diff options
author | Matei Alexandru Zaharia <matei@apache.org> | 2014-01-22 20:33:24 +0000 |
---|---|---|
committer | Matei Alexandru Zaharia <matei@apache.org> | 2014-01-22 20:33:24 +0000 |
commit | 673dcddb721241a6d7eef2d773a170a1e1a38202 (patch) | |
tree | 95e99582a87f471bea589487965b639323a0e05d /_layouts | |
parent | e42e6e2bef38ca1d6fb92c27a7556f30be940574 (diff) | |
download | spark-website-673dcddb721241a6d7eef2d773a170a1e1a38202.tar.gz spark-website-673dcddb721241a6d7eef2d773a170a1e1a38202.tar.bz2 spark-website-673dcddb721241a6d7eef2d773a170a1e1a38202.zip |
Update site look and add pages for Streaming and MLlib
This monster commit does a variety of things:
- Update the site look and feel to be cleaner
- Add top-level points to front page
- Add a listing of related projects, and pages for those included in Spark
- Reorganize docs and community pages
- Make sure the site scales properly on mobile devices
- Add tabs to let users view the examples in any programming language
It's just a start, but should be a step towards a better web presence.
Diffstat (limited to '_layouts')
-rw-r--r-- | _layouts/global.html | 204 | ||||
-rw-r--r-- | _layouts/post.html | 7 |
2 files changed, 154 insertions, 57 deletions
diff --git a/_layouts/global.html b/_layouts/global.html index 9f1eb2213..4c75b56e3 100644 --- a/_layouts/global.html +++ b/_layouts/global.html @@ -1,28 +1,24 @@ <!DOCTYPE html> -<!--[if IE 6]> -<html id="ie6" dir="ltr" lang="en-US"> -<![endif]--> -<!--[if IE 7]> -<html id="ie7" dir="ltr" lang="en-US"> -<![endif]--> -<!--[if IE 8]> -<html id="ie8" dir="ltr" lang="en-US"> -<![endif]--> -<!--[if !(IE 6) | !(IE 7) | !(IE 8) ]><!--> -<html dir="ltr" lang="en-US"> -<!--<![endif]--> +<html lang="en"> <head> - <link rel="shortcut icon" href="{{site.url}}favicon.ico" /> - <meta charset="UTF-8" /> - <meta name="viewport" content="width=device-width" /> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <title> {% if page.custom_title %} {{page.custom_title}} {% else %} {{page.title}} | Apache Spark {% endif %} </title> - <link rel="stylesheet" type="text/css" media="all" href="{{site.url}}css/style.css" /> - <link rel="stylesheet" href="{{site.url}}css/pygments-default.css"> + {% if page.redirect %} + <meta http-equiv="refresh" content="0; url={{site.url}}{{page.redirect}}"> + <link rel="canonical" href="{{site.url}}{{page.redirect}}" /> + {% endif %} + + <!-- Bootstrap core CSS --> + <link href="{{site.url}}css/cerulean.min.css" rel="stylesheet"> + <link href="{{site.url}}css/custom.css" rel="stylesheet"> <script type="text/javascript"> <!-- Google Analytics initialization --> @@ -47,48 +43,144 @@ } </script> - <link rel='canonical' href='{{site.url}}index.html' /> - - <style type="text/css"> - #site-title, - #site-description { - position: absolute !important; - clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ - clip: rect(1px, 1px, 1px, 1px); - } - </style> - <style type="text/css" id="custom-background-css"> - body.custom-background { background-color: #f1f1f1; } - </style> + <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!--[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.3.0/respond.min.js"></script> + <![endif]--> </head> -<!--body class="page {% if page.sidebar %}two-column right-sidebar{% else %}singular{% endif%}"--> -<body class="{{page.type}}"> -<div id="page" class="hfeed"> - - {% include navbar.html %} - - <div id="main"> - <div id="primary"> - <div id="content" role="main"> - {% if page.type contains 'archive' %} - {{ content }} - {% else %} - <article class="page type-page status-publish hentry"> - {{ content }} - </article><!-- #post --> - {% endif %} - </div><!-- #content --> - {% if page.sidebar %} - <div id="secondary" class="widget-area" role="complementary"> - {{ page.sidebar | markdownify }} - </div> - {% endif %} - {% include footer.html %} - </div><!-- #primary --> - </div><!-- #main --> -</div><!-- #page --> +<body> + +<div class="container" style="max-width: 1200px;"> + +<div class="masthead"> + {% if page.subproject %} + <p class="lead"> + <a href="{{site.url}}"> + <img src="{{site.url}}images/spark-logo.png" + style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"></a> + <a href="#"><span class="subproject"> + {{ page.subproject }} + </span></a> + </p> + {% else %} + <p class="lead"> + <a href="{{site.url}}"> + <img src="{{site.url}}images/spark-logo.png" + style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"></a><span class="tagline"> + Lightning-fast cluster computing + </span> + </p> + {% endif %} +</div> + +<nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> + <li><a href="{{site.url}}downloads.html">Download</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Related Projects <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="{{site.shark_url}}">Shark (SQL)</a></li> + <li><a href="{{site.url}}streaming/">Spark Streaming</a></li> + <li><a href="{{site.url}}mllib/">MLlib (machine learning)</a></li> + <li><a href="{{site.graphx_url}}">GraphX (graph)</a></li> + </ul> + </li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Documentation <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="{{site.url}}documentation.html">Overview</a></li> + <li><a href="{{site.url}}docs/latest/">Latest Release</a></li> + <li><a href="{{site.url}}examples.html">Examples</a></li> + </ul> + </li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="{{site.url}}community.html">Mailing Lists</a></li> + <li><a href="{{site.url}}community.html#events">Events and Meetups</a></li> + <li><a href="{{site.url}}community.html#history">Project History</a></li> + <li><a href="https://cwiki.apache.org/confluence/display/SPARK/Powered+By+Spark">Powered By</a></li> + </ul> + </li> + <li><a href="{{site.url}}faq.html">FAQ</a></li> + </ul> + </div> + <!-- /.navbar-collapse --> +</nav> + + +<div class="row"> + <div class="col-md-3 col-md-push-9"> + <div class="news" style="margin-bottom: 20px;"> + <h5>Latest News</h5> + <ul class="list-unstyled"> + {% for post in site.categories.news limit:4 %} + <li><a href="{{ post.url }}">{{ post.title }}</a> + <span class="small">({{post.date| date:"%b %d, %Y"}})</span></li> + {% endfor %} + </ul> + <p class="small" style="text-align: right;"><a href="{{site.url}}news/index.html">Archive</a></p> + </div> + <div class="hidden-xs hidden-sm"> + <a href="{{site.url}}downloads.html" class="btn btn-success btn-lg btn-block" style="margin-bottom: 30px;"> + Download Spark + </a> + <p style="font-size: 16px; font-weight: 500; color: #555;"> + Related Projects: + </p> + <ul class="list-narrow"> + <li><a href="{{site.shark_url}}">Shark (SQL)</a></li> + <li><a href="{{site.url}}streaming/">Spark Streaming</a></li> + <li><a href="{{site.url}}mllib/">MLlib (machine learning)</a></li> + <li><a href="{{site.graphx_url}}">GraphX (graph)</a></li> + </ul> + </div> + </div> + + <div class="col-md-9 col-md-pull-3"> + {{content}} + </div> +</div> + +{% if page.extra %} + {{ page.extra | markdownify }} +{% endif %} + +<footer class="small"> + <hr> + Apache Spark is an effort undergoing incubation at The Apache Software Foundation. + <a href="http://incubator.apache.org/" style="border: none;"> + <img style="vertical-align: middle; float: right; margin-bottom: 15px;" + src="{{site.url}}images/incubator-logo.png" alt="Apache Incubator" title="Apache Incubator" /> + </a> +</footer> + +</div> +<script src="https://code.jquery.com/jquery.js"></script> +<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script> +<script src="{{site.url}}js/lang-tabs.js"></script> </body> </html> diff --git a/_layouts/post.html b/_layouts/post.html index f05db77dd..60b45e9fe 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -5,4 +5,9 @@ type: singular <h2>{{page.title}}</h2> -{{content}}
\ No newline at end of file +{{content}} + +<p> +<br/> +<a href="{{site.url}}news/">Spark News Archive</a> +</p> |