Merge branch 'tb-css' into develop

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/phone_models/_index_core.html.haml b/app/views/phone_models/_index_core.html.haml
index b07eb68..b899a5c 100644
--- a/app/views/phone_models/_index_core.html.haml
+++ b/app/views/phone_models/_index_core.html.haml
@@ -1,13 +1,13 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('phone_models.index.name')
     %th= t('phone_models.index.product_manual_homepage_url')
     %th= t('phone_models.index.product_homepage_url')
     %th= t('phone_models.index.number_of_phones')
 
-  - reset_cycle
+  
   - for phone_model in phone_models
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= phone_model.name
       %td
         - if phone_model.product_manual_homepage_url
diff --git a/app/views/phone_models/edit.html.haml b/app/views/phone_models/edit.html.haml
index bf31ffc..ee10d3e 100644
--- a/app/views/phone_models/edit.html.haml
+++ b/app/views/phone_models/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("phone_models.edit.page_title")
+- content_for :title, t("phone_models.edit.page_title")
 
 = render "form"
diff --git a/app/views/phone_models/index.html.haml b/app/views/phone_models/index.html.haml
index 90aa4ce..e37243a 100644
--- a/app/views/phone_models/index.html.haml
+++ b/app/views/phone_models/index.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_models.index.page_title")
+- content_for :title, t("phone_models.index.page_title")
 
 - if @phone_models.count > 0
   = render "index_core", :phone_models => @phone_models
diff --git a/app/views/phone_models/new.html.haml b/app/views/phone_models/new.html.haml
index 9e900d4..a60bc68 100644
--- a/app/views/phone_models/new.html.haml
+++ b/app/views/phone_models/new.html.haml
@@ -1,3 +1,3 @@
-- title t("phone_models.new.page_title")
+- content_for :title, t("phone_models.new.page_title")
 
 = render "form"
diff --git a/app/views/phone_models/show.html.haml b/app/views/phone_models/show.html.haml
index 06fae4b..5e16bda 100644
--- a/app/views/phone_models/show.html.haml
+++ b/app/views/phone_models/show.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_models.show.page_title")
+- content_for :title, t("phone_models.show.page_title")
 
 %p
   %strong= t('phone_models.show.name') + ":"