accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [01/16] accumulo git commit: Convert social area and footer from html to markdown
Date Fri, 22 Apr 2016 22:59:37 GMT
Repository: accumulo
Updated Branches:
  refs/heads/asf-site 3e80cf034 -> 906f782ac
  refs/heads/gh-pages c61e77b0a -> 54012968b


Convert social area and footer from html to markdown


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

Branch: refs/heads/gh-pages
Commit: 54012968b4565420a77168abcc1c6b0163d49b1e
Parents: c61e77b
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Apr 22 18:57:41 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Apr 22 18:57:41 2016 -0400

----------------------------------------------------------------------
 _includes/footer.md    |  21 +++++++++
 _includes/social.md    |  17 +++++++
 _layouts/skeleton.html | 107 +++++++++++++++++++-------------------------
 css/accumulo.css       |  13 +++---
 4 files changed, 89 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/54012968/_includes/footer.md
----------------------------------------------------------------------
diff --git a/_includes/footer.md b/_includes/footer.md
new file mode 100644
index 0000000..79424c9
--- /dev/null
+++ b/_includes/footer.md
@@ -0,0 +1,21 @@
+
+<footer markdown="1">
+
+[![Apache Software Foundation][ASF_IMG]{: #asf-logo height="100"}][ASF]
+
+Copyright &copy; 2011-{{ site.time | date: '%Y' }} The Apache Software
+Foundation, Licensed under the [Apache License, Version 2.0][AL2]. Apache
+Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
+project logo are trademarks of the [Apache Software Foundation][ASF].
+
+Site created with [Bootstrap][BOOTSTRAP] including icons from
+[GLYPHICONS][GLYPHICONS] and [Font Awesome][FONTAWE].
+
+</footer>
+
+[ASF]: https://www.apache.org
+[ASF_IMG]: {{ site.baseurl }}/images/feather-small.gif
+[AL2]: https://www.apache.org/licenses/LICENSE-2.0
+[BOOTSTRAP]: https://getbootstrap.com
+[GLYPHICONS]: https://glyphicons.com
+[FONTAWE]: http://fontawesome.io

http://git-wip-us.apache.org/repos/asf/accumulo/blob/54012968/_includes/social.md
----------------------------------------------------------------------
diff --git a/_includes/social.md b/_includes/social.md
new file mode 100644
index 0000000..c4cb274
--- /dev/null
+++ b/_includes/social.md
@@ -0,0 +1,17 @@
+
+{: .table #sociallinks }
+| ![Twitter][1]{:style="height: 1em"}          | [@ApacheAccumulo][TWITTER]             
  |
+| ![Linked in][2]                              | [Apache Accumulo Professionals][LINKEDIN]
|
+| ![GitHub][3]{:style="height: 1em"}           | [apache / accumulo][GITHUB]            
  |
+| <span class="glyphicon glyphicon-comment" /> | [#accumulo @ freenode][IRC]      
        |
+| ![Blog][4]{:width="16"}                      | [Apache Accumulo Blog][BLOG]           
  |
+
+[1]: {{ site.baseurl }}/images/Twitter_logo_blue.png
+[2]: {{ site.baseurl }}/images/InBug-16px_0.png
+[3]: {{ site.baseurl }}/images/GitHub-Mark-32px.png
+[4]: {{ site.baseurl }}/favicon.png
+[TWITTER]: https://twitter.com/apacheaccumulo
+[LINKEDIN]: https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913
+[GITHUB]: https://github.com/apache/accumulo
+[IRC]: irc://chat.freenode.net/accumulo
+[BLOG]: https://blogs.apache.org/accumulo

http://git-wip-us.apache.org/repos/asf/accumulo/blob/54012968/_layouts/skeleton.html
----------------------------------------------------------------------
diff --git a/_layouts/skeleton.html b/_layouts/skeleton.html
index 49c05c9..cc21ada 100644
--- a/_layouts/skeleton.html
+++ b/_layouts/skeleton.html
@@ -23,37 +23,54 @@
 <link href="{{ site.baseurl }}/css/bootstrap.min.css" rel="stylesheet">
 <link href="{{ site.baseurl }}/css/bootstrap-theme.min.css" rel="stylesheet">
 <link href="{{ site.baseurl }}/css/dataTables.bootstrap.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="{{ site.baseurl }}/js/bootstrap.min.js"></script>
-<script src="{{ site.baseurl }}/js/jquery.dataTables.min.js"></script>
-<script src="{{ site.baseurl }}/js/dataTables.bootstrap.js"></script>
 <link href="{{ site.baseurl }}/css/accumulo.css" rel="stylesheet" type="text/css">
 <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+
 <title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape
}}{% endif %}</title>
 
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
+<script src="{{ site.baseurl }}/js/jquery.dataTables.min.js"></script>
+<script src="{{ site.baseurl }}/js/dataTables.bootstrap.js"></script>
 <script>
-$(function() {
-  var host = window.location.host;
-  if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
-    $('#non-canonical').show();
-  }
-});
-</script>
-<script>
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  // show location of canonical site if not currently on the canonical site
+  $(function() {
+    var host = window.location.host;
+    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
+      $('#non-canonical').show();
+    }
+  });
+
+  {% if page.nav %}
+  // decorate menu with currently navigated page
+  $(function() {
+    $("#{{page.nav}}").addClass("active");
+  });
+  {% endif %}
+
+  $(function() {
+    // decorate section headers with anchors
+    return $("h2, h3, h4, h5, h6").each(function(i, el) {
+      var $el, icon, id;
+      $el = $(el);
+      id = $el.attr('id');
+      icon = '<i class="fa fa-link"></i>';
+      if (id) {
+        return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
+      }
+    });
+  });
+
+  // configure Google Analytics
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
-  ga('create', 'UA-50934829-1', 'apache.org');
-  ga('send', 'pageview');
-}
+  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
+    ga('create', 'UA-50934829-1', 'apache.org');
+    ga('send', 'pageview');
+  }
 </script>
 </head>
 <body>
@@ -71,13 +88,8 @@ if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
         <a id="download-button-sidebar" class="btn btn-success btn-block" href="{{ site.baseurl
}}/downloads/" role="button">Download</a>
       </div>
       <hr>
-      <table class="table" id="sociallinks">
-        <tr><td><img src="{{ site.baseurl }}/images/Twitter_logo_blue.png"
style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
-        <tr><td><img src="{{ site.baseurl }}/images/InBug-16px_0.png"></td><td><a
href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo
Professionals</a></td></tr>
-        <tr><td><img src="{{ site.baseurl }}/images/GitHub-Mark-32px.png"
style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache
/ accumulo</a></td></tr>
-        <tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a
href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
-        <tr><td><img src="{{ site.baseurl }}/favicon.png" width="16" /></td><td><a
href="https://blogs.apache.org/accumulo">Apache Accumulo Blog</a></td></tr>
-      </table>
+      {% capture social-include %}{% include social.md %}{% endcapture %}{{ social-include
| markdownify }}
+
       <hr>
       <a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo
Summit" class="img-responsive" src="{{ site.baseurl }}/images/accumulo-summit.png"></a>
     </div>
@@ -93,40 +105,11 @@ if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
         {{ content }}
       </div>
 
-      <div id="footer">
-        <a href="https://www.apache.org">
-          <img id="asf-logo" alt="Apache Software Foundation" src="{{ site.baseurl }}/images/feather-small.gif"
height="100">
-        </a>
-        <div class="copyright">
-          <p>
-          Copyright &copy; 2011-2016 The Apache Software Foundation, Licensed under
-          the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License,
Version 2.0</a>.
-          Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-          project logo are trademarks of the <a href="https://www.apache.org">Apache
Software Foundation</a>.<br />
-          Site created with <a href="https://getbootstrap.com/">Bootstrap</a>
including icons from <a href="https://glyphicons.com/">GLYPHICONS</a> and <a
href="http://fontawesome.io/">Font Awesome</a>.
-          </p>
-        </div>
-      </div>
+      {% capture footer-include %}{% include footer.md %}{% endcapture %}{{ footer-include
| markdownify }}
     </div>
 
   </div>
 </div>
 
-<script type="text/javascript">
-{% if page.nav %}
-$("#{{page.nav}}").addClass("active");
-{% endif %}
-$(function() {
-  return $("h2, h3, h4, h5, h6").each(function(i, el) {
-    var $el, icon, id;
-    $el = $(el);
-    id = $el.attr('id');
-    icon = '<i class="fa fa-link"></i>';
-    if (id) {
-      return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
-    }
-  });
-});
-</script>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/54012968/css/accumulo.css
----------------------------------------------------------------------
diff --git a/css/accumulo.css b/css/accumulo.css
index 5eafec6..5f1969c 100644
--- a/css/accumulo.css
+++ b/css/accumulo.css
@@ -54,13 +54,18 @@ ul.nav li.dropdown:hover > ul.dropdown-menu {
 #content img {
     vertical-align: middle;
 }
-#footer {
+footer {
     border-top: 1px solid #CCCCCC;
     color: #666666;
     font-size: 0.8em;
     padding: 8px 8px;
     text-align: center;
 }
+footer > p {
+    width: 60%;
+    margin-left: auto;
+    margin-right: auto;
+}
 #asf-logo {
     float: left;
 }
@@ -88,12 +93,6 @@ ul.nav li.dropdown:hover > ul.dropdown-menu {
     margin-right: auto;
 }
 
-div.copyright {
-    width: 60%;
-    margin-left: auto;
-    margin-right: auto;
-}
-
 code {
     /* override nowrap in bootstrap */
     white-space: normal;


Mime
View raw message