summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-11 07:29:39 -0400
committerPeter Kozak <spag@golwen.net>2013-03-11 07:29:39 -0400
commit62293482479ff51c5044f536aa2aae88e5117f46 (patch)
treee4e643cabf14a58863715f8c112447b8e77e1fae /app
parent3e7b87d2839213cf5d29e2750b08a7b6cfd7d1c4 (diff)
parent64afdeacb1444b319abfcad6c9a8cfd656fe2dd4 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app')
-rw-r--r--app/controllers/trigger_controller.rb13
-rw-r--r--app/views/fax_documents/show.html.haml3
-rw-r--r--app/views/layouts/_navbar.html.haml14
3 files changed, 24 insertions, 6 deletions
diff --git a/app/controllers/trigger_controller.rb b/app/controllers/trigger_controller.rb
index 1a5bfca..0de9223 100644
--- a/app/controllers/trigger_controller.rb
+++ b/app/controllers/trigger_controller.rb
@@ -44,7 +44,7 @@ class TriggerController < ApplicationController
# Indicate a new voicemail in the navigation bar.
#
- PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_indicator').hide.delay(250).show('slow').hide.delay(250).show('slow');")
+ PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
render(
:status => 200,
@@ -110,6 +110,17 @@ class TriggerController < ApplicationController
end
if errors.count == 0
+ # Reload FaxDocument#show
+ #
+ PrivatePub.publish_to("/fax_documents/#{fax_document.id}", "location.reload();")
+
+ # Indicate a new fax in the navigation bar.
+ #
+ if fax_document.fax_accountable.class == User
+ user = fax_document.fax_accountable
+ PrivatePub.publish_to("/users/#{user.id}/messages/new", "$('#new_voicemail_or_fax_indicator').hide('fast').show('slow');")
+ end
+
render(
:status => 200,
:layout => false,
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
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