Merge branch 'tb-css' into develop

1 files changed, 10 insertions, 7 deletions

diff --git a/app/views/phone_books/_index_core.html.haml b/app/views/phone_books/_index_core.html.haml
index 5f50675..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
+%table{:class => 'table table-striped'}
   %tr
     %th= t('phone_books.index.name')
-    %th= t('phone_books.index.description')
     %th= t('phone_books.index.count')
-
-  - reset_cycle
+    %th{:colspan => '3'}
+  
   - for phone_book in phone_books
-    %tr{:class => cycle('odd', 'even')}
-      %td= phone_book.name
-      %td= phone_book.description
+    %tr
+      %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}