From aa46f61cc84043a81f760c961ec53786671e7e50 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 12:12:36 +0100
Subject: Moved the voicemail and fax indicator.

---
 app/views/layouts/_navbar.html.haml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/views')

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index fe5f48f..3e1da1c 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -22,12 +22,8 @@
                 =t("call_histories.index.page_title")
             %li
               %a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)}
-                %i.icon-star.icon-white{:id => 'new_voicemail_indicator'}
                 =t("voicemail_messages.index.page_title")
-            :javascript
-              $("#new_voicemail_indicator").hide()
-            = subscribe_to "/users/#{current_user.id}/messages/new"   
-
+   
       - if current_user
         %ul.nav.pull-right
           %li.display
@@ -43,10 +39,18 @@
           - if current_page?(tenant_user_path(current_user.current_tenant, current_user))
             %li.active
               %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
+                %i.icon-star.icon-white{:id => 'new_voicemail_or_fax_indicator'}
+                :javascript
+                  $("#new_voicemail_or_fax_indicator").hide()
+                = subscribe_to "/users/#{current_user.id}/messages/new"                
                 = current_user
           - else
             %li
               %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
+                %i.icon-star.icon-white{:id => 'new_voicemail_or_fax_indicator'}
+                :javascript
+                  $("#new_voicemail_or_fax_indicator").hide()
+                = subscribe_to "/users/#{current_user.id}/messages/new"                
                 = current_user
 
           - if single_sign_on_system? == false
-- 
cgit v1.2.3


From 64afdeacb1444b319abfcad6c9a8cfd656fe2dd4 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 12:19:57 +0100
Subject: Reload FaxDocument#show when a fax was send.

---
 app/views/fax_documents/show.html.haml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/views')

diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index b8f3e9e..f860143 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -65,3 +65,6 @@
 .row
   .span12
     = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }
+
+- if @fax_document.state == 'sending' || @fax_document.state == 'queued_for_sending'
+  = subscribe_to "/fax_documents/#{@fax_document.id}"
\ No newline at end of file
-- 
cgit v1.2.3