Author: marcus
Date: Fri Jun 27 21:30:08 2014
New Revision: 1606249

URL: http://svn.apache.org/r1606249
Log:
Added the separation of the news and blog text

Modified:
    openoffice/ooo-site/trunk/content/xx/index.html

Modified: openoffice/ooo-site/trunk/content/xx/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/xx/index.html?rev=1606249&r1=1606248&r2=1606249&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/xx/index.html (original)
+++ openoffice/ooo-site/trunk/content/xx/index.html Fri Jun 27 21:30:08 2014
@@ -222,72 +222,94 @@ screen reader.
 
 <div id="news" style="margin: 2% 3% 0 0; height: 520px;">
 
- <div class="campaign">
-    <h2>Recent Blog Posts</h2>
-      <p>
-        <em>29 July:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/interview_with_the_developers_of";>
-               Interview with the developers of 
PrOOo-Box</a>&nbsp;<em>&mdash;&nbsp;Rob&nbsp;Weir</em><br/>              
-        <em>23 July:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/a_short_celebration_and_then";>
-        A short celebration, and then back to 
work</a>&nbsp;<em>&mdash;&nbsp;Rob&nbsp;Weir</em><br/>
-        <em>17 June:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get";>
-        With Apache OpenOffice you get what you don't pay 
for</a>&nbsp;<em>&mdash;&nbsp;Rob&nbsp;Weir</em><br/>
-        <em>10 June:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/when_will_openoffice_version_x";>
-        When will OpenOffice be 
released?</a>&nbsp;<em>&mdash;&nbsp;Rob&nbsp;Weir</em><br/>
-        <em>04 June:</em><br /><a 
href="https://blogs.apache.org/OOo/entry/the_sidebar_new_and_improved";>
-        The Sidebar, New and 
Improved</a>&nbsp;<em>&mdash;&nbsp;Andre&nbsp;Fischer</em><br/>
-        
-      </p>
-     <p style="text-align:right"><a href="http://blogs.apache.org/OOo/";>All 
Posts</a></p>
-  </div>
-
-  <div class="campaign">
-    <h2>Apache OpenOffice 4.0 is now available for download!</h2>
+  <div class="campaign" style="height: 200px; float: right; overflow: auto;">
+    <h2 style="display: inline;">Recent Blog Posts</h2>
 
-    <p><em>23 July 2013:</em> Following a continuous time of improvement, we 
are proud to
-    <a href="https://blogs.apache.org/OOo/entry/a_short_celebration_and_then";
-    title="Blog post of the new Apache OpenOffice 4.0 release">announce today 
the newest release of Apache OpenOffice</a>.
-    It is out now and <a href="/download/index.html" title="Download Apache 
OpenOffice now!">available for download</a>.
-    This is a major feature release, so make sure to check out the
-    <a 
href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";
-    title="Apache OpenOffice 4.0 Release Notes">Feature Overview</a> to learn 
more about the new features and all
-    improvements.</p>
+    <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 class="campaign">
-    <h2>Over 60 million downloads of Apache OpenOffice</h2>
+  <div id="all_news" style="height: 320px; float: left; overflow: auto;">
+    <div class="campaign">
+      <h2>Recent News</h2>
 
-    <p><em>1 August 2013:</em>
-    Downloads of Apache OpenOfifce have now exceed 60 million. We invite you 
to take a look at 
-    <a href="http://stats.openoffice.org/";>our interactive charts</a> of daily 
and cumulative downloads.</p>
-  </div>
+      <p style="text-align:right">
+        <a href="news/index.html">All News</a>
+      </p>
+      <p></p>
 
-  <div class="campaign">
-    <h2>Volunteers, not Amateurs</h2>
+      <h2>Apache OpenOffice 4.1.0 released</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><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>
 
-    <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 class="campaign">
-    <h2>Apache OpenOffice given two Bossie Awards!</h2>
+</div>
 
-    <p><em>18 September 2012:</em>
-    InfoWorld has awarded Apache OpenOffice two Bossies (Best of Open Source), 
one for the OpenOffice application, and one
-    for our <a href="http://templates.openoffice.org/";>templates 
website</a>.<br />
-    <a 
href="https://plus.google.com/u/0/b/114598373874764163668/114598373874764163668/posts/guW3vcCvFFy";>
-    Read more on our Google+ page</a>.</p>
-  </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 class="campaign">
-    <h2><a href="/xx/news/">More OpenOffice News...</a></h2>
-  </div>
-</div>
+<div style="clear: both;"></div>
 
 </body>
 </html>
+


Reply via email to