Merge branch 'tb-css' into develop

5 files changed, 10 insertions, 10 deletions

diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml
index 69c9302..a24d0d3 100644
--- a/app/views/sip_accounts/_index_core.html.haml
+++ b/app/views/sip_accounts/_index_core.html.haml
@@ -1,18 +1,18 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('sip_accounts.index.online')
     %th= t('sip_accounts.index.caller_name')
     %th= t('sip_accounts.index.phone_numbers')
     %th= t('phones.name')
-
-  - reset_cycle
+    %th{:colspan => '3'}
+  
   - for sip_account in sip_accounts
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td
         - if sip_account.registration
-          =image_tag 'icons/phone-down-green-32x.png'
+          %i.icon-ok
         - else
-          =image_tag 'icons/phone-down-grey-32x.png'
+          %i.icon-thumbs-down
       %td
         = sip_account.caller_name
       - phone_numbers = sip_account.phone_numbers
diff --git a/app/views/sip_accounts/edit.html.haml b/app/views/sip_accounts/edit.html.haml
index c070ff7..d26b245 100644
--- a/app/views/sip_accounts/edit.html.haml
+++ b/app/views/sip_accounts/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("sip_accounts.edit.page_title")
+- content_for :title, t("sip_accounts.edit.page_title")
 
 = render "form"
diff --git a/app/views/sip_accounts/index.html.haml b/app/views/sip_accounts/index.html.haml
index 1131770..fbdba48 100644
--- a/app/views/sip_accounts/index.html.haml
+++ b/app/views/sip_accounts/index.html.haml
@@ -1,4 +1,4 @@
-- title t("sip_accounts.index.page_title")
+- content_for :title, t("sip_accounts.index.page_title")
 
 - if @sip_accounts.count > 0
   = render "index_core", :sip_accounts => @sip_accounts
diff --git a/app/views/sip_accounts/new.html.haml b/app/views/sip_accounts/new.html.haml
index 9d44680..bc4e00b 100644
--- a/app/views/sip_accounts/new.html.haml
+++ b/app/views/sip_accounts/new.html.haml
@@ -1,3 +1,3 @@
-- title t("sip_accounts.new.page_title")
+- content_for :title, t("sip_accounts.new.page_title")
 
 = render "form"
diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml
index c6344cd..4f6244f 100644
--- a/app/views/sip_accounts/show.html.haml
+++ b/app/views/sip_accounts/show.html.haml
@@ -1,4 +1,4 @@
-- title t("sip_accounts.show.page_title")
+- content_for :title, t("sip_accounts.show.page_title")
 
 %p
   %strong= t('sip_accounts.show.auth_name') + ":"