Merge branch 'tb-css' into develop

5 files changed, 7 insertions, 7 deletions

diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml
index fd3dca8..7194379 100644
--- a/app/views/softkeys/_index_core.html.haml
+++ b/app/views/softkeys/_index_core.html.haml
@@ -1,12 +1,12 @@
-%table
+%table{:class => 'table table-striped'}
   %tr
     %th= t('softkeys.index.function')
     %th= t('softkeys.index.number')
     %th= t('softkeys.index.label')
 
-  - reset_cycle
+  
   - for softkey in softkeys.order(:position)
-    %tr{:class => cycle('odd', 'even')}
+    %tr
       %td
         =softkey.to_s
       %td= softkey.number
diff --git a/app/views/softkeys/edit.html.haml b/app/views/softkeys/edit.html.haml
index 54d53fc..ce45176 100644
--- a/app/views/softkeys/edit.html.haml
+++ b/app/views/softkeys/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("softkeys.edit.page_title")
+- content_for :title, t("softkeys.edit.page_title")
 
 = render "form"
\ No newline at end of file
diff --git a/app/views/softkeys/index.html.haml b/app/views/softkeys/index.html.haml
index 8bdc00e..d0b68a9 100644
--- a/app/views/softkeys/index.html.haml
+++ b/app/views/softkeys/index.html.haml
@@ -1,4 +1,4 @@
-- title t("softkeys.index.page_title")
+- content_for :title, t("softkeys.index.page_title")
 
 - if @softkeys.count > 0
   = render "index_core", :softkeys => @softkeys
diff --git a/app/views/softkeys/new.html.haml b/app/views/softkeys/new.html.haml
index 593add6..9199a5c 100644
--- a/app/views/softkeys/new.html.haml
+++ b/app/views/softkeys/new.html.haml
@@ -1,3 +1,3 @@
-- title t("softkeys.new.page_title")
+- content_for :title, t("softkeys.new.page_title")
 
 = render "form"
diff --git a/app/views/softkeys/show.html.haml b/app/views/softkeys/show.html.haml
index 9ab4333..d0db111 100644
--- a/app/views/softkeys/show.html.haml
+++ b/app/views/softkeys/show.html.haml
@@ -1,4 +1,4 @@
-- title t("softkeys.show.page_title")
+- content_for :title, t("softkeys.show.page_title")
 
 %p
   %strong= t('softkeys.show.function') + ":"