diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
| commit | 8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch) | |
| tree | 1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /app/views/phone_books | |
| parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
| parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) | |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'app/views/phone_books')
| -rw-r--r-- | app/views/phone_books/_index_core.html.haml | 33 | ||||
| -rw-r--r-- | app/views/phone_books/show.html.haml | 4 |
2 files changed, 20 insertions, 17 deletions
diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml index accded6..09ce3a3 100644 --- a/app/views/phone_books/_index_core.html.haml +++ b/app/views/phone_books/_index_core.html.haml @@ -1,18 +1,21 @@ -%table{:class => 'table table-striped'} - %tr - %th= t('phone_books.index.name') - %th= t('phone_books.index.count') - %th{:colspan => '3'} - - - for phone_book in phone_books +%table.table.table-striped + %thead %tr - %td - - if phone_book.description.blank? + %th= t('phone_books.index.name') + %th + %span.visible-desktop + = t('phone_books.index.description') + %th= t('phone_books.index.count') + + %tbody + - for phone_book in phone_books + %tr + %td = 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 ) + %td + %span.visible-desktop + = phone_book.description + %td + = number_with_delimiter( phone_book.phone_book_entries.count ) - =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_book.phone_bookable, :child => phone_book}
\ No newline at end of file + =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => phone_book.phone_bookable, :child => phone_book}
\ 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 5140b91..b8030aa 100644 --- a/app/views/phone_books/show.html.haml +++ b/app/views/phone_books/show.html.haml @@ -1,5 +1,5 @@ - content_for :title, @phone_book -- if ! @phone_book.description.blank? +- if !@phone_book.description.blank? %p %strong= t('phone_books.show.description') + ":" = @phone_book.description @@ -7,7 +7,7 @@ = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @phone_book.phone_bookable, :child => @phone_book } %h2= t("phone_book_entries.index.page_title") -- if @phone_book_entries.count > 0 +- if @phone_book_entries.any? = render "phone_book_entries/index_core", :phone_book_entries => @phone_book_entries = render :partial => 'shared/create_link', :locals => {:parent => @phone_book, :child_class => PhoneBookEntry}
\ No newline at end of file |