[Xfce4-commits] <www:nick/gettext> Add subnav loading and page titles.
Nick Schermer
noreply at xfce.org
Wed Nov 24 22:20:01 CET 2010
Updating branch refs/heads/nick/gettext
to ef08f02cd0372d9e25d9b8c5976bf5d35f53bb19 (commit)
from 72e381f97329b27c3f50b0143ffaa06fcec69532 (commit)
commit ef08f02cd0372d9e25d9b8c5976bf5d35f53bb19
Author: Nick Schermer <nick at xfce.org>
Date: Wed Nov 24 22:19:04 2010 +0100
Add subnav loading and page titles.
index.php | 23 ++++++++-
lib/core.php | 4 ++
pages/about/artwork.php | 4 +-
pages/about/credits.php | 20 +-------
pages/about/en.nav.php | 19 --------
pages/about/features.php | 4 +-
pages/about/index.php | 4 +-
pages/about/nav.php | 10 ++++
pages/about/news.php | 38 ++++++++++++++-
pages/about/press.php | 8 ++-
pages/about/screenshots.php | 8 ++-
pages/community/en.nav.php | 9 ----
pages/community/index.php | 4 +-
pages/community/irc.php | 4 +-
pages/community/lists.php | 4 +-
pages/community/nav.php | 12 +++++
pages/development/index.php | 4 +-
pages/development/{en.nav.php => nav.php} | 0
pages/download/development.php | 13 +++--
pages/download/distros.php | 4 +-
pages/download/en.nav.php | 19 --------
pages/download/index.php | 6 ++-
pages/download/nav.php | 19 ++++++++
pages/download/requirements.php | 4 +-
pages/frontpage.php | 7 ++-
pages/header.php | 73 +++++++++++++++++-----------
pages/projects/{en.nav.php => nav.php} | 0
style/base.css | 3 +
28 files changed, 208 insertions(+), 119 deletions(-)
diff --git a/index.php b/index.php
index 4390ad3..55f875a 100644
--- a/index.php
+++ b/index.php
@@ -15,11 +15,30 @@ include ('lib/core.php');
$uri_a = explode('?', $_SERVER['REQUEST_URI']);
$uri = trim (strtolower ($uri_a[0]), '/');
+/* lookup to page from the uri */
+$content_file = lookup_page ($uri);
+
+/* load the page content in a buffer (we don't need it yet,
+ * but we do need some variables for the header) */
+ob_start ();
+include ($content_file);
+$contents = ob_get_clean ();
+
+/* load the page header */
include ('pages/header.php');
-include (lookup_page($uri));
+
+/* load the category navigation if there is one */
+$navigation_file = dirname ($content_file) . '/nav.php';
+if (is_file ($navigation_file))
+ include ($navigation_file);
+
+/* write the contents */
+echo $contents;
+
+/* end with the footer */
include ('pages/footer.php');
$timer_end = microtime_float ();
-echo "<!-- Execution time: ". round ($timer_end - $timer_start, 4) ." second -->";
+echo "Execution time: ". round ($timer_end - $timer_start, 4) ." second";
?>
diff --git a/lib/core.php b/lib/core.php
index 29d6708..947a819 100644
--- a/lib/core.php
+++ b/lib/core.php
@@ -31,6 +31,10 @@ function lookup_page($uri)
{
$root = 'pages/';
+ /* don't allow ../nav uris */
+ if (basename ($uri) == 'nav')
+ $uri = 'foo';
+
if (empty ($uri))
return $root.'frontpage.php';
diff --git a/pages/about/artwork.php b/pages/about/artwork.php
index e5f49ab..e78a9aa 100644
--- a/pages/about/artwork.php
+++ b/pages/about/artwork.php
@@ -1,4 +1,6 @@
-<h1><?php E_('Xfce Artwork') ?></h1>
+<?php $head['title'] = R_('Artwork') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php E_('You can download the Xfce Artwork Tarball <a href="/downloads/xfce_artwork.tar.bz2">here</a>. It contains some high-quality logos and banners.') ?>
</p>
diff --git a/pages/about/credits.php b/pages/about/credits.php
index 183520f..572ef94 100644
--- a/pages/about/credits.php
+++ b/pages/about/credits.php
@@ -1,19 +1,3 @@
-<?php
-function at(){
- echo '<img src="/layout/images/mail.png" alt="" width="10" height="10" hspace="2" border="0" />';
-}
+<?php $head['title'] = R_('Credits') ?>
-?>
-<h1><?php E_('Credits') ?></h1>
-
-<h2 id="lead"><?php E_('Project Lead') ?></h2>
-
-<h2 id="core"><?php E_('Core Developers') ?></h2>
-
-<h2 id="server"><?php E_('Server and website') ?></h2>
-
-<h2 id="contributors"><?php E_('Contributors') ?></h2>
-
-<h2 id="goodies"><?php E_('Goodies') ?></h2>
-
-<h2 id="translators"><?php E_('Translators') ?></h2>
+<h1><?php echo $head['title'] ?></h1>
diff --git a/pages/about/en.nav.php b/pages/about/en.nav.php
deleted file mode 100644
index ef6b9ee..0000000
--- a/pages/about/en.nav.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<ul>
- <li><a href="/about/">About</a></li>
- <li><a href="/about/features">Features</a></li>
- <li><a href="/about/tour">Xfce 4.6 Tour</a></li>
- <li><a href="/about/news">News</a></li>
- <li><a href="/about/screenshots">Screenshots</a></li>
- <li><a href="/about/credits">Credits</a>
- <ul>
- <li><a href="/about/credits#lead">Project Lead</a></li>
- <li><a href="/about/credits#core">Core Developers</a></li>
- <li><a href="/about/credits#server">Server</a></li>
- <li><a href="/about/credits#contributors">Contributors</a></li>
- <li><a href="/about/credits#goodies">Goodies</a></li>
- <li><a href="/about/credits#translators">Translators</a></li>
- </ul>
- </li>
- <li><a href="/about/press">Press</a></li>
- <li><a href="/about/artwork">Artwork</a></li>
-</ul>
diff --git a/pages/about/features.php b/pages/about/features.php
index 19c8b15..5abf530 100644
--- a/pages/about/features.php
+++ b/pages/about/features.php
@@ -1,4 +1,6 @@
-<h1><?php E_('Features') ?></h1>
+<?php $head['title'] = R_('Features') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php E_('Xfce provides a lightweight desktop environment with a desktop manager drawing a wallpaper and allowing you to have icons on your desktop, a panel with numerous plugins, a standard compliant window manager with a compositing manager, a settings manager to customize your desktop environment, a modern and easy to use file manager and a session manager which allows you to save the current session, autostart applications, shutdown, reboot, suspend or hibernate your computer.') ?>
diff --git a/pages/about/index.php b/pages/about/index.php
index 0ca41e9..00ad6f1 100644
--- a/pages/about/index.php
+++ b/pages/about/index.php
@@ -1,4 +1,6 @@
-<h1><?php E_('About') ?></h1>
+<?php $head['title'] = R_('About') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php E_('Xfce is a lightweight desktop environment for unix-like operating systems. It aims to be fast and lightweight, while still being visually appealing and user friendly.') ?>
diff --git a/pages/about/nav.php b/pages/about/nav.php
new file mode 100644
index 0000000..b8f7585
--- /dev/null
+++ b/pages/about/nav.php
@@ -0,0 +1,10 @@
+<ul>
+ <li><a href="/about/"><?php E_('About') ?></a></li>
+ <li><a href="/about/features"><?php E_('Features') ?></a></li>
+ <li><a href="/about/tour"><?php E_('Xfce 4.6 Tour') ?></a></li>
+ <li><a href="/about/news"><?php E_('News') ?></a></li>
+ <li><a href="/about/screenshots"><?php E_('Screenshots') ?></a></li>
+ <li><a href="/about/credits"><?php E_('Credits') ?></a></li>
+ <li><a href="/about/press"><?php E_('Press') ?></a></li>
+ <li><a href="/about/artwork"><?php E_('Artwork') ?></a></li>
+</ul>
diff --git a/pages/about/news.php b/pages/about/news.php
index 6eff33c..19ff825 100644
--- a/pages/about/news.php
+++ b/pages/about/news.php
@@ -1,4 +1,38 @@
-<?php
+<?php $head['title'] = R_('News') ?>
+<h1><?php echo $head['title'] ?></h1>
-?>
+
+
+<h2 id="2010-11-14"><?php E_('Xfce 4.8pre1 Released') ?></h2>
+<span>14 januari 2010</span>
+<p>
+ <?php E_('The Xfce development team is proud to announce the first preview release for Xfce 4.8. Together with this preview release, the Xfce project announces the feature freeze for the final 4.8 release which is set to be pushed out to the world on January 16th, 2011.') ?>
+</p>
+<p>
+ <?php E_('This release incorporates major changes to the core of the Xfce desktop environment and hopefully succeeds in fulfilling a number of long time requests. Among the most notable updates is that we have ported the entire Xfce core (Thunar, xfdesktop and thunar-volman in particular) from ThunarVFS to GIO, bringing remote filesystems to the Xfce desktop. The panel has been rewritten from scratch and provides better launcher management and improved multi-head support. The list of new panel features is too long to mention in its entirety here. Thanks to the new menu library garcon (formerly known as libxfce4menu, but rewritten once again) we now support menu editing via a third-party menu editor such as Alacarte (we do not ship our own yet). Our core libraries have been streamlined a bit, a good examplle being the newly introduced libxfce4ui library which is meant to replace libxfcegui4.') ?>
+</p>
+<p>
+ <?php E_('Perhaps the most important achievement we will accomplish with Xfce 4.8 is that, despite suffering from the small size of the development team from time to time, the core of the desktop environment has been aligned with today\'s desktop technologies such as GIO, ConsoleKit, PolicyKit, udev and many more. A lot of old cruft like has been stripped from the core as well, as has happened with HAL and ThunarVFS (which is still around for compatibility reasons).') ?>
+</p>
+<p>
+ <?php E_('Thanks to the awesome Transifex translation platform, our language teams have been able to update their translations at an incredible pace. Please include them when praising this release!') ?>
+</p>
+<p>
+ <?php E_('A complete list of all changes since the latest stable release is available <a href="/documentation/changelogs/4.8pre1">here</a>.') ?>
+</p>
+<p>
+ <?php E_('Kind regards and thanks to everyone who has contributed to this release,<br />The Xfce development team.') ?>
+</p>
+
+
+
+<h2 id="2009-00-00"><?php E_('Xfce 4.2.1.1 released') ?></h2>
+<p>
+ <?php E_('Xfce 4.2.1.1 has been released quickly after 4.2.1. It includes a fix for a bad bug where panel loses its configuration when saving the session in 4.2.1. The Sourceforge server has been updated, and other mirrors will follow soon.') ?>
+</p>
+
+<h2 id="2008-00-00"><?php E_('Xfce 4.2.1 released') ?></h2>
+<p>
+ <?php E_('Xfce 4.2.1 is available. This is a maintenance release. Download locations can be found on this page, and a changelog is available here.') ?>
+</p>
diff --git a/pages/about/press.php b/pages/about/press.php
index 3b8f3c0..53938cd 100644
--- a/pages/about/press.php
+++ b/pages/about/press.php
@@ -1,5 +1,9 @@
-<h1><?php E_('Press') ?></h1>
-<p><?php E_('Here you can find various reviews of the Xfce desktop environment.') ?></p>
+<?php $head['title'] = R_('Press') ?>
+
+<h1><?php echo $head['title'] ?></h1>
+<p>
+ <?php E_('Here you can find various reviews of the Xfce desktop environment.') ?>
+</p>
<table>
<tr>
diff --git a/pages/about/screenshots.php b/pages/about/screenshots.php
index 8ec3991..6b080c1 100644
--- a/pages/about/screenshots.php
+++ b/pages/about/screenshots.php
@@ -1,5 +1,9 @@
-<h1><?php E_('Screenshots') ?></h1>
-<p><?php E_('Some screenshots of Xfce, ordered by version.') ?></p>
+<?php $head['title'] = R_('Screenshots') ?>
+
+<h1><?php echo $head['title'] ?></h1>
+<p>
+ <?php E_('Some screenshots of Xfce, ordered by version.') ?>
+</p>
<h2><?php E_('Xfce 4.6') ?></h2>
<p>
diff --git a/pages/community/en.nav.php b/pages/community/en.nav.php
deleted file mode 100644
index d5ae519..0000000
--- a/pages/community/en.nav.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<ul>
- <li><a href="/community/">Community</a></li>
- <li><a href="http://forum.xfce.org" target="_blank" class="external">Forum</a></li>
- <li><a href="http://blog.xfce.org" target="_blank" class="external">Xfce Blog</a></li>
- <li><a href="http://wiki.xfce.org" target="_blank" class="external">Xfce Wiki</a></li>
- <li><a href="/community/lists">Mailing Lists</a></li>
- <li><a href="/community/irc">IRC</a></li>
- <li><a href="http://bugzilla.xfce.org" target="_blank" class="external">Report a bug</a></li>
-</ul>
diff --git a/pages/community/index.php b/pages/community/index.php
index d40c568..da698bb 100644
--- a/pages/community/index.php
+++ b/pages/community/index.php
@@ -1,4 +1,6 @@
-<h1><?php E_('Community') ?></h1>
+<?php $head['title'] = R_('Community') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php E_('If you were not able to solve your problem by using the documentation on this website, the Xfce communities are a good place to get help or to share your ideas.') ?>
diff --git a/pages/community/irc.php b/pages/community/irc.php
index c769049..de79670 100644
--- a/pages/community/irc.php
+++ b/pages/community/irc.php
@@ -1,3 +1,5 @@
-<h1><?php E_('IRC') ?></h1>
+<?php $head['title'] = R_('IRC') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p><?php E_('If you have a problem that you cannot resolve, you might want to try asking a question in our IRC channel <a href="irc://irc.freenode.net/#xfce">#xfce on irc.freenode.net</a>. The channel has several active users. It is recommended that you consult the <a href="/documentation">documentation</a> about your problem before asking your question.') ?></p>
diff --git a/pages/community/lists.php b/pages/community/lists.php
index b65ed6f..4f0e689 100644
--- a/pages/community/lists.php
+++ b/pages/community/lists.php
@@ -1,4 +1,6 @@
-<h1><?php E_('Mailing Lists') ?></h1>
+<?php $head['title'] = R_('Mailing Lists') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php E_('<strong>NOTE:</strong> In order to post to these lists, you must first subscribe.') ?>
diff --git a/pages/community/nav.php b/pages/community/nav.php
new file mode 100644
index 0000000..821d745
--- /dev/null
+++ b/pages/community/nav.php
@@ -0,0 +1,12 @@
+<ul>
+ <li><a href="/community/"><?php E_('Community') ?></a></li>
+ <li><a href="/community/lists"><?php E_('Mailing Lists') ?></a></li>
+ <li><a href="/community/irc"><?php E_('IRC') ?></a></li>
+</ul>
+
+<ul>
+ <li><a href="http://forum.xfce.org" target="_blank" class="external"><?php E_('Forum') ?></a></li>
+ <li><a href="http://blog.xfce.org" target="_blank" class="external"><?php E_('Blog') ?></a></li>
+ <li><a href="http://wiki.xfce.org" target="_blank" class="external"><?php E_('Wiki') ?></a></li>
+ <li><a href="http://bugzilla.xfce.org" target="_blank" class="external"><?php E_('Bug tracker') ?></a></li>
+</ul>
diff --git a/pages/development/index.php b/pages/development/index.php
index b621f62..814aec9 100644
--- a/pages/development/index.php
+++ b/pages/development/index.php
@@ -1,4 +1,6 @@
-<h1><?php E_('Development') ?></h1>
+<?php $head['title'] = R_('Development') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php E_('Xfce is made possible thanks to the help of volunteers with all kinds of skills and talents. Coding is just one way to help – translators, documenters, and designers are also welcome! This page outlines some of the areas where you could help out.') ?>
</p>
diff --git a/pages/development/en.nav.php b/pages/development/nav.php
similarity index 100%
rename from pages/development/en.nav.php
rename to pages/development/nav.php
diff --git a/pages/download/development.php b/pages/download/development.php
index ea5553b..5705ad9 100644
--- a/pages/download/development.php
+++ b/pages/download/development.php
@@ -1,16 +1,19 @@
+<?php $head['title'] = R_('Development source code') ?>
+
+
<?php include ('pages/versions.php'); ?>
-<h1><?php E_('Development source code') ?></h1>
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php E_('If you want to build Xfce from source code, you can either download the sourcetarballs of a released version of Xfce from our <a href="/download">download page</a>, or try a development version, by downloading it from GIT (only for the adventurous). Please note that installing two different versions of Xfce (ie. stable and development) is not supported.') ?>
</p>
-<h3><?php printf (R_('Latest release version (%s)'), $full_stable_version) ?></h3>
+<h3><?php printf (R_('Latest release version (%s)'), $stable_version) ?></h3>
<p>
<?php E_('This version contain the latest bug fixes, without any major new feature. This should be more stable than the development version (and even than the last official release), but there is still no guarantee that this version is bug free.') ?>
</p>
-<h3><?php printf (R_('Latest development version (%s)'), $full_devel_version) ?></h3>
+<h3><?php printf (R_('Latest development version (%s)'), $preview_version) ?></h3>
<p>
<?php E_('This version contain the latest development updates and bug fixes. There is no guarantee that it\'s fully working and bug free.') ?>
</p>
@@ -21,7 +24,7 @@
<a href="http://git.xfce.org/" class="external">browse the GIT repositories</a>.') ?>
</p>
-<h3><?php printf (R_('Latest release version (%s) from the GIT repositories'), $full_stable_version) ?></h3>
+<h3><?php printf (R_('Latest release version (%s) from the GIT repositories'), $stable_version) ?></h3>
<p><?php E_('You can download the desired modules with the following command:') ?></p>
@@ -34,7 +37,7 @@
<code>git clone -b xfce-4.6 git://git.xfce.org/xfce/xfce4-panel</code>
</p>
-<h3><?php printf(R_('Latest development version (%s) from the GIT repositories'), $full_devel_version) ?></h3>
+<h3><?php printf(R_('Latest development version (%s) from the GIT repositories'), $preview_version) ?></h3>
<p>
<?php E_('You can download the desired modules with the following command:') ?></p>
diff --git a/pages/download/distros.php b/pages/download/distros.php
index 0e07c37..94df228 100644
--- a/pages/download/distros.php
+++ b/pages/download/distros.php
@@ -1,4 +1,6 @@
-<h1><?php E_('Distributions') ?></h1>
+<?php $head['title'] = R_('Distributions') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<h2><?php E_('Distributions based on Xfce') ?></h2>
diff --git a/pages/download/en.nav.php b/pages/download/en.nav.php
deleted file mode 100644
index dd27c3e..0000000
--- a/pages/download/en.nav.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php include_once('version.php'); ?>
-<ul>
- <li><a href="/download#stable">Stable release</a>
- <ul>
- <li><a href="/download#source">Source Code</a></li>
- <li><a href="/download#binaries">Binaries</a></li>
- </ul>
- </li>
- <?php if(isset($version_unstable)) { ?>
- <li><a href="/download#unstable">Unstable release</a></li>
- <?php } ?>
- <li><a href="/download/development">Development version</a>
- <ul>
- <li><a href="http://git.xfce.org/" class="external">Browse GIT repositories</a></li>
- </ul>
- </li>
- <li><a href="http://goodies.xfce.org" class="external">Panel Plugins</a></li>
- <li><a href="/download/distros">Xfce Distributions</a></li>
-</ul>
diff --git a/pages/download/index.php b/pages/download/index.php
index 7766f17..ce6e5a1 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -1,5 +1,7 @@
<?php
+$head['title'] = R_('Download');
+
include ('pages/versions.php');
$servers = array (
@@ -18,7 +20,7 @@ function print_servers($path)
?>
-<h1><?php E_('Download') ?></h1>
+<h1><?php echo $head['title'] ?></h1>
<h2 id="stable"><?php printf (R_('Stable release %s'), $stable_version) ?></h1>
<p>
@@ -44,7 +46,7 @@ function print_servers($path)
</ul>
<?php } ?>
-<h2><?php E_('Individual releases') ?></h2>
+<h2 id="individual"><?php E_('Individual releases') ?></h2>
<p>
<?php E_('Each package in Xfce can make idividual releases, also the core packages, to make development or stable releases. You can follow the announcements of the releases on the <a href="/community/lists">Xfce user mailing list</a>, watch the <a href="http://releases.xfce.org/feeds/project/">release feeds</a> or follow the Xfce <a href="http://identi.ca/xfce">ident.ca channel</a>.') ?>
</p>
diff --git a/pages/download/nav.php b/pages/download/nav.php
new file mode 100644
index 0000000..f3a9775
--- /dev/null
+++ b/pages/download/nav.php
@@ -0,0 +1,19 @@
+<?php include ('pages/versions.php'); ?>
+
+<ul>
+ <li><a href="/download"><?php E_('Download') ?></a>
+ <ul>
+ <li><a href="/download#stable"><?php E_('Stable release') ?></a></li>
+<?php if($preview_visible) { ?>
+ <li><a href="/download#unstable"><?php E_('Preview release') ?></a></li>
+<?php } ?>
+ <li><a href="/download/#individual"><?php E_('Individual releases') ?></a></li>
+ </ul>
+ </li>
+ <li><a href="/download/development"><?php E_('Development') ?></a></li>
+</ul>
+
+<ul>
+ <li><a href="http://git.xfce.org/" class="external"><?php E_('Browse GIT repositories') ?></a></li>
+ <li><a href="http://goodies.xfce.org" class="external"><?php E_('Panel Plugins') ?></a></li>
+</ul>
diff --git a/pages/download/requirements.php b/pages/download/requirements.php
index 6509475..e4c49af 100644
--- a/pages/download/requirements.php
+++ b/pages/download/requirements.php
@@ -1,4 +1,6 @@
-<h1><?php E_('System requirements') ?></h1>
+<?php $head['title'] = R_('System requirements') ?>
+
+<h1><?php echo $head['title'] ?></h1>
<p>
<?php printf (R_('All packages (except xfce4-dev-tools) depend on both gtk+ %s and glib %s.'), '>= 2.10', '>= 2.12') ?>
</p>
diff --git a/pages/frontpage.php b/pages/frontpage.php
index 2e5e4c5..5221e72 100644
--- a/pages/frontpage.php
+++ b/pages/frontpage.php
@@ -1,3 +1,8 @@
+<?php
+ $head['title'] = R_('Frontpage');
+ $head['description'] = 'Xfce Desktop Environment';
+ $head['keywords'] = 'desktop environment, window manager, desktop, speed, lightweight, gtk+, open source, xforms common environment';
+?>
-<h1><?php E_('Frontpage'); ?></h1>
+<h1><?php echo $head['title'] ?></h1>
diff --git a/pages/header.php b/pages/header.php
index 617ced4..38a3763 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -1,42 +1,57 @@
+<?php
+/* setup the page title */
+if (isset ($head['title']))
+ $title = $head['title'].' - Xfce';
+else
+ $title = 'Xfce';
+?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
-
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Xfce</title>
- <link rel="shortcut icon" href="/favicon.png" type="image/png" />
- <link rel="stylesheet" media="screen" href="/style/base.css" type="text/css" />
- <meta name="description" content="Xfce Desktop Environment" />
- <meta name="keywords" content="desktop environment, window manager, desktop, speed, lightweight, gtk+, open source, xforms common environment" />
+ <title><?php echo $title ?></title>
+ <link rel="shortcut icon" href="/favicon.png" type="image/png" />
+ <link rel="stylesheet" media="screen" href="/style/base.css" type="text/css" />
+<?php
+ if (isset ($head['stylesheet']) && is_array ($head['stylesheet']))
+ foreach ($head['stylesheet'] as $sheet)
+ echo "\t<link rel=\"stylesheet\" media=\"screen\" href=\"$sheet\" type=\"text/css\" />\n";
+
+ if (isset ($head['description']))
+ echo "\t<meta name=\"description\" content=\"".$head['description']."\" />\n";
+
+ if (isset ($head['keywords']))
+ echo "\t<meta name=\"keywords\" content=\"".$head['keywords']."\" />\n";
+?>
</head>
<body id="top">
<div id="xfce-header">
- <div>
- <h1>Xfce</h1>
- <ul>
- <li><a href="http://www.xfce.org" title="Go to the homepage" class="active">Home</a></li>
- <li><a href="http://docs.xfce.org" title="Official documentation">Docs</a></li>
- <li><a href="http://wiki.xfce.org" title="Community documentation">Wiki</a></li>
- <li><a href="http://forum.xfce.org" title="Community forums">Forum</a></li>
- <li><a href="http://bugzilla.xfce.org" title="Report and track bugs">Bugs</a></li>
- <li><a href="http://blog.xfce.org" title="Visit the blog">Blog</a></li>
- <li><a href="http://translations.xfce.org" title="Help translating the Xfce project">Translate</a></li>
- </ul>
- </div>
- <div id="xfce-header-clear"></div>
+ <div>
+ <h1>Xfce</h1>
+ <ul>
+ <li><a href="http://www.xfce.org" title="Go to the homepage" class="active">Home</a></li>
+ <li><a href="http://docs.xfce.org" title="Official documentation">Docs</a></li>
+ <li><a href="http://wiki.xfce.org" title="Community documentation">Wiki</a></li>
+ <li><a href="http://forum.xfce.org" title="Community forums">Forum</a></li>
+ <li><a href="http://bugzilla.xfce.org" title="Report and track bugs">Bugs</a></li>
+ <li><a href="http://blog.xfce.org" title="Visit the blog">Blog</a></li>
+ <li><a href="http://translations.xfce.org" title="Help translating the Xfce project">Translate</a></li>
+ </ul>
+ </div>
+ <div id="xfce-header-clear"></div>
</div>
<div id="pagewrap">
- <div>
- <ul>
- <li><a href="/">Home</a></li>
- <li><a href="/about/">About</a></li>
- <li><a href="/download/">Download</a></li>
- <li><a href="/community/">Community</a></li>
- <li><a href="/projects/">Projects</a></li>
- <li><a href="/development/">Development</a></li>
- </ul>
- </div>
+ <div>
+ <ul>
+ <li><a href="/">Home</a></li>
+ <li><a href="/about/">About</a></li>
+ <li><a href="/download/">Download</a></li>
+ <li><a href="/community/">Community</a></li>
+ <li><a href="/projects/">Projects</a></li>
+ <li><a href="/development/">Development</a></li>
+ </ul>
+ </div>
diff --git a/pages/projects/en.nav.php b/pages/projects/nav.php
similarity index 100%
rename from pages/projects/en.nav.php
rename to pages/projects/nav.php
diff --git a/style/base.css b/style/base.css
index 3632857..55fa339 100644
--- a/style/base.css
+++ b/style/base.css
@@ -2,6 +2,9 @@
body {
margin: 0;
padding: 0;
+
+ /* background: -moz-Field;
+ color: -moz-FieldText; */
}
#xfce-header {
More information about the Xfce4-commits
mailing list