[Libreoffice-commits] .: Branch 'tdf-website' - 4 commits - css/style.css download/index.html download/index.php index.php Makefile template.php
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Jan 13 03:40:41 PST 2011
Makefile | 1
css/style.css | 2 -
download/index.html | 31 ++++++++++++++++++
download/index.php | 87 ----------------------------------------------------
index.php | 36 +--------------------
template.php | 12 ++-----
6 files changed, 39 insertions(+), 130 deletions(-)
New commits:
commit eb470e7cc3b56715eb990bafe88d448f156c0400
Merge: 42d9309... 622c224...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jan 13 11:39:30 2011 +0000
Merge more fixes
Conflicts:
download/index.php
commit 42d9309113478fa12f7f147d0db60a5b26921860
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jan 13 11:32:01 2011 +0000
more cleanup of downloads
diff --git a/Makefile b/Makefile
index aa5bfaf..5db4add 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
ALL_TARGETS = \
index.html\
- download/index.html\
lgpl/index.html\
foundation/index.html\
foundation/newindex.html\
diff --git a/download/index.html b/download/index.html
new file mode 100644
index 0000000..df21eae
--- /dev/null
+++ b/download/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+ <head>
+ <title>LibreOffice Productivity Suite - The Document Foundation</title>
+ <style type="text/css">
+ @import url(/css/blueprint/print.css) print;
+ @import url(/css/blueprint/screen.css) screen;
+ @import url(/css/tabs.css);
+ @import url(/css/style.css);
+ </style>
+ <link rel="shortcut icon" href="/favicon.ico">
+ <link rel="icon" href="/favicon.ico">
+ <meta name="google-site-verification" content="XSd_Fmsyv5scVsV3jHDZYiaNWS43w9BkmCacMtn_gU8">
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+ <meta name="language" content="en">
+ <meta name="Robots" content="index, follow">
+ <meta name="keywords" content="LibreOffice, The Document Foundation">
+ <meta name="description" content="The Document Foundation is an independent self-governing democratic Foundation created by leading members of the OpenOffice.org Community.">
+ </head>
+ <body>
+<h3>Downloading LibreOffice</h3>
+
+<p>
+This page is obsolete.
+You can download LibreOffice from the libreoffice.org download site which is at
+<a href="http://www.libreoffice.org/download/">http://www.libreoffice.org/download</a>.
+</p>
+
+ </body>
+</html>
+
diff --git a/template.php b/template.php
index b8635aa..bf95c76 100644
--- a/template.php
+++ b/template.php
@@ -12,7 +12,7 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
"contribute" => array("/contribution/", "Contribute"),
"supporters" => array("/supporters/", "Supporters") ,
"contact" => array("/contact/", "Contact") ,
- "faq" => array("/faq/", "FAQ")
+ "faq" => array("/faq/", "FAQ")
);
// tabs state. the all have the "container" value
// and the current one MUST have the "selected" value
@@ -24,8 +24,8 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
"supporters" => "container",
"contact" => "container",
"faq" => "container"
- );
-
+ );
+
$id = "summary";
foreach ($context as $c) {
if (array_key_exists ($c, $tabs)) {
@@ -151,5 +151,4 @@ $rightnavigation = <<<EOT
EOT;
-
?>
commit 4612b3f13da8aad4d0f5420ce9e3ac4ffd8b1e2b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jan 13 11:27:50 2011 +0000
remove the download tab, and re-direct to libreoffice.org/download
diff --git a/download/index.php b/download/index.php
deleted file mode 100644
index c35628e..0000000
--- a/download/index.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-require("../template.php");
-
-$urlbase=$download_binaries;
-
-$content = <<<EOT
-
-
-<div id="libreoffice">
-<script type="text/javascript" src="/scripts/photoshuffler.js"></script>
-
-<div id="right-download"><div id="screenshot-slide"><a href="/download/"><img id="screenshot-slide-image" src="/img/slides/scaled/LO_StartCenter_Small.png" alt="Download LibreOffice"></a></div></div>
-
-<h3>About LibreOffice</h3>
-
-<p>
-LibreOffice is a productivity suite that is compatible with other major
-office suites, and is available on a variety of platforms. It is free software
-and therefore free to download, use and distribute.
-</p>
-
-<h3>Download LibreOffice Release Candidate 3</h3>
-
-<p>
-The following software packages are intended to give you a first impression of what LibreOffice
-is. Currently we are in the process of combining the work of many contributors, and improving
-how to make the software available to our users.
-There are known issues, so please consider reading the <a href="#release-notes">release notes</a>
-below for a list of known issues being worked on, the most obvious being
-the incomplete language packaging situation.
-</p>
-
-<p>
-This release candidate is not intended for production use!
-</p>
-
-<div id="download-nav">
- <ul id="dlnav">
- <li class="dlnav-win32"><a href="$urlbase/3.3.0-rc3/win/x86/LibO_3.3.0rc3_Win_x86_install_multi.exe">Download and install this for the International version to be used on Microsoft Windows.</a></li>
- <li class="dlnav-linux32"><a href="$urlbase/3.3.0-rc3/rpm/x86/LibO_3.3.0rc3_Linux_x86_install-rpm_en-US.tar.gz">Download and install this for the English version to be used on various GNU/Linux 32-bit distributions.</a></li>
- <li class="dlnav-linux64"><a href="$urlbase/3.3.0-rc3/rpm/x86_64/LibO_3.3.0rc3_Linux_x86-64_install-rpm_en-US.tar.gz">Download and install this for the English version to be used on various GNU/Linux 64-bit distributions.</a></li>
- <li class="dlnav-mac"><a href="$urlbase/3.3.0-rc3/mac/x86/LibO_3.3.0rc3_MacOS_x86_install_en-US.dmg">Download and install this for the English version to be used on Apple MacOS X (x86).</a></li>
- <li class="dlnav-source"><a href="$download_source">Click here to download the tarball containing the source code.</a></li>
- </ul>
-
- <p>You can also <a href="http://tracker.documentfoundation.org:6969">download using BitTorrent</a>,
- or <a href="$urlbase/3.3.0-rc3">browse all the RC3 installation packages</a> to get unofficial
- Debian packages (<a href="$urlbase/3.3.0-rc3/deb/x86/LibO_3.3.0rc3_Linux_x86_install-deb_en-US.tar.gz">32-bit .debs</a>
- or <a href="$urlbase/3.3.0-rc3/deb/x86_64/LibO_3.3.0rc3_Linux_x86-64_install-deb_en-US.tar.gz">64-bit .debs</a>),
- <a href="$urlbase/3.3.0-rc3/mac/ppc/LibO_3.3.0rc3_MacOS_PPC_install_en-US.dmg">Apple MacOS X (PPC)</a>
- or language packs.</p>
-</div>
-
-<h3 id="release-notes">Release Notes</h3>
-<p>This release candidate is not intended for production use!</p>
-<p>There are a number of known issues being worked on:</p>
-<ul class="list-libreoffice">
-<li>The Windows build is an International build - you can choose the user interface language that
- is suitable for you. The help content is not included, but using an online version.
- Alternatively, there are separate helppacks available. Please browse <a href="$urlbase/3.3.0-rc3">the archives</a>
- to get the helppack pack you need for your platform.</li>
-<li>The Linux and MacOSX builds are English builds with the possibility to install language packs.
- Please browse <a href="$urlbase/3.3.0-rc3">the archives</a> to get the language pack you need
- for your platform.</li>
-<li>The LibreOffice branding and renaming is new and work in progress. You may still see old graphics,
- icons or websites. So please bear with us. This also applies to
- the BrOffice.org branding - applicable in Brazil.</li>
-<li>Filters for the legacy StarOffice binary formats may be missing.</li>
-<li>More detailed release notes are <a href="http://wiki.documentfoundation.org/Releases/3.3/RC3">available in our wiki.</a>
-</ul>
-
-<h3>Keeping Up With the Progress</h3>
-<p>
-To be informed about the latest updates and releases of LibreOffice,
-send an empty mail to <a
-href="mailto:announce+subscribe at documentfoundation.org">announce+subscribe at documentfoundation.org</a>.<br>
-To join our discussion mailing list, send an empty mail to <a
-href="mailto:discuss+subscribe at documentfoundation.org">discuss+subscribe at documentfoundation.org</a>.<br>
-More information are available on our <a href="/contact/">Contacts</a> page.
-</p>
-
-</div>
-EOT;
-
-print_page("Download", array("libreoffice", "summary"),
- "LibreOffice Productivity Suite", $content);
-?>
diff --git a/index.php b/index.php
index d2ab332..a48d1db 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,9 @@ $rightnavigation
<!-- <li><div>It is proud to be the home of LibreOffice, the next evolution of the world's leading free office suite.</div></li> -->
</ul>
-<p>The Document Foundation is proud to be the home of <a href="download">LibreOffice</a>, the next evolution of the world's leading free office suite.</p>
+<p>The Document Foundation is proud to be the home of <a
+href="http://www.libreoffice.org/download/">LibreOffice</a>,
+the next evolution of the world's leading free office suite.</p>
<h3>Want to meet us?</h3>
diff --git a/template.php b/template.php
index e51b915..b8635aa 100644
--- a/template.php
+++ b/template.php
@@ -8,7 +8,6 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
// - (optional) the id of the tab it is under, this is for subsections
$hnav = array( "summary" => array("/", "Welcome"),
"foundation" => array("/foundation", "Foundation"),
- "libreoffice" => array("/download/", "LibreOffice"),
"develop" => array("/develop/", "Develop"),
"contribute" => array("/contribution/", "Contribute"),
"supporters" => array("/supporters/", "Supporters") ,
@@ -20,7 +19,6 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
// this is all dependent on ths CSS used.
$tabs = array ( "summary" => "container",
"foundation" => "container",
- "libreoffice" => "container",
"develop" => "container",
"contribute" => "container",
"supporters" => "container",
@@ -137,7 +135,6 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
$freedesktop_name="libreoffice";
$freedesktop_cgit="http://cgit.freedesktop.org/$freedesktop_name";
-$download_binaries="http://download.documentfoundation.org/libreoffice/testing";
$download_source="http://download.documentfoundation.org/libreoffice/src/libreoffice-build-3.3.0.3.tar.gz";
$rightnavigation = <<<EOT
commit 622c2245cb39511bfaf3fa9560762cc2d69322cf
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jan 13 11:35:31 2011 +0000
remove obsolete news, and fix more download links
diff --git a/css/style.css b/css/style.css
index e5947b1..e7a4f85 100644
--- a/css/style.css
+++ b/css/style.css
@@ -83,7 +83,7 @@ div.pre {
#rnav li.rnav-birthday a {
height: 400px;
- width: 400px;
+ width: 400px;
background: url(/img/anniversary-small.png) no-repeat;
}
#rnav li.rnav-download a {
diff --git a/download/index.php b/download/index.php
index c35628e..100ccec 100644
--- a/download/index.php
+++ b/download/index.php
@@ -1,8 +1,6 @@
<?php
require("../template.php");
-$urlbase=$download_binaries;
-
$content = <<<EOT
@@ -11,6 +9,7 @@ $content = <<<EOT
<div id="right-download"><div id="screenshot-slide"><a href="/download/"><img id="screenshot-slide-image" src="/img/slides/scaled/LO_StartCenter_Small.png" alt="Download LibreOffice"></a></div></div>
+<<<<<<< HEAD
<h3>About LibreOffice</h3>
<p>
@@ -68,15 +67,14 @@ This release candidate is not intended for production use!
<li>Filters for the legacy StarOffice binary formats may be missing.</li>
<li>More detailed release notes are <a href="http://wiki.documentfoundation.org/Releases/3.3/RC3">available in our wiki.</a>
</ul>
+=======
+<h3>Downloading LibreOffice</h3>
+>>>>>>> remove the download tab, and re-direct to libreoffice.org/download
-<h3>Keeping Up With the Progress</h3>
<p>
-To be informed about the latest updates and releases of LibreOffice,
-send an empty mail to <a
-href="mailto:announce+subscribe at documentfoundation.org">announce+subscribe at documentfoundation.org</a>.<br>
-To join our discussion mailing list, send an empty mail to <a
-href="mailto:discuss+subscribe at documentfoundation.org">discuss+subscribe at documentfoundation.org</a>.<br>
-More information are available on our <a href="/contact/">Contacts</a> page.
+This page is obsolete.
+You can download LibreOffice from the libreoffice.org download site which is at
+<a href="http://www.libreoffice.org/download/">http://www.libreoffice.org/download</a>.
</p>
</div>
diff --git a/index.php b/index.php
index d2ab332..b25fdf8 100644
--- a/index.php
+++ b/index.php
@@ -17,44 +17,14 @@ $rightnavigation
<!-- <li><div>It is proud to be the home of LibreOffice, the next evolution of the world's leading free office suite.</div></li> -->
</ul>
-<p>The Document Foundation is proud to be the home of <a href="download">LibreOffice</a>, the next evolution of the world's leading free office suite.</p>
+<p>The Document Foundation is proud to be the home of <a
+href="http://www.libreoffice.org/download/">LibreOffice</a>,
+the next evolution of the world's leading free office suite.</p>
<h3>Want to meet us?</h3>
<p>See the <a href="http://wiki.documentfoundation.org/Events">list of events</a> where you can meet The Document Foundation and members of the Community.</p>
-<h3>News</h3>
-
-<p>2010-12-23 <b>Release Candidate 2 available</b><br>
-LibreOffice 3.3 Release Candidate 2 is available. Download it <a href="download/">from here</a>.</p>
-
-<p>2010-12-20 <b>TDF joins Open Invention Network</b><br>
-The Document Foundation joins the Open Invention Network. <a href="http://www.documentfoundation.org/lists/announce/msg00021.html">Read our press release</a>.</p>
-
-<p>2010-12-06 <b>LibreOffice development extends to Brazil</b><br>
-The Document Foundation welcomes the new BrOffice Centre of Excellence for Free Software,
-a software development project recently announced by BrOffice, Itaipu Binacional and the
-Itaipu Technological Park Foundation. <a href="http://www.documentfoundation.org/lists/announce/msg00020.html">Read the press release.</a></p>
-
-<p>2010-11-17 <b>Official TDF blog opens</b><br>
-The official Document Foundation blog is <a href="http://blog.documentfoundation.org">here</a>.</p>
-
-<p>2010-11-10 <b>Preview of future product and technology developments</b><br>
-Read the press release <a href="http://www.documentfoundation.org/lists/announce/msg00016.html">here.</a></p>
-
-<p>2010-10-13 <b>The Next Decade Manifesto</b><br>
-The announcement of the next decade manifesto is available <a href="/pdf/tdf_nextdecade.pdf">here</a>.<br>
-The manifesto itself is <a href="/pdf/tdf_manifesto.pdf">available as PDF</a> and <a href="http://wiki.documentfoundation.org/TDF/Next_Decade_Manifesto">in our wiki</a>.</p>
-
-<p>2010-10-06 <b>Numbers of the first week</b><br>
-Numbers @ The Document Foundation press release is available <a href="/pdf/tdf_numbers.pdf">here</a>.</p>
-
-<p>2010-09-28 <b>The Document Foundation announced</b><br>
-The announcement of The Document Foundation is available <a href="/pdf/tdf_release.pdf">here</a>.</p>
-
-<p>2010-09-28 <b>Blogosphere</b><br>
-Bloggers can be found on the <a href="http://planet.documentfoundation.org">The Document Foundation Planet</a>.</p>
-
</div>
EOT;
diff --git a/template.php b/template.php
index e51b915..9be826d 100644
--- a/template.php
+++ b/template.php
@@ -8,7 +8,6 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
// - (optional) the id of the tab it is under, this is for subsections
$hnav = array( "summary" => array("/", "Welcome"),
"foundation" => array("/foundation", "Foundation"),
- "libreoffice" => array("/download/", "LibreOffice"),
"develop" => array("/develop/", "Develop"),
"contribute" => array("/contribution/", "Contribute"),
"supporters" => array("/supporters/", "Supporters") ,
@@ -20,7 +19,6 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
// this is all dependent on ths CSS used.
$tabs = array ( "summary" => "container",
"foundation" => "container",
- "libreoffice" => "container",
"develop" => "container",
"contribute" => "container",
"supporters" => "container",
@@ -137,14 +135,13 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
$freedesktop_name="libreoffice";
$freedesktop_cgit="http://cgit.freedesktop.org/$freedesktop_name";
-$download_binaries="http://download.documentfoundation.org/libreoffice/testing";
$download_source="http://download.documentfoundation.org/libreoffice/src/libreoffice-build-3.3.0.3.tar.gz";
$rightnavigation = <<<EOT
<div id="right-nav">
<ul id="rnav">
- <li class="rnav-download"><a href="/download">Download LibreOffice</a></li>
+ <li class="rnav-download"><a href="http://www.libreoffice.org/download">Download LibreOffice</a></li>
<li class="rnav-blue"><a href="/foundation">Understand the reasons for The Document Foundation</a></li>
<li class="rnav-green"><a href="/contribution">Sign up and get in touch with the community</a></li>
<li class="rnav-magenta"><a href="/contact">Get press material and contat spokes people</a></li>
More information about the Libreoffice-commits
mailing list