You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by wc...@apache.org on 2016/03/22 01:49:48 UTC
[1/4] incubator-quarks-website git commit: Modify Github Repos,
Javadoc, Download in Quarks Resources, Feedback Link
Repository: incubator-quarks-website
Updated Branches:
refs/heads/master 238fe1946 -> d28c9b443
Modify Github Repos, Javadoc, Download in Quarks Resources, Feedback Link
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/f4e21794
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/f4e21794
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/f4e21794
Branch: refs/heads/master
Commit: f4e217945f86fbe24c97a06e717a30b7df86b0ba
Parents: 41ffc5c
Author: Cazen <Ca...@korea.com>
Authored: Sat Mar 19 17:18:11 2016 +0900
Committer: Cazen <Ca...@korea.com>
Committed: Sat Mar 19 17:18:11 2016 +0900
----------------------------------------------------------------------
site/_data/mydoc/mydoc_topnav.yml | 4 ++--
site/_includes/feedback.html | 2 +-
site/_includes/header.html | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/f4e21794/site/_data/mydoc/mydoc_topnav.yml
----------------------------------------------------------------------
diff --git a/site/_data/mydoc/mydoc_topnav.yml b/site/_data/mydoc/mydoc_topnav.yml
index f9b9a85..3fa8b34 100644
--- a/site/_data/mydoc/mydoc_topnav.yml
+++ b/site/_data/mydoc/mydoc_topnav.yml
@@ -12,7 +12,7 @@ topnav:
# output: web
- title: Github Repos
- external_url: https://github.com/quarks-edge
+ external_url: https://github.com/apache/incubator-quarks
audience: writers, designers
platform: all
product: all
@@ -38,7 +38,7 @@ topnav_dropdowns:
output: web
items:
- title: Download
- external_url: https://github.com/quarks-edge/quarks/releases/latest
+ external_url: https://github.com/apache/incubator-quarks/releases
audience: writers, designers
platform: all
product: all
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/f4e21794/site/_includes/feedback.html
----------------------------------------------------------------------
diff --git a/site/_includes/feedback.html b/site/_includes/feedback.html
index 67d6bca..30cf13e 100644
--- a/site/_includes/feedback.html
+++ b/site/_includes/feedback.html
@@ -13,4 +13,4 @@ window.location.href = uri;
}
</script>
-<li><a href="https://github.com/quarks-edge/quarks.documentation/issues/new" target="_blank"><i class="fa fa-envelope-o"></i> Feedback</a></li>
\ No newline at end of file
+<li><a href="mailto:dev@quarks.incubator.apache.org" target="_blank"><i class="fa fa-envelope-o"></i> Feedback</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/f4e21794/site/_includes/header.html
----------------------------------------------------------------------
diff --git a/site/_includes/header.html b/site/_includes/header.html
index 217596c..535209e 100755
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -65,7 +65,7 @@ limitations under the License.
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand page-scroll" href="#home">Home</a>
+ <a class="navbar-brand page-scroll" href="{{ site.projurl}}/">Home</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -126,4 +126,4 @@ limitations under the License.
</div>
<!-- /.container -->
</nav>
-</div>
\ No newline at end of file
+</div>
[2/4] incubator-quarks-website git commit: Apply dropdown menu,
Home redirection(#home)
Posted by wc...@apache.org.
Apply dropdown menu, Home redirection(#home)
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/ca50a789
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/ca50a789
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/ca50a789
Branch: refs/heads/master
Commit: ca50a78958a39a07238ec20cfa6ec5f9e0b840f5
Parents: f4e2179
Author: cazen.lee <ca...@samsung.com>
Authored: Mon Mar 21 16:53:43 2016 +0900
Committer: cazen.lee <ca...@samsung.com>
Committed: Mon Mar 21 16:53:43 2016 +0900
----------------------------------------------------------------------
site/_config.yml | 2 +-
site/_data/mydoc/mydoc_topnav.yml | 28 ++++++++++++++++++++++++----
site/_includes/custom/conditions.html | 1 +
site/_includes/header.html | 4 ++--
site/_includes/topnav.html | 24 ++++++++++++++++++++++++
5 files changed, 52 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/ca50a789/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index 5c6d8fd..1fe9270 100755
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -125,4 +125,4 @@ host: 127.0.0.1
#Base URLs
docsurl: http://quarks-edge.github.io/quarks.documentation/
sourceurl: https://github.com/apache/incubator-quarks
-projurl: http://quarks-edge.github.io/quarks
+projurl: http://quarks.incubator.apache.org/
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/ca50a789/site/_data/mydoc/mydoc_topnav.yml
----------------------------------------------------------------------
diff --git a/site/_data/mydoc/mydoc_topnav.yml b/site/_data/mydoc/mydoc_topnav.yml
index 3fa8b34..3daa7e7 100644
--- a/site/_data/mydoc/mydoc_topnav.yml
+++ b/site/_data/mydoc/mydoc_topnav.yml
@@ -1,8 +1,5 @@
## Topnav single links
## if you want to list an external url, use external_url instead of url. the theme will apply a different link base.
-topnav:
-- title: Topnav
- subcategories:
# - title: Sample
# url: /mydoc/sample.html
# audience: writers, designers
@@ -11,13 +8,36 @@ topnav:
# version: all
# output: web
+
+githubrepos_dropdowns:
+- title: Github Repos dropdowns
+ subcategories:
- title: Github Repos
- external_url: https://github.com/apache/incubator-quarks
audience: writers, designers
platform: all
product: all
version: all
output: web
+ items:
+ - title: Source code
+ external_url: https://github.com/apache/incubator-quarks
+ audience: writers, designers
+ platform: all
+ product: all
+ version: all
+ output: web
+
+ - title: Website/Documentation
+ external_url: https://github.com/apache/incubator-quarks-website
+ audience: writers, designers
+ platform: all
+ product: all
+ version: all
+ output: web
+
+topnav:
+- title: Topnav
+ subcategories:
- title: Javadoc
external_url: https://quarks-edge.github.io/quarks/docs/javadoc/index.html
audience: writers, designers
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/ca50a789/site/_includes/custom/conditions.html
----------------------------------------------------------------------
diff --git a/site/_includes/custom/conditions.html b/site/_includes/custom/conditions.html
index b7add78..cc2fd81 100644
--- a/site/_includes/custom/conditions.html
+++ b/site/_includes/custom/conditions.html
@@ -32,6 +32,7 @@ ____ _
{% if site.project == "mydoc_designers" %}
{% assign audience = "designers" %}
{% assign sidebar = site.data.mydoc.mydoc_sidebar.entries %}
+{% assign githubrepos_dropdowns = site.data.mydoc.mydoc_topnav.githubrepos_dropdowns %}
{% assign topnav = site.data.mydoc.mydoc_topnav.topnav %}
{% assign topnav_dropdowns = site.data.mydoc.mydoc_topnav.topnav_dropdowns %}
{% assign version = "all" %}
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/ca50a789/site/_includes/header.html
----------------------------------------------------------------------
diff --git a/site/_includes/header.html b/site/_includes/header.html
index 535209e..a0599ce 100755
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -65,7 +65,7 @@ limitations under the License.
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand page-scroll" href="{{ site.projurl}}/">Home</a>
+ <a class="navbar-brand page-scroll" href="{{ site.projurl }}/#home">Home</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -97,7 +97,7 @@ limitations under the License.
<ul class="dropdown-menu">
<li><a href="docs/home">Documentation Home</a></li>
<li><a href="docs/quarks-getting-started">Getting Started Guide</a></li>
- <li><a href="{{ site.projurl}}/docs/javadoc/index.html">Javadoc</a></li>
+ <li><a href="{{ site.projurl }}/docs/javadoc/index.html">Javadoc</a></li>
</ul>
</li>
<li class="dropdown">
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/ca50a789/site/_includes/topnav.html
----------------------------------------------------------------------
diff --git a/site/_includes/topnav.html b/site/_includes/topnav.html
index 1e232ea..87b52ad 100644
--- a/site/_includes/topnav.html
+++ b/site/_includes/topnav.html
@@ -17,6 +17,30 @@
<!-- entries without drop-downs appear here -->
<!-- conditional logic to control which topnav appears for the audience defined in the configuration file.-->
{% include custom/conditions.html %}
+ <li class="dropdown">
+ {% for entry in githubrepos_dropdowns %}
+ {% for subcategory in entry.subcategories %}
+ {% if subcategory.audience contains audience and subcategory.product contains product and subcategory.platform contains platform and subcategory.version contains version and subcategory.output contains "web" %}
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ subcategory.title }}<b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ {% for subitem in subcategory.items %}
+ {% if subitem.audience contains audience and subitem.product contains product and subitem.platform contains platform and subcategory.version contains version and subitem.output contains "web" %}
+ {% if subitem.external_url %}
+ <li><a href="{{subitem.external_url}}" target="_blank">{{subitem.title}}</a></li>
+ {% elsif page.url contains subitem.url %}
+ <li class="dropdownActive"><a href="{{subitem.url}}">{{subitem.title}}</a></li>
+ {% else %}
+ <li><a href="{{subitem.url | replace: "/",""}}">{{subitem.title}}</a></li>
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ </ul>
+ </li>
+ {% endfor %}
+ {% endfor %}
+
{% for entry in topnav %}
{% for subcategory in entry.subcategories %}
[3/4] incubator-quarks-website git commit: rollback projurl and
applying Homebutton to hard coding(modify it later when javadoc page is
available)
Posted by wc...@apache.org.
rollback projurl and applying Homebutton to hard coding(modify it later when javadoc page is available)
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/efb6ea61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/efb6ea61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/efb6ea61
Branch: refs/heads/master
Commit: efb6ea61075f58ebf130b282ea7677a8a8738de7
Parents: ca50a78
Author: cazen.lee <ca...@samsung.com>
Authored: Mon Mar 21 17:00:17 2016 +0900
Committer: Cazen <ha...@ip-10-0-0-126.eu-west-1.compute.internal>
Committed: Mon Mar 21 08:04:22 2016 +0000
----------------------------------------------------------------------
site/_config.yml | 2 +-
site/_includes/header.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/efb6ea61/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index 1fe9270..5c6d8fd 100755
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -125,4 +125,4 @@ host: 127.0.0.1
#Base URLs
docsurl: http://quarks-edge.github.io/quarks.documentation/
sourceurl: https://github.com/apache/incubator-quarks
-projurl: http://quarks.incubator.apache.org/
+projurl: http://quarks-edge.github.io/quarks
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/efb6ea61/site/_includes/header.html
----------------------------------------------------------------------
diff --git a/site/_includes/header.html b/site/_includes/header.html
index a0599ce..ce67b93 100755
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -65,7 +65,7 @@ limitations under the License.
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand page-scroll" href="{{ site.projurl }}/#home">Home</a>
+ <a class="navbar-brand page-scroll" href="http://quarks.incubator.apache.org/#home">Home</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
[4/4] incubator-quarks-website git commit: Merge remote-tracking
branch 'cazen/QUARKS-45'
Posted by wc...@apache.org.
Merge remote-tracking branch 'cazen/QUARKS-45'
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/d28c9b44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/d28c9b44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/d28c9b44
Branch: refs/heads/master
Commit: d28c9b443cf25b46327712d6f90155e559cbb69c
Parents: 238fe19 efb6ea6
Author: wcmarsha <wc...@us.ibm.com>
Authored: Mon Mar 21 17:43:06 2016 -0700
Committer: wcmarsha <wc...@us.ibm.com>
Committed: Mon Mar 21 17:43:06 2016 -0700
----------------------------------------------------------------------
site/_data/mydoc/mydoc_topnav.yml | 30 +++++++++++++++++++++++++-----
site/_includes/custom/conditions.html | 1 +
site/_includes/feedback.html | 2 +-
site/_includes/header.html | 6 +++---
site/_includes/topnav.html | 24 ++++++++++++++++++++++++
5 files changed, 54 insertions(+), 9 deletions(-)
----------------------------------------------------------------------