You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/01/06 22:08:19 UTC
svn commit: r1429598 - in /rave/site/branches/bootstrapped:
content/css/rave.css lib/path.pm templates/single_narrative.html
templates/skeleton.html
Author: mfranklin
Date: Sun Jan 6 21:08:18 2013
New Revision: 1429598
URL: http://svn.apache.org/viewvc?rev=1429598&view=rev
Log:
Modified template to support bootstrap
Modified:
rave/site/branches/bootstrapped/content/css/rave.css
rave/site/branches/bootstrapped/lib/path.pm
rave/site/branches/bootstrapped/templates/single_narrative.html
rave/site/branches/bootstrapped/templates/skeleton.html
Modified: rave/site/branches/bootstrapped/content/css/rave.css
URL: http://svn.apache.org/viewvc/rave/site/branches/bootstrapped/content/css/rave.css?rev=1429598&r1=1429597&r2=1429598&view=diff
==============================================================================
--- rave/site/branches/bootstrapped/content/css/rave.css (original)
+++ rave/site/branches/bootstrapped/content/css/rave.css Sun Jan 6 21:08:18 2013
@@ -91,6 +91,20 @@ pre{
border: 1px solid #E6EBED;
}
+.footer p {
+ text-align: center;
+ margin-bottom: 0px;
+ color: #777;
+}
+
+.footer {
+ text-align: center;
+ padding: 30px 0;
+ margin-top: 70px;
+ border-top: 1px solid #E5E5E5;
+ background-color: whiteSmoke;
+}
+
/*
#content {
margin: 20px 150px 20px 250px;
@@ -204,7 +218,7 @@ dt {
/* Google Search box customizations */
.gsc-clear-button{display:none;}
-
+.gsc-search-button{vertical-align: top;}
Modified: rave/site/branches/bootstrapped/lib/path.pm
URL: http://svn.apache.org/viewvc/rave/site/branches/bootstrapped/lib/path.pm?rev=1429598&r1=1429597&r2=1429598&view=diff
==============================================================================
--- rave/site/branches/bootstrapped/lib/path.pm (original)
+++ rave/site/branches/bootstrapped/lib/path.pm Sun Jan 6 21:08:18 2013
@@ -3,8 +3,57 @@ use ASF::Value;
# taken from django's url.py
+our @nav = (
+ { title => "General", links => [
+ { title => "About",
+ href => "/index.html"},
+ { title => "Documentation",
+ href => "/documentation/index.html"},
+ { title => "Downloads",
+ href => "/downloads.html"}
+ ]},
+ { title => "Community", links => [
+ { title => "Get Involved",
+ href => "/get-involved.html" },
+ { title => "Mailing Lists",
+ href => "/mailing-lists.html" },
+ { title => "People",
+ href => "/people.html" },
+ { title => "Wiki",
+ href => "http://wiki.apache.org/rave" }
+ ]},
+ { title => "Development", links => [
+ { title => "Getting Started",
+ href => "/source.html"},
+ { title => "IDE Settings & Debugging",
+ href => "/ide-settings-and-debugging.html)"},
+ { title => "Release Management",
+ href => "/release-management.html"},
+ { title => "Issue Tracker",
+ href => "/issue-management.html"},
+ { title => "Continuous Integration",
+ href => "https://builds.apache.org/hudson/view/M-R/view/Rave/"},
+ { title => "Sonar Dashboard",
+ href => "https://analysis.apache.org/dashboard/index/58996"},
+ { title => "Website",
+ href => "edit-website.html"}
+ ]},
+ { title => "ASF", links => [
+ { title => "Apache Software Foundation",
+ href => "http://www.apache.org" },
+ { title => "Thanks",
+ href => "http://www.apache.org/foundation/thanks.html" },
+ { title => "Become a Sponsor",
+ href => "http://www.apache.org/foundation/sponsorship.html" },
+ { title => "Security",
+ href => "http://www.apache.org/security/" }
+ ]}
+);
+
our @patterns = (
- [qr!\.mdtext$!, single_narrative => { template => "single_narrative.html" }],
+ [qr!\.mdtext$!, single_narrative => {
+ template => "single_narrative.html",
+ nav => \@nav }],
# [qr!^/stanbol/sitemap\.html$!, sitemap => { headers => { title => "Stanbol Sitemap" }} ],
Modified: rave/site/branches/bootstrapped/templates/single_narrative.html
URL: http://svn.apache.org/viewvc/rave/site/branches/bootstrapped/templates/single_narrative.html?rev=1429598&r1=1429597&r2=1429598&view=diff
==============================================================================
--- rave/site/branches/bootstrapped/templates/single_narrative.html (original)
+++ rave/site/branches/bootstrapped/templates/single_narrative.html Sun Jan 6 21:08:18 2013
@@ -1 +1 @@
-{% extends "skeleton.html" %}
+{% extends "skeleton.html" %}
\ No newline at end of file
Modified: rave/site/branches/bootstrapped/templates/skeleton.html
URL: http://svn.apache.org/viewvc/rave/site/branches/bootstrapped/templates/skeleton.html?rev=1429598&r1=1429597&r2=1429598&view=diff
==============================================================================
--- rave/site/branches/bootstrapped/templates/skeleton.html (original)
+++ rave/site/branches/bootstrapped/templates/skeleton.html Sun Jan 6 21:08:18 2013
@@ -21,27 +21,52 @@
-->
<link rel="shortcut icon" href="/images/RAVE-favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" href="//www.google.com/cse/style/look/default.css"/>
+ <link href="/css/bootstrap.min.css" rel="stylesheet"/>
<link href="/css/rave.css" rel="stylesheet"/>
<title>{% block title %}{{ headers.title }}{% endblock %}</title>
</head>
<body>
- <div id="banner">
- <img id="logo" alt="Apache Rave" src="/images/RAVE-logo_main-logo-small.png"/>
- </div>
-
- <div id="navigation">
- <div id="cse-search-form">Loading <!-- Placeholder for Google Search Form --></div>
- {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
- </div>
- <div id="content">
- <h1 class="title">{% block title %}{{ headers.title }}{% endblock %}</h1>
- {% block content %}{{ content|markdown }}{% endblock %}
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="index.html">
+ Apache Rave™
+ </a>
+ <div class="nav-collapse">
+ <ul class="nav">{% for e in nav %}
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown">{{e.title}} <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ {% for l in e.links %}<li><a href="{{ l.href }}">{{ l.title }}</a></li>{% endfor %}
+ </ul>
+ </li>
+ {% endfor %}</ul>
+ </div><!-- /.nav-collapse -->
+ </div><!-- /.container -->
+ </div><!-- /.navbar-inner -->
+ </div>
+ <div id="main" role="main" class="container">
+ <div class="row">
+ <div class="span3 pull-right">
+ <div id="cse-search-form" class="pull-right">Loading <!-- Placeholder for Google Search Form --></div>
+ </div>
+
+ <div class="span9">
+ <h1 class="title">{% block title %}{{ headers.title }}{% endblock %}</h1>
+ {% block content %}{{ content|markdown }}{% endblock %}
+ </div>
+ </div>
</div>
- <div id="footer">
- <div class="copyright">
+ <footer class="footer">
+ <div class="container">
<p>
Copyright © 2012 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
@@ -50,7 +75,9 @@
All other marks mentioned may be trademarks or registered trademarks of their respective owners.
</p>
</div>
- </div>
+ </footer>
+ <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.8.2.min.js"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.1.1/bootstrap.min.js"></script>
<script src="//www.google.com/jsapi"></script>
<script>
google.load('search', '1', {language : 'en'});