Merge branch 'tb-css' into develop

5 files changed, 18 insertions, 12 deletions

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 12e89ee..5dc7c21 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -1,15 +1,21 @@
 - cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do 
-  %table
+  %table{:class => 'table table-striped'}
     %tr
       %th= t('call_routes.index.name')
+      %th= t('route_elements.index.pattern')
       %th= t('call_routes.index.endpoint_type')
-      %th= t('call_routes.index.endpoint_id')
-
-    - reset_cycle
+      %th{:colspan => '3'}
+    
     - for call_route in call_routes
-      %tr{:class => cycle('odd', 'even')}
-        - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do 
+      - cache(['call_route_single_table_row', call_route, call_routes.count]) do 
+        %tr
           %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= call_route.endpoint_type
-          %td= call_route.endpoint_id
           =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
diff --git a/app/views/call_routes/edit.html.haml b/app/views/call_routes/edit.html.haml
index 0ad46c5..6048200 100644
--- a/app/views/call_routes/edit.html.haml
+++ b/app/views/call_routes/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("call_routes.edit.page_title")
+- content_for :title, t("call_routes.edit.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml
index 151fc0e..bd4468c 100644
--- a/app/views/call_routes/index.html.haml
+++ b/app/views/call_routes/index.html.haml
@@ -1,7 +1,7 @@
-- title t("call_routes.index.page_title")
+- content_for :title, t("call_routes.index.page_title")
 
 - if @call_routes && @call_routes.count > 0
-  %table
+  %table{:class => 'table table-striped'}
     - @routing_tables.each do |routing_table|
       %tr
         %td{:colspan => 3}
diff --git a/app/views/call_routes/new.html.haml b/app/views/call_routes/new.html.haml
index 0796d7f..28aead9 100644
--- a/app/views/call_routes/new.html.haml
+++ b/app/views/call_routes/new.html.haml
@@ -1,3 +1,3 @@
-- title t("call_routes.new.page_title")
+- content_for :title, t("call_routes.new.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
index bada227..70fe13e 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -1,4 +1,4 @@
-- title t("call_routes.show.page_title")
+- content_for :title, t("call_routes.show.page_title")
 
 %p
   %strong= t('call_routes.show.table') + ":"