buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a failed build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/31 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed sincerely, -The Buildbot
svn commit: r910465 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Thu May 29 22:55:49 2014 New Revision: 910465 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r910464, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910464, websites/staging/ooo-site/trunk/content/
svn commit: r910441 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot Date: Thu May 29 21:09:36 2014 New Revision: 910441 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/index_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 21:09:36 2014 @@ -1 +1 @@ -1598401 +1598403 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 21:09:36 2014 @@ -1 +1 @@ -1598401 +1598403 Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Thu May 29 21:09:36 2014 @@ -251,7 +251,7 @@ + "" + "" - + "" + + "" + "" + "" + ""
svn commit: r1598403 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Thu May 29 21:09:02 2014 New Revision: 1598403 URL: http://svn.apache.org/r1598403 Log: Deleted CSS style as it is set anyway via Javascript Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1598403&r1=1598402&r2=1598403&view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Thu May 29 21:09:02 2014 @@ -235,7 +235,7 @@ + "" + "" - + "" + + "" + "" + "" + ""
svn commit: r910438 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/exceptions.css
Author: buildbot
Date: Thu May 29 21:03:57 2014
New Revision: 910438
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/exceptions.css
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 21:03:57 2014
@@ -1 +1 @@
-1598391
+1598401
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 21:03:57 2014
@@ -1 +1 @@
-1598391
+1598401
Modified: websites/staging/ooo-site/trunk/content/download/test/exceptions.css
==
--- websites/staging/ooo-site/trunk/content/download/test/exceptions.css
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/exceptions.css Thu
May 29 21:03:57 2014
@@ -80,6 +80,7 @@ h1 { padding-left: 0.5em; }
.green-sel .dl-txt-btn:hover h3 a { border: 5px solid #546828; color: #546828;
}
*/
.green-sel .dl-txt-btn h3 a { background: #E9FEBE; border: 5px solid #546828;
border-radius: 15px; color: #546828; margin: 5px 0 0 3%;}
+.green-sel .dl-txt-btn:hover h3 a { background: #546828; border: 5px solid
#E9FEBE; border-radius: 15px; color: #E9FEBE; margin: 5px 0 0 3%;}
.sub-green-sel { height: 60px; background: #E9FEBE; border-top: 1px solid
#C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size:
.8em; }
.sub-green-sel p { padding: .1em 3%; width: 100%; }
svn commit: r1598401 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus
Date: Thu May 29 21:02:45 2014
New Revision: 1598401
URL: http://svn.apache.org/r1598401
Log:
Added effect for displaying the download text buttons inverted
Modified:
openoffice/ooo-site/trunk/content/download/test/exceptions.css
Modified: openoffice/ooo-site/trunk/content/download/test/exceptions.css
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/exceptions.css?rev=1598401&r1=1598400&r2=1598401&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original)
+++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Thu May 29
21:02:45 2014
@@ -80,6 +80,7 @@ h1 { padding-left: 0.5em; }
.green-sel .dl-txt-btn:hover h3 a { border: 5px solid #546828; color: #546828;
}
*/
.green-sel .dl-txt-btn h3 a { background: #E9FEBE; border: 5px solid #546828;
border-radius: 15px; color: #546828; margin: 5px 0 0 3%;}
+.green-sel .dl-txt-btn:hover h3 a { background: #546828; border: 5px solid
#E9FEBE; border-radius: 15px; color: #E9FEBE; margin: 5px 0 0 3%;}
.sub-green-sel { height: 60px; background: #E9FEBE; border-top: 1px solid
#C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size:
.8em; }
.sub-green-sel p { padding: .1em 3%; width: 100%; }
svn commit: r910433 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/exceptions.css
Author: buildbot
Date: Thu May 29 20:05:11 2014
New Revision: 910433
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/exceptions.css
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 20:05:11 2014
@@ -1 +1 @@
-1598378
+1598391
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 20:05:11 2014
@@ -1 +1 @@
-1598378
+1598391
Modified: websites/staging/ooo-site/trunk/content/download/test/exceptions.css
==
--- websites/staging/ooo-site/trunk/content/download/test/exceptions.css
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/exceptions.css Thu
May 29 20:05:11 2014
@@ -148,13 +148,13 @@ background: url(../cachedimages/button-y
background: url(../cachedimages/button-yellow-top.png) right top no-repeat
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb',
endColorstr='#fbe977', GradientType=0 ); /* IE6-9 */ }
.yellow_gradient:hover {
background: url(../cachedimages/button-yellow-bottom.png) #FFF24F right top
no-repeat; /* Old browsers */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* FF3.6+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb),
color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6),
color-stop(0%, #fbffa4), color-stop(100%, #fac81d)); /* Chrome,Safari4+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* Chrome10+,Safari5.1+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4
0%, #fac81d 100%); /* Opera 11.10+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* IE10+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* W3C */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb',
endColorstr='#fac81d', GradientType=0 ); /* IE6-9 */ }
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* FF3.6+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb),
color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6),
color-stop(0%, #fbffa4), color-stop(100%, #fac81d)); /* Chrome,Safari4+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* Chrome10+,Safari5.1+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4
0%, #fac81d 100%); /* Opera 11.10+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* IE10+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* W3C */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb',
endColorstr='#fac81d', GradientType=0 ); /* IE6-9 */ }
.yellow_gradient h2 a { color: #E09C09; }
.yellow_gradient a h2 { color: #E09C09; }
.yellow_gradient:hover h2 a, #bodycol .yellow_gradient h2 a:hover { color:
#C80; }
svn commit: r1598391 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus
Date: Thu May 29 20:03:22 2014
New Revision: 1598391
URL: http://svn.apache.org/r1598391
Log:
Fixed CSS errors
Modified:
openoffice/ooo-site/trunk/content/download/test/exceptions.css
Modified: openoffice/ooo-site/trunk/content/download/test/exceptions.css
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/exceptions.css?rev=1598391&r1=1598390&r2=1598391&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original)
+++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Thu May 29
20:03:22 2014
@@ -148,13 +148,13 @@ background: url(../cachedimages/button-y
background: url(../cachedimages/button-yellow-top.png) right top no-repeat
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb',
endColorstr='#fbe977', GradientType=0 ); /* IE6-9 */ }
.yellow_gradient:hover {
background: url(../cachedimages/button-yellow-bottom.png) #FFF24F right top
no-repeat; /* Old browsers */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* FF3.6+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb),
color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6),
color-stop(0%, #fbffa4), color-stop(100%, #fac81d)); /* Chrome,Safari4+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* Chrome10+,Safari5.1+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4
0%, #fac81d 100%); /* Opera 11.10+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
-ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* IE10+ */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* W3C */
-background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat,
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb',
endColorstr='#fac81d', GradientType=0 ); /* IE6-9 */ }
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-moz-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* FF3.6+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceabb),
color-stop(0%, #f8b500), color-stop(0%, #fccd4d), color-stop(0%, #fcffb6),
color-stop(0%, #fbffa4), color-stop(100%, #fac81d)); /* Chrome,Safari4+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-webkit-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* Chrome10+,Safari5.1+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-o-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%, #fbffa4
0%, #fac81d 100%); /* Opera 11.10+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
-ms-linear-gradient(top, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* IE10+ */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
linear-gradient(to bottom, #fceabb 0%, #f8b500 0%, #fccd4d 0%, #fcffb6 0%,
#fbffa4 0%, #fac81d 100%); /* W3C */
+background: url(../cachedimages/button-yellow-bottom.png) right top no-repeat
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fceabb',
endColorstr='#fac81d', GradientType=0 ); /* IE6-9 */ }
.yellow_gradient h2 a { color: #E09C09; }
.yellow_gradient a h2 { color: #E09C09; }
.yellow_gradient:hover h2 a, #bodycol .yellow_gradient h2 a:hover { color:
#C80; }
svn commit: r1598377 - /openoffice/ooo-site/trunk/content/download/test/instructions.html
Author: marcus Date: Thu May 29 19:26:22 2014 New Revision: 1598377 URL: http://svn.apache.org/r1598377 Log: Deleted no longer needed webpage Removed: openoffice/ooo-site/trunk/content/download/test/instructions.html
svn commit: r910432 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot Date: Thu May 29 19:36:19 2014 New Revision: 910432 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/index_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 19:36:19 2014 @@ -1 +1 @@ -1598377 +1598378 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 19:36:19 2014 @@ -1 +1 @@ -1598377 +1598378 Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Thu May 29 19:36:19 2014 @@ -226,7 +226,7 @@ // Set a specific language ISO code to force to assemble a certain localized build as download link. // The variable can be found in the "msg_prop_l10n_.js". - NL_LANG = "en-US"; + NL_LANG = ""; document.write( "" + ""
svn commit: r910431 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/instructions.html
Author: buildbot Date: Thu May 29 19:34:28 2014 New Revision: 910431 Log: Staging update by buildbot for ooo-site Removed: websites/staging/ooo-site/trunk/content/download/test/instructions.html Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 19:34:28 2014 @@ -1 +1 @@ -1598367 +1598377 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 19:34:28 2014 @@ -1 +1 @@ -1598367 +1598377
svn commit: r1598378 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Thu May 29 19:29:34 2014 New Revision: 1598378 URL: http://svn.apache.org/r1598378 Log: Removed pre-filled to get browser-guessed language Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1598378&r1=1598377&r2=1598378&view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Thu May 29 19:29:34 2014 @@ -210,7 +210,7 @@ // Set a specific language ISO code to force to assemble a certain localized build as download link. // The variable can be found in the "msg_prop_l10n_.js". - NL_LANG = "en-US"; + NL_LANG = ""; document.write( "" + ""
svn commit: r910426 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Thu May 29 18:53:22 2014
New Revision: 910426
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/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:53:22 2014
@@ -1 +1 @@
-1598360
+1598367
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:53:22 2014
@@ -1 +1 @@
-1598360
+1598367
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Thu May 29 18:53:22 2014
@@ -1218,7 +1218,8 @@ function getLinkSel( rel_mode ) {
}
// Show an error message that the chosen items do not lead to a
download.
error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for " + RELEASE_LANG[ 1 ]
-+ " (" + RELEASE_LANG[ 2 ] + ").Please
choose another language or version.";
++ " (" + RELEASE_LANG[ 2 ] + ") (" + LANG_SEL +
")."
++ "Please choose another language or
version.";
showErrorMessage( error_text );
svn commit: r1598367 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Thu May 29 18:52:43 2014
New Revision: 1598367
URL: http://svn.apache.org/r1598367
Log:
Hint text: Show also the ISO code when a language is not support
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1598367&r1=1598366&r2=1598367&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Thu
May 29 18:52:43 2014
@@ -1218,7 +1218,8 @@ function getLinkSel( rel_mode ) {
}
// Show an error message that the chosen items do not lead to a
download.
error_text = "Apache OpenOffice " + VERSION_SEL + " is not
available for " + RELEASE_LANG[ 1 ]
-+ " (" + RELEASE_LANG[ 2 ] + ").Please
choose another language or version.";
++ " (" + RELEASE_LANG[ 2 ] + ") (" + LANG_SEL +
")."
++ "Please choose another language or
version.";
showErrorMessage( error_text );
svn commit: r910425 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot Date: Thu May 29 18:42:23 2014 New Revision: 910425 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/index_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 18:42:23 2014 @@ -1 +1 @@ -1598358 +1598360 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 18:42:23 2014 @@ -1 +1 @@ -1598358 +1598360 Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Thu May 29 18:42:23 2014 @@ -60,15 +60,19 @@ - - + - + + + +
svn commit: r1598360 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Thu May 29 18:40:45 2014 New Revision: 1598360 URL: http://svn.apache.org/r1598360 Log: Updated comments, put the green box at top Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1598360&r1=1598359&r2=1598360&view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Thu May 29 18:40:45 2014 @@ -44,15 +44,19 @@ - - + - + + + +
svn commit: r910424 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Thu May 29 18:36:10 2014
New Revision: 910424
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/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:36:10 2014
@@ -1 +1 @@
-1598352
+1598358
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:36:10 2014
@@ -1 +1 @@
-1598352
+1598358
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Thu May 29 18:36:10 2014
@@ -70,7 +70,7 @@ function initVars() {
element_ids_lnk = [ "dl_f_lnk", "dl_lp_lnk", "dl_f_chk_keys",
"dl_f_chk_asc", "dl_f_chk_md5", "dl_f_chk_sha256",
"dl_chk_verify", "dl_lp_chk_keys", "dl_lp_chk_asc", "dl_lp_chk_md5",
"dl_lp_chk_sha256", "dl_hlp", "dl_rpt" ];
- // The following are used in "index.html" and "download.js".
+ // The following are used in "download.js". and "index.html".
LANG_ISO= "";// The language as ISO
code
LANG_ARRAY = "";// This array contains
all language specific data
UI_PLATFORM = "";// The platform as
readable string
@@ -81,9 +81,9 @@ function initVars() {
RELEASE_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
RELEASE_PLATFORM= "";// The platform in the
release matrix array
RELEASE_LANG= "";// The language
specific data depending on LANG_ISO
- LANG_SEL= "";// The selected
language as ISO code from drop-down-box
- PLATFORM_SEL= "";// The selected
platform from drop-down-box
- VERSION_SEL = "";// The selected
version from drop-down-box
+ LANG_SEL= "";// The selected
language as ISO code from select box
+ PLATFORM_SEL= "";// The selected
platform from select box
+ VERSION_SEL = "";// The selected
version from select box
FILENAME_FULL = "";// The complete
filename of the download URL (for full installation)
FILENAME_LP = "";// The complete
filename of the download URL (for language pack)
FILESIZE_FULL = 0; // The filesize of the
download file (for full installation)
@@ -120,9 +120,8 @@ function initVars() {
*/
function getLanguage() {
var language = "";
-
-// alertDbg( "getLanguage()" );
-/* alert( ""
+/*
+ alert( ""
+ "getLanguage() : Begin" + "\n\n"
+ "language: " + language + "\n\n"
+ "NL_LANG: " + NL_LANG + "\n\n"
@@ -134,9 +133,11 @@ function getLanguage() {
if( NL_LANG != "" )
language = NL_LANG;
- // If available, use the selected language form drop-down-box.
- if( LANG_SEL != "" )
+ // Else if available, use the selected language from select box.
+ else if( LANG_SEL != "" )
language = LANG_SEL;
+
+ // Else try to recognize the language from browser data.
else if( navigator.language )
language = navigator.language;
else if( navigator.userLanguage )
@@ -215,7 +216,7 @@ function getLanguage() {
}
/*
- * Set values into the element for OS (drop-down-box)
+ * Set values into the element for OS (select box)
* Depends on array-list
*/
function fillOSSel() {
@@ -241,7 +242,7 @@ function fillOSSel() {
}
/*
- * Set values into the element for language (drop-down-box)
+ * Set values into the element for language (select box)
* Depends on array-list
*/
function fillLangSel() {
@@ -280,7 +281,7 @@ function fillLangSel() {
}
/*
- * Set values into the element for version (drop-down-box)
+ * Set values into the element for version (select box)
* Depends on array-list
*/
function fillVerSel() {
@@ -303,7 +304,7 @@ function fillVerSel() {
}
/*
- * Set value in the element for OS (drop-down-box)
+ * Set value in the element for OS (select box)
* Depends on OS data from browser
*/
funct
svn commit: r1598358 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Thu May 29 18:34:47 2014
New Revision: 1598358
URL: http://svn.apache.org/r1598358
Log:
Fixed error: was not recognized correct
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1598358&r1=1598357&r2=1598358&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Thu
May 29 18:34:47 2014
@@ -70,7 +70,7 @@ function initVars() {
element_ids_lnk = [ "dl_f_lnk", "dl_lp_lnk", "dl_f_chk_keys",
"dl_f_chk_asc", "dl_f_chk_md5", "dl_f_chk_sha256",
"dl_chk_verify", "dl_lp_chk_keys", "dl_lp_chk_asc", "dl_lp_chk_md5",
"dl_lp_chk_sha256", "dl_hlp", "dl_rpt" ];
- // The following are used in "index.html" and "download.js".
+ // The following are used in "download.js". and "index.html".
LANG_ISO= "";// The language as ISO
code
LANG_ARRAY = "";// This array contains
all language specific data
UI_PLATFORM = "";// The platform as
readable string
@@ -81,9 +81,9 @@ function initVars() {
RELEASE_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
RELEASE_PLATFORM= "";// The platform in the
release matrix array
RELEASE_LANG= "";// The language
specific data depending on LANG_ISO
- LANG_SEL= "";// The selected
language as ISO code from drop-down-box
- PLATFORM_SEL= "";// The selected
platform from drop-down-box
- VERSION_SEL = "";// The selected
version from drop-down-box
+ LANG_SEL= "";// The selected
language as ISO code from select box
+ PLATFORM_SEL= "";// The selected
platform from select box
+ VERSION_SEL = "";// The selected
version from select box
FILENAME_FULL = "";// The complete
filename of the download URL (for full installation)
FILENAME_LP = "";// The complete
filename of the download URL (for language pack)
FILESIZE_FULL = 0; // The filesize of the
download file (for full installation)
@@ -120,9 +120,8 @@ function initVars() {
*/
function getLanguage() {
var language = "";
-
-// alertDbg( "getLanguage()" );
-/* alert( ""
+/*
+ alert( ""
+ "getLanguage() : Begin" + "\n\n"
+ "language: " + language + "\n\n"
+ "NL_LANG: " + NL_LANG + "\n\n"
@@ -134,9 +133,11 @@ function getLanguage() {
if( NL_LANG != "" )
language = NL_LANG;
- // If available, use the selected language form drop-down-box.
- if( LANG_SEL != "" )
+ // Else if available, use the selected language from select box.
+ else if( LANG_SEL != "" )
language = LANG_SEL;
+
+ // Else try to recognize the language from browser data.
else if( navigator.language )
language = navigator.language;
else if( navigator.userLanguage )
@@ -215,7 +216,7 @@ function getLanguage() {
}
/*
- * Set values into the element for OS (drop-down-box)
+ * Set values into the element for OS (select box)
* Depends on array-list
*/
function fillOSSel() {
@@ -241,7 +242,7 @@ function fillOSSel() {
}
/*
- * Set values into the element for language (drop-down-box)
+ * Set values into the element for language (select box)
* Depends on array-list
*/
function fillLangSel() {
@@ -280,7 +281,7 @@ function fillLangSel() {
}
/*
- * Set values into the element for version (drop-down-box)
+ * Set values into the element for version (select box)
* Depends on array-list
*/
function fillVerSel() {
@@ -303,7 +304,7 @@ function fillVerSel() {
}
/*
- * Set value in the element for OS (drop-down-box)
+ * Set value in the element for OS (select box)
* Depends on OS data from browser
*/
function setOSSel() {
@@ -326,13 +327,13 @@ function setOSSel() {
// URL_PLATFORM = "";
- // Set the recognized browser platform as default for the drop-down-box.
+ // Set the recognized browser platform as default for the select box.
// alert( "SEL_OS.length: " + SEL_OS.length / 3 );
// alert( "URL_PLATFORM: " + URL_PLATFORM );
// alert( "sel_os.selectedIndex: " + sel_os.selectedIndex );
// for( var i = 0; i < SEL_OS.len
svn commit: r910421 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Thu May 29 18:09:09 2014
New Revision: 910421
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/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:09:09 2014
@@ -1 +1 @@
-1598350
+1598352
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:09:09 2014
@@ -1 +1 @@
-1598350
+1598352
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Thu May 29 18:09:09 2014
@@ -1133,8 +1133,6 @@ function getLink( rel_mode ) {
* Depends on chosen OS, language and type
*/
function getLinkSel( rel_mode ) {
- var error_text;
-
// Reset all error flags.
SF = false;
OTHER = false;
@@ -1146,7 +1144,6 @@ function getLinkSel( rel_mode ) {
rel_mode = 1;
// Get the selected data from the drop-down-boxes.
-
getOSSel();
getLangSel();
getVerSel();
svn commit: r910420 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot
Date: Thu May 29 18:06:54 2014
New Revision: 910420
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/index_droplist.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:06:54 2014
@@ -1 +1 @@
-1598349
+1598350
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:06:54 2014
@@ -1 +1 @@
-1598349
+1598350
Modified:
websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
==
--- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html
Thu May 29 18:06:54 2014
@@ -100,7 +100,7 @@
+ "Download Apache OpenOffice " + VERSION + ""
+ ""
+ "Click here to download (hosted by Sourceforge.net) for:"
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1
] + " (" + RELEASE_MATRIX_LANG[ 2 ] + ")"
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + "
(" + RELEASE_LANG[ 2 ] + ")"
+ "Filesize ~" + FILESIZE_FULL + " MByte | Milestone " +
MILESTONE + " | Build ID " + BUILD
+ " | SVN " + SVN_REV + " | Released: " + REL_DATE + ""
+ "" );
@@ -111,7 +111,7 @@
+ "Download Apache OpenOffice " + VERSION + ""
+ ""
+ ""
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] + "
(" + RELEASE_MATRIX_LANG[ 2 ] + ") "
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ " (Hosted by Sourceforge.net - A trusted
website)"
+ "" );
} else if ( OTHER ) {
@@ -123,7 +123,7 @@
+ "Download Apache OpenOffice"
+ ""
+ "Apache OpenOffice " + VERSION + " for "
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] + "
(" + RELEASE_MATRIX_LANG[ 2 ] + ") "
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here to choose from the alternative
download webpage."
+ "" );
} else if ( ARCHIVE ) {
@@ -135,7 +135,7 @@
+ "Download Apache OpenOffice"
+ ""
+ "Apache OpenOffice " + VERSION + " for "
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] + "
(" + RELEASE_MATRIX_LANG[ 2 ] + ") "
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here for the previous version " +
PRE_VERSION + "."
+ "" );
}
@@ -147,8 +147,8 @@
+ ""
+ "Download Apache OpenOffice"
+ ""
- + "Apache OpenOffice " + VERSION + " for " + RELEASE_MATRIX_LANG[ 1 ]
+ " (" + RELEASE_MATRIX_LANG[ 2 ] + ") "
- + "is not available. Click here to choose from the alternative " +
RELEASE_MATRIX_LANG[ 1 ] + " download webpage."
+ + "Apache OpenOffice " + VERSION + " for " + RELEASE_LANG[ 1 ] + " ("
+ RELEASE_LANG[ 2 ] + ") "
+ + "is not available. Click here to choose from the alternative " +
RELEASE_LANG[ 1 ] + " download webpage."
+ ""
+ "" );
}
@@ -375,7 +375,7 @@
+ ""
+ "Click here to download for:"
- + "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] +
" (" + RELEASE_MATRIX_LANG[ 2 ] + ") | "
+ + "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") | "
+ "~" + FILESIZE_FULL + " MByte | Released: " + BETA_REL_DATE + ""
+ "The Beta release is feature complete but not yet fully
tested and can contain issues. "
+ "It is strongly not recommended to use in production!"
@@ -388,7 +388,7 @@
+ ""
+ "Download Apache OpenOffice"
+ "Apache
OpenOffice " + BETA_NAME + " for "
- + "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] +
" (" + RELEASE_MATRIX_LANG[ 2 ] + ") "
+ + "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here to choose from the alternative
download webpage."
+ "" );
} else if ( ARCHIVE ) {
@@ -399,7 +399,7 @@
+ ""
+ "Download Apache OpenOffice"
+ "Apache
OpenOffice " + BETA_NAME + " for "
- + "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] +
" (" + RELEASE_MATRIX_LANG[ 2 ] + ") "
+ + "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Clic
svn commit: r1598351 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Thu May 29 18:06:01 2014
New Revision: 1598351
URL: http://svn.apache.org/r1598351
Log:
Removed unused variable
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1598351&r1=1598350&r2=1598351&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Thu
May 29 18:06:01 2014
@@ -1133,8 +1133,6 @@ function getLink( rel_mode ) {
* Depends on chosen OS, language and type
*/
function getLinkSel( rel_mode ) {
- var error_text;
-
// Reset all error flags.
SF = false;
OTHER = false;
@@ -1146,7 +1144,6 @@ function getLinkSel( rel_mode ) {
rel_mode = 1;
// Get the selected data from the drop-down-boxes.
-
getOSSel();
getLangSel();
getVerSel();
svn commit: r910419 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Thu May 29 18:05:29 2014
New Revision: 910419
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/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:05:29 2014
@@ -1 +1 @@
-1598348
+1598349
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:05:29 2014
@@ -1 +1 @@
-1598348
+1598349
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Thu May 29 18:05:29 2014
@@ -23,6 +23,7 @@
* function getPlatform()
* function getReleaseMatrixPos()
* function getFilename( ver )
+ * function getFileData( ver )
* function getFilesize( ver )
* function openItem ( itemid, uri )
* function alertDbg ( location )
@@ -76,10 +77,10 @@ function initVars() {
UI_PLATFORM_NO_SUP = "";// The platform as
readable string, if not supported
URL_PLATFORM= "";// The platform as
part of the download URL
OLD_PLATFORM= false; // Is the browser
platform old (true) or not (false)?
- RELEASE_MATRIX_PLATFORM_POS_FULL= 0; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM = "";// The platform in the
release matrix array
- RELEASE_MATRIX_LANG = "";// The language
specific data depending on LANG_ISO
+ RELEASE_PLATFORM_POS_FULL = 0; // The position of the
platform in the release matrix array
+ RELEASE_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
+ RELEASE_PLATFORM= "";// The platform in the
release matrix array
+ RELEASE_LANG= "";// The language
specific data depending on LANG_ISO
LANG_SEL= "";// The selected
language as ISO code from drop-down-box
PLATFORM_SEL= "";// The selected
platform from drop-down-box
VERSION_SEL = "";// The selected
version from drop-down-box
@@ -88,6 +89,7 @@ function initVars() {
FILESIZE_FULL = 0; // The filesize of the
download file (for full installation)
FILESIZE_LP = 0; // The filesize of the
download file (for language pack)
EXTENSION = "";// The file extension
of the download URL
+ REL_TEXT= "";// The release data
(milestone, build ID, svn rev, release date)
// TYPE= "";// The installation
type
// LINK= "";// The complete
download URL
LINK_FULL = "";// The complete
download URL (for full installation)
@@ -198,8 +200,8 @@ function getLanguage() {
LANG_ISO = language;
LANG_ARRAY = thisLanguage;
- var thisReleaseMatrixSet = release_matrix_410[ LANG_ISO ];
- RELEASE_MATRIX_LANG = thisReleaseMatrixSet[ 0 ];
+ var thisReleaseMatrixSet = release_410[ LANG_ISO ];
+ RELEASE_LANG = thisReleaseMatrixSet[ 0 ];
/*
alert( ""
+ "getLanguage() : End" + "\n\n"
@@ -945,25 +947,26 @@ function isLangSupported() {
switch( VERSION_SEL ) {
case "4.1.0":
- RELEASE_MATRIX_LANG = release_matrix_410[ LANG_ISO ][ 0
];
+ RELEASE_LANG = release_410[ LANG_ISO ][ 0 ];
break;
case "4.0.1":
- RELEASE_MATRIX_LANG = release_matrix_401[ LANG_ISO ][ 0
];
+ RELEASE_LANG = release_401[ LANG_ISO ][ 0 ];
break;
case "4.0.0":
- // Todo: Implement a "release_matrix_400" array in the
"release_matrix.js" file.
-//
svn commit: r1598350 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus
Date: Thu May 29 18:05:15 2014
New Revision: 1598350
URL: http://svn.apache.org/r1598350
Log:
Updated variables
Modified:
openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1598350&r1=1598349&r2=1598350&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/index_droplist.html
(original)
+++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Thu May
29 18:05:15 2014
@@ -84,7 +84,7 @@
+ "Download Apache OpenOffice " + VERSION + ""
+ ""
+ "Click here to download (hosted by Sourceforge.net) for:"
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1
] + " (" + RELEASE_MATRIX_LANG[ 2 ] + ")"
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + "
(" + RELEASE_LANG[ 2 ] + ")"
+ "Filesize ~" + FILESIZE_FULL + " MByte | Milestone " +
MILESTONE + " | Build ID " + BUILD
+ " | SVN " + SVN_REV + " | Released: " + REL_DATE + ""
+ "" );
@@ -95,7 +95,7 @@
+ "Download Apache OpenOffice " + VERSION + ""
+ ""
+ ""
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] + "
(" + RELEASE_MATRIX_LANG[ 2 ] + ") "
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ " (Hosted by Sourceforge.net - A trusted
website)"
+ "" );
} else if ( OTHER ) {
@@ -107,7 +107,7 @@
+ "Download Apache OpenOffice"
+ ""
+ "Apache OpenOffice " + VERSION + " for "
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] + "
(" + RELEASE_MATRIX_LANG[ 2 ] + ") "
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here to choose from the alternative
download webpage."
+ "" );
} else if ( ARCHIVE ) {
@@ -119,7 +119,7 @@
+ "Download Apache OpenOffice"
+ ""
+ "Apache OpenOffice " + VERSION + " for "
-+ "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] + "
(" + RELEASE_MATRIX_LANG[ 2 ] + ") "
++ "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here for the previous version " +
PRE_VERSION + "."
+ "" );
}
@@ -131,8 +131,8 @@
+ ""
+ "Download Apache OpenOffice"
+ ""
- + "Apache OpenOffice " + VERSION + " for " + RELEASE_MATRIX_LANG[ 1 ]
+ " (" + RELEASE_MATRIX_LANG[ 2 ] + ") "
- + "is not available. Click here to choose from the alternative " +
RELEASE_MATRIX_LANG[ 1 ] + " download webpage."
+ + "Apache OpenOffice " + VERSION + " for " + RELEASE_LANG[ 1 ] + " ("
+ RELEASE_LANG[ 2 ] + ") "
+ + "is not available. Click here to choose from the alternative " +
RELEASE_LANG[ 1 ] + " download webpage."
+ ""
+ "" );
}
@@ -359,7 +359,7 @@
+ ""
+ "Click here to download for:"
- + "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] +
" (" + RELEASE_MATRIX_LANG[ 2 ] + ") | "
+ + "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") | "
+ "~" + FILESIZE_FULL + " MByte | Released: " + BETA_REL_DATE + ""
+ "The Beta release is feature complete but not yet fully
tested and can contain issues. "
+ "It is strongly not recommended to use in production!"
@@ -372,7 +372,7 @@
+ ""
+ "Download Apache OpenOffice"
+ "Apache
OpenOffice " + BETA_NAME + " for "
- + "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] +
" (" + RELEASE_MATRIX_LANG[ 2 ] + ") "
+ + "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here to choose from the alternative
download webpage."
+ "" );
} else if ( ARCHIVE ) {
@@ -383,7 +383,7 @@
+ ""
+ "Download Apache OpenOffice"
+ "Apache
OpenOffice " + BETA_NAME + " for "
- + "" + UI_PLATFORM + " and " + RELEASE_MATRIX_LANG[ 1 ] +
" (" + RELEASE_MATRIX_LANG[ 2 ] + ") "
+ + "" + UI_PLATFORM + " and " + RELEASE_LANG[ 1 ] + " (" +
RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here for the previous version " +
PRE_VERSION + "."
+ "" );
}
@@ -395,19 +395,19 @@
+ ""
+ "Download Apache OpenOffice " + BETA_NAME + ""
+ "Apache
OpenOffice " + BETA_NAME + " for "
-+ "" + RELEASE_MATRIX_LANG[ 1 ] + " (" + RELEASE_MATRIX_LANG[ 2 ] +
") "
++ "" + RELEASE_LANG[ 1 ] + " (" + RELEASE_LANG[ 2 ] + ") "
+ "is not available. Click here to choose from the alternative Beta
Release download webpage."
svn commit: r1598349 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Thu May 29 18:04:03 2014
New Revision: 1598349
URL: http://svn.apache.org/r1598349
Log:
Updated variables and text, improved assembling for filename, filesize and
release data
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1598349&r1=1598348&r2=1598349&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Thu
May 29 18:04:03 2014
@@ -23,6 +23,7 @@
* function getPlatform()
* function getReleaseMatrixPos()
* function getFilename( ver )
+ * function getFileData( ver )
* function getFilesize( ver )
* function openItem ( itemid, uri )
* function alertDbg ( location )
@@ -76,10 +77,10 @@ function initVars() {
UI_PLATFORM_NO_SUP = "";// The platform as
readable string, if not supported
URL_PLATFORM= "";// The platform as
part of the download URL
OLD_PLATFORM= false; // Is the browser
platform old (true) or not (false)?
- RELEASE_MATRIX_PLATFORM_POS_FULL= 0; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
- RELEASE_MATRIX_PLATFORM = "";// The platform in the
release matrix array
- RELEASE_MATRIX_LANG = "";// The language
specific data depending on LANG_ISO
+ RELEASE_PLATFORM_POS_FULL = 0; // The position of the
platform in the release matrix array
+ RELEASE_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array
+ RELEASE_PLATFORM= "";// The platform in the
release matrix array
+ RELEASE_LANG= "";// The language
specific data depending on LANG_ISO
LANG_SEL= "";// The selected
language as ISO code from drop-down-box
PLATFORM_SEL= "";// The selected
platform from drop-down-box
VERSION_SEL = "";// The selected
version from drop-down-box
@@ -88,6 +89,7 @@ function initVars() {
FILESIZE_FULL = 0; // The filesize of the
download file (for full installation)
FILESIZE_LP = 0; // The filesize of the
download file (for language pack)
EXTENSION = "";// The file extension
of the download URL
+ REL_TEXT= "";// The release data
(milestone, build ID, svn rev, release date)
// TYPE= "";// The installation
type
// LINK= "";// The complete
download URL
LINK_FULL = "";// The complete
download URL (for full installation)
@@ -198,8 +200,8 @@ function getLanguage() {
LANG_ISO = language;
LANG_ARRAY = thisLanguage;
- var thisReleaseMatrixSet = release_matrix_410[ LANG_ISO ];
- RELEASE_MATRIX_LANG = thisReleaseMatrixSet[ 0 ];
+ var thisReleaseMatrixSet = release_410[ LANG_ISO ];
+ RELEASE_LANG = thisReleaseMatrixSet[ 0 ];
/*
alert( ""
+ "getLanguage() : End" + "\n\n"
@@ -945,25 +947,26 @@ function isLangSupported() {
switch( VERSION_SEL ) {
case "4.1.0":
- RELEASE_MATRIX_LANG = release_matrix_410[ LANG_ISO ][ 0
];
+ RELEASE_LANG = release_410[ LANG_ISO ][ 0 ];
break;
case "4.0.1":
- RELEASE_MATRIX_LANG = release_matrix_401[ LANG_ISO ][ 0
];
+ RELEASE_LANG = release_401[ LANG_ISO ][ 0 ];
break;
case "4.0.0":
- // Todo: Implement a "release_matrix_400" array in the
"release_matrix.js" file.
-// RELEASE_MATRIX_LANG = release_matrix_400[ LANG_ISO ][ 0
];
+ // Todo: Implement a "release_400" array in the
"release_matrix.js" file.
+
+ RELEASE_LANG = release_400[ LANG_ISO ][ 0 ];
break;
default:
- RELEASE_MATRIX_LANG = "";
+ RELEASE_LANG = "";
svn commit: r910418 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/release_matrix_droplist.js
Author: buildbot
Date: Thu May 29 18:01:59 2014
New Revision: 910418
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/release_matrix_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:01:59 2014
@@ -1 +1 @@
-1598333
+1598348
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 18:01:59 2014
@@ -1 +1 @@
-1598333
+1598348
Modified:
websites/staging/ooo-site/trunk/content/download/test/release_matrix_droplist.js
==
---
websites/staging/ooo-site/trunk/content/download/test/release_matrix_droplist.js
(original)
+++
websites/staging/ooo-site/trunk/content/download/test/release_matrix_droplist.js
Thu May 29 18:01:59 2014
@@ -18,18 +18,19 @@
3: Empty, not used
First row:
-a b 0 1 23 4
+a b 0 1 2 3 4
Further rows:
a b 0 12 3
*/
-var release_matrix_410 = {
+var release_410 = {
"src":{
"0": [ 'src', 'English (US)', 'English (US)', 'y',
'download/other.html' ],
-"1": [ 'tar_bz2', 'y', '208' ],
-"2": [ 'tar_gz', 'y', '274' ],
-"3": [ 'zip', 'y', '320' ]},
+"1": [ 'AOO410m18', '9764','r1589052', '2014-Apr-29' ],
+"2": [ 'tar_bz2', 'y', '208' ],
+"3": [ 'tar_gz', 'y', '274' ],
+"4": [ 'zip', 'y', '320' ]},
"sdk":{
"0": [ 'sdk', 'English (US)', 'English (US)', 'y',
'download/other.html' ],
@@ -152,7 +153,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 11' ]},
"en-US":{
-"0": [ 'en-US', 'English (US)','English (US)', 'y',
'download/other.html' ],
+"0": [ 'en-US', 'English (US)','English (US)', 'y',
'download/other.html' ],
"1": [ 'Linux_x86-64_install-deb', 'y', '153' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 18' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '154' ],
@@ -167,7 +168,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 17' ]},
"es":{
-"0": [ 'es', 'Spanish','Español', 'y',
'es/' ],
+"0": [ 'es', 'Spanish','Español', 'y', 'es/' ],
"1": [ 'Linux_x86-64_install-deb', 'y', '143' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 12' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '144' ],
@@ -197,7 +198,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 12' ]},
"fi":{
-"0": [ 'fi', 'Finnish','Suomi', 'y',
'fi/lataa.html' ],
+"0": [ 'fi', 'Finnish','Suomi', 'y', 'fi/lataa.html'
],
"1": [ 'Linux_x86-64_install-deb', 'y', '149' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 19' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '150' ],
@@ -302,7 +303,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 12' ]},
"it":{
-"0": [ 'it', 'Italian','Italiano', 'y',
'it/download/' ],
+"0": [ 'it', 'Italian','Italiano', 'y',
'it/download/' ],
"1": [ 'Linux_x86-64_install-deb', 'y', '148' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 12' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '149' ],
@@ -333,7 +334,7 @@ var release_matrix_410 = {
"km":{
"0": [ 'km', 'Khmer', 'áá¶áá¶ááááá',
'y', 'download/other.html' ],
-"1": [ 'Linux_x86-64_install-deb', 'y', '145',
'' ],
+"1": [ 'Linux_x86-64_install-deb', 'y', '145' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 15' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '146' ],
"4": [ 'Linux_x86-64_langpack-rpm','y', ' 15' ],
@@ -347,8 +348,8 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 31' ]},
"ko":{
-"0": [ 'ko', 'Korean', 'íêµì´', 'y', 'ko/' ],
-"1": [ 'Linux_x86-64_install-deb', 'y', '142',
'' ],
+
svn commit: r1598348 - /openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
Author: marcus
Date: Thu May 29 18:00:43 2014
New Revision: 1598348
URL: http://svn.apache.org/r1598348
Log:
Updated text and commments
Modified:
openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
Modified:
openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js?rev=1598348&r1=1598347&r2=1598348&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
Thu May 29 18:00:43 2014
@@ -18,18 +18,19 @@
3: Empty, not used
First row:
-a b 0 1 23 4
+a b 0 1 2 3 4
Further rows:
a b 0 12 3
*/
-var release_matrix_410 = {
+var release_410 = {
"src":{
"0": [ 'src', 'English (US)', 'English (US)', 'y',
'download/other.html' ],
-"1": [ 'tar_bz2', 'y', '208' ],
-"2": [ 'tar_gz', 'y', '274' ],
-"3": [ 'zip', 'y', '320' ]},
+"1": [ 'AOO410m18', '9764','r1589052', '2014-Apr-29' ],
+"2": [ 'tar_bz2', 'y', '208' ],
+"3": [ 'tar_gz', 'y', '274' ],
+"4": [ 'zip', 'y', '320' ]},
"sdk":{
"0": [ 'sdk', 'English (US)', 'English (US)', 'y',
'download/other.html' ],
@@ -152,7 +153,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 11' ]},
"en-US":{
-"0": [ 'en-US', 'English (US)','English (US)', 'y',
'download/other.html' ],
+"0": [ 'en-US', 'English (US)','English (US)', 'y',
'download/other.html' ],
"1": [ 'Linux_x86-64_install-deb', 'y', '153' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 18' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '154' ],
@@ -167,7 +168,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 17' ]},
"es":{
-"0": [ 'es', 'Spanish','Español', 'y',
'es/' ],
+"0": [ 'es', 'Spanish','Español', 'y', 'es/' ],
"1": [ 'Linux_x86-64_install-deb', 'y', '143' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 12' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '144' ],
@@ -197,7 +198,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 12' ]},
"fi":{
-"0": [ 'fi', 'Finnish','Suomi', 'y',
'fi/lataa.html' ],
+"0": [ 'fi', 'Finnish','Suomi', 'y', 'fi/lataa.html'
],
"1": [ 'Linux_x86-64_install-deb', 'y', '149' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 19' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '150' ],
@@ -302,7 +303,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 12' ]},
"it":{
-"0": [ 'it', 'Italian','Italiano', 'y',
'it/download/' ],
+"0": [ 'it', 'Italian','Italiano', 'y',
'it/download/' ],
"1": [ 'Linux_x86-64_install-deb', 'y', '148' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 12' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '149' ],
@@ -333,7 +334,7 @@ var release_matrix_410 = {
"km":{
"0": [ 'km', 'Khmer', 'áá¶áá¶ááááá',
'y', 'download/other.html' ],
-"1": [ 'Linux_x86-64_install-deb', 'y', '145',
'' ],
+"1": [ 'Linux_x86-64_install-deb', 'y', '145' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 15' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '146' ],
"4": [ 'Linux_x86-64_langpack-rpm','y', ' 15' ],
@@ -347,8 +348,8 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 31' ]},
"ko":{
-"0": [ 'ko', 'Korean', 'íêµì´', 'y', 'ko/' ],
-"1": [ 'Linux_x86-64_install-deb', 'y', '142',
'' ],
+"0": [ 'ko', 'Korean', 'íêµì´', 'y',
'ko/' ],
+"1": [ 'Linux_x86-64_install-deb', 'y', '142' ],
"2": [ 'Linux_x86-64_langpack-deb','y', ' 12' ],
"3": [ 'Linux_x86-64_install-rpm', 'y', '143' ],
"4": [ 'Linux_x86-64_langpack-rpm','y', ' 12' ],
@@ -452,7 +453,7 @@ var release_matrix_410 = {
"12": [ 'Win_x86_langpack', 'y', ' 12' ]},
"ru":{
-"0": [ 'ru'
svn commit: r910415 [1/2] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/release_matrix_droplist.js
Author: buildbot Date: Thu May 29 16:48:03 2014 New Revision: 910415 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/release_matrix_droplist.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 16:48:03 2014 @@ -1 +1 @@ -1598282 +1598333 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 16:48:03 2014 @@ -1 +1 @@ -1598282 +1598333
svn commit: r1598333 [1/2] - /openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
Author: marcus Date: Thu May 29 16:46:24 2014 New Revision: 1598333 URL: http://svn.apache.org/r1598333 Log: Added release data for AOO 4.0.0 Modified: openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
svn commit: r910393 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Thu May 29 12:50:42 2014
New Revision: 910393
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/download_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 12:50:42 2014
@@ -1 +1 @@
-1598281
+1598282
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu May 29 12:50:42 2014
@@ -1 +1 @@
-1598281
+1598282
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Thu May 29 12:50:42 2014
@@ -92,13 +92,13 @@ function initVars() {
// LINK= "";// The complete
download URL
LINK_FULL = "";// The complete
download URL (for full installation)
LINK_LP = "";// The complete
download URL (for language pack)
- LINK_CHECKSUM_KEYS = "";// The KEYS file as
download URL
- LINK_CHECKSUM_ASC_FULL = "";// The ASC file as
download URL (for full installation)
- LINK_CHECKSUM_MD5_FULL = "";// The MD5 file as
download URL (for full installation)
- LINK_CHECKSUM_SHA256_FULL = "";// The SHA256 file as
download URL (for full installation)
- LINK_CHECKSUM_ASC_LP= "";// The ASC file as
download URL (for language pack)
- LINK_CHECKSUM_MD5_LP= "";// The MD5 file as
download URL (for language pack)
- LINK_CHECKSUM_SHA256_LP = "";// The SHA256 file as
download URL (for language pack)
+ LINK_CHK_KEYS = "";// The KEYS file as
download URL
+ LINK_CHK_ASC_FULL = "";// The ASC file as
download URL (for full installation)
+ LINK_CHK_MD5_FULL = "";// The MD5 file as
download URL (for full installation)
+ LINK_CHK_SHA256_FULL= "";// The SHA256 file as
download URL (for full installation)
+ LINK_CHK_ASC_LP = "";// The ASC file as
download URL (for language pack)
+ LINK_CHK_MD5_LP = "";// The MD5 file as
download URL (for language pack)
+ LINK_CHK_SHA256_LP = "";// The SHA256 file as
download URL (for language pack)
SOURCEFORGE_BASE_URL= "";// The base URL for
all binary files on Sourceforge
SOURCEFORGE_PREV_URL= "";// The base URL for
all binary files (prev. version) on Sourceforge
ASF_BASE_URL= "";// The base URL for
all binary files on Apache
@@ -110,8 +110,6 @@ function initVars() {
OTHER = false; // Does the download
URL points to 'other.html'?
ARCHIVE = false; // Does the download
URL points to the ASF archive?
ERROR = false; // Is the download URL
in general correct (false) or not (true)?
-
- return;
}
/*
@@ -181,7 +179,7 @@ function getLanguage() {
thisLanguage = thisLanguageSet[ regionCode ];
} else {
// Choose the default langCode
- thisLanguage = thisLanguageSet[ "-" ];
+ var thisLanguage = thisLanguageSet[ "-" ];
if( languageCode == "en" ) {
// Special case, default is en-US for en-XX
language= "en-US";
@@ -238,8 +236,6 @@ function fillOSSel() {
// Set the recognized platform as default.
// setOSSel();
-
- return;
}
/*
@@ -279,7 +275,6 @@ function fillLangSel() {
sel_lang.appendChild( option );
}
*/
- return;
}
/*
@@ -303,8 +298,6 @@ function fillVerSel() {
// Set the version from the $VERSION variable as default.
// setVerSel();
-
- return;
}
/*
@@ -646,7 +639,7 @@ function getOSSel() {
+ "\n\n"
+ "" );
*/
- return;
+ return PLATFORM_SEL;
}
/*
@@ -708,7 +701,7 @@ function getLangSel() {
+ "\n\n"
+ "" );
*/
- return;
svn commit: r1598282 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Thu May 29 12:49:20 2014
New Revision: 1598282
URL: http://svn.apache.org/r1598282
Log:
Updated variables and return statements
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1598282&r1=1598281&r2=1598282&view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Thu
May 29 12:49:20 2014
@@ -92,13 +92,13 @@ function initVars() {
// LINK= "";// The complete
download URL
LINK_FULL = "";// The complete
download URL (for full installation)
LINK_LP = "";// The complete
download URL (for language pack)
- LINK_CHECKSUM_KEYS = "";// The KEYS file as
download URL
- LINK_CHECKSUM_ASC_FULL = "";// The ASC file as
download URL (for full installation)
- LINK_CHECKSUM_MD5_FULL = "";// The MD5 file as
download URL (for full installation)
- LINK_CHECKSUM_SHA256_FULL = "";// The SHA256 file as
download URL (for full installation)
- LINK_CHECKSUM_ASC_LP= "";// The ASC file as
download URL (for language pack)
- LINK_CHECKSUM_MD5_LP= "";// The MD5 file as
download URL (for language pack)
- LINK_CHECKSUM_SHA256_LP = "";// The SHA256 file as
download URL (for language pack)
+ LINK_CHK_KEYS = "";// The KEYS file as
download URL
+ LINK_CHK_ASC_FULL = "";// The ASC file as
download URL (for full installation)
+ LINK_CHK_MD5_FULL = "";// The MD5 file as
download URL (for full installation)
+ LINK_CHK_SHA256_FULL= "";// The SHA256 file as
download URL (for full installation)
+ LINK_CHK_ASC_LP = "";// The ASC file as
download URL (for language pack)
+ LINK_CHK_MD5_LP = "";// The MD5 file as
download URL (for language pack)
+ LINK_CHK_SHA256_LP = "";// The SHA256 file as
download URL (for language pack)
SOURCEFORGE_BASE_URL= "";// The base URL for
all binary files on Sourceforge
SOURCEFORGE_PREV_URL= "";// The base URL for
all binary files (prev. version) on Sourceforge
ASF_BASE_URL= "";// The base URL for
all binary files on Apache
@@ -110,8 +110,6 @@ function initVars() {
OTHER = false; // Does the download
URL points to 'other.html'?
ARCHIVE = false; // Does the download
URL points to the ASF archive?
ERROR = false; // Is the download URL
in general correct (false) or not (true)?
-
- return;
}
/*
@@ -181,7 +179,7 @@ function getLanguage() {
thisLanguage = thisLanguageSet[ regionCode ];
} else {
// Choose the default langCode
- thisLanguage = thisLanguageSet[ "-" ];
+ var thisLanguage = thisLanguageSet[ "-" ];
if( languageCode == "en" ) {
// Special case, default is en-US for en-XX
language= "en-US";
@@ -238,8 +236,6 @@ function fillOSSel() {
// Set the recognized platform as default.
// setOSSel();
-
- return;
}
/*
@@ -279,7 +275,6 @@ function fillLangSel() {
sel_lang.appendChild( option );
}
*/
- return;
}
/*
@@ -303,8 +298,6 @@ function fillVerSel() {
// Set the version from the $VERSION variable as default.
// setVerSel();
-
- return;
}
/*
@@ -646,7 +639,7 @@ function getOSSel() {
+ "\n\n"
+ "" );
*/
- return;
+ return PLATFORM_SEL;
}
/*
@@ -708,7 +701,7 @@ function getLangSel() {
+ "\n\n"
+ "" );
*/
- return;
+ return LANG_SEL;
}
/*
@@ -736,7 +729,7 @@ function getVerSel() {
}
}
- return;
+ return VERSION_SEL;
}
/*
@@ -761,7 +754,7 @@ function getTypeSel() {
TYPE = "";
}
- return;
+ return TYPE;
}
/*
@@ -887,7 +880,6 @@ function resetSel() {
document.getElementById( "dl_rpt_img" ).title = "";
document.getElementById( "dl_rpt_img" ).alt
svn commit: r910392 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot Date: Thu May 29 12:47:05 2014 New Revision: 910392 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/index_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 12:47:05 2014 @@ -1 +1 @@ -1598263 +1598281 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu May 29 12:47:05 2014 @@ -1 +1 @@ -1598263 +1598281 Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Thu May 29 12:47:05 2014 @@ -61,7 +61,9 @@ + + @@ -209,7 +212,8 @@ - + + - + Download Apache OpenOffice @@ -350,6 +355,7 @@ + + @@ -505,112 +514,6 @@ title="Choose from a wide range of additional and individual documents"> Extend your Apache OpenOffice creativity with a large and growing library of templates from other users. - - - - /* - - */ - - - - - - - - /* - @@ -193,7 +196,8 @@ - + + - + Download Apache OpenOffice @@ -334,6 +339,7 @@ + + @@ -489,112 +498,6 @@ title="Choose from a wide range of additional and individual documents"> Extend your Apache OpenOffice creativity with a large and growing library of templates from other users. - - - - /* - - */ - - - - - - - - /* -