Author: buildbot Date: Fri May 30 14:12:10 2014 New Revision: 910572 Log: Staging update by buildbot for ooo-site
Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/download/test/download_droplist.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Fri May 30 14:12:10 2014 @@ -1 +1 @@ -1598608 +1598609 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Fri May 30 14:12:10 2014 @@ -1 +1 @@ -1598608 +1598609 Modified: websites/staging/ooo-site/trunk/content/download/test/download_droplist.js ============================================================================== --- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js Fri May 30 14:12:10 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( "dl_f_lnk" ).style.cursor = "not-allowed"; - document.getElementById( "dl_f_lnk" ).href = "javascript:void( 0 )"; - 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 = "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; + document.getElementById( "dl_f_link" ).style.display = "inline"; + document.getElementById( "dl_f_link" ).style.cursor = "not-allowed"; + document.getElementById( "dl_f_link" ).href = "javascript:void( 0 )"; + document.getElementById( "dl_f_link" ).innerHTML = "No full installation available"; + document.getElementById( "dl_f_link" ).title = "Please select another language, platform or version."; + document.getElementById( "dl_lp_link" ).style.display = "inline"; + document.getElementById( "dl_lp_link" ).style.cursor = "not-allowed"; + document.getElementById( "dl_lp_link" ).href = "javascript:void( 0 )"; + 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( "dl_err" ).style.display = "inline"; + document.getElementById( "dl_err" ).style.textDecoration = "none"; + document.getElementById( "dl_err" ).style.fontSize = "1.2em"; + document.getElementById( "dl_err" ).style.cursor = "default"; + document.getElementById( "dl_err" ).innerHTML = "<br />" + error_text; SF = false; OTHER = false; @@ -1263,61 +1282,50 @@ function getLinkSel( rel_mode ) { ARCHIVE = false; ERROR = false; -// rel_text = "Milestone " + MILESTONE + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + REL_DATE; - - // Set the values for the both download text buttons. - document.getElementById( "dl_f_lnk" ).href = LINK_FULL; - document.getElementById( "dl_f_lnk" ).innerHTML = "Download full installation"; - document.getElementById( "dl_f_lnk" ).title = "Click to download: " + FILENAME_FULL; - document.getElementById( "dl_lp_lnk" ).href = LINK_LP; - document.getElementById( "dl_lp_lnk" ).innerHTML = "Download language pack"; - 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_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 = FILESIZE_FULL + " MB"; - document.getElementById( "space1" ).innerHTML = " | "; - document.getElementById( "dl_f_chk_hl" ).innerHTML = "Signatures and hashes: "; + // Set the values for both download text buttons. + document.getElementById( "dl_f_link" ).href = LINK_FULL; + document.getElementById( "dl_f_link" ).innerHTML = "Download full installation"; + document.getElementById( "dl_f_link" ).title = "Click to download: " + FILENAME_FULL; + document.getElementById( "dl_lp_link" ).href = LINK_LP; + document.getElementById( "dl_lp_link" ).innerHTML = "Download language pack"; + document.getElementById( "dl_lp_link" ).title = "Click to download: " + FILENAME_LP; + + // Set the values in the sub-green box for the 3 text lines. + document.getElementById( "dl_rel_info" ).innerHTML = "<b>Release info:</b> " + REL_TEXT; + document.getElementById( "dl_f_info" ).innerHTML = "<b>Full installation:</b> Filesize ~ " + FILESIZE_FULL + " MB | 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"; - document.getElementById( "space2" ).innerHTML = " , "; + document.getElementById( "space1" ).innerHTML = " , "; document.getElementById( "dl_f_chk_asc" ).href = LINK_CHK_ASC_FULL; document.getElementById( "dl_f_chk_asc" ).innerHTML = "ASC"; document.getElementById( "dl_f_chk_asc" ).title = "ASC signature for: " + FILENAME_FULL; - document.getElementById( "space3" ).innerHTML = " , "; + document.getElementById( "space2" ).innerHTML = " , "; document.getElementById( "dl_f_chk_md5" ).href = LINK_CHK_MD5_FULL; document.getElementById( "dl_f_chk_md5" ).innerHTML = "MD5"; document.getElementById( "dl_f_chk_md5" ).title = "MD5 hash for: " + FILENAME_FULL; - document.getElementById( "space4" ).innerHTML = " , "; + document.getElementById( "space3" ).innerHTML = " , "; 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_hl" ).innerHTML = "Language pack: "; - document.getElementById( "dl_lp_size_hl" ).innerHTML = "Filesize ~ "; - document.getElementById( "dl_lp_size" ).innerHTML = FILESIZE_LP + " MB"; - document.getElementById( "space5" ).innerHTML = " | "; - document.getElementById( "dl_lp_chk_hl" ).innerHTML = "Signatures and hashes: "; + document.getElementById( "dl_lp_info" ).innerHTML = "<b>Language pack:</b> Filesize ~ " + FILESIZE_LP + " MB | 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"; - document.getElementById( "space6" ).innerHTML = " , "; + document.getElementById( "space4" ).innerHTML = " , "; document.getElementById( "dl_lp_chk_asc" ).href = LINK_CHK_ASC_LP; document.getElementById( "dl_lp_chk_asc" ).innerHTML = "ASC"; document.getElementById( "dl_lp_chk_asc" ).title = "ASC signature for: " + FILENAME_LP; - document.getElementById( "space7" ).innerHTML = " , "; + document.getElementById( "space5" ).innerHTML = " , "; document.getElementById( "dl_lp_chk_md5" ).href = LINK_CHK_MD5_LP; document.getElementById( "dl_lp_chk_md5" ).innerHTML = "MD5"; document.getElementById( "dl_lp_chk_md5" ).title = "MD5 hash for: " + FILENAME_LP; - document.getElementById( "space8" ).innerHTML = " , "; + document.getElementById( "space6" ).innerHTML = " , "; document.getElementById( "dl_lp_chk_sha256" ).href = LINK_CHK_SHA256_LP; document.getElementById( "dl_lp_chk_sha256" ).innerHTML = "SHA256"; document.getElementById( "dl_lp_chk_sha256" ).title = "SHA256 hash for: " + FILENAME_LP; - // Set the values in the sub-green box on the right hand side. + // Set the values in the sub-green box below the 3 text lines. 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 = "Install info"; @@ -1337,27 +1345,30 @@ function getLinkSel( rel_mode ) { 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 + document.getElementById( "dl_err" ).style.display = "none"; + // Change CSS styles for all elements with ID in the green and sub-green colored boxes. - // Set the cursor style for these elements to default. -// for( var i = 0; i < element_ids.length; i++ ) { - for( var i = 0, j = element_ids.length; i < j; i++ ) { -// document.getElementById( element_ids[ i ] ).style.display = "inline"; - document.getElementById( element_ids[ i ] ).style.cursor = "default"; + // Set the cursor style for elements to default and make the elements visible. + for( var i = 0, j = element_ids_sub_green.length; i < j; i++ ) { + document.getElementById( element_ids_sub_green[ i ] ).style.display = "inline"; + document.getElementById( element_ids_sub_green[ i ] ).style.cursor = "default"; } - // Set the cursor style for these elements with link to a pointer sign. -// for( var i = 0; i < element_ids_lnk.length; i++ ) { - for( var i = 0, j = element_ids_lnk.length; i < j; i++ ) { - document.getElementById( element_ids_lnk[ i ] ).style.cursor = "pointer"; + // Set the cursor style for elements with links to pointer and make the elements visible. + for( var i = 0, j = element_ids_links.length; i < j; i++ ) { + document.getElementById( element_ids_links[ i ] ).style.display = "inline"; + document.getElementById( element_ids_links[ i ] ).style.cursor = "pointer"; } // 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"; } // alertDbg( "getLinkSel(): End" );