Merge branch 'tb-css' into develop

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml
index 3435686..5336057 100644
--- a/app/views/route_elements/_index_core.html.haml
+++ b/app/views/route_elements/_index_core.html.haml
@@ -1,4 +1,4 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('route_elements.index.var_in')
     %th= t('route_elements.index.var_out')
@@ -7,9 +7,9 @@
     %th= t('route_elements.index.action')
     %th= t('route_elements.index.mandatory')
 
-  - reset_cycle
+  
   - for route_element in route_elements
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= route_element.var_in
       %td= route_element.var_out
       %td= route_element.pattern
diff --git a/app/views/route_elements/edit.html.haml b/app/views/route_elements/edit.html.haml
index 770eb6c..c2da3e6 100644
--- a/app/views/route_elements/edit.html.haml
+++ b/app/views/route_elements/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("route_elements.edit.page_title")
+- content_for :title, t("route_elements.edit.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/route_elements/index.html.haml b/app/views/route_elements/index.html.haml
index 8a6f7bc..43d47f1 100644
--- a/app/views/route_elements/index.html.haml
+++ b/app/views/route_elements/index.html.haml
@@ -1,4 +1,4 @@
-- title t("route_elements.index.page_title")
+- content_for :title, t("route_elements.index.page_title")
 
 - if @route_elements && @route_elements.count > 0
   = render "index_core", :route_elements => @route_elements
diff --git a/app/views/route_elements/new.html.haml b/app/views/route_elements/new.html.haml
index 903e808..2b9b9c1 100644
--- a/app/views/route_elements/new.html.haml
+++ b/app/views/route_elements/new.html.haml
@@ -1,3 +1,3 @@
-- title t("route_elements.new.page_title")
+- content_for :title, t("route_elements.new.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml
index c637a4d..808f2a0 100644
--- a/app/views/route_elements/show.html.haml
+++ b/app/views/route_elements/show.html.haml
@@ -1,4 +1,4 @@
-- title t("route_elements.show.page_title")
+- content_for :title, t("route_elements.show.page_title")
 
 %p
   %strong= t('route_elements.show.var_in') + ":"