anoopmb
/
frappe
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

renamed app to desk

version-14
Rushabh Mehta 11 years ago
parent
329763a2e8
commit
b18ab9c7df
9 changed files with 8 additions and 8 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      frappe/public/build.json
  2. +0
    -0
      frappe/public/css/desk.css
  3. +0
    -0
      frappe/public/js/frappe/desk.js
  4. +1
    -1
      frappe/public/js/legacy/dom.js
  5. +1
    -1
      frappe/public/js/legacy/print_format.js
  6. +1
    -1
      frappe/templates/includes/login.js
  7. +1
    -1
      frappe/templates/pages/desk.html
  8. +1
    -1
      frappe/templates/pages/desk.py
  9. +1
    -1
      frappe/utils/__init__.py

+ 2
- 2
frappe/public/build.json View File

@@ -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",


frappe/public/css/app.css → frappe/public/css/desk.css View File


frappe/public/js/frappe/app.js → frappe/public/js/frappe/desk.js View File


+ 1
- 1
frappe/public/js/legacy/dom.js View File

@@ -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
}


+ 1
- 1
frappe/public/js/legacy/print_format.js View File

@@ -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) || []);


+ 1
- 1
frappe/templates/includes/login.js View File

@@ -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";


frappe/templates/pages/app.html → frappe/templates/pages/desk.html View File

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<head>
<meta charset="utf-8">
<title>Application</title>
<title>Frappe Desk</title>
<meta name="author" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">

frappe/templates/pages/app.py → frappe/templates/pages/desk.py View File

@@ -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


+ 1
- 1
frappe/utils/__init__.py View File

@@ -839,7 +839,7 @@ def get_url_to_form(doctype, name, base_url=None, label=None):
if not label: label = name
return """<a href="%(base_url)s/app.html#!Form/%(doctype)s/%(name)s">%(label)s</a>""" % locals()
return """<a href="%(base_url)s/desk#!Form/%(doctype)s/%(name)s">%(label)s</a>""" % locals()
def encode_dict(d, encoding="utf-8"):
for key in d:


Write Preview
Loading…
Cancel
Save