You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/04/28 15:56:42 UTC

[1/2] incubator-quarks-website git commit: [QUARKS-145] Highlight current page in sidebar and keep sidebar open

Repository: incubator-quarks-website
Updated Branches:
  refs/heads/master 3dd3cfd33 -> 69e4513f7


[QUARKS-145] Highlight current page in sidebar and keep sidebar open


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/commit/a6166a11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/a6166a11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/a6166a11

Branch: refs/heads/master
Commit: a6166a11595098e0351147e91ff921da182653dd
Parents: 70f0019
Author: Queenie Ma <qu...@gmail.com>
Authored: Fri Apr 15 18:43:47 2016 -0700
Committer: Queenie Ma <qu...@gmail.com>
Committed: Fri Apr 15 18:43:47 2016 -0700

----------------------------------------------------------------------
 site/_includes/sidebar.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/a6166a11/site/_includes/sidebar.html
----------------------------------------------------------------------
diff --git a/site/_includes/sidebar.html b/site/_includes/sidebar.html
index 89e1196..a870243 100644
--- a/site/_includes/sidebar.html
+++ b/site/_includes/sidebar.html
@@ -11,7 +11,7 @@
                     caretHtml: '',
                     accordion: true,
                     openClass: 'active', // open
-                    save: false, // leave false or nav highlighting doesn't work right
+                    save: true,
                     cookie: {
                         name: 'navgoco',
                         expires: false,
@@ -51,10 +51,11 @@
             <li><a href="#">{{ subcategory.title }}</a>
                 <ul>
                     {% for item in subcategory.items %}
+                    {% capture new_page_url %}{{page.url | append:'.html'}}{% endcapture %}
                     {% if item.audience contains audience and item.product contains product and item.platform contains platform and item.version contains version and item.output contains "web" %}
                     {% if item.external_url %}
                     <li><a href="{{item.external_url}}" target="_blank">{{subcategory.title}}</a></li>
-                    {% elsif page.url == item.url %}
+                    {% elsif new_page_url == item.url %}
                     <li class="active"><a href="{{item.url | prepend: ".."}}">{{item.title}}</a></li>
                     {% else %}
                     <li><a href="{{item.url | prepend: ".."}}">{{item.title}}</a></li>


[2/2] incubator-quarks-website git commit: Merge pull request #43

Posted by dl...@apache.org.
Merge pull request #43

This closes #43


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/commit/69e4513f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/69e4513f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/69e4513f

Branch: refs/heads/master
Commit: 69e4513f78fe5fefe5f09073a04cf5d86317a5cc
Parents: 3dd3cfd a6166a1
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Thu Apr 28 09:56:36 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Thu Apr 28 09:56:36 2016 -0400

----------------------------------------------------------------------
 site/_includes/sidebar.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------