[notifications] added to title and new favicon

frappe/core/page/desktop/desktop.js

@@ -18,7 +18,7 @@ $.extend(frappe.desktop, {
 
 	render: function() {
 		var me = this;
-		document.title = "Desktop";
+		frappe.utils.set_title("Desktop");
 
 		this.wrapper.html(frappe.render_template("desktop_icon_grid", {
 			// all visible icons

frappe/desk/page/messages/messages.js

@@ -19,6 +19,11 @@ frappe.pages.messages.on_page_load = function(parent) {
 	frappe.desk.pages.messages = new frappe.desk.pages.Messages(parent);
 }
 
+frappe.pages.messages.on_page_show = function() {
+	// clear title prefix
+	frappe.utils.set_title_prefix("");
+}
+
 frappe.desk.pages.Messages = Class.extend({
 	init: function(wrapper, page) {
 		this.wrapper = wrapper;

frappe/public/js/frappe/desk.js

@@ -109,13 +109,13 @@ frappe.Application = Class.extend({
 						me.update_notification_count_in_modules();
 
 						if(frappe.get_route()[0] != "messages") {
-							$.each(r.message.new_messages, function(i, m) {
-						        if (Notify.needsPermission) {
-						            Notify.requestPermission(function() { me.browser_notify(m); });
-						        } else {
-									me.browser_notify(m);
-						        }
-							});
+							if(r.message.new_messages.length) {
+								$.each(r.message.new_messages, function(i, m) {
+									frappe.utils.notify(__("Message from {0}", [m.comment_by_fullname]),
+										m.comment);
+								});
+								frappe.utils.set_title_prefix("(" + r.message.new_messages.length + ")");
+							}
 						}
 					}
 				},
@@ -124,14 +124,8 @@ frappe.Application = Class.extend({
 		}
 	},
 
-	browser_notify: function(m) {
-		var notify = new Notify(__("Message from {0}", [m.comment_by_fullname]), {
-		    body: m.comment,
-		    notifyClick: function() {
-		    	frappe.set_route("messages");
-		    }
-		});
-		notify.show();
+	set_unread_messages: function() {
+
 	},
 
 	update_notification_count_in_modules: function() {

frappe/public/js/frappe/form/toolbar.js

@@ -44,7 +44,7 @@ frappe.ui.form.Toolbar = Class.extend({
 		var me = this;
 		this.page.set_title(title);
 		if(this.frm.meta.title_field) {
-			document.title = title + " - " + this.frm.docname;
+			frappe.utils.set_title(title + " - " + this.frm.docname);
 		}
 		this.set_indicator();
 	},

frappe/public/js/frappe/misc/utils.js

@@ -448,4 +448,42 @@ frappe.utils = {
 	warn_page_name_change: function(frm) {
 		frappe.msgprint("Note: Changing the Page Name will break previous URL to this page.");
 	},
+
+	if_notify_permitted: function(callback) {
+		if (Notify.needsPermission) {
+			Notify.requestPermission(callback);
+		} else {
+			callback();
+		}
+	},
+
+	notify: function(subject, body, route, onclick) {
+		if(!route) route = "messages";
+		if(!onclick) onclick = function() {
+			frappe.set_route(route);
+		}
+
+		frappe.utils.if_notify_permitted(function() {
+			var notify = new Notify(subject, {
+			    body: body,
+			    notifyClick: onclick
+			});
+			notify.show();
+		});
+	},
+
+	set_title: function(title) {
+		frappe._original_title = title;
+		if(frappe._title_prefix) {
+			title = frappe._title_prefix + " " + title;
+		}
+		document.title = title;
+	},
+
+	set_title_prefix: function(prefix) {
+		frappe._title_prefix = prefix;
+
+		// reset the original title
+		frappe.utils.set_title(frappe._original_title);
+	}
 };

frappe/public/js/frappe/router.js

@@ -47,7 +47,7 @@ frappe.route = function() {
 	}
 
 	if(frappe.route_titles[window.location.hash]) {
-		document.title = frappe.route_titles[window.location.hash];
+		frappe.utils.set_title(frappe.route_titles[window.location.hash]);
 	}
 }
 
@@ -117,7 +117,7 @@ frappe._cur_route = null;
 
 $(window).on('hashchange', function() {
 	// save the title
-	frappe.route_titles[frappe._cur_route] = document.title;
+	frappe.route_titles[frappe._cur_route] = frappe._original_title || document.title;
 
 	if(window.location.hash==frappe._cur_route)
 		return;

frappe/public/js/frappe/ui/listing.js

@@ -173,7 +173,7 @@ frappe.ui.Listing = Class.extend({
 		return frappe.call({
 			method: this.opts.method || 'frappe.desk.query_builder.runquery',
 			type: "GET",
-			freeze: this.opts.freeze || true,
+			freeze: (this.opts.freeze != undefined ? this.opts.freeze : true),
 			args: this.get_call_args(),
 			callback: function(r) {
 				if(!me.opts.no_loading)

frappe/public/js/frappe/ui/page.js

@@ -239,7 +239,7 @@ frappe.ui.Page = Class.extend({
 	set_title: function(txt, icon) {
 		// strip icon
 		this.title = txt;
-		document.title = txt.replace(/<[^>]*>/g, "");
+		frappe.utils.set_title(txt.replace(/<[^>]*>/g, ""));
 		if(icon) {
 			txt = '<span class="'+ icon +' text-muted" style="font-size: inherit;"></span> ' + txt;
 		}

frappe/public/js/legacy/dom.js

@@ -42,9 +42,6 @@ function add_sel_options(s, list, sel_val, o_style) {
 }
 
 var $n = '\n';
-function set_title(t) {
-	document.title = (frappe.title_prefix ? (frappe.title_prefix + ' - ') : '') + t;
-}
 
 function $a(parent, newtag, className, cs, innerHTML, onclick) {
 	if(parent && parent.substr)parent = $i(parent);

frappe/public/js/legacy/form.js

@@ -302,7 +302,7 @@ _f.Frm.prototype.refresh_header = function() {
 	// set title
 	// main title
 	if(!this.meta.in_dialog || this.in_form) {
-		set_title(this.meta.issingle ? this.doctype : this.docname);
+		frappe.utils.set_title(this.meta.issingle ? this.doctype : this.docname);
 	}
 
 	if(frappe.ui.toolbar.recent)

frappe/templates/base.html

@@ -11,10 +11,10 @@
 
     {% block favicon %}
 	<link rel="shortcut icon"
-		href="{{ (favicon or "/assets/frappe/images/favicon.ico") | with_leading_slash }}"
+		href="{{ (favicon or "/assets/frappe/images/favicon.png") | with_leading_slash }}"
 		type="image/x-icon">
 	<link rel="icon"
-		href="{{ (favicon or "/assets/frappe/images/favicon.ico") | with_leading_slash }}"
+		href="{{ (favicon or "/assets/frappe/images/favicon.png") | with_leading_slash }}"
 		type="image/x-icon">
     {% endblock %}
 	{%- block head -%}

frappe/templates/pages/desk.html

@@ -11,9 +11,9 @@
 	<meta name="mobile-web-app-capable" content="yes">
 	<title>Frappe Desk</title>
 	<link rel="shortcut icon"
-		href="{{ favicon or "/assets/frappe/images/favicon.ico" }}" type="image/x-icon">
+		href="{{ favicon or "/assets/frappe/images/favicon.png" }}" type="image/x-icon">
 	<link rel="icon"
-		href="{{ favicon or "/assets/frappe/images/favicon.ico" }}" type="image/x-icon">
+		href="{{ favicon or "/assets/frappe/images/favicon.png" }}" type="image/x-icon">
 	{% for include in include_css -%}
 	<link type="text/css" rel="stylesheet" href="{{ include }}">
 	{%- endfor -%}

frappe/website/doctype/website_settings/website_settings.py

@@ -98,9 +98,6 @@ def get_website_settings():
 		if hasattr(settings, k):
 			context[k] = settings.get(k)
 
-	if not context.get("favicon"):
-		context["favicon"] = "/assets/frappe/images/favicon.ico"
-
 	if settings.address:
 		context["footer_address"] = settings.address
 
@@ -125,8 +122,12 @@ def get_website_settings():
 	via_hooks = frappe.get_hooks("website_context")
 	for key in via_hooks:
 		context[key] = via_hooks[key]
-		if key not in ("top_bar_items", "footer_items", "post_login") and isinstance(context[key], (list, tuple)):
+		if key not in ("top_bar_items", "footer_items", "post_login") \
+			and isinstance(context[key], (list, tuple)):
 			context[key] = context[key][0]
 
+	if not context.get("favicon"):
+		context["favicon"] = "/assets/frappe/images/favicon.png"
+
 	return context