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

svn commit: r915139 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/ast/download/index.html content/bg/download/index.html content/bg/download/msg_prop_l10n_bg.js

Author: buildbot
Date: Sat Jul  5 18:03:48 2014
New Revision: 915139

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/ast/download/index.html
    websites/staging/ooo-site/trunk/content/bg/download/index.html
    websites/staging/ooo-site/trunk/content/bg/download/msg_prop_l10n_bg.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul  5 18:03:48 2014
@@ -1 +1 @@
-1608085
+1608088

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul  5 18:03:48 2014
@@ -1 +1 @@
-1608085
+1608088

Modified: websites/staging/ooo-site/trunk/content/ast/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/ast/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/ast/download/index.html Sat Jul  5 18:03:48 2014
@@ -5,34 +5,36 @@
 
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Descargues d'Apache OpenOffice - Sitiu oficial</title>
-  <script type="text/javascript" src="/download/globalvars.js"></script>
-  <script type="text/javascript" src="/download/download.js"></script>
-  <script type="text/javascript" src="/download/languages.js"></script>
-  <script type="text/javascript" src="/download/release_matrix.js"></script>
-  <script type="text/javascript" src="/download/boxed_download.js"></script>
+  <script type="text/javascript" src="../../download/globalvars.js"></script>
   <script type="text/javascript" src="msg_prop_l10n_ast.js"></script>
+  <script type="text/javascript" src="../../download/languages.js"></script>
+  <script type="text/javascript" src="../../download/release_matrix.js"></script>
+  <script type="text/javascript" src="../../download/boxed_download.js"></script>
+  <script type="text/javascript" src="../../download/download.js"></script>
   <style type="text/css">
   /* <![CDATA[ */
   /*-------------------- Exceptions on standard css -----------------------*/
-  @import "/download/styles.css";
-  @import "/download/exceptions.css";
+  @import "../../download/styles.css";
+  @import "../../download/exceptions.css";
   /* ]]> */
   </style>
   <script>
-    if (window.document.referrer.indexOf("shell.windows.com") != -1)
-       location.href = "/why/why_odf.html";
-
-    function shareFacebook() {
-      _gaq.push(['_trackEvent','social', 'shareDownload', 'facebook']); 
-      window.open('https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');	
-    }
-    function shareTwitter(){
-      _gaq.push(['_trackEvent','social', 'shareDownload', 'twitter']); 
-      window.open('https://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+100+million+trusted+downloads.','_blank','toolbar=0,status=0,width=580,height=325');
+    if ( window.document.referrer.indexOf( "shell.windows.com" ) != -1 ) {
+       location.href = "http://www.openoffice.org/why/why_odf.html";
     }
-    function shareGooglePlus(){
-      _gaq.push(['_trackEvent','social', 'shareDownload', 'google+']); 
-      window.open('https://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
+
+    function share( platform ) {
+      _gaq.push( ['_trackEvent', 'social', 'shareDownload', platform] ); 
+
+      if ( platform == 'apacheblog' ) {
+        window.open( 'http://blogs.apache.org/OOo/', '_blank' );
+      } else if ( platform == 'facebook' ) {
+        window.open( 'http://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      } else if ( platform == 'twitter' ) {
+        window.open( 'http://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+100+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      } else if ( platform == 'google+' ) {
+        window.open( 'http://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      }
     }
   </script>
 
@@ -88,6 +90,7 @@
     <!-- Green: Stable release: No JavaScript enabled -->
     <noscript>
     <div class="button green" id="optionitem2">
+      <div class="green-sel-icon"></div>
       <h2>
         <a>Descargar Apache OpenOffice</a>
       </h2>
@@ -101,16 +104,17 @@
     </div>
     </noscript>
 
-<!-- Light Blue: Share download with social networks -->
+  <!-- Light Blue: Share download with social networks -->
   <div class="button lightblue" id="optionitem4">
+    <div class="lightblue-icon"></div>
     <h2><a style="cursor: default;" title="Ayude a correr la voz y fale a les amistaes sobre Apache OpenOffice">Ayude a correr la voz</a></h2>
     <p style="cursor: default;" id="ShareDownloadLinks">
     <a style="cursor: default;" title="Ayude a correr la voz y fale a les amistaes sobre Apache OpenOffice">Por favor, fale a les amistaes sobre Apache OpenOffice.</a>
-    <a style="display: inline; padding: 0 5px 0 30px;" href="javascript:shareFacebook()" title="Por favor, fale a les amistaes sobre Apache OpenOffice per Facebook">
+    <a style="display: inline; padding: 0 5px 0 30px;" href="javascript:share( \"facebook\" )" title="Por favor, fale a les amistaes sobre Apache OpenOffice per Facebook">
     <img src="/images/logo-facebook-32.png" alt="Por favor, fale a les amistaes sobre Apache OpenOffice per Facebook" /></a>
-    <a style="display: inline; padding: 0 5px;" href="javascript:shareTwitter()" title="Por favor, fale a les amistaes sobre Apache OpenOffice per Twitter">
+    <a style="display: inline; padding: 0 5px;" href="javascript:share( \"twitter\" )" title="Por favor, fale a les amistaes sobre Apache OpenOffice per Twitter">
     <img src="/images/logo-twitter-32.png" alt="Por favor, fale a les amistaes sobre Apache OpenOffice per Twitter" /></a>
-    <a style="display: inline; padding: 0 5px;" href="javascript:shareGooglePlus()" title="Por favor, fale a les amistaes sobre Apache OpenOffice per Google+">
+    <a style="display: inline; padding: 0 5px;" href="javascript:share( \"google+\" )" title="Por favor, fale a les amistaes sobre Apache OpenOffice per Google+">
     <img src="/images/logo-googleplus-32.png" alt="Por favor, fale a les amistaes sobre Apache OpenOffice per Google+" /></a>
     </p>
   </div>
@@ -118,6 +122,7 @@
   <!-- Blue: Extensions -->
   <div class="button blue" id="optionitem5" onclick="openItem('optionitem3','http://extensions.openoffice.org');
     return false;">
+    <div class="blue-icon"></div>
     <h2><a href="http://extensions.openoffice.org"
     title="Escoyer ente un bon rangu de funciones adicionales ya individuales">Ver estensiones y diccionarios pa Apache OpenOffice</a></h2>
     <p><a href="http://extensions.openoffice.org"
@@ -128,6 +133,7 @@
   <!-- Blue: Templates -->
   <div class="button blue" id="optionitem6" onclick="openItem('optionitem3_1','http://templates.openoffice.org');
     return false;">
+    <div class="blue-icon"></div>
     <h2><a href="http://templates.openoffice.org"
     title="Escoyer ente un bon rangu de documentos adicionales ya individuales">Ver plantíes pa Apache OpenOffice</a></h2>
     <p><a href="http://templates.openoffice.org"
@@ -208,17 +214,14 @@
     <a href="http://validator.w3.org/check?uri=http://www.openoffice.org/download/index.html"
     title="W3C Markup Validation Service - Compruebe les marques (HTML, XHTML, ...) de documentos Web">
     <img src="/images/valid-xhtml10-blue.png"
-    alt="W3C Markup Validation Service - Compruebe les marques (HTML, XHTML, ...) de documentos Web" /></a>
+    alt="W3C Validation" /></a>
     &nbsp;&nbsp;&nbsp;
   </div>
 </div>
 
-   
-
 </div> <!-- class: overall_optionset -->
 
 
-
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: websites/staging/ooo-site/trunk/content/bg/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/bg/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/bg/download/index.html Sat Jul  5 18:03:48 2014
@@ -26,20 +26,22 @@
   /* ]]> */
   </style>
   <script>
-    if (window.document.referrer.indexOf("shell.windows.com") != -1)
+    if ( window.document.referrer.indexOf( "shell.windows.com" ) != -1 ) {
        location.href = "http://www.openoffice.org/why/why_odf.html";
-
-    function shareFacebook() {
-      _gaq.push(['_trackEvent','social', 'shareDownload', 'facebook']); 
-      window.open('http://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');	
-    }
-    function shareTwitter(){
-      _gaq.push(['_trackEvent','social', 'shareDownload', 'twitter']); 
-      window.open('http://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+90+million+trusted+downloads.','_blank','toolbar=0,status=0,width=580,height=325');
     }
-    function shareGooglePlus(){
-      _gaq.push(['_trackEvent','social', 'shareDownload', 'google+']); 
-      window.open('http://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F','_blank','toolbar=0,status=0,width=580,height=325');
+
+    function share( platform ) {
+      _gaq.push( ['_trackEvent', 'social', 'shareDownload', platform] ); 
+
+      if ( platform == 'apacheblog' ) {
+        window.open( 'http://blogs.apache.org/OOo/', '_blank' );
+      } else if ( platform == 'facebook' ) {
+        window.open( 'http://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      } else if ( platform == 'twitter' ) {
+        window.open( 'http://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+100+million+trusted+downloads.', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      } else if ( platform == 'google+' ) {
+        window.open( 'http://plus.google.com/share?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F', '_blank', 'toolbar=0, status=0, width=580, height=325' );
+      }
     }
   </script>
 
@@ -64,191 +66,100 @@
 
   <div class="optionset">
 
-  <!-- Text above the first colored box -->
-  <script type="text/javascript">
-  <!--
-  // The text in the H1 tag is intentionally shown as "display: none" (do not display).
-  // This is to please accessibility tools like a screen reader.
-  document.write( "<h1 style='display: none;'>" + l10n_download_headline_text + "</h1>" );
-  //-->
-  </script>
-
-  <!-- Green: Stable release -->
-  <!-- Download via select boxes -->
-  <script type="text/javascript">
-  <!--
-
-  // Set a specific language ISO code to force to assemble a certain localized build as download link.
-  // Changed: The variable can now be found in the "msg_prop_l10n_<ISO_code>.js".
-
-  // Get the download box from a separate file.
-  createDownloadBox();
-
-  // Fill the select boxes and wait for the user's choice.
-  init( 1 );
-
-  entourage.initialize();
-
-  //-->
-  </script>
-
-  <!-- Green: Stable release: No JavaScript enabled -->
-  <noscript>
-  <div class="first button green-sel" id="optionitem2">
-    <h2>
-      <a>Download Apache OpenOffice</a>
-    </h2>
-    <p>
-      <a style="cursor: pointer;" href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
-        title="Select from all platforms, languages, language packs to download">The browser seems to have JavaScript
-	disabled. This technique is used for showing the actual download link. If you want to download Apache OpenOffice
-	anyway, click this text to choose from the alternative download webpage.
-        Our apologies for the inconvenience.
-      </a>
-    </p>
-  </div>
-  </noscript>
-
-  <!-- Light Blue: Share download with social networks -->
-  <script type="text/javascript">
-  <!--
-  document.write( "<div class='button lightblue' id='optionitem4'>"
-    + "<h2>"
-      + "<a style='cursor: default;' title='" + l10n_share_light_blue_box_headline_title + "'>"
-        + l10n_share_light_blue_box_headline_text
-      + "</a>"
-    + "</h2>"
-    + "<p style='cursor: default;' id='ShareDownloadLinks'>"
-      + "<a style='cursor: default;' title='" + l10n_share_light_blue_box_text_title + "'>"
-        + l10n_share_light_blue_box_text_text
-      + "</a>"
-      + "<a style='display: inline; padding: 0 5px 0 30px;' href='javascript:shareFacebook()'"
-        + "title='" + l10n_share_light_blue_box_facebook_title + "'>"
-        + "<img src='http://www.openoffice.org/images/logo-facebook-32.png' alt='"
-        + l10n_share_light_blue_box_facebook_alt + "' />"
-      + "</a>"
-      + "<a style='display: inline; padding: 0 5px;' href='javascript:shareTwitter()'"
-        + "title='" + l10n_share_light_blue_box_twitter_title + "'>"
-        + "<img src='http://www.openoffice.org/images/logo-twitter-32.png' alt='"
-        + l10n_share_light_blue_box_twitter_alt + "' />"
-      + "</a>"
-      + "<a style='display: inline; padding: 0 5px;' href='javascript:shareGooglePlus()'"
-        + "title='" + l10n_share_light_blue_box_googleplus_title + "'>"
-        + "<img src='http://www.openoffice.org/images/logo-googleplus-32.png' alt='"
-        + l10n_share_light_blue_box_googleplus_alt + "' />"
-      + "</a>"
-    + "</p>"
-  + "</div>" );
-  //-->
-  </script>
-
-  <!-- Blue: Extensions -->
-  <script type="text/javascript">
-  <!--
-  document.write( "<div class='button blue' id='optionitem5' "
-    + "onclick='openItem('optionitem5','http://extensions.openoffice.org'); return false;'>"
-    + "<h2>"
-      + "<a href='http://extensions.openoffice.org' title='" + l10n_ext_blue_box_headline_title + "'>"
-        + l10n_ext_blue_box_headline_text
-      + "</a>"
-    + "</h2>"
-    + "<p>"
-      + "<a href='http://extensions.openoffice.org' title='" + l10n_ext_blue_box_text_title + "'>"
-        + l10n_ext_blue_box_text_text
-      + "</a>"
-    + "</p>"
-  + "</div>" );
-  //-->
-  </script>
-
-  <!-- Blue: Templates -->
-  <script type="text/javascript">
-  <!--
-  document.write( "<div class='button blue' id='optionitem6' "
-    + "onclick='openItem('optionitem6','http://templates.openoffice.org'); return false;'>"
-    + "<h2>"
-      + "<a href='http://templates.openoffice.org' title='" + l10n_tlp_blue_box_headline_title + "'>"
-        + l10n_tlp_blue_box_headline_text
-      + "</a>"
-    + "</h2>"
-    + "<p>"
-      + "<a href='http://templates.openoffice.org' title='" + l10n_tlp_blue_box_text_title + "'>"
-        + l10n_tlp_blue_box_text_text
-      + "</a>"
-    + "</p>"
-  + "</div>" );
-  //-->
-  </script>
+    <!-- Text above the first colored box -->
+    <script type="text/javascript">
+    <!--
+    // The text in the H1 tag is intentionally shown as "display: none" (do not display).
+    // This is to please accessibility tools like a screen reader.
+    document.write( "<h1 style='display: none;'>" + l10n_download_headline_text + "</h1>" );
+    //-->
+    </script>
+
+    <!-- Green: Stable release -->
+    <!-- Download via select boxes -->
+    <script type="text/javascript">
+    <!--
+
+    // Set a specific language ISO code to force to assemble a certain localized build as download link.
+    // Changed: The variable can now be found in the "msg_prop_l10n_<ISO_code>.js".
+
+    // Get the download box from a separate file.
+    createDownloadBox();
+
+    // Fill the select boxes and wait for the user's choice.
+    init( 1 );
+
+    entourage.initialize();
+
+    //-->
+    </script>
+
+    <!-- Green: Stable release: No JavaScript enabled -->
+    <noscript>
+    <div class="first button green-sel" id="optionitem2">
+      <div class="green-sel-icon"></div>
+      <h2>
+        <a style="cursor: pointer;" href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
+          title="Select from all platforms, languages, language packs to download">
+          Apache OpenOffice Downloads - Official Site
+        </a>
+      </h2>
+      <p>
+        <a style="cursor: pointer;" href="http://www.apache.org/dyn/aoo-closer.cgi/openoffice/"
+          title="Select from all platforms, languages and language packs to download">The browser seems to have
+          JavaScript disabled. This technique is used for showing the actual download link. If you want to download
+          Apache OpenOffice anyway, click this text to choose from the alternative download webpage.
+          Our apologies for the inconvenience.
+        </a>
+      </p>
+    </div>
+    </noscript>
+
+    <!-- Light Blue: Share download with social networks -->
+    <script type="text/javascript">
+    <!--
+    // Get the share box from a separate file.
+    createShareBox();
+    //-->
+    </script>
+
+    <!-- Blue: Extensions -->
+    <script type="text/javascript">
+    <!--
+    // Get the extensions box from a separate file.
+    createExtensionsBox();
+    //-->
+    </script>
+
+    <!-- Blue: Templates -->
+    <script type="text/javascript">
+    <!--
+    // Get the templates box from a separate file.
+    createTemplatesBox();
+    //-->
+    </script>
 
   </div> <!-- class "optionset" -->
 
   <div class="additionalinformation">
 
-  <script type="text/javascript">
-  <!--
-  document.write( "<h3>" + l10n_nav_headline_1_text + "</h3>"
-  + "<ul>"
-    + "<li><a href='http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html'"
-    + "title='" + l10n_nav_sysreq_title + "'>" + l10n_nav_sysreq_text + "</a></li>"
-    + "<li><a href='../../license.html'"
-    + "title='" + l10n_nav_license_title + "'>" + l10n_nav_license_text + "</a></li>"
-    + "<li><a href='http://openoffice.apache.org/downloads.html'"
-    + "title='" + l10n_nav_source_title + "'>" + l10n_nav_source_text + "</a>"
-    + "<li><a href='http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO'"
-    + "title='" + l10n_nav_build_title + "'>" + l10n_nav_build_text + "</a></li>"
-    + "<li><a href='http://openoffice.apache.org/downloads.html'"
-    + "title='" + l10n_nav_sdk_title + "'>" + l10n_nav_sdk_text + "</a></li>"
-    + "<li><a href='http://www.openoffice.org/download/devbuilds.html'"
-    + "title='" + l10n_nav_devbuilds_title + "'>" + l10n_nav_devbuilds_text + "</a></li>"
-  + "</ul>"
-
-  + "<h3>" + l10n_nav_headline_2_text + "</h3>"
-  + "<ul>"
-    + "<li><a href='http://cwiki.apache.org/confluence/display/OOOUSERS/Releases'"
-    + "title='" + l10n_nav_schedule_title + "'>" + l10n_nav_schedule_text + "</a></li>"
-    + "<li><a href='http://wiki.services.openoffice.org/wiki/Product_Release'"
-    + "title='" + l10n_nav_hist_schedule_title + "'>" + l10n_nav_hist_schedule_text + "</a></li>"
-    + "<li><a href='http://www.openoffice.org/download/common/instructions.html'"
-    + "title='" + l10n_nav_inst_guide_title + "'>" + l10n_nav_inst_guide_text + "</a></li>"
-    + "<li><a href='http://www.openoffice.org/documentation/index.html'"
-    + "title='" + l10n_nav_user_guide_title + "'>" + l10n_nav_user_guide_text + "</a></li>"
-    + "<li><a href='http://www.openoffice.org/download/common/java.html'"
-    + "title='" + l10n_nav_why_java_title + "'>" + l10n_nav_why_java_text + "</a></li>"
-    + "<li><a href='http://www.openoffice.org/development/releases/eol.html'"
-    + "title='" + l10n_nav_eol_title + "'>" + l10n_nav_eol_text + "</a></li>"
-  + "</ul>"
-
-  + "<h3>" + l10n_nav_headline_3_text + "</h3>"
-  + "<ul>"
-    + "<li><a href='http://www.openoffice.org/support/index.html'"
-    + "title='" + l10n_nav_support_title + "'>" + l10n_nav_support_text + "</a></li>"
-    + "<li><a href='http://openoffice.apache.org/native-lang.html'"
-    + "title='" + l10n_nav_local_title + "'>" + l10n_nav_local_text + "</a></li>"
-    + "<li><a href='http://www.openoffice.org/stats/index.html'"
-    + "title='" + l10n_nav_stat_title + "'>" + l10n_nav_stat_text + "</a></li>"
-    + "<li><a href='http://sourceforge.net/projects/openofficeorg.mirror/files/'"
-    + "title='" + l10n_nav_mirrors1_title + "'>" + l10n_nav_mirrors1_text + "</a><br /></li>"
-    + "<li><a href='http://www.apache.org/dyn/aoo-closer.cgi/openoffice/'"
-    + "title='" + l10n_nav_mirrors2_title + "'>" + l10n_nav_mirrors2_text + "</a><br /></li>"
-    + "<li><a href='http://www.openoffice.org/porting/index.html'"
-    + "title='" + l10n_nav_porting_title + "'>" + l10n_nav_porting_text + "</a><br /></li>"
-    + "<li><a href='http://www.openoffice.org/download/archive.html'"
-    + "title='" + l10n_nav_archive_title + "'>" + l10n_nav_archive_text + "</a><br /></li>"
-  + "</ul>"
-
-  + "<div id='SupportedAndSupporters'>"
-    + "<p>&nbsp;</p>"
-    + "<a href='http://www.sourceforge.net' title='" + l10n_img_sourceforge_title + "'>"
-      + "<img src='http://www.openoffice.org/images/sourceforge.png' width='160' height='34' alt='"
-      + l10n_img_sourceforge_alt + "' />"
-    + "</a>"
-    + "<br /><br />"
-    + "<a href='http://validator.w3.org/check?uri=referer' target='_blank' title='" + l10n_img_w3c_title + "'>"
-      + "<img src='http://www.openoffice.org/images/valid-xhtml10-blue.png' alt='" + l10n_img_w3c_alt + "' />"
-    + "</a>"
-  + "</div>" );
-  //-->
-  </script>
+    <!-- Navigation bar -->
+    <script type="text/javascript">
+    <!--
+    // Get the navigation bar from a separate file.
+    createNavigationBar();
+    //-->
+    </script>
+
+    <br /><br />
+
+    <!-- Logo section -->
+    <script type="text/javascript">
+    <!--
+    // Get the logo section from a separate file.
+    createLogoSection();
+    //-->
+    </script>
 
   </div> <!-- class: additionalinformation -->
 

Modified: websites/staging/ooo-site/trunk/content/bg/download/msg_prop_l10n_bg.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/bg/download/msg_prop_l10n_bg.js (original)
+++ websites/staging/ooo-site/trunk/content/bg/download/msg_prop_l10n_bg.js Sat Jul  5 18:03:48 2014
@@ -12,7 +12,7 @@
 // The following variables are used in the "index.html" file:
 
 // Set a specific language ISO code to force to assemble a download link with a certain language.
-NL_LANG							= "bg";
+var NL_LANG						= "bg";
 
 // General:
 var l10n_download_headline_text				= "Apache OpenOffice Download";
@@ -29,21 +29,34 @@ var l10n_download_green_box_selectbox_la
 var l10n_download_green_box_selectbox_ver_title		= "Select your favorite release version";
 
 // Download: Strings in the sub-green box (used in "index.html").
+// Not defined for now.
 
 // Download: Strings in the yellow box (used in "index.html").
+// Not defined for now.
 
 // Download: Strings in the sub-yellow box (used in "index.html").
+// Not defined for now.
 
 // Share: Strings in the light-blue box (used in "index.html").
 var l10n_share_light_blue_box_headline_text		= "Help Spread the Word";
 var l10n_share_light_blue_box_headline_title		= "Help spread the word and tell your friends about Apache OpenOffice";
 var l10n_share_light_blue_box_text_text			= "Please tell your friends about Apache OpenOffice:";
 var l10n_share_light_blue_box_text_title		= "Help spread the word and tell your friends about Apache OpenOffice";
+var l10n_share_light_blue_box_blog_text			= "Official Blog";
+var l10n_share_light_blue_box_blog_title		= "Weblog of OpenOffice.";
+var l10n_share_light_blue_box_blog_src			= "http://www.openoffice.org/images/logo-rss-32.png";
+var l10n_share_light_blue_box_blog_alt			= "Weblog of OpenOffice";
+var l10n_share_light_blue_box_facebook_text		= "Facebook";
 var l10n_share_light_blue_box_facebook_title		= "Please tell your friends about Apache OpenOffice via Facebook";
+var l10n_share_light_blue_box_facebook_src		= "http://www.openoffice.org/images/logo-facebook-32.png";
 var l10n_share_light_blue_box_facebook_alt		= "Share on Facebook";
+var l10n_share_light_blue_box_twitter_text		= "Twitter";
 var l10n_share_light_blue_box_twitter_title		= "Please tell your friends about Apache OpenOffice via Twitter";
+var l10n_share_light_blue_box_twitter_src		= "http://www.openoffice.org/images/logo-twitter-32.png";
 var l10n_share_light_blue_box_twitter_alt		= "Share on Twitter";
+var l10n_share_light_blue_box_googleplus_text		= "Google+";
 var l10n_share_light_blue_box_googleplus_title		= "Please tell your friends about Apache OpenOffice via Google+";
+var l10n_share_light_blue_box_googleplus_src		= "http://www.openoffice.org/images/logo-googleplus-32.png";
 var l10n_share_light_blue_box_googleplus_alt		= "Share on Google+";
 
 // Extensions: Strings in the blue box (top) (used in "index.html").
@@ -51,69 +64,98 @@ var l10n_ext_blue_box_headline_text			= 
 var l10n_ext_blue_box_headline_title			= "Choose from a wide range of additional and individual functionality";
 var l10n_ext_blue_box_text_text				= "Extend your Apache OpenOffice functionality with a large and growing library of extensions and dictionaries from other users.";
 var l10n_ext_blue_box_text_title			= "Choose from a wide range of additional and individual functionality";
+var l10n_ext_blue_box_text_href				= "http://extensions.openoffice.org/";
 
 // Templates: Strings in the blue box (bottom) (used in "index.html").
 var l10n_tlp_blue_box_headline_text			= "Get Apache OpenOffice Templates";
 var l10n_tlp_blue_box_headline_title			= "Choose from a wide range of additional and individual documents";
 var l10n_tlp_blue_box_text_text				= "Extend your Apache OpenOffice creativity with a large and growing library of templates from other users.";
 var l10n_tlp_blue_box_text_title			= "Choose from a wide range of additional and individual documents";
+var l10n_tlp_blue_box_text_href				= "http://templates.openoffice.org/";
 
 // Strings in the navigation bar (used in "index.html").
 // Release Information
 var l10n_nav_headline_1_text				= "Release Information";
-var l10n_nav_release_notes_text				= "Release Notes";
-var l10n_nav_release_notes_title			= "What is new, what has been improved in Apache OpenOffice?";
 var l10n_nav_sysreq_text				= "System Requirements";
 var l10n_nav_sysreq_title				= "HDD: ~300MB free - Memory: &gt;128MB - Processor: &gt;500MHz - OS: Win, Linux, Mac OS, Solaris, FreeBSD...";
-var l10n_nav_checksum_text				= "Verify the downloaded file";
-var l10n_nav_checksum_title				= "How to verify the downloaded file with signatures and hashes?";
+var l10n_nav_sysreq_href				= "http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html";
 var l10n_nav_license_text				= "License";
 var l10n_nav_license_title				= "Apache OpenOffice License";
+var l10n_nav_license_href				= "http://www.openoffice.org/license.html";
 var l10n_nav_source_text				= "Source";
 var l10n_nav_source_title				= "For developers and power users: Get the source to build Apache OpenOffice from scratch.";
+var l10n_nav_source_href				= "http://openoffice.apache.org/downloads.html";
 var l10n_nav_build_text					= "Building Guide";
 var l10n_nav_build_title				= "For developers and power users: HowTo guide to build Apache OpenOffice from scratch.";
+var l10n_nav_build_href					= "http://wiki.openoffice.org/wiki/Documentation/Building_Guide_AOO";
 var l10n_nav_sdk_text					= "Software Development Kit (SDK)";
 var l10n_nav_sdk_title					= "For developers: Software Development Kit.";
+var l10n_nav_sdk_href					= "http://openoffice.apache.org/downloads.html";
+var l10n_nav_devbuilds_text				= "Development Builds";
+var l10n_nav_devbuilds_title				= "For QA volunteers: Development Builds";
+var l10n_nav_devbuilds_href				= "http://www.openoffice.org/download/devbuilds.html";
 
 // Documentation
 var l10n_nav_headline_2_text				= "Documentation";
 var l10n_nav_schedule_text				= "Release Schedules";
 var l10n_nav_schedule_title				= "When are new releases planned?";
+var l10n_nav_schedule_href				= "http://cwiki.apache.org/confluence/display/OOOUSERS/Releases";
 var l10n_nav_hist_schedule_text				= "Historic Release Schedule";
 var l10n_nav_hist_schedule_title			= "When were old releases planned?";
+var l10n_nav_hist_schedule_href				= "http://wiki.services.openoffice.org/wiki/Product_Release";
 var l10n_nav_inst_guide_text				= "Installation Guides";
 var l10n_nav_inst_guide_title				= "Instructions for installing Apache OpenOffice on Windows, Linux and Mac OS machines";
+var l10n_nav_inst_guide_href				= "http://www.openoffice.org/download/common/instructions.html";
 var l10n_nav_user_guide_text				= "User Guides";
 var l10n_nav_user_guide_title				= "Extensive user manuals for every day use";
+var l10n_nav_user_guide_href				= "http://www.openoffice.org/documentation/index.html";
 var l10n_nav_why_java_text				= "Java and Apache OpenOffice";
 var l10n_nav_why_java_title				= "Explains why to use Java and what it is";
+var l10n_nav_why_java_href				= "http://www.openoffice.org/download/common/java.html";
 var l10n_nav_eol_text					= "End-Of-Life Information";
 var l10n_nav_eol_title					= "Information about releases that have reached End-Of-Life status";
+var l10n_nav_eol_href					= "http://www.openoffice.org/development/releases/eol.html";
 
 // Additional Resources
 var l10n_nav_headline_3_text				= "Additional Resources";
 var l10n_nav_support_text				= "Support";
 var l10n_nav_support_title				= "If the information above did not answer your question: Free and paid support!";
+var l10n_nav_support_href				= "http://www.openoffice.org/support/index.html";
 var l10n_nav_local_text					= "Localizations";
 var l10n_nav_local_title				= "Information and support in your favorite language";
+var l10n_nav_local_href					= "http://openoffice.apache.org/native-lang.html";
 var l10n_nav_stat_text					= "Download Statistics";
 var l10n_nav_stat_title					= "Download and other statistics";
+var l10n_nav_stat_href					= "http://www.openoffice.org/stats/index.html";
 var l10n_nav_mirrors1_text				= "Alternative download mirrors #1";
-var l10n_nav_mirrors1_title				= "Use Apache mirrors to download Apache OpenOffice";
+var l10n_nav_mirrors1_title				= "Use Sourceforge mirrors to download Apache OpenOffice";
+var l10n_nav_mirrors1_href				= "http://sourceforge.net/projects/openofficeorg.mirror/files/";
 var l10n_nav_mirrors2_text				= "Alternative download mirrors #2";
 var l10n_nav_mirrors2_title				= "Use Apache mirrors to download Apache OpenOffice";
+var l10n_nav_mirrors2_href				= "http://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
 var l10n_nav_porting_text				= "3rd party ports and distributions";
 var l10n_nav_porting_title				= "Ports and distributions from 3rd party vendors";
+var l10n_nav_porting_href				= "http://www.openoffice.org/porting/index.html";
 var l10n_nav_archive_text				= "Archived and legacy releases";
 var l10n_nav_archive_title				= "Download legacy and archived releases";
-var l10n_nav_devbuilds_text				= "Development Builds";
-var l10n_nav_devbuilds_title				= "For QA volunteers: Development Builds";
+var l10n_nav_archive_href				= "http://www.openoffice.org/download/archive.html";
+
+// List items in the navigation bar that are not used for now.
+var l10n_nav_release_notes_text				= "Release Notes";
+var l10n_nav_release_notes_title			= "What is new, what has been improved in Apache OpenOffice?";
+var l10n_nav_release_notes_href				= "http://www.openoffice.org/development/releases/index.html";
+var l10n_nav_checksum_text				= "Verify the downloaded file";
+var l10n_nav_checksum_title				= "How to verify the downloaded file with signatures and hashes?";
+var l10n_nav_checksum_href				= "http://www.openoffice.org/download/checksums.html";
 
 // Strings for the logo graphics.
 var l10n_img_sourceforge_title				= "Sourceforge - Download, Develop and Publish Free Open Source Software";
+var l10n_img_sourceforge_href				= "http://www.sourceforge.net/";
+var l10n_img_sourceforge_src				= "http://www.openoffice.org/images/sourceforge.png";
 var l10n_img_sourceforge_alt				= "Sourceforge";
 var l10n_img_w3c_title					= "W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents";
+var l10n_img_w3c_href					= "http://validator.w3.org/check?uri=referer";
+var l10n_img_w3c_src					= "http://www.openoffice.org/images/valid-xhtml10-blue.png";
 var l10n_img_w3c_alt					= "W3C Validator";
 
 
@@ -155,14 +197,17 @@ var l10n_download_checksum_sha256_text		
 var l10n_download_checksum_sha256_title			= "SHA256 hash for: ";
 
 var l10n_download_help_img_title			= "What is the difference between full installation and language pack?";
+var l10n_download_help_img_src				= "http://www.openoffice.org/download/cachedimages/help-information-icon.png";
 var l10n_download_help_img_alt				= "Install info";
 var l10n_download_help_text				= "What is a language pack?";
 var l10n_download_help_title				= "What is the difference between full installation and language pack?";
 var l10n_download_checksum_img_title			= "How to verify the downloaded file with checksums?";
+var l10n_download_checksum_img_src			= "http://www.openoffice.org/download/cachedimages/help-information-icon.png";
 var l10n_download_checksum_img_alt			= "Checksum verify";
 var l10n_download_checksum_text				= "How to verify the download?";
 var l10n_download_checksum_title			= "How to verify the downloaded file with checksums?";
 var l10n_download_report_img_title			= "Broken download link? Click here to report.";
+var l10n_download_report_img_src			= "http://www.openoffice.org/download/cachedimages/help-report-broken-link-icon.png";
 var l10n_download_report_img_alt			= "Broken link";
 var l10n_download_report_text				= "Report broken link";
 var l10n_download_report_title				= "Broken download link? Click here to report.";
@@ -174,6 +219,7 @@ var l10n_download_langpack_link_error_te
 var l10n_download_langpack_link_error_title		= "Please select another language, platform or version.";
 
 var l10n_download_error_problem_img_title		= "The selected download file is not available";
+var l10n_download_error_problem_img_src			= "http://www.openoffice.org/download/cachedimages/exclamation-icon.png";
 var l10n_download_error_problem_img_alt			= "Error text";
 var l10n_download_error_problem_text			= "Problem: ";
 var l10n_download_error_solution_text			= "Solution: ";
@@ -186,6 +232,13 @@ var l10n_download_error_please_select_4_
 
 var l10n_download_unknown_platform_text			= "unknown operating system / platform";
 
+// Download: Strings with customized error text in the sub-red box (used in "download.js").
+// Can be used when the default text in the variables above cannot be translated correctly.
+var l10n_download_error_custom_1_text			= "";
+var l10n_download_error_custom_2_text			= "";
+var l10n_download_error_custom_3_text			= "";
+var l10n_download_error_custom_4_text			= "";
+
 
 
 // The following variables are used in the "analyze.html" file:
@@ -194,8 +247,8 @@ var l10n_download_unknown_platform_text	
 var l10n_analyze_headline_text				= "How to report a broken download link?";
 var l10n_analyze_instruction_select_text		= "<b>Select your favorites</b>: Operating system, language and version in the green below.";
 var l10n_analyze_instruction_verify_text		= "Verify that these options <b>still do not</b> lead to valid download links.";
-var l10n_analyze_instruction_click_text			= "Click on the button below the green box:";
-var l10n_analyze_instruction_copy_text			= "Copy the selected table data into the clipboard:";
+var l10n_analyze_instruction_click_text			= "Click on the button below the green box: ";
+var l10n_analyze_instruction_copy_text			= "Copy the selected table data into the clipboard: ";
 var l10n_analyze_instruction_new_mail_text		= "Create a new mail.";
 var l10n_analyze_instruction_problem_text		= "<b>Write a problem description</b> (what does not work and what do you expect).";
 var l10n_analyze_instruction_details_text		= "Please also add <b>details about the used operating system</b>.";
@@ -215,8 +268,8 @@ var l10n_analyze_update_button_text			= 
 var l10n_analyze_update_button_title			= "Put the selected options as values into the table below";
 var l10n_analyze_select_button_text			= "Click to select the table";
 var l10n_analyze_select_button_title			= "Select all data in the table below";
-var l10n_analyze_copy_button_text			= "Copy with [Ctrl] + [C]";
-var l10n_analyze_copy_button_title			= "Copy the selected table data via [Ctrl] + [C] into the clipboard";
+var l10n_analyze_copy_button_text			= "Copy with [Ctrl]+[C] / [&#8984;]+[C]";
+var l10n_analyze_copy_button_title			= "Copy the selected table data via [ Ctrl ] + [ C ] or [ &#8984; ] + [ C ] into the clipboard";
 
 // Analyze: Strings for the table (used in "analyze.html").
 var l10n_analyze_table_browser_text			= "Browser variables";
@@ -237,4 +290,5 @@ var l10n_download_checksum_link				= "ht
 var l10n_download_report_link				= "http://www.openoffice.org/download/analyze.html";
 var l10n_download_porting_link				= "http://www.openoffice.org/porting/index.html";
 var l10n_download_archive_link				= "http://www.openoffice.org/download/archive.html";
+var l10n_download_aoo341_link				= "http://www.openoffice.org/download/other-341.html";