You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by bu...@apache.org on 2014/07/15 18:04:25 UTC

svn commit: r916298 - in /websites/staging/roller/trunk/content: ./ downloads/downloads.html getinvolved/edit_website.html glentest.html index.html project/whoweare.html

Author: buildbot
Date: Tue Jul 15 16:04:25 2014
New Revision: 916298

Log:
Staging update by buildbot for roller

Modified:
    websites/staging/roller/trunk/content/   (props changed)
    websites/staging/roller/trunk/content/downloads/downloads.html
    websites/staging/roller/trunk/content/getinvolved/edit_website.html
    websites/staging/roller/trunk/content/glentest.html
    websites/staging/roller/trunk/content/index.html
    websites/staging/roller/trunk/content/project/whoweare.html

Propchange: websites/staging/roller/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul 15 16:04:25 2014
@@ -1 +1 @@
-1610716
+1610734

Modified: websites/staging/roller/trunk/content/downloads/downloads.html
==============================================================================
--- websites/staging/roller/trunk/content/downloads/downloads.html (original)
+++ websites/staging/roller/trunk/content/downloads/downloads.html Tue Jul 15 16:04:25 2014
@@ -1,86 +1,88 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html id="top" xmlns="http://www.w3.org/1999/xhtml"><head>
-  <title>Downloads
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link rel="stylesheet" type="text/css" media="screen, projection, print" href="/css/roller.css">
-  <link rel="stylesheet" type="text/css" media="print" href="/css/roller_print.css">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller_print.css" title="Print friendly">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller.css" title="Standard">
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="icon" type="image/x-icon" href="/images/favicon.ico">
-</head>
-<body class="view">
-<div id="wikibody" class="fav-left">
-  <div id="header">
-    <!-- <div class="titlebox"></div> -->
-    <div class="applicationlogo"> 
-      <a href="">Main</a>
-    </div>
-
-    <div class="companylogo"></div>
-  
-    <div class="userbox">
-      <a href="http://roller.apache.org" alt="Apache Roller">
-        <img src="/images/roller-logo.jpg" alt="Apache Roller" id="asf-logo" style="width: 180px; height: 45px;">
-      </a>
-      <div class="clearbox"></div>
-    </div>
-
-    
-    <div class="pagename">
-      Downloads

-    </div>
-    
-    
-    <div class="breadcrumbs"><a href="/">Roller</a>&nbsp;&raquo&nbsp;<a href="/downloads/">Downloads</a></div>
-  </div>
-
-  <div id="content">
-    <div id="page">
-      <div id="actionsTop" class="pageactions"> 
-      <ul>
-        <li>
-          <a href="http://www.apache.org/foundation/" class="action edit" accesskey="f" title="The Foundation [f]">
-            <span class="accesskey">F</span>oundation
-          </a>
-        </li>
-        <li>
-          <a href="http://projects.apache.org" class="action edit" accesskey="p" title="The Projects [p]">
-            <span class="accesskey">P</span>rojects
-          </a>
-        </li>
-        <li>
-          <a href="http://people.apache.org" class="action edit" accesskey="e" title="The People [e]">
-            P<span class="accesskey">e</span>ople
-          </a>
-        </li>
-        <li>
-          <a href="http://www.apache.org/foundation/getinvolved.html" class="action edit" accesskey="i" title="Get Involved [i]">
-            Get <span class="accesskey">I</span>nvolved
-          </a>
-        </li>
-        <li>
-          <a title="Downloads [ d ]" class="action edit" accesskey="d" href="http://roller.apache.org/downloads/downloads.html">
-            <span class="accesskey">D</span>ownload
-          </a>
-        </li>
-        <li href="#" id="morebutton">
-          <a href="http://www.apache.org/foundation/sponsorship.html" accesskey="s" class="action edit" title="Support Apache [ s ]">
-            <span class="accesskey">S</span>upport Apache&nbsp;
-          </a>
-        </li>
-      </ul>
-      </div>
-
-      <div class="tabmenu">
-        <a class="activetab" id="menu-pagecontent" accesskey="R" href="/index.html">
-          <span class="accesskey">R</span>oller&nbsp;
-        </a>
-      </div>
-      
-      <div class="tabs">
-        <div id="pagecontent">
-          <h2 id="apache-roller-releases">Apache Roller Releases</h2>
+<!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="images/favicon.ico">
+
+    <title>Apache Roller</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="bootstrap-3.2.0/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Bootstrap theme -->
+    <link href="bootstrap-3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="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">
+      
+
+<div class="page-header">
+<p><a href="/">Roller</a>&nbsp;&raquo&nbsp;<a href="/downloads/">Downloads</a></p>
+<h1>Downloads
+
+</h1>
+</div>
+
+<h2 id="apache-roller-releases">Apache Roller Releases</h2>
 <p>Releases of the Apache Roller blog server are made available to the 
 general public at no charge, under the 
 <a href="http://apache.org/licenses/">Apache License,</a>
@@ -151,57 +153,22 @@ Windows users can get binary md5 program
     here,</a>
 or
 <a href="http://www.slavasoft.com/fsum/">here.</a></p>
-<p>If you want to build directly from the sources, please check the <a href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+build+Roller">Project Wiki</a>.</p>
-        </div>
-        <div style="clear:both;"></div>
-      </div>
-      <div id="actionsBottom" class="pageactions"> 
-        <a href="#top" class="action quick2top" title="Ir al principio">«</a>
-      </div>
-
-    </div>
-
-    <div id="favorites">
-      <div class="leftmenu">
-      <p><strong>Project Information</strong></p>
-<ul>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER" class="external">Project Wiki</a></li>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+FAQ" class="external">Project FAQ</a></li>
-<li><a href="http://rollerweblogger.org/project" class="external">Project Blog</a></li>
-<li><a href="/project/whoweare.html">Who We Are</a></li>
-</ul>
-<p><strong>Get Involved</strong></p>
-<ul>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists" class="external">Mailing Lists</a></li>
-<li><a href="https://issues.apache.org/jira/browse/ROL" class="external">Issue Tracker</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources" class="external">Develop Roller</a></li>
-<li><a href="http://svn.apache.org/viewvc/roller/" class="external">Browse Source</a></li>
-<li><a href="https://builds.apache.org/job/Roller/" class="external">Jenkins CI</a></li>
-<li><a href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project" class="external">Sonar Analysis</a></li>
-<li><a href="/getinvolved/edit_website.html">Edit Website</a></li>
-</ul>
-<p><strong>Downloads</strong></p>
-<ul>
-<li><a href="/downloads/downloads.html">Downloads</a></li>
-<li><a href="https://dist.apache.org/repos/dist/release/roller/roller-5/v5.0.4/docs/" class="external">Documentation</a> (release)</li></li>
-<li><a href="http://svn.apache.org/viewvc/roller/trunk/docs/" class="external">Documentation</a> (latest)</li></li>
-</ul>
-      </div>
-      <div class="leftmenufooter">
-        <br /><hr>
-      </div>
-      <div class="wikiversion"></div>  
-    </div>
-
-	<div class="clearbox"></div>
-  </div>
- 
-  <div id="footer">
-    <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
-      the <a href="http://www.apache.org/licenses/LICENSE-2.0" class="external">Apache License, Version 2.0</a>.
-      <br />Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
-    </div>
-  </div>
-</div>
-</body></html>
+<p>If you want to build directly from the sources, please check the <a href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+build+Roller">Project Wiki</a>.</p>
+
+
+      </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="bootstrap-3.2.0/js/bootstrap.min.js"></script>
+  </body>
+</html>

Modified: websites/staging/roller/trunk/content/getinvolved/edit_website.html
==============================================================================
--- websites/staging/roller/trunk/content/getinvolved/edit_website.html (original)
+++ websites/staging/roller/trunk/content/getinvolved/edit_website.html Tue Jul 15 16:04:25 2014
@@ -1,86 +1,88 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html id="top" xmlns="http://www.w3.org/1999/xhtml"><head>
-  <title>Edit Website</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link rel="stylesheet" type="text/css" media="screen, projection, print" href="/css/roller.css">
-  <link rel="stylesheet" type="text/css" media="print" href="/css/roller_print.css">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller_print.css" title="Print friendly">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller.css" title="Standard">
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="icon" type="image/x-icon" href="/images/favicon.ico">
-</head>
-<body class="view">
-<div id="wikibody" class="fav-left">
-  <div id="header">
-    <!-- <div class="titlebox"></div> -->
-    <div class="applicationlogo"> 
-      <a href="">Main</a>
-    </div>
-
-    <div class="companylogo"></div>
-  
-    <div class="userbox">
-      <a href="http://roller.apache.org" alt="Apache Roller">
-        <img src="/images/roller-logo.jpg" alt="Apache Roller" id="asf-logo" style="width: 180px; height: 45px;">
-      </a>
-      <div class="clearbox"></div>
-    </div>
-
-    
-    <div class="pagename">
-      Edit Website
-    </div>
-    
-    
-    <div class="breadcrumbs"><a href="/">Roller</a>&nbsp;&raquo&nbsp;<a href="/getinvolved/">Getinvolved</a></div>
-  </div>
-
-  <div id="content">
-    <div id="page">
-      <div id="actionsTop" class="pageactions"> 
-      <ul>
-        <li>
-          <a href="http://www.apache.org/foundation/" class="action edit" accesskey="f" title="The Foundation [f]">
-            <span class="accesskey">F</span>oundation
-          </a>
-        </li>
-        <li>
-          <a href="http://projects.apache.org" class="action edit" accesskey="p" title="The Projects [p]">
-            <span class="accesskey">P</span>rojects
-          </a>
-        </li>
-        <li>
-          <a href="http://people.apache.org" class="action edit" accesskey="e" title="The People [e]">
-            P<span class="accesskey">e</span>ople
-          </a>
-        </li>
-        <li>
-          <a href="http://www.apache.org/foundation/getinvolved.html" class="action edit" accesskey="i" title="Get Involved [i]">
-            Get <span class="accesskey">I</span>nvolved
-          </a>
-        </li>
-        <li>
-          <a title="Downloads [ d ]" class="action edit" accesskey="d" href="http://roller.apache.org/downloads/downloads.html">
-            <span class="accesskey">D</span>ownload
-          </a>
-        </li>
-        <li href="#" id="morebutton">
-          <a href="http://www.apache.org/foundation/sponsorship.html" accesskey="s" class="action edit" title="Support Apache [ s ]">
-            <span class="accesskey">S</span>upport Apache&nbsp;
-          </a>
-        </li>
-      </ul>
-      </div>
-
-      <div class="tabmenu">
-        <a class="activetab" id="menu-pagecontent" accesskey="R" href="/index.html">
-          <span class="accesskey">R</span>oller&nbsp;
-        </a>
-      </div>
-      
-      <div class="tabs">
-        <div id="pagecontent">
-          <p>The website uses the Apache CMS. More detailed documentation is available on 
+<!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="images/favicon.ico">
+
+    <title>Apache Roller</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="bootstrap-3.2.0/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Bootstrap theme -->
+    <link href="bootstrap-3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="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">
+      
+
+<div class="page-header">
+<p><a href="/">Roller</a>&nbsp;&raquo&nbsp;<a href="/getinvolved/">Getinvolved</a></p>
+<h1>Edit Website
+
+</h1>
+</div>
+
+<p>The website uses the Apache CMS. More detailed documentation is available on 
 the Apache Infrastructure pages including a quickstart guide on the
 <a href="http://apache.org/dev/cms.html#usage">Apache bookmarklet</a> and a <a href="http://apache.org/dev/cmsref.html">reference manual</a>. It is also useful to look at
 <a href="http://apache.org/dev/cmsadoption.html">other Apache CMS sites</a> for examples.</p>
@@ -131,57 +133,22 @@ is more difficult to match up the number
 numbers to have to get updated</li>
 <li>Indent with spaces not tabs</li>
 <li>Use * for lists and indent lists by 4 spaces</li>
-</ul>
-        </div>
-        <div style="clear:both;"></div>
-      </div>
-      <div id="actionsBottom" class="pageactions"> 
-        <a href="#top" class="action quick2top" title="Ir al principio">«</a>
-      </div>
-
-    </div>
-
-    <div id="favorites">
-      <div class="leftmenu">
-      <p><strong>Project Information</strong></p>
-<ul>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER" class="external">Project Wiki</a></li>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+FAQ" class="external">Project FAQ</a></li>
-<li><a href="http://rollerweblogger.org/project" class="external">Project Blog</a></li>
-<li><a href="/project/whoweare.html">Who We Are</a></li>
-</ul>
-<p><strong>Get Involved</strong></p>
-<ul>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists" class="external">Mailing Lists</a></li>
-<li><a href="https://issues.apache.org/jira/browse/ROL" class="external">Issue Tracker</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources" class="external">Develop Roller</a></li>
-<li><a href="http://svn.apache.org/viewvc/roller/" class="external">Browse Source</a></li>
-<li><a href="https://builds.apache.org/job/Roller/" class="external">Jenkins CI</a></li>
-<li><a href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project" class="external">Sonar Analysis</a></li>
-<li><a href="/getinvolved/edit_website.html">Edit Website</a></li>
 </ul>
-<p><strong>Downloads</strong></p>
-<ul>
-<li><a href="/downloads/downloads.html">Downloads</a></li>
-<li><a href="https://dist.apache.org/repos/dist/release/roller/roller-5/v5.0.4/docs/" class="external">Documentation</a> (release)</li></li>
-<li><a href="http://svn.apache.org/viewvc/roller/trunk/docs/" class="external">Documentation</a> (latest)</li></li>
-</ul>
-      </div>
-      <div class="leftmenufooter">
-        <br /><hr>
-      </div>
-      <div class="wikiversion"></div>  
-    </div>
-
-	<div class="clearbox"></div>
-  </div>
- 
-  <div id="footer">
-    <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
-      the <a href="http://www.apache.org/licenses/LICENSE-2.0" class="external">Apache License, Version 2.0</a>.
-      <br />Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
-    </div>
-  </div>
-</div>
-</body></html>
+
+
+      </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="bootstrap-3.2.0/js/bootstrap.min.js"></script>
+  </body>
+</html>

Modified: websites/staging/roller/trunk/content/glentest.html
==============================================================================
--- websites/staging/roller/trunk/content/glentest.html (original)
+++ websites/staging/roller/trunk/content/glentest.html Tue Jul 15 16:04:25 2014
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="icon" href="favicon.ico">
+    <link rel="icon" href="images/favicon.ico">
 
     <title>Apache Roller</title>
 
@@ -71,6 +71,10 @@
       </div>
     </div>
 
+    <div class="container">
+      <div class="markdown-content">
+      
+
     <!-- Main jumbotron for a primary marketing message or call to action -->
     <div class="jumbotron">
       <div class="container">
@@ -114,12 +118,15 @@
 
       <hr>
 
+
+      </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 -->
 
+    </div> <!-- /container -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->

Modified: websites/staging/roller/trunk/content/index.html
==============================================================================
--- websites/staging/roller/trunk/content/index.html (original)
+++ websites/staging/roller/trunk/content/index.html Tue Jul 15 16:04:25 2014
@@ -1,86 +1,88 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html id="top" xmlns="http://www.w3.org/1999/xhtml"><head>
-  <title>Apache Roller</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link rel="stylesheet" type="text/css" media="screen, projection, print" href="/css/roller.css">
-  <link rel="stylesheet" type="text/css" media="print" href="/css/roller_print.css">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller_print.css" title="Print friendly">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller.css" title="Standard">
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="icon" type="image/x-icon" href="/images/favicon.ico">
-</head>
-<body class="view">
-<div id="wikibody" class="fav-left">
-  <div id="header">
-    <!-- <div class="titlebox"></div> -->
-    <div class="applicationlogo"> 
-      <a href="">Main</a>
-    </div>
-
-    <div class="companylogo"></div>
-  
-    <div class="userbox">
-      <a href="http://roller.apache.org" alt="Apache Roller">
-        <img src="/images/roller-logo.jpg" alt="Apache Roller" id="asf-logo" style="width: 180px; height: 45px;">
-      </a>
-      <div class="clearbox"></div>
-    </div>
-
-    
-    <div class="pagename">
-      Apache Roller
-    </div>
-    
-    
-    <div class="breadcrumbs"><a href="/">Roller</a></div>
-  </div>
-
-  <div id="content">
-    <div id="page">
-      <div id="actionsTop" class="pageactions"> 
-      <ul>
-        <li>
-          <a href="http://www.apache.org/foundation/" class="action edit" accesskey="f" title="The Foundation [f]">
-            <span class="accesskey">F</span>oundation
-          </a>
-        </li>
-        <li>
-          <a href="http://projects.apache.org" class="action edit" accesskey="p" title="The Projects [p]">
-            <span class="accesskey">P</span>rojects
-          </a>
-        </li>
-        <li>
-          <a href="http://people.apache.org" class="action edit" accesskey="e" title="The People [e]">
-            P<span class="accesskey">e</span>ople
-          </a>
-        </li>
-        <li>
-          <a href="http://www.apache.org/foundation/getinvolved.html" class="action edit" accesskey="i" title="Get Involved [i]">
-            Get <span class="accesskey">I</span>nvolved
-          </a>
-        </li>
-        <li>
-          <a title="Downloads [ d ]" class="action edit" accesskey="d" href="http://roller.apache.org/downloads/downloads.html">
-            <span class="accesskey">D</span>ownload
-          </a>
-        </li>
-        <li href="#" id="morebutton">
-          <a href="http://www.apache.org/foundation/sponsorship.html" accesskey="s" class="action edit" title="Support Apache [ s ]">
-            <span class="accesskey">S</span>upport Apache&nbsp;
-          </a>
-        </li>
-      </ul>
-      </div>
-
-      <div class="tabmenu">
-        <a class="activetab" id="menu-pagecontent" accesskey="R" href="/index.html">
-          <span class="accesskey">R</span>oller&nbsp;
-        </a>
-      </div>
-      
-      <div class="tabs">
-        <div id="pagecontent">
-          <h2 id="welcome">Welcome!</h2>
+<!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="images/favicon.ico">
+
+    <title>Apache Roller</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="bootstrap-3.2.0/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Bootstrap theme -->
+    <link href="bootstrap-3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="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">
+      
+
+<div class="page-header">
+<p><a href="/">Roller</a></p>
+<h1>Apache Roller
+
+</h1>
+</div>
+
+<h2 id="welcome">Welcome!</h2>
 <p>Apache Roller is a full-featured, multi-user and group-blog server suitable for blog sites large and small.  It runs as a Java web application that should be able to run on most any Java EE server and relational database. Roller's installation guide covers deployment on Tomcat, GlassFish, and JBoss application servers using a MySQL, Derby, or PostgreSQL database.  Users however have reported success running Roller on other app servers and databases.</p>
 <p>Here are some of Roller's key features:</p>
 <ul>
@@ -110,57 +112,22 @@ and the direction of the ASF Board.</p>
 generous support from the community. We would like to take this opportunity
 to <a href="http://www.apache.org/foundation/thanks.html">thank our Sponsors</a>.
 If you are interested in sponsoring the ASF, please
-read our <a href="http://www.apache.org/foundation/sponsorship.html">sponsorship page</a>.</p>
-        </div>
-        <div style="clear:both;"></div>
-      </div>
-      <div id="actionsBottom" class="pageactions"> 
-        <a href="#top" class="action quick2top" title="Ir al principio">«</a>
-      </div>
-
-    </div>
-
-    <div id="favorites">
-      <div class="leftmenu">
-      <p><strong>Project Information</strong></p>
-<ul>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER" class="external">Project Wiki</a></li>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+FAQ" class="external">Project FAQ</a></li>
-<li><a href="http://rollerweblogger.org/project" class="external">Project Blog</a></li>
-<li><a href="/project/whoweare.html">Who We Are</a></li>
-</ul>
-<p><strong>Get Involved</strong></p>
-<ul>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists" class="external">Mailing Lists</a></li>
-<li><a href="https://issues.apache.org/jira/browse/ROL" class="external">Issue Tracker</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources" class="external">Develop Roller</a></li>
-<li><a href="http://svn.apache.org/viewvc/roller/" class="external">Browse Source</a></li>
-<li><a href="https://builds.apache.org/job/Roller/" class="external">Jenkins CI</a></li>
-<li><a href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project" class="external">Sonar Analysis</a></li>
-<li><a href="/getinvolved/edit_website.html">Edit Website</a></li>
-</ul>
-<p><strong>Downloads</strong></p>
-<ul>
-<li><a href="/downloads/downloads.html">Downloads</a></li>
-<li><a href="https://dist.apache.org/repos/dist/release/roller/roller-5/v5.0.4/docs/" class="external">Documentation</a> (release)</li></li>
-<li><a href="http://svn.apache.org/viewvc/roller/trunk/docs/" class="external">Documentation</a> (latest)</li></li>
-</ul>
-      </div>
-      <div class="leftmenufooter">
-        <br /><hr>
-      </div>
-      <div class="wikiversion"></div>  
-    </div>
-
-	<div class="clearbox"></div>
-  </div>
- 
-  <div id="footer">
-    <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
-      the <a href="http://www.apache.org/licenses/LICENSE-2.0" class="external">Apache License, Version 2.0</a>.
-      <br />Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
-    </div>
-  </div>
-</div>
-</body></html>
+read our <a href="http://www.apache.org/foundation/sponsorship.html">sponsorship page</a>.</p>
+
+
+      </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="bootstrap-3.2.0/js/bootstrap.min.js"></script>
+  </body>
+</html>

Modified: websites/staging/roller/trunk/content/project/whoweare.html
==============================================================================
--- websites/staging/roller/trunk/content/project/whoweare.html (original)
+++ websites/staging/roller/trunk/content/project/whoweare.html Tue Jul 15 16:04:25 2014
@@ -1,86 +1,88 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html id="top" xmlns="http://www.w3.org/1999/xhtml"><head>
-  <title>Who We Are
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link rel="stylesheet" type="text/css" media="screen, projection, print" href="/css/roller.css">
-  <link rel="stylesheet" type="text/css" media="print" href="/css/roller_print.css">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller_print.css" title="Print friendly">
-  <link rel="alternate stylesheet" type="text/css" href="/css/roller.css" title="Standard">
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-  <link rel="icon" type="image/x-icon" href="/images/favicon.ico">
-</head>
-<body class="view">
-<div id="wikibody" class="fav-left">
-  <div id="header">
-    <!-- <div class="titlebox"></div> -->
-    <div class="applicationlogo"> 
-      <a href="">Main</a>
-    </div>
-
-    <div class="companylogo"></div>
-  
-    <div class="userbox">
-      <a href="http://roller.apache.org" alt="Apache Roller">
-        <img src="/images/roller-logo.jpg" alt="Apache Roller" id="asf-logo" style="width: 180px; height: 45px;">
-      </a>
-      <div class="clearbox"></div>
-    </div>
-
-    
-    <div class="pagename">
-      Who We Are

-    </div>
-    
-    
-    <div class="breadcrumbs"><a href="/">Roller</a>&nbsp;&raquo&nbsp;<a href="/project/">Project</a></div>
-  </div>
-
-  <div id="content">
-    <div id="page">
-      <div id="actionsTop" class="pageactions"> 
-      <ul>
-        <li>
-          <a href="http://www.apache.org/foundation/" class="action edit" accesskey="f" title="The Foundation [f]">
-            <span class="accesskey">F</span>oundation
-          </a>
-        </li>
-        <li>
-          <a href="http://projects.apache.org" class="action edit" accesskey="p" title="The Projects [p]">
-            <span class="accesskey">P</span>rojects
-          </a>
-        </li>
-        <li>
-          <a href="http://people.apache.org" class="action edit" accesskey="e" title="The People [e]">
-            P<span class="accesskey">e</span>ople
-          </a>
-        </li>
-        <li>
-          <a href="http://www.apache.org/foundation/getinvolved.html" class="action edit" accesskey="i" title="Get Involved [i]">
-            Get <span class="accesskey">I</span>nvolved
-          </a>
-        </li>
-        <li>
-          <a title="Downloads [ d ]" class="action edit" accesskey="d" href="http://roller.apache.org/downloads/downloads.html">
-            <span class="accesskey">D</span>ownload
-          </a>
-        </li>
-        <li href="#" id="morebutton">
-          <a href="http://www.apache.org/foundation/sponsorship.html" accesskey="s" class="action edit" title="Support Apache [ s ]">
-            <span class="accesskey">S</span>upport Apache&nbsp;
-          </a>
-        </li>
-      </ul>
-      </div>
-
-      <div class="tabmenu">
-        <a class="activetab" id="menu-pagecontent" accesskey="R" href="/index.html">
-          <span class="accesskey">R</span>oller&nbsp;
-        </a>
-      </div>
-      
-      <div class="tabs">
-        <div id="pagecontent">
-          <h2 id="roller-committers">Roller Committers</h2>
+<!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="images/favicon.ico">
+
+    <title>Apache Roller</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="bootstrap-3.2.0/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Bootstrap theme -->
+    <link href="bootstrap-3.2.0/css/bootstrap-theme.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="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">
+      
+
+<div class="page-header">
+<p><a href="/">Roller</a>&nbsp;&raquo&nbsp;<a href="/project/">Project</a></p>
+<h1>Who We Are
+
+</h1>
+</div>
+
+<h2 id="roller-committers">Roller Committers</h2>
 <p>The current Roller committer list (* = PMC member):</p>
 <ul>
 <li>Anil R. Gangolli (*)</li>
@@ -92,57 +94,22 @@
 <li><a href="http://raibledesigns.com/">Matt Raible</a> (*)</li>
 <li>Craig L Russell (*)</li>
 <li><a href="http://gauravsaini.me/">Gaurav Saini</a></li>
-</ul>
-        </div>
-        <div style="clear:both;"></div>
-      </div>
-      <div id="actionsBottom" class="pageactions"> 
-        <a href="#top" class="action quick2top" title="Ir al principio">«</a>
-      </div>
-
-    </div>
-
-    <div id="favorites">
-      <div class="leftmenu">
-      <p><strong>Project Information</strong></p>
-<ul>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER" class="external">Project Wiki</a></li>
-<li><a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+FAQ" class="external">Project FAQ</a></li>
-<li><a href="http://rollerweblogger.org/project" class="external">Project Blog</a></li>
-<li><a href="/project/whoweare.html">Who We Are</a></li>
-</ul>
-<p><strong>Get Involved</strong></p>
-<ul>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists" class="external">Mailing Lists</a></li>
-<li><a href="https://issues.apache.org/jira/browse/ROL" class="external">Issue Tracker</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources" class="external">Develop Roller</a></li>
-<li><a href="http://svn.apache.org/viewvc/roller/" class="external">Browse Source</a></li>
-<li><a href="https://builds.apache.org/job/Roller/" class="external">Jenkins CI</a></li>
-<li><a href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project" class="external">Sonar Analysis</a></li>
-<li><a href="/getinvolved/edit_website.html">Edit Website</a></li>
 </ul>
-<p><strong>Downloads</strong></p>
-<ul>
-<li><a href="/downloads/downloads.html">Downloads</a></li>
-<li><a href="https://dist.apache.org/repos/dist/release/roller/roller-5/v5.0.4/docs/" class="external">Documentation</a> (release)</li></li>
-<li><a href="http://svn.apache.org/viewvc/roller/trunk/docs/" class="external">Documentation</a> (latest)</li></li>
-</ul>
-      </div>
-      <div class="leftmenufooter">
-        <br /><hr>
-      </div>
-      <div class="wikiversion"></div>  
-    </div>
-
-	<div class="clearbox"></div>
-  </div>
- 
-  <div id="footer">
-    <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
-      the <a href="http://www.apache.org/licenses/LICENSE-2.0" class="external">Apache License, Version 2.0</a>.
-      <br />Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
-    </div>
-  </div>
-</div>
-</body></html>
+
+
+      </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="bootstrap-3.2.0/js/bootstrap.min.js"></script>
+  </body>
+</html>