Author: buildbot Date: Sat Jul 5 18:07:23 2014 New Revision: 915141 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/fi/download/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sat Jul 5 18:07:23 2014 @@ -1 +1 @@ -1608089 +1608090 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Sat Jul 5 18:07:23 2014 @@ -1 +1 @@ -1608089 +1608090 Modified: websites/staging/ooo-site/trunk/content/fi/download/index.html ============================================================================== --- websites/staging/ooo-site/trunk/content/fi/download/index.html (original) +++ websites/staging/ooo-site/trunk/content/fi/download/index.html Sat Jul 5 18:07:23 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> </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 -->