diff --git a/frappe/public/build.json b/frappe/public/build.json
index 7647fcbe2e..29134210f3 100644
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -34,7 +34,7 @@
"public/css/bootstrap.css",
"public/css/bootstrap-responsive.css",
"public/css/font-awesome.css",
- "public/css/app.css",
+ "public/css/desk.css",
"public/css/appframe.css",
"public/css/app_icon.css",
"public/css/avatar.css",
@@ -62,7 +62,7 @@
"public/js/frappe/ui/listing.js",
"public/js/frappe/request.js",
"public/js/frappe/router.js",
- "public/js/frappe/app.js",
+ "public/js/frappe/desk.js",
"public/js/frappe/defaults.js",
"public/js/legacy/globals.js",
diff --git a/frappe/public/css/app.css b/frappe/public/css/desk.css
similarity index 100%
rename from frappe/public/css/app.css
rename to frappe/public/css/desk.css
diff --git a/frappe/public/js/frappe/app.js b/frappe/public/js/frappe/desk.js
similarity index 100%
rename from frappe/public/js/frappe/app.js
rename to frappe/public/js/frappe/desk.js
diff --git a/frappe/public/js/legacy/dom.js b/frappe/public/js/legacy/dom.js
index b7799f2c67..dfda1c879c 100644
--- a/frappe/public/js/legacy/dom.js
+++ b/frappe/public/js/legacy/dom.js
@@ -318,7 +318,7 @@ frappe.urllib = {
// returns the base url with http + domain + path (-index.cgi or # or ?)
get_base_url: function() {
- var url= window.location.href.split('#')[0].split('?')[0].split('app.html')[0];
+ var url= window.location.href.split('#')[0].split('?')[0].split('desk')[0];
if(url.substr(url.length-1, 1)=='/') url = url.substr(0, url.length-1)
return url
}
diff --git a/frappe/public/js/legacy/print_format.js b/frappe/public/js/legacy/print_format.js
index 24b1eb1cda..6fc9a40174 100644
--- a/frappe/public/js/legacy/print_format.js
+++ b/frappe/public/js/legacy/print_format.js
@@ -365,7 +365,7 @@ $.extend(_p, {
// replace relative links by absolute links
- var prefix = window.location.href.split("app.html")[0]
+ var prefix = window.location.href.split("desk")[0]
// find unique matches
var matches = $.unique(finished.match(/src=['"]([^'"]*)['"]/g) || []);
diff --git a/frappe/templates/includes/login.js b/frappe/templates/includes/login.js
index 2d6d5b0246..0700b884e2 100644
--- a/frappe/templates/includes/login.js
+++ b/frappe/templates/includes/login.js
@@ -88,7 +88,7 @@ login.call = function(args) {
login.login_handlers = {
200: function(data) {
if(data.message=="Logged In") {
- window.location.href = "app";
+ window.location.href = "desk";
} else if(data.message=="No App") {
if(localStorage) {
var last_visited = localStorage.getItem("last_visited") || "/index";
diff --git a/frappe/templates/pages/app.html b/frappe/templates/pages/desk.html
similarity index 96%
rename from frappe/templates/pages/app.html
rename to frappe/templates/pages/desk.html
index b2b6863a02..1b390a9850 100644
--- a/frappe/templates/pages/app.html
+++ b/frappe/templates/pages/desk.html
@@ -1,7 +1,7 @@
- Application
+ Frappe Desk
diff --git a/frappe/templates/pages/app.py b/frappe/templates/pages/desk.py
similarity index 89%
rename from frappe/templates/pages/app.py
rename to frappe/templates/pages/desk.py
index f406096e89..b596b7e8b1 100644
--- a/frappe/templates/pages/app.py
+++ b/frappe/templates/pages/desk.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
no_sitemap = 1
-base_template_path = "templates/pages/app.html"
+base_template_path = "templates/pages/desk.html"
import frappe, os
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index da5006d67f..69a09d6cbf 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -839,7 +839,7 @@ def get_url_to_form(doctype, name, base_url=None, label=None):
if not label: label = name
- return """%(label)s""" % locals()
+ return """%(label)s""" % locals()
def encode_dict(d, encoding="utf-8"):
for key in d: