[commit] unified notifications

public/js/startup.css

@@ -19,28 +19,6 @@ span, div, td, input, textarea, button, select {
 	text-align: center;
 }
 
-.navbar-new-comments {
-	margin: -3px 0px;
-	padding: 2px;
-	min-width: 20px;
-	text-align: center;
-	display: inline-block;
-	border-radius: 2px;
-	color: #999999;
-	background-color: #333131;
-}
-
-.navbar-new-comments:hover,
-.navbar-new-comments:active,
-.navbar-new-comments:focus {
-	color: #fff;
-}
-
-.navbar-new-comments-true {
-	color: #fff;
-	background-color: #B00D07;
-}
-
 /*extra size menus for recent*/
 .dropdown-menu#toolbar-recent, .dropdown-menu#toolbar-options, .dropdown-menu#toolbar-help{
 	min-width: 160px !important;

public/js/startup.js

@@ -35,9 +35,6 @@ erpnext.startup.start = function() {
 		// setup toolbar
 		erpnext.toolbar.setup();
 		
-		// set interval for updates
-		erpnext.startup.set_periodic_updates();
-
 		// complete registration
 		if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) { 
 			wn.require("app/js/complete_setup.js");
@@ -67,67 +64,6 @@ erpnext.startup.start = function() {
 	}
 }
 
-
-// ========== Update Messages ============
-erpnext.update_messages = function(reset) {
-	// Updates Team Messages
-	
-	if(inList(['Guest'], user) || !wn.session_alive) { return; }
-
-	if(!reset) {
-		var set_messages = function(r) {
-			if(!r.exc) {
-				// This function is defined in toolbar.js
-				erpnext.toolbar.set_new_comments(r.message.unread_messages);
-				
-				var show_in_circle = function(parent_id, msg) {
-					var parent = $('#'+parent_id);
-					if(parent) {
-						if(msg) {
-							parent.find('span:first').text(msg);
-							parent.toggle(true);
-						} else {
-							parent.toggle(false);
-						}
-					}
-				}
-				
-				show_in_circle('unread_messages', r.message.unread_messages);
-				show_in_circle('open_support_tickets', r.message.open_support_tickets);
-				show_in_circle('things_todo', r.message.things_todo);
-				show_in_circle('todays_events', r.message.todays_events);
-				show_in_circle('open_tasks', r.message.open_tasks);
-				show_in_circle('unanswered_questions', r.message.unanswered_questions);
-				show_in_circle('open_leads', r.message.open_leads);
-
-			} else {
-				clearInterval(wn.updates.id);
-			}
-		}
-
-		wn.call({
-			method: 'startup.startup.get_global_status_messages',
-			type:"GET",
-			callback: set_messages
-		});
-	
-	} else {
-		erpnext.toolbar.set_new_comments(0);
-		$('#unread_messages').toggle(false);
-	}
-}
-
-erpnext.startup.set_periodic_updates = function() {
-	// Set interval for periodic updates of team messages
-	wn.updates = {};
-
-	if(wn.updates.id) {
-		clearInterval(wn.updates.id);
-	}
-
-	wn.updates.id = setInterval(erpnext.update_messages, 60000);
-}
-
 erpnext.hide_naming_series = function() {
 	if(cur_frm.fields_dict.naming_series) {
 		cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);

public/js/toolbar.js

@@ -30,15 +30,11 @@ erpnext.toolbar.setup = function() {
 	$user.append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
 		'+wn._('Live Chat')+'</a></li>')
 	
-
-	$('.navbar .pull-right').append('\
-		<li><a href="#!messages" title="'+wn._('Unread Messages')
-			+'"><span class="navbar-new-comments"></span></a></li>');
-
 	erpnext.toolbar.set_new_comments();
 }
 
 erpnext.toolbar.set_new_comments = function(new_comments) {
+	return;
 	var navbar_nc = $('.navbar-new-comments');
 	if(cint(new_comments)) {
 		navbar_nc.addClass('navbar-new-comments-true')