You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ho...@apache.org on 2011/12/22 21:10:53 UTC
svn commit: r800826 - in /websites/production/ooo-site: ./
content/license.html content/pt-br/index.html
Author: homembit
Date: Thu Dec 22 20:10:53 2011
New Revision: 800826
Log:
Updating the page with the current status of the project and the download links to the last version of OOo available.
Removed all BrOffice references, that are now bound to LibreOffice.
Modified:
websites/production/ooo-site/ (props changed)
websites/production/ooo-site/content/license.html
websites/production/ooo-site/content/pt-br/index.html
Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 20:10:53 2011
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-800813
+/websites/staging/ooo-site/trunk:797592-800824
Modified: websites/production/ooo-site/content/license.html
==============================================================================
--- websites/production/ooo-site/content/license.html (original)
+++ websites/production/ooo-site/content/license.html Thu Dec 22 20:10:53 2011
@@ -78,15 +78,15 @@ See <a href="#below">below</a> for detai
</ul>
<p>You can freely modify, extend, and improve the OpenOffice.org source code. The LGPL requires that all changes must be made available if published. For
-more information on the LGPL, please also visit the Free Software Foundation's FAQ: <a href="http://www.gnu.org/licenses/gpl-faq.html" target="_blank">
-http://www.gnu.org/licenses/gpl-faq.html</a>.</p>
+more information on the LGPL, please also visit the : <a href="http://www.gnu.org/licenses/gpl-faq.html" target="_blank">
+Free Software Foundation's FAQ</a>.</p>
<p class="Header"><a id="below" name="below"></a>Other Works</p>
<p>The preference was always for contributions of editable work. But in those cases where editable material was difficult to obtain, there were several
options; all presumed that the developer held copyright in the work:</p>
<ul>
- <li>Developers would have signed a Contributor Agreement, which covers all work (and not just code) contributed to OpenOffice.org by you;</li>
+ <li>Developers would have signed a Contributor Agreement, which covers all work (and not just code) contributed to OpenOffice.org;</li>
<li>In countries where laws allow it, the developer could make it public domain by declaring as much in a signed document; or</li>
<li><span class="Header">developers could use the Creative Commons Attribution License (<a href="http://creativecommons.org/licenses/by-nd/2.5/">
"Attribution-NoDerivs 2.5"</a>). SUN/Oracle only accepted work under this license that was non-editable and for which there was no editable version that
Modified: websites/production/ooo-site/content/pt-br/index.html
==============================================================================
--- websites/production/ooo-site/content/pt-br/index.html (original)
+++ websites/production/ooo-site/content/pt-br/index.html Thu Dec 22 20:10:53 2011
@@ -4,8 +4,79 @@
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>OpenOffice.org - Projeto Brasil</title>
+<link href="/css/ooo.css" rel="stylesheet" type="text/css">
+
+
+ <meta name="verify-v1" content="7/WnCcvax+gnJU1u0eXYQOYtS6zlmE13fsCzq+qnlUs="/>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>OpenOffice.org</title>
+ <script type="text/javascript" src="download/globalvars.js"></script>
+ <script type="text/javascript" src="download/languages.js"></script>
+
+ <script type="text/javascript" src="download/download.js"></script>
+ <script type="text/javascript" src="download/download_bouncer.js"></script>
+ <script type="text/javascript" src="download/download_mirrorbrain.js"></script>
+ <script type="text/javascript">
+ <!--
+ var SHOWDOWNLOAD = false;
+
+ function toggleDownload() {
+ if (!SHOWDOWNLOAD) {
+ SHOWDOWNLOAD = true;
+ showDownload();
+ } else {
+ SHOWDOWNLOAD = false;
+ hideDownload();
+ }
+ }
+
+ function showDownload() {
+ var LINK = getLink( VERSION, MIRROR, SCHEMA );
+ var downloadCont = document.getElementById("action-download-extra");
+ var newHTML = "<div id=\"buttonwrap\"><div id=\"downloadbutton\" onclick=\"openItem('optionitem1','" + LINK + "'); return false;\">";
+
+ if ( hasMirrorLink() ) {
+ newHTML += "<h3><a href=\"" + LINK + "\" title=\"" + LINK + "\">Download now!</a></h3>"
+ + "<p>Start downloading OpenOffice.org " + VERSION + " for " + getPlatform() + " in "
+ + getLanguage() + "<br/>(Java Runtime Environment (JRE) included for all OS versions except Linux 32/64-bit Debian and Mac OS)</p>";
+ } else {
+ newHTML += "<h3><a href=\""+ LINK + "\" title=\"" + LINK + "\">Download now!</a></h3><p>Get OpenOffice.org from your "
+ + getLanguage() + " Native Language community</p>";
+
+ }
+
+ newHTML += "</div><p class=\"options\"><a href=\"/download/other.html\""
+ + "title=\"Get all platforms and languages, non-JRE versions, language packs to download\" onclick=\"document.location = this.href; return false;\">"
+ + "Get all platforms and languages</a> | "
+ + "<a href=\"http://development.openoffice.org/releases/" + VERSION + ".html\""
+ + "title=\"What is new, what has been improved in OOo " + VERSION + "?\">Release Notes</a> | "
+ + "<a href=\"/download/md5sums/" + VERSION + "_md5sums.txt\" title=\"MD5 checksums for OOo " + VERSION
+ + "\">MD5 checksums</a> | " + "<a href=\"http://distribution.openoffice.org/cdrom/iso_download.html\" title=\"ISO images\">ISO images</a> | "
+ + "<a href=\"http://distribution.openoffice.org/cdrom/index.html#cdrom\" title=\"Order CD-ROM\""
+ + "onclick=\"document.location = this.href; return false;\" >order CD-ROM</a> | "
+ + "<a href=\"http://distribution.openoffice.org/p2p/\" title=\"P2P downloads\""
+ + "onclick=\"document.location = this.href; return false;\" >P2P downloads</a></p></div>";
+ downloadCont.innerHTML = newHTML;
+ }
+
+ function hideDownload() {
+ var downloadCont = document.getElementById("action-download-extra");
+ var newHTML = "";
+ downloadCont.innerHTML = newHTML;
+ }
+ //-->
+ </script>
+ <style type="text/css">
+ /* <![CDATA[ */
+ /*-------------------- Exceptions on standard css -----------------------*/
+ @import "home.css";
+ @import "styles.css";
+ @import "exceptions.css";
+ /* ]]> */
+ </style>
+ <link rel="stylesheet" type="text/css" href="/product/product.css" media="screen"/>
+
+
</head>
@@ -39,36 +110,52 @@
-<style type="text/css">
- /* <![CDATA[ */
- @import "estilo.css";
- /* ]]> */
-</style>
-<div class="area">
- <div class="seagulf"></div>
- <div class="broo_txt_eng">
- <div><a href="http://www.broffice.org" target="_blank">BrOffice.org</a> is the product, the community
- and a NGO for OpenOffice.org development
- in Brazil. You are welcome to <a href="http://www.broffice.org" target="_blank">our website</a> during this download or anytime you want.
- Come <a href="http://www.broffice.org" target="_blank">visit us</a> for news, events, forums,
- support and much more.</div>
- </div>
+ <div id="content">
+
+
+
-<div id="broo_txt_pt">
- <p><a href="http://www.broffice.org/download" target="_blank"><img src="imagens/botao_baixeja.png" border="0" /></a></p>
- <p class="texto"><span class="txt_verde_logo">Br</span><span class="txt_azul_logo">Office.org</span> é o nome oficial
- do Open<span class="txt_azul_logo">Office.org</span> no Brasil.</p>
- <p class="texto">Além do produto, também é a comunidade e a ONG que apóia o projeto no nosso país.</p>
+ <!-- commment added in the online CMS -->
+<div id="actionstatements">
+ <ul>
+ <li><div class="action-info"><div class="action-text action-link">
+ <p><b>O Projeto OpenOffice está de casa nova, e agora é um projeto incubado da Fundação Apache.</b><p>
+ <br>
+ <p><b>O primeiro release do Apache OpenOffice está planejado para o inÃcio de 2012.</b></p>
+ <br>
+ </div></div></li>
+
+ <li><hr/></li>
+
+ <li><div class="action-download"><div class="action-text action-expand"
+ onclick="if ( SHOWDOWNLOAD ) { this.className='action-text action-contract' } else { this.className='action-text action-expand' }">
+ <p><a href="/download" onclick="toggleDownload(); return false;">Clique aqui para baixar a última versão do OpenOffice.org</a></p>
+ </div>
+ <div id="action-download-extra"></div></div></li>
-<p class="texto">Para saber mais, <a href="http://www.broffice.org" target="_blank">visite-nos</a>!</p>
-<p><a href="http://www.broffice.org" target="_blank"><img src="imagens/bt_quero_visitar.gif" width="275" height="41" border="0" /></a></p>
+ <li><hr/></li>
+ </ul>
</div>
-<div class="broo_txt_trademark">
- <div align="right">OpenOffice.org in Brazil is called BrOffice.org by trademark issues.</div>
-</div>
+<div id="news">
+ <div class="campaign">
+ <h2>Blog do OpenOffice.org na Apache</h2>
+ <p>Mantenha-se informado sobre os últimos desenvolvimentos do Apache OpenOffice no
+ <a href="https://blogs.apache.org/OOo/">blog da incubadora do Apache OpenOffice.org.</a></p>
+ </div>
+
+ <div class="campaign">
+ <h2>OpenOffice.org entra na Incubadora da Apache</h2>
+ <p>Em 1 de Junho de 2011, a Oracle anunciou a doação do código fonte do OpenOffice.org's para a
+ <a href="http://www.marketwire.com/press-release/statements-on-openofficeorg-contribution-to-apache-nasdaq-orcl-1521400.htm">Incubadora da Fundação Apache.</a>
+ Um site preliminar de incubação do OpenOffice.org <a href="http://incubator.apache.org/">http://incubator.apache.org/</a> foi criado em 13 de Junho de 2011 para a transição.
+ Junte-se a nós nesta nova fase da vida do OpenOffice.org's se inscrevendo na <a href="http://incubator.apache.org/mailing-lists.html">lista de discussão de desenvolvimento</a>,
+ a lista onde está sendo planejado e realizado o desenvolvimento do OpenOffice.org no ambiente Apache. Suas contribuições serão bem vindas !<br />
+
+ Os downloads e o suporte ao OpenOffice.org continuarão disponÃveis através deste site durante a fase de transição. </p>
+ </div>
</div>