Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/manufacturers/_index_core.html.haml b/app/views/manufacturers/_index_core.html.haml
index 8937909..5efa5d9 100644
--- a/app/views/manufacturers/_index_core.html.haml
+++ b/app/views/manufacturers/_index_core.html.haml
@@ -1,13 +1,13 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('manufacturers.index.name')
     %th= t('manufacturers.index.ieee_name')
     %th= t('manufacturers.index.homepage_url')
     %th= t('manufacturers.index.phone_models')
 
-  - reset_cycle
+  
   - for manufacturer in manufacturers
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= manufacturer.name
       %td= manufacturer.ieee_name
       %td
diff --git a/app/views/manufacturers/edit.html.haml b/app/views/manufacturers/edit.html.haml
index 61bcba0..913287a 100644
--- a/app/views/manufacturers/edit.html.haml
+++ b/app/views/manufacturers/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("manufacturers.edit.page_title")
+- content_for :title, t("manufacturers.edit.page_title")
 
 = render "form"
diff --git a/app/views/manufacturers/index.html.haml b/app/views/manufacturers/index.html.haml
index 43fecc6..ccdd44b 100644
--- a/app/views/manufacturers/index.html.haml
+++ b/app/views/manufacturers/index.html.haml
@@ -1,4 +1,4 @@
-- title t("manufacturers.index.page_title")
+- content_for :title, t("manufacturers.index.page_title")
 
 = render "index_core", :manufacturers => @manufacturers
 
diff --git a/app/views/manufacturers/new.html.haml b/app/views/manufacturers/new.html.haml
index 4fb9dbf..9931242 100644
--- a/app/views/manufacturers/new.html.haml
+++ b/app/views/manufacturers/new.html.haml
@@ -1,3 +1,3 @@
-- title t("manufacturers.new.page_title")
+- content_for :title, t("manufacturers.new.page_title")
 
 = render "form"
diff --git a/app/views/manufacturers/show.html.haml b/app/views/manufacturers/show.html.haml
index 1b8383b..8888402 100644
--- a/app/views/manufacturers/show.html.haml
+++ b/app/views/manufacturers/show.html.haml
@@ -1,4 +1,4 @@
-- title t("manufacturers.show.page_title")
+- content_for :title, t("manufacturers.show.page_title")
 
 %p
   %strong= t('manufacturers.show.name') + ":"