accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [03/20] accumulo git commit: ACCUMULO-4190 Clean up navigation menu
Date Wed, 04 May 2016 23:53:35 GMT
ACCUMULO-4190 Clean up navigation menu

Fix (rather than remove) nav menu activation based on current page.
Minor tweaks, like removing redundant menu items and remove "Other" section entirely.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0361e60e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0361e60e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0361e60e

Branch: refs/heads/gh-pages
Commit: 0361e60ed9053105029a97fab435fb754e636384
Parents: c299cf2
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed May 4 19:52:01 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed May 4 19:52:01 2016 -0400

----------------------------------------------------------------------
 1.4/examples/index.md   |  2 +-
 1.5/examples/index.md   |  2 +-
 1.6/examples/index.md   |  1 +
 1.7/examples/index.md   |  1 +
 _includes/nav.html      | 79 +++++++++++++++++++++-----------------------
 governance/releasing.md |  2 +-
 people.md               |  8 ++---
 rb.md                   |  5 +--
 release_notes/1.5.1.md  |  1 +
 release_notes/1.5.2.md  |  1 +
 release_notes/1.5.3.md  |  1 +
 release_notes/1.5.4.md  |  1 +
 release_notes/1.6.0.md  |  1 +
 release_notes/1.6.1.md  |  1 +
 release_notes/1.6.2.md  |  1 +
 release_notes/1.6.3.md  |  1 +
 release_notes/1.6.4.md  |  1 +
 release_notes/1.6.5.md  |  1 +
 release_notes/1.7.0.md  |  1 +
 release_notes/1.7.1.md  |  1 +
 release_notes/index.md  |  7 ++--
 21 files changed, 61 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/1.4/examples/index.md
----------------------------------------------------------------------
diff --git a/1.4/examples/index.md b/1.4/examples/index.md
index a3da874..04c34e6 100644
--- a/1.4/examples/index.md
+++ b/1.4/examples/index.md
@@ -1,6 +1,6 @@
 ---
 title: Examples
-nav: nav_examples_1_4
+nav: nav_examples_14
 ---
 
 Each README in the examples directory highlights the use of particular features of Apache
Accumulo.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/1.5/examples/index.md
----------------------------------------------------------------------
diff --git a/1.5/examples/index.md b/1.5/examples/index.md
index 784c2ea..f33d076 100644
--- a/1.5/examples/index.md
+++ b/1.5/examples/index.md
@@ -1,6 +1,6 @@
 ---
 title: Examples
-nav: nav_examples_1_5
+nav: nav_examples_15
 ---
 
 Before running any of the examples, the following steps must be performed.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/1.6/examples/index.md
----------------------------------------------------------------------
diff --git a/1.6/examples/index.md b/1.6/examples/index.md
index ab73eb2..55dc411 100644
--- a/1.6/examples/index.md
+++ b/1.6/examples/index.md
@@ -1,5 +1,6 @@
 ---
 title: Examples
+nav: nav_examples_16
 ---
 
 Before running any of the examples, the following steps must be performed.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/1.7/examples/index.md
----------------------------------------------------------------------
diff --git a/1.7/examples/index.md b/1.7/examples/index.md
index 04d5a71..4d85930 100644
--- a/1.7/examples/index.md
+++ b/1.7/examples/index.md
@@ -1,5 +1,6 @@
 ---
 title: Examples
+nav: nav_examples_17
 ---
 
 Before running any of the examples, the following steps must be performed.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/_includes/nav.html
----------------------------------------------------------------------
diff --git a/_includes/nav.html b/_includes/nav.html
index 95136d5..9bf9437 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -15,7 +15,7 @@
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Project<span
class="caret"></span></a>
         <ul class="dropdown-menu">
           <li id="nav_index"><a href="{{ site.baseurl }}/">Home</a></li>
-          <li id="nav_downloads"><a href="{{ site.baseurl }}/downloads/">Downloads</a></li>
+          <li id="nav_downloads"><a href="{{ site.baseurl }}/downloads">Downloads</a></li>
           <li id="nav_features"><a href="{{ site.baseurl }}/notable_features">Features</a></li>
           <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa
fa-external-link"></i> License</a></li>
         </ul>
@@ -26,7 +26,8 @@
           <li id="nav_getinvolved"><a href="{{ site.baseurl }}/get_involved">Get
Involved</a></li>
           <li id="nav_mailinglists"><a href="{{ site.baseurl }}/mailing_list">Mailing
Lists</a></li>
           <li id="nav_people"><a href="{{ site.baseurl }}/people">People</a></li>
-          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo">Blog</a></li>
+          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo"><i
class="fa fa-external-link"></i> Blog</a></li>
+          <li id="nav_projects"><a href="{{ site.baseurl }}/projects">Community
Projects</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Governance</li>
           <li id="nav_bylaws"><a href="{{ site.baseurl }}/bylaws">Bylaws</a></li>
@@ -39,6 +40,7 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Development<span
class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li class="dropdown-header">Guides</li>
           <li id="nav_source"><a href="{{ site.baseurl }}/source">Source &amp;
Guide</a></li>
           <li id="nav_git"><a href="{{ site.baseurl }}/git">Git Workflow</a></li>
           <li id="nav_versioning"><a href="{{  site.baseurl  }}/versioning">Versioning</a></li>
@@ -46,65 +48,60 @@
           <li id="nav_rb"><a href="{{ site.baseurl }}/rb">Review Board</a></li>
           <li id="nav_releasing"><a href="{{ site.baseurl }}/releasing">Making
Releases</a></li>
           <li id="nav_verify_release"><a href="{{ site.baseurl }}/verifying_releases">Verifying
Releases</a></li>
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i
class="fa fa-external-link"></i> Issues</a></li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i
class="fa fa-external-link"></i> Builds</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">Issues</li>
+          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i
class="fa fa-external-link"></i> JIRA</a></li>
+          <li><a href="https://github.com/apache/accumulo/issues"><i class="fa
fa-external-link"></i> GitHub</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">Builds</li>
+          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i
class="fa fa-external-link"></i> Jenkins</a></li>
+          <li><a href="https://travis-ci.org/apache/accumulo"><i class="fa
fa-external-link"></i> Travis CI</a></li>
         </ul>
         </li>
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span
class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li class="dropdown-header">Release Notes</li>
+          <li id="nav_rn_171"><a href="{{ site.baseurl }}/release_notes/1.7.1">1.7.1</a></li>
+          <li id="nav_rn_165"><a href="{{ site.baseurl }}/release_notes/1.6.5">1.6.5</a></li>
+          <li class="divider"></li>
           <li class="dropdown-header">Manual</li>
-          <li><a href="{{ site.baseurl }}/1.6/accumulo_user_manual">1.6</a></li>
           <li><a href="{{ site.baseurl }}/1.7/accumulo_user_manual">1.7</a></li>
+          <li><a href="{{ site.baseurl }}/1.6/accumulo_user_manual">1.6</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Javadoc</li>
-          <li><a href="{{ site.baseurl }}/1.6/apidocs">1.6</a></li>
           <li><a href="{{ site.baseurl }}/1.7/apidocs">1.7</a></li>
+          <li><a href="{{ site.baseurl }}/1.6/apidocs">1.6</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Examples</li>
-          <li id="nav_examples_1_6"><a href="{{ site.baseurl }}/1.6/examples">1.6</a></li>
-          <li id="nav_examples_1_7"><a href="{{ site.baseurl }}/1.7/examples">1.7</a></li>
+          <li id="nav_examples_17"><a href="{{ site.baseurl }}/1.7/examples">1.7</a></li>
+          <li id="nav_examples_16"><a href="{{ site.baseurl }}/1.6/examples">1.6</a></li>
           <li class="divider"></li>
+          <li id="nav_rn"><a href="{{ site.baseurl }}/release_notes">Release
Notes Archive</a></li>
           <li id="old_documentation"><a href="{{ site.baseurl }}/old_documentation">Docs
for Older Verisons</a></li>
           <li id="nav_screenshots"><a href="{{ site.baseurl }}/screenshots">Screenshots</a></li>
-          <li id="nav_papers"><a href="{{ site.baseurl }}/papers">Papers &amp;
Other Links</a></li>
+          <li id="nav_papers"><a href="{{ site.baseurl }}/papers">Papers &amp;
Presentations</a></li>
           <li id="nav_glossary"><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
         </ul>
         </li>
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Release Notes<span
class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span
class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="{{ site.baseurl }}/release_notes/1.7.1">1.7.1</a></li>
-          <li><a href="{{ site.baseurl }}/release_notes/1.6.5">1.6.5</a></li>
-          <li class="divider"></li>
-          <li><a href="{{ site.baseurl }}/release_notes/">Archives</a></li>
+          <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i>
Apache Software Foundation</a></li>
+          <li><a href="https://www.apache.org/foundation/sponsorship"><i class="fa
fa-external-link"></i> Sponsorship</a></li>
+          <li><a href="https://www.apache.org/security"><i class="fa fa-external-link"></i>
Security</a></li>
+          <li><a href="https://www.apache.org/foundation/thanks"><i class="fa
fa-external-link"></i> Thanks</a></li>
+          <li><a href="https://www.apache.org/foundation/policies/conduct"><i
class="fa fa-external-link"></i> Code of Conduct</a></li>
         </ul>
         </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Other<span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="{{ site.baseurl }}/papers">Papers &amp; Presentations</a></li>
-            <li><a href="{{ site.baseurl }}/projects">Community Projects</a></li>
-          </ul>
-          </li>
-          <li class="dropdown">
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span
class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i>
Apache Software Foundation</a></li>
-            <li><a href="https://www.apache.org/foundation/sponsorship"><i
class="fa fa-external-link"></i> Sponsorship</a></li>
-            <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link"></i>
Security</a></li>
-            <li><a href="https://www.apache.org/foundation/thanks"><i class="fa
fa-external-link"></i> Thanks</a></li>
-            <li><a href="https://www.apache.org/foundation/policies/conduct"><i
class="fa fa-external-link"></i> Code of Conduct</a></li>
-          </ul>
-          </li>
-        </ul>
-        <form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right"
role="search">
-          <div class="form-group">
-            <input type="text" name="q" class="form-control" placeholder="Search"/>
-            <input type="hidden" name="fc_project" value="Accumulo"/>
-          </div>
-          <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-        </form>
-      </div>
+      </ul>
+      <form method="GET" action="http://search-hadoop.com" class="navbar-form navbar-right"
role="search">
+        <div class="form-group">
+          <input type="text" name="q" class="form-control" placeholder="Search"/>
+          <input type="hidden" name="fc_project" value="Accumulo"/>
+        </div>
+        <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+      </form>
     </div>
-  </nav>
+  </div>
+</nav>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/governance/releasing.md
----------------------------------------------------------------------
diff --git a/governance/releasing.md b/governance/releasing.md
index 4b82f97..c91d9a0 100644
--- a/governance/releasing.md
+++ b/governance/releasing.md
@@ -1,6 +1,6 @@
 ---
 title: Release Guide
-nav: nav_releasing
+nav: nav_govreleasing
 ---
 
 ## Versioning

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/people.md
----------------------------------------------------------------------
diff --git a/people.md b/people.md
index d028a40..369c646 100644
--- a/people.md
+++ b/people.md
@@ -1,11 +1,10 @@
 ---
-title: Contributors
+title: People
 skiph1fortitle: true
 nav: nav_people
 ---
 
-PMC and Committers
-------------------
+## PMC and Committers
 
 {: .table .table-striped}
 | username      | name              | organization                           | timezone |
@@ -36,8 +35,7 @@ PMC and Committers
 | vikrams       | Vikram Srivastava | [Cloudera][CLOUDERA]                   | [PT][PT] |
 | vines         | John Vines        | [sqrrl][SQRRL]                         | [ET][ET] |
 
-Contributors
-------------
+## Contributors
 
 {: .table .table-striped}
 | username    | name                | organization                                      
               | timezone              |

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/rb.md
----------------------------------------------------------------------
diff --git a/rb.md b/rb.md
index ee13d4c..2831253 100644
--- a/rb.md
+++ b/rb.md
@@ -1,11 +1,8 @@
 ---
-title: Review Board Guidelines
-skiph1fortitle: true
+title: Using Review Board
 nav: nav_rb
 ---
 
-# Using Review Board
-
 The Apache Software Foundation provides an [instance][rbinstance] of
 [Review Board][rb] (RB) for projects to use in code reviews. Here is how RB can
 be used to support development in the context of the

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.5.1.md
----------------------------------------------------------------------
diff --git a/release_notes/1.5.1.md b/release_notes/1.5.1.md
index a13de7c..7b7b8bc 100644
--- a/release_notes/1.5.1.md
+++ b/release_notes/1.5.1.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.5.1 Release Notes
+nav: nav_rn_151
 ---
 
 Apache Accumulo 1.5.1 is a maintenance release on the 1.5 version branch.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.5.2.md
----------------------------------------------------------------------
diff --git a/release_notes/1.5.2.md b/release_notes/1.5.2.md
index e1a47ae..d887ea4 100644
--- a/release_notes/1.5.2.md
+++ b/release_notes/1.5.2.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.5.2 Release Notes
+nav: nav_rn_152
 ---
 
 Apache Accumulo 1.5.2 is a maintenance release on the 1.5 version branch.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.5.3.md
----------------------------------------------------------------------
diff --git a/release_notes/1.5.3.md b/release_notes/1.5.3.md
index 9d4956e..1f68515 100644
--- a/release_notes/1.5.3.md
+++ b/release_notes/1.5.3.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.5.3 Release Notes
+nav: nav_rn_153
 ---
 
 Apache Accumulo 1.5.3 is a bug-fix release for the 1.5 series. It is likely to be the last

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.5.4.md
----------------------------------------------------------------------
diff --git a/release_notes/1.5.4.md b/release_notes/1.5.4.md
index 6981e51..068ca04 100644
--- a/release_notes/1.5.4.md
+++ b/release_notes/1.5.4.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.5.4 Release Notes
+nav: nav_rn_154
 ---
 
 Apache Accumulo 1.5.4 is one more bug-fix release for the 1.5 series. Like 1.5.3 before it,
this release contains a

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.6.0.md
----------------------------------------------------------------------
diff --git a/release_notes/1.6.0.md b/release_notes/1.6.0.md
index 1e5d311..c4e5aa3 100644
--- a/release_notes/1.6.0.md
+++ b/release_notes/1.6.0.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.6.0 Release Notes
+nav: nav_rn_160
 ---
 
 Apache Accumulo 1.6.0 adds some major new features and fixes many bugs.  This release contains
changes from 609 issues contributed by 36 contributors and committers.  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.6.1.md
----------------------------------------------------------------------
diff --git a/release_notes/1.6.1.md b/release_notes/1.6.1.md
index 3949bd8..d2cd706 100644
--- a/release_notes/1.6.1.md
+++ b/release_notes/1.6.1.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.6.1 Release Notes
+nav: nav_rn_161
 ---
 
 Apache Accumulo 1.6.1 is a maintenance release on the 1.6 version branch.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.6.2.md
----------------------------------------------------------------------
diff --git a/release_notes/1.6.2.md b/release_notes/1.6.2.md
index f45b052..63d4cee 100644
--- a/release_notes/1.6.2.md
+++ b/release_notes/1.6.2.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.6.2 Release Notes
+nav: nav_rn_162
 ---
 
 Apache Accumulo 1.6.2 is a maintenance release on the 1.6 version branch.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.6.3.md
----------------------------------------------------------------------
diff --git a/release_notes/1.6.3.md b/release_notes/1.6.3.md
index 4d477e2..fdbc0bf 100644
--- a/release_notes/1.6.3.md
+++ b/release_notes/1.6.3.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.6.3 Release Notes
+nav: nav_rn_163
 ---
 
 Apache Accumulo 1.6.3 is a maintenance release on the 1.6 version branch.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.6.4.md
----------------------------------------------------------------------
diff --git a/release_notes/1.6.4.md b/release_notes/1.6.4.md
index 62757cc..fbc7ba4 100644
--- a/release_notes/1.6.4.md
+++ b/release_notes/1.6.4.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.6.4 Release Notes
+nav: nav_rn_164
 ---
 
 Apache Accumulo 1.6.4 is a maintenance release on the 1.6 version branch.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.6.5.md
----------------------------------------------------------------------
diff --git a/release_notes/1.6.5.md b/release_notes/1.6.5.md
index 1b6a121..6f879df 100644
--- a/release_notes/1.6.5.md
+++ b/release_notes/1.6.5.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.6.5 Release Notes
+nav: nav_rn_165
 ---
 
 Apache Accumulo 1.6.5 is a maintenance release on the 1.6 version branch. This

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.7.0.md
----------------------------------------------------------------------
diff --git a/release_notes/1.7.0.md b/release_notes/1.7.0.md
index 5d452ef..5dbda71 100644
--- a/release_notes/1.7.0.md
+++ b/release_notes/1.7.0.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.7.0 Release Notes
+nav: nav_rn_170
 ---
 
 Apache Accumulo 1.7.0 is a significant release that includes many important

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/1.7.1.md
----------------------------------------------------------------------
diff --git a/release_notes/1.7.1.md b/release_notes/1.7.1.md
index f6d3901..f914697 100644
--- a/release_notes/1.7.1.md
+++ b/release_notes/1.7.1.md
@@ -1,5 +1,6 @@
 ---
 title: Apache Accumulo 1.7.1 Release Notes
+nav: nav_rn_171
 ---
 
 Apache Accumulo 1.7.1 is a maintenance release on the 1.7 version branch. This

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0361e60e/release_notes/index.md
----------------------------------------------------------------------
diff --git a/release_notes/index.md b/release_notes/index.md
index 4600d8c..552bada 100644
--- a/release_notes/index.md
+++ b/release_notes/index.md
@@ -1,11 +1,8 @@
 ---
-title: Apache Accumulo Release Notes
-skiph1fortitle: true
-nav: nav_index
+title: Release Notes
+nav: nav_rn
 ---
 
-# Release Notes
-
 Apache Accumulo generates release notes for the benefit of users which summarize the important
and notable changes that
 are contained in that release. Users can leverage these release notes to make make decisions
about the benefits (or
 concerns) in updating to a new version.


Mime
View raw message