From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:18:16 +0100 Subject: Started the migration to Twitter Bootstrap. --- app/views/phone_books/_index_core.html.haml | 2 +- app/views/phone_books/edit.html.haml | 2 +- app/views/phone_books/index.html.haml | 2 +- app/views/phone_books/new.html.haml | 2 +- app/views/phone_books/show.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/phone_books') diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index 5f50675..beed729 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -1,4 +1,4 @@ -%table +%table{:class => 'table table-striped'} %tr %th= t('phone_books.index.name') %th= t('phone_books.index.description') diff --git a/app/views/phone_books/edit.html.haml b/app/views/phone_books/edit.html.haml index 36c945b..e1d4553 100644 --- a/app/views/phone_books/edit.html.haml +++ b/app/views/phone_books/edit.html.haml @@ -1,3 +1,3 @@ -- title t("phone_books.edit.page_title", :resource => @phone_book) +- content_for :title, t("phone_books.edit.page_title", :resource => @phone_book) = render "form" diff --git a/app/views/phone_books/index.html.haml b/app/views/phone_books/index.html.haml index 52b4e9b..e681878 100644 --- a/app/views/phone_books/index.html.haml +++ b/app/views/phone_books/index.html.haml @@ -1,4 +1,4 @@ -- title t("phone_books.index.page_title") +- content_for :title, t("phone_books.index.page_title") - if @phone_books.count > 0 = render "index_core", :phone_books => @phone_books diff --git a/app/views/phone_books/new.html.haml b/app/views/phone_books/new.html.haml index e96ce1e..66d6e99 100644 --- a/app/views/phone_books/new.html.haml +++ b/app/views/phone_books/new.html.haml @@ -1,3 +1,3 @@ -- title t("phone_books.new.page_title") +- content_for :title, t("phone_books.new.page_title") = render "form" \ No newline at end of file diff --git a/app/views/phone_books/show.html.haml b/app/views/phone_books/show.html.haml index 047b15e..5140b91 100644 --- a/app/views/phone_books/show.html.haml +++ b/app/views/phone_books/show.html.haml @@ -1,4 +1,4 @@ -- title @phone_book +- content_for :title, @phone_book - if ! @phone_book.description.blank? %p %strong= t('phone_books.show.description') + ":" -- cgit v1.2.3 From d8fe3b636cab1504cb5d3cb5dc57ed818749ccf5 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 21:30:48 +0100 Subject: Twitter Bootstrap stuff. --- app/views/phone_books/_index_core.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/phone_books') diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index beed729..fdbe864 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -4,9 +4,9 @@ %th= t('phone_books.index.description') %th= t('phone_books.index.count') - - reset_cycle + - for phone_book in phone_books - %tr{:class => cycle('odd', 'even')} + %tr %td= phone_book.name %td= phone_book.description %td -- cgit v1.2.3 From c52babd4346b1a52c28bb7437d0434ecfb9ab70f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 22:25:32 +0100 Subject: Twitter Bootstrap stuff. --- app/views/phone_books/_index_core.html.haml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app/views/phone_books') diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index fdbe864..4763155 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -1,14 +1,17 @@ %table{:class => 'table table-striped'} %tr %th= t('phone_books.index.name') - %th= t('phone_books.index.description') %th= t('phone_books.index.count') - + %th{:colspan => '3'} - for phone_book in phone_books %tr - %td= phone_book.name - %td= phone_book.description + %td + - if phone_book.description.blank? + = phone_book.name + - else + %a.brand{:rel => 'tooltip', :title => phone_book.description} + = phone_book.name %td = number_with_delimiter( phone_book.phone_book_entries.count ) = render :partial => 'shared/create_link', :locals => {:parent => phone_book, :child_class => PhoneBookEntry, :short_link => true} -- cgit v1.2.3 From 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 15:31:47 +0100 Subject: UI improvements. --- app/views/phone_books/_index_core.html.haml | 1 - 1 file changed, 1 deletion(-) (limited to 'app/views/phone_books') diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index 4763155..accded6 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -14,6 +14,5 @@ = phone_book.name %td = number_with_delimiter( phone_book.phone_book_entries.count ) - = render :partial => 'shared/create_link', :locals => {:parent => phone_book, :child_class => PhoneBookEntry, :short_link => true} =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_book.phone_bookable, :child => phone_book} \ No newline at end of file -- cgit v1.2.3