Started the migration to Twitter Bootstrap.

5 files changed, 8 insertions, 8 deletions

diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml
index 5f0cb41..b364bd2 100644
--- a/app/views/users/_index_core.html.haml
+++ b/app/views/users/_index_core.html.haml
@@ -1,5 +1,5 @@
 - cache(['user_table_row_inner_td', I18n.locale, current_user, users.reorder(:updated_at).last, users.count, GsParameter.get('NUMBER_OF_SHOWN_ITEMS')]) do
-  %table
+  %table{:class => 'table table-striped'}
     %tr
       %th
       %th= t('users.index.user_name')
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 96272f5..ed79b2c 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -1,3 +1,3 @@
-- title t("users.edit.page_title", :resource => @user)
+- content_for :title, t("users.edit.page_title", :resource => @user)
 
 = render "form"
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
index 892e035..8a3d1fc 100644
--- a/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
@@ -1,4 +1,4 @@
-- title t("users.index.page_title")
+- content_for :title, t("users.index.page_title")
 
 - if @users.count > 0
   = render "index_core", :users => @users
diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml
index a014611..64fe55f 100644
--- a/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
@@ -1,3 +1,3 @@
-- title t("users.new.page_title")
+- content_for :title, t("users.new.page_title")
 
 = render "form"
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 9a0ae02..75eaf54 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,7 +1,7 @@
-- title "User: #{@user}"
+- content_for :title, "User: #{@user}"
 
-#user-show
-  %aside
+.row
+  .span3
     - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do
       = image_tag @user.image_url(:small).to_s, class: 'display' if @user.image? && @user.image_url(:small)
       %p
@@ -40,7 +40,7 @@
             =link_to conference, edit_user_conference_path(@user, conference)
 
 
-  %section
+  .span9
     = render :partial => 'phone_books', :locals => {:user => @user, :phone_books => @phone_books}
 
     - if current_user.user_groups.where(:name => 'Admins').any?