Author: buildbot
Date: Sun Jun 29 19:32:29 2014
New Revision: 914369

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

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jun 29 19:32:29 2014
@@ -1 +1 @@
-1606576
+1606577

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jun 29 19:32:29 2014
@@ -1 +1 @@
-1606576
+1606577

Modified: websites/staging/ooo-site/trunk/content/fi/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/fi/index.html (original)
+++ websites/staging/ooo-site/trunk/content/fi/index.html Sun Jun 29 19:32:29 
2014
@@ -3,22 +3,84 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-<title>Suomenkielinen Apache OpenOffice</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <meta name="version" content="0.1" />
-
-<!-- Begin Finnish header -->
-<style type="text/css" media="screen, projection">
-/*<![CDATA[*/
-<!--
-  @import url(css/fi.css);
--->
-/*]]>*/
-</style>
-<!-- End Finnish header -->
+    <meta name="description" content="The official home page of the Apache 
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw 
and Base." />
+    <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open 
Document Format, free office editors" />
+    <meta name="google-site-verification" 
content="x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4" />
+    <meta name="p:domain_verify" content="bd1ba1fb9d25b0eb3d64891f89e9195e" /> 
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <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>
+    <style type="text/css">
+    /* <![CDATA[ */
+    /*-------------------- Exceptions on standard css -----------------------*/
+    @import "../home.css";
+    @import "../styles.css";
+    @import "../exceptions.css";
+    /* ]]> */
+    </style>
+
+    <script>
+      function follow( platform ) {
+        _gaq.push( ['_trackEvent','social', 'followUs', platform] ); 
+
+        if ( platform == 'ApacheBlog' )
+          window.open( "https://blogs.apache.org/OOo/";, "_blank" );
+        else if ( platform == 'Facebook' )
+          window.open( "https://www.facebook.com/ApacheOO";, "_blank" );
+        else if ( platform == 'Twitter' )
+          window.open( "https://twitter.com/ApacheOO";, "_blank" );
+        else if ( platform == 'GooglePlus' )
+          window.open( "https://plus.google.com/+openoffice";, "_blank" );
+      }
+
+      function showAlertbox( show ) {
+       // More see "http://html-color-codes.info/";
+        var l10n_alert_box_background_color = "#F5A9A9";
+        // Make the whole alert box clickable with a link.
+        var l10n_alert_box_href                    = 
"http://openoffice.apache.org/translate.html";;
+       // Maximum 49 characters.
+        var l10n_alert_box_headline_text    = "We need your help to complete 
translation into Finnish!";
+       // Maximum 630 characters.
+        var l10n_alert_box_text_text       = "This note is in English because 
we have no one to translate this webpage and others into your language. The 
links on the page will help you download and install Apache OpenOffice with 
Finnish translation. But we still need help with this website. <br /><br /> If 
you are interested in helping translate, please click this text to review the 
information. You can send a note to our mailing list 
\"[email protected]\" if you want to volunteer or if you have 
questions.";
+
+        // 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";
+
+          // Show alert box with defined background color.
+          // Depending if link is available, make the whole DIV clickable or 
not.
+          if( l10n_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;'>" );
+
+            // Show headline.
+            document.write( "<h2 style='cursor: pointer;'>" + 
l10n_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>" );
+
+          } else {
+            // Show the text without link and normal cursor.
+            document.write( "<div id='alert_box' style='background: " + 
l10n_alert_box_background_color + "'>" );
+
+            // Show headline.
+            document.write( "<h2 style='cursor: default;'>" + 
l10n_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>" );
+          }
 
-        
+          document.write( "</div>" ); // Alert box
+        }
+      }
+
+    </script>
 
 <!--#include virtual="/google-analytics.js" --> 
 <!--#include virtual="/scripts/entourage.js" -->
@@ -36,147 +98,236 @@
     
     
     
-<div id="fiheader">
-       <div id="fipositioner">
-               <!--<a id="fiheader-logo" href="http://fi.openoffice.org/"; 
accesskey="1" title="Suomenkieliselle Apache OpenOffice-kotisivulle"></a>
-               <h1 id="fipositioner-text">Vapaa ja avoin 
toimisto-ohjelmisto</h1> -->
-
-       </div>
-</div> 
-<table id="fibody">
- <tr>
-  <td>
-   <table width="100%" cellspacing="0" cellpadding="0">
-    <tr>
-     <td></td>
-     <td colspan="2">
-      <table cellpadding="5">
-       <tr valign="top">
-        <td>
-        
-<!-- Begin Finnish navbar -->
-         <div class="fiLeftMenu">
-          <div class="toolgroup">
-           <div class="label"><strong>Apache 
OpenOffice&nbsp;suomeksi</strong></div>
-           <ul>  
-            <li><a href="index.html">Pääsivu</a></li>
-            <li><a href="lataa.html">Lataa</a></li>
-            <li><a href="tuote.html">Ohjelmiston&nbsp;kuvaus</a></li>
-            <li><a href="sivukartta.html">Sivukartta</a></li>
-           </ul>
-          </div>
-          
-          <div class="toolgroup">
-           <div class="label"><strong>Ohjeita</strong></div>
-           <ul>
-            <li><a href="tuki.html">Käyttäjätuki</a></li>
-            <li><a href="vastauksia.html">Vastauksia kysymyksiin</a></li>
-            <li><a href="dokumentaatio.html">Käyttöoppaat</a></li>
-            <li><a href="kielityokalut.html">Tavutus ja oikoluku</a></li>
-            <li><a href="mallit.html">Asiakirjamalleja</a></li>
-           </ul>
+
+<!-- The text in the H1 tag is intentionally shown as not displayable, just to 
please accessibility tools like a
+screen reader.
+-->
+<h1 style="display: none;">Apache OpenOffice</h1>
+
+<div id="actionstatements">
+
+  <script type="text/javascript">
+  <!--
+  // Show alert box.
+  showAlertbox( true );
+  //-->
+  </script>
+
+  <ul>
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-info">
+        <div class="action-text action-link">
+          <a href="../why/index.html"><h2>I want to learn more about 
OpenOffice</h2>
+          <p>What is Apache OpenOffice? And why should I use it?</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+
+    <!-- Show the download link with currently available version number, 
loaded via JavaScript -->
+    <script type="text/javascript">
+    <!--
+    document.write( "<li>"
+      + "<div class='action-download'>"
+        + "<div class='action-text action-link'>"
+          + "<a href='download/index.html'>"
+            + "<h2>I want to download Apache OpenOffice</h2>"
+            + "<p style='font-size: 1.0em; font-weight: bold;'>(Most recent 
release: " + VERSION + ")</p>"
+            + "<p>Download Apache OpenOffice for free <b>(really!)</b> | "
+              + "<a 
href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'"
+                + "title='Blog post: With Apache OpenOffice you get what you 
do not pay for' target='_blank'>"
+                + "Click here to get more information"
+              + "</a>."
+            + "</p>"
+          + "</a>"
+        + "</div>"
+      + "</div>"
+    + "</li>" );
+    //-->
+    </script>
+
+    <!-- Show the download link, without version number -->
+    <noscript>
+      <li>
+        <div class="action-download">
+          <div class="action-text action-link">
+            <a href="download/index.html">
+              <h2>I want to download Apache OpenOffice</h2>
+              <p>Download Apache OpenOffice for free, or find out about other 
ways of getting it.</p>
+            </a>
           </div>
-          
-          <div class="toolgroup">
-           <div class="label"><strong>Suomennosprojekti</strong></div>
-           <ul>
-            <li><a 
href="http://fi.openoffice.org/servlets/ProjectNewsList";>Tiedotteet</a></li>
-            <li><a href="postituslistat.html">Postituslistat</a>
-             (<a 
href="http://fi.openoffice.org/servlets/ProjectMailingListList";>engl</a>)
-            </li>
-            <li><a href="todo.html">Tehtäviä</a></li>
-            <li><a href="issuezilla.html">Viat ja toiveet</a>
-             (<a 
href="http://fi.openoffice.org/servlets/ProjectIssues";>engl</a>)
-            </li>
-            <li><a href="yhteystiedot.html">Yhteystiedot</a></li>
-           </ul>
-          </div> 
-         </div>
-<!-- End Finnish navbar -->
-        </td>
-        <td class="pagecontent">
-<!-- END-FINNISH-HEADER-PART -->
-        
-<!-- ====================================================================== -->
-<table>
- <tr valign="top">
-  <td>
-   
-   <div id="pagetitle">Vapautta kotiin, kouluun ja toimistoon</div>
-   <div id="slogan"><b></b></div>
-   
-   <p>Apache OpenOffice on avoimeen lähdekoodiin ja avoimiin standardeihin
-    perustuva täysimittainen toimisto-ohjelmisto. Se on saatavilla
-    ilmaiseksi ja on vapaasti kopioitavissa ja levitettävissä, myös 
suomenkielisenä
-    versiona.
-   </p>
-   
-   <table class="downloadlinks">
-    <tr><td><font size="+1"><a href="lataa.html">Lataa Apache 
OpenOffice</a></font></td></tr>
-   </table>
-   
-   <p>OpenOffice.org sisältää yhdessä paketissa kaikki 
toimisto-ohjelmistoon kuuluvat osat:</p>
-   <ul class="nobullets">
-    <li><img src="kuvat/icons/writer48.png" /> Apache OpenOffice Writer - 
tekstinkäsittely</li>
-    <li><img src="kuvat/icons/calc48.png" /> Apache OpenOffice Calc - 
taulukkolaskenta</li>
-    <li><img src="kuvat/icons/draw48.png" /> Apache OpenOffice Draw - 
vektorigrafiikka</li>
-    <li><img src="kuvat/icons/impress48.png" /> Apache OpenOffice Impress - 
esitysgrafiikka</li>
-    <li><img src="kuvat/icons/base48.png" /> Apache OpenOffice Base - 
tietokannat</li>
-   </ul>
-   
-   <p>OpenOffice.org on pitkälti yhteensopiva vastaavilla Microsoft
-    Office -toimisto-ohjelmilla (Word, Excel, Powerpoint) tehtyjen
-    asiakirjojen kanssa. Lisäksi se kykenee kirjoittamaan asiakirjoja
-    mm. PDF-muodossa.
-   </p>
-   
-   <div>
-    <p style="margin-top: 2em;"><b>Uutisia:</b></p>
-    <ul>
-     <li><a 
href="http://fi.openoffice.org/servlets/NewsItemView?newsItemID=743";></a></li>
-     <li><a 
href="http://fi.openoffice.org/servlets/NewsItemView?newsItemID=742";></a></li>
-     <li><a 
href="http://fi.openoffice.org/servlets/NewsItemView?newsItemID=727";></a></li>
-     
-     
-    </ul>
-   </div>
-   
-  </td>
-  <td id="oikeapaneeli" width="200">
-   <div>
-    <a href="kuvat/openoffice.org3.0_linux.png"><img border="0" 
src="kuvat/openoffice.org3.0_peukalokuva_linux.png" align="middle" width="192"
-     height="144" alt="OpenOffice.org 3.0 Linuxissa"/>
-    </a>
-   </div>
-   <div>
-    <p style="margin-top: 2em;"><b>OpenOffice.org ja OpenDocument 
uutisissa:</b></p>
-    <ul>
-     <li><a 
href="http://www.tietoviikko.fi/kaikki_uutiset/article371624.ece";>Ilmainen 
OpenOffice jo joka viidennessä saksalaiskoneessa</a> (4.2.2010)</li>
-     <li><a 
href="http://www.tietoviikko.fi/kaikki_uutiset/article279746.ece";>Microsoft 
avaa Officen oven odf-tiedostoille</a> (29.4.2009)</li>
-     <li><a 
href="http://www.tietokone.fi/uutta/uutinen.asp?news_id=37151";>Openoffice 
yllättävän suosittu – Google Docs ei</a> (15.3.2009)</li>
-     <li><a href="http://www.tietokone.fi/uutta/uutinen.asp?news_id=32935";>Red 
Hat vaatii Microsoftilta tukea odf-formaatille</a>
-     (26.2.2008)</li>
-     <li><a href="http://www.tietoviikko.fi/doc.te?f_id=1208064";>OpenOffice 
etenee oikeusministeriössä</a> (16.8.2007)</li>
-     <li><a 
href="http://www.itviikko.fi/page.php?page_id=46&amp;news_id=20077758";>Uusikaupunki
 syleilee avoimia tiedostomuotoja</a>
-     (28.3.2007)</li>
-    </ul>
-    <p>Katso myös <a href="http://silvonen.wordpress.com/";>Jussin 
OOo-blogi</a></p>
-   </div>
-  </td>
- </tr>
-</table>
-
-
-<!-- ====================================================================== -->
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
+        </div>
+      </li>
+    </noscript>
+
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-help">
+        <div class="action-text action-link">
+          <a href="../support/index.html"><h2>I need help with my 
OpenOffice</h2>
+          <p>Help is at hand whenever you need it.</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-extend">
+        <div class="action-text action-link">
+          <a href="../extensions/index.html"><h2>I want to do more with my 
OpenOffice</h2>
+          <p>Extend Apache OpenOffice with additional functionality, templates 
and clipart.</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+    <li>
+      <div class="action-participate">
+        <div class="action-text action-link">
+          <a href="http://openoffice.apache.org/get-involved.html";><h2>I want 
to participate in OpenOffice</h2>
+          <p>Apache OpenOffice is made with help from people all over the 
world. Feel free to contribute!</p></a>
+        </div>
+      </div>
+    </li>
+    <li>
+      <hr />
+    </li>
+    <li>
+     <div class="action-social">
+        <div class="action-text action-link">
+          <a href="../social/index.html" 
onclick="javascript:follow('SocialLink');">
+          <h2>I want to stay in touch with OpenOffice</h2>
+          <p>Follow the progress of OpenOffice via our announcement list, 
social media areas and blog.</p></a>
+            <div class="action-social-extra">
+              <p>
+                <span style="padding:0 5px;cursor: pointer;" 
onclick="javascript:follow('ApacheBlog');"
+                title="Blog of OpenOffice."><img 
src="../images/logo-rss-16.png" alt="Blog of OpenOffice" />
+                <a>Official Blog</a></span>
+                <span style="padding:0 5px;cursor: pointer;" 
onclick="javascript:follow('Facebook');"
+                title="Follow us on Facebook."><img 
src="../images/logo-facebook-16.png" alt="Follow us on Facebook." />
+                <a>Facebook</a></span>
+                <span style="padding:0 5px;cursor: pointer;" 
onclick="javascript:follow('Twitter');"
+                title="Follow us on Twitter."><img 
src="../images/logo-twitter-16.png" alt="Follow us on Twitter." />
+                <a>Twitter</a></span>
+                <span style="padding:0 5px;cursor: pointer;" 
onclick="javascript:follow('GooglePlus');"
+                title="Follow us on Google+."><img 
src="../images/logo-googleplus-16.png" alt="Follow us on Google+." />
+                <a>Google+</a></span>
+              </p>
+            </div>
+        </div>
+      </div>
+     </li>
+    <li>
+      <hr />
+    </li>
+  </ul>
+
+  <div id="SupportedAndSupporters">
+    <a href="http://validator.w3.org/check?uri=referer";
+    title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents">
+    <img src="http://www.w3.org/Icons/valid-xhtml10-blue.png";
+    alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents"/></a>
+  </div>
+</div>
+
+<div id="news" style="margin: 2% 3% 0 0; height: 520px;">
+
+  <div class="campaign" style="height: 200px; float: right; overflow: auto;">
+    <h2 style="display: inline;">Recent Blog Posts</h2>
+
+    <p style="text-align:right">
+      <a href="http://blogs.apache.org/OOo/";>All Posts</a>
+    </p>
+
+    <p>
+      <em>29 April:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce";>
+      Apache OpenOffice 4.1.0 released</a>
+      <br/>
+      <em>28 April:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2";>
+      Apache OpenOffice Weekly News #2</a>
+      <br/>
+      <em>25 April:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1";>
+      Apache OpenOffice Weekly News #1</a>
+      <br/>
+      <em>17 April:</em><br /><a 
href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56";>
+      100 Million downloads</a>
+      <br/>
+      <em>31 December:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a";>
+      Apache OpenOffice in 2013: a year in review</a>
+      <br/>
+    </p>
+  </div>
+
+  <div id="all_news" style="height: 320px; float: left; overflow: auto;">
+    <div class="campaign">
+      <h2>Recent News</h2>
+
+      <p style="text-align:right">
+        <a href="news/index.html">All News</a>
+      </p>
+      <p></p>
+
+      <h2>Apache OpenOffice 4.1.0 released</h2>
+
+      <p><em>29 April 2014:</em>
+      The Apache OpenOffice project announces the   
+      <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="Download Apache OpenOffice 4.1.0">Don't miss to download</a> the 
new release and find out yourself.</p>
+    </div>
+
+    <div class="campaign">
+      <h2>100 Million downloads</h2>
+
+      <p><em>17 April 2014:</em>
+      The Apache OpenOffice project is proud to tell you that our software was 
  
+      <a 
href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56";
+      title="Apache OpenOffice was downloaded 100 million times">downloaded 
over 100 million times</a>. Join us in
+      celebrating this big achievement!</p>
+    </div>
+
+    <div class="campaign">
+      <h2>Italian region adopts OpenOffice, saves 2 Million Euro</h2>
+
+      <p><em>10 October 2013:</em>
+      The Italian administrative region of Emilia-Romagna announced plans to 
move to OpenOffice,
+      <a 
href="https://joinup.ec.europa.eu/community/osor/news/openoffice-italian-emilia-romagna-save-2-million";>
+      saving 2 million euro</a>.</p>
+    </div>
+
+    <div class="campaign">
+      <h2>Volunteers, not Amateurs</h2>
+
+      <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.
+
+      <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></p>
+    </div>
+
+  </div>
+
+</div>
+
+<!-- Every new element and text that is defined below the previous DIV will be 
actually dislayed wrapped below this DIV
+(because of "clear: both" instead of floated around the previous DIVs. This is 
really needed. -->
+
+<div style="clear: both;"></div>
 
 
   </div>


Reply via email to