Merge branch 'tb-css' into develop

5 files changed, 8 insertions, 8 deletions

diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml
index dd2d1f5..0eec67f 100644
--- a/app/views/gateways/_index_core.html.haml
+++ b/app/views/gateways/_index_core.html.haml
@@ -1,15 +1,15 @@
 - cache(['gateways_table', gateways.count, gateways.first, gateways.last]) do 
-  %table
+  %table{:class => 'table table-striped'}
     %tr
       %th= t('gateways.index.name')
       %th= t('gateways.index.technology')
       %th= t('gateways.index.inbound')
       %th= t('gateways.index.outbound')
       %th= t('gateways.index.description')
-
-    - reset_cycle
+      %th{:colspan => '3'}
+    
     - for gateway in gateways
-      %tr{:class => cycle('odd', 'even')}
+      %tr
         - cache(['gateway_single_table_row_within_tr', gateway, gateways.count]) do 
           %td= gateway.name
           %td= gateway.technology
diff --git a/app/views/gateways/edit.html.haml b/app/views/gateways/edit.html.haml
index 417dd09..238dc3c 100644
--- a/app/views/gateways/edit.html.haml
+++ b/app/views/gateways/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("gateways.edit.page_title")
+- content_for :title, t("gateways.edit.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/gateways/index.html.haml b/app/views/gateways/index.html.haml
index cec9cd1..f5d3275 100644
--- a/app/views/gateways/index.html.haml
+++ b/app/views/gateways/index.html.haml
@@ -1,4 +1,4 @@
-- title t("gateways.index.page_title")
+- content_for :title, t("gateways.index.page_title")
 
 - if @gateways && @gateways.count > 0
   = render "index_core", :gateways => @gateways
diff --git a/app/views/gateways/new.html.haml b/app/views/gateways/new.html.haml
index a2609f3..d17ff6e 100644
--- a/app/views/gateways/new.html.haml
+++ b/app/views/gateways/new.html.haml
@@ -1,3 +1,3 @@
-- title t("gateways.new.page_title")
+- content_for :title, t("gateways.new.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml
index 9d0ee53..9a3e1c4 100644
--- a/app/views/gateways/show.html.haml
+++ b/app/views/gateways/show.html.haml
@@ -1,4 +1,4 @@
-- title t("gateways.show.page_title")
+- content_for :title, t("gateways.show.page_title")
 
 %p
   %strong= t('gateways.show.id') + ":"