From 2dedc9a3de4e0cd39e539b7b5f92a8190151c803 Mon Sep 17 00:00:00 2001 From: Dony Sukardi Date: Tue, 12 Jul 2016 03:16:05 +0800 Subject: [PATCH] Fix for Documentation The following issues are addressed in this commit: - Synchronize CSS with the layout changes in Docs - Hide 'Shopping Cart' on Docs pages - Load Frappe context for Jinja - Fix for 'Improve this page' link - Get title for ToC from .md files - Fix for non-pages child routes --- .../docs/user/fr/guides/portal-development/.md | 5 ----- frappe/public/css/docs.css | 16 ++++++++-------- .../templates/includes/navbar/navbar_items.html | 6 ++++-- frappe/utils/jinja.py | 4 +++- frappe/utils/setup_docs.py | 4 ++-- frappe/website/router.py | 4 +++- frappe/website/utils.py | 2 +- 7 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 frappe/docs/user/fr/guides/portal-development/.md diff --git a/frappe/docs/user/fr/guides/portal-development/.md b/frappe/docs/user/fr/guides/portal-development/.md deleted file mode 100644 index 9136f09c29..0000000000 --- a/frappe/docs/user/fr/guides/portal-development/.md +++ /dev/null @@ -1,5 +0,0 @@ -# Pages - -You can make your website by adding pages to the `/www` folder of your website. The urls of your site will match the path of your pages within the `/www` folder. - -Pages must be `.html` or `.md` (Markdown) files. Basic HTML template is provided in frappe in `frappe/templates/base_template.html` diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index b354818a3e..7a7b55673f 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -305,19 +305,19 @@ img { margin: 0 auto; max-width: 870px; } -.page-container .webpage-content ol > li, -.page-container .webpage-content ul > li { +.page-container .page-content ol > li, +.page-container .page-content ul > li { margin: 13px auto; } -.page-container .webpage-content ol > li li, -.page-container .webpage-content ul > li li { +.page-container .page-content ol > li li, +.page-container .page-content ul > li li { margin: 4px auto; } -.page-container .webpage-content ol li ol { +.page-container .page-content ol li ol { list-style-type: disc; } -.page-container .webpage-content ul, -.page-container .webpage-content ol { +.page-container .page-content ul, +.page-container .page-content ol { margin-bottom: 32px; } @media (min-width: 768px) { @@ -520,7 +520,7 @@ p { margin-top: 24px; font-size: 16px; } -.docs-footer img.frappe-bird { +.docs-footer img.frappe-bird-grey { width: 40px; height: 40px; background: #fff; diff --git a/frappe/templates/includes/navbar/navbar_items.html b/frappe/templates/includes/navbar/navbar_items.html index 77d0525640..1bce855241 100644 --- a/frappe/templates/includes/navbar/navbar_items.html +++ b/frappe/templates/includes/navbar/navbar_items.html @@ -13,6 +13,8 @@ {% include "templates/includes/navbar/navbar_link.html" %} {%- endif -%} {%- endfor %} - {% block navbar_right_extension %}{% endblock %} + {% if not only_static %} + {% block navbar_right_extension %}{% endblock %} + {% endif %} {% include "templates/includes/navbar/navbar_login.html" %} - \ No newline at end of file + diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 3974e7e66e..96cede6491 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -119,9 +119,11 @@ def get_jloader(): from jinja2 import ChoiceLoader, PackageLoader, PrefixLoader apps = frappe.local.flags.web_pages_apps or frappe.get_installed_apps(sort=True) - apps.reverse() + if not "frappe" in apps: + apps.append('frappe') + frappe.local.jloader = ChoiceLoader( # search for something like app/templates/... [PrefixLoader(dict( diff --git a/frappe/utils/setup_docs.py b/frappe/utils/setup_docs.py index 1f1802c76c..a07210af9f 100644 --- a/frappe/utils/setup_docs.py +++ b/frappe/utils/setup_docs.py @@ -348,7 +348,7 @@ class setup_docs(object): source_link = self.docs_config.source_link, app_name = self.app, branch = context.app.branch, - target = target_path_fragment)) + target = context.template)) if not os.path.exists(os.path.dirname(target_filename)): os.makedirs(os.path.dirname(target_filename)) @@ -437,7 +437,7 @@ edit_link = '''
- + Improve this page
diff --git a/frappe/website/router.py b/frappe/website/router.py index 7414f08d3b..b645b00af3 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -238,7 +238,7 @@ def setup_source(page_info): def setup_index(page_info): '''Build page sequence from index.txt''' - if page_info.basename=='index': + if page_info.basename=='': # load index.txt if loading all pages index_txt_path = os.path.join(page_info.basepath, 'index.txt') if os.path.exists(index_txt_path): @@ -284,6 +284,8 @@ def load_properties(page_info): import re if "', page_info.source)[0].strip() + elif "

" in page_info.source: + page_info.title = re.findall('

([^>]*)

', page_info.source)[0].strip() else: page_info.title = os.path.basename(page_info.name).replace('_', ' ').replace('-', ' ').title() diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 2ee6caa198..4cd967350f 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -201,7 +201,7 @@ def get_full_index(route=None, extn = False): new_children = [] for name in page_info.index: child_route = page_info.route + '/' + name - if pages[child_route]: + if child_route in pages: new_children.append(pages[child_route]) # add remaining pages not in index.txt