diff --git a/config.json b/config.json index ffc6d2cc13..cee89611ae 100644 --- a/config.json +++ b/config.json @@ -1,12 +1,5 @@ { "modules": { - "Activity": { - "type": "page", - "link": "activity", - "color": "#633501", - "icon": "icon-play", - "label": "Activity" - }, "To Do": { "type": "page", "link": "todo", @@ -28,5 +21,29 @@ "label": "Messages", "icon": "icon-comments" } + }, + "web": { + "pages": { + "404": { + "template": "lib/templates/pages/404" + }, + "error": { + "no_cache": true, + "template": "lib/templates/pages/error" + }, + "login": { + "template": "lib/templates/pages/login" + }, + "message": { + "no_cache": true, + "template": "lib/templates/pages/message" + }, + "print": { + "no_cache": true, + "template": "lib/templates/pages/print", + "args_method": "core.doctype.print_format.print_format.get_args" + } + }, + "generators": {} } } \ No newline at end of file diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000000..cfba1a5ca0 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,25 @@ + + + + + + {{ title }} + + + + + + + + + {% if description -%} + + {%- endif %} + {% block header -%} + {%- endblock %} + + + {% block body %} + {% endblock %} + + \ No newline at end of file diff --git a/templates/css/login.css b/templates/css/login.css new file mode 100644 index 0000000000..4120807022 --- /dev/null +++ b/templates/css/login.css @@ -0,0 +1,43 @@ + \ No newline at end of file diff --git a/templates/js/login.js b/templates/js/login.js new file mode 100644 index 0000000000..06ea4c5242 --- /dev/null +++ b/templates/js/login.js @@ -0,0 +1,97 @@ + +var login = {}; + +$(document).ready(function(wrapper) { + $('#login_btn').click(login.do_login) + + $('#password').keypress(function(ev){ + if(ev.which==13 && $('#password').val()) { + $('form').submit(function() { + login.do_login(); + return false; + }); + } + }); + $(document).trigger('login_rendered'); +}) + +// Login +login.do_login = function(){ + var args = {}; + if(window.is_sign_up) { + args.cmd = "core.doctype.profile.profile.sign_up"; + args.email = $("#login_id").val(); + args.full_name = $("#full_name").val(); + + if(!args.email || !valid_email(args.email) || !args.full_name) { + login.set_message("Valid email and name required."); + return false; + } + } else if(window.is_forgot) { + args.cmd = "reset_password"; + args.user = $("#login_id").val(); + + if(!args.user) { + login.set_message("Valid Login Id required."); + return false; + } + + } else { + args.cmd = "login" + args.usr = $("#login_id").val(); + args.pwd = $("#password").val(); + + if(!args.usr || !args.pwd) { + login.set_message("Both login and password required."); + return false; + } + } + + $('#login_btn').attr("disabled", "disabled"); + $("#login-spinner").toggle(true); + $('#login_message').toggle(false); + + $.ajax({ + type: "POST", + url: "server.py", + data: args, + dataType: "json", + success: function(data) { + $("input").val(""); + $("#login-spinner").toggle(false); + $('#login_btn').attr("disabled", false); + if(data.message=="Logged In") { + window.location.href = "app.html"; + } else if(data.message=="No App") { + window.location.href = "index"; + } else { + login.set_message(data.message); + } + } + }) + + return false; +} + +login.sign_up = function() { + $("#login_wrapper h3").html("Sign Up"); + $("#login-label").html("Email Id"); + $("#password-row, #sign-up-wrapper, #login_message").toggle(false); + $("#full-name-row").toggle(true); + $("#login_btn").html("Register"); + $("#forgot-wrapper").html("Login") + window.is_sign_up = true; +} + +login.show_forgot_password = function() { + $("#login_wrapper h3").html("Forgot"); + $("#login-label").html("Email Id"); + $("#password-row, #sign-up-wrapper, #login_message").toggle(false); + $("#login_btn").html("Send Password"); + $("#forgot-wrapper").html("Login") + window.is_forgot = true; +} + +login.set_message = function(message, color) { + $('#login_message').html(message).toggle(true); +} \ No newline at end of file diff --git a/templates/pages/404.html b/templates/pages/404.html new file mode 100644 index 0000000000..3c37a30f38 --- /dev/null +++ b/templates/pages/404.html @@ -0,0 +1,14 @@ +{% extends "app/website/templates/html/outer.html" %} + +{% set title="Not Found" %} + +{% block content %} +
+
+

Page missing or moved

+
+

We are very sorry for this, but the page you are looking for is missing + (this could be because of a typo in the address) or moved.

+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/pages/error.html b/templates/pages/error.html new file mode 100644 index 0000000000..5ebe552bbc --- /dev/null +++ b/templates/pages/error.html @@ -0,0 +1,13 @@ +{% extends "lib/templates/base.html" %} + +{% set title="Error" %} + +{% block body %} +
+
+

Oops, a server error has occured

+
+ 
%(error)s
+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/pages/login.html b/templates/pages/login.html new file mode 100644 index 0000000000..285094b893 --- /dev/null +++ b/templates/pages/login.html @@ -0,0 +1,62 @@ +{% extends "lib/templates/base.html" %} + +{% block header %} + + {% include "lib/templates/css/login.css" %} +{% endblock %} + +{% set title="Login" %} + +{% block body %} +
+
+ +

Login

+
+ + + + + + + + + + + + + + + + + + + + +
+
+

+ Forgot Password

+

+ New user? Sign Up

+
+
+
+ Home | + ERPNext

+ {% if copyright %} +
© {{ copyright }} + {% endif %} +
+ +{% endblock %} \ No newline at end of file diff --git a/templates/pages/message.html b/templates/pages/message.html new file mode 100644 index 0000000000..79b76bc63a --- /dev/null +++ b/templates/pages/message.html @@ -0,0 +1,11 @@ +{% extends "lib/templates/base.html" %} + +{% set title=webnotes.message_title %} + +{% block block %} +
+
+ {{ webnotes.message }} +
+
+{% endblock %} \ No newline at end of file diff --git a/templates/pages/print.html b/templates/pages/print.html new file mode 100644 index 0000000000..b684dfe7ec --- /dev/null +++ b/templates/pages/print.html @@ -0,0 +1,18 @@ + + + + + + Print Format + + + + + {{ body }} + +{%- if comment -%} + +{%- endif -%} + \ No newline at end of file diff --git a/webnotes/__init__.py b/webnotes/__init__.py index 97581e156f..f6badd934c 100644 --- a/webnotes/__init__.py +++ b/webnotes/__init__.py @@ -401,17 +401,24 @@ def repsond_as_web_page(title, html): response['type'] = 'page' response['page_name'] = 'message.html' +_config = None def get_config(): - import webnotes.utils, json + global _config + if not _config: + import webnotes.utils, json - config = _dict({"modules": {}}) - with open(webnotes.utils.get_path("lib", "config.json"), "r") as configf: - framework_config = json.loads(configf.read()) - config.modules.update(framework_config["modules"]) + _config = _dict({"modules": {}, "web": _dict({"pages": {}, "generators": {}})}) + with open(webnotes.utils.get_path("lib", "config.json"), "r") as configf: + framework_config = json.loads(configf.read()) + _config.modules.update(framework_config["modules"]) + _config.web.pages.update(framework_config["web"]["pages"]) + _config.web.generators.update(framework_config["web"]["generators"]) - with open(webnotes.utils.get_path("app", "config.json"), "r") as configf: - app_config = json.loads(configf.read()) - config.modules.update(app_config["modules"]) + with open(webnotes.utils.get_path("app", "config.json"), "r") as configf: + app_config = json.loads(configf.read()) + _config.modules.update(app_config["modules"]) + _config.web.pages.update(app_config["web"]["pages"]) + _config.web.generators.update(app_config["web"]["generators"]) - return config + return _config \ No newline at end of file diff --git a/webnotes/webutils.py b/webnotes/webutils.py index 1f7a39d4b7..d5094c5008 100644 --- a/webnotes/webutils.py +++ b/webnotes/webutils.py @@ -76,8 +76,8 @@ def update_page_name(doc, title): """set page_name and check if it is unique""" webnotes.conn.set(doc, "page_name", page_name(title)) - if doc.page_name in standard_pages: - webnotes.conn.sql("""Page Name cannot be one of %s""" % ', '.join(standard_pages)) + if doc.page_name in get_standard_pages(): + webnotes.conn.sql("""Page Name cannot be one of %s""" % ', '.join(get_standard_pages())) res = webnotes.conn.sql("""\ select count(*) from `tab%s` @@ -103,26 +103,35 @@ def build_html(args): args["len"] = len - jenv = Environment(loader = FileSystemLoader(get_templates_path())) - html = jenv.get_template(args['template']).render(args) + jenv = Environment(loader = FileSystemLoader(webnotes.utils.get_base_path())) + template_name = args['template'] + if not template_name.endswith(".html"): + template_name = template_name + ".html" + html = jenv.get_template(template_name).render(args) return html +def get_standard_pages(): + return webnotes.get_config()["web"]["pages"].keys() + def prepare_args(page_name): if page_name == 'index': page_name = get_home_page() - if page_name in standard_pages: + pages = get_page_settings() + + if page_name in pages: + page_info = pages[page_name] args = webnotes._dict({ - 'template': 'pages/%s.html' % page_name, + 'template': page_info["template"], 'name': page_name, }) - if page_name in page_settings_map: - target = page_settings_map[page_name] - if "." in target: - args.update(webnotes.get_method(target)()) - else: - args.obj = webnotes.bean(page_settings_map[page_name]).obj + + # additional args + if "args_method" in page_info: + args.update(webnotes.get_method(page_info["args_method"])()) + elif "args_doctype" in page_info: + args.obj = webnotes.bean(page_info["args_doctype"]).obj else: args = get_doc_fields(page_name) @@ -145,7 +154,7 @@ def get_doc_fields(page_name): obj.prepare_template_args() args = obj.doc.fields - args['template'] = page_map[doc_type].template + args['template'] = get_generators()[doc_type]["template"] args['obj'] = obj args['int'] = int @@ -153,10 +162,10 @@ def get_doc_fields(page_name): def get_source_doc(page_name): """get source doc for the given page name""" - for doctype in page_map: + for doctype in get_generators(): name = webnotes.conn.sql("""select name from `tab%s` where page_name=%s and ifnull(%s, 0)=1""" % (doctype, "%s", - page_map[doctype].condition_field), page_name) + get_generators()[doctype]["condition_field"]), page_name) if name: return doctype, name[0][0] @@ -171,9 +180,8 @@ def clear_cache(page_name=None): cache.delete_value("page:" + p) def get_all_pages(): - all_pages = standard_pages - all_pages += page_settings_map.keys() - for doctype in page_map: + all_pages = get_standard_pages() + for doctype in get_generators(): all_pages += [p[0] for p in webnotes.conn.sql("""select distinct page_name from `tab%s`""" % doctype) if p[0]] @@ -208,4 +216,14 @@ def get_hex_shade(color, percent): percent = percent * 2 return p(r) + p(g) + p(b) + +def get_standard_pages(): + return webnotes.get_config()["web"]["pages"].keys() +def get_generators(): + return webnotes.get_config()["web"]["generators"] + +def get_page_settings(): + return webnotes.get_config()["web"]["pages"] + +