anoopmb
/
frappe
1
0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

Configurable Website Sidebar in Web Pages (#2530) 

* [wip] website fixes

* [added] Website Sidebar
version-14
Rushabh Mehta il y a 8 ans
committed by GitHub
Parent
b793f40259
révision
d579cea70d
20 fichiers modifiés avec 398 ajouts et 67 suppressions
Vue séparée
Option de Diff
Voir les Statistiques Télécharger le Fichier Patch Télécharger le Fichier des Différences
  1. +4
    -0
      frappe/config/website.py
  2. +2
    -2
      frappe/model/db_query.py
  3. +5
    -4
      frappe/public/css/website.css
  4. +1
    -0
      frappe/public/js/frappe/form/footer/timeline.js
  5. +6
    -4
      frappe/public/less/website.less
  6. +9
    -2
      frappe/templates/base.html
  7. +7
    -7
      frappe/templates/includes/footer/footer.html
  8. +3
    -3
      frappe/templates/includes/footer/footer_items.html
  9. +0
    -2
      frappe/templates/includes/navbar/navbar.html
  10. +71
    -41
      frappe/website/doctype/web_page/web_page.json
  11. +5
    -0
      frappe/website/doctype/web_page/web_page.py
  12. +0
    -0
      frappe/website/doctype/website_sidebar/__init__.py
  13. +12
    -0
      frappe/website/doctype/website_sidebar/test_website_sidebar.py
  14. +8
    -0
      frappe/website/doctype/website_sidebar/website_sidebar.js
  15. +119
    -0
      frappe/website/doctype/website_sidebar/website_sidebar.json
  16. +10
    -0
      frappe/website/doctype/website_sidebar/website_sidebar.py
  17. +0
    -0
      frappe/website/doctype/website_sidebar_item/__init__.py
  18. +123
    -0
      frappe/website/doctype/website_sidebar_item/website_sidebar_item.json
  19. +10
    -0
      frappe/website/doctype/website_sidebar_item/website_sidebar_item.py
  20. +3
    -2
      frappe/website/website_theme/standard/standard.json

+ 4
- 0
frappe/config/website.py Voir le fichier

@@ -17,6 +17,10 @@ def get_data():
"name": "Web Form",
"description": _("User editable form on Website."),
},
{
"type": "doctype",
"name": "Website Sidebar",
},
{
"type": "doctype",
"name": "Website Slideshow",


+ 2
- 2
frappe/model/db_query.py Voir le fichier

@@ -461,7 +461,7 @@ class DatabaseQuery(object):
args.order_by = get_order_by(self.doctype, meta)

def check_sort_by_table(self, order_by_query):
for order_by in order_by_query.split(","):
for order_by in order_by_query.split(","):
if "." in order_by:
tbl = order_by.split('.')[0].strip()
if tbl not in self.tables:
@@ -517,5 +517,5 @@ def get_order_by(doctype, meta):
# draft docs always on top
if meta.is_submittable:
order_by = "`tab{0}`.docstatus asc, {1}".format(doctype, order_by)
return order_by

+ 5
- 4
frappe/public/css/website.css Voir le fichier

@@ -435,8 +435,10 @@ h6 a {
max-width: 100%;
}
.banner {
margin-top: 20px;
padding: 0px 20px;
padding: 10px 0px;
}
.banner img {
max-height: 50px;
}
.no-border {
border: none !important;
@@ -827,11 +829,10 @@ a.active {
padding-bottom: 20px;
}
.footer-group {
margin-bottom: 28px;
margin-bottom: 1em;
}
.footer-group-label {
display: inline-block;
font-size: 11px;
}
li .footer-child-item {
margin: 15px 0px !important;


+ 1
- 0
frappe/public/js/frappe/form/footer/timeline.js Voir le fichier

@@ -309,6 +309,7 @@ frappe.ui.form.Timeline = Class.extend({
}

docinfo.versions.forEach(function(version) {
if(!version.data) return;
var data = JSON.parse(version.data);

// comment


+ 6
- 4
frappe/public/less/website.less Voir le fichier

@@ -63,8 +63,11 @@ h1, h2, h3, h4, h5, h6 {
}

.banner {
margin-top: 20px;
padding: 0px 20px;
padding: 10px 0px;

img {
max-height: 50px;
}
}

.no-border {
@@ -556,12 +559,11 @@ a.active {
}

.footer-group {
margin-bottom: 28px;
margin-bottom: 1em;
}

.footer-group-label {
display:inline-block;
font-size: 11px;
}




+ 9
- 2
frappe/templates/base.html Voir le fichier

@@ -48,16 +48,23 @@
<body data-path="{{ path }}">
<div class="main-section">
<div>
<header>
{%- block banner -%}
{% include "templates/includes/banner_extension.html" ignore missing %}
{% include "templates/includes/banner_extension.html" ignore missing %}
{% if banner_html -%}
<header class="container">{{ banner_html or "" }}</header>
<div class="container">
<div class='banner'>
{{ banner_html or "" }}
</div>
</div>
{%- endif %}
{%- endblock -%}

{%- block navbar -%}
{% include "templates/includes/navbar/navbar.html" %}
{%- endblock -%}
</header>

<div class="hero-and-content">
<div data-html-block="hero">
{%- block hero -%}{%- endblock -%}


+ 7
- 7
frappe/templates/includes/footer/footer.html Voir le fichier

@@ -3,17 +3,17 @@
<div class="container">
<div class="row">
<div class="col-sm-6 text-left">
<div class="row">
{% if footer_items -%}
<ul class="list-unstyled navbar-nav col-sm-12">
{% include "templates/includes/footer/footer_items.html" %}
</ul>
{% endif %}
<div class="row">
{% include "templates/includes/footer/footer_items.html" %}
</div>
{% endif %}
</div>

<div class="col-sm-6 text-right">
{% block extension %}{% include "templates/includes/footer/footer_extension.html" %}{% endblock %}
{% block extension %}
{% include "templates/includes/footer/footer_extension.html" %}
{% endblock %}
</div>
</div>
<div class="row footer-bottom-line">
@@ -21,8 +21,8 @@
{% if copyright %}
&copy; {{ copyright }}
{% endif %}
<br>
{% if footer_address %}
{% if copyright %}<br>{% endif %}
{{ footer_address }}
{% endif %}
</div>


+ 3
- 3
frappe/templates/includes/footer/footer_items.html Voir le fichier

@@ -1,7 +1,7 @@
{% for page in footer_items %}
<div class="col-sm-4 footer-group">
{% if not page.parent_label -%}
<li data-label='{{ page.label }}'>
<div data-label='{{ page.label }}'>
<a {% if not page.child_items -%} href="{{ (page.url or '')|abs_url }}" {%- endif %}
{% if page.child_items %} onclick="return false;" {% endif %}
{{ page.target or ''}}>
@@ -17,10 +17,10 @@
{%- endfor -%}
</ul>
{%- else -%}
<span class="footer-group-label text-extra-muted">{{ page.label }}<span>
<span class="footer-group-label small text-muted">{{ page.label }}<span>
</a>
{%- endif -%}
</li>
</div>
{%- endif -%}
</div>
{% endfor %}


+ 0
- 2
frappe/templates/includes/navbar/navbar.html Voir le fichier

@@ -1,4 +1,3 @@
<header>
<nav class="navbar navbar-default navbar-main" role="navigation">
<div class="container">
<div class="navbar-header">
@@ -20,4 +19,3 @@
</div>
</div>
</nav>
</header>

+ 71
- 41
frappe/website/doctype/web_page/web_page.json Voir le fichier

@@ -206,34 +206,6 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "show_sidebar",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Show Sidebar",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
@@ -267,7 +239,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"description": "Content in markdown format that appears on the main side of your page",
"description": "",
"fieldname": "main_section",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -303,7 +275,7 @@
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Custom Javascript",
"label": "Script",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -387,7 +359,7 @@
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Custom CSS",
"label": "Style",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -428,6 +400,34 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "text_align",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Text Align",
"length": 0,
"no_copy": 0,
"options": "Left\nCenter\nRight",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
@@ -488,7 +488,7 @@
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible": 1,
"columns": 0,
"fieldname": "section_break_17",
"fieldtype": "Section Break",
@@ -498,6 +498,7 @@
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Sidebar and Comments",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -517,7 +518,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "enable_comments",
"fieldname": "show_sidebar",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -525,10 +526,11 @@
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Enable Comments",
"label": "Show Sidebar",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
@@ -544,19 +546,20 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "text_align",
"fieldtype": "Select",
"fieldname": "website_sidebar",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Text Align",
"label": "Website Sidebar",
"length": 0,
"no_copy": 0,
"options": "Left\nCenter\nRight",
"options": "Website Sidebar",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
@@ -594,6 +597,33 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "enable_comments",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Enable Comments",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
@@ -625,7 +655,7 @@
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"collapsible": 1,
"columns": 0,
"depends_on": "eval:!doc.__islocal",
"description": "",
@@ -637,7 +667,7 @@
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "",
"label": "Header and Description",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -719,7 +749,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 20,
"modified": "2016-12-29 14:40:31.000917",
"modified": "2016-12-29 07:51:57.437822",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Page",


+ 5
- 0
frappe/website/doctype/web_page/web_page.py Voir le fichier

@@ -47,6 +47,11 @@ class WebPage(WebsiteGenerator):
if not self.show_title:
context["no_header"] = 1

if self.show_sidebar and self.website_sidebar:
context.sidebar_items = frappe.get_all('Website Sidebar Item',
filters=dict(parent=self.website_sidebar), fields=['title', 'route', '`group`'],
order_by='idx asc')

self.set_metatags(context)
self.set_breadcrumbs(context)
self.set_title_and_header(context)


+ 0
- 0
frappe/website/doctype/website_sidebar/__init__.py Voir le fichier


+ 12
- 0
frappe/website/doctype/website_sidebar/test_website_sidebar.py Voir le fichier

@@ -0,0 +1,12 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies and Contributors
# See license.txt
from __future__ import unicode_literals

import frappe
import unittest

# test_records = frappe.get_test_records('Website Sidebar')

class TestWebsiteSidebar(unittest.TestCase):
pass

+ 8
- 0
frappe/website/doctype/website_sidebar/website_sidebar.js Voir le fichier

@@ -0,0 +1,8 @@
// Copyright (c) 2016, Frappe Technologies and contributors
// For license information, please see license.txt

frappe.ui.form.on('Website Sidebar', {
refresh: function(frm) {

}
});

+ 119
- 0
frappe/website/doctype/website_sidebar/website_sidebar.json Voir le fichier

@@ -0,0 +1,119 @@
{
"allow_copy": 0,
"allow_import": 0,
"allow_rename": 1,
"autoname": "field:title",
"beta": 0,
"creation": "2016-12-29 07:48:06.319665",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "sidebar_items",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Sidebar Items",
"length": 0,
"no_copy": 0,
"options": "Website Sidebar Item",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"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-12-29 07:50:05.633460",
"modified_by": "Administrator",
"module": "Website",
"name": "Website Sidebar",
"name_case": "",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Website Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 0
}

+ 10
- 0
frappe/website/doctype/website_sidebar/website_sidebar.py Voir le fichier

@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies and contributors
# For license information, please see license.txt

from __future__ import unicode_literals
import frappe
from frappe.model.document import Document

class WebsiteSidebar(Document):
pass

+ 0
- 0
frappe/website/doctype/website_sidebar_item/__init__.py Voir le fichier


+ 123
- 0
frappe/website/doctype/website_sidebar_item/website_sidebar_item.json Voir le fichier

@@ -0,0 +1,123 @@
{
"allow_copy": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
"creation": "2016-12-29 07:42:26.246725",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
"engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "route",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Route",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "group",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"in_standard_filter": 0,
"label": "Group",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2016-12-29 07:42:26.246725",
"modified_by": "Administrator",
"module": "Website",
"name": "Website Sidebar Item",
"name_case": "",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 0
}

+ 10
- 0
frappe/website/doctype/website_sidebar_item/website_sidebar_item.py Voir le fichier

@@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies and contributors
# For license information, please see license.txt

from __future__ import unicode_literals
import frappe
from frappe.model.document import Document

class WebsiteSidebarItem(Document):
pass

+ 3
- 2
frappe/website/website_theme/standard/standard.json Voir le fichier

@@ -2,6 +2,7 @@
"apply_style": 0,
"apply_text_styles": 0,
"creation": "2015-02-19 13:37:33.925909",
"css": ".navbar-header {\n display: none;\n}",
"custom": 0,
"docstatus": 0,
"doctype": "Website Theme",
@@ -10,9 +11,9 @@
"footer_text_color": "",
"heading_style": "",
"heading_webfont": "",
"idx": 17,
"idx": 26,
"link_color": "",
"modified": "2016-08-03 06:59:24.539564",
"modified": "2016-12-29 05:40:17.289226",
"modified_by": "Administrator",
"module": "Website",
"name": "Standard",


Écrire Aperçu
Chargement…
Annuler
Enregistrer