@@ -28,6 +28,8 @@ class ApplicationController < ActionController::Base helper_method :buildUserLink + helper_method :activeEmergencies? + before_filter :login_required before_filter :update_last_online @@ -251,7 +253,12 @@ class ApplicationController < ActionController::Base Logmessage.create(:logtime => Time.now.to_i, :severity => 0, :errorcode => "LOG", :logmsg => logmsg) end - + + def activeEmergencies? + return false if Emergency.find_by_active(true).blank? + return true + end + public :permission?, :block end app/controllers/application_controller.rb @@ -13,6 +13,11 @@ <div id="maintop"> <div id="top"> <img src="/images/layout/top.png" alt="ScopePort" id="toplogo"> + <div id="emergency-list"> + <% if activeEmergencies? %> + <%= link_to "Active emergencies!", :controller => "emergencies" %> + <% end %> + </div> <% unless @first_admin %> <% if admin? %> <div id="logmsg"> @@ -21,12 +26,12 @@ </div> <% end %> <div id="bigredbutton-activate"> - <a onclick="bigRedButtonSlide()" title="Declare emergency!"> + <a onclick="bigRedButtonSlide()" title="Declare emergency!" id="bigredbutton-activator"> ! </a> </div> <div id="bigredbutton" style="display: none;"> - <%= link_to "Declare emergency!", :controller => "emergencies", :action => "declare" %> + <span id="bigredbutton-pulse"><%= link_to "Declare emergency!", :controller => "emergencies", :action => "new" %></span> </div> <div id="usermenu"> <div id="usermenuwelcome"> @@ -99,6 +104,10 @@ <div id="flash-error" style="display: none;"><%= flash[:error] %></div> <script type="text/javascript"> + <% if activeEmergencies? %> + //Effect.Pulsate("toplogo", { pulses: 9999, duration: 9999/0.7 }); + <% end %> + noticediv = document.getElementById("flash-notice").innerHTML; errordiv = document.getElementById("flash-error").innerHTML; if(noticediv != "") app/views/layouts/application.html.erb @@ -104,3 +104,24 @@ function updateForm (fields) { elements[7].value = cf.service_state; } } + +function bigRedButtonSlide(){ + document.getElementById('bigredbutton').style.display = ""; + document.getElementById('bigredbutton-activator').style.display = "none"; + Effect.Pulsate('bigredbutton-pulse', { pulses: 9999, duration: 9999 }); +} + +function appendToList(x){ + var container = document.getElementById("emergency-chat-list"); + var newElement = document.createElement("li"); + newElement.innerHTML = x; + container.insertBefore(newElement, container.lastChild); +} + +function scrollToBottom(x){ + var scroll = document.getElementById("autoscroll"); + if(scroll.checked){ + var el = document.getElementById(x); + el.scrollTop = el.scrollHeight; + } +} public/javascripts/scopeport.js @@ -187,7 +187,7 @@ dd { #navigation { height: 40px; - padding-top: 80px; + padding-top: 60px; } .navlink { @@ -294,6 +294,17 @@ dd { border: 0px; } +#emergency-list { + height: 19px; + width: 200px; + margin: 0px auto; + text-align: center; + position: relative; + top: 5px; + font-size: 13px; + font-weight: bold; +} + #container { width: 960px; height: 100%; public/stylesheets/core.css @@ -514,3 +514,77 @@ #conversations-clear { margin-top: 15px; } + +/* + * Emergencies + */ + +#emergency-new-receivers { + margin-top: 10px; + margin-bottom: 20px; +} + +#emergencies-list { + margin-top: 15px; +} + +#emergency-description { + margin-top: 10px; +} + +.emergency-section h2 { + font-size: 12px; +} + +.emergency-section p { + margin: 0px; + margin-bottom: 2px; +} + +#emergency-chat { + margin-top: 10px; +} + +#emergency-chat-top { + float: right; + padding-right: 5px; +} + +#emergency-chat-list { + width: 905px; + height: 150px; + overflow: auto; + border-left: 1px dotted #000000; + margin: 0px; + padding: 0px; + margin-top: 5px; + margin-bottom: 5px; + padding-left: 3px; + padding-right: 5px; + padding-bottom: 3px; + list-style-type: none; +} + +#emergency-chat-message-field { + width: 849px; +} + +#emergency-chat-submit-field { + width: 50px; +} + +.emergency-chat-message-date { + color: #BBBBBB; +} + +.emergency-chat-message-username { + font-weight: bold; +} + +.emergency-chat-message-message { + font-style: italic; +} + +#emergency-close { + margin-top: 15px; +} public/stylesheets/sections.css 596951fb9ba7ed1c35031d8d650121ec54ece5c6 lennartkoopmann lennartkoopmann lennart@scopeport.org http://github.com/lennartkoopmann/scopeport-web-interface/commit/c77c7ddc0b714658b071ee30ec7eeb832b2823e1 c77c7ddc0b714658b071ee30ec7eeb832b2823e1 2009-07-21T18:37:12-07:00 2009-07-21T18:37:12-07:00 New module: Emergencies f62840f9bea30e779c0e90a8f3a53737603a562d lennartkoopmann lennartkoopmann lennart@scopeport.org