Author: buildbot
Date: Sun Jul 20 18:06:05 2014
New Revision: 916883

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 Sun Jul 20 18:06:05 2014
@@ -1 +1 @@
-1612136
+1612137

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jul 20 18:06:05 2014
@@ -1 +1 @@
-1612136
+1612137

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 Sun Jul 20 18:06:05 2014
@@ -11,6 +11,9 @@
     <link href="https://plus.google.com/+openoffice"; rel="publisher" />
     <title>Apache OpenOffice - The Free and Open Productivity Suite</title>
     <script type="text/javascript" src="download/globalvars.js"></script>
+    <script type="text/javascript" src="msg_prop_l10n.js"></script>
+    <script type="text/javascript" src="download/languages.js"></script>
+    <script type="text/javascript" src="download/download.js"></script>
     <style type="text/css">
     /* <![CDATA[ */
     /*-------------------- Exceptions on standard css -----------------------*/
@@ -23,66 +26,105 @@
       function follow( platform ) {
         _gaq.push( ['_trackEvent', 'social', 'followUs', platform] ); 
 
-        if ( platform == 'ApacheBlog' )
+        if ( platform == 'ApacheBlog' ) {
           window.open( "https://blogs.apache.org/OOo/";, "_blank" );
-        else if ( platform == 'Facebook' )
+        } else if ( platform == 'Facebook' ) {
           window.open( "https://www.facebook.com/ApacheOO";, "_blank" );
-        else if ( platform == 'Twitter' )
+        } else if ( platform == 'Twitter' ) {
           window.open( "https://twitter.com/ApacheOO";, "_blank" );
-        else if ( platform == 'GooglePlus' )
+        } else if ( platform == 'GooglePlus' ) {
           window.open( "https://plus.google.com/+openoffice";, "_blank" );
+        }
       }
 
-      function showAlertbox( show ) {
+      function showAlertBox( show ) {
        // More see "http://html-color-codes.info/";
-        var l10n_alert_box_background_color = "#F5A9A9";
+        var l10n_index_alert_box_background_color      = "#F5A9A9";
         // Make the whole alert box clickable with a link.
-        var l10n_alert_box_href                    = "index.html";
+        var l10n_index_alert_box_href                  = "index.html";
        // Maximum 49 characters.
-        var l10n_alert_box_headline_text    = "Headline text with max. 49 
characters";
+        var l10n_index_alert_box_headline_text         = "Headline text with 
max. 49 characters";
        // Maximum 630 characters.
-        var l10n_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.";
+        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_alert_box_background_color )
-            var l10n_alert_box_background_color = "#FFD9A7";
+          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_alert_box_href ) {
+          if( l10n_index_alert_box_href ) {
             // Show the text with link and cursor as poiner.
-            document.write( "<div id='alert_box' style='background: " + 
l10n_alert_box_background_color
-            + "; ' onclick='window.open(\"" + l10n_alert_box_href + "\", 
\"_blank\"); return false;'>" );
+            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_alert_box_headline_text + "</h2>" );
+            document.write( "<h2 style='cursor: pointer;'>" + 
l10n_index_alert_box_headline_text + "</h2>" );
 
             // Show text.
-            if( l10n_alert_box_text_text )
-              document.write( "<p style='cursor: pointer;'>" + 
l10n_alert_box_text_text + "</p>" );
-
+            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_alert_box_background_color + "'>" );
+            document.write( "<div id='alert_box' style='background: " + 
l10n_index_alert_box_background_color + "'>" );
 
             // Show headline.
-            document.write( "<h2 style='cursor: default;'>" + 
l10n_alert_box_headline_text + "</h2>" );
+            document.write( "<h2 style='cursor: default;'>" + 
l10n_index_alert_box_headline_text + "</h2>" );
 
-            // Shoe text.
-            if( l10n_alert_box_text_text )
-              document.write( "<p style='cursor: default;'>" + 
l10n_alert_box_text_text + "</p>" );
+            // 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.
+
+       // Query if the browser language is one of the released languages.
+       // The array has 3 elements per language (defined in 
"/download/globalvars.js"
+       for( var i = 0, j = DL.SEL_LANG.length; i < j; i = i + 3 ) {
+         // 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.
+           }
+           break;
+         }
+       }
+
+       return;
+      }
     </script>
 
 <!--#include virtual="/google-analytics.js" --> 
@@ -112,8 +154,14 @@ screen reader.
   <script type="text/javascript">
   <!--
   // 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 );
+
+  // 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.
-  showAlertbox( false );
+  setRedirect();
   //-->
   </script>
 
@@ -319,8 +367,8 @@ screen reader.
         <a 
href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce";
         title="Offical blog post about Apache OpenOffice 4.1.0">official 
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.0">Release Notes</a> 
you can read about all new features, functions
-        and languages. <a href="https://www.openoffice.org/download/";
+        title="Release Notes for Apache OpenOffice 4.1.0">Release 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.0">Don't miss to download</a> 
the new release and find out yourself.
       </p>
     </div>
@@ -353,10 +401,11 @@ screen reader.
 
       <p>
         <em>8 January 2013:</em>
-        Apache OpenOffice is developed 100% by volunteers.  Apache does not 
pay for developers, for translators, for QA, for
-        marketing, for UI, for support, etc. Of course, we're happy to accept
-        <a href="http://www.apache.org/foundation/contributing.html";>donations 
to the Apache Software Foundation</a>, to keep
-        our servers runnings and for similar overhead expenses. But our 
products are developed entirely by volunteers.
+        Apache OpenOffice is developed 100% by volunteers.  Apache does not 
pay for developers, for translators, for QA,
+        for marketing, for UI, for support, etc. Of course, we're happy to 
accept
+        <a href="http://www.apache.org/foundation/contributing.html";>donations 
to the Apache Software Foundation</a>, to
+        keep our servers runnings and for similar overhead expenses. But our 
products are developed entirely by
+        volunteers.
       </p>
       <p>Some users are initially worried by this statement:<br /><strong>How 
can software for free, developed by
         volunteers, be any good?<br /></strong><a 
href="why/why_volunteers.html">Read on for an answer...</a>


Reply via email to