Twitter Bootstrap stuff.

13 files changed, 36 insertions, 25 deletions

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 222303b..5dc7c21 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -2,14 +2,20 @@
   %table{:class => 'table table-striped'}
     %tr
       %th= t('call_routes.index.name')
+      %th= t('route_elements.index.pattern')
       %th= t('call_routes.index.endpoint_type')
-      %th= t('call_routes.index.endpoint_id')
-
+      %th{:colspan => '3'}
     
     - for call_route in call_routes
-      %tr
-        - cache(['call_route_single_table_row_within_tr', call_route, call_routes.count]) do 
+      - cache(['call_route_single_table_row', call_route, call_routes.count]) do 
+        %tr
           %td= call_route.name
+          %td
+            - if call_route.route_elements.any?
+              = call_route.route_elements.first.pattern
+              - if call_route.route_elements.count > 1
+                = ', ...'
+            - else
+              = '-'
           %td= call_route.endpoint_type
-          %td= call_route.endpoint_id
           =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml
index d75b80a..1265716 100644
--- a/app/views/fax_documents/_index_core.html.haml
+++ b/app/views/fax_documents/_index_core.html.haml
@@ -11,7 +11,7 @@
 
   
   - for fax_document in fax_documents
-    %tr{:class => cycle('odd', 'even'), :id => "fax_document_#{fax_document.id}"}
+    %tr{:id => "fax_document_#{fax_document.id}"}
       - if fax_document.sent_at
         %td= "#{fax_document.inbound ? '⇨' : '⇦'} #{fax_document.sent_at}".html_safe
         %td= t("fax_documents.states.#{fax_document.state}")
diff --git a/app/views/gateways/_index_core.html.haml b/app/views/gateways/_index_core.html.haml
index 3fcf064..0eec67f 100644
--- a/app/views/gateways/_index_core.html.haml
+++ b/app/views/gateways/_index_core.html.haml
@@ -6,7 +6,7 @@
       %th= t('gateways.index.inbound')
       %th= t('gateways.index.outbound')
       %th= t('gateways.index.description')
-
+      %th{:colspan => '3'}
     
     - for gateway in gateways
       %tr
diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml
index fb1dd6f..fe72d26 100644
--- a/app/views/phone_book_entries/_index_core.de.html.haml
+++ b/app/views/phone_book_entries/_index_core.de.html.haml
@@ -11,7 +11,7 @@
             ~# Because of you we have to do this with a table.
             ~# With Love,
             ~# Mario.
-            %tr.phone-book-entry{:class => cycle('odd', 'even'), :"itemscope itemtype" => "http://schema.org/Person"}
+            %tr.phone-book-entry{:"itemscope itemtype" => "http://schema.org/Person"}
               %td.thumbnail
                 = image_tag(entry.image_url(:small).to_s, :itemprop => 'image')
               %td.user
diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml
index 1e24b5d..6e35221 100644
--- a/app/views/phone_book_entries/_index_core.html.haml
+++ b/app/views/phone_book_entries/_index_core.html.haml
@@ -12,7 +12,7 @@
             ~# Because of you we have to do this with a table.
             ~# With Love,
             ~# Mario.
-            %tr.phone-book-entry{:class => cycle('odd', 'even'), :"itemscope itemtype" => "http://schema.org/Person"}
+            %tr.phone-book-entry{:"itemscope itemtype" => "http://schema.org/Person"}
               %td.thumbnail
                 = image_tag(entry.image_url(:small).to_s, :itemprop => 'image')
               %td.user
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}
diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml
index cac29d0..a24d0d3 100644
--- a/app/views/sip_accounts/_index_core.html.haml
+++ b/app/views/sip_accounts/_index_core.html.haml
@@ -4,6 +4,7 @@
     %th= t('sip_accounts.index.caller_name')
     %th= t('sip_accounts.index.phone_numbers')
     %th= t('phones.name')
+    %th{:colspan => '3'}
   
   - for sip_account in sip_accounts
     %tr
diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml
index 7e7e46b..627f221 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.html.haml
@@ -19,13 +19,13 @@
   - Manufacturer.all.each do |manufacturer|
     - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
       = succeed ', ' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
+        =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
     - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last
       = succeed ' und ' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
+        =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
     - else
       = succeed '.' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
+        =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
 
 = render :partial => 'call_routes', :locals => {:tenant => tenant}
 
diff --git a/app/views/tenants/_call_routes.html.haml b/app/views/tenants/_call_routes.html.haml
index 41066ae..28f84bf 100644
--- a/app/views/tenants/_call_routes.html.haml
+++ b/app/views/tenants/_call_routes.html.haml
@@ -5,4 +5,4 @@
   = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute}
 - else
   %p
-    = link_to t("call_routes.index.page_title"), call_routes_path
\ No newline at end of file
+    = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + t("call_routes.index.page_title"), call_routes_path
\ No newline at end of file
diff --git a/app/views/tenants/_gs_parameter_table.html.haml b/app/views/tenants/_gs_parameter_table.html.haml
index 407f6e3..8afdb0e 100644
--- a/app/views/tenants/_gs_parameter_table.html.haml
+++ b/app/views/tenants/_gs_parameter_table.html.haml
@@ -12,13 +12,13 @@
       %td
         = t("gui_functions.name")
       %td
-        = link_to GuiFunction.count.to_s, gui_functions_path
+        = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GuiFunction.count.to_s, gui_functions_path
       %td
         = l GuiFunction.reorder(:updated_at).last.updated_at, :format => :short 
     %tr
       %td
         = t("gs_parameters.name")
       %td
-        = link_to GsParameter.count.to_s, gs_parameters_path
+        = link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + GsParameter.count.to_s, gs_parameters_path
       %td
         = l GsParameter.reorder(:updated_at).last.updated_at, :format => :short 
diff --git a/app/views/user_groups/_index_core.html.haml b/app/views/user_groups/_index_core.html.haml
index 49cd858..941f9fa 100644
--- a/app/views/user_groups/_index_core.html.haml
+++ b/app/views/user_groups/_index_core.html.haml
@@ -8,7 +8,7 @@
         %th= t('user_groups.index.tenant_id')
       - else
         %th= t('user_groups.index.members')
-
+      %th{:colspan => '3'}
     
     - for user_group in user_groups
       %tr
diff --git a/app/views/users/_index_core.html.haml b/app/views/users/_index_core.html.haml
index b492a1d..b0efaef 100644
--- a/app/views/users/_index_core.html.haml
+++ b/app/views/users/_index_core.html.haml
@@ -6,11 +6,11 @@
       %th= t('users.index.email')
       %th= t('users.index.first_name')
       %th= t('users.index.last_name')
-
-    
+      %th{:colspan => '3'}
+  
     - for user in users
-      %tr
-        - cache(['user_table_row_inner_td', I18n.locale, current_user, user]) do
+      - cache(['user_table_row', I18n.locale, current_user, user]) do
+        %tr
           %td 
             = image_tag user.image_url(:mini).to_s if user.image_url(:mini)
           %td= user.user_name
diff --git a/app/views/voicemail_messages/_index_core.html.haml b/app/views/voicemail_messages/_index_core.html.haml
index e6e6398..ded7ea0 100644
--- a/app/views/voicemail_messages/_index_core.html.haml
+++ b/app/views/voicemail_messages/_index_core.html.haml
@@ -4,7 +4,7 @@
     %table{:class => 'table table-striped'}
       
       - for voicemail_message in voicemail_messages
-        %tr.voicemail-messages-entry{:class => cycle('odd', 'even'), :id => "message_#{voicemail_message.uuid}"}
+        %tr.voicemail-messages-entry{:id => "message_#{voicemail_message.uuid}"}
           %td.select_box= check_box_tag("selected_uuids[]", voicemail_message.uuid, false, :uuid => "select_item_#{voicemail_message.uuid}", :class => 'select_item')
           %td.time
             .voicemail-received
@@ -40,5 +40,6 @@
               = link_to t('voicemail_messages.index.actions.destroy'), sip_account_voicemail_message_path(@sip_account, voicemail_message), :method => :delete
 
   %footer.entries-nav= render :partial => "voicemail_messages/navigation"
+  = link_to Haml::Engine.new("%i.icon-remove").render + ' test ', root_url
   = image_submit_tag('icons/cross-16x.png', :confirm => t("voicemail_messages.index.actions.confirm_selected"))
   = t("voicemail_messages.index.actions.destroy_multiple")