You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2011/08/09 02:24:30 UTC
svn commit: r1155168 - in /incubator/ooo/site/trunk/content/openofficeorg:
css/ooo.css download/styles.css www/index.html www/index.style
Author: wave
Date: Tue Aug 9 00:24:30 2011
New Revision: 1155168
URL: http://svn.apache.org/viewvc?rev=1155168&view=rev
Log:
Adjusted www/index.html down to body content. Added www/index.style to include special css and javascript that is unique to the page. This is an interim solution.
Added:
incubator/ooo/site/trunk/content/openofficeorg/www/index.style
Modified:
incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css
incubator/ooo/site/trunk/content/openofficeorg/download/styles.css
incubator/ooo/site/trunk/content/openofficeorg/www/index.html
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=1155168&r1=1155167&r2=1155168&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css Tue Aug 9 00:24:30 2011
@@ -23,6 +23,10 @@ body {
#banner {
padding: 0 0 0 0;
+ color: black;
+ font-family: Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
+ font-size:18pt;
+ vertical-align: middle;
}
a {
Modified: incubator/ooo/site/trunk/content/openofficeorg/download/styles.css
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/download/styles.css?rev=1155168&r1=1155167&r2=1155168&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/download/styles.css (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/download/styles.css Tue Aug 9 00:24:30 2011
@@ -733,7 +733,7 @@ th { background: #EEE; color: #000; }
/*--------------------------- Top Menu / Navigation ---------------------------*/
#subheader { margin: 0 0 13px 0; width: 100%; min-width: 750px; height: 25px; background: url(/branding/images/header.png) no-repeat left -125px #CFE7F5; }
-#navigation { height: 25px; float: right; }
+/*#navigation { height: 25px; float: right; }*/
.navigation { font-size: .8em; }
.navigation ul { margin: 0 8px 0 0; padding: 0; }
.navigation li { margin: 0; padding: 0; list-style: none; display: inline; }
@@ -751,7 +751,7 @@ th { background: #EEE; color: #000; }
/*--------------------------- Content (informational body) Layout ---------------------------*/
-#content { width: 100%; padding: 10px 0 160px 0; clear: both; display: block; font-size: 1em; background:#FFF; }
+/*#content { width: 100%; padding: 10px 0 160px 0; clear: both; display: block; font-size: 1em; background:#FFF; }*/
#main { width: 100%; margin: 0; table-layout: auto;}
#bodycol { margin: 0; padding: 0 13px 0 0; height: auto; }
#bodycol li { margin: 10px 0 10px 30px; }
@@ -865,7 +865,6 @@ div.campaign p { line-height: 140%; font
/*--------------------------- Formerly tigris.css ---------------------------*/
-#banner { background: #234; }
#broadcastmsg { background: 3px 6px #ecf4fe; border: 1px solid #aaa; border-left: 1px solid #999; border-right: 1px solid #999; margin: .75em 0; }
#helpbox { margin-bottom: 1em; padding: 6px 11px 1em 6px; }
#helpbox p { padding: 4px 0 4px 0; }
Modified: incubator/ooo/site/trunk/content/openofficeorg/www/index.html
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/www/index.html?rev=1155168&r1=1155167&r2=1155168&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/www/index.html (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/www/index.html Tue Aug 9 00:24:30 2011
@@ -1,69 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
- <!--
- <meta name="verify-v1" content="7/WnCcvax+gnJU1u0eXYQOYtS6zlmE13fsCzq+qnlUs="/>
- -->
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>OpenOffice.org - The Free and Open Productivity Suite</title>
- <link rel="stylesheet" type="text/css" href="/branding/css/home.css" media="screen"/>
- <script type="text/javascript" src="http://download.openoffice.org/globalvars.js"></script>
- <script type="text/javascript" src="http://download.openoffice.org/languages.js"></script>
- <script type="text/javascript" src="http://download.openoffice.org/download.js"></script>
- <script type="text/javascript" src="http://download.openoffice.org/download_bouncer.js"></script>
- <script type="text/javascript" src="http://download.openoffice.org/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><a href='" + LINK + "' title='" + LINK + "'>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)</a></p>";
- } else {
- newHTML += "<h3><a href='"+ LINK + "' title='" + LINK + "'>Download now!</a></h3>"
- + "<p><a href='" + LINK + "' title='" + LINK + "'>Get OpenOffice.org from your " + getLanguage() + " Native Language community</a></p>";
- }
-
- newHTML += "</div><p class='options'><a href='http://download.openoffice.org/other.html'"
- + "title='Get all platforms and languages, non-JRE versions, language packs to download'><b>Searching for another version?</b></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='http://download.openoffice.org/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'>Order CD-ROM</a> | "
- + "<a href='http://distribution.openoffice.org/p2p/' title='P2P downloads'>P2P downloads</a></p></div>";
- downloadCont.innerHTML = newHTML;
- }
-
- function hideDownload() {
- var downloadCont = document.getElementById("action-download-extra");
- var newHTML = "";
- downloadCont.innerHTML = newHTML;
- }
- //-->
- </script>
-</head>
-
-<body>
-
<div id="actionstatements">
<ul>
<li><div class="action-info"><div class="action-text action-link">
@@ -137,6 +71,3 @@
</div>
-->
</div>
-
-</body>
-</html>
Added: incubator/ooo/site/trunk/content/openofficeorg/www/index.style
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/www/index.style?rev=1155168&view=auto
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/www/index.style (added)
+++ incubator/ooo/site/trunk/content/openofficeorg/www/index.style Tue Aug 9 00:24:30 2011
@@ -0,0 +1,55 @@
+ <link rel="stylesheet" type="text/css" href="/openofficeorg/css/ooo.css"/>
+ <link rel="stylesheet" type="text/css" href="/openofficeorg/www/product/product.css" media="screen"/>
+ <script type="text/javascript" src="http://download.openoffice.org/globalvars.js"></script>
+ <script type="text/javascript" src="http://download.openoffice.org/languages.js"></script>
+ <script type="text/javascript" src="http://download.openoffice.org/download.js"></script>
+ <script type="text/javascript" src="http://download.openoffice.org/download_bouncer.js"></script>
+ <script type="text/javascript" src="http://download.openoffice.org/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><a href='" + LINK + "' title='" + LINK + "'>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)</a></p>";
+ } else {
+ newHTML += "<h3><a href='"+ LINK + "' title='" + LINK + "'>Download now!</a></h3>"
+ + "<p><a href='" + LINK + "' title='" + LINK + "'>Get OpenOffice.org from your " + getLanguage() + " Native Language community</a></p>";
+ }
+
+ newHTML += "</div><p class='options'><a href='http://download.openoffice.org/other.html'"
+ + "title='Get all platforms and languages, non-JRE versions, language packs to download'><b>Searching for another version?</b></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='http://download.openoffice.org/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'>Order CD-ROM</a> | "
+ + "<a href='http://distribution.openoffice.org/p2p/' title='P2P downloads'>P2P downloads</a></p></div>";
+ downloadCont.innerHTML = newHTML;
+ }
+
+ function hideDownload() {
+ var downloadCont = document.getElementById("action-download-extra");
+ var newHTML = "";
+ downloadCont.innerHTML = newHTML;
+ }
+ //-->
+ </script>