openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r871403 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze.html content/download/test/index.html
Date Sat, 27 Jul 2013 09:31:19 GMT
Author: buildbot
Date: Sat Jul 27 09:31:19 2013
New Revision: 871403

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/download/test/analyze.html
    websites/staging/ooo-site/trunk/content/download/test/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 27 09:31:19 2013
@@ -1 +1 @@
-1507614
+1507616

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 27 09:31:19 2013
@@ -1 +1 @@
-1507614
+1507616

Modified: websites/staging/ooo-site/trunk/content/download/test/analyze.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/analyze.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/analyze.html Sat Jul 27 09:31:19
2013
@@ -40,24 +40,33 @@
   var NL_LANGUAGE = "";
   var LINK        = getLink();
 
-  if ( hasMirrorLink( NL_LANGUAGE ) ) {
+  if ( hasMirrorLink() ) {
+    if ( LINK.toLowerCase().indexOf( "sourceforge" ) ) {
       // Download directly from a mirror with displayed platform and language.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
       + LINK + "');" + "return false;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION
-      + " - Milestone " + MILESTONE + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>"
-      + "Download Apache OpenOffice " + VERSION + "</a></h2>"
-      + "<p><a href='" + LINK + "' title='" + LINK + "'>Click here for the most
recent version for "
+      document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + "
- Milestone " + MILESTONE
+      + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>Download Apache OpenOffice "
+ VERSION + "</a></h2>"
+      + "<p><a href='" + LINK + "' title='Version " + VERSION + " - Milestone "
+ MILESTONE + " - Build ID " + BUILD
+      + " - SVN " + SVN_REV + "'>Click here for the most recent version for "
       + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.</a></p>");
+    } else {
+      // OS and/or package manager was not recognized, therefore use "other.html" as download
link.
+      document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+      + LINK + "');" + "return false;\">" );
+      document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>Apache
OpenOffice " + VERSION
+      + " is not available for:<br />" + UI_PLATFORM + "</a></h2>"
+      + "<p><a href='" + LINK + "' title='" + LINK + "'>Please choose from the
alternative download webpage.</a></p>");
+    }
   } else {
-    // Download from an alternative webpage if hasMirrorLink( NL_LANGUAGE ) == false.
+    // Download from an alternative webpage if hasMirrorLink() == false.
     document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
     + LANG_ARRAY[ 3 ] + "');" + "return false;\">" );
     document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[
4 ] + "'>"
     + "Download Apache OpenOffice " + VERSION + "</a></h2>"
     + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>A
release for "
-    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available.
Please "
-    + "choose another language from the alternative download webpage.</a></p>"
);
+    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available.
Please choose another language from the "
+    + "alternative download webpage.</a></p>" );
   }
   document.write( "</div>" );
 
@@ -112,8 +121,8 @@
     document.write( "<tr><td>Language name				</td><td>" + LANG_NAME
				+ "</td></tr>" );
     document.write( "<tr><td>Language ISO code				</td><td>" + LANG_ISO
				+ "</td></tr>" );
     document.write( "<tr><td>Language array data			</td><td>" + LANG_ARRAY
				+ "</td></tr>" );
-    document.write( "<tr><td>Platform name				</td><td>" + UI_PLATFORM
			+ "</td></tr>" );
-    document.write( "<tr><td>Mirror platform name			</td><td>" +
PLATFORM					+ "</td></tr>" );
+    document.write( "<tr><td>UI Platform name				</td><td>" + UI_PLATFORM
			+ "</td></tr>" );
+    document.write( "<tr><td>Mirror platform name			</td><td>" +
URL_PLATFORM					+ "</td></tr>" );
     document.write( "<tr><td>File name					</td><td>" + FILENAME
				+ "</td></tr>" );
     document.write( "<tr><td>File extension				</td><td>" + EXTENSION
				+ "</td></tr>" );
     document.write( "<tr><td>Checksum file (here for MD5)		</td><td>"
+ CHECKSUM_MD5				+ "</td></tr>" );

Modified: websites/staging/ooo-site/trunk/content/download/test/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/index.html (original)
+++ websites/staging/ooo-site/trunk/content/download/test/index.html Sat Jul 27 09:31:19 2013
@@ -68,25 +68,23 @@
   var LINK        = getLink();
 
   if ( hasMirrorLink() ) {
-    /*
-    if ( LINK.toLowerCase().indexOf( "other" ) ) {
-      // OS and/or package manager was not recognized, therefore use "other.html" as download
link.
-      document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-      + LINK + "');" + "return false;\">" );
-      document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>Download
Apache OpenOffice " + VERSION + "</a></h2>"
-      + "<p><a href='" + LINK + "' title='" + LINK + "'>Click here for the most
recent version for "
-      + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.</a></p><br
/>");
-    } else {
-    */
+    if ( LINK.toLowerCase().indexOf( "sourceforge" ) ) {
       // Download directly from a mirror with displayed platform and language.
       document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
       + LINK + "');" + "return false;\">" );
       document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + "
- Milestone " + MILESTONE
       + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>Download Apache OpenOffice "
+ VERSION + "</a></h2>"
-      + "<p><a href='" + LINK + "' title='Version " + VERSION + " - Milestone "
+ MILESTONE
-      + " - Build ID " + BUILD + " - SVN " + SVN_REV + "'>Click here for the most recent
version for "
+      + "<p><a href='" + LINK + "' title='Version " + VERSION + " - Milestone "
+ MILESTONE + " - Build ID " + BUILD
+      + " - SVN " + SVN_REV + "'>Click here for the most recent version for "
       + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.</a></p>");
-    //  }
+    } else {
+      // OS and/or package manager was not recognized, therefore use "other.html" as download
link.
+      document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
+      + LINK + "');" + "return false;\">" );
+      document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>Apache
OpenOffice " + VERSION
+      + " is not available for:<br />" + UI_PLATFORM + "</a></h2>"
+      + "<p><a href='" + LINK + "' title='" + LINK + "'>Please choose from the
alternative download webpage.</a></p>");
+    }
   } else {
     // Download from an alternative webpage if hasMirrorLink() == false.
     document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
@@ -94,8 +92,8 @@
     document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[
4 ] + "'>"
     + "Download Apache OpenOffice " + VERSION + "</a></h2>"
     + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>A
release for "
-    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available.
Please "
-    + "choose another language from the alternative download webpage.</a></p>"
);
+    + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available.
Please choose another language from the "
+    + "alternative download webpage.</a></p>" );
   }
   document.write( "</div>" );
 



Mime
View raw message