Merge branch 'develop'5.1-beta1

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/acd_agents/_index_core.html.haml b/app/views/acd_agents/_index_core.html.haml
index 7cb1aae..c082fd1 100644
--- a/app/views/acd_agents/_index_core.html.haml
+++ b/app/views/acd_agents/_index_core.html.haml
@@ -1,4 +1,4 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('acd_agents.index.name')
     %th= t('acd_agents.index.status')
@@ -6,9 +6,9 @@
     %th= t('acd_agents.index.calls_answered')
     %th= t('acd_agents.index.destination')
 
-  - reset_cycle
+  
   - for acd_agent in acd_agents
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td= acd_agent.name
       %td= acd_agent.status
       %td= acd_agent.last_call
diff --git a/app/views/acd_agents/edit.html.haml b/app/views/acd_agents/edit.html.haml
index 8ab14b8..41671b2 100644
--- a/app/views/acd_agents/edit.html.haml
+++ b/app/views/acd_agents/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("acd_agents.edit.page_title")
+- content_for :title, t("acd_agents.edit.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/acd_agents/index.html.haml b/app/views/acd_agents/index.html.haml
index d586dcf..ddf5fde 100644
--- a/app/views/acd_agents/index.html.haml
+++ b/app/views/acd_agents/index.html.haml
@@ -1,4 +1,4 @@
-- title t("acd_agents.index.page_title")
+- content_for :title, t("acd_agents.index.page_title")
 
 - if @acd_agents && @acd_agents.count > 0
   = render "index_core", :acd_agents => @acd_agents
diff --git a/app/views/acd_agents/new.html.haml b/app/views/acd_agents/new.html.haml
index 546136b..fb4d256 100644
--- a/app/views/acd_agents/new.html.haml
+++ b/app/views/acd_agents/new.html.haml
@@ -1,3 +1,3 @@
-- title t("acd_agents.new.page_title")
+- content_for :title, t("acd_agents.new.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/acd_agents/show.html.haml b/app/views/acd_agents/show.html.haml
index 0c90f4b..39c0036 100644
--- a/app/views/acd_agents/show.html.haml
+++ b/app/views/acd_agents/show.html.haml
@@ -1,4 +1,4 @@
-- title t("acd_agents.show.page_title")
+- content_for :title, t("acd_agents.show.page_title")
 
 %p
   %strong= t('acd_agents.show.name') + ":"