Author: snoopdave
Date: Sat Jul 14 12:20:22 2012
New Revision: 1361531

URL: http://svn.apache.org/viewvc?rev=1361531&view=rev
Log:
Fixes broken and out of date links in Roller's main website pages and addresses 
these issues: https://issues.apache.org/jira/browse/ROL-1945
https://issues.apache.org/jira/browse/ROL-1828
https://issues.apache.org/jira/browse/ROL-1935
https://issues.apache.org/jira/browse/ROL-1940

These fixes should be live on our site today.

Thanks to Glenn Mazza!

Modified:
    roller/trunk/site/docs/dev/sitemap.html
    roller/trunk/site/docs/download.html
    roller/trunk/site/docs/downloads.html
    roller/trunk/site/docs/index.html
    roller/trunk/site/xdocs/index.xml
    roller/trunk/site/xdocs/stylesheets/project.xml
    roller/trunk/site/xdocs/stylesheets/site.vsl

Modified: roller/trunk/site/docs/dev/sitemap.html
URL: 
http://svn.apache.org/viewvc/roller/trunk/site/docs/dev/sitemap.html?rev=1361531&r1=1361530&r2=1361531&view=diff
==============================================================================
--- roller/trunk/site/docs/dev/sitemap.html (original)
+++ roller/trunk/site/docs/dev/sitemap.html Sat Jul 14 12:20:22 2012
@@ -45,8 +45,8 @@ limitations under the License.
         </menu>
       <div class="menuheader">Get Involved</div>
     <menu compact="compact">
-          <li><a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";>Mailing-lists</a></li>
 
-          <li><a href="http://opensource.atlassian.com/projects/roller";>Bug 
tracker</a></li> 
+          <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>Mailing-lists</a></li>
 
+          <li><a href="https://issues.apache.org/jira/browse/ROL";>Bug 
tracker</a></li> 
         </menu>
       <div class="menuheader">Downloads</div>
     <menu compact="compact">
@@ -68,34 +68,23 @@ limitations under the License.
          </td>
     <!-- RIGHT SIDE NAVIGATION -->
     <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader">Related Sites</div>
-    <menu compact="compact">
-          <li><a href="http://rollerweblogger.org/project";>Roller project 
blog</a></li> 
-        </menu>
-      <div class="menuheader"><a 
+           <div class="menuheader"><a 
 href="http://projects.apache.org/";>Related Projects</a></div>
     <menu compact="compact">
           <li><a href="http://struts.apache.org"; />Apache Struts</li> 
           <li><a href="http://velocity.apache.org"; />Apache Velocity</li> 
-          <li><a href="http://jakarta.apache.org"; />Apache Jakarta</li> 
-          <li><a href="http://db.apache.org"; />Apache Derby</li> 
-          <li><a href="http://incubator.apache.org/abdera"; />Apache Abdera 
(incubating)</li> 
-          <li><a href="http://rome.dev.java.net"; />Java.Net ROME</li> 
-          <li><a href="http://blogapps.dev.java.net"; />Java.Net Blogapps</li> 
+          <li><a href="http://tomcat.apache.org"; />Apache Tomcat</li> 
+          <li><a href="http://db.apache.org/derby/"; />Apache Derby</li> 
+          <li><a href="http://abdera.apache.org/"; />Apache Abdera</li> 
+          <li><a href="https://rometools.jira.com/wiki/display/ROME/Home"; 
/>ROME Tools</li> 
         </menu>
 
-     <div class="menuheader">Search apache.org</div>
-     <form action="http://search.apache.org/"; method="post">
-    <p><input type="text" name="query" size="10" />
-    <input type="submit" value="Go" /></p>
-</form>
-
     </td>     
    </tr>
    <!-- FOOTER -->
    <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
    <tr><td colspan="3" class="footer">
-         Copyright &#169; 1999-2006, The Apache Software Foundation<br />
+         Copyright &#169; 1999-2012, The Apache Software Foundation<br />
 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
        </td>
    </tr>

Modified: roller/trunk/site/docs/download.html
URL: 
http://svn.apache.org/viewvc/roller/trunk/site/docs/download.html?rev=1361531&r1=1361530&r2=1361531&view=diff
==============================================================================
--- roller/trunk/site/docs/download.html (original)
+++ roller/trunk/site/docs/download.html Sat Jul 14 12:20:22 2012
@@ -46,8 +46,8 @@ limitations under the License.
         </menu>
       <div class="menuheader">Get Involved</div>
     <menu compact="compact">
-          <li><a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";>Mailing-lists</a></li>
 
-          <li><a href="http://opensource.atlassian.com/projects/roller";>Bug 
tracker</a></li> 
+          <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>Mailing-lists</a></li>
 
+          <li><a href="https://issues.apache.org/jira/browse/ROL";>Bug 
tracker</a></li> 
         </menu>
       <div class="menuheader">Downloads</div>
     <menu compact="compact">
@@ -217,34 +217,23 @@ limitations under the License.
          </td>
     <!-- RIGHT SIDE NAVIGATION -->
     <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader">Related Sites</div>
-    <menu compact="compact">
-          <li><a href="http://rollerweblogger.org/project";>Roller project 
blog</a></li> 
-        </menu>
-      <div class="menuheader"><a 
+           <div class="menuheader"><a 
 href="http://projects.apache.org/";>Related Projects</a></div>
     <menu compact="compact">
           <li><a href="http://struts.apache.org"; />Apache Struts</li> 
           <li><a href="http://velocity.apache.org"; />Apache Velocity</li> 
-          <li><a href="http://jakarta.apache.org"; />Apache Jakarta</li> 
-          <li><a href="http://db.apache.org"; />Apache Derby</li> 
-          <li><a href="http://incubator.apache.org/abdera"; />Apache Abdera 
(incubating)</li> 
-          <li><a href="http://rome.dev.java.net"; />Java.Net ROME</li> 
-          <li><a href="http://blogapps.dev.java.net"; />Java.Net Blogapps</li> 
+          <li><a href="http://tomcat.apache.org"; />Apache Tomcat</li> 
+          <li><a href="http://db.apache.org/derby/"; />Apache Derby</li> 
+          <li><a href="http://abdera.apache.org/"; />Apache Abdera</li> 
+          <li><a href="https://rometools.jira.com/wiki/display/ROME/Home"; 
/>ROME Tools</li> 
         </menu>
 
-     <div class="menuheader">Search apache.org</div>
-     <form action="http://search.apache.org/"; method="post">
-    <p><input type="text" name="query" size="10" />
-    <input type="submit" value="Go" /></p>
-</form>
-
     </td>     
    </tr>
    <!-- FOOTER -->
    <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
    <tr><td colspan="3" class="footer">
-         Copyright &#169; 1999-2006, The Apache Software Foundation<br />
+         Copyright &#169; 1999-2012, The Apache Software Foundation<br />
 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
        </td>
    </tr>

Modified: roller/trunk/site/docs/downloads.html
URL: 
http://svn.apache.org/viewvc/roller/trunk/site/docs/downloads.html?rev=1361531&r1=1361530&r2=1361531&view=diff
==============================================================================
--- roller/trunk/site/docs/downloads.html (original)
+++ roller/trunk/site/docs/downloads.html Sat Jul 14 12:20:22 2012
@@ -46,8 +46,8 @@ limitations under the License.
         </menu>
       <div class="menuheader">Get Involved</div>
     <menu compact="compact">
-          <li><a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";>Mailing-lists</a></li>
 
-          <li><a href="http://opensource.atlassian.com/projects/roller";>Bug 
tracker</a></li> 
+          <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>Mailing-lists</a></li>
 
+          <li><a href="https://issues.apache.org/jira/browse/ROL";>Bug 
tracker</a></li> 
         </menu>
       <div class="menuheader">Downloads</div>
     <menu compact="compact">
@@ -106,34 +106,23 @@ limitations under the License.
          </td>
     <!-- RIGHT SIDE NAVIGATION -->
     <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader">Related Sites</div>
-    <menu compact="compact">
-          <li><a href="http://rollerweblogger.org/project";>Roller project 
blog</a></li> 
-        </menu>
-      <div class="menuheader"><a 
+           <div class="menuheader"><a 
 href="http://projects.apache.org/";>Related Projects</a></div>
     <menu compact="compact">
           <li><a href="http://struts.apache.org"; />Apache Struts</li> 
           <li><a href="http://velocity.apache.org"; />Apache Velocity</li> 
-          <li><a href="http://jakarta.apache.org"; />Apache Jakarta</li> 
-          <li><a href="http://db.apache.org"; />Apache Derby</li> 
-          <li><a href="http://incubator.apache.org/abdera"; />Apache Abdera 
(incubating)</li> 
-          <li><a href="http://rome.dev.java.net"; />Java.Net ROME</li> 
-          <li><a href="http://blogapps.dev.java.net"; />Java.Net Blogapps</li> 
+          <li><a href="http://tomcat.apache.org"; />Apache Tomcat</li> 
+          <li><a href="http://db.apache.org/derby/"; />Apache Derby</li> 
+          <li><a href="http://abdera.apache.org/"; />Apache Abdera</li> 
+          <li><a href="https://rometools.jira.com/wiki/display/ROME/Home"; 
/>ROME Tools</li> 
         </menu>
 
-     <div class="menuheader">Search apache.org</div>
-     <form action="http://search.apache.org/"; method="post">
-    <p><input type="text" name="query" size="10" />
-    <input type="submit" value="Go" /></p>
-</form>
-
     </td>     
    </tr>
    <!-- FOOTER -->
    <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
    <tr><td colspan="3" class="footer">
-         Copyright &#169; 1999-2006, The Apache Software Foundation<br />
+         Copyright &#169; 1999-2012, The Apache Software Foundation<br />
 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
        </td>
    </tr>

Modified: roller/trunk/site/docs/index.html
URL: 
http://svn.apache.org/viewvc/roller/trunk/site/docs/index.html?rev=1361531&r1=1361530&r2=1361531&view=diff
==============================================================================
--- roller/trunk/site/docs/index.html (original)
+++ roller/trunk/site/docs/index.html Sat Jul 14 12:20:22 2012
@@ -46,8 +46,8 @@ limitations under the License.
         </menu>
       <div class="menuheader">Get Involved</div>
     <menu compact="compact">
-          <li><a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";>Mailing-lists</a></li>
 
-          <li><a href="http://opensource.atlassian.com/projects/roller";>Bug 
tracker</a></li> 
+          <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>Mailing-lists</a></li>
 
+          <li><a href="https://issues.apache.org/jira/browse/ROL";>Bug 
tracker</a></li> 
         </menu>
       <div class="menuheader">Downloads</div>
     <menu compact="compact">
@@ -71,7 +71,7 @@ limitations under the License.
         <a href="downloads.html">downloads</a>, 
         <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+User+Documentation";>user
 documentation</a>, 
         <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Install+Guides";>install
 guide</a>, 
-        <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";>mailing-lists</a>,
+        <a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>mailing-lists</a>,
         <a href="https://issues.apache.org/jira/browse/ROL";>bug tracker</a>,
         <a href="http://cwiki.apache.org/confluence/display/ROLLER";>wiki</a> 
and the 
         <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+FAQ";>FAQ</a>. 
@@ -127,34 +127,23 @@ limitations under the License.
          </td>
     <!-- RIGHT SIDE NAVIGATION -->
     <td valign="top" nowrap="nowrap" class="navright">
-           <div class="menuheader">Related Sites</div>
-    <menu compact="compact">
-          <li><a href="http://rollerweblogger.org/project";>Roller project 
blog</a></li> 
-        </menu>
-      <div class="menuheader"><a 
+           <div class="menuheader"><a 
 href="http://projects.apache.org/";>Related Projects</a></div>
     <menu compact="compact">
           <li><a href="http://struts.apache.org"; />Apache Struts</li> 
           <li><a href="http://velocity.apache.org"; />Apache Velocity</li> 
-          <li><a href="http://jakarta.apache.org"; />Apache Jakarta</li> 
-          <li><a href="http://db.apache.org"; />Apache Derby</li> 
-          <li><a href="http://incubator.apache.org/abdera"; />Apache Abdera 
(incubating)</li> 
-          <li><a href="http://rome.dev.java.net"; />Java.Net ROME</li> 
-          <li><a href="http://blogapps.dev.java.net"; />Java.Net Blogapps</li> 
+          <li><a href="http://tomcat.apache.org"; />Apache Tomcat</li> 
+          <li><a href="http://db.apache.org/derby/"; />Apache Derby</li> 
+          <li><a href="http://abdera.apache.org/"; />Apache Abdera</li> 
+          <li><a href="https://rometools.jira.com/wiki/display/ROME/Home"; 
/>ROME Tools</li> 
         </menu>
 
-     <div class="menuheader">Search apache.org</div>
-     <form action="http://search.apache.org/"; method="post">
-    <p><input type="text" name="query" size="10" />
-    <input type="submit" value="Go" /></p>
-</form>
-
     </td>     
    </tr>
    <!-- FOOTER -->
    <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
    <tr><td colspan="3" class="footer">
-         Copyright &#169; 1999-2006, The Apache Software Foundation<br />
+         Copyright &#169; 1999-2012, The Apache Software Foundation<br />
 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
        </td>
    </tr>

Modified: roller/trunk/site/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/site/xdocs/index.xml?rev=1361531&r1=1361530&r2=1361531&view=diff
==============================================================================
--- roller/trunk/site/xdocs/index.xml (original)
+++ roller/trunk/site/xdocs/index.xml Sat Jul 14 12:20:22 2012
@@ -30,7 +30,7 @@ limitations under the License.
         <a href="downloads.html">downloads</a>, 
         <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+User+Documentation";>user
 documentation</a>, 
         <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Install+Guides";>install
 guide</a>, 
-        <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";>mailing-lists</a>,
+        <a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>mailing-lists</a>,
         <a href="https://issues.apache.org/jira/browse/ROL";>bug tracker</a>,
         <a href="http://cwiki.apache.org/confluence/display/ROLLER";>wiki</a> 
and the 
         <a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+FAQ";>FAQ</a>. 

Modified: roller/trunk/site/xdocs/stylesheets/project.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/site/xdocs/stylesheets/project.xml?rev=1361531&r1=1361530&r2=1361531&view=diff
==============================================================================
--- roller/trunk/site/xdocs/stylesheets/project.xml (original)
+++ roller/trunk/site/xdocs/stylesheets/project.xml Sat Jul 14 12:20:22 2012
@@ -27,8 +27,8 @@ limitations under the License.
 </projects>
 
 <projects><title>Get Involved</title>
-    <li><a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists";>Mailing-lists</a></li>
-    <li><a href="http://opensource.atlassian.com/projects/roller";>Bug 
tracker</a></li>
+    <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>Mailing-lists</a></li>
+    <li><a href="https://issues.apache.org/jira/browse/ROL";>Bug 
tracker</a></li>
 </projects>
 
 <projects><title>Downloads</title>
@@ -37,18 +37,13 @@ limitations under the License.
     <li><a 
href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Install+Guides";>Roller
 Install Guide</a> </li>
 </projects>
 
-<menu><title>Related Sites</title>
-  <li><a href="http://rollerweblogger.org/project";>Roller project blog</a></li>
-</menu>
-
 <menu><title href="http://projects.apache.org/";>Related Projects</title>
   <li><a href="http://struts.apache.org";></a>Apache Struts</li>
   <li><a href="http://velocity.apache.org";></a>Apache Velocity</li>
-  <li><a href="http://jakarta.apache.org";></a>Apache Jakarta</li>
-  <li><a href="http://db.apache.org";></a>Apache Derby</li>
-  <li><a href="http://incubator.apache.org/abdera";></a>Apache Abdera 
(incubating)</li>
-  <li><a href="http://rome.dev.java.net";></a>Java.Net ROME</li>
-  <li><a href="http://blogapps.dev.java.net";></a>Java.Net Blogapps</li>
+  <li><a href="http://tomcat.apache.org";></a>Apache Tomcat</li>
+  <li><a href="http://db.apache.org/derby/";></a>Apache Derby</li>
+  <li><a href="http://abdera.apache.org/";></a>Apache Abdera</li>
+  <li><a href="https://rometools.jira.com/wiki/display/ROME/Home";></a>ROME 
Tools</li>
 </menu>
 
 </body>

Modified: roller/trunk/site/xdocs/stylesheets/site.vsl
URL: 
http://svn.apache.org/viewvc/roller/trunk/site/xdocs/stylesheets/site.vsl?rev=1361531&r1=1361530&r2=1361531&view=diff
==============================================================================
--- roller/trunk/site/xdocs/stylesheets/site.vsl (original)
+++ roller/trunk/site/xdocs/stylesheets/site.vsl Sat Jul 14 12:20:22 2012
@@ -300,18 +300,12 @@ href="$title.getAttributeValue("href")">
     <td valign="top" nowrap="nowrap" class="navright">
      #makeProject()
 
-     <div class="menuheader">Search apache.org</div>
-     <form action="http://search.apache.org/"; method="post">
-    <p><input type="text" name="query" size="10" />
-    <input type="submit" value="Go" /></p>
-</form>
-
     </td>     
    </tr>
    <!-- FOOTER -->
    <tr><td colspan="3"><hr noshade="noshade" size="1"/></td></tr>
    <tr><td colspan="3" class="footer">
-         Copyright &#169; 1999-2006, The Apache Software Foundation<br />
+         Copyright &#169; 1999-2012, The Apache Software Foundation<br />
 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
        </td>
    </tr>


Reply via email to