accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhava...@apache.org
Subject svn commit: r1579730 - in /accumulo/site/branches/redesign14: content/css/accumulo.css templates/nav.html templates/skeleton.html
Date Thu, 20 Mar 2014 20:29:22 GMT
Author: bhavanki
Date: Thu Mar 20 20:29:21 2014
New Revision: 1579730

URL: http://svn.apache.org/r1579730
Log:
Integrate Bootstrap, reworking nav menu and skeleton.

Added:
    accumulo/site/branches/redesign14/templates/nav.html
Modified:
    accumulo/site/branches/redesign14/content/css/accumulo.css
    accumulo/site/branches/redesign14/templates/skeleton.html

Modified: accumulo/site/branches/redesign14/content/css/accumulo.css
URL: http://svn.apache.org/viewvc/accumulo/site/branches/redesign14/content/css/accumulo.css?rev=1579730&r1=1579729&r2=1579730&view=diff
==============================================================================
--- accumulo/site/branches/redesign14/content/css/accumulo.css (original)
+++ accumulo/site/branches/redesign14/content/css/accumulo.css Thu Mar 20 20:29:21 2014
@@ -14,21 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-body {
-    color: white;
-    font-family: Verdana,Geneva,sans-serif;
-    font-size: 10pt;
-    margin: 0;
-}
-#banner {
-    margin-top: 0;
-    min-width: 850px;
-    padding: 10px;
-}
-#logo {
-    margin-left: 20px;
-    text-align: left;
-}
 #bannertext {
     margin-top: 10px;
     text-align: left;
@@ -36,125 +21,23 @@ body {
 .clear {
     clear: both;
 }
-a {
-    color: #107EC0;
-}
-a:visited {
-    color: #107EC0;
-}
-a:hover {
-    background-color: #E6EBED;
-    color: #107EC0;
-}
-a img {
-    border: medium none;
-}
-h1, h2, h3, h4, h5, h6 {
-    border-bottom: 2px dashed #666666;
-    color: black;
-    text-transform: uppercase;
-}
 #content {
-    color: #333333;
-    margin: 0 150px 20px 220px;
     padding: 0 8px 40px;
 }
-#content h1 {
-    font-size: 1.4em;
-    padding-top: 15px;
-    padding-bottom: 15px;
-}
-#content h2 {
-    border-bottom: 1px dashed #666666;
-    font-size: 1.2em;
-    margin-top: 2em;
-}
-#content h3 {
-    border-bottom: medium none;
-    font-size: 1.1em;
-    margin-bottom: 0;
-}
-#content h4, h5, h6 {
-    border-bottom: medium none;
-    font-size: 1em;
-    margin-bottom: 0;
-}
 #content img {
     vertical-align: middle;
 }
-.codehilite {
-    background-color: #FFFFFF;
-    border-radius: 10px 10px 10px 10px;
-    padding: 0.01em 1em;
-}
-#navigation {
-    -moz-border-bottom-colors: none;
-    -moz-border-image: none;
-    -moz-border-left-colors: none;
-    -moz-border-right-colors: none;
-    -moz-border-top-colors: none;
-    background: none repeat scroll 0 0 #F5F8FA;
-    border-color: #C0C0C0 #C0C0C0 #C0C0C0 -moz-use-text-color;
-    border-radius: 0 10px 10px 0;
-    border-style: solid solid solid none;
-    border-width: 1px 1px 1px medium;
-    color: #000033;
-    float: left;
-    font-size: 0.9em;
-    margin: 0 0 20px;
-    padding: 15px 15px 5px 25px;
-    width: 170px;
-}
-#navigation img {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-}
-#navigation h1 {
-    border-bottom: 2px dashed #666666;
-    color: #000000;
-    font-size: 1em;
-    margin-bottom: 0;
-    margin-top: 0.8em;
-    padding: 0;
-}
-#navigation ul {
-    list-style: none outside none;
-    margin: 0;
-    padding: 0;
-}
-#navigation li {
-    border-bottom: 1px solid #CCCCCC;
-    margin: 0.2em 0;
-    padding: 0;
-}
-#navigation li a {
-    margin: 0;
-    text-decoration: none;
-}
-#navigation li a:hover {
-    background: none repeat scroll 0 0 transparent;
-    color: #193240;
-}
 #footer {
     border-top: 1px solid #CCCCCC;
     color: #666666;
     font-size: 0.8em;
-    margin: 20px 150px 20px 250px;
-    padding: 0 8px;
+    padding: 8px 8px;
     text-align: center;
 }
-.copyright {
-    float: left;
-}
 #asf-logo {
     float: left;
     padding-top: 15px;
 }
-dd {
-}
-dl {
-}
 dt {
     display: inline;
     float: left;
@@ -170,4 +53,4 @@ dt {
 
 #release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
     padding: 5px;
-}
\ No newline at end of file
+}

Added: accumulo/site/branches/redesign14/templates/nav.html
URL: http://svn.apache.org/viewvc/accumulo/site/branches/redesign14/templates/nav.html?rev=1579730&view=auto
==============================================================================
--- accumulo/site/branches/redesign14/templates/nav.html (added)
+++ accumulo/site/branches/redesign14/templates/nav.html Thu Mar 20 20:29:21 2014
@@ -0,0 +1,90 @@
+<nav class="navbar navbar-default navbar-static-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <a class="navbar-brand" href="index.html">Accumulo</a>
+  </div>
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li class="active"><a href="/index.html">Home</a></li>
+<li><a href="/downloads">Downloads</a></li>
+<li><a href="/notable_features.html">Features</a></li>
+<li><a href="/licenses/LICENSE-2.0">License</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Community <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="/get_involved.html">Get Involved</a></li>
+<li><a href="/mailing_list.html">Mailing Lists</a></li>
+<li><a href="/people.html">People</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Development <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="/source.html">Source &amp; Guide</a></li>
+<li><a href="/git.html">Git WIP</a></li>
+<li><a href="/contrib.html">Contrib Projects</a></li>
+<li><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</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>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a>
/ <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li>
-->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li><a href="/1.4/examples">1.4</a></li>
+<li><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li><a href="/screenshots.html">Screenshots</a></li>
+<li><a href="/papers.html">Papers &amp; Other Links</a></li>
+<li><a href="/glossary.html">Glossary</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="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/">Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</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>
+</nav>

Modified: accumulo/site/branches/redesign14/templates/skeleton.html
URL: http://svn.apache.org/viewvc/accumulo/site/branches/redesign14/templates/skeleton.html?rev=1579730&r1=1579729&r2=1579730&view=diff
==============================================================================
--- accumulo/site/branches/redesign14/templates/skeleton.html (original)
+++ accumulo/site/branches/redesign14/templates/skeleton.html Thu Mar 20 20:29:21 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,23 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="css/bootstrap.min.css" rel="stylesheet">
+  <link href="css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="js/bootstrap.min.js"></script>
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>{% block title %}{{ headers.title }}{% endblock %}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,22 +45,25 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
'.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
-  </div>
-
+{% include "nav.html" %}
+<!--
   <div id="navigation">
   {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
   </div>
+-->
 
+<div class="container-fluid">
+<div class="row">
+  <div class="col-xs-12">
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
 
   <div id="content">
@@ -59,7 +73,7 @@
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/
width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"
width="100">
     </a>
     <div class="copyright">
       <p>
@@ -72,6 +86,10 @@
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
 
 </body>
 </html>



Mime
View raw message