Author: marcus Date: Sun Jul 21 12:30:10 2013 New Revision: 1505363 URL: http://svn.apache.org/r1505363 Log: Corrected links to incubator, formatted text, deleted white-spaces
Modified: openoffice/ooo-site/trunk/content/index.html Modified: openoffice/ooo-site/trunk/content/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/index.html?rev=1505363&r1=1505362&r2=1505363&view=diff ============================================================================== --- openoffice/ooo-site/trunk/content/index.html (original) +++ openoffice/ooo-site/trunk/content/index.html Sun Jul 21 12:30:10 2013 @@ -1,11 +1,10 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" /> <head> - <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 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" /> <link rel="STYLESHEET" type="text/css" href="/product/product.css" media="screen" /> @@ -20,20 +19,19 @@ </style> <script> - function follow(platform) { - _gaq.push(['_trackEvent','social', 'followUs', platform]); - 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"); - } else if (platform == 'ApacheBlog') { - window.open("https://blogs.apache.org/OOo/","_blank"); - } - } + function follow(platform) { + _gaq.push(['_trackEvent','social', 'followUs', platform]); + 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"); + } else if (platform == 'ApacheBlog') { + window.open("https://blogs.apache.org/OOo/","_blank"); + } + } </script> - </head> <body> @@ -44,7 +42,6 @@ <div class="action-info"> <div class="action-text action-link"> <h2><a href="/why/">I want to learn more about OpenOffice</a></h2> - <p><a href="/why/">What is Apache OpenOffice? And why should I use it?</a></p> </div> </div> @@ -56,7 +53,6 @@ <div class="action-download"> <div class="action-text action-link"> <h2><a href="/download/">I want to download OpenOffice</a></h2> - <p><a href="/download/">Download Apache OpenOffice for free, or find out about other ways of getting it.</a></p> </div> </div> @@ -68,7 +64,6 @@ <div class="action-help"> <div class="action-text action-link"> <h2><a href="/support/">I need help with my OpenOffice</a></h2> - <p><a href="/support/">Help is at hand whenever you need it.</a></p> </div> </div> @@ -80,7 +75,6 @@ <div class="action-extend"> <div class="action-text action-link"> <h2><a href="/extensions/">I want to do more with my OpenOffice</a></h2> - <p><a href="/extensions/">Extend Apache OpenOffice with additional functionality, templates and clipart.</a></p> </div> </div> @@ -91,10 +85,8 @@ <li> <div class="action-participate"> <div class="action-text action-link"> - <h2><a href="https://incubator.apache.org/openofficeorg/get-involved.html"> - I want to participate in OpenOffice</a></h2> - - <p><a href="https://incubator.apache.org/openofficeorg/get-involved.html"> + <h2><a href="http://openoffice.apache.org/get-involved.html">I want to participate in OpenOffice</a></h2> + <p><a href="http://openoffice.apache.org/get-involved.html"> Apache OpenOffice is made with help from people all over the world. Feel free to contribute!</a></p> </div> </div> @@ -106,24 +98,21 @@ <div class="action-social"> <div class="action-text action-link"> <h2><a href="/social/" onclick="javascript:follow('SocialLink');">I want to stay in touch with OpenOffice</a></h2> - <p><a href="/social/" onclick="javascript:follow('SocialLink');">Follow the progress of OpenOffice via our announcement list, social media areas and blog.</a></p> - <div class="action-social-extra"> - <p> - <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('ApacheBlog');" title="Official Blog"> - <img src="images/logo-rss-16.png"> <a><u>Official Blog</u></a> - </span> - <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('Facebook');" title="Follow Us on Facebook"> - <img src="images/logo-facebook-16.png"> <a><u>Facebook</u></a> - </span> - <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('Twitter');" title="Follow Us on Twitter"> - <img src="images/logo-twitter-16.png"> <a><u>Twitter</u></a> - </span> - <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('GooglePlus');" title="Follow Us on Google+"> - <img src="images/logo-googleplus-16.png"> <a><u>Google+</u></a> - </span> - </p> - </div> - </div> + <p><a href="/social/" onclick="javascript:follow('SocialLink');"> + Follow the progress of OpenOffice via our announcement list, social media areas and blog.</a></p> + <div class="action-social-extra"> + <p> + <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('ApacheBlog');" + title="Official Blog"><img src="images/logo-rss-16.png"> <a><u>Official Blog</u></a></span> + <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('Facebook');" + title="Follow Us on Facebook"><img src="images/logo-facebook-16.png"> <a><u>Facebook</u></a></span> + <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('Twitter');" + title="Follow Us on Twitter"><img src="images/logo-twitter-16.png"> <a><u>Twitter</u></a></span> + <span style="padding:0 5px;cursor: pointer; cursor: hand;" onclick="javascript:follow('GooglePlus');" + title="Follow Us on Google+"><img src="images/logo-googleplus-16.png"> <a><u>Google+</u></a></span> + </p> + </div> + </div> </div> </li> <li> @@ -137,45 +126,55 @@ <div class="campaign"> <h2>Recent Blog Posts</h2> <p> - 17 Jun: <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> <em>— Rob Weir</em><br/> - 10 Jun: <a href="https://blogs.apache.org/OOo/entry/when_will_openoffice_version_x">When will OpenOffice be released?</a> <em>— Rob Weir</em><br/> - 04 Jun: <a href="https://blogs.apache.org/OOo/entry/the_sidebar_new_and_improved">The Sidebar, New and Improved</a> <em>— Andre Fischer</em><br/> - 15 May: <a href="https://blogs.apache.org/OOo/entry/apache_openoffice_one_year_50">One Year, 50 Million Downloads</a> <em>— Rob Weir</em><br/> - </p> + <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> <em>— Rob 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> <em>— Rob 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> <em>— Andre Fischer</em><br/> + <em>15 May:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_one_year_50"> + One Year, 50 Million Downloads</a> <em>— Rob Weir</em><br/> + </p> <p style="text-align:right"><a href="http://blogs.apache.org/OOo/">All Posts</a></p> </div> - - <div class="campaign"> + + <div class="campaign"> <h2>Over 50 million downloads of AOO 3.4</h2> - <p><em>14 May 2013:</em> Apache OpenOffice 3.4 was released in May 2012. Downloads now exceed 50 million. We invite you to take a look at + <p><em>14 May 2013:</em> + Apache OpenOffice 3.4 was released in May 2012. Downloads now exceed 50 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> - -<div class="campaign"> + </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. <strong>How can software for free, developed by volunteers, be any good?</strong> - <a href="http://www.openoffice.org/why/why_volunteers.html">Read on for an answer...</a></p> -</div> + <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="http://www.openoffice.org/why/why_volunteers.html">Read on for an answer...</a></p> + </div> -<div class="campaign"> + <div class="campaign"> <h2>Apache OpenOffice given two Bossie Awards!</h2> - <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>. - Read <a href="https://plus.google.com/u/0/b/114598373874764163668/114598373874764163668/posts/guW3vcCvFFy">more on our Google+ page</a>.</p> + <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> - -<div class="campaign"> + <div class="campaign"> <h2><a href="/news/">More OpenOffice News...</a></h2> </div> -<!-- <div id="SupportedAndSupporters"> +<!-- + <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"