Repository: apex-site Updated Branches: refs/heads/master 041fcfb8a -> 6d8ebf071
APEXCORE-514 Further navigation changes Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/d7d86720 Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/d7d86720 Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/d7d86720 Branch: refs/heads/master Commit: d7d8672087c88fa050e1177740920c87841e8198 Parents: 63f2b53 Author: Michelle Xiao <[email protected]> Authored: Wed Oct 12 16:09:21 2016 -0700 Committer: Michelle Xiao <[email protected]> Committed: Wed Oct 12 16:09:21 2016 -0700 ---------------------------------------------------------------------- navigation.json | 18 ++++++++---------- src/less/docs.less | 11 ++++++++--- src/less/header.less | 7 +++++++ src/md/docs.md | 2 +- src/pages/docs.html | 4 ++-- src/pages/index.html | 16 +++------------- src/partials/header.handlebars | 6 +++++- 7 files changed, 34 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-site/blob/d7d86720/navigation.json ---------------------------------------------------------------------- diff --git a/navigation.json b/navigation.json index ea5e8df..98a0b60 100644 --- a/navigation.json +++ b/navigation.json @@ -1,24 +1,22 @@ [ { "id": "index", "label": "Home", "href": "/" }, + { "id": "docs", "label": "Documentation", "href": "/docs.html" }, { "id": "Powered by Apex", "label": "Powered By Apex", "href": "/powered-by-apex.html" }, { "id": "roadmap", "label": "Roadmap", "href": "/roadmap.html" }, { "id": "announcements", "label": "Announcements", "href": "/announcements.html" }, { "id": "community", "label": "Community", "href": "/community.html", "items": [ - { "label": "Contributing", "href": "/community.html#contributing" }, - { "label": "Newest \"apache-apex\" Questions - Stack Overflow", "href": "http://stackoverflow.com/questions/tagged/apache-apex"; } + { "label": "Mailing Lists", "href": "/community.html#mailing-lists" }, + { "label": "Issue Tracking", "href": "/community.html#issue-tracking" }, + { "label": "Stack Overflow", "href": "http://stackoverflow.com/questions/tagged/apache-apex"}, + { "label": "Contributing", "href": "/community.html#contributing"}, + { "label": "Apache", "classes": "dropdown-header"}, + { "label": "Apache Foundation", "href": "http://www.apache.org/foundation/how-it-works.html"; } ]}, - { "id": "docs", "label": "Docs", "href": "/docs.html" }, - { "id": "source", "label": "Source", "items": [ + { "id": "source", "label": "Github", "href": "https://github.com/apache/apex-core";, "items": [ { "label": "Apex Core (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=apex-core.git"; }, { "label": "Apex Core (Github Mirror)", "href": "https://github.com/apache/apex-core"; }, { "label": "Apex Malhar (ASF)", "href": "https://git-wip-us.apache.org/repos/asf?p=apex-malhar.git"; }, { "label": "Apex Malhar (Github Mirror)", "href": "https://github.com/apache/apex-malhar"; } ] }, - { "id": "apache", "label": "Apache", "items": [ - { "label": "Apache Foundation", "href": "http://www.apache.org/foundation/how-it-works.html"; }, - { "label": "Apache License", "href": "http://www.apache.org/licenses/"; }, - { "label": "Sponsorship", "href": "http://www.apache.org/foundation/sponsorship.html"; }, - { "label": "Thanks", "href": "http://www.apache.org/foundation/thanks.html"; } - ]}, { "id": "download", "label": "Download", "href": "/downloads.html", "classes": "btn btn-success" } ] http://git-wip-us.apache.org/repos/asf/apex-site/blob/d7d86720/src/less/docs.less ---------------------------------------------------------------------- diff --git a/src/less/docs.less b/src/less/docs.less index b1c238a..c8dec59 100644 --- a/src/less/docs.less +++ b/src/less/docs.less @@ -4,8 +4,8 @@ } } -.fixed-links { - text-align: center; +.fixed-links ul { + padding-left: 0; } div.docs-nav ul li { @@ -14,6 +14,11 @@ div.docs-nav ul li { width: 160px; margin: 0 -4px; padding: 0; + text-align: center; +} + +div.docs-nav ul li.docs { + margin-left: 0; } div.docs-nav ul li.write-apex { @@ -38,7 +43,7 @@ div.docs-nav ul li a { background-color: whitesmoke; position: fixed; width: 100%; - left: 0; + left: 58px; top: 0; z-index: 100; } http://git-wip-us.apache.org/repos/asf/apex-site/blob/d7d86720/src/less/header.less ---------------------------------------------------------------------- diff --git a/src/less/header.less b/src/less/header.less index e6fbb85..59d973e 100644 --- a/src/less/header.less +++ b/src/less/header.less @@ -65,4 +65,11 @@ .dropdown-menu { left: 0 !important; right: auto !important; +} + +.dropdown-header { + margin: 10px 0 0 20px; + padding: 5px 0 0; + border-top: 1px solid #dad9d6; + font-size: 14px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/apex-site/blob/d7d86720/src/md/docs.md ---------------------------------------------------------------------- diff --git a/src/md/docs.md b/src/md/docs.md index 851db93..42bb07a 100644 --- a/src/md/docs.md +++ b/src/md/docs.md @@ -43,6 +43,6 @@ use them via callbacks. Contrasts windows with micro-batches. - <a href="https://blogs.apache.org/foundation/entry/celebrating_17_years_of_the";>Apache Software Foundation</a> Discusses the history of the foundation, guiding principles, current statistics and provides numerous additional links for details of how the foundation operates and is managed. - <a href="https://techblog.xavient.com/real-time-data-ingestion-dip-apache-apex-co-dev-opportunity";>Data Ingestion Platform - Xavient Information Systems</a> Discusses usage of Apache Apex in their data ingestion platform. -### Trouble Shooting +### Troubleshooting - <a href="http://docs.datatorrent.com/troubleshooting/"; rel="nofollow">Troubleshooting Guide</a> http://git-wip-us.apache.org/repos/asf/apex-site/blob/d7d86720/src/pages/docs.html ---------------------------------------------------------------------- diff --git a/src/pages/docs.html b/src/pages/docs.html index 8157743..b314aba 100644 --- a/src/pages/docs.html +++ b/src/pages/docs.html @@ -4,11 +4,11 @@ <div class="docs-nav"><strong> <div class="fixed-links"> <ul> - <li class="active"><a href="#documentation">Documentation</a></li> + <li class="docs active"><a href="#documentation">Documentation</a></li> <li class="write-apex"><a href="#writing-apache-apex-applications">Writing Apache Apex Applications</a></li> <li><a href="#presentations">Presentations</a></li> <li class="blogs"><a href="#blogs">Blogs</a></li> - <li><a href="#trouble-shooting">Trouble Shooting</a></li> + <li><a href="#troubleshooting">Troubleshooting</a></li> </ul> </div> </strong></div> http://git-wip-us.apache.org/repos/asf/apex-site/blob/d7d86720/src/pages/index.html ---------------------------------------------------------------------- diff --git a/src/pages/index.html b/src/pages/index.html index 48fdc48..f756310 100644 --- a/src/pages/index.html +++ b/src/pages/index.html @@ -10,24 +10,14 @@ <div class="text-ctnr col-md-9"> <h1>Apache Apex<span class="banner-trademark">™</span></h1> <p>Enterprise-grade unified stream and batch processing engine.</p> - <p> - <a class="btn btn-info btn-lg" href="/community.html" role="button">Community</a> - <a class="btn btn-info btn-lg" href="/docs.html" role="button">Documentation</a> - <a class="btn btn-info btn-lg" href="https://github.com/apache/apex-core"; role="button">Github</a> - <a class="btn btn-success btn-lg" href="/downloads.html" role="button" target="_blank">Download</a> - </p> + <a class="h2" href="https://blogs.apache.org/apex/entry/apache_apex_malhar_3_5";> + <i>Now with <b>event-time windowing</b> and <b>high-level API.</b></i> + </a> </div> </div> </div> <div class="break"></div> - <div class="container"> - <center> - <a class="h2" href="https://blogs.apache.org/apex/entry/apache_apex_malhar_3_5";> - <i>Now with <b>event-time windowing</b> and <b>high-level API.</b></i> - </a> - </center> - </div> <div class="container"> <div class="col-md-4"> http://git-wip-us.apache.org/repos/asf/apex-site/blob/d7d86720/src/partials/header.handlebars ---------------------------------------------------------------------- diff --git a/src/partials/header.handlebars b/src/partials/header.handlebars index 58e4d5e..27504b4 100644 --- a/src/partials/header.handlebars +++ b/src/partials/header.handlebars @@ -41,7 +41,11 @@ <li class="nav-item nav-mouseover"> <ul class="dropdown-menu"> {{#each items}} - <li><a href="{{href}}">{{label}}</a></li> + {{#if href}} + <li class="{{classes}}"><a href="{{href}}">{{label}}</a></li> + {{else}} + <li class="{{classes}}"><strong>{{label}}</strong></li> + {{/if}} {{/each}} </ul> <a href="{{href}}" class="nav-link">{{label}}</a>
