Author: marcus Date: Mon Feb 24 21:07:37 2014 New Revision: 1571439 URL: http://svn.apache.org/r1571439 Log: Fixed possible error for 'div' tags and CSS styles
Modified: openoffice/ooo-site/trunk/content/download/test/index.html Modified: openoffice/ooo-site/trunk/content/download/test/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index.html?rev=1571439&r1=1571438&r2=1571439&view=diff ============================================================================== --- openoffice/ooo-site/trunk/content/download/test/index.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index.html Mon Feb 24 21:07:37 2014 @@ -61,44 +61,49 @@ screen reader. --> // If download URL contains "sourceforge" (-> normal and correct download link), // then download from Sourceforge with displayed platform and language. document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" - + LINK + "');" + "return false;\">" ); - document.write( "<h2><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE - + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>" - + "Download Apache OpenOffice " + VERSION + "</a></h2>" - + "<p><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE + " | Build ID " + BUILD - + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>Click here to download for:<br />" - + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" + FILESIZE + " MByte | Released: " - + REL_DATE + "<br /></a></p>" ); + + LINK + "');" + "return false;\">" + + "<h2><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE + + " | Build ID " + BUILD + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>" + + "Download Apache OpenOffice " + VERSION + "</a></h2>" + + "<p><a href='" + LINK + "' title='Version " + VERSION + " | Milestone " + MILESTONE + " | Build ID " + BUILD + + " | SVN " + SVN_REV + " | Released: " + REL_DATE + "'>Click here to download for:<br />" + + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | ~" + FILESIZE + " MByte | Released: " + + REL_DATE + "<br /></a></p>" + + "</div>" ); } else if ( OTHER ) { // If download URL contains "other" (-> platform, OS or package manager was not recognized), // then use "other.html" as download link. - document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>" - + "Download Apache OpenOffice</a></h2>" - + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for " - + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Click " - + "here to choose from the alternative download webpage.</a></p>" ); + document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" + + LINK + "');" + "return false;\">" + + "<h2><a href='" + LINK + "' title='" + LINK + "'>" + + "Download Apache OpenOffice</a></h2>" + + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for " + + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Click " + + "here to choose from the alternative download webpage.</a></p>" + + "</div>" ); } else if ( ARCHIVE ) { // If download URL contains "archive" (-> platform/OS is no longer supported), // then provide a download link to the previous version. document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" - + LINK + "');" + "return false;\">" ); - document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>" - + "Download Apache OpenOffice</a></h2>" - + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for " - + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Click " - + "here for the previous version " + PRE_VERSION + ".</a></p>" ); + + LINK + "');" + "return false;\">" + + "<h2><a href='" + LINK + "' title='" + LINK + "'>" + + "Download Apache OpenOffice</a></h2>" + + "<p><a href='" + LINK + "' title='" + LINK + "'>Apache OpenOffice " + VERSION + " for " + + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Click " + + "here for the previous version " + PRE_VERSION + ".</a></p>" + + "</div>" ); } } else { // If browser language do not match with AOO languages, then download from an alternative webpage. document.write( "<div class=\"first button green\" id=\"optionitem1\" onclick=\"openItem('optionitem1','" - + LINK + "');" + "return false;\">" ); - document.write( "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>" - + "Download Apache OpenOffice</a></h2>" - + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>Apache OpenOffice " + VERSION + " for " - + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Please choose another build from the " - + "alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>" ); + + LINK + "');" + "return false;\">" + + "<h2><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>" + + "Download Apache OpenOffice</a></h2>" + + "<p><a href='" + LANG_ARRAY[ 4 ] + "' title='" + LANG_ARRAY[ 4 ] + "'>Apache OpenOffice " + VERSION + " for " + + "<b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b> is not available. Please choose another build from the " + + "alternative " + LANG_ARRAY[ 1 ] + " download webpage.</a></p>" + + "</div>" ); } - document.write( "</div>" ); // Show some helpful links for SDK, source, checksums, release notes, legacy version. document.write( "<div class=\"sub-green\">" ); @@ -115,18 +120,18 @@ screen reader. --> VERSION = PRE_VERSION; } document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+" + VERSION + "+Release+Notes'" - + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'><b>Release Notes</b></a> | <br />" - + "<a href='other.html' title='Get all platforms, languages, language packs to download'>" - + "<b>Get all platforms, languages, language packs</b></a> | " - + "<a href='other.html#source' title='Get the source code and SDK to download'>Source code and SDK</a> | <br />" - + "<a href='../../porting/index.html'" - + "title='Get Apache OpenOffice software packaged as portable USB versions and third-party ports'>" - + "<b>Portable USB versions</b> and third-party ports</a> | " - + "Old and legacy version: <a href='../other-341.html' title='Get the old version of Apache OpenOffice " - + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + " - + "<a href='../legacy/index.html' title='Get the legacy version of OpenOffice.org " - + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a></p>" ); - document.write( "</div>" ); + + "title='What is new, what has been improved in Apache OpenOffice " + VERSION + "?'><b>Release Notes</b></a> | <br />" + + "<a href='other.html' title='Get all platforms, languages, language packs to download'>" + + "<b>Get all platforms, languages, language packs</b></a> | " + + "<a href='other.html#source' title='Get the source code and SDK to download'>Source code and SDK</a> | <br />" + + "<a href='../../porting/index.html'" + + "title='Get Apache OpenOffice software packaged as portable USB versions and third-party ports'>" + + "<b>Portable USB versions</b> and third-party ports</a> | " + + "Old and legacy version: <a href='../other-341.html' title='Get the old version of Apache OpenOffice " + + OLDVERSION + "'><b>" + OLDVERSION + "</b></a> + " + + "<a href='../legacy/index.html' title='Get the legacy version of OpenOffice.org " + + LEGACYVERSION + "'><b>" + LEGACYVERSION + "</b></a></p>" + + "</div>" ); entourage.initialize(); //--> @@ -166,42 +171,44 @@ screen reader. --> if ( SOURCEFORGE ) { // If a Beta Release is available for download, then download from Sourceforge with displayed platform and language. document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','" - + LINK + "') return false;\">" ); - document.write( "<h2><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone " + BETA_MILESTONE - + " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE + "'>" - + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>" - + "<p><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone " + BETA_MILESTONE + " | " - + "Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE + "'>" - + "Click here to download for:<br /><b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | " - + "~" + FILESIZE + " MByte | Released: " + BETA_REL_DATE + "<br />" - + "<br /><b>The Beta release is feature complete but is not yet fully tested and can contain issues. " - + "It is not recommended to use in production.</b></a></p>" ); + + LINK + "') return false;\">" + + "<h2><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone " + BETA_MILESTONE + + " | Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE + "'>" + + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>" + + "<p><a href='" + LINK + "' title='Version " + BETA_NAME + " | Milestone " + BETA_MILESTONE + " | " + + "Build ID " + BETA_BUILD + " | SVN " + BETA_SVN_REV + " | Released: " + BETA_REL_DATE + "'>" + + "Click here to download for:<br /><b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + "</b> | " + + "~" + FILESIZE + " MByte | Released: " + BETA_REL_DATE + "<br />" + + "<br /><b>The Beta release is feature complete but is not yet fully tested and can contain issues. " + + "It is not recommended to use in production.</b></a></p>" + + "</div>" ); } else if ( OTHER ) { // If download URL contains "other" (-> platform, OS or package manager was not recognized), // then use "all_beta.html" as download link. LINK = "http://www.openoffice.org/download/test/all_beta.html"; document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','" - + LINK + "') return false;\">" ); - document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>" - + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>" - + "<p><a href='" + LINK + "' title='" + LINK + "'>The Beta release is not available for:<br />" - + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b><br />" - + "Click here to choose from the alternative download webpage.</a></p>" ); + + LINK + "') return false;\">" + + "<h2><a href='" + LINK + "' title='" + LINK + "'>" + + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>" + + "<p><a href='" + LINK + "' title='" + LINK + "'>The Beta release is not available for:<br />" + + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b><br />" + + "Click here to choose from the alternative download webpage.</a></p>" + + "</div>" ); } } else { // If browser language do not match with AOO languages, then download from an alternative webpage. LINK = "http://www.openoffice.org/download/test/all_beta.html"; document.write( "<div class=\"button yellow\" id=\"optionitem2\" onclick=\"openItem('optionitem2','" - + LINK + "') return false;\">" ); - document.write( "<h2><a href='" + LINK + "' title='" + LINK + "'>" - + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>" - + "<p><a href='" + LINK + "' title='" + LINK + "'>The Beta release is not available for:<br />" - + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b><br />" - + "Click here to choose from the alternative download webpage.</a></p>" ); + + LINK + "') return false;\">" + + "<h2><a href='" + LINK + "' title='" + LINK + "'>" + + "Download Apache OpenOffice " + BETA_NAME + "</a></h2>" + + "<p><a href='" + LINK + "' title='" + LINK + "'>The Beta release is not available for:<br />" + + "<b>" + UI_PLATFORM + "</b> and <b>" + LANG_ARRAY[ 2 ] + " (" + LANG_ARRAY[ 1 ] + ")</b><br />" + + "Click here to choose from the alternative download webpage.</a></p>" + + "</div>" ); } - document.write( "</div>" ); // Show some helpful links for SDK, source, checksums, release notes. document.write( "<div class=\"sub-yellow\">" ); @@ -215,11 +222,11 @@ screen reader. --> + "<a href='../checksums.html' title='How to verify the download with checksums?'>How to verify?</a> | " ); } document.write( "<a href='https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+" + BETA_VERSION + "+Release+Notes'" - + "title='What is new, what has been improved in Apache OpenOffice " + BETA_NAME + "?'><b>Release Notes</b></a> | " - + "<br /><a href='all_beta.html' title='Get all platforms, languages, language packs to download'>" - + "<b>Get all platforms, languages, language packs</b></a> | " - + "<a href='all_beta.html#source' title='Get the source code and SDK to download'>Source code and SDK</a></p>" ); - document.write( "</div>" ); + + "title='What is new, what has been improved in Apache OpenOffice " + BETA_NAME + "?'><b>Release Notes</b></a> | " + + "<br /><a href='all_beta.html' title='Get all platforms, languages, language packs to download'>" + + "<b>Get all platforms, languages, language packs</b></a> | " + + "<a href='all_beta.html#source' title='Get the source code and SDK to download'>Source code and SDK</a></p>" + + "</div>" ); // } else {