Author: buildbot
Date: Sun Jul 13 23:56:12 2014
New Revision: 916119
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/marketing/art/galleries/logos/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jul 13 23:56:12 2014
@@ -1 +1 @@
-1610324
+1610325
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Jul 13 23:56:12 2014
@@ -1 +1 @@
-1610324
+1610325
Modified:
websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html
==============================================================================
---
websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html
(original)
+++
websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html
Sun Jul 13 23:56:12 2014
@@ -51,6 +51,13 @@
table {
width : 100%;
}
+ /* <![CDATA[ */
+ /*-------------------- Exceptions on standard css -----------------------*/
+ /* @import "../styles.css"; */
+ /* @import "../exceptions.css"; */
+ h3 { font-style: italic; font-size: 1.1em; text-decoration: underline;
margin-bottom: 0.5em; }
+ h4, h5, h6 { font-weight: bold; }
+ /* ]]> */
</style>
<!--#include virtual="/google-analytics.js" -->
@@ -72,59 +79,38 @@
<div class="back_home">
<a href="/art/"></a>
</div>
- <table>
- <tbody><tr>
- <td class="top_left">
- <table>
- <tbody><tr>
- <td style="width: 0px;">
- <a
href="/art/index.html">
-
- </a>
- </td>
- <td>
- <h2>OpenOffice.org
Official Logo</h2>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- This is the official
OpenOffice.org logo to be used as
-references to both the product and the open source community behind the
+
+
+<h2> Apache OpenOffice Logo Items </h2>
+
+
+<h3>The Apache OpenOffice Logo</h3>
+<p>
+This is the official Apache OpenOffice logo to be used as a
+reference to both the product and the open source community behind the
product.
<br>
-In order to protect the brand OpenOffice.org, the logo is not licensed under
an open source license. As it is trademarked you are allowed to use it, if the
OpenOffice.org brand is used to refer to our product and our community. If you
wish to use the OpenOffice.org logo please follow the <a
href="http://about.openoffice.org/index.html#logo";> easy steps <a/> for
requesting permission. Furthermore the
- <a
href="http://wiki.services.openoffice.org/wiki/Logo_Usage_Guidelines";>OpenOffice.org
Logo Usage Guidelines
- </a>will enable you to use the
OpenOffice.org logo properly.
- <br>
- OpenOffice.org and the
OpenOffice.org logo are trademarks or registered trademarks of Oracle and/or
its affiliates.
- <br>
- You can download the
OpenOffice.org logo as <a
href="<http://www.openoffice.org/trademark/logo_color.svg>"> SVG </a> or <a
href="http://ui.openoffice.org/VisualDesign/gifs/Logos/OpenOffice_Logo_cmyk.eps";>
EPS </a>
- </td>
- </tr>
- </tbody></table>
-
-
- </td>
- <td style="width: 120px;" class="top_center">
- <table>
- <tbody><tr>
-
- </tr>
- <tr>
-
- </tr>
- </tbody></table>
- </td>
- </tr>
- </tbody></table>
- <br>
- <a href=""><img src="index_files/logo_color.png" title=""
style="border-style: none;" alt=""></a>
+In order to protect the brand OpenOffice, the logo is not licensed under an
open source license. As it is trademarked you are allowed to use it, if the
OpenOffice logo is used to refer to our product and our community. If you wish
to use the OpenOffice logo please follow the <a
href="http://about.openoffice.org/index.html#logo";> easy steps <a/> for
requesting permission. Furthermore the
+<a
href="http://wiki.services.openoffice.org/wiki/Logo_Usage_Guidelines";>OpenOffice.org
Logo Usage Guidelines
+</a>will enable you to use the OpenOffice.org logo properly.
+<br>
+OpenOffice.org, older OpenOffice.org logos, and the Apache OpenOffice logo are
trademarks or registered trademarks of the Apache Software Foundation.
-<img alt="refreshed logo"
src="http://www.openoffice.org/marketing/art/galleries/logos/main/aoo4-main-tm-logo-rgb.png";
align="middle">
+<br>
+You can download the Apache OpenOffice logo as <a
href="<http://www.openoffice.org/trademark/logo_color.svg>"> SVG </a> or <a
href="http://ui.openoffice.org/VisualDesign/gifs/Logos/OpenOffice_Logo_cmyk.eps";>
EPS </a>
+</p>
+<p>
+ <a href=""><img src="index_files/logo_color.png" title=""
style="border-style: none;" alt=""></a>
+<img alt="refreshed logo"
src="http://www.openoffice.org/marketing/art/galleries/logos/main/aoo4-main-tm-logo-rgb.png";
align="middle">
+<h3>Apache OpenOffice Logo Pins</h3>
+<p> Apache OpenOffice 1" pins displayed in the picture below can be reordered
from the <a
href="http://www.wackybuttons.com/preview.php?display=show&dc1=3718704";> link
provided here </a>if needed. <br>
+<em>(NOTE)</em> This is only one of many merchants that can provide this kind
of service and is not specifically endorsed
+by the Apache Software Foundation.<p>
+<img src="AOO_Pins.jpeg" alt="logo pins in gull formation" hieght="447px"
width="794px"></img>
<br>
</div>
![http://www.openoffice.org/marketing/art/galleries/logos/main/aoo4-main-tm-logo-rgb.png"](http://www.openoffice.org/marketing/art/galleries/logos/main/aoo4-main-tm-logo-rgb.png"){kind=link}