Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml
index 4e15509..1265716 100644
--- a/app/views/fax_documents/_index_core.html.haml
+++ b/app/views/fax_documents/_index_core.html.haml
@@ -1,4 +1,4 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('fax_documents.index.sent_at')
     %th= t('fax_documents.index.state')
@@ -9,9 +9,9 @@
       = t('fax_documents.index.remote_station_id')
     %th= t('fax_documents.index.thumbnails')
 
-  - reset_cycle
+  
   - for fax_document in fax_documents
-    %tr{:class => cycle('odd', 'even'), :id => "fax_document_#{fax_document.id}"}
+    %tr{:id => "fax_document_#{fax_document.id}"}
       - if fax_document.sent_at
         %td= "#{fax_document.inbound ? '⇨' : '⇦'} #{fax_document.sent_at}".html_safe
         %td= t("fax_documents.states.#{fax_document.state}")
diff --git a/app/views/fax_documents/edit.html.haml b/app/views/fax_documents/edit.html.haml
index 5da92c6..239bf8b 100644
--- a/app/views/fax_documents/edit.html.haml
+++ b/app/views/fax_documents/edit.html.haml
@@ -1,4 +1,4 @@
-- title t("fax_documents.edit.page_title")
+- content_for :title, t("fax_documents.edit.page_title")
 
 = render "form"
 
diff --git a/app/views/fax_documents/index.html.haml b/app/views/fax_documents/index.html.haml
index 11199dd..33c697c 100644
--- a/app/views/fax_documents/index.html.haml
+++ b/app/views/fax_documents/index.html.haml
@@ -1,4 +1,4 @@
-- title t("fax_documents.index.page_title")
+- content_for :title, t("fax_documents.index.page_title")
 
 = render "index_core", :fax_documents => @fax_documents
 
diff --git a/app/views/fax_documents/new.html.haml b/app/views/fax_documents/new.html.haml
index be02860..8884418 100644
--- a/app/views/fax_documents/new.html.haml
+++ b/app/views/fax_documents/new.html.haml
@@ -1,3 +1,3 @@
-- title t("fax_documents.new.page_title")
+- content_for :title, t("fax_documents.new.page_title")
 
 = render "form"
diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index 4703e1d..41d3bff 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -1,4 +1,4 @@
-- title t("fax_documents.show.page_title")
+- content_for :title, t("fax_documents.show.page_title")
 - child = @fax_document
 - parent = @fax_document.fax_account