You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2014/05/03 12:46:35 UTC

svn commit: r1592176 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js

Author: marcus
Date: Sat May  3 10:46:34 2014
New Revision: 1592176

URL: http://svn.apache.org/r1592176
Log:
Changed title for download links to show only the filename, renamed several 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=1592176&r1=1592175&r2=1592176&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Sat May  3 10:46:34 2014
@@ -57,16 +57,16 @@ function initVars() {
 	FILESIZE_LP				= 0;	 // The filesize of the download file (for language pack)
 	EXTENSION				= "";	 // The file extension of the download URL
 //	TYPE					= "";	 // The installation type
-	LINK					= "";	 // The complete download URL
+//	LINK					= "";	 // The complete download URL
 	LINK_FULL				= "";	 // The complete download URL (for full installation)
 	LINK_LP					= "";	 // The complete download URL (for language pack)
-	CHECKSUM_KEYS				= "";	 // The KEYS file as download URL
-	CHECKSUM_ASC_FULL			= "";	 // The ASC file as download URL (for full installation)
-	CHECKSUM_MD5_FULL			= "";	 // The MD5 file as download URL (for full installation)
-	CHECKSUM_SHA256_FULL			= "";	 // The SHA256 file as download URL (for full installation)
-	CHECKSUM_ASC_LP				= "";	 // The ASC file as download URL (for language pack)
-	CHECKSUM_MD5_LP				= "";	 // The MD5 file as download URL (for language pack)
-	CHECKSUM_SHA256_LP			= "";	 // The SHA256 file as 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)
 	SOURCEFORGE				= false; // The download URL points to Soureforge
 	OTHER					= false; // The download URL points to 'other.html'
 	ARCHIVE					= false; // The download URL points to the ASF archive
@@ -95,16 +95,16 @@ function alertDbg( function_name ) {
 	+ "FILESIZE_LP: "			+ "\t\t\t\t\t"		+ FILESIZE_LP				+ "\n"
 	+ "EXTENSION: "				+ "\t\t\t\t\t"		+ EXTENSION				+ "\n"
 //	+ "TYPE: "				+ "\t\t\t\t\t\t"	+ TYPE					+ "\n"
-	+ "BASE_URL: "				+ "\t\t\t\t\t"		+ SOURCEFORGE_BASE_URL			+ "\n"
-	+ "LINK: "				+ "\t\t\t\t\t\t"	+ LINK					+ "\n"
+	+ "SOURCEFORGE_BASE_URL: "		+ "\t\t\t"		+ SOURCEFORGE_BASE_URL			+ "\n"
+//	+ "LINK: "				+ "\t\t\t\t\t\t"	+ LINK					+ "\n"
 	+ "LINK_FULL: "				+ "\t\t\t\t\t"		+ LINK_FULL				+ "\n"
 	+ "LINK_LP: "				+ "\t\t\t\t\t\t"	+ LINK_LP				+ "\n"
-	+ "CHECKSUM_ASC_FULL: "			+ "\t\t\t\t"		+ CHECKSUM_ASC_FULL			+ "\n"
-	+ "CHECKSUM_MD5_FULL: "			+ "\t\t\t\t"		+ CHECKSUM_MD5_FULL			+ "\n"
-	+ "CHECKSUM_SHA256_FULL: "		+ "\t\t\t\t"		+ CHECKSUM_SHA256_FULL			+ "\n"
-	+ "CHECKSUM_ASC_LP: "			+ "\t\t\t\t"		+ CHECKSUM_ASC_LP			+ "\n"
-	+ "CHECKSUM_MD5_LP: "			+ "\t\t\t\t"		+ CHECKSUM_MD5_LP			+ "\n"
-	+ "CHECKSUM_SHA256_LP: "		+ "\t\t\t\t"		+ CHECKSUM_SHA256_LP			+ "\n"
+	+ "LINK_CHECKSUM_ASC_FULL: "		+ "\t\t\t\t"		+ LINK_CHECKSUM_ASC_FULL		+ "\n"
+	+ "LINK_CHECKSUM_MD5_FULL: "		+ "\t\t\t\t"		+ LINK_CHECKSUM_MD5_FULL		+ "\n"
+	+ "LINK_CHECKSUM_SHA256_FULL: "		+ "\t\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			+ "\n"
+	+ "LINK_CHECKSUM_SHA256_LP: "		+ "\t\t\t\t"		+ LINK_CHECKSUM_SHA256_LP		+ "\n"
 	+ "SOURCEFORGE: "			+ "\t\t\t\t\t"		+ SOURCEFORGE				+ "\n"
 	+ "OTHER: "				+ "\t\t\t\t\t\t"	+ OTHER					+ "\n"
 	+ "ARCHIVE: "				+ "\t\t\t\t\t\t"	+ ARCHIVE				+ "\n"
@@ -501,12 +501,12 @@ function getLink( rel_mode ) {
 		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)" ) {
-				LINK_FULL		= SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + getFilename( PRE_VERSION ) + "/download";
+				LINK_FULL		  = SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/" + getFilename( PRE_VERSION ) + "/download";
 
-				CHECKSUM_KEYS		= "https://people.apache.org/keys/group/openoffice.asc";
-				CHECKSUM_ASC_FULL	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + getFilename( PRE_VERSION ) + ".asc";
-				CHECKSUM_MD5_FULL	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + getFilename( PRE_VERSION ) + ".md5";
-				CHECKSUM_SHA256_FULL	= APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + getFilename( PRE_VERSION ) + ".sha256";
+				LINK_CHECKSUM_KEYS	  = "https://people.apache.org/keys/group/openoffice.asc";
+				LINK_CHECKSUM_ASC_FULL	  = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + getFilename( PRE_VERSION ) + ".asc";
+				LINK_CHECKSUM_MD5_FULL	  = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + getFilename( PRE_VERSION ) + ".md5";
+				LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/" + getFilename( PRE_VERSION ) + ".sha256";
 
 				SOURCEFORGE	= false;
 				OTHER		= false;
@@ -531,12 +531,12 @@ function getLink( rel_mode ) {
 
 			// All other cases for old platforms.
 			} else {
-				LINK_FULL		= "http://archive.apache.org/dist/openoffice/";
+				LINK_FULL		  = "http://archive.apache.org/dist/openoffice/";
 
-				CHECKSUM_KEYS		= "https://people.apache.org/keys/group/openoffice.asc";
-				CHECKSUM_ASC_FULL	= "http://archive.apache.org/dist/openoffice/";
-				CHECKSUM_MD5_FULL	= "http://archive.apache.org/dist/openoffice/";
-				CHECKSUM_SHA256_FULL	= "http://archive.apache.org/dist/openoffice/";
+				LINK_CHECKSUM_KEYS	  = "https://people.apache.org/keys/group/openoffice.asc";
+				LINK_CHECKSUM_ASC_FULL	  = "http://archive.apache.org/dist/openoffice/";
+				LINK_CHECKSUM_MD5_FULL	  = "http://archive.apache.org/dist/openoffice/";
+				LINK_CHECKSUM_SHA256_FULL = "http://archive.apache.org/dist/openoffice/";
 
 				SOURCEFORGE	= false;
 				OTHER		= true;
@@ -563,12 +563,12 @@ function getLink( rel_mode ) {
 		}
 
 		// If language is supported and platform was recognized, assemble the filenames for download and checksums.
-		LINK_FULL		= SOURCEFORGE_BASE_URL + LANG_ISO + "/" + getFilename( VERSION ) + "/download";
+		LINK_FULL		  = SOURCEFORGE_BASE_URL + LANG_ISO + "/" + getFilename( VERSION ) + "/download";
 
-		CHECKSUM_KEYS		= "https://people.apache.org/keys/group/openoffice.asc";
-		CHECKSUM_ASC_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION ) + ".asc";
-		CHECKSUM_MD5_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION ) + ".md5";
-		CHECKSUM_SHA256_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION ) + ".sha256";
+		LINK_CHECKSUM_KEYS	  = "https://people.apache.org/keys/group/openoffice.asc";
+		LINK_CHECKSUM_ASC_FULL	  = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION ) + ".asc";
+		LINK_CHECKSUM_MD5_FULL	  = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION ) + ".md5";
+		LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + getFilename( VERSION ) + ".sha256";
 
 		SOURCEFORGE	= true;
 		OTHER		= false;
@@ -605,9 +605,9 @@ function getLinkSel( rel_mode ) {
 	var a, b, c, d = "";
 
 	// Delete any previously set strings
-	CHECKSUM_ASC_FULL	= "";
-	CHECKSUM_MD5_FULL	= "";
-	CHECKSUM_SHA256_FULL	= "";
+	LINK_CHECKSUM_ASC_FULL	  = "";
+	LINK_CHECKSUM_MD5_FULL	  = "";
+	LINK_CHECKSUM_SHA256_FULL = "";
 
 	// reset all global variables
 	initVars();
@@ -639,17 +639,17 @@ function getLinkSel( rel_mode ) {
 			// If language and platform are recognized, assemble the filenames for download and checksums.
 
 			// Assign the file name (column 3) from the release matrix of language and platform.
-			LINK_FULL		= SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME_FULL + "/download";
-			LINK_LP			= SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME_LP   + "/download";
+			LINK_FULL		  = SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME_FULL + "/download";
+			LINK_LP			  = SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME_LP   + "/download";
 
-			CHECKSUM_KEYS		= "https://people.apache.org/keys/group/openoffice.asc";
-			CHECKSUM_ASC_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".asc";
-			CHECKSUM_MD5_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".md5";
-			CHECKSUM_SHA256_FULL	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".sha256";
-
-			CHECKSUM_ASC_LP		= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".asc";
-			CHECKSUM_MD5_LP		= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".md5";
-			CHECKSUM_SHA256_LP	= APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".sha256";
+			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_ASC_LP	  = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".asc";
+			LINK_CHECKSUM_MD5_LP	  = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".md5";
+			LINK_CHECKSUM_SHA256_LP	  = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_LP + ".sha256";
 
 			SOURCEFORGE		= true;
 			OTHER			= false;
@@ -664,10 +664,10 @@ function getLinkSel( rel_mode ) {
 
 		document.getElementById( "dl_full_link" ).href		= LINK_FULL;
 		document.getElementById( "dl_full_link" ).text		= "Download full install";
-		document.getElementById( "dl_full_link" ).title		= LINK_FULL;
+		document.getElementById( "dl_full_link" ).title		= "Click to download: " + FILENAME_FULL;
 		document.getElementById( "dl_lp_link" ).href		= LINK_LP;
 		document.getElementById( "dl_lp_link" ).text		= "Download language pack";
-		document.getElementById( "dl_lp_link" ).title		= LINK_LP;
+		document.getElementById( "dl_lp_link" ).title		= "Click to download: " + FILENAME_LP;
 		document.getElementById( "dl_help" ).href		= "full_vs_lp.html";
 		document.getElementById( "dl_help" ).title		= "What is the difference between full installation and language pack?";
 		document.getElementById( "dl_help_img" ).src		= "../cachedimages/help-icon.png";
@@ -682,21 +682,21 @@ function getLinkSel( rel_mode ) {
 		document.getElementById( "dl_full_size" ).text		= c;
 		document.getElementById( "space1" ).text		= " | ";
 		document.getElementById( "dl_full_chk_hl" ).text	= "Signatures and hashes: ";
-		document.getElementById( "dl_full_chk_keys" ).href	= CHECKSUM_KEYS;
+		document.getElementById( "dl_full_chk_keys" ).href	= LINK_CHECKSUM_KEYS;
 		document.getElementById( "dl_full_chk_keys" ).text	= "KEYS";
-		document.getElementById( "dl_full_chk_keys" ).title	= "KEYS signature";
+		document.getElementById( "dl_full_chk_keys" ).title	= "KEYS signature file";
 		document.getElementById( "space2" ).text		= " , ";
-		document.getElementById( "dl_full_chk_asc" ).href	= CHECKSUM_ASC_FULL;
+		document.getElementById( "dl_full_chk_asc" ).href	= LINK_CHECKSUM_ASC_FULL;
 		document.getElementById( "dl_full_chk_asc" ).text	= "ASC";
-		document.getElementById( "dl_full_chk_asc" ).title	= "ASC signature";
+		document.getElementById( "dl_full_chk_asc" ).title	= "ASC signature for: " + FILENAME_FULL;
 		document.getElementById( "space3" ).text		= " , ";
-		document.getElementById( "dl_full_chk_md5" ).href	= CHECKSUM_MD5_FULL;
+		document.getElementById( "dl_full_chk_md5" ).href	= LINK_CHECKSUM_MD5_FULL;
 		document.getElementById( "dl_full_chk_md5" ).text	= "MD5";
-		document.getElementById( "dl_full_chk_md5" ).title	= "MD5 hash";
+		document.getElementById( "dl_full_chk_md5" ).title	= "MD5 hash for: " + FILENAME_FULL;
 		document.getElementById( "space4" ).text		= " , ";
-		document.getElementById( "dl_full_chk_sha256" ).href	= CHECKSUM_SHA256_FULL;
+		document.getElementById( "dl_full_chk_sha256" ).href	= LINK_CHECKSUM_SHA256_FULL;
 		document.getElementById( "dl_full_chk_sha256" ).text	= "SHA256";
-		document.getElementById( "dl_full_chk_sha256" ).title	= "SHA256 hash";
+		document.getElementById( "dl_full_chk_sha256" ).title	= "SHA256 hash for: " + FILENAME_FULL;
 		document.getElementById( "space5" ).text		= " , ";
 		document.getElementById( "dl_chk_verify" ).href		= "../checksums.html";
 		document.getElementById( "dl_chk_verify" ).text		= "How to verify?";
@@ -706,21 +706,21 @@ function getLinkSel( rel_mode ) {
 		document.getElementById( "dl_lp_size" ).text		= d;
 		document.getElementById( "space6" ).text		= " | ";
 		document.getElementById( "dl_lp_chk_hl" ).text		= "Signatures and hashes: ";
-		document.getElementById( "dl_lp_chk_keys" ).href	= CHECKSUM_KEYS;
+		document.getElementById( "dl_lp_chk_keys" ).href	= LINK_CHECKSUM_KEYS;
 		document.getElementById( "dl_lp_chk_keys" ).text	= "KEYS";
-		document.getElementById( "dl_lp_chk_keys" ).title	= "KEYS signature";
+		document.getElementById( "dl_lp_chk_keys" ).title	= "KEYS signature file";
 		document.getElementById( "space7" ).text		= " , ";
-		document.getElementById( "dl_lp_chk_asc" ).href		= CHECKSUM_ASC_LP;
+		document.getElementById( "dl_lp_chk_asc" ).href		= LINK_CHECKSUM_ASC_LP;
 		document.getElementById( "dl_lp_chk_asc" ).text		= "ASC";
-		document.getElementById( "dl_lp_chk_asc" ).title	= "ASC signature";
+		document.getElementById( "dl_lp_chk_asc" ).title	= "ASC signature for: " + FILENAME_LP;
 		document.getElementById( "space8" ).text		= " , ";
-		document.getElementById( "dl_lp_chk_md5" ).href		= CHECKSUM_MD5_LP;
+		document.getElementById( "dl_lp_chk_md5" ).href		= LINK_CHECKSUM_MD5_LP;
 		document.getElementById( "dl_lp_chk_md5" ).text		= "MD5";
-		document.getElementById( "dl_lp_chk_md5" ).title	= "MD5 hash";
+		document.getElementById( "dl_lp_chk_md5" ).title	= "MD5 hash for: " + FILENAME_LP;
 		document.getElementById( "space9" ).text		= " , ";
-		document.getElementById( "dl_lp_chk_sha256" ).href	= CHECKSUM_SHA256_LP;
+		document.getElementById( "dl_lp_chk_sha256" ).href	= LINK_CHECKSUM_SHA256_LP;
 		document.getElementById( "dl_lp_chk_sha256" ).text	= "SHA256";
-		document.getElementById( "dl_lp_chk_sha256" ).title	= "SHA256 hash";
+		document.getElementById( "dl_lp_chk_sha256" ).title	= "SHA256 hash for: " + FILENAME_LP;
 	}
 
 	return;