svn commit: r1598164 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Wed May 28 22:39:57 2014 New Revision: 1598164 URL: http://svn.apache.org/r1598164 Log: Move the debugging function 'alertDbg' to the bottom 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=1598164r1=1598163r2=1598164view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Wed May 28 22:39:57 2014 @@ -3,7 +3,6 @@ * -- * function init () * function initVars () - * function alertDbg ( location ) * function getLanguage() * function fillOSSel () * function fillLangSel() @@ -26,6 +25,7 @@ * function getFilename( ver ) * function getFilesize( ver ) * function openItem ( itemid, uri ) + * function alertDbg ( location ) */ /* @@ -113,55 +113,6 @@ function initVars() { } /* - * Output values of variables for debugging - */ -function alertDbg( location ) { - if( location == ) - location = No location named!; - - alert( - + location + \n - + NL_LANG:+ \t\t\t\t\t\t\t + NL_LANG + \n - + LANG_ISO: + \t\t\t\t\t\t+ LANG_ISO + \n - + LANG_ARRAY: + \t\t\t\t\t\t+ LANG_ARRAY+ \n - + RELEASE_MATRIX_PLATFORM_POS_FULL: + \t + RELEASE_MATRIX_PLATFORM_POS_FULL + \n - + RELEASE_MATRIX_PLATFORM_POS_LP: + \t\t+ RELEASE_MATRIX_PLATFORM_POS_LP+ \n - + RELEASE_MATRIX_PLATFORM:+ \t\t\t + RELEASE_MATRIX_PLATFORM + \n - + RELEASE_MATRIX_LANG:+ \t\t\t\t+ RELEASE_MATRIX_LANG + \n - + UI_PLATFORM:+ \t\t\t\t\t\t+ UI_PLATFORM + \n - + UI_PLATFORM_NO_SUP: + \t\t\t\t+ UI_PLATFORM_NO_SUP+ \n - + URL_PLATFORM: + \t\t\t\t\t\t+ URL_PLATFORM + \n - + OLD_PLATFORM: + \t\t\t\t\t + OLD_PLATFORM + \n - + LANG_SEL: + \t\t\t\t\t\t+ LANG_SEL + \n - + PLATFORM_SEL: + \t\t\t\t\t\t+ PLATFORM_SEL + \n - + VERSION_SEL:+ \t\t\t\t\t\t+ VERSION_SEL + \n - + FILENAME_FULL: + \t\t\t\t\t + FILENAME_FULL + \n - + FILENAME_LP:+ \t\t\t\t\t\t+ FILENAME_LP + \n - + FILESIZE_FULL: + \t\t\t\t\t\t+ FILESIZE_FULL + \n - + FILESIZE_LP:+ \t\t\t\t\t\t+ FILESIZE_LP + \n - + EXTENSION: + \t\t\t\t\t\t+ EXTENSION + \n -// + TYPE: + \t\t\t\t\t\t+ TYPE + \n - + SOURCEFORGE_BASE_URL: + \t\t\t + SOURCEFORGE_BASE_URL + \n - + APACHE_DIST_BASE_URL: + \t\t\t\t+ APACHE_DIST_BASE_URL + \n -// + LINK: + \t\t\t\t\t\t+ LINK + \n - + LINK_FULL: + \t\t\t\t\t\t+ LINK_FULL + \n - + LINK_LP:+ \t\t\t\t\t\t\t + LINK_LP + \n - + LINK_CHECKSUM_ASC_FULL: + \t\t\t + LINK_CHECKSUM_ASC_FULL+ \n - + LINK_CHECKSUM_MD5_FULL: + \t\t\t + LINK_CHECKSUM_MD5_FULL+ \n - + LINK_CHECKSUM_SHA256_FULL: + \t\t\t + LINK_CHECKSUM_SHA256_FULL + \n - + LINK_CHECKSUM_ASC_LP: + \t\t\t\t+ LINK_CHECKSUM_ASC_LP + \n - + LINK_CHECKSUM_MD5_LP: + \t\t\t\t+ LINK_CHECKSUM_MD5_LP
svn commit: r1598165 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Wed May 28 22:52:12 2014 New Revision: 1598165 URL: http://svn.apache.org/r1598165 Log: Fixed error: Get the checksum files from 'Apache Archive' and no longer from 'Apache Dist' 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=1598165r1=1598164r2=1598165view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Wed May 28 22:52:12 2014 @@ -104,6 +104,8 @@ function initVars() { APACHE_BASE_URL = ;// The base URL for all binary files on Apache APACHE_DIST_BASE_URL= ;// The base URL for all checksum files on Apache APACHE_DIST_PREVIOUS_URL= ;// The base URL for all checksum files (prev. version) on Apache + APACHE_ARC_BASE_URL = ;// The base URL for all checksum files on Apache + APACHE_ARC_PREVIOUS_URL = ;// The base URL for all checksum files (prev. version) on Apache SF = false; // Does the download URL points to Soureforge? OTHER = false; // Does the download URL points to 'other.html'? ARCHIVE = false; // Does the download URL points to the ASF archive? @@ -1006,10 +1008,11 @@ function getLink( rel_mode ) { SOURCEFORGE_PREVIOUS_URL = SOURCEFORGE + PRE_VERSION + /binaries/; APACHE_DIST_PREVIOUS_URL = APACHE_DIST + PRE_VERSION; + APACHE_ARC_PREVIOUS_URL = APACHE_ARC + PRE_VERSION; LINK_FULL= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + /; LINK_FULL= LINK_FULL + FILENAME_FULL + /download; - +/* LINK_CHK_KEYS= https://people.apache.org/keys/group/openoffice.asc;; LINK_CHK_ASC_FULL= APACHE_DIST_PREVIOUS_URL + /binaries/ + LANG_ISO + /; @@ -1020,6 +1023,17 @@ function getLink( rel_mode ) { LINK_CHK_SHA256_FULL = APACHE_DIST_PREVIOUS_URL + /binaries/ + LANG_ISO + /; LINK_CHK_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + FILENAME_FULL + .sha256; +*/ + LINK_CHK_KEYS= https://people.apache.org/keys/group/openoffice.asc;; + + LINK_CHK_ASC_FULL= APACHE_ARC_PREVIOUS_URL + /binaries/ + LANG_ISO + /; + LINK_CHK_ASC_FULL= LINK_CHECKSUM_ASC_FULL+ FILENAME_FULL + .asc; + + LINK_CHK_MD5_FULL= APACHE_ARC_PREVIOUS_URL + /binaries/ + LANG_ISO + /; + LINK_CHK_MD5_FULL= LINK_CHECKSUM_MD5_FULL+ FILENAME_FULL + .md5; + + LINK_CHK_SHA256_FULL = APACHE_ARC_PREVIOUS_URL + /binaries/ + LANG_ISO + /; + LINK_CHK_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + FILENAME_FULL + .sha256; SF = false; OTHER= false; @@ -1079,14 +1093,20 @@ function getLink( rel_mode ) { getFilename( VERSION ); SOURCEFORGE_BASE_URL = SOURCEFORGE + VERSION + /binaries/; - APACHE_DIST_BASE_URL = APACHE_DIST + VERSION; +// APACHE_DIST_BASE_URL = APACHE_DIST + VERSION; + APACHE_ARC_BASE_URL = APACHE_ARC + VERSION; LINK_FULL = SOURCEFORGE_BASE_URL + LANG_ISO + / + FILENAME_FULL + /download; - +/* LINK_CHECKSUM_KEYS= https://people.apache.org/keys/group/openoffice.asc;; LINK_CHECKSUM_ASC_FULL= APACHE_DIST_BASE_URL + /binaries/ + LANG_ISO + / + FILENAME_FULL + .asc; LINK_CHECKSUM_MD5_FULL= APACHE_DIST_BASE_URL + /binaries/ + LANG_ISO + / + FILENAME_FULL + .md5; LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_BASE_URL + /binaries/ + LANG_ISO + / + FILENAME_FULL + .sha256; +*/ + LINK_CHECKSUM_KEYS= https://people.apache.org/keys/group/openoffice.asc;; + LINK_CHECKSUM_ASC_FULL= APACHE_ARC_BASE_URL + /binaries/ + LANG_ISO + / + FILENAME_FULL + .asc; + LINK_CHECKSUM_MD5_FULL= APACHE_ARC_BASE_URL + /binaries/ + LANG_ISO + / + FILENAME_FULL + .md5
svn commit: r1598169 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Wed May 28 23:17:52 2014 New Revision: 1598169 URL: http://svn.apache.org/r1598169 Log: Updated variable names and its values 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=1598169r1=1598168r2=1598169view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Wed May 28 23:17:52 2014 @@ -100,12 +100,12 @@ function initVars() { 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) SOURCEFORGE_BASE_URL= ;// The base URL for all binary files on Sourceforge - SOURCEFORGE_PREVIOUS_URL= ;// The base URL for all binary files (prev. version) on Sourceforge - APACHE_BASE_URL = ;// The base URL for all binary files on Apache - APACHE_DIST_BASE_URL= ;// The base URL for all checksum files on Apache - APACHE_DIST_PREVIOUS_URL= ;// The base URL for all checksum files (prev. version) on Apache - APACHE_ARC_BASE_URL = ;// The base URL for all checksum files on Apache - APACHE_ARC_PREVIOUS_URL = ;// The base URL for all checksum files (prev. version) on Apache + 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 + ASF_DIST_BASE_URL = ;// The base URL for all checksum files on Apache + ASF_DIST_PREV_URL = ;// The base URL for all checksum files (prev. version) on Apache + ASF_ARC_BASE_URL= ;// The base URL for all checksum files on Apache + ASF_ARC_PREV_URL= ;// The base URL for all checksum files (prev. version) on Apache SF = false; // Does the download URL points to Soureforge? OTHER = false; // Does the download URL points to 'other.html'? ARCHIVE = false; // Does the download URL points to the ASF archive? @@ -1003,42 +1003,35 @@ function getLink( rel_mode ) { // If platform is 'Mac OS X = 10.6', provide a download link with previous AOO version. if( UI_PLATFORM == Mac OS X (10.6 or older) ) { getReleaseMatrixPos() - getFilesize( PRE_VERSION ); - getFilename( PRE_VERSION ); + getFilesize( PREV_VERSION ); + getFilename( PREV_VERSION ); - SOURCEFORGE_PREVIOUS_URL = SOURCEFORGE + PRE_VERSION + /binaries/; - APACHE_DIST_PREVIOUS_URL = APACHE_DIST + PRE_VERSION; - APACHE_ARC_PREVIOUS_URL = APACHE_ARC + PRE_VERSION; + SOURCEFORGE_PREV_URL = SOURCEFORGE + PREV_VERSION + /binaries/; + ASF_DIST_PREV_URL= ASF_DIST+ PREV_VERSION; + ASF_ARC_PREV_URL = ASF_ARC + PREV_VERSION; - LINK_FULL= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + /; - LINK_FULL= LINK_FULL + FILENAME_FULL + /download; + LINK_FULL= SOURCEFORGE_PREV_URL+LANG_ISO+/+FILENAME_FULL+/download; /* - LINK_CHK_KEYS= https://people.apache.org/keys/group/openoffice.asc;; + LINK_CHK_KEYS= https://people.apache.org/keys/group/openoffice.asc;; - LINK_CHK_ASC_FULL= APACHE_DIST_PREVIOUS_URL + /binaries/ + LANG_ISO + /; - LINK_CHK_ASC_FULL= LINK_CHECKSUM_ASC_FULL+ FILENAME_FULL + .asc; + LINK_CHK_ASC_FULL= ASF_DIST_PREV_URL + /binaries/ + LANG_ISO + /; + LINK_CHK_ASC_FULL= LINK_CHECKSUM_ASC_FULL + FILENAME_FULL + .asc; - LINK_CHK_MD5_FULL= APACHE_DIST_PREVIOUS_URL + /binaries/ + LANG_ISO + /; - LINK_CHK_MD5_FULL
svn commit: r1598170 - /openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js
Author: marcus Date: Wed May 28 23:20:24 2014 New Revision: 1598170 URL: http://svn.apache.org/r1598170 Log: Updated variable names Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js?rev=1598170r1=1598169r2=1598170view=diff == --- openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Wed May 28 23:20:24 2014 @@ -18,7 +18,7 @@ var MILESTONE = AOO410m18; var BUILD = 9764; var SVN_REV= r1589052; var REL_DATE = 2014-Apr-29; -var PRE_VERSION= 4.0.1; +var PREV_VERSION = 4.0.1; var OLDVERSION = 3.4.1; var LEGACYVERSION = 3.3.0; @@ -103,9 +103,9 @@ var SEL_VER = [ 4.1.0, 4.1.0, // Base URLs to the Sourceforge and Apache mirror server var SOURCEFORGE= http://sourceforge.net/projects/openofficeorg.mirror/files/;; -var APACHE = http://www.apache.org/dyn/aoo-closer.cgi/openoffice/;; -var APACHE_DIST= http://www.apache.org/dist/openoffice/;; -var APACHE_ARC = http://archive.apache.org/dist/openoffice/;; +var ASF= http://www.apache.org/dyn/aoo-closer.cgi/openoffice/;; +var ASF_DIST = http://www.apache.org/dist/openoffice/;; +var ASF_ARC= http://archive.apache.org/dist/openoffice/;; // Beta Release: General variables var BETA_VERSION = 4.1.0-beta; @@ -130,14 +130,14 @@ var BETA_SDK_LANG = [ en-US ]; // Base URLs to the Sourceforge and Apache mirror server var BETA_SOURCEFORGE_BASE_URL = http://sourceforge.net/projects/openofficeorg.mirror/files/milestones/; + BETA_VERSION; BETA_SOURCEFORGE_BASE_URL = BETA_SOURCEFORGE_BASE_URL + /binaries/; -var BETA_APACHE_BASE_URL = http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; + BETA_VERSION; -var BETA_APACHE_DIST_BASE_URL = http://www.apache.org/dist/openoffice/; + BETA_VERSION; -var BETA_APACHE_ARC_BASE_URL = http://archive.apache.org/dist/openoffice/; + BETA_VERSION; +var BETA_ASF_BASE_URL = http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; + BETA_VERSION; +var BETA_ASF_DIST_BASE_URL = http://www.apache.org/dist/openoffice/; + BETA_VERSION; +var BETA_ASF_ARC_BASE_URL = http://archive.apache.org/dist/openoffice/; + BETA_VERSION; // Debug: Uncomment to use different base URLs // 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; -// var APACHE_DIST_BASE_URL= http://www.apache.org/dist/aoo/; + VERSION; +// var ASF_BASE_URL= http://www.apache.org/dyn/aoo-closer.cgi/aoo/; + VERSION; +// var ASF_DIST_BASE_URL = http://www.apache.org/dist/aoo/; + VERSION; // Deprecated mirror server // var MIRROR_BOUNCER_URL = http://openoffice.bouncer.osuosl.org/;;
svn commit: r1598172 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Wed May 28 23:40:34 2014 New Revision: 1598172 URL: http://svn.apache.org/r1598172 Log: Updated CSS style elements 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=1598172r1=1598171r2=1598172view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Wed May 28 23:40:34 2014 @@ -60,13 +60,13 @@ function initVars() { // Define variables without var to make them globally available. // The following are used in download.js only. - element_ids = [dl_f_lnk, dl_lp_lnk, dl_rel_dta_hl, dl_rel_dta, dl_f_hl, dl_f_size_hl, dl_f_size, + element_ids = [ dl_f_lnk, dl_lp_lnk, dl_rel_dta_hl, dl_rel_dta, dl_f_hl, dl_f_size_hl, dl_f_size, space1, dl_f_chk_hl, dl_f_chk_keys, space2, dl_f_chk_asc, space3, dl_f_chk_md5, space4, dl_f_chk_sha256, space5, dl_chk_verify, dl_lp_hl, dl_lp_size_hl, dl_lp_size, space6, dl_lp_chk_hl, dl_lp_chk_keys, space7, dl_lp_chk_asc, space8, dl_lp_chk_md5, space9, dl_lp_chk_sha256, dl_hlp, dl_hlp_img, dl_rpt, dl_rpt_img ]; - 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, + 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. @@ -1308,7 +1308,7 @@ function getLinkSel( rel_mode ) { document.getElementById( space5 ).innerHTML = , ; document.getElementById( dl_chk_verify).href = ../checksums.html; document.getElementById( dl_chk_verify).innerHTML = How to verify?; - document.getElementById( dl_chk_verify).title = How to verify the download with checksums?; + document.getElementById( dl_chk_verify).title = How to verify the downloaded file with checksums?; document.getElementById( dl_lp_hl ).innerHTML = Language pack: ; document.getElementById( dl_lp_size_hl).innerHTML = Filesize ~ ; document.getElementById( dl_lp_size ).innerHTML = FILESIZE_LP + MByte; @@ -1336,7 +1336,7 @@ function getLinkSel( rel_mode ) { document.getElementById( dl_hlp ).title = What is the difference between full installation and language pack?; document.getElementById( dl_hlp_img ).src = ../cachedimages/help-information-icon.png; document.getElementById( dl_hlp_img ).title = What is the difference between full installation and language pack?; - document.getElementById( dl_hlp_img ).alt = Info; + document.getElementById( dl_hlp_img ).alt = Install info; // document.getElementById( dl_hlp_img2 ).src = ../cachedimages/help-information-icon.png; // document.getElementById( dl_hlp_img2 ).title = What is the difference between full installation and language pack?; // document.getElementById( dl_hlp_img2 ).alt = Info; @@ -1365,10 +1365,10 @@ function getLinkSel( rel_mode ) { } // Further specific exceptions. - document.getElementById( dl_hlp ).style.cursor= help; - document.getElementById( dl_hlp_img ).style.cursor= help; - document.getElementById( dl_rpt ).style.cursor= help; - document.getElementById( dl_rpt_img ).style.cursor= help; + document.getElementById( dl_hlp ).style.cursor = help; + document.getElementById( dl_hlp_img ).style.cursor = help; + document.getElementById( dl_rpt ).style.cursor = help; + document.getElementById( dl_rpt_img ).style.cursor = help; } // alertDbg( getLinkSel(): End );
svn commit: r1598173 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Wed May 28 23:42:17 2014 New Revision: 1598173 URL: http://svn.apache.org/r1598173 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=1598173r1=1598172r2=1598173view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Wed May 28 23:42:17 2014 @@ -138,12 +138,12 @@ screen reader. -- /* document.write( div class='sub-green' + p ); -if ( LINK_CHECKSUM_ASC_FULL ) { +if ( LINK_CHK_ASC_FULL ) { document.write( Signatures and hashes: - + a href=' + LINK_CHECKSUM_KEYS + ' + title='KEYS signature file'KEYS/a , - + a href=' + LINK_CHECKSUM_ASC_FULL + ' + title='ASC signature for: + FILENAME_FULL + 'ASC/a , - + a href=' + LINK_CHECKSUM_MD5_FULL + ' + title='MD5 hash for: + FILENAME_FULL + 'MD5/a , - + a href=' + LINK_CHECKSUM_SHA256_FULL + ' + title='SHA256 hash for: + FILENAME_FULL + 'SHA256/a , + + a href=' + LINK_CHK_KEYS + ' + title='KEYS signature file'KEYS/a , + + a href=' + LINK_CHK_ASC_FULL + ' + title='ASC signature for: + FILENAME_FULL + 'ASC/a , + + a href=' + LINK_CHK_MD5_FULL + ' + title='MD5 hash for: + FILENAME_FULL + 'MD5/a , + + a href=' + LINK_CHK_SHA256_FULL + ' + title='SHA256 hash for: + FILENAME_FULL + 'SHA256/a , + a href='../checksums.html' title='How to verify the download with checksums?'How to verify?/a | ); } document.write( @@ -301,14 +301,15 @@ screen reader. -- // + img id='dl_hlp_img2' style='padding: 5px 0px 0px 0px;' src='' title='' alt='' / + img id='dl_hlp_img' style='padding: 5px 0px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a style='padding: 0px 0px 0px 3%;'/a -+ a id='dl_hlp' style='cursor: pointer;' href='' title='' target='_blank' onclick='showWindow( this.href ); -+ return false;'/a +// + a id='dl_hlp' style='cursor: pointer;' href='' title='' target='_blank' onclick='showWindow( this.href ); ++ a id='dl_hlp' href='' title='' target='_blank' onclick='showWindow( this.href ); return false;'/a + br / // + img id='dl_rpt_img2' style='padding: 5px 0px 0px 0px;' src='' title='' alt='' / + img id='dl_rpt_img' style='padding: 5px 0px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a style='padding: 0px 0px 0px 3%;'/a -+ a id='dl_rpt' style='cursor: pointer;' href='' title='' target='_blank'/a +// + a id='dl_rpt' style='cursor: pointer;' href='' title='' target='_blank'/a ++ a id='dl_rpt' href='' title='' target='_blank'/a + /p + div style='clear: both;'/div + /div );
svn commit: r1598175 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Thu May 29 00:03:56 2014 New Revision: 1598175 URL: http://svn.apache.org/r1598175 Log: Updated the error texts 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=1598175r1=1598174r2=1598175view=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 00:03:56 2014 @@ -920,16 +920,16 @@ function showErrorMessage( error_text ) document.getElementById( dl_f_lnk ).style.display = inline; document.getElementById( dl_f_lnk ).style.cursor = not-allowed; document.getElementById( dl_f_lnk ).href = javascript:void( 0 ); - document.getElementById( dl_f_lnk ).innerHTML = error_text[ 0 ]; - document.getElementById( dl_f_lnk ).title = error_text[ 1 ]; + document.getElementById( dl_f_lnk ).innerHTML = No full installation available; + document.getElementById( dl_f_lnk ).title = Please select another language, platform or version.; document.getElementById( dl_lp_lnk).style.display = inline; document.getElementById( dl_lp_lnk).style.cursor = not-allowed; document.getElementById( dl_lp_lnk).href = javascript:void( 0 ); - document.getElementById( dl_lp_lnk).innerHTML = error_text[ 2 ]; - document.getElementById( dl_lp_lnk).title = error_text[ 3 ]; + document.getElementById( dl_lp_lnk).innerHTML = No language pack available; + document.getElementById( dl_lp_lnk).title = Please select another language, platform or version.; document.getElementById( dl_f_size_hl ).style.display = inline; document.getElementById( dl_f_size_hl ).style.cursor = default; - document.getElementById( dl_f_size_hl ).innerHTML = error_text[ 4 ]; + document.getElementById( dl_f_size_hl ).innerHTML = error_text; SF = false; OTHER = false; @@ -1135,7 +1135,7 @@ function getLink( rel_mode ) { * Depends on chosen OS, language and type */ function getLinkSel( rel_mode ) { - var error_text; + var error_text = ; // Reset all error flags. SF = false; @@ -1173,10 +1173,8 @@ function getLinkSel( rel_mode ) { // If version is '4.1.0' (or newer) + platform is 'Mac OS X = 10.6', show the none-availability to the user. if( VERSION_SEL == 4.1.0 URL_PLATFORM == MacOS_x86_install ) { // Show an error message that the chosen items do not lead to a download. - error_text = [ No full installation available, Please select another language, platform or version., - No language pack available, Please select another language, platform or version., - Apache OpenOffice + VERSION_SEL + for b + UI_PLATFORM + /b is not available. - + br /Please select version 4.0.1 or older. ]; + error_text = Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM + /b. ++ br /Please select version 4.0.1 or older.; showErrorMessage( error_text ); @@ -1186,10 +1184,8 @@ function getLinkSel( rel_mode ) { // If version is '4.0.1' (or older) + platform is 'Mac OS X = 10.7', show the none-availability to the user. if( ( VERSION_SEL == 4.0.1 || VERSION_SEL == 4.0.0 ) URL_PLATFORM == MacOS_x86-64_install ) { // Set the values for all elements that should not be empty. - error_text = [ No full installation available, Please select another language, platform or version., - No language pack available, Please select another language, platform or version., - Apache OpenOffice + VERSION_SEL + for b + UI_PLATFORM + /b is not available. - + br /Please select version 4.1.0 or newer. ]; + error_text = Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM + /b. ++ br /Please select version 4.1.0 or newer.; showErrorMessage( error_text ); @@ -1199,10 +1195,8 @@ function getLinkSel( rel_mode ) { // If recognized platform is not 'Windows', 'Linux' or 'Mac', show the none-availability to the user. if( UI_PLATFORM_NO_SUP != ) { // Show an error message that the chosen items do not lead to a download. - error_text = [ No full installation available, Please select another
svn commit: r1598181 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Thu May 29 00:18:41 2014 New Revision: 1598181 URL: http://svn.apache.org/r1598181 Log: Updated text 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=1598181r1=1598180r2=1598181view=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 00:18:41 2014 @@ -68,9 +68,6 @@ screen reader. -- // Get the download link (1 = Stable Release). var dl_link = getLink( 1 ); // Does the browser language match with AOO languages? - -// alertDbg( index.html ); - if ( isLangSupported() ) { if ( SF ) { // If download link contains sourceforge (- normal and correct download link), @@ -203,7 +200,7 @@ screen reader. -- + /h2 + p style='padding-bottom: 0px;' - + a title='Apache OpenOffice binary files are hosted trustworthy by Sourceforge.net' + + a title='Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website' + (Hosted by Sourceforge.net - A trusted website)/a + a title='Select your favorite operating system, language and version' + bSelect your favorite operating system, language and version:/b/a
svn commit: r1598182 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Thu May 29 00:19:59 2014 New Revision: 1598182 URL: http://svn.apache.org/r1598182 Log: Updated variables 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=1598182r1=1598181r2=1598182view=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 00:19:59 2014 @@ -1600,12 +1600,12 @@ function getFilename( ver ) { // Assemble filename for download from release matrix of language and platform (column 0). // Product name + version + platform as URL part + language ISO + file extension. - FILENAME_FULL = Apache_OpenOffice_ + ver + _; - FILENAME_FULL = FILENAME_FULL+ release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ]; - FILENAME_FULL = FILENAME_FULL+ _ + LANG_ISO + EXTENSION; - FILENAME_LP = Apache_OpenOffice_ + ver + _; - FILENAME_LP = FILENAME_LP + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ]; - FILENAME_LP = FILENAME_LP + _ + LANG_ISO + EXTENSION; + FILENAME_FULL = Apache_OpenOffice_ + ver + _ + + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + _ + + LANG_ISO + EXTENSION; + FILENAME_LP = Apache_OpenOffice_ + ver + _ + + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + _ + + LANG_ISO + EXTENSION; break; case 4.0.1: // Assign all values from the release matrix of language and platform. @@ -1613,12 +1613,12 @@ function getFilename( ver ) { // Assemble filename for download from release matrix of language and platform (column 0). // Product name + version + platform as URL part + language ISO + file extension. - FILENAME_FULL = Apache_OpenOffice_ + ver + _; - FILENAME_FULL = FILENAME_FULL+ release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ]; - FILENAME_FULL = FILENAME_FULL+ _ + LANG_ISO + EXTENSION; - FILENAME_LP = Apache_OpenOffice_ + ver + _; - FILENAME_LP = FILENAME_LP + release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ]; - FILENAME_LP = FILENAME_LP + _ + LANG_ISO + EXTENSION; + FILENAME_FULL = Apache_OpenOffice_ + ver + _ + + release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + _ + + LANG_ISO + EXTENSION; + FILENAME_LP = Apache_OpenOffice_ + ver + _ + + release_matrix_401[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + _ + + LANG_ISO + EXTENSION; break; case 4.0.0: // Assign all values from the release matrix of language and platform. @@ -1643,12 +1643,12 @@ function getFilename( ver ) { /* // Assemble the filename for download from the release matrix of language and platform (column 0). // Product name + version + platform as URL part + language ISO + file extension. - FILENAME_FULL = Apache_OpenOffice_ + ver + _; - FILENAME_FULL = FILENAME_FULL+ release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ]; - FILENAME_FULL = FILENAME_FULL+ _ + LANG_ISO + EXTENSION; - FILENAME_LP = Apache_OpenOffice_ + ver + _; - FILENAME_LP = FILENAME_LP + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ]; - FILENAME_LP = FILENAME_LP + _ + LANG_ISO + EXTENSION; + FILENAME_FULL = Apache_OpenOffice_ + ver + _ + + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_FULL ][ 0 ] + _ + + LANG_ISO + EXTENSION; + FILENAME_LP = Apache_OpenOffice_ + ver + _ + + release_matrix_410[ LANG_ISO ][ RELEASE_MATRIX_PLATFORM_POS_LP ][ 0 ] + _ + + LANG_ISO + EXTENSION; */ // alert( ver + \n\n + FILENAME_FULL + \n\n + FILENAME_LP );
svn commit: r1598261 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Thu May 29 11:58:47 2014 New Revision: 1598261 URL: http://svn.apache.org/r1598261 Log: Updated comments 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=1598261r1=1598260r2=1598261view=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 11:58:47 2014 @@ -42,15 +42,15 @@ body -!-- The text in the H1 tag is intentionally shown as not displayable, just to please accessibility tools like a -screen reader. -- -h1 style=display: none;Apache OpenOffice Download/h1 - div class=optionset !-- Green: Stable release -- script type=text/javascript !-- + // The text in the H1 tag is intentionally shown as display: none (do not display). + // This is to please accessibility tools like a screen reader. + document.write( h1 style='display: none;'Apache OpenOffice Download/h1 ); + /* document.write( div + Just for testing, please ignore. @@ -64,9 +64,12 @@ screen reader. -- + /div ); */ // 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_ISO_code.js. NL_LANG = ; + // Get the download link (1 = Stable Release). var dl_link = getLink( 1 ); + // Does the browser language match with AOO languages? if ( isLangSupported() ) { if ( SF ) { @@ -631,10 +634,10 @@ screen reader. -- title=Extensive user manuals for every day useUser Guides/a/li lia href=../common/java.html title=Explains why to use Java and what it isJava and Apache OpenOffice/a/li -!-- +!-- lia href=http://java.com/en/download/manual_v6.jsp; title=Get the Java Runtime Environment (JRE 1.6)Get the Java Runtime Environment (JRE 1.6)/a/li --- +-- lia href=../../development/releases/eol.html title=Information about releases that have reached End-Of-Life statusEnd-Of-Life Information/a/li /ul @@ -653,7 +656,7 @@ screen reader. -- title=If the information above did not answer your question: Free and paid support!Support/a/li lia href=http://openoffice.apache.org/native-lang.html; title=Information and support in your favorite languageLocalizations/a/li -!-- +!-- lia href=../../distribution/index.html title=FAQ for distributions Distributions FAQ/a/li lia href=../../distribution/cdrom/iso_download.html @@ -662,7 +665,7 @@ screen reader. -- title=If you cannot download OpenOffice.org, order a CD-ROMOrder CD-ROM/a lia href=../../distribution/mirrors#mirrors title=To get alternative download locationsAll Mirror Server/abr //li --- +-- lia href=../../stats/index.html title=Download and other statisticsDownload Statistics/a/li lia href=http://sourceforge.net/projects/openofficeorg.mirror/files/;
svn commit: r1598262 - /openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js
Author: marcus Date: Thu May 29 11:59:34 2014 New Revision: 1598262 URL: http://svn.apache.org/r1598262 Log: Updated comments Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js?rev=1598262r1=1598261r2=1598262view=diff == --- openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Thu May 29 11:59:34 2014 @@ -8,10 +8,10 @@ * VERSION: Set the release version (e.g., 4.1.0) that is currently on the mirrors. */ -// Stable release: General variables +// Stable release: General variables. var VERSION= 4.1.0; var VERSION_SHORT = VERSION; -// If last char of VERSION == 0, assign only the first 3 chars to VERSION_SHORT +// If last char of VERSION == 0, assign only the first 3 chars to VERSION_SHORT. if ( VERSION.slice( 4, 5 ) == 0 ) VERSION_SHORT = VERSION.substring( 0, 3 ); var MILESTONE = AOO410m18; @@ -22,7 +22,7 @@ var PREV_VERSION = 4.0.1; var OLDVERSION = 3.4.1; var LEGACYVERSION = 3.3.0; -// Only used on the other.html webpage +// Only used on the other.html webpage. var PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, MacOS_x86 ]; var FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, @@ -33,7 +33,7 @@ var LP_LANG = [ ast, bg, cs, da ru, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; var SDK_LANG = [ en-US ]; -// OS data for the select element +// OS data for the select element. var SEL_OS = [ Win_x86_install, Windows (EXE), .exe, Linux_x86-64_install-deb, Linux 64-bit (x86-64) (DEB), .tar.gz, Linux_x86-64_install-rpm, Linux 64-bit (x86-64) (RPM), .tar.gz, @@ -52,7 +52,7 @@ var SEL_OS= [ win32, Windows 32-b mac32, OS X 32-bit (x86) (DMG), MacOS_x86_install,.dmg ]; */ -// Language data for the select element +// Language data for the select element. var SEL_LANG = [ ast, Asturian (Asturianu) (ast), eu,Basque (Euskara) (eu), bg,Bulgarian (бÑлгаÑÑки език) (bg), @@ -92,22 +92,22 @@ var SEL_LANG= [ ast, Asturian (A tr,Turkish (Türkçe) (tr), vi,Vietnamese (Tiếng Viá»t) (vi) ]; -// Version data for the select element +// Version data for the select element. var SEL_VER= [ 4.1.0, 4.1.0, 4.0.1, 4.0.1, 4.0.0, 4.0.0 ]; -// Install type data for the select element +// Install type data for the select element. // var SEL_TYPE= [ e1, Choose install type, e2, ---, // full, Full Installation, lp, Language Pack ]; -// Base URLs to the Sourceforge and Apache mirror server +// Base URLs to the Sourceforge and Apache mirror server. var SOURCEFORGE= http://sourceforge.net/projects/openofficeorg.mirror/files/;; var ASF= http://www.apache.org/dyn/aoo-closer.cgi/openoffice/;; var ASF_DIST = http://www.apache.org/dist/openoffice/;; var ASF_ARC= http://archive.apache.org/dist/openoffice/;; -// Beta Release: General variables +// Beta Release: General variables. var BETA_VERSION = 4.1.0-beta; var BETA_NAME = 4.1.0 Beta; var BETA_MILESTONE = AOO410m14; @@ -116,7 +116,7 @@ var BETA_SVN_REV= r1573601; var BETA_REL_DATE = 2014-Mar-10; var BETA_ACTIVE= -1; // 1 = activate download, 0 = display coming soon, -1 = display nothing -// Only used on the all_beta.html webpage +// Only used on the all_beta.html webpage. var BETA_PLATFORM = [ Win_x86, Linux_x86_rpm, Linux_x86_deb, Linux_x86-64_rpm, Linux_x86-64_deb, MacOS_x86-64 ]; var BETA_FULL_LANG = [ ast, bg, cs, da, de, el, en-GB, en-US, es, eu, fi, fr, gd, @@ -127,23 +127,23 @@ var BETA_LP_LANG = [ ast, bg, cs, sk, sl, sr, sv, ta, th, tr, vi, zh-CN, zh-TW ]; var
svn commit: r1598263 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Thu May 29 12:02:44 2014 New Revision: 1598263 URL: http://svn.apache.org/r1598263 Log: Updated text 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=1598263r1=1598262r2=1598263view=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:02:44 2014 @@ -1001,7 +1001,7 @@ function getLink( rel_mode ) { // If platform is too old, provide a general download link to the archive. if( OLD_PLATFORM ) { // If platform is 'Mac OS X = 10.6', provide a download link with previous AOO version. - if( UI_PLATFORM == Mac OS X (10.6 or older) ) { + if( UI_PLATFORM == Mac OS X (= 10.6) ) { getReleaseMatrixPos() getFilesize( PREV_VERSION ); getFilename( PREV_VERSION ); @@ -1068,7 +1068,8 @@ function getLink( rel_mode ) { } else if( URL_PLATFORM == ) { // If no UI string was set, show it to the user. if( UI_PLATFORM == ) { - UI_PLATFORM = unknown platform/OS; + UI_PLATFORM = an unknown operating system / platform; +// UI_PLATFORM = l10n_download_unknown_platform; } LINK_FULL = http://www.openoffice.org/download/other.html;; @@ -1196,7 +1197,7 @@ function getLinkSel( rel_mode ) { if( UI_PLATFORM_NO_SUP != ) { // Show an error message that the chosen items do not lead to a download. error_text = Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM_NO_SUP + /b. -+ br /Please select a platform for Windows, Linux or OS X.; ++ br /Please select a download for Windows, Linux or OS X.; showErrorMessage( error_text ); @@ -1520,7 +1521,7 @@ function getPlatform() { ua.indexOf( 10.4 ) != -1 || ua.indexOf( 10_4 ) != -1 || ua.indexOf( 10.3 ) != -1 || - ua.indexOf( 10_3 ) != -1 ) { UI_PLATFORM = Mac OS X (10.6 or older); + ua.indexOf( 10_3 ) != -1 ) { UI_PLATFORM = Mac OS X (= 10.6); URL_PLATFORM= MacOS_x86_install; OLD_PLATFORM= true; }
svn commit: r1598281 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Thu May 29 12:46:13 2014 New Revision: 1598281 URL: http://svn.apache.org/r1598281 Log: Updated comments 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=1598281r1=1598280r2=1598281view=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 12:46:13 2014 @@ -45,7 +45,9 @@ div class=optionset !-- Green: Stable release -- + !-- Download via single link -- script type=text/javascript + !-- // The text in the H1 tag is intentionally shown as display: none (do not display). // This is to please accessibility tools like a screen reader. @@ -169,6 +171,7 @@ + /div ); // entourage.initialize(); + //-- /script @@ -193,7 +196,8 @@ /div /noscript - !-- Grey: Listboxes -- + !-- Green: Stable release -- + !-- Download via select boxes -- script type=text/javascript !-- document.write( div class='button green-sel' id='optionitem2' @@ -316,10 +320,11 @@ document.write( /div ); init(); + //-- /script - !-- Grey: Stable release: No JavaScript enabled -- + !-- Green: Stable release: No JavaScript enabled -- noscript div class=button green-sel id=optionitem2 h2aDownload Apache OpenOffice/a/h2 @@ -334,6 +339,7 @@ !-- Yellow: Beta Release online -- script type=text/javascript !-- + // If the Beta Release is available for download, offer download links. if ( BETA_ACTIVE == 1 ) { // Set a specific language ISO code to force to assemble a certain localized build as download link. @@ -426,9 +432,11 @@ } else { // If the Beta Release is not planned at all, show nothing. } + //-- /script !-- Yellow: Beta: No JavaScript enabled -- + !-- noscript div class=button yellow id=optionitem3 onclick=openItem('optionitem3','all_beta.html'); return false; @@ -448,6 +456,7 @@ /div /noscript -- + !-- Light Blue: Share download with social networks -- div class=button lightblue id=optionitem4 h2a style=cursor: default; title=Help spread the word and tell your friends about Apache OpenOffice @@ -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./a/p /div - - !-- Yellow: Release Candidate online -- - script type=text/javascript - /* - !-- - if ( RC_ACTIVE == 1 ) { -// If the RC is available for download, download from Sourceforge with displayed platform and language. -document.write( div class=\button yellow\ id=\optionitem4\ onclick=\openItem('optionitem4', - + 'all_rc.html#untested-full'); - + return false;\ - + h2a href='all_rc.html#untested-full' title='Select from other platforms and languages to download' - + Get OpenOffice.org Release Candidates/a/h2 - + pa href='all_rc.html#untested-full' title='Select from other platforms and languages to download' - + bMost recent: OOo + RC_NAME + + RC_NUMBER + /b/a/p -+ /div ); -document.write( div class=\sub-yellow\ - + pa href='all_rc.html' title='Get all platforms, languages, language packs to download' - + Get all platforms, languages, language packs/a | - + a href='http://www.openoffice.org/development/releases/; + RC_BUILD + .html' - + title='What is new, what has been improved in OpenOffice.org + RC_NAME + RC_NUMBER + ?'Release Notes/a | - + a href='next/md5sums/ + RC_BUILD + _md5sums.txt' title='MD5 checksums for OpenOffice.org + RC_NAME + RC_NUMBER - + 'MD5 checksums/a/p -+ /div ); - } else if ( RC_ACTIVE == 0 ) { -// If the RC is not yet available for download, show a coming soon message. -document.write( div class=\button yellow\ id=\optionitem4\ - + h2aGet OpenOffice.org Release Candidate small( + RC_NAME + RC_NUMBER + coming soon)/small/a/h2 - + paA wide range of platforms and languages will be available. - + br /bImportant:/b These builds are nearly ready but needs to be finally tested and are therefore not - + released./a/p -+ /div ); - } else { -// If the RC is not planned at all, show nothing. - //-- - */ - /script - - !-- Yellow: Release Candidate: No JavaScript enabled -- - !-- - noscript - div class=button yellow id=optionitem4 onclick=openItem('optionitem4','all_rc.html#untested-full'); return false; -h2a href=all_rc.html title=Select from all platforms, languages, language packs to download -Get OpenOffice.org Release Candidate/a/h2 -pa href=all_rc.html title=Select from other platforms
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=1598282r1=1598281r2=1598282view=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 = ; */ - return; } /* @@ -936,7 +928,7
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: 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=1598348r1=1598347r2=1598348view=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','Espantilde;ol', 'y', 'es/' ], +0: [ 'es', 'Spanish','Espantilde;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', 'Russian','Ð ÑÑÑкий', 'y', 'ru/about-downloads.html
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=1598349r1=1598348r2=1598349view=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 = ; ERROR = true
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=1598351r1=1598350r2=1598351view=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: 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=1598358r1=1598357r2=1598358view=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 select element for OS (drop-down-box) + * Set values into the select element for OS (select box) * Depends on array-list */ function fillOSSel() { @@ -241,7 +242,7 @@ function fillOSSel() { } /* - * Set values into the select element for language (drop-down-box) + * Set values into the select element for language (select box) * Depends on array-list */ function fillLangSel() { @@ -280,7 +281,7 @@ function fillLangSel() { } /* - * Set values into the select element for version (drop-down-box) + * Set values into the select element for version (select box) * Depends on array-list */ function fillVerSel() { @@ -303,7 +304,7 @@ function fillVerSel() { } /* - * Set value in the select element for OS (drop-down-box) + * Set value in the select 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.length; i = i + 3 ) { for( var i = 0, j
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=1598360r1=1598359r2=1598360view=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 @@ div class=optionset - !-- Green: Stable release -- - !-- Download via single link -- + !-- Text above the first colored box -- script type=text/javascript - !-- // The text in the H1 tag is intentionally shown as display: none (do not display). // This is to please accessibility tools like a screen reader. document.write( h1 style='display: none;'Apache OpenOffice Download/h1 ); + -- + /script + !-- Green: Stable release -- + !-- Download via single link -- + script type=text/javascript + !-- /* document.write( div + Just for testing, please ignore. @@ -65,11 +69,13 @@ + /form + /div ); */ +/* // 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_ISO_code.js. NL_LANG = ; // Get the download link (1 = Stable Release). + var dl_link = getLink( 1 ); // Does the browser language match with AOO languages? @@ -77,18 +83,18 @@ if ( SF ) { // If download link contains sourceforge (- normal and correct download link), // offer download link from Sourceforge with displayed platform and language. -/* - document.write( div class=\first button green\ id=\optionitem1\ onclick=\openItem('optionitem1',' -+ dl_link + '); return false;\ -+ h2a href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' -+ Download Apache OpenOffice + VERSION + /a/h2 -+ pa href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' -+ Click here to download (hosted by Sourceforge.net) for: -+ br /b + UI_PLATFORM + /b and b + RELEASE_LANG[ 1 ] + ( + RELEASE_LANG[ 2 ] + )/b -+ br /Filesize ~ + FILESIZE_FULL + nbsp;MByte | Milestone + MILESTONE + | Build ID + BUILD -+ | SVN + SVN_REV + | Released: + REL_DATE + /a/p - + /div ); -*/ + +//document.write( div class=\first button green\ id=\optionitem1\ onclick=\openItem('optionitem1',' +// + dl_link + '); return false;\ +// + h2a href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' +// + Download Apache OpenOffice + VERSION + /a/h2 +// + pa href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' +// + Click here to download (hosted by Sourceforge.net) for: +// + br /b + UI_PLATFORM + /b and b + RELEASE_LANG[ 1 ] + ( + RELEASE_LANG[ 2 ] + )/b +// + br /Filesize ~ + FILESIZE_FULL + nbsp;MByte | Milestone + MILESTONE + | Build ID + BUILD +// + | SVN + SVN_REV + | Released: + REL_DATE + /a/p +//+ /div ); + document.write( div class=\first button green\ id=\optionitem1\ onclick=\openItem('optionitem1',' + dl_link + '); return false;\ + h2a href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' @@ -162,13 +168,14 @@ + a href='../legacy/index.html' title='Get the legacy version of OpenOffice.org + LEGACYVERSION + 'b + LEGACYVERSION + /b/a/p + /div ); -*/ + document.write( div class='sub-green' + p/p + pa style='text-decoration: none;'Filesize ~ + FILESIZE_FULL + nbsp;MByte | Milestone + MILESTONE + | + Build ID + BUILD + | SVN + SVN_REV + | Released: + REL_DATE + /a/p + p/p + /div ); +*/ // entourage.initialize(); @@ -200,7 +207,12 @@ !-- Download via select boxes -- script type=text/javascript !-- - document.write( div class='button green-sel' id='optionitem2' + + // 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_ISO_code.js. + NL_LANG = en-US; + + document.write( div class='first button green-sel' id='optionitem2' + h2 + a title='Download Apache OpenOffice for your favorite operating system, language and version' + Download Apache OpenOffice/a
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=1598367r1=1598366r2=1598367view=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 b + RELEASE_LANG[ 1 ] -+ ( + RELEASE_LANG[ 2 ] + )/b.br /Please choose another language or version.; ++ ( + RELEASE_LANG[ 2 ] + ) ( + LANG_SEL + )/b. ++ br /Please choose another language or version.; showErrorMessage( error_text );
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=1598378r1=1598377r2=1598378view=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_ISO_code.js. - NL_LANG = en-US; + NL_LANG = ; document.write( div class='first button green-sel' id='optionitem2' + h2
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: 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=1598391r1=1598390r2=1598391view=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: 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=1598401r1=1598400r2=1598401view=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: 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=1598403r1=1598402r2=1598403view=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 @@ + /form + div class='dl-txt-btn' - + h3 style='display: inline; cursor: default;' + + h3 style='display: inline;' + a id='dl_f_lnk' style='padding: 5px 5px 5px 5px;' href='' title=''/a + a id='dl_lp_lnk' style='padding: 5px 5px 5px 5px;' href='' title=''/a + /h3
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: r1598557 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Fri May 30 11:32:44 2014 New Revision: 1598557 URL: http://svn.apache.org/r1598557 Log: Moved the links with icon below the 3 text lines, to avoid text wrapping when font size is bigger or browser window is not full screen 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=1598557r1=1598556r2=1598557view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Fri May 30 11:32:44 2014 @@ -275,12 +275,15 @@ // Show some helpful data and links for filesizes and checksums. document.write( div class='sub-green-sel' -+ div style='float: left; width: 77%;' +// + div style='float: left; width: 77%;' ++ div + p -+ a id='dl_rel_dta_hl'style='text-decoration: none; font-weight: bold;'/a -+ a id='dl_rel_dta' style='text-decoration: none;'/a +// Release info. ++ a id='dl_rel_info_hl' style='text-decoration: none; font-weight: bold;'/a ++ a id='dl_rel_info' style='text-decoration: none;'/a + br / +// Full installation: Filesize and checksums. + a id='dl_f_hl' style='text-decoration: none; font-weight: bold;'/a + a id='dl_f_size_hl' style='text-decoration: none;'/a + a id='dl_f_size'style='text-decoration: none;'/a @@ -293,41 +296,56 @@ + a id='dl_f_chk_md5' style='text-decoration: underline;' href='' title=''/a + a id='space4' style='text-decoration: none;'/a + a id='dl_f_chk_sha256' style='text-decoration: underline;' href='' title=''/a -+ a id='space5' style='text-decoration: none;'/a -+ a id='dl_chk_verify'style='text-decoration: underline;' href='' title=''/a + br / +// Langpack: Filesize and checksums. + a id='dl_lp_hl' style='text-decoration: none; font-weight: bold;'/a + a id='dl_lp_size_hl'style='text-decoration: none;'/a + a id='dl_lp_size' style='text-decoration: none;'/a -+ a id='space6' style='text-decoration: none;'/a ++ a id='space5' style='text-decoration: none;'/a + a id='dl_lp_chk_hl' style='text-decoration: none;'/a + a id='dl_lp_chk_keys' style='text-decoration: underline;' href='' title=''/a -+ a id='space7' style='text-decoration: none;'/a ++ a id='space6' style='text-decoration: none;'/a + a id='dl_lp_chk_asc'style='text-decoration: underline;' href='' title=''/a -+ a id='space8' style='text-decoration: none;'/a ++ a id='space7' style='text-decoration: none;'/a + a id='dl_lp_chk_md5'style='text-decoration: underline;' href='' title=''/a -+ a id='space9' style='text-decoration: none;'/a ++ a id='space8' style='text-decoration: none;'/a + a id='dl_lp_chk_sha256' style='text-decoration: underline;' href='' title=''/a - + /p -+ /div ++ br / + +// Help: What is a language pack? ++ img id='dl_hlp_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ a id='dl_hlp' href='' title='' target='_blank' onclick='showWindow( this.href ); return false;'/a ++ a style='padding: 0px 0px 0px 30px;'/a + +// Help: How to verify the download? ++ img id='dl_chk_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ a id='dl_chk' href='' title='' target='_blank'/a ++ a style='padding: 0px 0px 0px 30px;'/a +// Help: Report broken link. ++ img id='dl_rpt_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ a id='dl_rpt' href='' title='' target='_blank'/a + + /p +/* + div style='float: right; width: 23%;' + p -// + img id='dl_hlp_img2' style='padding: 5px 0px 0px 0px;' src='' title='' alt='' / -+ img id='dl_hlp_img' style='padding: 5px 0px 0px 0px;' src='' title='' height='16' width='16' alt='' / -+ a style='padding: 0px 0px 0px 3%;'/a -// + a id='dl_hlp' style='cursor: pointer;' href='' title='' target='_blank' onclick='showWindow( this.href ); ++ img id='dl_hlp_img' style='padding: 5px 0px 0px 5px;' src='' title='' height='16' width='16' alt='' / +// + a style='padding: 0px 0px 0px 3%;'/a + a id='dl_hlp' href='' title='' target='_blank' onclick='showWindow( this.href ); return false;'/a + br / -// + img id
svn commit: r1598558 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 11:34:12 2014 New Revision: 1598558 URL: http://svn.apache.org/r1598558 Log: Changed data to show the links with icon below the 3 text lines 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=1598558r1=1598557r2=1598558view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 11:34:12 2014 @@ -61,14 +61,14 @@ function initVars() { // Define variables without var to make them globally available. // The following are used in download.js only. - element_ids = [ dl_f_lnk, dl_lp_lnk, dl_rel_dta_hl, dl_rel_dta, dl_f_hl, dl_f_size_hl, dl_f_size, + element_ids = [ dl_f_lnk, dl_lp_lnk, dl_rel_info_hl, dl_rel_info, dl_f_hl, dl_f_size_hl, dl_f_size, space1, dl_f_chk_hl, dl_f_chk_keys, space2, dl_f_chk_asc, space3, dl_f_chk_md5, space4, - dl_f_chk_sha256, space5, dl_chk_verify, dl_lp_hl, dl_lp_size_hl, dl_lp_size, space6, dl_lp_chk_hl, - dl_lp_chk_keys, space7, dl_lp_chk_asc, space8, dl_lp_chk_md5, space9, dl_lp_chk_sha256, dl_hlp, - dl_hlp_img, dl_rpt, dl_rpt_img ]; + dl_f_chk_sha256, dl_lp_hl, dl_lp_size_hl, dl_lp_size, space5, dl_lp_chk_hl, dl_lp_chk_keys, + space6, dl_lp_chk_asc, space7, dl_lp_chk_md5, space8, dl_lp_chk_sha256, dl_hlp_img, dl_hlp, + dl_chk_img, dl_chk, dl_rpt_img, dl_rpt ]; 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 ]; + dl_lp_chk_keys, dl_lp_chk_asc, dl_lp_chk_md5, dl_lp_chk_sha256, dl_hlp, dl_chk, dl_rpt ]; // The following are used in download.js. and index.html. LANG_ISO= ;// The language as ISO code @@ -807,8 +807,8 @@ function resetSel() { document.getElementById( dl_lp_lnk ).title= ; // Emtpy the values in the sub-green box on the left hand side. - document.getElementById( dl_rel_dta_hl ).innerHTML= ; - document.getElementById( dl_rel_dta ).innerHTML = ; + document.getElementById( dl_rel_info_hl ).innerHTML = ; + document.getElementById( dl_rel_info ).innerHTML = ; document.getElementById( dl_f_hl ).innerHTML = ; document.getElementById( dl_f_size_hl ).innerHTML = ; document.getElementById( dl_f_size ).innerHTML= ; @@ -911,7 +911,7 @@ function showErrorMessage( error_text ) // In general, reset the data for link, text and title of all elements. resetSel(); - // Now set again the values for all elements that should be shown. + // Now set again the values for all elements that should be shown with changed data. document.getElementById( dl_f_lnk ).style.display = inline; document.getElementById( dl_f_lnk ).style.cursor = not-allowed; document.getElementById( dl_f_lnk ).href = javascript:void( 0 ); @@ -1274,11 +1274,11 @@ function getLinkSel( rel_mode ) { document.getElementById( dl_lp_lnk).title = Click to download: + FILENAME_LP; // Set the values in the sub-green box on the left hand side. - document.getElementById( dl_rel_dta_hl).innerHTML = Release data: ; - document.getElementById( dl_rel_dta ).innerHTML = REL_TEXT; + document.getElementById( dl_rel_info_hl ).innerHTML = Release info: ; + document.getElementById( dl_rel_info ).innerHTML = REL_TEXT; document.getElementById( dl_f_hl ).innerHTML = Full installation: ; - document.getElementById( dl_f_size_hl ).innerHTML = Filesize ~; - document.getElementById( dl_f_size).innerHTML = nbsp; + FILESIZE_FULL + MByte; + document.getElementById( dl_f_size_hl ).innerHTML = Filesize ~ ; + document.getElementById( dl_f_size).innerHTML = FILESIZE_FULL + MB; document.getElementById( space1 ).innerHTML = | ; document.getElementById( dl_f_chk_hl ).innerHTML = Signatures and hashes: ; document.getElementById( dl_f_chk_keys).href = LINK_CHK_KEYS; @@ -1296,71 +1296,68 @@ function getLinkSel( rel_mode ) { document.getElementById( dl_f_chk_sha256 ).href = LINK_CHK_SHA256_FULL; document.getElementById( dl_f_chk_sha256 ).innerHTML = SHA256
svn commit: r1598607 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus Date: Fri May 30 14:06:11 2014 New Revision: 1598607 URL: http://svn.apache.org/r1598607 Log: Updated height for sub-green box 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=1598607r1=1598606r2=1598607view=diff == --- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original) +++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Fri May 30 14:06:11 2014 @@ -67,11 +67,6 @@ h1 { padding-left: 0.5em; } .green-sel:hover p, #bodycol .green-sel p:hover { cursor: default; } .green-sel:hover p a, #bodycol .green-sel p a:hover { cursor: default; } .green-sel form { padding: 0px 0px 0px 3%; margin: 0 0 20px 0; } -/* -.green-sel .sel-os { background: transparent; border: 2px solid #718D36; height: 27px; width: 200px; padding: 2px; -moz-appearance: none; -webkit-appearance: none; -ms-appearance: none; appearance: none; } -.green-sel .sel-lang { background: transparent; border: 2px solid #718D36; height: 27px; width: 360px; padding: 2px; -moz-appearance: none; -webkit-appearance: none; -ms-appearance: none; appearance: none; } -.green-sel .sel-ver { background: transparent; border: 2px solid #718D36; height: 27px; width: 80px; padding: 2px; -moz-appearance: none; -webkit-appearance: none; -ms-appearance: none; appearance: none; } -*/ .green-sel .sel-os { background: transparent; border: 2px solid #718D36; height: 27px; width: 200px; padding: 2px; } .green-sel .sel-lang { background: transparent; border: 2px solid #718D36; height: 27px; width: 360px; padding: 2px; } .green-sel .sel-ver { background: transparent; border: 2px solid #718D36; height: 27px; width: 80px; padding: 2px; } @@ -81,7 +76,7 @@ h1 { padding-left: 0.5em; } */ .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 { height: 83px; 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%; } .grey { background: #C0C0C0 right top no-repeat; cursor: default; }
svn commit: r1598608 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Fri May 30 14:08:07 2014 New Revision: 1598608 URL: http://svn.apache.org/r1598608 Log: Added new 'a' element for error text, combined some 'a' elements 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=1598608r1=1598607r2=1598608view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Fri May 30 14:08:07 2014 @@ -235,9 +235,9 @@ + /form + div class='dl-txt-btn' - + h3 style='display: inline;' -+ a id='dl_f_lnk' style='padding: 5px 5px 5px 5px;' href='' title=''/a -+ a id='dl_lp_lnk' style='padding: 5px 5px 5px 5px;' href='' title=''/a + + h3 style='display: inline; cursor: default;' ++ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a ++ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a + /h3 + br /br / /* @@ -274,42 +274,37 @@ + /div ); // Show some helpful data and links for filesizes and checksums. - document.write( div class='sub-green-sel' +//document.write( div class='sub-green-sel' + document.write( div id='sub_green_box' class='sub-green-sel' // + div style='float: left; width: 77%;' + div + p +// Error text with hint. ++ a id='dl_err' style='text-decoration: none; cursor: default; font-size: 1.2em'/a + // Release info. -+ a id='dl_rel_info_hl' style='text-decoration: none; font-weight: bold;'/a + a id='dl_rel_info' style='text-decoration: none;'/a + br / // Full installation: Filesize and checksums. -+ a id='dl_f_hl' style='text-decoration: none; font-weight: bold;'/a -+ a id='dl_f_size_hl' style='text-decoration: none;'/a -+ a id='dl_f_size'style='text-decoration: none;'/a -+ a id='space1' style='text-decoration: none;'/a -+ a id='dl_f_chk_hl' style='text-decoration: none;'/a ++ a id='dl_f_info'style='text-decoration: none;'/a + a id='dl_f_chk_keys'style='text-decoration: underline;' href='' title=''/a -+ a id='space2' style='text-decoration: none;'/a ++ a id='space1' style='text-decoration: none;'/a + a id='dl_f_chk_asc' style='text-decoration: underline;' href='' title=''/a -+ a id='space3' style='text-decoration: none;'/a ++ a id='space2' style='text-decoration: none;'/a + a id='dl_f_chk_md5' style='text-decoration: underline;' href='' title=''/a -+ a id='space4' style='text-decoration: none;'/a ++ a id='space3' style='text-decoration: none;'/a + a id='dl_f_chk_sha256' style='text-decoration: underline;' href='' title=''/a + br / // Langpack: Filesize and checksums. -+ a id='dl_lp_hl' style='text-decoration: none; font-weight: bold;'/a -+ a id='dl_lp_size_hl'style='text-decoration: none;'/a -+ a id='dl_lp_size' style='text-decoration: none;'/a -+ a id='space5' style='text-decoration: none;'/a -+ a id='dl_lp_chk_hl' style='text-decoration: none;'/a ++ a id='dl_lp_info' style='text-decoration: none;'/a + a id='dl_lp_chk_keys' style='text-decoration: underline;' href='' title=''/a -+ a id='space6' style='text-decoration: none;'/a ++ a id='space4' style='text-decoration: none;'/a + a id='dl_lp_chk_asc'style='text-decoration: underline;' href='' title=''/a -+ a id='space7' style='text-decoration: none;'/a ++ a id='space5' style='text-decoration: none;'/a + a id='dl_lp_chk_md5'style='text-decoration: underline;' href='' title=''/a -+ a id='space8' style='text-decoration: none;'/a ++ a id='space6' style='text-decoration: none;'/a + a id='dl_lp_chk_sha256' style='text-decoration: underline;' href='' title=''/a + br / @@ -349,6 +344,9 @@ + /div ); document.write( /div ); +//entourage.initialize(); + + // Fill the select boxes and wait for the user's choice. init(); //--
svn commit: r1598609 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 14:11:13 2014 New Revision: 1598609 URL: http://svn.apache.org/r1598609 Log: Changed sub-green box to light-red for displaying error text, back to light-green for normal display 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=1598609r1=1598608r2=1598609view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 14:11:13 2014 @@ -61,13 +61,18 @@ function initVars() { // Define variables without var to make them globally available. // The following are used in download.js only. - element_ids = [ dl_f_lnk, dl_lp_lnk, dl_rel_info_hl, dl_rel_info, dl_f_hl, dl_f_size_hl, dl_f_size, - space1, dl_f_chk_hl, dl_f_chk_keys, space2, dl_f_chk_asc, space3, dl_f_chk_md5, space4, + element_ids_sub_green = [ dl_rel_info, dl_f_info, dl_f_chk_keys, space1, dl_f_chk_asc, space2, + dl_f_chk_md5, space3, dl_f_chk_sha256, dl_lp_info, dl_lp_chk_keys, space4, dl_lp_chk_asc, space5, + dl_lp_chk_md5, space6, dl_lp_chk_sha256, dl_hlp_img, dl_hlp, dl_chk_img, dl_chk, dl_rpt_img, + dl_rpt ]; +/* + element_ids_sub_green = [ dl_rel_info_hl, dl_rel_info, dl_f_hl, dl_f_size_hl, + dl_f_size, space1, dl_f_chk_hl, dl_f_chk_keys, space2, dl_f_chk_asc, space3, dl_f_chk_md5, space4, dl_f_chk_sha256, dl_lp_hl, dl_lp_size_hl, dl_lp_size, space5, dl_lp_chk_hl, dl_lp_chk_keys, space6, dl_lp_chk_asc, space7, dl_lp_chk_md5, space8, dl_lp_chk_sha256, dl_hlp_img, dl_hlp, dl_chk_img, dl_chk, dl_rpt_img, dl_rpt ]; - - 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, +*/ + element_ids_links = [ dl_f_link, dl_lp_link, dl_f_chk_keys, dl_f_chk_asc, dl_f_chk_md5, dl_f_chk_sha256, dl_lp_chk_keys, dl_lp_chk_asc, dl_lp_chk_md5, dl_lp_chk_sha256, dl_hlp, dl_chk, dl_rpt ]; // The following are used in download.js. and index.html. @@ -761,7 +766,7 @@ function getTypeSel() { } /* - * Reset the link, text and title of all elements that are not available + * Set CSS style for all elements with ID to make them invisible */ function resetSel() { // var elements = document.getElementsByTagName( select ); @@ -774,21 +779,30 @@ function resetSel() { // Change CSS styles for all elements with ID in the green and sub-green colored boxes. // Emtpy the values for all elements, make them invisible. // for( var i = 0; i element_ids.length; i++ ) { - for( var i = 0, j = element_ids.length; i j; i++ ) { - if( element_ids[ i ].indexOf( img ) 0 ) { +// for( var i = 0, j = element_ids.length; i j; i++ ) { +// if( element_ids[ i ].indexOf( img ) 0 ) { // Emtpy the values for all text elements. // document.getElementById( element_ids[ i ] ).href = javascript:void( 0 ); // document.getElementById( element_ids[ i ] ).title = ; // document.getElementById( element_ids[ i ] ).innerHTML = ; - } else { +// } else { // Emtpy the values for all image elements. // document.getElementById( element_ids[ i ] ).style.display = none; // document.getElementById( element_ids[ i ] ).src = javascript:void( 0 ); // document.getElementById( element_ids[ i ] ).title = ; // document.getElementById( element_ids[ i ] ).alt = ; - } +// } // document.getElementById( element_ids[ i ] ).title = ; - document.getElementById( element_ids[ i ] ).style.display = none; + +// document.getElementById( element_ids[ i ] ).style.display = none; +// } + + for( var i = 0, j = element_ids_sub_green.length; i j; i++ ) { + document.getElementById( element_ids_sub_green[ i ] ).style.display = none; + } + + for( var i = 0, j = element_ids_links.length; i j; i++ ) { + document.getElementById( element_ids_links[ i ] ).style.display = none; } /* // Set the values for all elements that should not be empty. @@ -912,19 +926,24 @@ function showErrorMessage( error_text ) resetSel(); // Now set again the values for all elements that should be shown with changed data. - document.getElementById( dl_f_lnk ).style.display = inline; - document.getElementById
svn commit: r1598651 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus Date: Fri May 30 16:08:24 2014 New Revision: 1598651 URL: http://svn.apache.org/r1598651 Log: Set a general min and max value for 'width' for all colored boxes to allow text wraps only within this range, disallow text wraps in general 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=1598651r1=1598650r2=1598651view=diff == --- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original) +++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Fri May 30 16:08:24 2014 @@ -26,7 +26,7 @@ h1 { padding-left: 0.5em; } #content h2 { margin-top: 0; } -.optionset { margin: 0 0 0 -2px; float: left; width: 77%; max-width: 1200px; } +.optionset { margin: 0 0 0 -2px; float: left; width: 77%; min-width: 680px; max-width: 1200px; } .optionset a { margin: 0; padding: .1em 0 .25em 3%; color: #333; } .optionset p { margin: 0; padding: .1em 0 .25em 3%; color: #333; } .optionset p a { margin: 0; padding: 0; color: #333; } @@ -170,7 +170,7 @@ background: url(../cachedimages/button-y .sub-red { background: #FFE2B5; border-top: 1px solid #FFB15E; border-bottom: 1px solid #FFB15E; border-radius: 15px; font-size: .8em; cursor: default; } .sub-red p { padding: .1em 3%; width: 75%; cursor: default; } -.additionalinformation { background: none; float: right; width: 21%; clear: none; } +.additionalinformation { background: none; float: right; width: 21%; white-space: nowrap; clear: none; } .additionalinformation h2 { border-bottom: 1px solid #CCC; margin-bottom: 5px; margin-top: 0px; } .additionalinformation h3 { margin-left: 5px; margin-bottom: 5px; } .additionalinformation li { margin-left: 5px; font-size: 12px; }
svn commit: r1598653 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 16:11:16 2014 New Revision: 1598653 URL: http://svn.apache.org/r1598653 Log: Added 'Problem' and 'Solution' as keywords in bold for the error text 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=1598653r1=1598652r2=1598653view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 16:11:16 2014 @@ -1189,8 +1189,9 @@ function getLinkSel( rel_mode ) { // If recognized platform is not Windows, Linux or Mac, show the none-availability to the user. if( UI_PLATFORM_NO_SUP != ) { // Show an error message that the chosen items do not lead to a download. - error_text = Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM_NO_SUP + /b. -+ br /Please select a download for Windows, Linux or OS X.; + error_text = bProblem:/b Apache OpenOffice + VERSION_SEL + is not available for b ++ UI_PLATFORM_NO_SUP + /b. ++ br /bSolution:/b Please select a download for Windows, Linux or OS X.; showErrorMessage( error_text ); @@ -1200,8 +1201,9 @@ function getLinkSel( rel_mode ) { // If version is '4.1.0' (or newer) and platform is 'Mac OS X = 10.6', show the none-availability to the user. if( VERSION_SEL == 4.1.0 URL_PLATFORM == MacOS_x86_install ) { // Show an error message that the chosen items do not lead to a download. - error_text = Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM + /b. -+ br /Please select version 4.0.1.; + error_text = bProblem:/b nbsp;Apache OpenOffice + VERSION_SEL + is not available for b ++ UI_PLATFORM + /b. ++ br /bSolution:/b Please select version 4.0.1.; showErrorMessage( error_text ); @@ -1211,8 +1213,9 @@ function getLinkSel( rel_mode ) { // If version is '4.0.1' (or older) and platform is 'Mac OS X = 10.7', show the none-availability to the user. if( ( VERSION_SEL == 4.0.1 || VERSION_SEL == 4.0.0 ) URL_PLATFORM == MacOS_x86-64_install ) { // Set the values for all elements that should not be empty. - error_text = Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM + /b. -+ br /Please select version 4.1.0 or newer.; + error_text = bProblem:/b Apache OpenOffice + VERSION_SEL + is not available for b ++ UI_PLATFORM + /b. ++ br /bSolution:/b Please select version 4.1.0 or newer.; showErrorMessage( error_text ); @@ -1236,9 +1239,9 @@ function getLinkSel( rel_mode ) { LINK_LP = LINK_LP; } // Show an error message that the chosen items do not lead to a download. - error_text = Apache OpenOffice + VERSION_SEL + is not available for b + RELEASE_LANG[ 1 ] -+ ( + RELEASE_LANG[ 2 ] + ) ( + LANG_SEL + )/b. -+ br /Please choose another language or version.; + error_text = bProblem:/b Apache OpenOffice + VERSION_SEL + is not available for b ++ RELEASE_LANG[ 1 ] + ( + RELEASE_LANG[ 2 ] + ) ( + LANG_SEL + )/b. ++ br /bSolution:/b Please choose another language or version.; showErrorMessage( error_text );
svn commit: r1598672 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus Date: Fri May 30 17:03:07 2014 New Revision: 1598672 URL: http://svn.apache.org/r1598672 Log: Added a general container that includes the containers for the colored boxes and the nav bar, set a min and max value for the width, if the browser window gets too small the nav bar will not be wrapped below the colored boxes but a scrollbar should get the content back 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=1598672r1=1598671r2=1598672view=diff == --- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original) +++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Fri May 30 17:03:07 2014 @@ -26,6 +26,7 @@ h1 { padding-left: 0.5em; } #content h2 { margin-top: 0; } +.overall_optionset { min-width: 880px; max-width: 1400px; overflow: auto; } .optionset { margin: 0 0 0 -2px; float: left; width: 77%; min-width: 680px; max-width: 1200px; } .optionset a { margin: 0; padding: .1em 0 .25em 3%; color: #333; } .optionset p { margin: 0; padding: .1em 0 .25em 3%; color: #333; }
svn commit: r1598673 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Fri May 30 17:03:40 2014 New Revision: 1598673 URL: http://svn.apache.org/r1598673 Log: Added a general container that includes the containers for the colored boxes and the nav bar, set a min and max value for the width, if the browser window gets too small the nav bar will not be wrapped below the colored boxes but a scrollbar should get the content back 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=1598673r1=1598672r2=1598673view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Fri May 30 17:03:40 2014 @@ -42,6 +42,7 @@ body +div class=overall_optionset div class=optionset !-- Text above the first colored box -- @@ -621,6 +622,7 @@ alt=W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents //a /div /div +/div /body /html
svn commit: r1598695 - /openoffice/ooo-site/trunk/content/index.html
Author: marcus Date: Fri May 30 18:28:34 2014 New Revision: 1598695 URL: http://svn.apache.org/r1598695 Log: Added a general 'div' container that includes all 'div' of the news, set a value for the height of blog posts and news, if the content is too long then scrollbars are displayed to get all the content Modified: openoffice/ooo-site/trunk/content/index.html Modified: openoffice/ooo-site/trunk/content/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/index.html?rev=1598695r1=1598694r2=1598695view=diff == --- openoffice/ooo-site/trunk/content/index.html (original) +++ openoffice/ooo-site/trunk/content/index.html Fri May 30 18:28:34 2014 @@ -44,6 +44,9 @@ screen reader. div id=actionstatements ul li + hr / +/li +li div class=action-info div class=action-text action-link a href=why/index.htmlh2I want to learn more about OpenOffice/h2 @@ -55,7 +58,7 @@ screen reader. hr / /li -!-- Show the currently available version, load via JavaScript -- +!-- Show the currently available version, loaded via JavaScript -- script type=text/javascript !-- document.write( li @@ -134,106 +137,116 @@ screen reader. hr / /li /ul -/div -div id=news - - div class=campaign -h2Recent Blog Posts/h2 - p -em10 May:/embr /a href=https://blogs.apache.org/infra/entry/mail_outage; - OpenOffice mailing lists: service restored/a -br/ -em29 April:/embr /a href=https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce; -Apache OpenOffice 4.1.0 released/a -br/ -em28 April:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2; -Apache OpenOffice Weekly News #2/a -br/ -em25 April:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1; -Apache OpenOffice Weekly News #1/a -br/ -em17 April:/embr /a href=https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56; -100 Million downloads/a -br/ -em01 April:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_4_2_to; -Apache OpenOffice 4.2 to Bring OpenCash Support/a -br/ -em10 March:/embr /a href=https://blogs.apache.org/OOo/entry/seeking_beta_testers_for_apache; -Announcing Apache OpenOffice 4.1.0 Beta/a -br/ -em20 February:/embr /a href=https://blogs.apache.org/OOo/entry/international_mother_language_day_2014; -International Mother Language Day 2014/a -br/ -em31 December:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a; -Apache OpenOffice in 2013: a year in review/a -br/ - /p - p style=text-align:righta href=http://blogs.apache.org/OOo/;All Posts/a/p + div id=SupportedAndSupporters +a href=http://validator.w3.org/check?uri=referer; +title=W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents +img src=http://www.w3.org/Icons/valid-xhtml10-blue.png; +alt=W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents//a /div +/div - div class=campaign -h2Recent News/h2 - -pbr //p +div id=news style=height: 520px; -h2Apache OpenOffice 4.1.0 released/h2 + div class=campaign style=height: 200px; float: right; overflow: auto; +h2 style=display: inline;Recent Blog Posts/h2 -pem29 April 2014:/em -The Apache OpenOffice project announces the -a href=https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce; -title=Offical blog post about Apache OpenOffice 4.1.0official release of version 4.1.0/a. -In the a href=https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes; -title=Release Notes for Apache OpenOffice 4.1.0Release Notes/a you can read about all new features, functions -and languages. a href=https://www.openoffice.org/download/; -title=Download Apache OpenOffice 4.1.0Don't miss to download/a the new release and find out yourself./p - /div +p style=text-align:right + a href=http://blogs.apache.org/OOo/;All Posts/a +/p + +p + em10 May:/embr /a href=https://blogs.apache.org/infra/entry/mail_outage; + OpenOffice mailing lists: service restored/a + br/ + em29 April:/embr /a href=https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce; + Apache OpenOffice 4.1.0 released/a + br/ + em28 April:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2; + Apache OpenOffice Weekly News #2/a + br/ + em25 April:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1; + Apache OpenOffice Weekly News #1
svn commit: r910606 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Fri May 30 19:00:48 2014 New Revision: 910606 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r910605, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910605, websites/staging/ooo-site/trunk/content/
svn commit: r1598704 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 19:17:39 2014 New Revision: 1598704 URL: http://svn.apache.org/r1598704 Log: Added default value to 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=1598704r1=1598703r2=1598704view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 19:17:39 2014 @@ -1390,7 +1390,7 @@ function getPlatform() { var ua = navigator.userAgent.toLowerCase(); // Get the User Agent string in lower cases. var av = navigator.appVersion.toLowerCase(); // Get the application version in lower cases. UI_PLATFORM= ; // Delete previously set string. - UI_PLATFORM_NO_SUP = ; // Delete previously set string. + UI_PLATFORM_NO_SUP = false;// Delete previously set string. URL_PLATFORM = ; // Delete previously set string. EXTENSION = ; // Delete previously set string.
svn commit: r1598710 - /openoffice/ooo-site/trunk/content/download/test/download.js
Author: marcus Date: Fri May 30 19:32:24 2014 New Revision: 1598710 URL: http://svn.apache.org/r1598710 Log: Changed variable to use for 'if' condition Modified: openoffice/ooo-site/trunk/content/download/test/download.js Modified: openoffice/ooo-site/trunk/content/download/test/download.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download.js?rev=1598710r1=1598709r2=1598710view=diff == --- openoffice/ooo-site/trunk/content/download/test/download.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download.js Fri May 30 19:32:24 2014 @@ -155,8 +155,8 @@ function getLanguage() { function hasMirrorLink() { // Check the flag in languages.js, 'y' - provide download link, 'n' - redirect to alternative webpage. // Check the flag in release_matrix.js, 'y' - provide download link, 'n' - redirect to alternative webpage. -// if ( LANG_ARRAY[ 3 ] == 'y' ) { - if ( RELEASE_MATRIX_LANG[ 1 ] == 'y' ) { + if ( LANG_ARRAY[ 3 ] == 'y' ) { +// if ( RELEASE_MATRIX_LANG[ 1 ] == 'y' ) { return true; } else { ERROR = true;
svn commit: r1598711 - /openoffice/ooo-site/trunk/content/download/test/analyze.html
Author: marcus Date: Fri May 30 19:33:46 2014 New Revision: 1598711 URL: http://svn.apache.org/r1598711 Log: Restored the functionality (with the old one-click-download link and without the new select boxes Modified: openoffice/ooo-site/trunk/content/download/test/analyze.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze.html?rev=1598711r1=1598710r2=1598711view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze.html Fri May 30 19:33:46 2014 @@ -3,10 +3,10 @@ head meta http-equiv=Content-Type content=text/html; charset=utf-8 / titleApache OpenOffice Downloads - Analyze errors of stable release/title - script type=text/javascript src=globalvars_droplist.js/script + script type=text/javascript src=globalvars.js/script script type=text/javascript src=languages.js/script - script type=text/javascript src=release_matrix_droplist.js/script - script type=text/javascript src=download_droplist.js/script + script type=text/javascript src=release_matrix.js/script + script type=text/javascript src=download.js/script style type=text/css /* ![CDATA[ */ /* Exceptions on standard css ---*/ @@ -28,12 +28,12 @@ screen reader. -- script type=text/javascript !-- // Set a specific language ISO code to force to assemble a certain localized build as download link. - NL_LANG = ; + NL_LANGUAGE = ; // Get the download link (1 = Stable Release). var dl_link = getLink( 1 ); // Does the browser language match with AOO languages? - if ( isLangSupported() ) { -if ( SF ) { + if ( hasMirrorLink() ) { +if ( SOURCEFORGE ) { // If download link contains sourceforge (- normal and correct download link), // offer download link from Sourceforge with displayed platform and language. /* @@ -44,17 +44,17 @@ screen reader. -- + pa href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' + Click here to download (hosted by Sourceforge.net) for: + br /b + UI_PLATFORM + /b and b + RELEASE_MATRIX_LANG[ 1 ] + ( + RELEASE_MATRIX_LANG[ 2 ] + )/b -+ br /Filesize ~ + FILESIZE_FULL + nbsp;MByte | Milestone + MILESTONE + | Build ID + BUILD ++ br /Filesize ~ + FILESIZE + nbsp;MByte | Milestone + MILESTONE + | Build ID + BUILD + | SVN + SVN_REV + | Released: + REL_DATE + /a/p + /div ); */ document.write( div class=\first button green\ id=\optionitem1\ onclick=\openItem('optionitem1',' + dl_link + '); return false;\ -+ h2a href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' ++ h2a href=' + dl_link + ' title='Click to download: + FILENAME + ' + Download Apache OpenOffice + VERSION + /a/h2 -+ pa href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' -+ a href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' -+ b + UI_PLATFORM + /b and b + RELEASE_LANG[ 1 ] + ( + RELEASE_LANG[ 2 ] + )/b ++ pa href=' + dl_link + ' title='Click to download: + FILENAME + ' ++ a href=' + dl_link + ' title='Click to download: + FILENAME + ' ++ b + UI_PLATFORM + /b and b + LANG_ARRAY[ 1 ] + ( + LANG_ARRAY[ 2 ] + )/b + nbsp;nbsp;nbsp;(Hosted by Sourceforge.net - A trusted website)/a/p + /div ); } else if ( OTHER ) { @@ -62,11 +62,11 @@ screen reader. -- // use other.html as download link. document.write( div class=\first button green\ id=\optionitem1\ onclick=\openItem('optionitem1',' + dl_link + '); return false;\ -+ h2a href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' ++ h2a href=' + dl_link + ' title='Click to download: + FILENAME + ' + Download Apache OpenOffice/a/h2 -+ pa href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' ++ pa href=' + dl_link + ' title='Click to download: + FILENAME + ' + Apache OpenOffice + VERSION + for -+ b + UI_PLATFORM + /b and b + RELEASE_LANG[ 1 ] + ( + RELEASE_LANG[ 2 ] + )/b ++ b + UI_PLATFORM + /b and b + LANG_ARRAY[ 1 ] + ( + LANG_ARRAY[ 2 ] + )/b + is not available. Click here to choose from the alternative download webpage./a/p + /div ); } else if ( ARCHIVE ) { @@ -74,11 +74,11 @@ screen reader. -- // offer download link from archive to the previous version. document.write( div class=\first button green\ id=\optionitem1\ onclick=\openItem('optionitem1',' + dl_link + '); return false;\ -+ h2a href=' + dl_link + ' title='Click to download: + FILENAME_FULL + ' ++ h2a href=' + dl_link + ' title
svn commit: r1598715 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 19:46:05 2014 New Revision: 1598715 URL: http://svn.apache.org/r1598715 Log: Changed variable value to use for 'if' condition 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=1598715r1=1598714r2=1598715view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 19:46:05 2014 @@ -1187,7 +1187,7 @@ function getLinkSel( rel_mode ) { } */ // If recognized platform is not Windows, Linux or Mac, show the none-availability to the user. - if( UI_PLATFORM_NO_SUP != ) { + if( UI_PLATFORM_NO_SUP != false ) { // Show an error message that the chosen items do not lead to a download. error_text = bProblem:/b Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM_NO_SUP + /b.
svn commit: r1598722 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 20:00:36 2014 New Revision: 1598722 URL: http://svn.apache.org/r1598722 Log: Updated comments 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=1598722r1=1598721r2=1598722view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 20:00:36 2014 @@ -1023,7 +1023,7 @@ function getLink( rel_mode ) { getFileData( PREV_VERSION ); SOURCEFORGE_PREV_URL = SOURCEFORGE + PREV_VERSION + /binaries/; - ASF_DIST_PREV_URL= ASF_DIST+ PREV_VERSION; +// ASF_DIST_PREV_URL= ASF_DIST+ PREV_VERSION; ASF_ARC_PREV_URL = ASF_ARC + PREV_VERSION; LINK_FULL= SOURCEFORGE_PREV_URL+LANG_ISO+/+FILENAME_FULL+/download;
svn commit: r1598724 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Fri May 30 20:01:56 2014 New Revision: 1598724 URL: http://svn.apache.org/r1598724 Log: Added new analyze webpage for the select box implementation Added: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (with props) Added: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598724view=auto == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (added) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Fri May 30 20:01:56 2014 @@ -0,0 +1,208 @@ +!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; +html xmlns=http://www.w3.org/1999/xhtml; / +head + meta http-equiv=Content-Type content=text/html; charset=utf-8 / + titleApache OpenOffice Downloads - Analyze errors of stable release/title + script type=text/javascript src=globalvars_droplist.js/script + script type=text/javascript src=languages.js/script + script type=text/javascript src=release_matrix_droplist.js/script + script type=text/javascript src=download_droplist.js/script + style type=text/css + /* ![CDATA[ */ + /* Exceptions on standard css ---*/ + @import styles.css; + @import exceptions.css; + /* ]] */ + /style +/head + +body + +div class=optionset + + !-- Text above the first colored box -- + script type=text/javascript + !-- + // The text in the H1 tag is intentionally shown as display: none (do not display). + // This is to please accessibility tools like a screen reader. + document.write( h1 style='display: none;'Apache OpenOffice Download/h1 ); + -- + /script + + !-- Green: Stable release -- + !-- Download via select boxes -- + script type=text/javascript + !-- + + // 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_ISO_code.js. + NL_LANG = ; + + document.write( div class='first button green-sel' id='optionitem2' ++ h2 + + a title='Download Apache OpenOffice for your favorite operating system, language and version' + + Download Apache OpenOffice/a ++ /h2 + ++ p style='padding-bottom: 0px;' + + a title='Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website' + + (Hosted by Sourceforge.net - A trusted website)/a + + a title='Select your favorite operating system, language and version' + + bSelect your favorite operating system, language and version:/b/a ++ /p + ++ form name='download' + + select class='sel-os' id='os'name='os' title='Select your favorite operating system' + + onchange='getLinkSel( 1 )'/select + + select class='sel-lang' id='lang'name='lang' title='Select your favorite language' + + onchange='getLinkSel( 1 )'/select + + select class='sel-ver' id='ver' name='ver' title='Select your favorite release version' + + onchange='getLinkSel( 1 )'/select ++ /form + ++ div class='dl-txt-btn' + + h3 style='display: inline; cursor: default;' ++ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a ++ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a + + /h3 + + br /br / ++ /div + + /div ); + + // Show some helpful data and links for filesizes and checksums. + document.write( div id='sub_green_box' class='sub-green-sel' ++ div + + p +// Error text with hint. ++ a id='dl_err' style='text-decoration: none; cursor: default; font-size: 1.2em'/a + +// Release info. ++ a id='dl_rel_info' style='text-decoration: none;'/a ++ br / + +// Full installation: Filesize and checksums. ++ a id='dl_f_info'style='text-decoration: none;'/a ++ a id='dl_f_chk_keys'style='text-decoration: underline;' href='' title=''/a ++ a id='space1' style='text-decoration: none;'/a ++ a id='dl_f_chk_asc' style='text-decoration: underline;' href='' title=''/a ++ a id='space2' style='text-decoration: none;'/a ++ a id='dl_f_chk_md5' style='text-decoration: underline;' href='' title=''/a ++ a id='space3' style='text-decoration: none;'/a ++ a id='dl_f_chk_sha256' style='text-decoration: underline;' href='' title=''/a ++ br / + +// Langpack: Filesize and checksums. ++ a id='dl_lp_info' style='text-decoration: none;'/a ++ a id='dl_lp_chk_keys' style='text-decoration: underline;' href='' title=''/a ++ a id='space4' style='text-decoration: none;'/a ++ a id='dl_lp_chk_asc'style='text-decoration
svn commit: r910620 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Fri May 30 20:05:39 2014 New Revision: 910620 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r910619, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910619, websites/staging/ooo-site/trunk/content/
svn commit: r1598741 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 20:31:48 2014 New Revision: 1598741 URL: http://svn.apache.org/r1598741 Log: Updated text 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=1598741r1=1598740r2=1598741view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 20:31:48 2014 @@ -1241,7 +1241,7 @@ function getLinkSel( rel_mode ) { // Show an error message that the chosen items do not lead to a download. error_text = bProblem:/b Apache OpenOffice + VERSION_SEL + is not available for b + RELEASE_LANG[ 1 ] + ( + RELEASE_LANG[ 2 ] + ) ( + LANG_SEL + )/b. -+ br /bSolution:/b Please choose another language or version.; ++ br /bSolution:/b Please select another language or version.; showErrorMessage( error_text );
svn commit: r1598769 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Fri May 30 23:01:46 2014 New Revision: 1598769 URL: http://svn.apache.org/r1598769 Log: Updated styles for sub-green box 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=1598769r1=1598768r2=1598769view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 23:01:46 2014 @@ -937,13 +937,14 @@ function showErrorMessage( error_text ) document.getElementById( dl_lp_link).innerHTML= No language pack available; document.getElementById( dl_lp_link).title= Please select another language, platform or version.; - document.getElementById( sub_green_box ).style.background = #F87E7E; // LightRed + document.getElementById( sub_green_box ).style.background = #FECBCB; // LightRed + document.getElementById( sub_green_box ).style.borderTop = 1px solid #C0; // Darker red + document.getElementById( sub_green_box ).style.borderBottom = 1px solid #C0; // Darker red - document.getElementById( dl_err).style.display= inline; - document.getElementById( dl_err).style.textDecoration = none; + document.getElementById( dl_err).innerHTML= br / + error_text; document.getElementById( dl_err).style.fontSize = 1.2em; document.getElementById( dl_err).style.cursor = default; - document.getElementById( dl_err).innerHTML= br / + error_text; + document.getElementById( dl_err).style.display= inline; SF = false; OTHER = false; @@ -1350,6 +1351,9 @@ function getLinkSel( rel_mode ) { // Reset the CSS styles for the elements in the sub-green colored boxes. document.getElementById( sub_green_box).style.background = #E9FEBE; // LightGreen + document.getElementById( sub_green_box).style.borderTop = 1px solid #C3E480; // Darker green + document.getElementById( sub_green_box ).style.borderBottom = 1px solid #C3E480; // Darker green + document.getElementById( sub_green_box).style.fontSize = 0.8em; document.getElementById( dl_err ).style.display = none; // Change CSS styles for all elements with ID in the green and sub-green colored boxes.
svn commit: r1598770 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Fri May 30 23:02:06 2014 New Revision: 1598770 URL: http://svn.apache.org/r1598770 Log: Updated styles for sub-green box 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=1598770r1=1598769r2=1598770view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Fri May 30 23:02:06 2014 @@ -281,7 +281,7 @@ + div + p // Error text with hint. -+ a id='dl_err' style='text-decoration: none; cursor: default; font-size: 1.2em'/a ++ a id='dl_err' style='text-decoration: none;'/a // Release info. + a id='dl_rel_info' style='text-decoration: none;'/a
svn commit: r1598771 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus Date: Fri May 30 23:02:51 2014 New Revision: 1598771 URL: http://svn.apache.org/r1598771 Log: Updated styles for sub-green box 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=1598771r1=1598770r2=1598771view=diff == --- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original) +++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Fri May 30 23:02:51 2014 @@ -77,7 +77,7 @@ h1 { padding-left: 0.5em; } */ .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: 83px; background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size: .8em; } +.sub-green-sel { height: 83px; background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size: .8em; padding: 5px; } .sub-green-sel p { padding: .1em 3%; width: 100%; } .grey { background: #C0C0C0 right top no-repeat; cursor: default; }
svn commit: r1598772 - /openoffice/ooo-site/trunk/content/download/test/exceptions.css
Author: marcus Date: Fri May 30 23:07:16 2014 New Revision: 1598772 URL: http://svn.apache.org/r1598772 Log: Updated styles for sub-green box 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=1598772r1=1598771r2=1598772view=diff == --- openoffice/ooo-site/trunk/content/download/test/exceptions.css (original) +++ openoffice/ooo-site/trunk/content/download/test/exceptions.css Fri May 30 23:07:16 2014 @@ -77,7 +77,7 @@ h1 { padding-left: 0.5em; } */ .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: 83px; background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size: .8em; padding: 5px; } +.sub-green-sel { height: 83px; background: #E9FEBE; border-top: 1px solid #C3E480; border-bottom: 1px solid #C3E480; border-radius: 15px; font-size: .8em; padding: 5px 5px 5px 0px; } .sub-green-sel p { padding: .1em 3%; width: 100%; } .grey { background: #C0C0C0 right top no-repeat; cursor: default; }
svn commit: r1598786 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Sat May 31 00:07:41 2014 New Revision: 1598786 URL: http://svn.apache.org/r1598786 Log: Disabled old 'noscript' text for green box 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=1598786r1=1598785r2=1598786view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Sat May 31 00:07:41 2014 @@ -184,6 +184,7 @@ /script !-- Green: Stable release: No JavaScript enabled -- +!-- noscript div class=first button green id=optionitem1 h2aDownload Apache OpenOffice/a/h2 @@ -203,7 +204,7 @@ a href=../legacy/index.html title=Get the legacy version of OpenOffice.orgLegacy OpenOffice.org/a/p /div /noscript - +-- !-- Green: Stable release -- !-- Download via select boxes -- script type=text/javascript
svn commit: r1598789 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Sat May 31 00:17:00 2014 New Revision: 1598789 URL: http://svn.apache.org/r1598789 Log: Updated cursor style and text for all 'noscript' sections 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=1598789r1=1598788r2=1598789view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Sat May 31 00:17:00 2014 @@ -188,10 +188,10 @@ noscript div class=first button green id=optionitem1 h2aDownload Apache OpenOffice/a/h2 -pa href=http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; +pa style=cursor: pointer; href=http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; title=Select from all platforms, languages, language packs to downloadYour browser does not seem to allow JavaScript on websites. This technique is used on this webpage for presenting the actual download link. If you want to download -Apache OpenOffice, click here to go to the alternative download page, and you will skip this page. +Apache OpenOffice, click this text to go to the alternative download page, and you will skip this page. Our apologies for the inconvenience./a/p /div div class=sub-green @@ -358,10 +358,10 @@ noscript div class=button green-sel id=optionitem2 h2aDownload Apache OpenOffice/a/h2 -pa href=http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; +pa style=cursor: pointer; href=http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; title=Select from all platforms, languages, language packs to downloadYour browser does not seem to allow JavaScript on websites. This technique is used on this webpage for presenting the actual download link. If you want to download -Apache OpenOffice, click here to go to the alternative download page, and you will skip this page. +Apache OpenOffice, click this text to go to the alternative download page, and you will skip this page. Our apologies for the inconvenience./a/p /div /noscript @@ -472,10 +472,10 @@ div class=button yellow id=optionitem3 onclick=openItem('optionitem3','all_beta.html'); return false; h2a href=all_beta.html title=Select from all platforms, languages, language packs to download Download Apache OpenOffice Beta/a/h2 -pa href=http://sourceforge.net/projects/openofficeorg.mirror/files/; +pa style=cursor: pointer; href=http://sourceforge.net/projects/openofficeorg.mirror/files/; title=Select from all platforms, languages, language packs to downloadYour browser does not seem to allow JavaScript on websites. This technique is used on this webpage for presenting the actual download link. If you want to download -Apache OpenOffice, click here to go to the alternative download page, and you will skip this page. +Apache OpenOffice, click this text to go to the alternative download page, and you will skip this page. Our apologies for the inconvenience./a/p /div div class=sub-yellow
svn commit: r1598848 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 10:18:38 2014 New Revision: 1598848 URL: http://svn.apache.org/r1598848 Log: Improved comparison operators, updated comments 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=1598848r1=1598847r2=1598848view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 10:18:38 2014 @@ -76,43 +76,43 @@ function initVars() { dl_lp_chk_keys, dl_lp_chk_asc, dl_lp_chk_md5, dl_lp_chk_sha256, dl_hlp, dl_chk, dl_rpt ]; // 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 - UI_PLATFORM_NO_SUP = ;// The platform as readable string, if not supported - URL_PLATFORM= ;// The platform as part of the download URL + LANG_ISO= ;// The language as ISO code. + LANG_ARRAY = ;// This array contains all language specific data. + UI_PLATFORM = ;// The platform as readable string. + 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_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 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) - 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) - LINK_LP = ;// The complete 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 - ASF_DIST_BASE_URL
svn commit: r1598849 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Sat May 31 10:21:04 2014 New Revision: 1598849 URL: http://svn.apache.org/r1598849 Log: Added a graphic icon to the error text 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=1598849r1=1598848r2=1598849view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Sat May 31 10:21:04 2014 @@ -282,7 +282,8 @@ + div + p // Error text with hint. -+ a id='dl_err' style='text-decoration: none;'/a ++ img id='dl_err_img' style='margin: 5px 5px 15px 0px;' src='' title='' height='16' width='16' alt='' / ++ a id='dl_err' style='text-decoration: none;' title=''/a // Release info. + a id='dl_rel_info' style='text-decoration: none;'/a
svn commit: r1598850 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 10:22:22 2014 New Revision: 1598850 URL: http://svn.apache.org/r1598850 Log: Show a graphic icon left to the error text, make it visible and invisible for the respective purpose 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=1598850r1=1598849r2=1598850view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 10:22:22 2014 @@ -945,6 +945,10 @@ function showErrorMessage( error_text ) document.getElementById( sub_green_box ).style.borderTop = 1px solid #C0; // Darker red document.getElementById( sub_green_box ).style.borderBottom = 1px solid #C0; // Darker red + document.getElementById( dl_err_img).src = ../cachedimages/exclamation-icon.png; + document.getElementById( dl_err_img).title= The selected download file is not available; + document.getElementById( dl_err_img).alt = Error text; + document.getElementById( dl_err_img).style.display= inline-block; document.getElementById( dl_err).innerHTML= br / + error_text; document.getElementById( dl_err).title= The selected download file is not available; document.getElementById( dl_err).style.fontSize = 1.2em; @@ -1358,6 +1362,7 @@ function getLinkSel( rel_mode ) { document.getElementById( sub_green_box).style.borderTop = 1px solid #C3E480; // Darker green document.getElementById( sub_green_box ).style.borderBottom = 1px solid #C3E480; // Darker green document.getElementById( sub_green_box).style.fontSize = 0.8em; + document.getElementById( dl_err_img ).style.display = none; document.getElementById( dl_err ).style.display = none; // Change CSS styles for all elements with ID in the green and sub-green colored boxes.
svn commit: r1598851 - /openoffice/ooo-site/trunk/content/download/cachedimages/exclamation-icon.png
Author: marcus Date: Sat May 31 10:23:39 2014 New Revision: 1598851 URL: http://svn.apache.org/r1598851 Log: Added a graphic icon as exclamation mark Added: openoffice/ooo-site/trunk/content/download/cachedimages/exclamation-icon.png (with props) Added: openoffice/ooo-site/trunk/content/download/cachedimages/exclamation-icon.png URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/cachedimages/exclamation-icon.png?rev=1598851view=auto == Binary file - no diff available. Propchange: openoffice/ooo-site/trunk/content/download/cachedimages/exclamation-icon.png -- svn:mime-type = image/png
svn commit: r1598852 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 10:28:39 2014 New Revision: 1598852 URL: http://svn.apache.org/r1598852 Log: Updated link 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=1598852r1=1598851r2=1598852view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 10:28:39 2014 @@ -1353,7 +1353,7 @@ function getLinkSel( rel_mode ) { document.getElementById( dl_rpt_img ).src = ../cachedimages/help-report-broken-link-icon.png; document.getElementById( dl_rpt_img ).title = Broken download link? Click here to report.; document.getElementById( dl_rpt_img ).alt = Broken link; - document.getElementById( dl_rpt ).href = analyze.html; + document.getElementById( dl_rpt ).href = analyze_droplist.html; document.getElementById( dl_rpt ).innerHTML = Report broken link; document.getElementById( dl_rpt ).title = Broken download link? Click here to report.;
svn commit: r1598855 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 11:37:22 2014 New Revision: 1598855 URL: http://svn.apache.org/r1598855 Log: Changed positioning for the popup window 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=1598855r1=1598854r2=1598855view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 11:37:22 2014 @@ -909,7 +909,7 @@ function resetSel() { */ function showWindow( target_link ) { // Open a popup window to show the file from the target_link. - window = window.open( target_link, , location=no, width=800, height=500, left=100, top=300); + window = window.open( target_link, , location=no, width=800, height=550, left=100, top=250); window.focus(); /* alert(
svn commit: r1598857 - /openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html
Author: marcus Date: Sat May 31 11:38:55 2014 New Revision: 1598857 URL: http://svn.apache.org/r1598857 Log: Updated text in general, added text about dictionaries Modified: openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html Modified: openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html?rev=1598857r1=1598856r2=1598857view=diff == --- openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html (original) +++ openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html Sat May 31 11:38:55 2014 @@ -12,27 +12,38 @@ /style /head -body +body style=padding: 10px 10px 10px 10px; !-- The text in the H1 tag is intentionally shown as not displayable, just to please accessibility tools like a screen reader. -- h1 style=display: none;Apache OpenOffice/h1 - - !-- The text in the H1 tag is intentionally shown as not displayable, just to please accessibility tools like a - screen reader. -- h2 style=display: none;Apache OpenOffice/h2 h3Apache OpenOffice - Full Installation vs. Language Pack/h3 - pIf you want to use more than a single language in Apache OpenOffice then it is recommended to use - a href='http://wiki.openoffice.org/wiki/Languagepack' title='What is a language pack?'language packs/a. The idea is to - have a base language, e.g., English (US) and several other languages without a need to install for every language a full - installation. Due to this it has to be installed over a full installation with the same version number and platform. The - language can be changed via the menu Tools - Options - Language Settings - Languages - User Interface./p - - pThey are not integrated in the full installation file and it contains only resource files to show, e.g., menus, dialogs, - error messages in your favorite language - but there is no program logic. It may contain translated Help content as well. - Language packs are created only when also a full installation file is available. In case it is not fully localized, some - elements of the UI or help topics will display in English as default language./p + pBy default Apache OpenOffice is offering a single language when installing a full installation. Full installation means + that all application modules (Write, Calc, Impress, etc.) are available. The term does not belong to languages./p + + pWhen you want to use one or more languages in OpenOffice for the user interface (for example, menus, dialogs and + messages ) and help topics then it is recommended to use language packs. The idea is to have a base installation for, + e.g., English (US) and additional languages on top without a need to install a full installation for every language. For + this every language pack has to be installed over a full installation. Important is that the same version number and + platform has to fit to the base installation (for example, it is not possible to install a language pack from release + 4.0.0 over the base installation of 4.1.0)./p + + pLanguage packs contain only resource files to show menus, dialogs, messages, etc. in your favorite language but there + is no program logic. In case text is not fully localized some elements of the user interface or help topics will display + in English as default language./p + + pAfter the language pack is installed the new language can be switched via the menu Tools - Options - Language + Settings - Languages - User Interface./p + + pbPlease note:/bbr / + Since OpenOffice 3.4.1 dictionaries are no longer included in the installation files. Dictionaries are not part of the + OpenOffice project but stored on the a href=http://extensions.openoffice.org/en/search?f[0]=field_project_tags%3A157; + title=Get Apache OpenOffice Extensions and Dictionaries target=_blankextension webpage/a (hosted by + a href=http://sourceforge.net/; title=Sourceforge - Download, Develop and Publish Free Open Source Software + target=_blank Sourceforge.net/a). Therefore they get improved independent of the release schedule of OpenOffice and + are offered separately. Then they can be updated at any time when new versions are released./p /body /html
svn commit: r1598859 - /openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html
Author: marcus Date: Sat May 31 11:40:47 2014 New Revision: 1598859 URL: http://svn.apache.org/r1598859 Log: Updated link Modified: openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html Modified: openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html?rev=1598859r1=1598858r2=1598859view=diff == --- openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html (original) +++ openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html Sat May 31 11:40:47 2014 @@ -41,7 +41,7 @@ Since OpenOffice 3.4.1 dictionaries are no longer included in the installation files. Dictionaries are not part of the OpenOffice project but stored on the a href=http://extensions.openoffice.org/en/search?f[0]=field_project_tags%3A157; title=Get Apache OpenOffice Extensions and Dictionaries target=_blankextension webpage/a (hosted by - a href=http://sourceforge.net/; title=Sourceforge - Download, Develop and Publish Free Open Source Software + a href=http://www.sourceforge.net/; title=Sourceforge - Download, Develop and Publish Free Open Source Software target=_blank Sourceforge.net/a). Therefore they get improved independent of the release schedule of OpenOffice and are offered separately. Then they can be updated at any time when new versions are released./p /body
svn commit: r1598863 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 11:56:40 2014 New Revision: 1598863 URL: http://svn.apache.org/r1598863 Log: Updated parameters for popup window 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=1598863r1=1598862r2=1598863view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 11:56:40 2014 @@ -908,9 +908,10 @@ function resetSel() { * Depends on received target link */ function showWindow( target_link ) { - // Open a popup window to show the file from the target_link. - window = window.open( target_link, _blank, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, \ - titlebar=no, toolbar=no, width=800, height=550, left=100, top=250); + // Open a popup window with specific parameters to show the file from target_link. + window = window.open( target_link, _blank, \ + location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, titlebar=no, toolbar=no, \ + left=100, top=250, width=800, height=550); window.focus(); /* alert(
svn commit: r1598865 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 12:18:06 2014 New Revision: 1598865 URL: http://svn.apache.org/r1598865 Log: Fixed broken parameter list for popup window, renamed function 'resetSel()' to 'resetElements()' to show the purpose better 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=1598865r1=1598864r2=1598865view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 12:18:06 2014 @@ -14,7 +14,7 @@ * function setLangSel () * function setVerSel () * function getTypeSel () - * function resetSel () + * function resetElements () * function showWindow ( target_url ) * function showErrorMessage ( error_text ) * function isLangSupported() @@ -612,7 +612,7 @@ function getOSSel() { URL_PLATFORM= ; EXTENSION = ; sel_os.selectedIndex= 0; - resetSel(); + resetElements(); return; } */ @@ -677,7 +677,7 @@ function getLangSel() { if( lang_value == e0 || lang_value == e1 ) { LANG_SEL = ; sel_lang.selectedIndex = 0; - resetSel(); + resetElements(); return; } */ @@ -728,7 +728,7 @@ function getVerSel() { if( ver_value == e0 || ver_value == e1 ) { VERSION_SEL = ; sel_ver.selectedIndex = 0; - resetSel(); + resetElements(); return; } */ @@ -772,7 +772,7 @@ function getTypeSel() { /* * Set CSS style for all elements with ID to make them invisible */ -function resetSel() { +function resetElements() { // var elements = document.getElementsByTagName( select ); /* // Set the first option as default for all select elements. @@ -909,9 +909,8 @@ function resetSel() { */ function showWindow( target_link ) { // Open a popup window with specific parameters to show the file from target_link. - window = window.open( target_link, _blank, \ - location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, titlebar=no, toolbar=no, \ - left=100, top=250, width=800, height=550); + window = window.open( target_link, _blank, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, \ + titlebar=no, toolbar=no, left=100, top=250, width=800, height=550); window.focus(); /* alert( @@ -929,7 +928,7 @@ function showErrorMessage( error_text ) // The chosen items from select boxes lead to no download link, show an error message about reason and alternative. // In general, reset the data for link, text and title of all elements. - resetSel(); + resetElements(); // Now set again the values for all elements that should be shown with changed data. document.getElementById( dl_f_link ).style.display= inline; @@ -1192,7 +1191,7 @@ function getLinkSel( rel_mode ) { /* if( PLATFORM_SEL == || LANG_SEL == || VERSION_SEL == ) { // When OS or language was not chosen, let the user choose again. // When OS, language or version was not chosen, let the user choose again. - // resetSel(); + // resetElements(); return; }
svn commit: r1598866 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 12:23:34 2014 New Revision: 1598866 URL: http://svn.apache.org/r1598866 Log: Updated parameters for popup window 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=1598866r1=1598865r2=1598866view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 12:23:34 2014 @@ -909,8 +909,9 @@ function resetElements() { */ function showWindow( target_link ) { // Open a popup window with specific parameters to show the file from target_link. - window = window.open( target_link, _blank, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, \ - titlebar=no, toolbar=no, left=100, top=250, width=800, height=550); + window = window.open( target_link, _blank, + location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, titlebar=no, toolbar=no, \ + left=100, top=250, width=800, height=550); window.focus(); /* alert(
svn commit: r1598902 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sat May 31 19:09:19 2014 New Revision: 1598902 URL: http://svn.apache.org/r1598902 Log: Implemented an analyze mode to support the 'analyze.html' 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=1598902r1=1598901r2=1598902view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May 31 19:09:19 2014 @@ -19,7 +19,7 @@ * function showErrorMessage ( error_text ) * function isLangSupported() * function getLink( rel_mode ) - * function getLinkSel ( rel_mode ) + * function getLinkSel () * function getPlatform() * function getReleaseMatrixPos() * function getFilename( ver ) @@ -32,7 +32,7 @@ /* * Init function */ -function init() { +function init( a, b ) { // Set global variables. initVars(); @@ -50,8 +50,11 @@ function init() { setLangSel(); setVerSel(); - // Get the download link from the selected elements. - getLinkSel( 1 ); + + // Get release mode and analyze mode from index.html respective analyze.html. + R_MODE = a; + A_MODE = b; + getLinkSel(); } /* @@ -76,6 +79,8 @@ function initVars() { dl_lp_chk_keys, dl_lp_chk_asc, dl_lp_chk_md5, dl_lp_chk_sha256, dl_hlp, dl_chk, dl_rpt ]; // The following are used in download.js. and index.html. + R_MODE = ;// The release mode (1 = stable release (default), 2 = beta release, etc.). + A_MODE = ;// The analyze mode (0 = no debug (default), 1 = debug mode). LANG_ISO= ;// The language as ISO code. LANG_ARRAY = ;// This array contains all language specific data. UI_PLATFORM = ;// The platform as readable string. @@ -1163,16 +1168,19 @@ function getLink( rel_mode ) { * Get link to mirror system for download file and checksum file * Depends on chosen OS, language and type */ -function getLinkSel( rel_mode ) { +function getLinkSel() { // Reset all error flags. SF = false; OTHER = false; ARCHIVE = false; ERROR = false; - // If no release mode was given, assume it is about the stable release. - if( rel_mode === undefined ) - rel_mode = 1; + // If no mode was given, assume it is the release mode (stable release). + if( R_MODE === undefined ) + R_MODE = 1; + // If no mode was given, assume it is not the analyze mode (used for analyze.html). + if( A_MODE === undefined ) + A_MODE = false; // Get the selected data from the select boxes. getOSSel(); @@ -1235,7 +1243,7 @@ function getLinkSel( rel_mode ) { // If language is not supported, show the none-availability to the user. if( ! isLangSupported() ) { - if( rel_mode === 1 ) { + if( R_MODE === 1 ) { // Release mode. // Provide the link from the Native Language (NL) group. // LINK_FULL = LANG_ARRAY[ 4 ]; @@ -1355,9 +1363,6 @@ function getLinkSel( rel_mode ) { document.getElementById( dl_rpt_img ).src = ../cachedimages/help-report-broken-link-icon.png; document.getElementById( dl_rpt_img ).title = Broken download link? Click here to report.; document.getElementById( dl_rpt_img ).alt = Broken link; - document.getElementById( dl_rpt ).href = analyze_droplist.html; - document.getElementById( dl_rpt ).innerHTML = Report broken link; - document.getElementById( dl_rpt ).title = Broken download link? Click here to report.; // Reset the CSS styles for the elements in the sub-green colored boxes. document.getElementById( sub_green_box).style.background = #E9FEBE; // LightGreen @@ -1387,6 +1392,25 @@ function getLinkSel( rel_mode ) { document.getElementById( dl_chk ).style.cursor = help; document.getElementById( dl_rpt_img ).style.cursor = help; document.getElementById( dl_rpt ).style.cursor = help; + + // Set different values depending if in analyze mode or not + if( A_MODE === false
svn commit: r1598903 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sat May 31 19:10:16 2014 New Revision: 1598903 URL: http://svn.apache.org/r1598903 Log: Re-work to support the new download via select boxes Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598903r1=1598902r2=1598903view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sat May 31 19:10:16 2014 @@ -33,7 +33,6 @@ !-- Download via select boxes -- script type=text/javascript !-- - // 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_ISO_code.js. NL_LANG = ; @@ -52,12 +51,12 @@ + /p + form name='download' - + select class='sel-os' id='os'name='os' title='Select your favorite operating system' - + onchange='getLinkSel( 1 )'/select - + select class='sel-lang' id='lang'name='lang' title='Select your favorite language' - + onchange='getLinkSel( 1 )'/select - + select class='sel-ver' id='ver' name='ver' title='Select your favorite release version' - + onchange='getLinkSel( 1 )'/select + + select class='sel-os' id='os' name='os' title='Select your favorite operating system' + + onchange='getLinkSel()'/select + + select class='sel-lang' id='lang' name='lang' title='Select your favorite language' + + onchange='getLinkSel()'/select + + select class='sel-ver' id='ver' name='ver' title='Select your favorite release version' + + onchange='getLinkSel()'/select + /form + div class='dl-txt-btn' @@ -74,7 +73,8 @@ + div + p // Error text with hint. -+ a id='dl_err' style='text-decoration: none; cursor: default; font-size: 1.2em'/a ++ img id='dl_err_img'style='margin: 5px 5px 15px 0px;' src='' title='' height='16' width='16' alt='' / ++ a id='dl_err' style='text-decoration: none;' title=''/a // Release info. + a id='dl_rel_info' style='text-decoration: none;'/a @@ -103,24 +103,24 @@ + br / // Help: What is a language pack? -+ img id='dl_hlp_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ img id='dl_hlp_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a id='dl_hlp' href='' title='' target='_blank' onclick='showWindow( this.href ); return false;'/a + a style='padding: 0px 0px 0px 30px;'/a // Help: How to verify the download? -+ img id='dl_chk_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ img id='dl_chk_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a id='dl_chk' href='' title='' target='_blank'/a + a style='padding: 0px 0px 0px 30px;'/a // Help: Report broken link. -+ img id='dl_rpt_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / -+ a id='dl_rpt' href='' title='' target='_blank'/a ++ img id='dl_rpt_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ a id='dl_rpt' href='' title='' target='_blank' onclick='updateTable(); return false;'/a + /p + /div ); document.write( /div ); // Fill the select boxes and wait for the user's choice. - init(); + init( 1, true ); //-- /script @@ -140,8 +140,10 @@ div script type=text/javascript -document.write( table border='1' style='width:100%; border-collapse:collapse; border-spacing: 2px; float: left'tbody ); +document.write( table id='js_dl_values' border='1' style='width:100%; border-collapse:collapse; border-spacing: 2px; float: left'tbody ); document.write( th style='width:25%;'bBrowser variables/b /th style='75%;'thbValues/b/th/tr ); + +// List all varaibles from browser's document object model (DOM). document.write( trtdnavigator.appCodeName /tdtd + navigator.appCodeName + /td/tr ); document.write( trtdnavigator.appName /tdtd + navigator.appName + /td/tr ); document.write( trtdnavigator.appVersion /tdtd + navigator.appVersion + /td/tr ); @@ -165,41 +167,58 @@ if ( navigator.userAgent.indexOf( IceWeasel ) != -1 ) document.write( trtdnavigator.UserAgent (with IceWeasel ?) /tdtd
svn commit: r1598904 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Sat May 31 19:11:22 2014 New Revision: 1598904 URL: http://svn.apache.org/r1598904 Log: Updates to support an analyze mode in the 'analyze.html' 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=1598904r1=1598903r2=1598904view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Sat May 31 19:11:22 2014 @@ -228,12 +228,12 @@ + /p + form name='download' - + select class='sel-os' id='os'name='os' title='Select your favorite operating system' - + onchange='getLinkSel( 1 )'/select - + select class='sel-lang' id='lang'name='lang' title='Select your favorite language' - + onchange='getLinkSel( 1 )'/select - + select class='sel-ver' id='ver' name='ver' title='Select your favorite release version' - + onchange='getLinkSel( 1 )'/select + + select class='sel-os' id='os' name='os' title='Select your favorite operating system' + + onchange='getLinkSel()'/select + + select class='sel-lang' id='lang' name='lang' title='Select your favorite language' + + onchange='getLinkSel()'/select + + select class='sel-ver' id='ver' name='ver' title='Select your favorite release version' + + onchange='getLinkSel()'/select + /form + div class='dl-txt-btn' @@ -282,8 +282,8 @@ + div + p // Error text with hint. -+ img id='dl_err_img' style='margin: 5px 5px 15px 0px;' src='' title='' height='16' width='16' alt='' / -+ a id='dl_err' style='text-decoration: none;' title=''/a ++ img id='dl_err_img'style='margin: 5px 5px 15px 0px;' src='' title='' height='16' width='16' alt='' / ++ a id='dl_err' style='text-decoration: none;' title=''/a // Release info. + a id='dl_rel_info' style='text-decoration: none;'/a @@ -312,17 +312,17 @@ + br / // Help: What is a language pack? -+ img id='dl_hlp_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ img id='dl_hlp_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a id='dl_hlp' href='' title='' target='_blank' onclick='showWindow( this.href ); return false;'/a + a style='padding: 0px 0px 0px 30px;'/a // Help: How to verify the download? -+ img id='dl_chk_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ img id='dl_chk_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a id='dl_chk' href='' title='' target='_blank'/a + a style='padding: 0px 0px 0px 30px;'/a // Help: Report broken link. -+ img id='dl_rpt_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / ++ img id='dl_rpt_img' style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a id='dl_rpt' href='' title='' target='_blank'/a + /p /* @@ -350,7 +350,7 @@ //entourage.initialize(); // Fill the select boxes and wait for the user's choice. - init(); + init( 1, false ); //-- /script
svn commit: r910710 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Sat May 31 19:32:25 2014 New Revision: 910710 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r910709, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910709, websites/staging/ooo-site/trunk/content/
svn commit: r1598927 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sat May 31 22:09:34 2014 New Revision: 1598927 URL: http://svn.apache.org/r1598927 Log: Updates Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598927r1=1598926r2=1598927view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sat May 31 22:09:34 2014 @@ -12,13 +12,25 @@ /* Exceptions on standard css ---*/ @import styles.css; @import exceptions.css; + + table, th, td { border: 1px solid black; } /* ]] */ /style /head body -div class=optionset +!-- No JavaScript enabled -- +noscript + div class=notice +h1Apache OpenOffice Downloads - Analyze errors/h1 +br / +h2JavaScript not enabled?/h2 +pJavaScript needs to be enabled to show the analysis data on this webpage./p + /div +/noscript + +div class=optionset style=float: left; !-- Text above the first colored box -- script type=text/javascript @@ -125,103 +137,133 @@ //-- /script - !-- No JavaScript enabled -- - noscript -div class=notice - h1Apache OpenOffice Downloads - Analyze errors/h1 - br / - h2JavaScript not enabled?/h2 - pJavaScript needs to be enabled to show the analysis data on this webpage./p -/div - /noscript - pnbsp;/p /div -div +div style=float: left; script type=text/javascript -document.write( table id='js_dl_values' border='1' style='width:100%; border-collapse:collapse; border-spacing: 2px; float: left'tbody ); -document.write( th style='width:25%;'bBrowser variables/b /th style='75%;'thbValues/b/th/tr ); -// List all varaibles from browser's document object model (DOM). -document.write( trtdnavigator.appCodeName /tdtd + navigator.appCodeName + /td/tr ); -document.write( trtdnavigator.appName /tdtd + navigator.appName + /td/tr ); -document.write( trtdnavigator.appVersion /tdtd + navigator.appVersion + /td/tr ); -document.write( trtdnavigator.platform /tdtd + navigator.platform + /td/tr ); -document.write( trtdnavigator.oscpu /tdtd + navigator.oscpu+ /td/tr ); -document.write( trtdnavigator.cpuClass /tdtd + navigator.cpuClass + /td/tr ); -document.write( trtdnavigator.product /tdtd + navigator.product + /td/tr ); -document.write( trtdnavigator.productSub /tdtd + navigator.productSub + /td/tr ); -document.write( trtdnavigator.vendor /tdtd + navigator.vendor + /td/tr ); -document.write( trtdnavigator.vendorSub /tdtd + navigator.vendorSub+ /td/tr ); -document.write( trtdnavigator.language /tdtd + navigator.language + /td/tr ); -document.write( trtdnavigator.browserLanguage /tdtd + navigator.browserLanguage + /td/tr ); -document.write( trtdnavigator.userLanguage /tdtd + navigator.userLanguage + /td/tr ); -document.write( trtdnavigator.systemLanguage /tdtd + navigator.systemLanguage + /td/tr ); - -document.write( trtdnavigator.userAgent /tdtd + navigator.userAgent+ /td/tr ); -if ( navigator.userAgent.indexOf( Debian ) != -1 ) - document.write( trtdnavigator.UserAgent (with Debian ?) /tdtd + navigator.userAgent.indexOf( Debian )+ /td/tr ); -if ( navigator.userAgent.indexOf( Ubuntu ) != -1 ) - document.write( trtdnavigator.UserAgent (with Ubuntu ?) /tdtd + navigator.userAgent.indexOf( Ubuntu )+ /td/tr ); -if ( navigator.userAgent.indexOf( IceWeasel ) != -1 ) - document.write( trtdnavigator.UserAgent (with IceWeasel ?) /tdtd + navigator.userAgent.indexOf( IceWeasel ) + /td/tr ); - -document.write( th style='width:25%;'bStable Release/b /th style='75%;'thnbsp;/th/tr ); -document.write( trthbJavaScriptnbsp;functions/variables/b /ththbValues/b/th/tr ); - -// List all variables and function's return values from scripting. -document.write( trtdLanguage name /tdtd id='lang_native' /* LANG_ARRAY[ 2
svn commit: r1598929 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sat May 31 22:29:16 2014 New Revision: 1598929 URL: http://svn.apache.org/r1598929 Log: Changed list styles Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598929r1=1598928r2=1598929view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sat May 31 22:29:16 2014 @@ -148,12 +148,13 @@ + h2How to report a broken download link?/h2 + p -+ ol style='padding: 0px 0px 0px 15px;' ++ ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + liSelect your favorite operating system, language and version./li + liMake sure that there is actually is no file downloadable by clicking one or both download buttons./li - + liClick on the link \buUpdate table/u/b\./li + + liClick on the link \a href='javascript:void( 0 )' title='Update the values in the table below.' + + onclick='updateTable(); return false;'buUpdate table/u/b/a\./li + liCopy the complete table (really, from top to bottom)./li - + linbsp;/li + + br / + liThen open your favorite mail application and create a new mail./li + liWrite a problem description (what do you see and what do you expect)./li + liAlso add details about your operating system./li
svn commit: r1598930 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sat May 31 22:40:19 2014 New Revision: 1598930 URL: http://svn.apache.org/r1598930 Log: Updated link Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598930r1=1598929r2=1598930view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sat May 31 22:40:19 2014 @@ -151,8 +151,8 @@ + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + liSelect your favorite operating system, language and version./li + liMake sure that there is actually is no file downloadable by clicking one or both download buttons./li - + liClick on the link \a href='javascript:void( 0 )' title='Update the values in the table below.' - + onclick='updateTable(); return false;'buUpdate table/u/b/a\./li + + liClick on the link a href='javascript:void( 0 )' title='Update the values in the table below.' + + onclick='updateTable(); return false;'buUpdate table/u/b/a./li + liCopy the complete table (really, from top to bottom)./li + br / + liThen open your favorite mail application and create a new mail./li
svn commit: r1598960 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Sun Jun 1 09:43:18 2014 New Revision: 1598960 URL: http://svn.apache.org/r1598960 Log: Removed the analyze mode as all necessary code is now in 'analyze.html' 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=1598960r1=1598959r2=1598960view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sun Jun 1 09:43:18 2014 @@ -53,7 +53,6 @@ function init( a, b ) { // Get release mode and analyze mode from index.html respective analyze.html. R_MODE = a; - A_MODE = b; getLinkSel(); } @@ -80,7 +79,6 @@ function initVars() { // The following are used in download.js. and index.html. R_MODE = ;// The release mode (1 = stable release (default), 2 = beta release, etc.). - A_MODE = ;// The analyze mode (0 = no debug (default), 1 = debug mode). LANG_ISO= ;// The language as ISO code. LANG_ARRAY = ;// This array contains all language specific data. UI_PLATFORM = ;// The platform as readable string. @@ -1178,9 +1176,6 @@ function getLinkSel() { // If no mode was given, assume it is the release mode (stable release). if( R_MODE === undefined ) R_MODE = 1; - // If no mode was given, assume it is not the analyze mode (used for analyze.html). - if( A_MODE === undefined ) - A_MODE = false; // Get the selected data from the select boxes. getOSSel(); @@ -1363,6 +1358,9 @@ function getLinkSel() { document.getElementById( dl_rpt_img ).src = ../cachedimages/help-report-broken-link-icon.png; document.getElementById( dl_rpt_img ).title = Broken download link? Click here to report.; document.getElementById( dl_rpt_img ).alt = Broken link; + document.getElementById( dl_rpt ).href = analyze_droplist.html; + document.getElementById( dl_rpt ).innerHTML = Report broken link; + document.getElementById( dl_rpt ).title = Broken download link? Click here to report.; // Reset the CSS styles for the elements in the sub-green colored boxes. document.getElementById( sub_green_box).style.background = #E9FEBE; // LightGreen @@ -1392,25 +1390,6 @@ function getLinkSel() { document.getElementById( dl_chk ).style.cursor = help; document.getElementById( dl_rpt_img ).style.cursor = help; document.getElementById( dl_rpt ).style.cursor = help; - - // Set different values depending if in analyze mode or not - if( A_MODE === false ) { - document.getElementById( dl_rpt ).href = analyze_droplist.html; - document.getElementById( dl_rpt ).innerHTML = Report broken link; - document.getElementById( dl_rpt ).title = Broken download link? Click here to report.; - } else { - - for( var i = 0, j = element_ids_sub_green.length; i j; i++ ) { - document.getElementById( element_ids_sub_green[ i ] ).style.display = none; - } - - document.getElementById( dl_rpt ).style.fontSize = 1.6em; - document.getElementById( dl_rpt ).href = javascript:void( 0 ); - document.getElementById( dl_rpt ).innerHTML = bSelect your favorite options and click to update the table below/b; - document.getElementById( dl_rpt ).title = Update the values in the table below.; - document.getElementById( dl_rpt_img ).style.display = none; - document.getElementById( dl_rpt ).style.display = inline-block; - } } // alertDbg( getLinkSel(): End );
svn commit: r1598961 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sun Jun 1 09:58:23 2014 New Revision: 1598961 URL: http://svn.apache.org/r1598961 Log: Updated styles for ordered list Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598961r1=1598960r2=1598961view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sun Jun 1 09:58:23 2014 @@ -39,7 +39,8 @@ + h1How to report a broken download link?/h1 + p - + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' +//+ ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + + ol style='list-style: disc outside none;' + liSelect your favorite operating system, language and version below./li + liVerify that these oprions do not lead to valied download links./li + liClick on the following link to update the table below:/li @@ -58,13 +59,10 @@ + a href='mailto:mail address needs to be agreed' title='Mail address to send the broken link report to' + bMail Address needs tbd/b/a/li + /ol -+ /p -+ p + h3We will try to respond as soon as we get the mail and the problem analyzed. + br /Thank you for your report./h3 -+ /p -+ br / ); ++ /p ); //-- /script /div
svn commit: r1598963 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sun Jun 1 10:07:17 2014 New Revision: 1598963 URL: http://svn.apache.org/r1598963 Log: Updated styles for ordered list Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598963r1=1598962r2=1598963view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sun Jun 1 10:07:17 2014 @@ -39,15 +39,14 @@ + h1How to report a broken download link?/h1 + p -//+ ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' - + ol style='list-style: disc outside none;' + + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + liSelect your favorite operating system, language and version below./li + liVerify that these oprions do not lead to valied download links./li + liClick on the following link to update the table below:/li + ol style='list-style: none none none;' + lia style='font-size: 1.2em; color: red;' href='javascript:void( 0 )' + title='Put the selected options as values into the table below.' onclick='updateTable(); return false;' - + buUpdate the table below/u/b/a./li + + buUpdate the table below/u/b/a/li + /ol + liCopy the complete table (really, from top to bottom)./li + br /
svn commit: r1598964 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sun Jun 1 10:21:01 2014 New Revision: 1598964 URL: http://svn.apache.org/r1598964 Log: Updated mail address Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598964r1=1598963r2=1598964view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sun Jun 1 10:21:01 2014 @@ -55,8 +55,8 @@ + liAlso add details about your operating system./li + liPaste the copied data at the end./li + liFinally, send the mail to: - + a href='mailto:mail address needs to be agreed' title='Mail address to send the broken link report to' - + bMail Address needs tbd/b/a/li + + a href='mailto:mail address needs to be agreed#63;subject=Reporting%20broken%20download%20link' + + title='Mail address to send the broken link report to'bMail Address needs tbd/b/a/li + /ol + h3We will try to respond as soon as we get the mail and the problem analyzed.
svn commit: r1598968 - /openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html
Author: marcus Date: Sun Jun 1 11:30:32 2014 New Revision: 1598968 URL: http://svn.apache.org/r1598968 Log: Updated link Modified: openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html Modified: openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html?rev=1598968r1=1598967r2=1598968view=diff == --- openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html (original) +++ openoffice/ooo-site/trunk/content/download/test/full_vs_lp.html Sun Jun 1 11:30:32 2014 @@ -39,7 +39,7 @@ pbPlease note:/bbr / Since OpenOffice 3.4.1 dictionaries are no longer included in the installation files. Dictionaries are not part of the - OpenOffice project but stored on the a href=http://extensions.openoffice.org/en/search?f[0]=field_project_tags%3A157; + OpenOffice project but stored on the a href=http://extensions.openoffice.org/en/search?query=dictionaries; title=Get Apache OpenOffice Extensions and Dictionaries target=_blankextension webpage/a (hosted by a href=http://www.sourceforge.net/; title=Sourceforge - Download, Develop and Publish Free Open Source Software target=_blank Sourceforge.net/a). Therefore they get improved independent of the release schedule of OpenOffice and
svn commit: r1598973 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Sun Jun 1 12:11:04 2014 New Revision: 1598973 URL: http://svn.apache.org/r1598973 Log: Deleted cmments, moved 'no script' section, updated indents 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=1598973r1=1598972r2=1598973view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Sun Jun 1 12:11:04 2014 @@ -166,9 +166,7 @@ + p/p + /div ); */ - -// entourage.initialize(); - +//entourage.initialize(); //-- /script @@ -209,15 +207,18 @@ // Headline. + h2 + a title='Download Apache OpenOffice for your favorite operating system, language and version' - + Download Apache OpenOffice/a ++ Download Apache OpenOffice + + /a + /h2 // Select text. + p style='padding-bottom: 0px;' + a title='Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website' - + (Hosted by Sourceforge.net - A trusted website)/a ++ (Hosted by Sourceforge.net - A trusted website) + + /a + a title='Select your favorite operating system, language and version' - + bSelect your favorite operating system, language and version:/b/a ++ bSelect your favorite operating system, language and version:/b + + /a + /p // Select boxes. @@ -237,34 +238,6 @@ + a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a + /h3 + br /br / -/* - + a style='padding: 5px 0px 0px 3%; text-decoration: none; cursor: default;'/a - + a id='dl_hlp' style='padding: 5px 0px 0px 3px; text-decoration: none; cursor: pointer;' href='' title='' -+ target='_blank' onclick='showWindow( this.href ); return false;' -+ img id='dl_hlp_img' src='' title='' height='16' width='16' alt='' / - + /a - - + a style='padding: 5px 0px 0px 15%; text-decoration: none; cursor: default;'/a - + a id='dl_rpt' style='padding: 5px 0px 0px 3px; text-decoration: none; cursor: pointer;' href='' title='' -+ target='_blank' -+ img id='dl_rpt_img' src='' title='' height='16' width='16' alt='' / - + /a -*/ -//+ a id='dl_rpt' style='padding: 5px 0px 0px 3px; font-size: .9em; text-decoration: none; cursor: pointer;' -//+ href='' title='' target='_blank'/a - -//+ p/p - -//+ a style='text-decoration: none;' id='dl_rel_data' title=''/a -/* - + a id='dl_rpt' style='padding: 5px 0px 0px 10%; cursor: pointer;' href='' title='' target='_blank' -+ img id='dl_rpt_img' src='' title='' height='16' width='16' alt='' / - + /a - - + a id='dl_rpt' style='padding: 5px 0px 0px 3px; text-decoration: none; cursor: pointer;' href='' title='' - + target='_blank' /a -*/ -//+ p/p + /div + /div ); @@ -316,23 +289,6 @@ + img id='dl_rpt_img'style='padding: 5px 5px 0px 0px;' src='' title='' height='16' width='16' alt='' / + a id='dl_rpt' href='' title='' target='_blank'/a + /p ); -/* -+ p - + img id='dl_hlp_img'style='padding: 5px 0px 0px 5px;' src='' title='' height='16' width='16' alt='' / -//+ a style='padding: 0px 0px 0px 3%;'/a - + a id='dl_hlp' href='' title='' target='_blank' onclick='showWindow( this.href ); return false;'/a - + br / - - + img id='dl_chk_img'style='padding: 5px 0px 0px 5px;' src='' title='' height='16' width='16' alt='' / -//+ a style='padding: 0px 0px 0px 3%;'/a - + a id='dl_chk' href='' title='' target='_blank'/a - + br / - - + img id='dl_rpt_img'style='padding: 5px 0px 0px 5px;' src='' title='' height='16' width='16' alt='' / -//+ a style='padding: 0px 0px 0px 3%;'/a - + a id='dl_rpt' href='' title='' target='_blank'/a -+ /p -*/ document.write( /div ); //entourage.initialize(); @@ -346,12 +302,17 @@ !-- Green: Stable release: No JavaScript enabled -- noscript div class=first button green-sel id=optionitem2 -h2aDownload Apache OpenOffice/a/h2 -pa style=cursor: pointer; href=http://www.apache.org/dyn/aoo-closer.cgi/openoffice/; -title=Select from all platforms, languages, language packs to downloadYour browser does not seem to allow JavaScript -on websites. This technique is used on this webpage for presenting the actual download link. If you want to download -Apache
svn commit: r1598974 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Sun Jun 1 12:15:09 2014 New Revision: 1598974 URL: http://svn.apache.org/r1598974 Log: Moved 'no script' section, updated indents Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1598974r1=1598973r2=1598974view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Sun Jun 1 12:15:09 2014 @@ -20,18 +20,7 @@ body -!-- No JavaScript enabled -- -noscript - div class=notice -h1Apache OpenOffice Downloads - Analyze errors/h1 -br / -h2JavaScript not enabled?/h2 -pJavaScript needs to be enabled to show the analysis data on this webpage./p - /div -/noscript - div - !-- What to do to report a broken link -- script type=text/javascript !-- @@ -67,7 +56,6 @@ /div div class=optionset style=float: left; - !-- Green: Stable release -- !-- Download via select boxes -- script type=text/javascript @@ -83,15 +71,18 @@ // Headline. + h2 + a title='Download Apache OpenOffice for your favorite operating system, language and version' - + Download Apache OpenOffice/a ++ Download Apache OpenOffice + + /a + /h2 // Select text. + p style='padding-bottom: 0px;' + a title='Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website' - + (Hosted by Sourceforge.net - A trusted website)/a ++ (Hosted by Sourceforge.net - A trusted website) + + /a + a title='Select your favorite operating system, language and version' - + bSelect your favorite operating system, language and version:/b/a ++ bSelect your favorite operating system, language and version:/b + + /a + /p // Select boxes. @@ -272,6 +263,16 @@ div style=clear: both;/div +!-- No JavaScript enabled -- +noscript + div class=notice +h1Apache OpenOffice Downloads - Analyze errors/h1 +br / +h2JavaScript not enabled?/h2 +pJavaScript needs to be enabled to show the analysis data on this webpage./p + /div +/noscript + /body /html
svn commit: r910794 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Sun Jun 1 18:17:45 2014 New Revision: 910794 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r910793, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910793, websites/staging/ooo-site/trunk/content/
svn commit: r1599302 - /openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js
Author: marcus Date: Mon Jun 2 18:35:42 2014 New Revision: 1599302 URL: http://svn.apache.org/r1599302 Log: Reworked the items for the platform select box Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js?rev=1599302r1=1599301r2=1599302view=diff == --- openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Mon Jun 2 18:35:42 2014 @@ -34,13 +34,13 @@ var LP_LANG = [ ast, bg, cs, da var SDK_LANG = [ en-US ]; // OS data for the select element. -var SEL_OS = [ Win_x86_install, Windows (EXE), .exe, - Linux_x86-64_install-deb, Linux 64-bit (x86-64) (DEB), .tar.gz, - Linux_x86-64_install-rpm, Linux 64-bit (x86-64) (RPM), .tar.gz, - Linux_x86_install-deb,Linux 32-bit (x86) (DEB),.tar.gz, - Linux_x86_install-rpm,Linux 32-bit (x86) (RPM),.tar.gz, - MacOS_x86-64_install, OS X 64-bit (x86-64) (DMG), .dmg, - MacOS_x86_install,OS X 32-bit (x86) (DMG), .dmg ]; +var SEL_OS = [ win32, Windows (EXE), .exe, + lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, + lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, + lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, + lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, + mac64, OS X 64-bit (x86-64) (DMG), .dmg, + mac32, OS X 32-bit (x86) (DMG), .dmg ]; /* var SEL_OS = [ win32, Windows 32-bit (x86) (EXE), Win_x86_install, .exe,
svn commit: r1599303 [1/2] - /openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
Author: marcus Date: Mon Jun 2 18:38:49 2014 New Revision: 1599303 URL: http://svn.apache.org/r1599303 Log: Removed the platform data as it is no longer needed Modified: openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
svn commit: r1599304 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Mon Jun 2 18:40:40 2014 New Revision: 1599304 URL: http://svn.apache.org/r1599304 Log: Reworked the code for finding the correct platform to assemble the download link 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=1599304r1=1599303r2=1599304view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon Jun 2 18:40:40 2014 @@ -83,7 +83,9 @@ function initVars() { LANG_ARRAY = ;// This array contains all language specific data. UI_PLATFORM = ;// The platform as readable string. UI_PLATFORM_NO_SUP = ;// The platform as readable string, if not supported. - URL_PLATFORM= ;// The platform as part of the download URL. + PLATFORM= ;// The platform in short form. + PLATFORM_FULL = ;// The platform as part of the download URL (full install). + PLATFORM_LP = ;// The platform as part of the download URL (langpack). OLD_PLATFORM= false; // Is the browser platform old (true) or not (false)? RELEASE_PLATFORM_POS_FULL = 0; // The position of the platform in the release matrix array (full install). RELEASE_PLATFORM_POS_LP = 0; // The position of the platform in the release matrix array (langpack). @@ -112,8 +114,8 @@ function initVars() { 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. - ASF_DIST_BASE_URL = ;// The base URL for all checksum files on Apache. - ASF_DIST_PREV_URL = ;// The base URL for all checksum files (prev. version) on Apache. +// ASF_DIST_BASE_URL = ;// The base URL for all checksum files on Apache. +// ASF_DIST_PREV_URL = ;// The base URL for all checksum files (prev. version) on Apache. ASF_ARC_BASE_URL= ;// The base URL for all checksum files on Apache. ASF_ARC_PREV_URL= ;// The base URL for all checksum files (prev. version) on Apache. SF = false; // Does the download URL points to Soureforge? @@ -320,7 +322,7 @@ function fillVerSel() { * Depends on OS data from browser */ function setOSSel() { - // Depending on $URL_PLATFORM assign the platform string of the release matrix. + // Depending on $PLATFORM assign the platform string of the release matrix. var sel_os = document.getElementById( os ); // var sel_os_text = document.download.os.options[document.download.os.selectedIndex].text; // PLATFORM_SEL = sel_os.value; @@ -328,7 +330,7 @@ function setOSSel() { /* alert( + setOSSel() : Before switch + \n\n - + URL_PLATFORM: + \t\t\t + URL_PLATFORM + \n + + PLATFORM: + \t\t\t + PLATFORM + \n + sel_os.selectedIndex: + \t + sel_os.selectedIndex + \n + sel_os.value: + \t\t\t + sel_os.value + \n + sel_os_text:+ \t\t\t + sel_os_text + \n @@ -337,17 +339,17 @@ function setOSSel() { + ); */ -// URL_PLATFORM = ; +// PLATFORM = ; // 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( PLATFORM: + PLATFORM ); // alert( sel_os.selectedIndex: + sel_os.selectedIndex ); // for( var i = 0; i SEL_OS.length; i = i + 3 ) { for( var i = 0, j = SEL_OS.length; i j; i = i + 3 ) { // If the platform was found, assign the found index to the select box. // alert( i: + i / 2 + \n + SEL_OS[ i ]: + SEL_OS[ i ] ); - if( SEL_OS[ i ] === URL_PLATFORM ) { + if( SEL_OS[ i ] === PLATFORM ) { sel_os.selectedIndex = i / 3; // alert( Assigned: + i / 3
svn commit: r1599313 - /openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html
Author: marcus Date: Mon Jun 2 19:13:10 2014 New Revision: 1599313 URL: http://svn.apache.org/r1599313 Log: Fixed broken links Modified: openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html Modified: openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html?rev=1599313r1=1599312r2=1599313view=diff == --- openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html (original) +++ openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html Mon Jun 2 19:13:10 2014 @@ -7,7 +7,6 @@ body div class=app h2Issue Writing Guidelines/h2 -p$Date: 2007/02/23 11:26:39 $ /p h4Consider the rulesbr /h4 pWe strongly encourage you to read the a href=basic_rules.htmlBasic @@ -104,7 +103,7 @@ IssueTracker requires that you select a (If they all look meaningless, click on the Component link, which links to descriptions of each component, to help you make the best choice.) /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#platform; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#rep_platform; Platform/a:nbsp;On which hardware platform did you find this issue? /b(e.g., Sun, PC)br If you know the issue happens on all hardware platforms, choose 'All'. @@ -118,14 +117,14 @@ listed. /blockquote blockquote br iHow important is the issue? /i/blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#issuetype; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#cf_bug_type; Issue Type/a: Is this a defect, enhancement, feature-request, task or patch?/bbr This item defaults to 'defect'. (To determine the most appropriate type of issue, click on the Issue Type link for a full explanation of each choice.) /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#priority; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#priority; Priority/a: How much does the problem affect the product's emoverall/em usefullness?/bbr Developers use this field as emone/em measure how to priorize @@ -133,13 +132,13 @@ their work.br This item defaults to '3'. 1 is the highest (rarely used), 5 the lowest priority.br Please read the a - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#priority;definition + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#priority;definition of issue priorities/a carefully before attempting to use P2 or even P1./blockquote blockquote br iWho will be following up on the issue?/i /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#assignedto; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#assigned_to; Assigned To/a: Which engineer should be responsible for fixing this issue?/bbr IssueTracker will automatically assign the issue to a default engineer @@ -174,8 +173,8 @@ possible. A precise step-by-step descrip For crashing issues it might help to have additional information in case you're able to provide that:/blockquote blockquotebr - ba href=http://www.openoffice.org/scdocs/notargetmilestone.html;Target -Milestone/a:/b Think of it as a deadline; targets are not + ba href=https://issues.apache.org/ooo/page.cgi?id=fields.html#target_milestone; +Target Milestone/a:/b Think of it as a deadline; targets are not determined or next build--for most issues, stipulate not determined. ul
svn commit: r910986 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Mon Jun 2 19:16:41 2014 New Revision: 910986 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r910985, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910985, websites/staging/ooo-site/trunk/content/
svn commit: r1599323 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Mon Jun 2 19:33:33 2014 New Revision: 1599323 URL: http://svn.apache.org/r1599323 Log: Fixed error: Make a download possible when browsing from an unsupported platform but changing the platform manual via select box 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=1599323r1=1599322r2=1599323view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon Jun 2 19:33:33 2014 @@ -962,6 +962,11 @@ function showErrorMessage( error_text ) document.getElementById( dl_err).style.cursor = default; document.getElementById( dl_err).style.display= inline-block; + // Delete previously set string to get the possibility back to choose a different platform + // and then to assemble a new download link. + UI_PLATFORM_NO_SUP = ; + + // Set some error flags. SF = false; OTHER = false; ARCHIVE = false; @@ -1203,7 +1208,7 @@ function getLinkSel() { } */ // If recognized platform is not Windows, Linux or Mac, show the none-availability to the user. - if( UI_PLATFORM_NO_SUP !== false ) { + if( UI_PLATFORM_NO_SUP !== ) { // Show an error message that the chosen items do not lead to a download. error_text = bProblem:/b Apache OpenOffice + VERSION_SEL + is not available for b + UI_PLATFORM_NO_SUP + /b. @@ -1410,7 +1415,7 @@ function getPlatform() { var ua = navigator.userAgent.toLowerCase(); // Get the User Agent string in lower cases. var av = navigator.appVersion.toLowerCase();// Get the application version in lower cases. UI_PLATFORM= ;// Delete previously set string. - UI_PLATFORM_NO_SUP = false; // Delete previously set string. + UI_PLATFORM_NO_SUP = ;// Delete previously set string. PLATFORM = ;// Delete previously set string. EXTENSION = ;// Delete previously set string. @@ -1487,7 +1492,8 @@ function getPlatform() { if( os.indexOf( x11 ) !== -1 ) UI_PLATFORM_NO_SUP = unknown OS (X11 support); // If $UI_PLATFORM_NO_SUP is already filled, something was recognized and no more work is needed. - if( UI_PLATFORM_NO_SUP !== false ) + + if( UI_PLATFORM_NO_SUP !== ) return PLATFORM; // Windows?
svn commit: r1599326 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Mon Jun 2 19:40:14 2014 New Revision: 1599326 URL: http://svn.apache.org/r1599326 Log: Fixed typos Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599326r1=1599325r2=1599326view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Mon Jun 2 19:40:14 2014 @@ -30,7 +30,7 @@ + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + liSelect your favorite operating system, language and version below./li - + liVerify that these oprions do not lead to valied download links./li + + liVerify that these options do not lead to valid download links./li + liClick on the following link to update the table below:/li + ol style='list-style: none none none;' + lia style='font-size: 1.2em; color: red;' href='javascript:void( 0 )'
svn commit: r1599328 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Mon Jun 2 19:44:54 2014 New Revision: 1599328 URL: http://svn.apache.org/r1599328 Log: Fixed typos 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=1599328r1=1599327r2=1599328view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon Jun 2 19:44:54 2014 @@ -1316,7 +1316,7 @@ function getLinkSel() { // Set the values in the sub-green box for the 3 text lines. document.getElementById( dl_rel_info ).innerHTML = bRelease info:/b + REL_TEXT; - document.getElementById( dl_f_info).innerHTML = bFull installation:/b Filesize ~ + FILESIZE_FULL + MByte | Signatures and hashes: ; + document.getElementById( dl_f_info).innerHTML = bFull installation:/b File size ~ + FILESIZE_FULL + MByte | Signatures and hashes: ; document.getElementById( dl_f_chk_keys).href = LINK_CHK_KEYS; document.getElementById( dl_f_chk_keys).innerHTML = KEYS; document.getElementById( dl_f_chk_keys).title = KEYS signature file; @@ -1332,7 +1332,7 @@ function getLinkSel() { document.getElementById( dl_f_chk_sha256 ).href = LINK_CHK_SHA256_FULL; document.getElementById( dl_f_chk_sha256 ).innerHTML = SHA256; document.getElementById( dl_f_chk_sha256 ).title = SHA256 hash for: + FILENAME_FULL; - document.getElementById( dl_lp_info ).innerHTML = bLanguage pack:/b Filesize ~ + FILESIZE_LP + MByte | Signatures and hashes: ; + document.getElementById( dl_lp_info ).innerHTML = bLanguage pack:/b File size ~ + FILESIZE_LP + MByte | Signatures and hashes: ; document.getElementById( dl_lp_chk_keys ).href = LINK_CHK_KEYS; document.getElementById( dl_lp_chk_keys ).innerHTML = KEYS; document.getElementById( dl_lp_chk_keys ).title = KEYS signature file;
svn commit: r1599330 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Mon Jun 2 19:49:16 2014 New Revision: 1599330 URL: http://svn.apache.org/r1599330 Log: Open the download in a new browser tab 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=1599330r1=1599329r2=1599330view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Mon Jun 2 19:49:16 2014 @@ -234,8 +234,8 @@ // Both download text buttons. + div class='dl-txt-btn' + h3 style='display: inline; cursor: default;' -+ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a -+ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a ++ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a ++ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a + /h3 + br /br / + /div
svn commit: r1599340 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Mon Jun 2 20:17:11 2014 New Revision: 1599340 URL: http://svn.apache.org/r1599340 Log: Updated text, updated variables, moved the link 'Update the table' below the green box Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599340r1=1599339r2=1599340view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Mon Jun 2 20:17:11 2014 @@ -29,18 +29,13 @@ + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' - + liSelect your favorite operating system, language and version below./li - + liVerify that these options do not lead to valid download links./li - + liClick on the following link to update the table below:/li - + ol style='list-style: none none none;' - + lia style='font-size: 1.2em; color: red;' href='javascript:void( 0 )' - + title='Put the selected options as values into the table below.' onclick='updateTable(); return false;' - + buUpdate the table below/u/b/a/li - + /ol + + liSelect your favorite operating system, language and version in the green below./li + + liVerify that these options bstill do not/b lead to valid download links./li + + liClick on the link \Update the table\ below the green box./li + liCopy the complete table (really, from top to bottom)./li + br / + liThen create a new mail./li - + liWrite a problem description (what do you see and what do you expect)./li + + liWrite a problem description (what does not work and what do you expect)./li + liAlso add details about your operating system./li + liPaste the copied data at the end./li + liFinally, send the mail to: @@ -166,7 +161,18 @@ pnbsp;/p /div -div style=float: left; +div style=clear: both; float: left; + p +a style=padding: 0px 0px 0px 15px; font-size: 1.2em; href=javascript:void( 0 ) + title=Put the selected options as values into the table below. onclick=updateTable(); return false; + bClick here to update the table/b +/a + /p + + pnbsp;/p +/div + +div style=clear: both; float: left; script type=text/javascript document.write( div style='float: left;' @@ -213,7 +219,9 @@ + trtdRelease matrix language array data /tdtd/td/tr/* RELEASE_LANG */ + trtdUI platform name /tdtd/td/tr/* UI_PLATFORM */ + trtdUI platform name (not supported) /tdtd/td/tr/* UI_PLATFORM_NO_SUP */ - + trtdURL platform name /tdtd/td/tr/* URL_PLATFORM */ + + trtdPlatform (short) /tdtd/td/tr/* PLATFORM */ + + trtdURL platform name (full) /tdtd/td/tr/* PLATFORM_FULL */ + + trtdURL platform name (lp) /tdtd/td/tr/* PLATFORM_LP */ + trtdURL platform name (from select box) /tdtd/td/tr/* PLATFORM_SEL */ + trtdVersion (from select box) /tdtd/td/tr/* VERSION_SEL */ + trtdFile name (full) /tdtd/td/tr/* FILENAME_FULL */ @@ -242,10 +250,10 @@ function updateTable() { // All variables and functions that should be shown in the table. elements = [LANG_ARRAY[ 2 ], LANG_ISO, LANG_SEL, LANG_ARRAY, RELEASE_PLATFORM_POS_FULL, RELEASE_PLATFORM_POS_LP, - RELEASE_PLATFORM, RELEASE_LANG, UI_PLATFORM, UI_PLATFORM_NO_SUP, URL_PLATFORM, PLATFORM_SEL, - VERSION_SEL, FILENAME_FULL, FILENAME_LP, EXTENSION, FILESIZE_FULL, FILESIZE_LP, REL_TEXT, LINK_FULL, - LINK_LP, LINK_CHK_MD5_FULL, LINK_CHK_MD5_LP, SOURCEFORGE_BASE_URL, ASF_ARC_BASE_URL, getLinkSel(), - isLangSupported(), OLD_PLATFORM, SF, OTHER, ARCHIVE, ERROR ]; + RELEASE_PLATFORM, RELEASE_LANG, UI_PLATFORM, UI_PLATFORM_NO_SUP, PLATFORM, PLATFORM_FULL, PLATFORM_LP, + PLATFORM_SEL, VERSION_SEL, FILENAME_FULL, FILENAME_LP, EXTENSION, FILESIZE_FULL, FILESIZE_LP, + REL_TEXT, LINK_FULL, LINK_LP, LINK_CHK_MD5_FULL, LINK_CHK_MD5_LP, SOURCEFORGE_BASE_URL, + ASF_ARC_BASE_URL, getLinkSel(), isLangSupported(), OLD_PLATFORM, SF, OTHER, ARCHIVE, ERROR ]; // Assign the respective table cell with the variable or function. // Start with the 20th row (i = 19) in the 2nd cell (1), count through the elements array (j): @@ -260,7 +268,6 @@ !-- Every new
svn commit: r1599364 - /openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js
Author: marcus Date: Mon Jun 2 21:26:45 2014 New Revision: 1599364 URL: http://svn.apache.org/r1599364 Log: Added item 'other' in OS select box to refer to porting webpage, added item 'older' to refer to the archive Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js?rev=1599364r1=1599363r2=1599364view=diff == --- openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Mon Jun 2 21:26:45 2014 @@ -34,13 +34,14 @@ var LP_LANG = [ ast, bg, cs, da var SDK_LANG = [ en-US ]; // OS data for the select element. -var SEL_OS = [ win32, Windows (EXE), .exe, - lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, - lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, - lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, - lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, - mac64, OS X 64-bit (x86-64) (DMG), .dmg, - mac32, OS X 32-bit (x86) (DMG), .dmg ]; +var SEL_OS = [ win32, Windows (EXE), .exe, + lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, + lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, + lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, + lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, + mac64, OS X 64-bit (x86-64) (DMG), .dmg, + mac32, OS X 32-bit (x86) (DMG), .dmg, + other, More platforms / operating systems, ]; /* var SEL_OS = [ win32, Windows 32-bit (x86) (EXE), Win_x86_install, .exe, @@ -95,7 +96,8 @@ var SEL_LANG = [ ast, Asturian (A // Version data for the select element. var SEL_VER= [ 4.1.0, 4.1.0, 4.0.1, 4.0.1, - 4.0.0, 4.0.0 ]; + 4.0.0, 4.0.0, + older, Older releases ]; // Install type data for the select element. // var SEL_TYPE= [ e1, Choose install type, e2, ---,
svn commit: r1599365 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Mon Jun 2 21:29:08 2014 New Revision: 1599365 URL: http://svn.apache.org/r1599365 Log: Implemented code to link to the porting webpage (for more platforms) and archive (for oler releases) 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=1599365r1=1599364r2=1599365view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon Jun 2 21:29:08 2014 @@ -1243,6 +1243,42 @@ function getLinkSel() { return ERROR; } + // If version is 'older', create a download link that leads to the archive webpage. + if( VERSION_SEL === older ) { + // In general, reset the data for link, text and title of all elements. + resetElements(); + + // Set the URL to the archive as download link. + LINK_FULL = http://www.openoffice.org/download/archive.html;; + + // Set the values for only one download text button. + document.getElementById( dl_f_link ).href = LINK_FULL; + document.getElementById( dl_f_link ).innerHTML = Archive: Download from older releases; + document.getElementById( dl_f_link ).title = Archive: Download from older releases; + document.getElementById( dl_f_link ).style.display = inline; + document.getElementById( dl_lp_link ).style.display = none; + document.getElementById( sub_green_box ).style.display = none; + + return LINK_FULL; + } + + // If platform is 'other', create a download link that leads to the Porting webpage. + if( PLATFORM_SEL === other ) { + // In general, reset the data for link, text and title of all elements. + resetElements(); + + // Set the URL to the archive as download link. + LINK_FULL = http://www.openoffice.org/porting/;; + + // Set the values for only one download text button. + document.getElementById( dl_f_link ).href = LINK_FULL; + document.getElementById( dl_f_link ).innerHTML = Porting: Download from other 3rd party vendors; + document.getElementById( dl_f_link ).title = Porting: Download from other 3rd party vendors; + document.getElementById( dl_lp_link ).style.display = none; + + return LINK_FULL; + } + // If language is not supported, show the none-availability to the user. if( ! isLangSupported() ) { if( R_MODE === 1 ) { @@ -1391,12 +1427,15 @@ function getLinkSel() { } // Set the cursor style for the 3 links with icon to a help sign. - document.getElementById( dl_hlp_img ).style.cursor = help; - document.getElementById( dl_hlp ).style.cursor = help; - document.getElementById( dl_chk_img ).style.cursor = help; - document.getElementById( dl_chk ).style.cursor = help; - document.getElementById( dl_rpt_img ).style.cursor = help; - document.getElementById( dl_rpt ).style.cursor = help; + document.getElementById( dl_hlp_img ).style.cursor = help; + document.getElementById( dl_hlp ).style.cursor = help; + document.getElementById( dl_chk_img ).style.cursor = help; + document.getElementById( dl_chk ).style.cursor = help; + document.getElementById( dl_rpt_img ).style.cursor = help; + document.getElementById( dl_rpt ).style.cursor = help; + + // Make the sub-green box and therefore all elements visible. + document.getElementById( sub_green_box).style.display = block; } // alertDbg( getLinkSel(): End );
svn commit: r1599378 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Mon Jun 2 22:11:57 2014 New Revision: 1599378 URL: http://svn.apache.org/r1599378 Log: Updated code to recognize the used browser and platform/OS 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=1599378r1=1599377r2=1599378view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon Jun 2 22:11:57 2014 @@ -1450,9 +1450,10 @@ function getLinkSel() { function getPlatform() { // For more help or data see: http://www.useragentstring.com;. - var os = navigator.platform.toLowerCase(); // Get the platform string in lower cases. - var ua = navigator.userAgent.toLowerCase(); // Get the User Agent string in lower cases. - var av = navigator.appVersion.toLowerCase();// Get the application version in lower cases. + var av = navigator.appVersion.toLowerCase();// Get the application version in lower case. + var os = navigator.platform.toLowerCase(); // Get the platform string in lower case. + var ua = navigator.userAgent.toLowerCase(); // Get the user agent string in lower case. + var ve = navigator.vendor.toLowerCase();// Get the vendor string in lower case. UI_PLATFORM= ;// Delete previously set string. UI_PLATFORM_NO_SUP = ;// Delete previously set string. PLATFORM = ;// Delete previously set string. @@ -1477,64 +1478,78 @@ function getPlatform() { } if( os ) { - // Recognized but not supported platforms/OS, set $UI_PLATFORM_NO_SUP to show it to the user. - if( os.indexOf( aix ) !== -1 ) UI_PLATFORM_NO_SUP = IBM AIX; - if( os.indexOf( alphaserver ) !== -1 ) UI_PLATFORM_NO_SUP = AlphaServer; - if( os.indexOf( amiga ) !== -1 ) UI_PLATFORM_NO_SUP = AmigaOS; - if( ua.indexOf( android ) !== -1 || - av.indexOf( android ) !== -1 ) UI_PLATFORM_NO_SUP = Android mobile devices; - if( os.indexOf( arm ) !== -1 ) UI_PLATFORM_NO_SUP = ARM mobile devices; + // Recognized but *not supported* platforms/OS, set $UI_PLATFORM_NO_SUP to show it to the user. + + // Mobile devices. + if( ua.indexOf( android ) !== -1 ) + if( ua.indexOf( nexus ) !== -1 + ve.indexOf( google) !== -1 ) UI_PLATFORM_NO_SUP = Google Nexus; + else if( ua.indexOf( moble) !== -1 ) UI_PLATFORM_NO_SUP = mobile devices (Android); + + if( os.indexOf( arm ) !== -1 ) UI_PLATFORM_NO_SUP = mobile devices (ARM processor); if( ua.indexOf( blackberry) !== -1 ) UI_PLATFORM_NO_SUP = Blackberry smartphones; if( ua.indexOf( brew ) !== -1 ) UI_PLATFORM_NO_SUP = smartphones (BREW); + if( ua.indexOf( ce.net) !== -1 ) UI_PLATFORM_NO_SUP = mobile phones (Windows CE); + if( ua.indexOf( galaxy) !== -1 ) UI_PLATFORM_NO_SUP = Samsung Galaxy; + if( ua.indexOf( hiptop) !== -1 ) UI_PLATFORM_NO_SUP = smartphones (Hiptop); + if( ua.indexOf( htc ) !== -1 ) UI_PLATFORM_NO_SUP = HTC mobile devices; + if( ua.indexOf( ipad ) !== -1 || + ua.indexOf( iphone) !== -1 || + ua.indexOf( ipod ) !== -1 ) UI_PLATFORM_NO_SUP = Apple iPhone/iPad/iPod; + if( ua.indexOf( kindle) !== -1 ) UI_PLATFORM_NO_SUP = Amazon Kindle; + if( ua.indexOf( lg) !== -1 ) UI_PLATFORM_NO_SUP = LG mobile devices; + if( ua.indexOf( nokia ) !== -1 ) UI_PLATFORM_NO_SUP = mobile phones (Nokia); + if( ua.indexOf( palm ) !== -1 ) UI_PLATFORM_NO_SUP = mobile phones (Palm OS); + if( ua.indexOf( pike ) !== -1
svn commit: r1599382 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Mon Jun 2 22:30:56 2014 New Revision: 1599382 URL: http://svn.apache.org/r1599382 Log: Changed the order (first 'other platforms' then 'older releases', updated text 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=1599382r1=1599381r2=1599382view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon Jun 2 22:30:56 2014 @@ -1243,38 +1243,38 @@ function getLinkSel() { return ERROR; } - // If version is 'older', create a download link that leads to the archive webpage. - if( VERSION_SEL === older ) { + // If platform is 'other', create a download link that leads to the Porting webpage. + if( PLATFORM_SEL === other ) { // In general, reset the data for link, text and title of all elements. resetElements(); // Set the URL to the archive as download link. - LINK_FULL = http://www.openoffice.org/download/archive.html;; + LINK_FULL = http://www.openoffice.org/porting/;; // Set the values for only one download text button. document.getElementById( dl_f_link ).href = LINK_FULL; - document.getElementById( dl_f_link ).innerHTML = Archive: Download from older releases; - document.getElementById( dl_f_link ).title = Archive: Download from older releases; - document.getElementById( dl_f_link ).style.display = inline; + document.getElementById( dl_f_link ).innerHTML = Porting: Download from other 3rd party vendors; + document.getElementById( dl_f_link ).title = Click to browse to the porting webpage and download from other 3rd party vendors; document.getElementById( dl_lp_link ).style.display = none; - document.getElementById( sub_green_box ).style.display = none; return LINK_FULL; } - // If platform is 'other', create a download link that leads to the Porting webpage. - if( PLATFORM_SEL === other ) { + // If version is 'older', create a download link that leads to the archive webpage. + if( VERSION_SEL === older ) { // In general, reset the data for link, text and title of all elements. resetElements(); // Set the URL to the archive as download link. - LINK_FULL = http://www.openoffice.org/porting/;; + LINK_FULL = http://www.openoffice.org/download/archive.html;; // Set the values for only one download text button. document.getElementById( dl_f_link ).href = LINK_FULL; - document.getElementById( dl_f_link ).innerHTML = Porting: Download from other 3rd party vendors; - document.getElementById( dl_f_link ).title = Porting: Download from other 3rd party vendors; + document.getElementById( dl_f_link ).innerHTML = Archive: Download from older releases; + document.getElementById( dl_f_link ).title = Click to browse to the archive and download older releases; + document.getElementById( dl_f_link ).style.display = inline; document.getElementById( dl_lp_link ).style.display = none; + document.getElementById( sub_green_box ).style.display = none; return LINK_FULL; }
svn commit: r1599387 - /openoffice/ooo-site/trunk/content/download/checksums.html
Author: marcus Date: Mon Jun 2 22:46:31 2014 New Revision: 1599387 URL: http://svn.apache.org/r1599387 Log: Fixed broken link Modified: openoffice/ooo-site/trunk/content/download/checksums.html Modified: openoffice/ooo-site/trunk/content/download/checksums.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/checksums.html?rev=1599387r1=1599386r2=1599387view=diff == --- openoffice/ooo-site/trunk/content/download/checksums.html (original) +++ openoffice/ooo-site/trunk/content/download/checksums.html Mon Jun 2 22:46:31 2014 @@ -283,7 +283,7 @@ title=Learn more about how to use maili h3Report broken links/h3 pPlease report any broken link or things you think that needs to be corrected on this webpage by sending a mail to: -a href=mailto:d...@openoffice.apache.org#63;subject=Possible%20broken%20link#58;%203.4.1_checksums; +a href=mailto:d...@openoffice.apache.org#63;subject=Possible%20broken%20link#58;%20Checksums; title=Development mailing list (to receive answers you need to be subscribed) Development mailing list/a.nbsp;b*)/b/p
svn commit: r911015 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Mon Jun 2 22:50:58 2014 New Revision: 911015 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r911014, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r911014, websites/staging/ooo-site/trunk/content/
svn commit: r1599740 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Tue Jun 3 18:37:53 2014 New Revision: 1599740 URL: http://svn.apache.org/r1599740 Log: Open the download link in a new browser tab Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599740r1=1599739r2=1599740view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Tue Jun 3 18:37:53 2014 @@ -93,8 +93,8 @@ // Both download text buttons. + div class='dl-txt-btn' + h3 style='display: inline; cursor: default;' -+ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a -+ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a ++ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a ++ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a + /h3 + br /br / + /div
svn commit: r1599741 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Tue Jun 3 18:41:14 2014 New Revision: 1599741 URL: http://svn.apache.org/r1599741 Log: Fixed error: Show the download link when 'other' or 'older' was selected 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=1599741r1=1599740r2=1599741view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue Jun 3 18:41:14 2014 @@ -1252,10 +1252,12 @@ function getLinkSel() { LINK_FULL = http://www.openoffice.org/porting/;; // Set the values for only one download text button. - document.getElementById( dl_f_link ).href = LINK_FULL; - document.getElementById( dl_f_link ).innerHTML = Porting: Download from other 3rd party vendors; - document.getElementById( dl_f_link ).title = Click to browse to the porting webpage and download from other 3rd party vendors; - document.getElementById( dl_lp_link ).style.display = none; + document.getElementById( dl_f_link ).href = LINK_FULL; + document.getElementById( dl_f_link ).innerHTML = Porting: Download from other 3rd party vendors; + document.getElementById( dl_f_link ).title = Click to browse to the porting webpage and download from other 3rd party vendors; + document.getElementById( dl_f_link ).style.display = inline; + document.getElementById( dl_lp_link).style.display = none; + document.getElementById( sub_green_box ).style.display = none; return LINK_FULL; } @@ -1269,11 +1271,11 @@ function getLinkSel() { LINK_FULL = http://www.openoffice.org/download/archive.html;; // Set the values for only one download text button. - document.getElementById( dl_f_link ).href = LINK_FULL; - document.getElementById( dl_f_link ).innerHTML = Archive: Download from older releases; - document.getElementById( dl_f_link ).title = Click to browse to the archive and download older releases; - document.getElementById( dl_f_link ).style.display = inline; - document.getElementById( dl_lp_link ).style.display = none; + document.getElementById( dl_f_link ).href = LINK_FULL; + document.getElementById( dl_f_link ).innerHTML = Archive: Download from older releases; + document.getElementById( dl_f_link ).title = Click to browse to the archive and download older releases; + document.getElementById( dl_f_link ).style.display = inline; + document.getElementById( dl_lp_link).style.display = none; document.getElementById( sub_green_box ).style.display = none; return LINK_FULL;
svn commit: r1599745 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Tue Jun 3 18:45:16 2014 New Revision: 1599745 URL: http://svn.apache.org/r1599745 Log: Updated text 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=1599745r1=1599744r2=1599745view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue Jun 3 18:45:16 2014 @@ -1253,8 +1253,8 @@ function getLinkSel() { // Set the values for only one download text button. document.getElementById( dl_f_link ).href = LINK_FULL; - document.getElementById( dl_f_link ).innerHTML = Porting: Download from other 3rd party vendors; - document.getElementById( dl_f_link ).title = Click to browse to the porting webpage and download from other 3rd party vendors; + document.getElementById( dl_f_link ).innerHTML = Porting: Click to choose from 3rd party vendors; + document.getElementById( dl_f_link ).title = Click to browse to the porting webpage and download from 3rd party vendors; document.getElementById( dl_f_link ).style.display = inline; document.getElementById( dl_lp_link).style.display = none; document.getElementById( sub_green_box ).style.display = none; @@ -1272,8 +1272,8 @@ function getLinkSel() { // Set the values for only one download text button. document.getElementById( dl_f_link ).href = LINK_FULL; - document.getElementById( dl_f_link ).innerHTML = Archive: Download from older releases; - document.getElementById( dl_f_link ).title = Click to browse to the archive and download older releases; + document.getElementById( dl_f_link ).innerHTML = Archive: Click to choose from legacy releases; + document.getElementById( dl_f_link ).title = Click to browse to the archive and download legacy releases; document.getElementById( dl_f_link ).style.display = inline; document.getElementById( dl_lp_link).style.display = none; document.getElementById( sub_green_box ).style.display = none;
svn commit: r1599746 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Tue Jun 3 18:45:32 2014 New Revision: 1599746 URL: http://svn.apache.org/r1599746 Log: Updated text Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599746r1=1599745r2=1599746view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Tue Jun 3 18:45:32 2014 @@ -165,7 +165,7 @@ p a style=padding: 0px 0px 0px 15px; font-size: 1.2em; href=javascript:void( 0 ) title=Put the selected options as values into the table below. onclick=updateTable(); return false; - bClick here to update the table/b + bUpdate the table/b /a /p @@ -240,8 +240,8 @@ + trtdisLangSupported() ? /tdtd/td/tr/* isLangSupported() */ + trtdOld platform ? /tdtd/td/tr/* OLD_PLATFORM */ + trtdContains link to Sourgeforge ? /tdtd/td/tr/* SF */ - + trtdContains link to 'other.html' ? /tdtd/td/tr/* OTHER */ - + trtdContains link to archived build ? /tdtd/td/tr/* ARCHIVE */ + + trtdContains link to porting webpage ? /tdtd/td/tr/* OTHER */ + + trtdContains link to the archive ? /tdtd/td/tr/* ARCHIVE */ + trtdGeneral error ? /tdtd/td/tr/* ERROR */ + /tbody + /table
svn commit: r1599756 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Tue Jun 3 18:56:02 2014 New Revision: 1599756 URL: http://svn.apache.org/r1599756 Log: Inverted error flag, assume an error by default until the assembled download link is valid 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=1599756r1=1599755r2=1599756view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue Jun 3 18:56:02 2014 @@ -121,7 +121,7 @@ function initVars() { SF = false; // Does the download URL points to Soureforge? 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)? + ERROR = true; // Is the download URL in general correct (false) or not (true)? } /* @@ -967,9 +967,6 @@ function showErrorMessage( error_text ) UI_PLATFORM_NO_SUP = ; // Set some error flags. - SF = false; - OTHER = false; - ARCHIVE = false; ERROR = true; return ERROR; @@ -1066,8 +1063,6 @@ function getLink( rel_mode ) { LINK_CHK_MD5_FULL= ASF_ARC_PREV_URL+/binaries/+LANG_ISO+/+FILENAME_FULL+.md5; LINK_CHK_SHA256_FULL = ASF_ARC_PREV_URL+/binaries/+LANG_ISO+/+FILENAME_FULL+.sha256; - SF = false; - OTHER= false; ARCHIVE = true; ERROR= true; return LINK_FULL; @@ -1078,9 +1073,7 @@ function getLink( rel_mode ) { LINK_FULL = http://www.openoffice.org/porting/index.html;; - SF= false; OTHER = true; - ARCHIVE = false; ERROR = true; return LINK_FULL; @@ -1094,9 +1087,7 @@ function getLink( rel_mode ) { LINK_CHECKSUM_MD5_FULL= http://archive.apache.org/dist/openoffice/;; LINK_CHECKSUM_SHA256_FULL = http://archive.apache.org/dist/openoffice/;; - SF= false; OTHER = true; - ARCHIVE = false; ERROR = true; return LINK_FULL; } @@ -1110,9 +1101,7 @@ function getLink( rel_mode ) { } LINK_FULL = http://www.openoffice.org/download/other.html;; - SF= false; OTHER = true; - ARCHIVE = false; ERROR = true; return LINK_FULL; @@ -1141,8 +1130,6 @@ function getLink( rel_mode ) { LINK_CHECKSUM_SHA256_FULL = ASF_ARC_BASE_URL + /binaries/ + LANG_ISO + / + FILENAME_FULL + .sha256; SF= true; - OTHER = false; - ARCHIVE = false; ERROR = false; return LINK_FULL; @@ -1158,9 +1145,7 @@ function getLink( rel_mode ) { // Provide the all_beta.html as download link. LINK_FULL = http://www.openoffice.org/download/all_beta.html;; } - SF = false; OTHER = true; - ARCHIVE = false; ERROR = true; } @@ -1178,7 +1163,7 @@ function getLinkSel() { SF = false; OTHER = false; ARCHIVE = false; - ERROR = false; + ERROR = true; // If no mode was given, assume it is the release mode (stable release). if( R_MODE === undefined ) @@ -1215,6 +1200,7 @@ function getLinkSel() { + br /bSolution:/b Please select a download for Windows, Linux or OS X.; showErrorMessage( error_text ); + ERROR = true; return ERROR; } @@ -1227,6 +1213,7 @@ function
svn commit: r1599761 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus Date: Tue Jun 3 19:00:49 2014 New Revision: 1599761 URL: http://svn.apache.org/r1599761 Log: Inverted error flag, assume an error by default until the assembled download link is valid 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=1599761r1=1599760r2=1599761view=diff == --- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Tue Jun 3 19:00:49 2014 @@ -967,7 +967,7 @@ function showErrorMessage( error_text ) UI_PLATFORM_NO_SUP = ; // Set some error flags. - ERROR = true; + ERROR = true; return ERROR; } @@ -998,7 +998,7 @@ function isLangSupported() { break; default: RELEASE_LANG = ; - ERROR = true; + ERROR = true; } // if( LANG_ARRAY[ 3 ] === 'y' ) { @@ -1006,7 +1006,7 @@ function isLangSupported() { return true; } else { NOT_AVAILABLE = RELEASE_LANG[ 1 ] + is not available; - ERROR = true; + ERROR = true; return false; } } @@ -1270,7 +1270,7 @@ function getLinkSel() { document.getElementById( sub_green_box ).style.display = none; ARCHIVE = true; - ERROR = false; + ERROR = false; return LINK_FULL; } @@ -1541,6 +1541,7 @@ function getPlatform() { // If $UI_PLATFORM_NO_SUP is already filled, something was recognized and no more work is needed. if( UI_PLATFORM_NO_SUP !== ) + ERROR = true; return PLATFORM; // Recognized and *supported* platforms/OS, set $UI_PLATFORM to show it to the user.