From 929ef59df961f5a1d51d02f60d9fa45205e6da77 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 13 Feb 2014 00:52:40 +0530 Subject: [PATCH] Show Siblings in Sidebar at Leaf Nodes --- webnotes/templates/includes/sidebar.html | 2 +- webnotes/website/css/website.css | 6 ++++++ webnotes/website/js/website.js | 8 ++------ webnotes/webutils.py | 9 ++++++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/webnotes/templates/includes/sidebar.html b/webnotes/templates/includes/sidebar.html index 0a76a98b81..899a43b80b 100644 --- a/webnotes/templates/includes/sidebar.html +++ b/webnotes/templates/includes/sidebar.html @@ -1,7 +1,7 @@ {% if children -%} {%- for child in children -%}
- + {{ child.page_title }} {% if not child.public_read %} () diff --git a/webnotes/website/css/website.css b/webnotes/website/css/website.css index a6918a15ea..a67e5fa0e3 100644 --- a/webnotes/website/css/website.css +++ b/webnotes/website/css/website.css @@ -388,6 +388,12 @@ a.no-decoration { color: inherit; } +a.active { + pointer-events: none; + cursor: default; + color: initial; +} + .page-breadcrumbs .breadcrumb { padding: 0px; margin-bottom: 2px; diff --git a/webnotes/website/js/website.js b/webnotes/website/js/website.js index 0b74db7ac1..4962bdeb59 100644 --- a/webnotes/website/js/website.js +++ b/webnotes/website/js/website.js @@ -244,23 +244,19 @@ $.extend(wn, { }, load_via_ajax: function(href) { - console.log("calling ajax"); - + // console.log("calling ajax"); window.previous_href = href; history.pushState(null, null, href); $.ajax({ url: href, cache: false }).done(function(data) { history.replaceState(data, data.title, href); + $("html, body").animate({ scrollTop: 0 }, "slow"); wn.render_json(data); }) }, render_json: function(data) { if(data.reload) { window.location = location.href; - // } else if(data.html) { - // var newDoc = document.open("text/html", "replace"); - // newDoc.write(data.html); - // newDoc.close(); } else { $('[data-html-block]').each(function(i, section) { var $section = $(section); diff --git a/webnotes/webutils.py b/webnotes/webutils.py index f8c3a66a15..2833b93ee9 100644 --- a/webnotes/webutils.py +++ b/webnotes/webutils.py @@ -147,7 +147,14 @@ def build_sitemap_options(path): sitemap_options.children = webnotes.conn.sql("""select * from `tabWebsite Sitemap` where parent_website_sitemap=%s - and public_read=1 order by idx asc, page_title asc""", (sitemap_options.name,), as_dict=True) + and public_read=1 order by -idx desc, page_title asc""", (sitemap_options.pathname,), as_dict=True) + + # leaf node, show siblings + if not sitemap_options.children: + sitemap_options.children = webnotes.conn.sql("""select * from `tabWebsite Sitemap` + where ifnull(parent_website_sitemap, '')=%s + and public_read=1 order by -idx desc, page_title asc""", + sitemap_options.parent_website_sitemap or "", as_dict=True) # determine templates to be used if not sitemap_options.base_template_path: