incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r1160040 - in /incubator/ooo/site/trunk: content/openofficeorg/ content/openofficeorg/css/ content/openofficeorg/images/ templates/
Date Sun, 21 Aug 2011 19:30:06 GMT
Author: wave
Date: Sun Aug 21 19:30:06 2011
New Revision: 1160040

URL: http://svn.apache.org/viewvc?rev=1160040&view=rev
Log:
Updates to the website skeleton. CSS merged. Header and footer changes. Added Terms and Contact
pages linked from footer.

Added:
    incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext   (with props)
    incubator/ooo/site/trunk/content/openofficeorg/images/feather-small.gif   (with props)
    incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext   (with props)
Removed:
    incubator/ooo/site/trunk/content/openofficeorg/css/ooohtml.css
Modified:
    incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css
    incubator/ooo/site/trunk/templates/skeleton.html

Added: incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext?rev=1160040&view=auto
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext (added)
+++ incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext Sun Aug 21 19:30:06 2011
@@ -0,0 +1,33 @@
+Title: Contact Us
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+For any questions, comments, or concerns about this project or website please contact the
project on the developer mailing list:
+
+  - [ooo-dev@incubator.apache.org][1].
+
+For private or legal matters, please contact the Podling Project Management Committee (PPMC):
+
+  - [ooo-private@incubator.apache.org][2].
+
+For security issues, please contact the private security list:
+
+  - [ooo-security@incubator.apache.org][3].
+
+  [1]:  mailto:ooo-dev@incubator.apache.org
+  [2]:  mailto:ooo-private@incubator.apache.org
+  [3]:  mailto:ooo-security@incubator.apache.org

Propchange: incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css?rev=1160040&r1=1160039&r2=1160040&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css Sun Aug 21 19:30:06 2011
@@ -22,13 +22,36 @@ body {
 }
 
 #banner {
+  height: 150px;
   padding: 0 0 0 0;
   color: black;
   font-family: Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
-  font-size:18pt;
+  font-size:16pt;
   vertical-align: middle;
 }
 
+#bannerright {
+  text-align: right;
+  float: right;
+  padding: 34pt 36pt 26pt 36pt;
+}
+
+#bannercenter {
+  padding: 46pt 2pt 50pt 2pt;
+  float: center;
+  color: #107EC0;
+}
+
+#bannerleft {
+  text-align: left;
+  float: left;
+}
+
+#bannerleft a:hover {
+ color: #107EC0;
+ background-color: white;
+}
+
 a {
   color: #107EC0;
 }
@@ -39,7 +62,7 @@ a:visited {
 
 a:hover {
  color: #107EC0;
- background-color: #e6ebed;
+ text-decoration:underline;
 }
 
 a img { border: none; }
@@ -50,13 +73,16 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 #content {
-  margin: 0 150px 20px 250px;
+  margin: 0 50px 20px 50px;
   padding: 0 8px 40px;
   color: #333;
+  overflow: auto;
+  width: 95%
 }
 
 #content h1,h2,h3,h4,h5,h6 {
   font-weight: normal;
+  text-transform:none;
   margin: 10px 0 15px;
   padding: 5px 0;
 }
@@ -70,7 +96,6 @@ h1,h2,h3,h4,h5,h6 {
 #content h2 {
   font-size: 1.2em;
   margin-top: 2em;
-  border-bottom: 1px solid #a3afb6;
 }
 
 #content h3,h4,h5,h6 {
@@ -83,6 +108,46 @@ h1,h2,h3,h4,h5,h6 {
   margin-bottom: 0.5em;
 }
 
+#contenta {
+  margin: 0 150px 20px 250px;
+  padding: 0 8px 40px;
+  color: #333;
+}
+
+#contenta h1,h2,h3,h4,h5,h6 {
+  font-weight: normal;
+  margin: 10px 0 15px;
+  padding: 5px 0;
+}
+
+#contenta h1 {
+  font-size: 1.4em;
+  padding: 15px;
+  border-top: 1px solid #a3afb6;
+}
+
+#contenta h2 {
+  font-size: 1.2em;
+  margin-top: 2em;
+  border-bottom: 1px solid #a3afb6;
+}
+
+#contenta h3,h4,h5,h6 {
+  border-bottom: none;
+  font-size: 1em;
+  margin-bottom: 0;
+}
+
+#contenta li {
+  margin-bottom: 0.5em;
+}
+
+#contenta a:hover {
+ color: #107EC0;
+ text-decoration:underline;
+ background-color: #e6ebed;
+}
+
 table {
   border-collapse:collapse;
   margin: auto;
@@ -129,6 +194,58 @@ td {
   border-radius: 10px;
 }
 
+#sidenav {
+  border: 1px solid #e6ebed;
+  border-left: none;
+  -moz-border-radius: 0 10px 10px 0;
+  border-radius: 0 10px 10px 0;
+  font-size: 0.9em;
+  color: #003;
+  float: left;
+  padding: 15px 15px 5px 25px;
+  width: 180px;
+  background: none repeat scroll 0 0 #f5f8fa;
+  margin: 0 0 20px 0;
+}
+
+#sidenav img {
+  padding-bottom: 15px;
+  margin-left: auto;
+  margin-right: auto;
+  display: block;
+}
+
+#sidenav h1 {
+  color: #000;
+  font-size: 1em;
+  padding: 0;
+  margin-top: 0.8em;
+  margin-bottom: 0;
+  border-bottom: 1px solid #a3afb6;
+}
+
+#sidenav ul {
+  margin: 0 0;
+  padding: 0;
+  list-style: none;
+}
+
+#sidenav li {
+  border-bottom: 1px solid #e6ebed; 
+  margin: 0.2em 0;
+  padding: 0;
+}
+
+#sidenav li a {
+  margin: 0;
+  text-decoration:none;
+}
+
+#sidenav li a:hover {
+  color: #193240;
+  background: none;
+}
+
 #navigation {
   border: 1px solid #e6ebed;
   border-left: none;
@@ -177,17 +294,35 @@ td {
 }
 
 #navigation li a:hover {
-  color: #193240;
-  background: none;
+ color: #107EC0;
+ background-color: #e6ebed;
 }
 
-#footer {
-  margin: 20px 150px 20px 250px;
-  border-top: 1px solid #ccc;
+#footera {
+  margin: 20px 0px 0px 0px;
+  padding: 8px 0px 12px 0px;
+  border-top: 2px solid #ccc;
   color:#666;
   font-size: 0.8em;
   padding: 0 8px;
-  text-align: center;
+  text-align: left;
+  overflow: auto;
+  width: 98%
+}
+
+#copyrighta {
+  float: left;
+}
+
+#copyrighta p {
+  padding-left: 20px;
+}
+
+#poweredby {
+  float: right;
+  text-align: right;
+  width: 210px;
+  height: 90px;
 }
 
 #asf-logo {

Added: incubator/ooo/site/trunk/content/openofficeorg/images/feather-small.gif
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/images/feather-small.gif?rev=1160040&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ooo/site/trunk/content/openofficeorg/images/feather-small.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext?rev=1160040&view=auto
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext (added)
+++ incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext Sun Aug 21 19:30:06 2011
@@ -0,0 +1,75 @@
+Title:
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+Terms of Use for Apache Incubator project openoffice.org web site.
+
+1. INTRODUCTION. This Site and its contents are made available by Apache Software Foundation,
incubator project OpenOffice.org podling project management committee (AOO-PPMC). These Terms
of Use apply to everyone who Uses this Site (as defined below), or who participates in any
projects hosted on this Site. PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR
PARTICIPATING IN ANY PROJECTS, YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM.
IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY
PROJECTS HOSTED ON THIS SITE.
+
+2. DEFINITIONS. As used here: 
+a. "Host" means AOO-PPMC. 
+b. "Materials" means source code, code samples, object code, technical materials, documentation
, discussion thread postings, weblogs, wikis, data, and any other content, information or
technology available on the Site. 
+c. "Project" means a project hosted on the Site. 
+d. "Site" means the collection of web pages that can be accessed via this website, as well
as any successor web pages or other technology as may be designated by the Host. 
+e. "Submissions" means any Materials submitted to the Site, including all Projects. 
+f. "Terms" means these Terms of Use. 
+g. "Use" and its variants are meant in their broadest sense, including, but not limited to,
the acts of using, accessing, receiving, browsing, downloading from, and uploading to. A "User"
is a person or entity who Uses the Site. 
+h. "You" means you personally, as well as the person or entity on whose behalf you are Using
the Site.
+
+3. ACCESS TO THE SITE AND THINGS YOU FIND HERE. This section refers to the Materials found
on the Site, as defined above. 
+a. Other Licenses/Terms. Some of the Materials may be accompanied by their own licenses or
terms of use. With respect to Your rights in and obligations regarding such Materials, and
to the extent there is a conflict, those licenses or terms of use take precedence over these
Terms, and you agree to be bound accordingly. With respect to any other matters, including
but not limited to Your Use of this Site, submission of Materials hereto, and obligations
to the Host, these Terms take precedence over any conflicting terms.
+
+b. Use at Your Own Risk. You understand that the Host does not pre-screen Materials, and
You agree to assume all risks in Using them. These risks include, but are not limited to,
errors, viruses, worms, time-limited software that expires without notice, and the possibility
that the Materials infringe or misappropriate the intellectual property rights of others.
You agree to assume all such risks.
+
+c. Don't Blame the Messenger. You understand that Materials may contain the opinions of others
and You do not hold the Host responsible for such opinions.
+
+d. Copyright Infringement. If You believe that any Materials infringe Your copyrights, please
follow the procedure set forth at Apache Software Foundation legal affairs website: http://apache.org/legal/.
+
+e. Management of Materials and Access. You agree that the Host has sole discretion in deciding
whether to accept and post Materials, and that the Host may delete Materials for any reason
(including no reason) whatsoever. You understand that access to the Site may be limited for
technical reasons, that outages may occur, and that the Host has no obligation to store or
back up any Materials. You agree that the Host has the right to restrict or terminate, in
their sole discretion, access to the Site for any reason, including their belief that a User
has violated these Terms.
+
+f. Links to Other Sites. You understand that this Site may provide links to other sites or
content that is not hosted or managed by the Host, and you agree that the Host has no control
over, responsibility or liability whatsoever relating to any such sites or content, including
Your Use of them.
+
+4. THINGS YOU SUBMIT TO THE SITE. This Site offers many opportunities for You to contribute
Materials to the on this site. In addition to the other terms found here, the following terms
apply to any Submissions made by You ("Your Submissions").
+
+a. You Take Responsibility for Your Submissions. You warrant that You have all rights needed
to provide Your Submissions to the Host for posting to the Site in accordance with the Terms
and to grant the licenses set forth in sections 4.b and 4.c. You agree that You will make
all reasonable efforts to ensure that Your Submissions:  do not infringe, misappropriate or
violate the intellectual property rights or privacy interests of others; (ii) are not confidential
or trade secret information, or subject to anyone's privacy interests; (iii) are not inaccurate,
harmful, obscene, pornographic, defamatory, racist, or otherwise objectionable to a reasonable
User; and (iv) do not violate any law, ordinance, or regulation of any country, state or locality.
YOU AGREE THAT YOU, AND NOT THE HOST, ARE FULLY RESPONSIBLE FOR YOUR SUBMISSIONS AND THAT
YOU, AND NOT THE HOST, ARE LIABLE FOR ANY AND ALL CLAIMS ARISING OUT OF THEM.
+
+b. Source Code Submissions. You agree that any source code You contribute to a Project will
be submitted under, and subject to, the license posted for that Project. If no license is
posted, You agree that Your Submission will be governed by the Apache License, Version 2.0,
which terms can be found at http://opensource.org/licenses/apache2.0.php. You acknowledge
that You are responsible for including all applicable copyright notices and licenses with
Your Submissions, and that You assume the risks of failing to do so, including the potential
loss of Your rights to Your Submissions.
+
+c. Other Submissions. (This Section 4.c applies to all Submissions other than source code
contributed to a Project, which is governed by the preceding section.) The Host does not claim
ownership of Your Submissions. However, in order to fulfill the purposes of this Site, You
must give the Host and all Users the right to post, access, evaluate, discuss, and refine
Your Submissions. In legalese: You hereby grant to the Host and all Users a royalty-free,
perpetual, irrevocable, worldwide, non-exclusive and fully sub-licensable right and license
under Your intellectual property rights to reproduce, modify, adapt, publish, translate, create
derivative works from, distribute, perform, display and use Your Submissions (in whole or
part) and to incorporate them in other works in any form, media, or technology now known or
later developed, all subject to the obligation to retain any copyright notices included in
Your Submissions. All Users, the Host, and their sublicensees are respon
 sible for any modifications they make to the Submissions of others.
+
+d. Private Projects. With respect to a Project that is designated as "Private," the preceding
license for "Other Submissions" is limited to Users who have access to the Project, and such
rights may only be sublicensed to other Users with authorized access to the Project.
+
+e. Other Licenses/Terms. Some Projects are governed by their own terms regarding Submissions
and may require You to sign agreements (such as an Apache Software Foundation Individual Contributor
License Agreement) licensing Your rights in Your Submissions. In all such cases, and to the
extent there is a conflict, the terms of those Projects and agreements take precedence over
these Terms.
+
+f. Privacy. You consent to the collection, processing and storage by the Host of any personal
information provided by You in accordance with the terms of AOO-PPMC Privacy Policy, which
is available at http://incubator.apache.org/openoffice.org/privacy.html. You agree to comply
with all applicable laws and regulations, and the terms of Apache OpenOffice.org Privacy Policy,
with respect to any use by You of any personal information in connection with this Site.
+
+5. MISCELLANEOUS.
+
+a. Disclaimer of Warranties. YOUR USE OF THE SITE IS AT YOUR SOLE RISK. THE SITE, INCLUDING
ALL MATERIALS FOUND ON IT, IS PROVIDED ON AN "AS IS," "AS AVAILABLE" AND "WITH ALL FAULTS"
BASIS. THE HOST DISCLAIMS ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES
OF ANY KIND, INCLUDING ANY IMPLIED WARRANTY OR CONDITION OF MERCHANTABILITY, SATISFACTORY
QUALITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. THE HOST MAKES NO REPRESENTATIONS,
WARRANTIES, CONDITIONS OR GUARANTEES AS TO THE USEFULNESS QUALITY, SUITABILITY, TRUTH, ACCURACY
OR COMPLETENESS OF THE SITE. YOU AGREE TO ASSUME ALL RISK OF LOSS OR LIABILITY FOR THE USE
OF THIS SITE OR ANY MATERIALS ON IT.
+
+b. Limitation of Liability. TO THE FULLEST EXTENT PERMITTED BY LAW, THE HOST IS NOT LIABLE
FOR ANY DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR EXEMPLARY DAMAGES
(INCLUDING, WITHOUT LIMITATION, LOSS OF BUSINESS, REVENUE, PROFITS, GOODWILL, USE, DATA, ELECTRONICALLY
TRANSMITTED ORDERS, OR OTHER ECONOMIC ADVANTAGE) ARISING OUT OF OR IN CONNECTION WITH THE
SITE OR MATERIALS, EVEN IF THE HOST HAS PREVIOUSLY BEEN ADVISED OF, OR REASONABLY COULD HAVE
FORESEEN, THE POSSIBILITY OF SUCH DAMAGES, HOWEVER THEY ARISE, WHETHER IN BREACH OF CONTRACT
OR IN TORT (INCLUDING NEGLIGENCE). TO THE EXTENT THAT ANY JURISDICTION DOES NOT ALLOW THE
EXCLUSION OR LIMITATION OF DIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, PORTIONS OF THE ABOVE
LIMITATION OR EXCLUSION MAY NOT APPLY.
+
+c. Trademarks. All logos and trademarks contained on this Site are and remain the property
of their respective owners. No licenses or other rights in or to such logos and/or trademarks
are granted to You by these Terms.
+
+d. Changes to Terms. These Terms may be changed or updated by the Host without notice.
+
+e. Export Compliance. You agree that U.S. export control laws and other applicable export
and import laws govern your Submissions and use of the Site, Materials and Submissions, including
technical data; additional information can be found on http://apache.org/dev/crypto.html.
You agree that neither the Materials and Submissions nor any direct product thereof will be
exported, directly, or indirectly, in violation of these laws, or will be used for any purpose
prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons
proliferation.
+
+f. Governing Law. These Terms of Use are governed by the substantive and procedural laws
of Delaware.
+
+g. General. You agree that these Terms of Use are the complete agreement for the Site, Materials
and Submissions, and these Terms of Use supersedes all prior or contemporaneous agreements
or representations. If any term of these Terms of Use is found to be invalid or unenforceable,
the remaining provisions will remain effective
+

Propchange: incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/skeleton.html?rev=1160040&r1=1160039&r2=1160040&view=diff
==============================================================================
--- incubator/ooo/site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/site/trunk/templates/skeleton.html Sun Aug 21 19:30:06 2011
@@ -19,44 +19,47 @@
     limitations under the License.
 -->
 
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 {% if header %}
-<link href="/openofficeorg/css/ooohtml.css" rel="stylesheet" type="text/css">
 {% autoescape off %}{{ header }}{% endautoescape %}{% else %}
 <title>{% block title %}{{ headers.title }}{% endblock %}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-{$ else %}
-<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 {% endif %}
 </head>
 
 <body>
   <div id="banner">
-    <img id="logo" style="vertical-align:middle" alt="Apache OpenOffice.org (Incubating)"

-	 src="/openofficeorg/images/ooo-logo.png"/>
-   <span style="vertical-align:middle;">&nbsp;|&nbsp;The Free and Open Productivity
Suite</span>
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and
Open Productivity Suite</div>
   </div>
-  
   {% if sidenav %}
-  <div id="navigation">
+  <div id="sidenav">
     {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
   </div>
-  {% endif %}
-
+  <div id="contenta">
+  {% else %}
   <div id="content">
+  {% endif %}
     {% block title %}{% if headers.title %}<h1 class="title">{{ headers.title }}</h1>{%
endif %}{% endblock %}
     {% block content %}{{ content|markdown }}{% endblock %}
   </div>
 
-  <div id="footer">
-    <div class="copyright">
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered
by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
       <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Copyright &copy; 2011 The Apache Software Foundation. |
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/license.html">License</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache
Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
       </p>
     </div>
   </div>



Mime
View raw message