incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r1190583 - in /incubator/ooo/ooo-site/trunk: content/index.html templates/skeleton.html tools/urlrewrite.sed tools/urlrewrite.sh tools/web-list.txt
Date Fri, 28 Oct 2011 21:21:17 GMT
Author: wave
Date: Fri Oct 28 21:21:17 2011
New Revision: 1190583

URL: http://svn.apache.org/viewvc?rev=1190583&view=rev
Log:
Updates for ooo-site.apache.org

Modified:
    incubator/ooo/ooo-site/trunk/content/index.html
    incubator/ooo/ooo-site/trunk/templates/skeleton.html
    incubator/ooo/ooo-site/trunk/tools/urlrewrite.sed
    incubator/ooo/ooo-site/trunk/tools/urlrewrite.sh
    incubator/ooo/ooo-site/trunk/tools/web-list.txt

Modified: incubator/ooo/ooo-site/trunk/content/index.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/index.html?rev=1190583&r1=1190582&r2=1190583&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/index.html (original)
+++ incubator/ooo/ooo-site/trunk/content/index.html Fri Oct 28 21:21:17 2011
@@ -4,11 +4,11 @@
   <meta name="verify-v1" content="7/WnCcvax+gnJU1u0eXYQOYtS6zlmE13fsCzq+qnlUs="/>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>OpenOffice.org - The Free and Open Productivity Suite</title>
-  <script type="text/javascript" src="../download/globalvars.js"></script>
-  <script type="text/javascript" src="../download/languages.js"></script>
-  <script type="text/javascript" src="../download/download.js"></script>
-  <script type="text/javascript" src="../download/download_bouncer.js"></script>
-  <script type="text/javascript" src="../download/download_mirrorbrain.js"></script>
+  <script type="text/javascript" src="download/globalvars.js"></script>
+  <script type="text/javascript" src="download/languages.js"></script>
+  <script type="text/javascript" src="download/download.js"></script>
+  <script type="text/javascript" src="download/download_bouncer.js"></script>
+  <script type="text/javascript" src="download/download_mirrorbrain.js"></script>
   <script type="text/javascript">
   <!--
   var SHOWDOWNLOAD = false;

Modified: incubator/ooo/ooo-site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/skeleton.html?rev=1190583&r1=1190582&r2=1190583&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Fri Oct 28 21:21:17 2011
@@ -1,25 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE- 2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+<link href="/css/ooo.css" rel="stylesheet" type="text/css">
 {% if header %}
 {% autoescape off %}{{ header }}{% endautoescape %}{% else %}
 <title>{% block title %}{{ headers.title }}{% endblock %}</title>
@@ -30,9 +12,9 @@
 <body>
   <div id="banner">
     <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
-      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/images/ooo-logo.png"/></a></div>
     <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+      <img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a></div>
    <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and
Open Productivity Suite</div>
   </div>
   <div id="clear"></div>
@@ -50,7 +32,7 @@
 
   <div id="footera">
     <div id="poweredby">
-      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered
by the Apache CMS.</p>
+      <p><img src="/images/feather-small.gif"/><br/>Powered by the Apache
CMS.</p>
     </div>
     <div id="copyrighta">
       <p>
@@ -60,9 +42,8 @@
 	not necessarily a reflection of the completeness or stability of the code, it does indicate
that the project has
 	yet to be fully endorsed by the ASF.</p>
       <p>
-	Copyright &copy; 2011 The Apache Software Foundation Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.
-	<a href="/openofficeorg/contact.html">Contact Us</a> |
-	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<a href="/contact.html">Contact Us</a> |
+	<a href="/terms.html">Terms of Use</a>
 	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
 	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache
Software Foundation.
 	<br />Other names appearing on the site may be trademarks of their respective owners.

Modified: incubator/ooo/ooo-site/trunk/tools/urlrewrite.sed
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/tools/urlrewrite.sed?rev=1190583&r1=1190582&r2=1190583&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/tools/urlrewrite.sed (original)
+++ incubator/ooo/ooo-site/trunk/tools/urlrewrite.sed Fri Oct 28 21:21:17 2011
@@ -20,12 +20,14 @@
 #
 # This file contains a set of url change commands.
 #
-s/http:\/\/www.openoffice.org/\/openofficeorg\/www/g
-s/http:\/\/download.openoffice.org/\/openofficeorg\/download/g
-s/http:\/\/support.openoffice.org/\/openofficeorg\/support/g
-s/http:\/\/contributing.openoffice.org/\/openofficeorg\/contributing/g
-s/http:\/\/projects.openoffice.org/\/openofficeorg\/projects/g
-s/http:\/\/why.openoffice.org/\/openofficeorg\/why/g
+s/\/openofficeorg\/www/\//g
+s/\/openofficeorg\//\//g
+s/http:\/\/www.openoffice.org/\//g
+s/http:\/\/download.openoffice.org/\/download/g
+s/http:\/\/support.openoffice.org/\/support/g
+s/http:\/\/contributing.openoffice.org/\/contributing/g
+s/http:\/\/projects.openoffice.org/\/projects/g
+s/http:\/\/why.openoffice.org/\/why/g
 #
 # For bugzilla:
 s/http:\/\/openoffice.org\/bugzilla/https:\/\/issues.apache.org\/ooo/g

Modified: incubator/ooo/ooo-site/trunk/tools/urlrewrite.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/tools/urlrewrite.sh?rev=1190583&r1=1190582&r2=1190583&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/tools/urlrewrite.sh (original)
+++ incubator/ooo/ooo-site/trunk/tools/urlrewrite.sh Fri Oct 28 21:21:17 2011
@@ -44,7 +44,7 @@ fi
 
 toolsdir=`pwd`
 sedscripts=${toolsdir}/urlrewrite.sed
-contentdir=${toolsdir}/../content/openofficeorg/
+contentdir=${toolsdir}/../content/
 
 webproject=$1
 

Modified: incubator/ooo/ooo-site/trunk/tools/web-list.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/tools/web-list.txt?rev=1190583&r1=1190582&r2=1190583&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/tools/web-list.txt (original)
+++ incubator/ooo/ooo-site/trunk/tools/web-list.txt Fri Oct 28 21:21:17 2011
@@ -31,33 +31,9 @@
 # begin with "./".
 #
 
-#./www
-#./download
-#./de
-#./projects
-#./contributing
-#./support
-#./why
-./api
-./framework
-./bibliographic
-./tools
-./dba
-./documentation
-./external
-./graphics
-./gsl
-./installation
-./lingucomponent
-./l10n
-./marketing
-./porting
-./qa
-./sc
-./ucb
-./udk
-./ux
-./ui
-./website
-./sw
-./xml
+./.
+./download
+./de
+./projects
+./contributing
+./support



Mime
View raw message