openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r864881 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze.html content/download/test/download.js content/download/test/globalvars.js content/download/test/languages.js
Date Sat, 08 Jun 2013 19:19:41 GMT
Author: buildbot
Date: Sat Jun  8 19:19:40 2013
New Revision: 864881

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/download.js
    websites/staging/ooo-site/trunk/content/download/test/globalvars.js
    websites/staging/ooo-site/trunk/content/download/test/languages.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun  8 19:19:40 2013
@@ -1 +1 @@
-1491032
+1491037

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jun  8 19:19:40 2013
@@ -1 +1 @@
-1491032
+1491037

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 Jun  8 19:19:40
2013
@@ -11,8 +11,8 @@
   <style type="text/css">
   /* <![CDATA[ */
   /*-------------------- Exceptions on standard css -----------------------*/
-  @import "styles.css";
-  @import "exceptions.css";
+  @import "../styles.css";
+  @import "../exceptions.css";
   /* ]]> */
   </style>
 
@@ -35,29 +35,28 @@
 <div class="optionset">
 
 <!-- Green: Stable release -->
-  <script type="text/javascript">  
+  <script type="text/javascript">
   <!--
   // Set a specific language ISO code to force to assemble a certain localized build as download
URL
   var NL_LANGUAGE = "";
   var LINK        = getLink();
 
-  if ( hasMirrorLink() ) {
+  if ( hasMirrorLink( NL_LANGUAGE ) ) {
     // 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='" + LINK + "'>Download
Apache OpenOffice " + VERSION + "</a></h2>"
-    + "<p><a href='" + LINK + "' title='" + LINK + "'>Click to start downloading
the most recent version for "
-    + UI_PLATFORM + " and " + LANG_ARRAY[ 2 ] + ".</a></p>" );
+    + "<p><a href='" + LINK + "' title='" + LINK + "'>Click here for the most
recent version for <b>"
+    + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b>.<br /></a></p>");
   } else {
-    // Download from an alternative webpage as hasMirrorLink() == false.
+    // Download from an alternative webpage if hasMirrorLink( NL_LANGUAGE ) == false.
     document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','"
-    + LANG_ARRAY[ 4 ] + "');" + "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 " + LANG_ARRAY[ 2 ]
-    + " is not available. Please choose from the alternative download webpage for another
language.</a></p>" );
+    + LANG_ARRAY[ 3 ] + "');" + "return false;\">" );
+    document.write( "<h2><a href='" + LANG_ARRAY[ 3 ] + "' title='" + LANG_ARRAY[
3 ] + "'>Download Apache OpenOffice "
+    + VERSION + "</a></h2><p><a href='" + LANG_ARRAY[ 3 ] + "' title='"
+ LANG_ARRAY[ 3 ] + "'>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>" );
   }
-
   document.write( "</div>" );
   // -->
   </script>
@@ -69,7 +68,7 @@
   <script type="text/javascript">
     document.write( "<table border='1' style='border-collapse:collapse; border-spacing:
2px; float: left'><tbody>" );
     document.write( "<tr><td><b>Variables from the browser		</b></td><td><b>Values</b></td></tr>"
);
-    // document.write( "<tr><td>window.location.href			</td><td>"
+ window.location.href			+ "</td></tr>" );
+    document.write( "<tr><td>window.location.href			</td><td>" +
window.location.href			+ "</td></tr>" );
     document.write( "<tr><td>navigator.appCodeName			</td><td>" +
navigator.appCodeName			+ "</td></tr>" );
     document.write( "<tr><td>navigator.appName				</td><td>" + navigator.appName
			+ "</td></tr>" );
     document.write( "<tr><td>navigator.appVersion			</td><td>" +
navigator.appVersion			+ "</td></tr>" );

Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Sat Jun  8 19:19:40
2013
@@ -128,19 +128,22 @@ function getLink() {
 	//	version = version.split( "_" )[0];
 
 	if ( hasMirrorLink() ) {
-		file_link = PEOPLE_BASE_URL + VERSION + "/binaries/" + NL_LANGUAGE + "/Apache_OpenOffice_incubating_"
-                file_link = file_link + VERSION + "_" + PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
-		FILENAME  = "Apache_OpenOffice_incubating_" + VERSION + "_" + PLATFORM + "_" + NL_LANGUAGE
+ EXTENSION;
-
-		if ( NL_LANGUAGE == "en-US" ) {
-			chk_link = APACHE_DIST_BASE_URL + "files/stable/"                        + VERSION
-			chk_link = chk_link + "/Apache_OpenOffice_incubating_" + VERSION + "_" + PLATFORM + "_"
-			chk_link = chk_link + NL_LANGUAGE + EXTENSION;
-		} else {
-			chk_link = APACHE_DIST_BASE_URL + "files/localized/" + NL_LANGUAGE + "/" + VERSION
-			chk_link = chk_link + "/Apache_OpenOffice_incubating_" + VERSION + "_" + PLATFORM + "_"
-			chk_link = chk_link + NL_LANGUAGE + EXTENSION;
-		}
+		// file_link = SOURCEFORGE_BASE_URL + NL_LANGUAGE + "/Apache_OpenOffice_";
+                // file_link = file_link + VERSION + "_" + PLATFORM + "_" + NL_LANGUAGE;
+                // file_link = file_link + EXTENSION;
+
+		file_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE;
+		file_link = file_link + "/Apache_OpenOffice_" + VERSION + "_" + PLATFORM;
+                file_link = file_link + "_" + NL_LANGUAGE + EXTENSION;
+		FILENAME = "Apache_OpenOffice_" + VERSION + "_" + PLATFORM + "_"
+		FILENAME = FILENAME + NL_LANGUAGE + EXTENSION;
+
+		// chk_link = APACHE_DIST_BASE_URL + "Apache_OpenOffice_" + VERSION + "_";
+		// chk_link = chk_link + PLATFORM + "_" + NL_LANGUAGE + EXTENSION;
+
+		chk_link = PEOPLE_BASE_URL + "/binaries/" + NL_LANGUAGE;
+		chk_link = chk_link + "/Apache_OpenOffice_" + VERSION + "_" + PLATFORM;
+		chk_link = chk_link + "_" + NL_LANGUAGE + EXTENSION;
 
 		CHECKSUM_ASC    = chk_link + ".asc";
 		CHECKSUM_MD5    = chk_link + ".md5";
@@ -181,7 +184,7 @@ function getPlatform() {
 				EXTENSION	= ".tar.gz";
 				if ( navigator.userAgent.toLowerCase().indexOf( "debian" )    != -1 ||
 				     navigator.userAgent.toLowerCase().indexOf( "ubuntu" )    != -1 ||
-				     navigator.userAgent.toLowerCase().indexOf( "iceweasel" ) != -1 ) {
+				     navigator.userAgent.toLowerCase().indexOf( "iceweasel") != -1 ) {
 					UI_PLATFORM	= "Linux Debian 64-bit (DEB)";
 					PLATFORM	= "Linux_x86-64_install-deb";
 					EXTENSION	= ".tar.gz";
@@ -234,7 +237,7 @@ function getPlatform() {
 			UI_PLATFORM	= "Android mobile device";
 			PLATFORM	= "no_mirror_platform";
 			EXTENSION	= "no_extension";
-		} else if ( navigator.userAgent.toLowerCase().indexOf( "blackberry" ) != -1 ) {
+		} else if ( navigator.userAgent.toLowerCase().indexOf( "blackberry" ) !=-1 ) {
 			UI_PLATFORM	= "Blackberry mobile device";
 			PLATFORM	= "no_mirror_platform";
 			EXTENSION	= "no_extension";
@@ -258,4 +261,3 @@ function openItem( itemid, uri ) {
 	var thisDocument  = document.getElementById( itemid );
 	document.location = uri;
 };
-

Modified: websites/staging/ooo-site/trunk/content/download/test/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/globalvars.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/globalvars.js Sat Jun  8 19:19:40
2013
@@ -10,14 +10,10 @@
    SCHEMA:  Set the naming-schema for the download-set (e.g., "aoo") (not used as only 1
mirror system is used)
 */
 
-// Base URLs to the Sourceforge and Apache mirror server
-var SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/";
-var PEOPLE_BASE_URL		= "http://people.apache.org/~marcus/aoo/";
-var APACHE_BASE_URL		= "http://www.apache.org/dyn/aoo-closer.cgi/incubator/ooo/";
-var APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/incubator/ooo/";
-
 // General variables for the most recent stable release
-var VERSION			= "3.4.1";
+var VERSION			= "4.0.0";
+// var MIRROR			= "sourceforge";
+// var SCHEMA			= "aoo";
 
 // Variables for the tables for the most recent stable release
 var PLATFORM			= new Array( "Win_x86", "Linux_x86_rpm", "Linux_x86_deb", "Linux_x86-64_rpm",
"Linux_x86-64_deb", "Mac_OS_x86" );
@@ -25,8 +21,16 @@ var FULL_LANG			= new Array( "ar","cs","
 var LP_LANG			= new Array( "ar","cs","de","en-GB","en-US","es","fi","fr","gl","hu","it","ja","km","nl","pt-BR","ru","sk","sl","zh-CN","zh-TW"
);
 var SDK_LANG			= new Array( "en-US" );
 
+// Base URLs to the Sourceforge and Apache mirror server
+var SOURCEFORGE_BASE_URL	= "http://sourceforge.net/projects/openofficeorg.mirror/" + VERSION
+ "/binaries/";
+var PEOPLE_BASE_URL		= "http://people.apache.org/~marcus/aoo/"                 + VERSION;
+var APACHE_BASE_URL		= "http://www.apache.org/dyn/aoo-closer.cgi/aoo/"         + VERSION
+ "/binaries/";
+var APACHE_DIST_BASE_URL	= "http://www.apache.org/dist/aoo/"                       + VERSION
+ "/source/";
+
 // Deprecated mirror server
 // var MIRROR_BOUNCER_URL	= "http://openoffice.bouncer.osuosl.org/";
 // var MIRROR_MIRRORBRAIN_URL	= "http://download.services.openoffice.org/";
 // var MIRROR_MIRRORBRAIN_URL2	= "http://openoffice.mirrorbrain.org/";
 
+// The maximal available number of languages
+var LANG_MAX			= 133;

Modified: websites/staging/ooo-site/trunk/content/download/test/languages.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/languages.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/languages.js Sat Jun  8 19:19:40
2013
@@ -26,8 +26,8 @@ var languages = {
 "de": {"-": ['de',    'German',			'Deutsch',				'y', 'http://www.openoffice.org/de/']},
 "hu": {"-": ['hu',    'Hungarian',		'Magyar',				'y', 'http://www.openoffice.org/hu/about-downloads.html']},
 "it": {"-": ['it',    'Italian',		'Italiano',				'y', 'http://www.openoffice.org/it/download/']},
-"ja": {"-": ['ja',    'Japanese',		'日本語',				'y', 'http://www.openoffice.org/ja/']},
-"km": {"-": ['km',    'Khmer',			'ភាសាខ្មែរ',
		'y', 'http://www.openoffice.org/km/']},
+"ja": {"-": ['ja',    'Japanese',		'日本語',					'y', 'http://www.openoffice.org/ja/']},
+"km": {"-": ['km',    'Khmer',			'ភាសាខ្មែរ',
			'y', 'http://www.openoffice.org/km/']},
 "pt": {"-": ['pt',    'Portuguese (European)',	'Portugu&ecirc;s (Europeu)',		'y', 'http://www.openoffice.org/pt/download/download.htm'],
       "pt": ['pt-PT', 'Portuguese (European)',	'Portugu&ecirc;s (Europeu)',		'y', 'http://www.openoffice.org/pt/download/download.htm'],
       "br": ['pt-BR', 'Portuguese (Brazilian)',	'Portugu&ecirc;s (do Brasil)',		'y',
'http://www.openoffice.org/pt-br/']},
@@ -36,7 +36,7 @@ var languages = {
 "sl": {"-": ['sl',    'Slovenian',		'Slovenski jezik (slovenščina)',	'y', 'http://www.openoffice.org/sl/']},
 "es": {"-": ['es',    'Spanish',		'Espa&ntilde;ol',			'y', 'http://www.openoffice.org/es/']},
 
-"as": {"-": ['as',    'Assamese',               'অসমীয়া',
				'n',  'http://as.openoffice.org/']},
+"as": {"-": ['as',    'Assamese',               'অসমীয়া',
			'n',  'http://as.openoffice.org/']},
 "ast":{"-": ['ast',   'Asturian',               'Asturianu',				'n', 'http://ast.openoffice.org/']},
 "eu": {"-": ['eu',    'Basque',                 'Euskara',				'n', 'http://eu.openoffice.org/']},
 "be": {"-": ['be',    'Belarusian',             'Беларуская
мова',			'n', 'http://be.openoffice.org/'],
@@ -55,7 +55,7 @@ var languages = {
 "et": {"-": ['et',    'Estonian',               'Eesti keel',				'n', 'http://www.openoffice.org/download/other.html']},
 "ka": {"-": ['ka',    'Georgian',               'ქართული
ენა',				'n', 'http://ka.openoffice.org/']},
 "el": {"-": ['el',    'Greek',                  '&Epsilon;&lambda;&lambda;&eta;&nu;&iota;&kappa;ά',
'n', 'http://el.openoffice.org/']},
-"gu": {"-": ['gu',    'Gujarati',               'ગુજરાતી',
				'n', 'http://gu.openoffice.org/']},
+"gu": {"-": ['gu',    'Gujarati',               'ગુજરાતી',
			'n', 'http://gu.openoffice.org/']},
 "he": {"-": ['he',    'Hebrew',                 'עִבְרִית',					'n',
'http://www.openoffice.org/download/other.html']},
 "hi": {"-": ['hi',    'Hindi',                  'हिन्दी',	
			'n', 'http://hi.openoffice.org/']},
 "is": {"-": ['is',    'Icelandic',              'Íslenska',				'n', 'http://is.openoffice.org/']},
@@ -88,7 +88,7 @@ var languages = {
 "si": {"-": ['si',    'Sinhala',                'සිංහල',					'n',
'http://si.openoffice.org/']},
 "sv": {"-": ['sv',    'Swedish',                'Svenska',				'n', 'http://sv.openoffice.org/get/']},
 "ta": {"-": ['ta',    'Tamil',                  'தமிழ்',					'n',
'http://ta.openoffice.org/']},
-"te": {"-": ['te',    'Telugu',                 'తెలుగు',	
		'n', 'http://te.openoffice.org/']},
+"te": {"-": ['te',    'Telugu',                 'తెలుగు',	
			'n', 'http://te.openoffice.org/']},
 "th": {"-": ['th',    'Thai',                   'ภาษาไทย',
			'n', 'http://th.openoffice.org/']},
 "tr": {"-": ['tr',    'Turkish',                'T&uuml;rk&ccedil;e',			'n', 'http://tr.openoffice.org/']},
 "uk": {"-": ['uk',    'Ukrainian',              'Yкраї́нська
мо́ва',			'n', 'http://uk.openoffice.org/']},
@@ -97,4 +97,3 @@ var languages = {
 "vi": {"-": ['vi',    'Vietnamese',             'Tiếng Việt',				'n', 'http://vi.openoffice.org/']},
 "cy": {"-": ['cy',    'Welsh',                  'Cymraeg',				'n', 'http://cy.openoffice.org/']}
 };
-



Mime
View raw message