roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1610734 - in /roller/cmssite/trunk: lib/path.pm templates/roller-template.html templates/test.html
Date Tue, 15 Jul 2014 16:04:21 GMT
Author: gmazza
Date: Tue Jul 15 16:04:20 2014
New Revision: 1610734

URL: http://svn.apache.org/r1610734
Log:
Creating roller-template.html

Modified:
    roller/cmssite/trunk/lib/path.pm
    roller/cmssite/trunk/templates/roller-template.html
    roller/cmssite/trunk/templates/test.html

Modified: roller/cmssite/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/lib/path.pm?rev=1610734&r1=1610733&r2=1610734&view=diff
==============================================================================
--- roller/cmssite/trunk/lib/path.pm (original)
+++ roller/cmssite/trunk/lib/path.pm Tue Jul 15 16:04:20 2014
@@ -4,10 +4,11 @@ package path;
 
 our @patterns = (
 	[qr!/glentest.mdtext$!, single_narrative => { template => "test.html" }],
-	[qr!\.mdtext$!, single_narrative => { template => "single_narrative.html" }],
-	[qr!/sitemap\.html$!, sitemap => { headers => { title => "Sitemap" }} ],
+	[qr!\.mdtext$!, single_narrative => { template => "basic.html" }],
 ) ;
 
+# [qr!/sitemap\.html$!, sitemap => { headers => { title => "Sitemap" }} ],
+
 # for specifying interdependencies between files
 
 our %dependencies = (

Modified: roller/cmssite/trunk/templates/roller-template.html
URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/templates/roller-template.html?rev=1610734&r1=1610733&r2=1610734&view=diff
==============================================================================
--- roller/cmssite/trunk/templates/roller-template.html (original)
+++ roller/cmssite/trunk/templates/roller-template.html Tue Jul 15 16:04:20 2014
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="{{base}}images/favicon.ico">
+
+    <title>Apache Roller</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="{{base}}bootstrap-3.2.0/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Bootstrap theme -->
+    <link href="{{base}}bootstrap-3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="{{base}}css/roller-bs.css" rel="stylesheet">
+
+  </head>
+
+  <body>
+
+    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Apache Roller</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Project Info
<span class="caret"></span></a>
+              <ul class="dropdown-menu" role="menu">
+                <li><a href="http://rollerweblogger.org/project">Team Blog</a></li>
+                <li><a href="http://cwiki.apache.org/confluence/display/ROLLER">Project
Wiki</a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">Mailing
Lists</a></li>
+                <li><a href="http://roller.apache.org/project/whoweare.html">Who
We Are</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved
<span class="caret"></span></a>
+              <ul class="dropdown-menu" role="menu">
+                <li><a href="https://issues.apache.org/jira/browse/ROL">Issue
Tracker</a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources">Development
Information</a></li>
+                <li><a href="http://svn.apache.org/viewvc/roller/">Browse Source</a></li>
+                <li><a href="https://builds.apache.org/job/Roller/">Jenkins CI</a></li>
+                <li><a href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project">Sonar
Analysis</a></li>
+                <li><a href="http://roller.apache.org/getinvolved/edit_website.html">Website
Admin</a></li>
+              </ul>
+            </li>
+            <li><a href="http://roller.apache.org/downloads/downloads.html">Download</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <span
class="caret"></span></a>
+              <ul class="dropdown-menu" role="menu">
+                <li><a href="http://www.apache.org/foundation/">Foundation</a></li>
+                <li><a href="http://projects.apache.org/">Projects</a></li>
+                <li><a href="http://people.apache.org/">People</a></li>
+                <li><a href="http://www.apache.org/foundation/sponsorship.html">Support
Apache</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+    <div class="container">
+      <div class="markdown-content">
+      {% block content %}{{ content|markdown }}{% endblock %}
+      </div>
+
+      <footer>
+        <p>Copyright &copy; 2014 The Apache Software Foundation, Licensed under
the 
+        <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
2.0</a>.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script src="{{base}}bootstrap-3.2.0/js/bootstrap.min.js"></script>
+  </body>
+</html>

Modified: roller/cmssite/trunk/templates/test.html
URL: http://svn.apache.org/viewvc/roller/cmssite/trunk/templates/test.html?rev=1610734&r1=1610733&r2=1610734&view=diff
==============================================================================
--- roller/cmssite/trunk/templates/test.html (original)
+++ roller/cmssite/trunk/templates/test.html Tue Jul 15 16:04:20 2014
@@ -1,75 +1,6 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="favicon.ico">
+{% extends "roller-template.html" %}
 
-    <title>Apache Roller</title>
-
-    <!-- Bootstrap core CSS -->
-    <link href="{{base}}bootstrap-3.2.0/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- Bootstrap theme -->
-    <link href="{{base}}bootstrap-3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
-
-    <!-- Custom styles for this template -->
-    <link href="{{base}}css/roller-bs.css" rel="stylesheet">
-
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">Apache Roller</a>
-        </div>
-        <div class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Project Info
<span class="caret"></span></a>
-              <ul class="dropdown-menu" role="menu">
-                <li><a href="http://rollerweblogger.org/project">Team Blog</a></li>
-                <li><a href="http://cwiki.apache.org/confluence/display/ROLLER">Project
Wiki</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">Mailing
Lists</a></li>
-                <li><a href="http://roller.apache.org/project/whoweare.html">Who
We Are</a></li>
-              </ul>
-            </li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved
<span class="caret"></span></a>
-              <ul class="dropdown-menu" role="menu">
-                <li><a href="https://issues.apache.org/jira/browse/ROL">Issue
Tracker</a></li>
-                <li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources">Development
Information</a></li>
-                <li><a href="http://svn.apache.org/viewvc/roller/">Browse Source</a></li>
-                <li><a href="https://builds.apache.org/job/Roller/">Jenkins CI</a></li>
-                <li><a href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project">Sonar
Analysis</a></li>
-                <li><a href="http://roller.apache.org/getinvolved/edit_website.html">Website
Admin</a></li>
-              </ul>
-            </li>
-            <li><a href="http://roller.apache.org/downloads/downloads.html">Download</a></li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">ASF <span
class="caret"></span></a>
-              <ul class="dropdown-menu" role="menu">
-                <li><a href="http://www.apache.org/foundation/">Foundation</a></li>
-                <li><a href="http://projects.apache.org/">Projects</a></li>
-                <li><a href="http://people.apache.org/">People</a></li>
-                <li><a href="http://www.apache.org/foundation/sponsorship.html">Support
Apache</a></li>
-              </ul>
-            </li>
-          </ul>
-        </div><!--/.nav-collapse -->
-      </div>
-    </div>
+{% block content %}
 
     <!-- Main jumbotron for a primary marketing message or call to action -->
     <div class="jumbotron">
@@ -114,17 +45,5 @@
 
       <hr>
 
-      <footer>
-        <p>Copyright &copy; 2014 The Apache Software Foundation, Licensed under
the 
-        <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
2.0</a>.</p>
-      </footer>
-    </div> <!-- /container -->
-
+{% endblock %}
 
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="{{base}}bootstrap-3.2.0/js/bootstrap.min.js"></script>
-  </body>
-</html>



Mime
View raw message