openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r917455 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/index.html
Date Sat, 26 Jul 2014 10:30:26 GMT
Author: buildbot
Date: Sat Jul 26 10:30:25 2014
New Revision: 917455

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/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 26 10:30:25 2014
@@ -1 +1 @@
-1613596
+1613598

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul 26 10:30:25 2014
@@ -1 +1 @@
-1613596
+1613598

Modified: websites/staging/ooo-site/trunk/content/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/index.html (original)
+++ websites/staging/ooo-site/trunk/content/index.html Sat Jul 26 10:30:25 2014
@@ -38,62 +38,82 @@
       }
 
       function showAlertBox( show ) {
-	// More see "http://html-color-codes.info/"
-        var l10n_index_alert_box_background_color	= "#F5A9A9";
-        // Make the whole alert box clickable with a link.
-        var l10n_index_alert_box_href			= "index.html";
-	// Maximum 49 characters.
-        var l10n_index_alert_box_headline_text		= "Headline text with max. 49 characters";
-	// Maximum 630 characters.
-        var l10n_index_alert_box_text_text		= "Text with max. 630 characters."
-							+ "<br /><br />"
-							+ "This alert box is now within the layout of the list items "
-							+ "below. <br /><br />"
-							+ "The following link can be added to point the user to more "
-							+ "information or to a solution. But the link can also be left "
-							+ "out. Then the link will not be shown.";
-        // Show alert box or not?
-        if( show ) {
-          // If no background color value was set then use the default value.
-          if( ! l10n_index_alert_box_background_color )
-            var l10n_index_alert_box_background_color = "#FFD9A7";
-
-          // Show alert box with defined background color.
-          // Depending if link is available, make the whole DIV clickable or not.
-          if( l10n_index_alert_box_href ) {
-            // Show the text with link and cursor as poiner.
-            document.write( "<div id='alert_box' style='background: " + l10n_index_alert_box_background_color
-            + "; ' onclick='window.open( \"" + l10n_index_alert_box_href + "\", \"_blank\"
); return false;'>" );
-
-            // Show headline.
-            document.write( "<h2 style='cursor: pointer;'>" + l10n_index_alert_box_headline_text
+ "</h2>" );
-
-            // Show text.
-            if( l10n_index_alert_box_text_text ) {
-              document.write( "<p style='cursor: pointer;'>" + l10n_index_alert_box_text_text
+ "</p>" );
-            }
-          } else {
-            // Show the text without link and normal cursor.
-            document.write( "<div id='alert_box' style='background: " + l10n_index_alert_box_background_color
+ "'>" );
-
-            // Show headline.
-            document.write( "<h2 style='cursor: default;'>" + l10n_index_alert_box_headline_text
+ "</h2>" );
-
-            // Show text.
-            if( l10n_index_alert_box_text_text ) {
-              document.write( "<p style='cursor: default;'>" + l10n_index_alert_box_text_text
+ "</p>" );
-            }
-          }
+	// The text is defined in "/msg_prop_l10n.js".
 
-          document.write( "</div>" ); // Alert box
-        }
+	// Show alert box or not?
+	if( show ) {
+		// If no background color value was set then use the default value.
+		if( ! l10n.index_alert_box_background_color || l10n.index_alert_box_background_color ===
"" )
+			l10n.index_alert_box_background_color = "#FFD9A7";
+
+		// Show alert box with defined background color.
+		// Depending if link is available, make the whole DIV clickable or not.
+		if( l10n.index_alert_box_href ) {
+			// Show the text with link and cursor as poiner.
+			document.write( "<div id='alert_box' style='background: "
+			+ l10n.index_alert_box_background_color
+			+ "; ' onclick='window.open( \"" + l10n.index_alert_box_href
+			+ "\", \"_blank\" ); return false;'>" );
+
+			// Show headline.
+			document.write( "<h2 style='cursor: pointer;'>"
+			+ l10n.index_alert_box_headline_text + "</h2>" );
+
+			// Show text.
+			if( l10n.index_alert_box_text_text ) {
+				document.write( "<p style='cursor: pointer;'>"
+				+ l10n.index_alert_box_text_text + "</p>" );
+			}
+		} else {
+			// Show the text without link and normal cursor.
+			document.write( "<div id='alert_box' style='background: "
+			+ l10n.index_alert_box_background_color + "'>" );
+
+			// Show headline.
+			document.write( "<h2 style='cursor: default;'>"
+			+ l10n.index_alert_box_headline_text + "</h2>" );
+
+			// Show text.
+			if( l10n.index_alert_box_text_text ) {
+				document.write( "<p style='cursor: default;'>"
+				+ l10n.index_alert_box_text_text + "</p>" );
+			}
+		}
+
+		document.write( "</div>" ); // Alert box
+	}
       }
 
       function setRedirect() {
-	DL.NL_LANG	= "";			// Set to empty as both variables must not be used in following function.
-	DL.LANG_SEL	= "";
-	var lang_iso	= DL.getLanguage();	// Get the language ISO code from browser guessed data.
-	var lang_text	= "";			// The message text that can be shown.
+	// The text is defined in "/msg_prop_l10n.js".
+	DL.NL_LANG	= "";					// Set to empty as both variables ...
+	DL.LANG_SEL	= "";					// ... must not be used in following function.
+	var lang_iso	= DL.getLanguage();			// Get the language ISO code from browser guessed data.
+	var lang_mode	= "";					// Customized redirect mode.
+	var lang_text	= "";					// Customized message text that can be shown.
+	var link	= "";					// Override redirect mode.
+
+	// Add ECMA262-5 Array methods if not supported natively.
+	// To workaround that MSIE 8 and older do not support this function.
+	if( !( 'indexOf' in Array.prototype ) ) {
+		Array.prototype.indexOf= function( find, i ) {	// 'i' is an optional parameter.
+			if( i === undefined ) {
+				i = 0;
+			}
+			if( i < 0 ) {
+				i+= this.length;
+			}
+			if( i < 0 ) {
+				i = 0;
+			}
+			for( var n = this.length; i < n; i++ ) {
+				if( i in this && this[ i ] === find ) {
+					return i;
+				}
+			}
+			return -1;
+		};
+	}
 
 	// Query if the browser language is one of the released languages.
 	// The array has 3 elements per language (defined in "/download/globalvars.js"
@@ -101,28 +121,43 @@
 	  // If the ISO code is found in the language array.
 	  if( DL.SEL_LANG[ i ] === lang_iso ) {
 	    // Query for the redirect method (defined in "/msg_prop_l10n.js", column 0).
-	    switch( l10n.index_redirect_text[ i / 3 * 2 ] ) {
-	      case "hard":
-		// Don't show a message, just redirect. 
-		window.open( "http://www.openoffice.org/" + lang_iso , "_self" );
-		break;
-	      case "soft":
-		// Show a message and redirect on user's click.
-		// Assign the message text (defined in "/msg_prop_l10n.js", column 1).
-
-		document.write( "<div id='redirect_box'"
-		  + " onclick='window.open( \"http://www.openoffice.org/" + lang_iso + "\", \"_self\" );
return false;'>"
-		  + "<p>" + l10n.index_redirect_text[ i / 3 * 2 + 1 ] + "</p>"
-		+ "</div>" ); // redirect box
-		break;
-	      case "none":
-	      default:
-		// Do and show nothing.
-	    }
+	    lang_mode	= l10n.index_redirect_text[ i / 3 * 2 ];
+	    lang_text	= l10n.index_redirect_text[ i / 3 * 2 + 1 ];
 	    break;
 	  }
 	}
 
+	// Convert the browser URL into a string.
+	link = String( document.location );
+
+	// Does the browser URL contain already a redirect mode?
+	// If yes, set the new redirect mode to override the customized mode.
+	if( link.indexOf( "hard" ) !== -1 ) {
+	    lang_mode = "hard";
+	} else if( link.indexOf( "soft" ) !== -1 ) {
+	    lang_mode = "soft";
+	} else if( link.indexOf( "none" ) !== -1 ) {
+	    lang_mode = "none";
+	}
+
+	switch( lang_mode ) {
+	  case "hard":
+	    // Do not show a message, just redirect. 
+	    window.open( "http://www.openoffice.org/" + lang_iso , "_self" );
+	    break;
+	  case "soft":
+	    // Show a message and redirect only on user's click.
+	    // Assign the message text (defined in "/msg_prop_l10n.js", array "l10n.index_redirect_text",
column 1).
+	    document.write( "<div id='redirect_box'"
+	      + " onclick='window.open( \"http://www.openoffice.org/" + lang_iso + "\", \"_self\"
); return false;'>"
+	      + "<p>" + lang_text + "</p>"
+	    + "</div>" ); // redirect box
+	    break;
+	  case "none":
+	  default:
+	    // Do nothing and show nothing.
+	}
+
 	return;
       }
     </script>
@@ -156,11 +191,9 @@ screen reader.
   // Show alert box.
   // Show important messages and announcements.
   // Change to 'true' if you want to show the text that is defined in the variables above.
-  showAlertBox( false );
+  showAlertBox( true );
 
-  // Show redirect box.
-  // Let the user decide to click to get to their localized NL website or not.
-  // Change to 'true' if you want to show the text that is defined in the variables above.
+  // Check if and how a redirect to the respective NL webpage should be done.
   setRedirect();
   //-->
   </script>



Mime
View raw message