Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/phone_number_ranges/_index_core.html.haml b/app/views/phone_number_ranges/_index_core.html.haml
index 24ea96d..b378be8 100644
--- a/app/views/phone_number_ranges/_index_core.html.haml
+++ b/app/views/phone_number_ranges/_index_core.html.haml
@@ -1,13 +1,13 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('phone_number_ranges.index.name')
     %th= t('phone_number_ranges.index.description')
     %th= t('phone_number_ranges.index.numbers')
     %th= t('phone_number_ranges.index.amount')
 
-  - reset_cycle
+  
   - for phone_number_range in phone_number_ranges
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= t("phone_number_ranges.ranges.#{phone_number_range}.label")
       %td= t("phone_number_ranges.ranges.#{phone_number_range}.description")
       %td
diff --git a/app/views/phone_number_ranges/edit.html.haml b/app/views/phone_number_ranges/edit.html.haml
index fbf6d12..791be71 100644
--- a/app/views/phone_number_ranges/edit.html.haml
+++ b/app/views/phone_number_ranges/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("phone_number_ranges.edit.page_title", :resource => @phone_number_range)
+- content_for :title, t("phone_number_ranges.edit.page_title", :resource => @phone_number_range)
 
 = render "form"
diff --git a/app/views/phone_number_ranges/index.html.haml b/app/views/phone_number_ranges/index.html.haml
index 56cf137..769dc68 100644
--- a/app/views/phone_number_ranges/index.html.haml
+++ b/app/views/phone_number_ranges/index.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_number_ranges.index.page_title")
+- content_for :title, t("phone_number_ranges.index.page_title")
 
 - if @phone_number_ranges.count > 0
   = render "index_core", :phone_number_ranges => @phone_number_ranges
diff --git a/app/views/phone_number_ranges/new.html.haml b/app/views/phone_number_ranges/new.html.haml
index d26b34d..1e5eab0 100644
--- a/app/views/phone_number_ranges/new.html.haml
+++ b/app/views/phone_number_ranges/new.html.haml
@@ -1,3 +1,3 @@
-- title t("phone_number_ranges.new.page_title")
+- content_for :title, t("phone_number_ranges.new.page_title")
 
 = render "form"
diff --git a/app/views/phone_number_ranges/show.html.haml b/app/views/phone_number_ranges/show.html.haml
index 64df556..fdb54a7 100644
--- a/app/views/phone_number_ranges/show.html.haml
+++ b/app/views/phone_number_ranges/show.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_number_ranges.show.page_title")
+- content_for :title, t("phone_number_ranges.show.page_title")
 
 %p
   %strong= t('phone_number_ranges.show.name') + ":"