summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-02 11:44:11 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-02 11:44:11 +0100
commitb8c39c59cf7e698d5653cc49fa746506a9c41e24 (patch)
treeb5f782af7817270fc610f7756082608d00685e19 /app/views
parentaad8a03991fe616f84fa18ed1db81831220f8d64 (diff)
parentba5b2737365592cc511a526a3b14be46c3a75467 (diff)
Merge branch 'sortable' into develop
Diffstat (limited to 'app/views')
-rw-r--r--app/views/call_routes/_index_core.html.haml58
-rw-r--r--app/views/call_routes/index.html.haml11
2 files changed, 34 insertions, 35 deletions
diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 52a45ba..9eae9ee 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -1,29 +1,31 @@
-- cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do
- %table.table.table-striped
- %thead
- %tr
- %th
- %th= t('call_routes.index.name')
- %th= t('route_elements.index.pattern')
- %th= t('call_routes.index.endpoint')
+/ - cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do
+%table.table.table-striped{ :id => "call_routes" }
+ %thead
+ %tr
+ %th
+ %th= t('call_routes.index.name')
+ %th= t('route_elements.index.pattern')
+ %th= t('call_routes.index.endpoint')
- %tbody
- - for call_route in call_routes
- - cache(['call_route_single_table_row', call_route, call_routes.count]) do
- %tr
- %td= call_route.position
- %td= call_route.name
- %td
- - if call_route.route_elements.any?
- = call_route.route_elements.first.pattern
- - if call_route.route_elements.count > 1
- = ', ...'
- - else
- = '-'
- %td
- - endpoint = call_route.endpoint
- - if endpoint
- = endpoint
- - else
- = call_route.endpoint_type
- =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
+ %tbody
+ - for call_route in call_routes
+ / - cache(['call_route_single_table_row', call_route, call_routes.count]) do
+ = content_tag_for :tr, call_route do
+ %td
+ %span.handle
+ %i.icon-resize-vertical
+ %td= call_route.name
+ %td
+ - if call_route.route_elements.any?
+ = call_route.route_elements.first.pattern
+ - if call_route.route_elements.count > 1
+ = ', ...'
+ - else
+ = '-'
+ %td
+ - endpoint = call_route.endpoint
+ - if endpoint
+ = endpoint
+ - else
+ = call_route.endpoint_type
+ =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml
index 488e1c7..d5181e3 100644
--- a/app/views/call_routes/index.html.haml
+++ b/app/views/call_routes/index.html.haml
@@ -1,11 +1,8 @@
- content_for :title, t("call_routes.index.page_title")
-- if @call_routes && @call_routes.count > 0
- %table.table.table-striped
- - @routing_tables.each do |routing_table|
- %tr
- %td{:colspan => 3}
- %h3= routing_table
- = render "index_core", :call_routes => @call_routes.where(:routing_table => routing_table)
+- if @call_routes && @call_routes.any?
+ - @routing_tables.each do |routing_table|
+ %h3= routing_table
+ = render "index_core", :call_routes => @call_routes.where(:routing_table => routing_table)
= render :partial => 'shared/create_link', :locals => {:child_class => CallRoute}