diff --git a/frappe/__init__.py b/frappe/__init__.py index 43e6edf02b..5010baec61 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.15" +__version__ = "7.0.16" local = Local() @@ -1133,7 +1133,7 @@ def format_value(value, df, doc=None, currency=None): import frappe.utils.formatters return frappe.utils.formatters.format_value(value, df, doc, currency=currency) -def get_print(doctype, name, print_format=None, style=None, html=None, as_pdf=False, doc=None): +def get_print(doctype=None, name=None, print_format=None, style=None, html=None, as_pdf=False, doc=None): """Get Print Format for given document. :param doctype: DocType of document. diff --git a/frappe/commands/site.py b/frappe/commands/site.py index a961872192..ae00f521a5 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -20,12 +20,9 @@ from frappe.utils import touch_file, get_site_path @click.option('--install-app', multiple=True, help='Install app after installation') def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin_password=None, verbose=False, install_apps=None, source_sql=None, force=None, install_app=None, db_name=None): "Create a new site" - if not db_name: - db_name = hashlib.sha1(site).hexdigest()[:10] - frappe.init(site=site, new_site=True) - _new_site(db_name, site, mariadb_root_username=mariadb_root_username, mariadb_root_password=mariadb_root_password, admin_password=admin_password, + _new_site(None, site, mariadb_root_username=mariadb_root_username, mariadb_root_password=mariadb_root_password, admin_password=admin_password, verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force) if len(frappe.utils.get_sites()) == 1: @@ -35,6 +32,9 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N verbose=False, install_apps=None, source_sql=None,force=False, reinstall=False): """Install a new Frappe site""" + if not db_name: + db_name = hashlib.sha1(site).hexdigest()[:16] + from frappe.installer import install_db, make_site_dirs from frappe.installer import install_app as _install_app import frappe.utils.scheduler @@ -95,8 +95,10 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas site = get_site(context) frappe.init(site=site) - db_name = db_name or frappe.conf.db_name or hashlib.sha1(site).hexdigest()[:10] - _new_site(db_name, site, mariadb_root_username=mariadb_root_username, mariadb_root_password=mariadb_root_password, admin_password=admin_password, verbose=context.verbose, install_apps=install_app, source_sql=sql_file_path, force=context.force) + _new_site(frappe.conf.db_name, site, mariadb_root_username=mariadb_root_username, + mariadb_root_password=mariadb_root_password, admin_password=admin_password, + verbose=context.verbose, install_apps=install_app, source_sql=sql_file_path, + force=context.force) # Extract public and/or private files to the restored site, if user has given the path if with_public_files: @@ -131,7 +133,8 @@ def reinstall(context, yes=False): frappe.destroy() frappe.init(site=site) - _new_site(frappe.conf.db_name, site, verbose=context.verbose, force=True, reinstall=True, install_apps=installed) + _new_site(frappe.conf.db_name, site, verbose=context.verbose, force=True, reinstall=True, + install_apps=installed) @click.command('install-app') @click.argument('app') @@ -303,7 +306,7 @@ def uninstall(context, app, dry_run=False): @click.option('--archived-sites-path') def drop_site(site, root_login='root', root_password=None, archived_sites_path=None): "Remove site from database and filesystem" - from frappe.installer import get_current_host, make_connection + from frappe.installer import get_root_connection from frappe.model.db_schema import DbManager from frappe.utils.backups import scheduled_backup @@ -312,9 +315,9 @@ def drop_site(site, root_login='root', root_password=None, archived_sites_path=N scheduled_backup(ignore_files=False, force=True) db_name = frappe.local.conf.db_name - frappe.local.db = make_connection(root_login, root_password) + frappe.local.db = get_root_connection(root_login, root_password) dbman = DbManager(frappe.local.db) - dbman.delete_user(db_name, get_current_host()) + dbman.delete_user(db_name) dbman.drop_database(db_name) if not archived_sites_path: diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index 1e43780b2f..74267674cb 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -108,7 +108,8 @@ class Communication(Document): self.sender_full_name = self.sender self.sender = None else: - validate_email_add(self.sender, throw=True) + if self.sent_or_received=='Sent': + validate_email_add(self.sender, throw=True) sender_name, sender_email = parseaddr(self.sender) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 01fbb03e09..48763253eb 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -39,6 +39,8 @@ class User(Document): fields=['module_name'], filters={'standard': 1})]) def validate(self): + self.check_demo() + self.in_insert = self.get("__islocal") # clear new password @@ -61,6 +63,10 @@ class User(Document): if self.language == "Loading...": self.language = None + def check_demo(self): + if frappe.session.user == 'demo@erpnext.com': + frappe.throw('Cannot change user details in demo. Please signup for a new account at https://erpnext.com', title='Not Allowed') + def set_full_name(self): self.full_name = " ".join(filter(None, [self.first_name, self.last_name])) diff --git a/frappe/custom/doctype/custom_script/custom_script.py b/frappe/custom/doctype/custom_script/custom_script.py index e9d59ed46b..d3f5c100c6 100644 --- a/frappe/custom/doctype/custom_script/custom_script.py +++ b/frappe/custom/doctype/custom_script/custom_script.py @@ -1,19 +1,19 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt +# MIT License. See license.txt from __future__ import unicode_literals import frappe -from frappe.utils import cstr from frappe.model.document import Document class CustomScript(Document): - def autoname(self): + if not self.script_type: + self.script_type = 'Client' self.name = self.dt + "-" + self.script_type def on_update(self): frappe.clear_cache(doctype=self.dt) - + def on_trash(self): frappe.clear_cache(doctype=self.dt) diff --git a/frappe/email/doctype/newsletter/newsletter.js b/frappe/email/doctype/newsletter/newsletter.js index f401f02a69..2839b9a8ea 100644 --- a/frappe/email/doctype/newsletter/newsletter.js +++ b/frappe/email/doctype/newsletter/newsletter.js @@ -1,19 +1,8 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -cur_frm.cscript.onload = function(doc) { - return frappe.call({ - method: "frappe.email.doctype.newsletter.newsletter.get_lead_options", - type: "GET", - callback: function(r) { - set_field_options("lead_source", r.message.sources.join("\n")) - set_field_options("lead_status", r.message.statuses.join("\n")) - } - }); -} - cur_frm.cscript.refresh = function(doc) { - erpnext.toggle_naming_series(); + if(window.erpnext) erpnext.toggle_naming_series(); if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved && inList(frappe.boot.user.can_write, doc.doctype)) { cur_frm.add_custom_button(__('Send'), function() { diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json index e77e978046..7b96fee6d7 100644 --- a/frappe/email/doctype/newsletter/newsletter.json +++ b/frappe/email/doctype/newsletter/newsletter.json @@ -10,6 +10,7 @@ "docstatus": 0, "doctype": "DocType", "document_type": "Other", + "editable_grid": 0, "fields": [ { "allow_on_submit": 0, @@ -246,7 +247,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-06-28 17:20:07.227578", + "modified": "2016-08-05 06:26:58.705579", "modified_by": "Administrator", "module": "Email", "name": "Newsletter", @@ -254,27 +255,7 @@ "permissions": [ { "amend": 0, - "apply_user_permissions": 1, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "All", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - }, - { - "amend": 0, - "apply_user_permissions": 1, + "apply_user_permissions": 0, "cancel": 0, "create": 0, "delete": 1, @@ -287,13 +268,13 @@ "read": 1, "report": 1, "role": "Newsletter Manager", - "set_user_permissions": 0, + "set_user_permissions": 1, "share": 1, "submit": 0, - "write": 0 + "write": 1 } ], - "quick_entry": 1, + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "sort_order": "ASC", diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index f8973aeb48..ab0eb636b6 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -78,15 +78,6 @@ class Newsletter(Document): throw(_("Please save the Newsletter before sending")) check_email_limit(self.recipients) -@frappe.whitelist() -def get_lead_options(): - return { - "sources": ["All"] + filter(None, - frappe.db.sql_list("""select distinct source from tabLead""")), - "statuses": ["All"] + filter(None, - frappe.db.sql_list("""select distinct status from tabLead""")) - } - @frappe.whitelist(allow_guest=True) def unsubscribe(email, name): diff --git a/frappe/hooks.py b/frappe/hooks.py index 717af665c2..7f8f1ecaa0 100755 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -44,7 +44,6 @@ web_include_js = [ bootstrap = "assets/frappe/css/bootstrap.css" web_include_css = [ - "assets/frappe/css/font/open-sans/open-sans.css", "assets/css/frappe-web.css" ] website_route_rules = [ @@ -99,7 +98,7 @@ doc_events = { "after_insert": "frappe.email.doctype.email_alert.email_alert.trigger_email_alerts", "validate": [ "frappe.email.doctype.email_alert.email_alert.trigger_email_alerts", - ], + ], "on_update": [ "frappe.desk.notifications.clear_doctype_notifications", "frappe.email.doctype.email_alert.email_alert.trigger_email_alerts", diff --git a/frappe/installer.py b/frappe/installer.py index d818ef3c7c..7e5ce9d870 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -28,7 +28,7 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N dbman.create_database(db_name) else: - frappe.local.db = make_connection(root_login, root_password) + frappe.local.db = get_root_connection(root_login, root_password) frappe.local.session = frappe._dict({'user':'Administrator'}) create_database_and_user(force, verbose) @@ -44,25 +44,23 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N frappe.flags.in_install_db = False -def get_current_host(): - return frappe.db.sql("select user()")[0][0].split('@')[1] def create_database_and_user(force, verbose): db_name = frappe.local.conf.db_name dbman = DbManager(frappe.local.db) if force or (db_name not in dbman.get_database_list()): - dbman.delete_user(db_name, get_current_host()) + dbman.delete_user(db_name) dbman.drop_database(db_name) else: raise Exception("Database %s already exists" % (db_name,)) - dbman.create_user(db_name, frappe.conf.db_password, get_current_host()) + dbman.create_user(db_name, frappe.conf.db_password) if verbose: print "Created user %s" % db_name dbman.create_database(db_name) if verbose: print "Created database %s" % db_name - dbman.grant_all_privileges(db_name, db_name, get_current_host()) + dbman.grant_all_privileges(db_name, db_name) dbman.flush_privileges() if verbose: print "Granted privileges to user %s and database %s" % (db_name, db_name) @@ -85,14 +83,17 @@ def import_db_from_sql(source_sql, verbose): DbManager(frappe.local.db).restore_database(db_name, source_sql, db_name, frappe.conf.db_password) if verbose: print "Imported from database %s" % source_sql -def make_connection(root_login, root_password): - if root_login: - if not root_password: - root_password = frappe.conf.get("root_password") or None +def get_root_connection(root_login='root', root_password=None): + if not frappe.local.flags.root_connection: + if root_login: + if not root_password: + root_password = frappe.conf.get("root_password") or None - if not root_password: - root_password = getpass.getpass("MySQL root password: ") - return frappe.database.Database(user=root_login, password=root_password) + if not root_password: + root_password = getpass.getpass("MySQL root password: ") + frappe.local.flags.root_connection = frappe.database.Database(user=root_login, password=root_password) + + return frappe.local.flags.root_connection def install_app(name, verbose=False, set_as_patched=True): frappe.clear_cache() @@ -188,7 +189,7 @@ def remove_app(app_name, dry_run=False): if not doctype.issingle: drop_doctypes.append(doctype.name) - + # remove reports for report in frappe.get_list("Report", filters={"module": module_name}): print "removing {0}...".format(report.name) diff --git a/frappe/model/db_schema.py b/frappe/model/db_schema.py index 62f0643904..aa4d4cd04a 100644 --- a/frappe/model/db_schema.py +++ b/frappe/model/db_schema.py @@ -459,6 +459,8 @@ class DbManager: if db: self.db = db + def get_current_host(self): + return self.db.sql("select user()")[0][0].split('@')[1] def get_variables(self,regex): """ @@ -480,8 +482,11 @@ class DbManager: return [t[0] for t in self.db.sql("SHOW TABLES")] - def create_user(self, user, password, host): + def create_user(self, user, password, host=None): #Create user if it doesn't exist. + if not host: + host = self.get_current_host() + try: if password: self.db.sql("CREATE USER '%s'@'%s' IDENTIFIED BY '%s';" % (user[:16], host, password)) @@ -490,8 +495,9 @@ class DbManager: except Exception: raise - def delete_user(self, target, host): - # delete user if exists + def delete_user(self, target, host=None): + if not host: + host = self.get_current_host() try: self.db.sql("DROP USER '%s'@'%s';" % (target, host)) except Exception, e: @@ -504,15 +510,21 @@ class DbManager: if target in self.get_database_list(): self.drop_database(target) - self.db.sql("CREATE DATABASE IF NOT EXISTS `%s` ;" % target) + self.db.sql("CREATE DATABASE `%s` ;" % target) def drop_database(self,target): self.db.sql("DROP DATABASE IF EXISTS `%s`;"%target) - def grant_all_privileges(self, target, user, host): + def grant_all_privileges(self, target, user, host=None): + if not host: + host = self.get_current_host() + self.db.sql("GRANT ALL PRIVILEGES ON `%s`.* TO '%s'@'%s';" % (target, user, host)) - def grant_select_privilges(self, db, table, user, host): + def grant_select_privilges(self, db, table, user, host=None): + if not host: + host = self.get_current_host() + if table: self.db.sql("GRANT SELECT ON %s.%s to '%s'@'%s';" % (db, table, user, host)) else: diff --git a/frappe/public/js/frappe/form/templates/form_links.html b/frappe/public/js/frappe/form/templates/form_links.html index f237359d9d..b90aef4c2c 100644 --- a/frappe/public/js/frappe/form/templates/form_links.html +++ b/frappe/public/js/frappe/form/templates/form_links.html @@ -1,4 +1,5 @@
+
Related Documents
{% for (var i=0; i < transactions.length; i++) { %} {% if((i % 2)===0) { %}
{% } %}
diff --git a/frappe/templates/includes/navbar/navbar_link.html b/frappe/templates/includes/navbar/navbar_link.html index 6b0384e2af..b4178b5ad0 100644 --- a/frappe/templates/includes/navbar/navbar_link.html +++ b/frappe/templates/includes/navbar/navbar_link.html @@ -1,4 +1,4 @@ -
  • +
  • diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css index 8bf333f600..d09c1e1852 100644 --- a/frappe/templates/styles/standard.css +++ b/frappe/templates/styles/standard.css @@ -45,8 +45,8 @@ } .data-field { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 5px; + margin-bottom: 5px; } .important .value { diff --git a/frappe/tests/test_email.py b/frappe/tests/test_email.py index 8386663164..6616b9b67c 100644 --- a/frappe/tests/test_email.py +++ b/frappe/tests/test_email.py @@ -49,9 +49,9 @@ class TestEmail(unittest.TestCase): def test_expired(self): self.test_email_queue() - frappe.db.sql("update `tabEmail Queue` set creation='2010-01-01 12:00:00'") - from frappe.email.queue import flush - flush(from_test=True) + frappe.db.sql("update `tabEmail Queue` set creation=DATE_SUB(curdate(), interval 8 day)") + from frappe.email.queue import clear_outbox + clear_outbox() email_queue = frappe.db.sql("""select * from `tabEmail Queue` where status='Expired'""", as_dict=1) self.assertEquals(len(email_queue), 2) self.assertTrue('test@example.com' in [d['recipient'] for d in email_queue]) diff --git a/frappe/utils/help.py b/frappe/utils/help.py new file mode 100644 index 0000000000..4f5ff6969c --- /dev/null +++ b/frappe/utils/help.py @@ -0,0 +1,66 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals + +import frappe + +from frappe.model.db_schema import DbManager +from frappe.installer import get_root_connection +from frappe.database import Database +import os + +help_db_name = '_frappe_help' + +def sync(): + # make table + help_db = HelpDatabase() + help_db.make_table() + help_db.sync_pages() + +@frappe.whitelist() +def get_help(text): + return HelpDatabase().search(text) + +class HelpDatabase(object): + def __init__(self): + self.make_database() + self.connect() + + def make_database(self): + dbman = DbManager(get_root_connection()) + + # make database + if not help_db_name in dbman.get_database_list(): + dbman.create_user(help_db_name, help_db_name) + dbman.create_database(help_db_name) + dbman.grant_all_privileges(help_db_name, help_db_name) + dbman.flush_privileges() + + def connect(self): + self.db = Database(user=help_db_name, password=help_db_name) + + def make_table(self): + if not 'help' in self.db.get_tables(): + self.db.sql('''create table help(path text, content text, fulltext(content)) + COLLATE=utf8mb4_unicode_ci + ENGINE=MyISAM + CHARACTER SET=utf8mb4''') + + def search(self, words): + return self.db.sql('select path, content from help where match(content) against (%s) limit 10', words) + + def sync_pages(self): + self.db.sql('truncate help') + for app in os.listdir('../apps'): + docs_folder = '../apps/{app}/{app}/docs/user'.format(app=app) + if os.path.exists(docs_folder): + for basepath, folders, files in os.walk(docs_folder): + for fname in files: + if fname.rsplit('.', 1)[-1] in ('md', 'html'): + fpath = os.path.join(basepath, fname) + with open(fpath, 'r') as f: + #relpath = os.path.relpath(fpath, '../apps/{app}'.format(app=app)) + self.db.sql('''insert into help(path, content) + values (%s, %s)''', (fpath, f.read())) + diff --git a/frappe/website/doctype/website_theme/website_theme.js b/frappe/website/doctype/website_theme/website_theme.js index 8819c5e8c2..f538359431 100644 --- a/frappe/website/doctype/website_theme/website_theme.js +++ b/frappe/website/doctype/website_theme/website_theme.js @@ -18,7 +18,11 @@ frappe.ui.form.on("Website Theme", "onload_post_render", function(frm) { }); frappe.ui.form.on("Website Theme", "refresh", function(frm) { + frm.set_intro(__('Default theme is set in {0}', ['' + + __('Website Settings') + ''])); + frm.toggle_display(["module", "custom"], !frappe.boot.developer_mode); + if (!frm.doc.custom && !frappe.boot.developer_mode) { frm.set_read_only(); frm.disable_save(); diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index f9c4f54799..3d5247fe44 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -3,11 +3,13 @@ "allow_import": 1, "allow_rename": 0, "autoname": "field:theme", + "beta": 0, "creation": "2015-02-18 12:46:38.168929", "custom": 0, "docstatus": 0, "doctype": "DocType", "document_type": "Setup", + "editable_grid": 0, "fields": [ { "allow_on_submit": 0, @@ -66,7 +68,7 @@ "bold": 0, "collapsible": 0, "default": "1", - "description": "This must be checked if the below style settings are applicable", + "description": "", "fieldname": "apply_style", "fieldtype": "Check", "hidden": 0, @@ -142,6 +144,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_style", "description": "Link to your Bootstrap theme", "fieldname": "bootstrap", "fieldtype": "Code", @@ -193,18 +196,16 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "default": "", - "fieldname": "font_size", - "fieldtype": "Select", + "fieldname": "apply_text_styles", + "fieldtype": "Check", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "label": "Font Size", + "label": "Apply Text Styles", "length": 0, "no_copy": 0, - "options": "\n12px\n13px\n14px\n15px\n16px\n17px\n18px", "permlevel": 0, "precision": "", "print_hide": 0, @@ -220,17 +221,19 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"", - "fieldname": "text_webfont", - "fieldtype": "Data", + "default": "", + "depends_on": "apply_text_styles", + "fieldname": "font_size", + "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "label": "Google Font (Text)", + "label": "Font Size", "length": 0, "no_copy": 0, + "options": "\n12px\n13px\n14px\n15px\n16px\n17px\n18px", "permlevel": 0, "precision": "", "print_hide": 0, @@ -246,15 +249,16 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_text_styles", "description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"", - "fieldname": "heading_webfont", + "fieldname": "text_webfont", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "label": "Google Font (Heading)", + "label": "Google Font (Text)", "length": 0, "no_copy": 0, "permlevel": 0, @@ -272,13 +276,16 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "column_break_18", - "fieldtype": "Column Break", + "depends_on": "apply_text_styles", + "description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"", + "fieldname": "heading_webfont", + "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "label": "Google Font (Heading)", "length": 0, "no_copy": 0, "permlevel": 0, @@ -296,6 +303,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_text_styles", "fieldname": "text_color", "fieldtype": "Data", "hidden": 0, @@ -321,6 +329,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_text_styles", "fieldname": "link_color", "fieldtype": "Data", "hidden": 0, @@ -346,17 +355,15 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "heading_style", - "fieldtype": "Select", + "fieldname": "column_break_18", + "fieldtype": "Column Break", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, - "label": "Heading Style", "length": 0, "no_copy": 0, - "options": "\nUPPERCASE\nTitle Case\nlowercase", "permlevel": 0, "precision": "", "print_hide": 0, @@ -372,16 +379,18 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "depends_on": "apply_style", - "fieldname": "section_break_8", - "fieldtype": "Section Break", + "depends_on": "apply_text_styles", + "fieldname": "heading_style", + "fieldtype": "Select", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "label": "Heading Style", "length": 0, "no_copy": 0, + "options": "\nUPPERCASE\nTitle Case\nlowercase", "permlevel": 0, "precision": "", "print_hide": 0, @@ -397,6 +406,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_text_styles", "fieldname": "top_bar_color", "fieldtype": "Data", "hidden": 0, @@ -422,6 +432,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_text_styles", "fieldname": "top_bar_text_color", "fieldtype": "Data", "hidden": 0, @@ -447,55 +458,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, - "fieldname": "no_sidebar", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "label": "Hide Sidebar", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "fieldname": "column_break_11", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_list_view": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, + "depends_on": "apply_text_styles", "fieldname": "footer_color", "fieldtype": "Data", "hidden": 0, @@ -521,6 +484,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_text_styles", "fieldname": "footer_text_color", "fieldtype": "Data", "hidden": 0, @@ -545,7 +509,7 @@ { "allow_on_submit": 0, "bold": 0, - "collapsible": 0, + "collapsible": 1, "depends_on": "apply_style", "fieldname": "section_break_4", "fieldtype": "Section Break", @@ -554,6 +518,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "label": "Background", "length": 0, "no_copy": 0, "permlevel": 0, @@ -698,6 +663,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "depends_on": "apply_style", "fieldname": "js", "fieldtype": "Code", "hidden": 0, @@ -723,13 +689,14 @@ "hide_heading": 0, "hide_toolbar": 0, "idx": 0, + "image_view": 0, "in_create": 0, "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-02-22 09:39:16.920883", + "modified": "2016-08-03 02:16:20.733994", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", @@ -777,10 +744,12 @@ "write": 1 } ], + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "search_fields": "", "sort_field": "modified", "sort_order": "DESC", - "title_field": "" + "title_field": "", + "track_seen": 0 } \ No newline at end of file diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 93fab3a092..23e2bbe32b 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -63,7 +63,6 @@ def use_theme(theme): def add_website_theme(context): bootstrap = frappe.get_hooks("bootstrap")[0] - web_include_css = context.web_include_css context.theme = frappe._dict() if not context.disable_website_theme: @@ -74,9 +73,7 @@ def add_website_theme(context): if website_theme.bootstrap: bootstrap = website_theme.bootstrap - context.no_sidebar = website_theme.no_sidebar - - context.web_include_css = ["website_theme.css"] + context.web_include_css + context.web_include_css = context.web_include_css + ["website_theme.css"] context.web_include_css = [bootstrap] + context.web_include_css diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index c669a27fc8..df486b4c0a 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -377,7 +377,8 @@ $(document).ready(function() { // switch to app link if(getCookie("system_user")==="yes" && logged_in) { $("#website-post-login .dropdown-menu").append('
  • Switch To Desk
    • '); - $(".navbar-header .dropdown .dropdown-menu").append('
  • Switch To Desk
    • '); + $(".navbar-header .dropdown:not(.dropdown-submenu) > .dropdown-menu") + .append('
  • Switch To Desk
    • '); } frappe.render_user(); @@ -389,6 +390,12 @@ $(document).on("page-change", function() { $(document).trigger("apply_permissions"); $('.dropdown-toggle').dropdown(); + //multilevel dropdown fix + $('.dropdown-menu .dropdown-submenu .dropdown-toggle').on('click', function (e) { + e.stopPropagation(); + $(this).parent().parent().parent().addClass('open'); + }) + $.extend(frappe, getCookies()); frappe.session = {'user': frappe.user_id}; diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json index d7eb9ca480..5fe51b7280 100644 --- a/frappe/website/website_theme/standard/standard.json +++ b/frappe/website/website_theme/standard/standard.json @@ -1,5 +1,6 @@ { "apply_style": 0, + "apply_text_styles": 0, "creation": "2015-02-19 13:37:33.925909", "custom": 0, "docstatus": 0, @@ -8,17 +9,16 @@ "footer_color": "", "footer_text_color": "", "heading_style": "", - "heading_webfont": "Open Sans", + "heading_webfont": "", "idx": 17, "link_color": "", - "modified": "2016-04-21 02:34:26.091046", + "modified": "2016-08-03 06:59:24.539564", "modified_by": "Administrator", "module": "Website", "name": "Standard", - "no_sidebar": 0, "owner": "Administrator", "text_color": "", - "text_webfont": "Open Sans", + "text_webfont": "", "theme": "Standard", "top_bar_color": "", "top_bar_text_color": "" diff --git a/frappe/www/print.py b/frappe/www/print.py index bf29ca9ec7..fa4e337c6b 100644 --- a/frappe/www/print.py +++ b/frappe/www/print.py @@ -19,10 +19,10 @@ standard_format = "templates/print_formats/standard.html" def get_context(context): """Build context for print""" - if not frappe.form_dict.doctype or not frappe.form_dict.name: + if not ((frappe.form_dict.doctype and frappe.form_dict.name) or frappe.form_dict.doc): return { "body": """

    Error

    -

    Parameters doctype, name and format required

    +

    Parameters doctype and name required

    %s
    """ % repr(frappe.form_dict) } diff --git a/frappe/www/website_theme.css b/frappe/www/website_theme.css index 0c14356a66..ccf6982950 100644 --- a/frappe/www/website_theme.css +++ b/frappe/www/website_theme.css @@ -1,6 +1,6 @@ -{%- if False and theme and theme.apply_style -%} +{%- if theme and theme.apply_style -%} -{%- set font_family_sans_serif = '"Helvetica Neue", Helvetica, Arial, sans-serif' -%} +{%- set font_family_sans_serif = '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif' -%} {%- set heading_selectors = "h1, h2, h3, h4, h5, h6" -%} {{ theme.webfont_import or "" }} @@ -17,19 +17,22 @@ body { {%- endif %} {# text #} - {% if theme.text_webfont -%} - font-family: "{{ theme.text_webfont }}", {{ font_family_sans_serif }}; + {% if theme.apply_text_styles %} + {% if theme.text_webfont -%} + font-family: "{{ theme.text_webfont }}", {{ font_family_sans_serif }}; - {%- endif %} + {%- endif %} - {% if theme.font_size -%} - font-size: {{ theme.font_size }}; - {%- endif %} + {% if theme.font_size -%} + font-size: {{ theme.font_size }}; + {%- endif %} - color: {{ theme.text_color }}; + color: {{ theme.text_color }}; + {% endif %} } {# links #} +{% if theme.apply_text_styles %} a { color: {{ theme.link_color }}; } @@ -52,6 +55,7 @@ a:active { text-transform: {{ theme.heading_style }}; } {%- endif %} +{% endif %} {% include "frappe/templates/includes/website_theme/navbar.css" %}