[Xfce4-commits] <www:master> Style and content changes.
Nick Schermer
noreply at xfce.org
Tue Apr 17 20:22:17 CEST 2012
Updating branch refs/heads/master
to 152b274f436da78bbf4613265da5b3f8ef10b691 (commit)
from 3fadeb5cce98177fc10beba49c2b03fa2d72afd7 (commit)
commit 152b274f436da78bbf4613265da5b3f8ef10b691
Author: Nick Schermer <nick at xfce.org>
Date: Sun Apr 15 12:36:47 2012 +0200
Style and content changes.
pages/about/credits.php | 15 +--
pages/about/nav.php | 50 ++++++--
pages/about/news.php | 44 +++++---
pages/about/press.php | 146 -----------------------
pages/about/releasemodel.php | 4 -
pages/about/tour.php | 100 +----------------
pages/about/tour44.php | 40 +++---
pages/about/tour46.php | 48 ++++----
pages/about/{tour.php => tour48.php} | 26 ++--
pages/community/index.php | 6 -
pages/community/nav.php | 35 ++++--
pages/download/changelogs/index.php | 4 +-
pages/download/index.php | 10 --
pages/download/nav.php | 46 ++++++--
pages/footer.php | 4 +-
pages/frontpage.php | 32 ++++-
pages/getinvolved/index.php | 6 +-
pages/getinvolved/nav.php | 44 +++++---
pages/getinvolved/translation.php | 6 -
pages/header.php | 48 +-------
pages/projects/index.php | 40 ++++---
pages/projects/nav.php | 23 ++--
style/base.css | 213 +++++++++++++---------------------
style/frontpage.css | 35 ++++--
style/img/bullit.gif | Bin 49 -> 0 bytes
style/img/external.gif | Bin 105 -> 0 bytes
style/news.css | 6 +-
27 files changed, 406 insertions(+), 625 deletions(-)
diff --git a/pages/about/credits.php b/pages/about/credits.php
index 1531a25..6a37c2b 100644
--- a/pages/about/credits.php
+++ b/pages/about/credits.php
@@ -7,15 +7,6 @@ include ('lib/translators.php');
$head['title'] = R_('Credits');
-$toc['anchors'] = array (
- 'core' => R_('Core developers'),
- 'active' => R_('Active contributors'),
- 'servers' => R_('Servers maintained by'),
- 'goodies' => R_('Goodies supervision'),
- 'translation' => R_('Translations supervision'),
- 'translators' => R_('Translators'),
- 'previous' => R_('Previous contributors'));
-
function print_credits($people)
{
$last = end ($people);
@@ -34,7 +25,7 @@ function print_translator_credits()
foreach ($translators as $language => $people)
{
- echo "<h3>$language</h3>\n<blockquote>";
+ echo "<dt>$language</dt>\n<dd>";
$last = end ($people);
foreach ($people as $person => $mail)
@@ -45,7 +36,7 @@ function print_translator_credits()
echo ', ';
}
- echo "</blockquote>\n";
+ echo "</dd>\n";
}
}
?>
@@ -109,7 +100,9 @@ function print_translator_credits()
?>
<h2 id="translators"><?php E_('Translators')?></h2>
+<dl>
<?php print_translator_credits(); ?>
+</dl>
<h2 id="previous"><?php E_('Previous contributors')?></h2>
<?php
diff --git a/pages/about/nav.php b/pages/about/nav.php
index 9088887..0f2a685 100644
--- a/pages/about/nav.php
+++ b/pages/about/nav.php
@@ -1,11 +1,39 @@
-<?php
-
-$toc['menu'] = array (
- 'about' => R_('About'),
- 'about/tour' => R_('Tour'),
- 'about/news' => R_('News'),
- 'about/screenshots' => R_('Screenshots'),
- 'about/credits' => R_('Credits'),
- 'about/press' => R_('Press'),
- 'about/releasemodel' => R_('Release Model'));
-?>
+<h2><?php E_('Related Pages') ?></h2>
+<ul>
+ <li>
+ <a href="/about"><?php E_('About') ?>
+ <span>– <?php E_('general information about the Xfce desktop') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="/about/tour"><?php E_('4.10 Tour') ?>
+ <span>– <?php E_('visual tour about new features in the last major releases') ?></span>
+ </a>
+
+ <ul>
+ <li><a href="/about/tour48">4.8 Tour</a></li>
+ <li><a href="/about/tour46">4.6 Tour</a></li>
+ <li><a href="/about/tour44">4.4 Tour</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="/about/news"><?php E_('News') ?>
+ <span>– <?php E_('release announcements') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="/about/screenshots"><?php E_('Screenshots') ?>
+ <span>– <?php E_('examples of Xfce desktops ordered by version') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="/about/credits"><?php E_('Credits') ?>
+ <span>– <?php E_('list of all contributors') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="/about/releasemodel"><?php E_('Release Model') ?>
+ <span>– <?php E_('the Xfce release policy for core modules') ?></span>
+ </a>
+ </li>
+</ul>
diff --git a/pages/about/news.php b/pages/about/news.php
index bd7b314..2fbffc7 100644
--- a/pages/about/news.php
+++ b/pages/about/news.php
@@ -7,11 +7,9 @@ $head['title'] = R_('News');
$head['stylesheet'] = array ('/style/news.css');
$head['feed'] = 'http://www.xfce.org/feed?lang='.$lang;
-//$toc['anchors'] = array ();
-
echo '<h1>'.$head['title'].'</h1>';
-echo '<span class="rss"><a href="'.$head['feed'].'">Subscribe to articles using RSS Feed</a></span>';
+echo '<span class="rss"><a href="'.$head['feed'].'">'.R_('Subscribe to RSS feed').'</a></span>';
if (isset ($_GET['post']))
$only_stamp = (int) $_GET['post'];
@@ -20,13 +18,18 @@ else
$has_items = false;
+$counter = 0;
+
foreach ($news as $item)
{
$stamp = strtotime ($item['date']);
if ($only_stamp > 0 && $only_stamp != $stamp)
continue;
-
+
+ $link = '/about/news/?post='.$stamp;
+ $counter++;
+
if (!empty ($item['version']))
$title = sprintf (R_('Xfce %s released'), $item['version']);
else
@@ -39,20 +42,31 @@ foreach ($news as $item)
'<br />'.date ('Y', $stamp).'</span></div>';
echo '<div class="post-wrap">';
- foreach ($item['paragraphs'] as $p)
- echo '<p>'.$p.'</p>'."\n";
-
- if (!empty ($item['version']))
- {
- echo '<ul>';
- echo '<li>Download: <a href="http://archive.xfce.org/xfce/'.$item['version'].'/">http://archive.xfce.org/xfce/'.$item['version'].'/</a></li>';
- echo '<li><a href="/download/changelogs/'.$item['version'].'/">'.R_('Changes in this release').'</a></li>';
- echo '</ul>';
- }
+
+ if ($counter < 2)
+ {
+ foreach ($item['paragraphs'] as $p)
+ echo '<p>'.$p.'</p>'."\n";
+
+ if (!empty ($item['version']))
+ {
+ echo '<ul>';
+ echo '<li><a href="http://archive.xfce.org/xfce/'.$item['version'].'/">'.R_('Download').' <span>– http://archive.xfce.org/xfce/'.$item['version'].'/</span></a></li>';
+ echo '<li><a href="/download/changelogs/'.$item['version'].'/">'.R_('Changes in this release').'</a></li>';
+ echo '<li><a href="'.$link.'">'.R_('Permalink').'</a></li>';
+ echo '</ul>';
+ }
+ }
+ else
+ {
+ echo '<p>'.$item['paragraphs'][0];
+ echo ' <a href="'.$link.'">';
+ E_('Learn More →');
+ echo '</a></p>';
+ }
echo '</div>';
- //$toc['anchors'] += array ('post-'. $stamp => $item['title']);
$has_items = true;
}
diff --git a/pages/about/press.php b/pages/about/press.php
deleted file mode 100644
index 5a678e1..0000000
--- a/pages/about/press.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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>
-
-<h2>Xfce 4.8</h2>
-
-<table>
- <tr>
- <th><?php E_('Date') ?></th>
- <th><?php E_('Website') ?></th>
- <th><?php E_('Link') ?></th>
- </tr>
- <tr>
- <td>2011-01-19</td>
- <td>Datamation</td>
- <td><a href="http://itmanagement.earthweb.com/osrc/article.php/3921221/Forget-GNOME-and-KDE-Xfce-48-Runs-Simpler-and-Faster.htm">Forget GNOME and KDE, Xfce 4.8 Runs Simpler and Faster</a></td>
- </tr>
- <tr>
- <td>2011-01-17</td>
- <td>OSNews</td>
- <td><a href="http://www.osnews.com/story/24276/Xfce_4_8_Released">Xfce 4.8 released</a></td>
- </tr>
- <tr>
- <td>2011-01-17</td>
- <td>OStatic</td>
- <td><a href="http://ostatic.com/blog/loss-of-installer-dampens-xfce-4-8-release">Loss of Installer Dampens Xfce 4.8 Release</a></td>
- </tr>
- <tr>
- <td>2010-12-22</td>
- <td>LWN</td>
- <td><a href="http://lwn.net/Articles/420519/">A first look at Xfce 4.8</a></td>
- </tr>
-</table>
-
-<h2>Xfce 4.6</h2>
-
-<table>
- <tr>
- <th><?php E_('Date') ?></th>
- <th><?php E_('Website') ?></th>
- <th><?php E_('Link') ?></th>
- </tr>
- <tr>
- <td>2009-03-03</td>
- <td>Ars Technica</td>
- <td><a href="http://arstechnica.com/open-source/news/2009/03/hands-on-xfce-46-has-nice-new-features-no-fat.ars">Hands-on: fat-free Xfce 4.6 has nice new features</a></td>
- </tr>
- <tr>
- <td>2009-03-01</td>
- <td>Xubuntu Blog</td>
- <td><a href="http://xubuntublog.wordpress.com/2009/03/01/xfce-making-great-strides-with-version-46/">Xfce making great strides with version 4.6</a></td>
- </tr>
- <tr>
- <td>2009-02-27</td>
- <td>Tectonic</td>
- <td><a href="http://www.tectonic.co.za/2009/02/two-years-on-and-xfce-46-breaks-cover/">Two years on and Xfce 4.6 breaks cover</a></td>
- </tr>
- <tr>
- <td>2009-02-27</td>
- <td>OS News</td>
- <td><a href="http://www.osnews.com/story/21054/Xfce_4_6_0_Impresses_with_Slew_of_New_Features">Xfce 4.6 impresses with slew of new features</a></td>
- </tr>
-</table>
-
-<h2>Xfce 4.4</h2>
-
-<table>
- <tr>
- <th><?php E_('Date') ?></th>
- <th><?php E_('Website') ?></th>
- <th><?php E_('Link') ?></th>
- </tr>
- <tr>
- <td>2006-06-09</td>
- <td>LWN</td>
- <td><a href="http://lwn.net/Articles/182966/">What next for the Xfce Project?</a></td>
- </tr>
- <tr>
- <td>2006-01-10</td>
- <td>Tuxmachines</td>
- <td><a href="http://www.tuxmachines.org/node/6448">Xtra Fine Computing Environment: xfce4.4 beta 1.</a></td>
- </tr>
-</table>
-
-<h2>Xfce 4.2</h2>
-
-<table>
- <tr>
- <th><?php E_('Date') ?></th>
- <th><?php E_('Website') ?></th>
- <th><?php E_('Link') ?></th>
- </tr>
- <tr>
- <td>2006-01-10</td>
- <td>Blog, All about Linux </td>
- <td><a href="http://linuxhelp.blogspot.com/2006/01/xfce-42-light-weight-window-manager.html">Xfce 4.2 - A light weight window manager heavy in features.</a></td>
- </tr>
- <tr>
- <td>2005-10-01</td>
- <td>Linux Magazine </td>
- <td><a href="http://www.linux-magazine.com/issue/57/Xfce_42_Review.pdf">Installing and exploring Xfce 4.2</a></td>
- </tr>
- <tr>
- <td>2005-01-11</td>
- <td>Mad Penguin</td>
- <td><a href="http://www.madpenguin.org/cms/?m=show&id=3216">Xfce Installer Something To Be Proud Of</a></td>
- </tr>
- <tr>
- <td>2004-11-24</td>
- <td>OSNews</td>
- <td><a href="http://osnews.com/story.php?news_id=8975">Xfce 4.2 - the Future is Now!</a></td>
- </tr>
- <tr>
- <td>2004-09-27</td>
- <td>Mad Penguin</td>
- <td><a href="http://www.madpenguin.org/cms/?m=show&id=3216">Linux-based HP Thin Client With Xfce 4</a></td>
- </tr>
- <tr>
- <td>2004-08-10</td>
- <td>Blog, Juha-Mikko</td>
- <td><a href="http://jmz.iki.fi/blog.php/computers/xfce_42_beta_review">Xfce 4.2 Beta Review</a></td>
- </tr>
- <tr>
- <td>2004-05-10</td>
- <td>OSNews</td>
- <td><a href="http://osnews.com/story.php?news_id=7002">Giving Xfce4 a Spin</a></td>
- </tr>
- <tr>
- <td>2003-12-22</td>
- <td>OSNews</td>
- <td><a href="http://osnews.com/story.php?news_id=5478">Xfce-4 - A Refreshingly Solid Desktop</a></td>
- </tr>
- <tr>
- <td>2003-11-01</td>
- <td>Unix Review </td>
- <td><a href="http://www.unixreview.com/documents/s=1832/ur0311d/">Powertweak Linux and XFce Desktop Environment</a></td>
- </tr>
- <tr>
- <td>2002-02-07</td>
- <td>NewsForge</td>
- <td><a href="http://www.newsforge.com/article.pl?sid=02/02/06/2138220">Xfce: Not just another desktop environment for *nix</a></td>
- </tr>
-</table>
diff --git a/pages/about/releasemodel.php b/pages/about/releasemodel.php
index 8131a38..864c25d 100644
--- a/pages/about/releasemodel.php
+++ b/pages/about/releasemodel.php
@@ -2,10 +2,6 @@
$head['title'] = R_('Release Model');
-$toc['anchors'] = array (
- 'core' => R_('The Xfce Core Desktop'),
- 'cycle' => R_('The Release Cycle'));
-
?>
<h1><?php echo $head['title'] ?></h1>
diff --git a/pages/about/tour.php b/pages/about/tour.php
index d96bdac..e8154ba 100644
--- a/pages/about/tour.php
+++ b/pages/about/tour.php
@@ -2,103 +2,5 @@
<h1><?php echo $head['title'] ?></h1>
-<p><?php E_("This tour will introduce you to all the new major visual features in Xfce 4.8. This is only the visual part of what has been done; for a full list of changes, see the <a href=\"/download/changelogs/\">changelogs</a>. The tours of <a href=\"/about/tour46\">Xfce 4.6</a> and <a href=\"/about/tour44\">Xfce 4.4</a> are also still available.") ?></p>
-
-<h2><?php E_("Thunar file browser") ?></h2>
-
- <h3><?php E_("Remote shares browsing") ?></h3>
-
- <p><?php E_("Thunar now has optional support for GVFS which will allow you to browse remote shares using Thunar: FTP, Windows Shares, WebDav and SSH servers...") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/thunar-remote.png" alt="<?php E_("Thunar browsing a remote share") ?>" /></p>
-
- <h3><?php E_("New file operations progress dialog") ?></h3>
-
- <p><?php E_("When several file operations (copy or move) are being handled in parallel, Thunar now shows a single progress dialog which displays all the relevant information.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/thunar-progress.png" alt="<?php E_("Progress dialog") ?>" /></p>
-
- <h3><?php E_("Eject button for removable devices") ?></h3>
-
- <p><?php E_("It is is now possible to eject removable devices by clicking the eject button near each removable device label in the side pane.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/thunar-eject.png" alt="<?php E_("Eject button") ?>" /></p>
-
-<h2><?php E_("Xfce panel") ?></h2>
-
- <p><?php E_("The Xfce panel has been totally rewritten in 4.8, here are the most visible changes.") ?></p>
-
- <h3><?php E_("Improved positioning and size handling") ?></h3>
-
- <p><?php E_("The panel has much better support for positioning panels on the screen. It can be dragged and snapped to screen borders; floating positions are only remembered when moving a panel and the length of the panel can be adjusted as a percentage of the monitor size.") ?></p>
-
- <h3><?php E_("Transparent backgrounds") ?></h3>
-
- <p><?php E_("The panel is now able to draw transparent panel backgrounds with non transparent items. Your panel items will remain readable and you will enjoy a nice panel look.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-transparent.png" alt="<?php E_("Transparent panel background") ?>" /></p>
-
- <h3><?php E_("New item editor") ?></h3>
-
- <p><?php E_("The panel now features an item editor which allows to modify, move, add and remove items quickly. This is particularly useful for items which are hard to right click and gives you an easy way to change your panel layout from a single place.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-editor.png" alt="<?php E_("Panel item editor") ?>" /></p>
-
- <h3><?php E_("Drag and drop to create launchers") ?></h3>
-
- <p><?php E_("You can now drag and drop menu entries from the panel applications menu, application finder or Thunar to the panel to create launchers. This feature should please the huge number of people who had been requesting it for ages. The launcher also has an integrated application finder to add new items.") ?></p>
-
- <h3><?php E_("Window buttons plugin") ?></h3>
-
- <p><?php E_("The iconbox and tasklist plugins are new merged into 1 plugin, called window buttons. It implements different sorting modes, improved handling in vertical panels and can draw a similar frame as Xfwm4 Alt+tab when hovering a button.") ?></p>
-
- <h3><?php E_("New fuzzy clock") ?></h3>
-
- <p><?php E_("An Xfce release without a new clock mode would not be a true Xfce release. Let us introduce you the 'fuzzy' clock mode!") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-fuzzy-clock.png" alt="<?php E_("New fuzzy clock mode") ?>" /></p>
-
- <h3><?php E_("New directory menu plugin") ?></h3>
-
- <p><?php E_("The directory menu plugin provides a menu reproducing the arborescence of a particular folder. This allows you to open a terminal or a file manager in a sub-folder in a very fast and efficient way.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-directorymenu.png" alt="<?php E_("Directory menu plugin") ?>" /></p>
-
- <h3><?php E_("Applications menu edition") ?></h3>
-
- <p><?php E_("You can now edit the applications menu using any Freedesktop compliant menu editor, Alacarte being the one we used to test.") ?></p>
-
-<h2><?php E_("Xfce settings dialogs") ?></h2>
-
- <h3><?php E_("Improved multihead setup configuration") ?></h3>
-
- <p><?php E_("Xfce can now handle and setup multihead setups for any randr 1.2 compatible driver. Unfortunately, this means it will not work with Nvidia proprietary drivers.") ?></p>
-
- <p><?php E_("You can enable and disable plugged screens, set their resolution, refresh rate, rotation and reflection, clone screens or extend desktops.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/display-settings.png" alt="<?php E_("New display settings dialog") ?>" /></p>
-
- <h4><?php E_("Timed confirmation") ?></h4>
-
- <p><?php E_("Any change made with the settings dialog will have to be confirmed within ten seconds or they will be reverted. This prevents broken video drivers from leaving your computer unusable.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/display-settings-confirmation.png" alt="<?php E_("Timed confirmation for display settings changes") ?>" /></p>
-
- <h4><?php E_("Quick setup dialog") ?></h4>
-
- <p><?php E_("The quick setup dialog allows you to configure a dual screen setup in a second. Plug the second screen, press the display key or Windows + p and select the wanted layout. Done!") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/minimal-display-settings.png" alt="<?php E_("Quick multihead setup") ?>" /></p>
-
- <h3><?php E_("Settings edition in the Xfce Settings Editor") ?></h3>
-
- <p><?php E_("The Xfce Settings Editor now deserves its name, it is no longer a simpler Xfconf settings viewer. You can now modify, delete, add and reset settings through its interface. It also monitors changes to update its view.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/settings-editor.png" alt="<?php E_("Editing Xfconf properties with the Settings Editor") ?>" /></p>
-
- <h3><?php E_("Improved keyboard layout selection") ?></h3>
-
- <p><?php E_("The layout selection dialog received a lot of love: it no longer displays cryptic language/variants codes but uses localized languages/variants names. Layout edition was also made easier by prefilling the dialogs with the current values.") ?></p>
-
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/keyboard-settings-list.png" alt="<?php E_("Layouts and variants list") ?>" /></p>
+<p><?php E_("This tour will introduce you to all the new major visual features in Xfce 4.10. This is only the visual part of what has been done; for a full list of changes, see the <a href=\"/download/changelogs/\">changelogs</a>.") ?></p>
diff --git a/pages/about/tour44.php b/pages/about/tour44.php
index a18364f..7f38991 100644
--- a/pages/about/tour44.php
+++ b/pages/about/tour44.php
@@ -12,13 +12,13 @@
<?php E_('One of the most often requested features during the 4.0 and 4.2 was support for icons on the desktop. Now, with Xfce 4.4.0, this feature was finally added to the desktop manager <b>Xfdesktop</b>.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/desktop-icons.png" alt="Desktop Icons" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/desktop-icons.png" alt="Desktop Icons" /></p>
<p>
<?php E_('The desktop manager utilizes <b>Thunar</b>\'s libraries to handle application launchers and regular files/folders on the desktop. The desktop manager is also able to display icons for minimized windows on the desktop, which is quite a popular feature from the CDE world. Of course, you can disable the desktop icons altogether if you prefer a clean desktop.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/desktop-settings.png" alt="Desktop Settings" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/desktop-settings.png" alt="Desktop Settings" /></p>
<p>
<?php E_('<b>Xfdesktop</b> also continues to provide access to the applications menu, as it did in the previous Xfce releases.') ?>
@@ -31,7 +31,7 @@
<?php E_('The desktop icon support goes hand in hand with the new file manager <a href="http://thunar.xfce.org/">Thunar</a> which replaces the previous file manager <b>Xffm</b>.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/thunar.png" alt="Thunar File Manager" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/thunar.png" alt="Thunar File Manager" /></p>
<p>
<?php E_('<b>Thunar</b> was written from scratch to provide an easy to use, but still very lightweight file manager for Xfce. Its user interface was designed to look similar to the file chooser which was introduced with GTK+ 2.4, and other file managers such as <b>Nautilus</b> and <b>pcmanfm</b> already picked up that idea as well.') ?>
@@ -41,7 +41,7 @@
<?php E_('<b>Thunar</b> supports all the file management functionality which users will expect, and also several advanced features. For example, a so-called <i>Bulk Renamer</i> is included which allows users to rename multiple files at once using a certain criterion.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/thunar-bulk-rename.png" alt="Thunar Bulk Rename" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/thunar-bulk-rename.png" alt="Thunar Bulk Rename" /></p>
<h2><?php E_('Removable Drives and Media') ?></h2>
@@ -49,7 +49,7 @@
<?php E_('Xfce 4.4.0 provides easy access to data on removable drives and media. Just insert the media into the drive or plug the new drive in to the computer and an icon representing the removable volume will appear on the desktop and in <b>Thunar</b>\'s side pane.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/removable-volumes.png" alt="Removable Volumes" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/removable-volumes.png" alt="Removable Volumes" /></p>
<p>
<?php E_('Click on the icon to automatically mount the volume. Right-click the icon to unmount the drive or eject the media from the drive. Note however that this feature requires <a href="http://freedesktop.org/wiki/Software_2fhal">HAL</a> and is therefore only available for Linux 2.6.x and FreeBSD 6.x and above at the time of this writing (there is limited removable media support for FreeBSD 4.x and 5.x which does not require HAL).') ?>
@@ -62,7 +62,7 @@
<?php E_('The new text editor <b>MousePad</b> is included with this release. <b>MousePad</b> provides all the basic editor functionality, nothing more, nothing less.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/mousepad.png" alt="MousePad" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/mousepad.png" alt="MousePad" /></p>
<p>
<?php E_('You can think of <b>MousePad</b> as the equivalent to <b>NotePad</b> on Windows. It starts up very fast, usually in less than one second, even on older systems.') ?>
@@ -74,25 +74,25 @@
<?php E_('<b>Xfwm4</b> continues to be the window manager of the hearts.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/xfwm4-argb32.png" alt="Xfwm4 ARGB32" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/xfwm4-argb32.png" alt="Xfwm4 ARGB32" /></p>
<p>
<?php E_('This release features an enhanced compositor, supporting transparent ARGB windows, shadows, window frame transparency and much more.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/xfwm4-switcher.png" alt="Xfwm4 Switcher" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/xfwm4-switcher.png" alt="Xfwm4 Switcher" /></p>
<p>
<?php E_('<b>Xfwm4</b> also includes a brand new application switcher, as shown in the screenshot above, which displays all windows from the current workspace with icons and window titles.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/xfwm4-themes.png" alt="Xfwm4 Themes" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/xfwm4-themes.png" alt="Xfwm4 Themes" /></p>
<p>
<?php E_('Further on support for multiple image formats for window decoration themes was added, including <tt>PNG</tt>, <tt>GIF</tt> and <tt>SVG</tt> images.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/xfwm4-tweaks.png" alt="Xfwm4 Tweaks" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/xfwm4-tweaks.png" alt="Xfwm4 Tweaks" /></p>
<p>
<?php E_('Advanced controls for the window manager were also added, allowing thorough tweaking of window behavior.') ?>
@@ -105,19 +105,19 @@
<?php E_('The <b>Xfce4-panel</b> was completely rewritten for the Xfce 4.4 release. Multiple panels are supported <i>out of the box</i> now and can easily be configured using the new <b>Panel Manager</b> shown in the screenshot below.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/panel-manager.png" alt="Panel Manager" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/panel-manager.png" alt="Panel Manager" /></p>
<p>
<?php E_('One of the major problems in previous Xfce releases was that every plugin had to be run in the same process as the panel, and hence every plugin was able to crash the whole panel. To address this issue, support for external plugins was added to the panel.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/panel-additem.png" alt="Panel Add Item Dialog" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/panel-additem.png" alt="Panel Add Item Dialog" /></p>
<p>
<?php E_('Developers of panel plugins can now decide whether the plugin should run as external process or as part of the panel process, depending on the stability of the plugin.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/panel-iconbox.png" alt="Panel Icon Box Plugin" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/panel-iconbox.png" alt="Panel Icon Box Plugin" /></p>
<p>
<?php E_('Since there is now support for multiple panels, the separate <b>Xftaskbar4</b> and <b>Xfce4-iconbox</b> utilities are no longer required. Instead, both the taskbar and the iconbox are available as panel plugins now.') ?>
@@ -134,7 +134,7 @@
<?php E_('The new time management application <b>Orage</b> replaces the <b>Xfcalendar</b>, which was introduced with Xfce 4.2.0. <b>Orage</b> provides several features to efficiently manage your time.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/orage.png" alt="Orage" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/orage.png" alt="Orage" /></p>
<p>
<?php E_('While <b>Orage</b> is very lightweight and easy to use, it supports all the important features found in larger calendar applications like <b>Outlook</b> or <b>Evolution</b>. While <b>Xfcalendar</b> used the custom <tt>dbh</tt> format in the past to store your settings, <b>Orage</b> is based on <tt>ical</tt> and therefore compatible with other calendar applications.') ?>
@@ -147,7 +147,7 @@
<?php E_('While <b>Terminal</b> was already available during the 4.2 days, it was not mature enough at that time to be part of the core. With this major release, it was moved into the core desktop.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/terminal.png" alt="Terminal" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/terminal.png" alt="Terminal" /></p>
<p>
<?php E_('Besides the basic features which you might expect from a terminal emulator, it includes some nice additional features, like multiple tabs per window, customizable toolbars and the ability to configure nearly every aspect of the application via <i>hidden options</i>. As can be seen in the screenshot above, this release also supports real transparency using <b>Xfwm4</b>\'s integrated composition manager.') ?>
@@ -160,13 +160,13 @@
<?php E_('<b>Xfprint</b>, the Xfce printing management application, saw several small improvements with this release. First, the <tt>a2ps</tt> converter is not mandatory anymore, whilst still recommended. Support for <tt>CUPS</tt> 1.2 was added and <b>Xfprint</b> is now able to display the printer state with the <tt>CUPS</tt>-backend.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/xfprint.png" alt="Xfce Printing" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/xfprint.png" alt="Xfce Printing" /></p>
<p>
<?php E_('<b>Xfprint</b> also integrates with <b>MousePad</b> to provide generic printing support for different kinds of text documents using the <tt>a2ps</tt> converter.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/xfprint-dialog.png" alt="Xfce Print Dialog" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/xfprint-dialog.png" alt="Xfce Print Dialog" /></p>
<p>
<?php E_('As you can see the print dialog still looks relatively similar to that of Xfce 4.2, but the internal workings of the printing support were improved, especially the <tt>CUPS</tt> support. Besides that, the printing management functionality was moved to a library, so other applications can use the API to access the printer configuration.') ?>
@@ -179,7 +179,7 @@
<?php E_('Xfce 4.4.0 implements the new <a href="http://freedesktop.org/wiki/Standards_2fautostart_2dspec">Autostart Specification</a> - actually Xfce was the first desktop to implement said feature, but the others were faster to release. ;-)') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/autostart.png" alt="Xfce Autostart Editor" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/autostart.png" alt="Xfce Autostart Editor" /></p>
<p>
<?php E_('The specification consists of two parts, the <i>Autostart of Applications During Startup</i>, which is implemented in <b>xfce4-session</b> and the <i>Autostart Of Applications After Mount</i> which is implemented in <a href="http://foo-projects.org/~benny/projects/thunar-volman/index.html">thunar-volman</a>. This release also includes the <b>xfce4-autostart-editor</b>, shown in the screenshot above, which allows users to easily add, remove or disable autostarted applications.') ?>
@@ -192,13 +192,13 @@
<?php E_('This release introduces new options to customize the desktop to your needs. Some examples of new settings dialogs were already shown in the sections above.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/preferences-applications.png" alt="Preferred Applications" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/preferences-applications.png" alt="Preferred Applications" /></p>
<p>
<?php E_('The preferred applications framework, which was previously only available in <b>Terminal</b>, was imported into Xfce, so users no longer need to edit shell profiles to specify which browser and terminal emulator should be used by Xfce applications. The goal was to make it as easy as possible to change an application for a certain category (GNOME users may have already noticed that GNOME adopted this approach, because it is such simple).') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.4/preferences-keyboard.png" alt="Keyboard Shortcuts" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.4/preferences-keyboard.png" alt="Keyboard Shortcuts" /></p>
<p>
<?php E_('And then there was the problem with the keyboard shortcuts in Xfce 4.2... Xfce 4.2 limited the number of freely available keyboard shortcuts, while people wanted to assign any number of keyboard shortcuts. With Xfce 4.4 this limitation is history and the application shortcuts are now separated from the window manager shortcuts.') ?>
diff --git a/pages/about/tour46.php b/pages/about/tour46.php
index dbd1c61..a24a563 100644
--- a/pages/about/tour46.php
+++ b/pages/about/tour46.php
@@ -13,14 +13,14 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfdesktop-rubberbanding.png" title="<?php E_('Multiple icons selection') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfdesktop-rubberbanding.png" title="<?php E_('Multiple icons selection') ?>" alt="" />
</p>
<p>
<?php E_('<b>Xfce 4.6</b> features a brand new desktop menu which allows you to manipulate files as with the <b>Thunar</b> filemanager contextual menu, but also to open applications, exit your session, or access the help documentation.') ?>
</p>
-<p class="image"><img src="http://cdn.xfce.org/about/tour/4.6/xfdesktop-menu.png" title="<?php E_('New desktop menu') ?>" alt="" /></p>
+<p class="image"><img src="<?php echo $static_media ?>/about/tour/4.6/xfdesktop-menu.png" title="<?php E_('New desktop menu') ?>" alt="" /></p>
<h2><?php E_('Panel') ?></h2>
@@ -29,7 +29,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-panel-clock.png" title="<?php E_('New binary clock') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-panel-clock.png" title="<?php E_('New binary clock') ?>" alt="" />
</p>
<p>
@@ -43,7 +43,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-mixer.png" title="<?php E_('New sound mixer') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-mixer.png" title="<?php E_('New sound mixer') ?>" alt="" />
</p>
<h2><?php E_('Improved session manager') ?></h2>
@@ -53,7 +53,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-session-settings.png" title="<?php E_('Session settings dialog') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-session-settings.png" title="<?php E_('Session settings dialog') ?>" alt="" />
</p>
<p>
@@ -61,7 +61,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-session-logout.png" title="<?php E_('Session logout dialog') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-session-logout.png" title="<?php E_('Session logout dialog') ?>" alt="" />
</p>
<h2><?php E_('Window manager') ?></h2>
@@ -74,7 +74,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfwm4-net-ping.png" title="<?php E_('Dialog to terminate busy applications') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-net-ping.png" title="<?php E_('Dialog to terminate busy applications') ?>" alt="" />
</p>
<p>
@@ -82,7 +82,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfwm4-new-menu.png" title="<?php E_('New actions menu') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-new-menu.png" title="<?php E_('New actions menu') ?>" alt="" />
</p>
<p>
@@ -90,7 +90,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfwm4-fill-operation.png" title="<?php E_('Fill operation') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-fill-operation.png" title="<?php E_('Fill operation') ?>" alt="" />
</p>
<p>
@@ -98,7 +98,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfwm4-resize.png" title="<?php E_('Flicker free resizing') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-resize.png" title="<?php E_('Flicker free resizing') ?>" alt="" />
</p>
<p>
@@ -106,7 +106,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfwm4-new-tweaks.png" title="<?php E_('New tweakable options') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-new-tweaks.png" title="<?php E_('New tweakable options') ?>" alt="" />
</p>
<h2><?php E_('File manager') ?></h2>
@@ -116,7 +116,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/thunar-wallpaper-plugin.png" title="Set an image in a Thunar folder as wallpaper" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-wallpaper-plugin.png" title="Set an image in a Thunar folder as wallpaper" alt="" />
</p>
<p>
@@ -124,7 +124,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/thunar-xdg-user-dirs.png" title="<?php E_('Thunar menu for user directories') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-xdg-user-dirs.png" title="<?php E_('Thunar menu for user directories') ?>" alt="" />
</p>
<p>
@@ -132,7 +132,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/thunar-mounting.png" title="<?php E_('Translucent icons for unmounted drives and volumes') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-mounting.png" title="<?php E_('Translucent icons for unmounted drives and volumes') ?>" alt="" />
</p>
<p>
@@ -140,7 +140,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/thunar-encrypted.png" title="<?php E_('Thunar support for encrypted devices') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-encrypted.png" title="<?php E_('Thunar support for encrypted devices') ?>" alt="" />
</p>
<h2><?php E_('New configuration dialogs') ?></h2>
@@ -150,13 +150,13 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-settings-manager.png" title="<?php E_('Xfce4 Settings Manager') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-settings-manager.png" title="<?php E_('Xfce4 Settings Manager') ?>" alt="" />
</p>
<h3><?php E_('Accessibility settings') ?></h3>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-accessibility-settings.png" title="<?php E_('Accessibility settings dialog') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-accessibility-settings.png" title="<?php E_('Accessibility settings dialog') ?>" alt="" />
</p>
<p>
@@ -166,7 +166,7 @@
<h3><?php E_('Appearance settings') ?></h3>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-appearance-settings.png" title="<?php E_('Appearance settings dialog') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-appearance-settings.png" title="<?php E_('Appearance settings dialog') ?>" alt="" />
</p>
<p>
@@ -175,7 +175,7 @@
<h3><?php E_('Display settings') ?></h3>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-display-settings.png" title="<?php E_('Display settings dialog') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-display-settings.png" title="<?php E_('Display settings dialog') ?>" alt="" />
</p>
<p>
@@ -185,7 +185,7 @@
<h3><?php E_('Keyboard settings') ?></h3>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-keyboard-settings-layout.png" title="<?php E_('Keyboard settings dialog, layout tab') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-keyboard-settings-layout.png" title="<?php E_('Keyboard settings dialog, layout tab') ?>" alt="" />
</p>
<p>
@@ -193,7 +193,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png" title="<?php E_('Keyboard settings dialog, shortcuts tab') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png" title="<?php E_('Keyboard settings dialog, shortcuts tab') ?>" alt="" />
</p>
<p>
@@ -203,7 +203,7 @@
<h3><?php E_('Mouse settings') ?></h3>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-mouse-settings.png" title="<?php E_('Mouse settings dialog') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-mouse-settings.png" title="<?php E_('Mouse settings dialog') ?>" alt="" />
</p>
<p>
@@ -213,7 +213,7 @@
<h3><?php E_('Desktop settings') ?></h3>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfdesktop-settings.png" title="<?php E_('Desktop settings dialog') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfdesktop-settings.png" title="<?php E_('Desktop settings dialog') ?>" alt="" />
</p>
<p>
@@ -227,7 +227,7 @@
</p>
<p class="image">
- <img src="http://cdn.xfce.org/about/tour/4.6/xfce4-appfinder.png" title="<?php E_('New application finder') ?>" alt="" />
+ <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-appfinder.png" title="<?php E_('New application finder') ?>" alt="" />
</p>
<h2><?php E_('Links') ?></h2>
diff --git a/pages/about/tour.php b/pages/about/tour48.php
similarity index 73%
copy from pages/about/tour.php
copy to pages/about/tour48.php
index d96bdac..e4e38c2 100644
--- a/pages/about/tour.php
+++ b/pages/about/tour48.php
@@ -1,4 +1,4 @@
-<?php $head['title'] = R_('Tour') ?>
+<?php $head['title'] = R_('Xfce 4.8 tour') ?>
<h1><?php echo $head['title'] ?></h1>
@@ -10,19 +10,19 @@
<p><?php E_("Thunar now has optional support for GVFS which will allow you to browse remote shares using Thunar: FTP, Windows Shares, WebDav and SSH servers...") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/thunar-remote.png" alt="<?php E_("Thunar browsing a remote share") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/thunar-remote.png" alt="<?php E_("Thunar browsing a remote share") ?>" /></p>
<h3><?php E_("New file operations progress dialog") ?></h3>
<p><?php E_("When several file operations (copy or move) are being handled in parallel, Thunar now shows a single progress dialog which displays all the relevant information.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/thunar-progress.png" alt="<?php E_("Progress dialog") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/thunar-progress.png" alt="<?php E_("Progress dialog") ?>" /></p>
<h3><?php E_("Eject button for removable devices") ?></h3>
<p><?php E_("It is is now possible to eject removable devices by clicking the eject button near each removable device label in the side pane.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/thunar-eject.png" alt="<?php E_("Eject button") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/thunar-eject.png" alt="<?php E_("Eject button") ?>" /></p>
<h2><?php E_("Xfce panel") ?></h2>
@@ -36,13 +36,13 @@
<p><?php E_("The panel is now able to draw transparent panel backgrounds with non transparent items. Your panel items will remain readable and you will enjoy a nice panel look.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-transparent.png" alt="<?php E_("Transparent panel background") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/panel-transparent.png" alt="<?php E_("Transparent panel background") ?>" /></p>
<h3><?php E_("New item editor") ?></h3>
<p><?php E_("The panel now features an item editor which allows to modify, move, add and remove items quickly. This is particularly useful for items which are hard to right click and gives you an easy way to change your panel layout from a single place.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-editor.png" alt="<?php E_("Panel item editor") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/panel-editor.png" alt="<?php E_("Panel item editor") ?>" /></p>
<h3><?php E_("Drag and drop to create launchers") ?></h3>
@@ -56,13 +56,13 @@
<p><?php E_("An Xfce release without a new clock mode would not be a true Xfce release. Let us introduce you the 'fuzzy' clock mode!") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-fuzzy-clock.png" alt="<?php E_("New fuzzy clock mode") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/panel-fuzzy-clock.png" alt="<?php E_("New fuzzy clock mode") ?>" /></p>
<h3><?php E_("New directory menu plugin") ?></h3>
<p><?php E_("The directory menu plugin provides a menu reproducing the arborescence of a particular folder. This allows you to open a terminal or a file manager in a sub-folder in a very fast and efficient way.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/panel-directorymenu.png" alt="<?php E_("Directory menu plugin") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/panel-directorymenu.png" alt="<?php E_("Directory menu plugin") ?>" /></p>
<h3><?php E_("Applications menu edition") ?></h3>
@@ -76,29 +76,29 @@
<p><?php E_("You can enable and disable plugged screens, set their resolution, refresh rate, rotation and reflection, clone screens or extend desktops.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/display-settings.png" alt="<?php E_("New display settings dialog") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/display-settings.png" alt="<?php E_("New display settings dialog") ?>" /></p>
<h4><?php E_("Timed confirmation") ?></h4>
<p><?php E_("Any change made with the settings dialog will have to be confirmed within ten seconds or they will be reverted. This prevents broken video drivers from leaving your computer unusable.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/display-settings-confirmation.png" alt="<?php E_("Timed confirmation for display settings changes") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/display-settings-confirmation.png" alt="<?php E_("Timed confirmation for display settings changes") ?>" /></p>
<h4><?php E_("Quick setup dialog") ?></h4>
<p><?php E_("The quick setup dialog allows you to configure a dual screen setup in a second. Plug the second screen, press the display key or Windows + p and select the wanted layout. Done!") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/minimal-display-settings.png" alt="<?php E_("Quick multihead setup") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/minimal-display-settings.png" alt="<?php E_("Quick multihead setup") ?>" /></p>
<h3><?php E_("Settings edition in the Xfce Settings Editor") ?></h3>
<p><?php E_("The Xfce Settings Editor now deserves its name, it is no longer a simpler Xfconf settings viewer. You can now modify, delete, add and reset settings through its interface. It also monitors changes to update its view.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/settings-editor.png" alt="<?php E_("Editing Xfconf properties with the Settings Editor") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/settings-editor.png" alt="<?php E_("Editing Xfconf properties with the Settings Editor") ?>" /></p>
<h3><?php E_("Improved keyboard layout selection") ?></h3>
<p><?php E_("The layout selection dialog received a lot of love: it no longer displays cryptic language/variants codes but uses localized languages/variants names. Layout edition was also made easier by prefilling the dialogs with the current values.") ?></p>
- <p class="image"><img src="http://cdn.xfce.org/about/tour/4.8/keyboard-settings-list.png" alt="<?php E_("Layouts and variants list") ?>" /></p>
+ <p class="image"><img src="<?php echo $static_media ?>/about/tour/4.8/keyboard-settings-list.png" alt="<?php E_("Layouts and variants list") ?>" /></p>
diff --git a/pages/community/index.php b/pages/community/index.php
index 9eed9dd..fe590a2 100644
--- a/pages/community/index.php
+++ b/pages/community/index.php
@@ -2,12 +2,6 @@
$head['title'] = R_('Community');
-$toc['anchors'] = array (
- 'mail' => R_('Mailing lists'),
- 'irc' => R_('IRC'),
- 'forum' => R_('Forums'),
- 'social' => R_('Social Networks'));
-
?>
<h1><?php echo $head['title'] ?></h1>
diff --git a/pages/community/nav.php b/pages/community/nav.php
index 6cd332c..3f10222 100644
--- a/pages/community/nav.php
+++ b/pages/community/nav.php
@@ -1,12 +1,23 @@
-<?php
-
-$toc['menu'] = array (
- 'community' => R_('Community'));
-
-$toc['external'] = array (
- 'http://forum.xfce.org' => R_('Forum'),
- 'http://blog.xfce.org' => R_('Blog'),
- 'http://wiki.xfce.org' => R_('Wiki'),
- 'https://bugzilla.xfce.org' => R_('Bug tracker'));
-
-?>
+<h2><?php E_('Related Sites') ?></h2>
+<ul>
+ <li>
+ <a href="http://forum.xfce.org"><?php E_('Forums') ?>
+ <span>– <?php E_('talk about Xfce in the community forums') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="http://blog.xfce.or"><?php E_('Blog') ?>
+ <span>– <?php E_('read what the contributors to Xfce have the say') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="http://wiki.xfce.org"><?php E_('Wiki') ?>
+ <span>– <?php E_('community wiki and development resources') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="https://bugzilla.xfce.org"><?php E_('Bug Tracker') ?>
+ <span>– <?php E_('report problems, patches or ideas to help making Xfce better') ?></span>
+ </a>
+ </li>
+</ul>
diff --git a/pages/download/changelogs/index.php b/pages/download/changelogs/index.php
index 47e0722..944c13a 100644
--- a/pages/download/changelogs/index.php
+++ b/pages/download/changelogs/index.php
@@ -2,7 +2,7 @@
$head['title'] = R_('Changelogs');
-$toc['anchors'] = array (
+$major_versions = array (
'4.10' => 'Xfce 4.10',
'4.8' => 'Xfce 4.8',
'4.6' => 'Xfce 4.6',
@@ -38,7 +38,7 @@ rsort ($versions);
$printed = 0;
-foreach ($toc['anchors'] as $id => $name)
+foreach ($major_versions as $id => $name)
{
echo '<h2 id="'.$id.'">'.$name.'</h2>';
echo '<ul>';
diff --git a/pages/download/index.php b/pages/download/index.php
index 9760e96..0d40581 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -4,16 +4,6 @@ include ('pages/versions.php');
$head['title'] = R_('Download');
-$toc['anchors'] = array (
- 'stable' => R_('Stable release'),
- 'individual' => R_('Individual releases'),
- 'distros' => R_('Distributions'),
- 'artwork' => R_('Artwork'));
-
-if($preview_visible) {
- $toc['anchors'] += array ('unstable' => R_('Preview release'));
-}
-
?>
<h1><?php echo $head['title'] ?></h1>
diff --git a/pages/download/nav.php b/pages/download/nav.php
index 150b9ba..d39c721 100644
--- a/pages/download/nav.php
+++ b/pages/download/nav.php
@@ -1,14 +1,36 @@
-<?php
+<h2><?php E_('Related Pages') ?></h2>
+<ul>
+ <li>
+ <a href="/download"><?php E_('Download') ?></a>
+ </li>
+ <li>
+ <a href="/download/changelogs"><?php E_('Changelogs') ?>
+ <span>– <?php E_('release notes of each Xfce release') ?></span>
+ </a>
+ </li>
+</ul>
-include ('pages/versions.php');
-$toc['menu'] = array (
- 'download' => R_('Download'),
- 'download/changelogs' => R_('Changelogs'));
-
-$toc['external'] = array (
- 'http://docs.xfce.org/xfce/building' => R_('Building Xfce'),
- 'http://git.xfce.org/' => R_('Browse GIT repositories'),
- 'http://goodies.xfce.org' => R_('Xfce goodies'));
-
-?>
+<h2><?php E_('Related Sites') ?></h2>
+<ul>
+ <li>
+ <a href="http://archive.xfce.org"><?php E_('Archive') ?>
+ <span>– <?php E_('the Xfce download archive') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="http://docs.xfce.org/xfce/building"><?php E_('Building') ?>
+ <span>– <?php E_('documentation on building Xfce from sourc') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="http://git.xfce.org"><?php E_('GIT') ?>
+ <span>– <?php E_('browse the source repositories') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="http://goodies.xfce.org"><?php E_('Goodies') ?>
+ <span>– <?php E_('wiki with information on additional software for Xfce') ?></span>
+ </a>
+ </li>
+</ul>
diff --git a/pages/footer.php b/pages/footer.php
index 03b0844..c80ddfa 100644
--- a/pages/footer.php
+++ b/pages/footer.php
@@ -1,6 +1,8 @@
</div> <!-- page-contents -->
+ <div class="clearboth"></div>
+ </div> <!-- content-wrap -->
<div id="footer">
- <hr />
+ <hr class="hidden" />
<p><?php printf (R_('Copyright %s <a href="/about/credits">Xfce Development Team</a>. This page was last modified on %s.'), '2003-'.date ('Y'), $footer['mtime']) ?></p>
</div>
</div> <!-- page-wrap -->
diff --git a/pages/frontpage.php b/pages/frontpage.php
index 8fc8a20..3508bb8 100644
--- a/pages/frontpage.php
+++ b/pages/frontpage.php
@@ -6,10 +6,9 @@ include ('pages/versions.php');
$head['description'] = 'Xfce Desktop Environment';
$head['keywords'] = 'desktop environment, window manager, desktop, speed, lightweight, gtk+, open source, xforms common environment';
$head['feed'] = 'http://www.xfce.org/feed?lang='.$lang;
-$head['pagediv'] = false;
?>
-<div id="slidewrap" class="page_contents">
+<div id="slidewrap">
<div id="slide">
<ul>
<li>
@@ -68,23 +67,40 @@ var slideshow=new TINY.slider.slide('slideshow',{
});
</script>
-<div class="page_contents file_frontpage">
+<div class="frontpage_cols">
<div class="column">
<div class="lcolumn">
<h2><?php E_('Xfce Desktop Environment') ?></h2>
<p><?php E_('Xfce is a lightweight desktop environment for UNIX-like operating systems. It aims to be fast and low on system resources, while still being visually appealing and user friendly.') ?></p>
<ul>
- <li><a href="/download"><?php printf (R_('Download the latest %s release'), $stable_version) ?></a></li>
- <li><a href="/download/changelogs/4.8.0"><?php printf (R_('Release notes for %s'), $stable_version) ?></a></li>
- <li><a href="/about/tour"><?php E_('Visual tour of Xfce 4.8') ?></a></li>
- <li><a href="/about/screenshots"><?php E_('Screenshots') ?></a></li>
+ <li>
+ <a href="/download"><?php E_('Download') ?>
+ <span>– <?php E_('get the source tarballs') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="/download/changelogs/4.10"><?php E_('ChangeLog') ?>
+ <span>– <?php printf (R_('release notes for Xfce %s'), $stable_version) ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="/about/tour"><?php printf (R_('%s Tour'), $stable_version) ?>
+ <span>– <?php E_('visual tour about new features in the lastest releases') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="/about/screenshots"><?php E_('Screenshots') ?>
+ <span>– <?php E_('examples of Xfce desktops ordered by version') ?></span>
+ </a>
+ </li>
</ul>
</div>
</div>
<div class="column">
<div class="rcolumn">
+ <span class="rss"><a href="http://www.xfce.org/feed?lang=<?php echo $lang ?>"><?php E_('Subscribe to RSS feed') ?></a></span>
<h2><?php E_('Latest News') ?></h2>
<?php
$count = 2;
@@ -119,3 +135,5 @@ var slideshow=new TINY.slider.slide('slideshow',{
</div>
<div class="clearboth"></div>
+
+</div>
diff --git a/pages/getinvolved/index.php b/pages/getinvolved/index.php
index af7ae19..7471700 100644
--- a/pages/getinvolved/index.php
+++ b/pages/getinvolved/index.php
@@ -9,14 +9,16 @@
<?php E_('Possible tasks include testing, bug reporting; writing code, developing artwork, documentation or translations; or spreading the word and helping out with promotion and marketing both on line and at tradeshows and conferences.') ?>
</p>
-<h2><a href="http://docs.xfce.org/wiki/documentation"><?php E_('Documentation') ?></a></h2>
+<h2><?php E_('Documentation') ?></h2>
<p>
<?php E_('There\'s lots of people using and testing Xfce. By providing useful and up-to-date documentation, you will make a big impact on helping people understand how to make the most of the Xfce Desktop Environement.') ?>
+ <a href="http://docs.xfce.org/wiki/documentation"><?php E_('Learn More →') ?></a>
</p>
-<h2><a href="/getinvolved/translation"><?php E_('Translation') ?></a></h2>
+<h2><?php E_('Translation') ?></h2>
<p>
<?php E_('Are you fluent in multiple languages? By contributing your translations of text to the Xfce Desktop Environement, you will help Xfce be a better part of the global market and more accessible to the millions of potential users out there.') ?>
+ <a href="/getinvolved/translation"><?php E_('Learn More →') ?></a>
</p>
<h2><?php E_('Development') ?></h2>
diff --git a/pages/getinvolved/nav.php b/pages/getinvolved/nav.php
index 15360ce..70f9ea2 100644
--- a/pages/getinvolved/nav.php
+++ b/pages/getinvolved/nav.php
@@ -1,17 +1,31 @@
-<?php
+<h2><?php E_('Related Pages') ?></h2>
+<ul>
+ <li>
+ <a href="/getinvolved"><?php E_('Get Involved') ?></a>
+ </li>
+ <li>
+ <a href="/getinvolved/translation"><?php E_('Translation') ?>
+ <span>– <?php E_('information about translating Xfce') ?></span>
+ </a>
+ </li>
+</ul>
-$toc['menu'] = array (
- 'getinvolved' => R_('Get Involved'),
- /*'getinvolved/documentation' => R_('Documentation'),*/
- 'getinvolved/translation' => R_('Translation'),
- /*'getinvolved/development' => R_('Development'),
- 'getinvolved/promotion' => R_('Promotion'),
- 'getinvolved/testing' => R_('Testing'),
- 'getinvolved/bugreporting' => R_('Bug Reporting')*/);
-$toc['external'] = array (
- 'https://bugzilla.xfce.org' => R_('Report a bug'),
- 'https://translations.xfce.org' => R_('Translations'),
- 'http://buildbot.xfce.org' => R_('Buildbot'));
-
-?>
+<h2><?php E_('Related Sites') ?></h2>
+<ul>
+ <li>
+ <a href="https://bugzilla.xfce.org"><?php E_('Bug Tracker') ?>
+ <span>– <?php E_('report problems, patches or ideas to help making Xfce better') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="https://translations.xfce.org"><?php E_('Transifex') ?>
+ <span>– <?php E_('the Xfce translation portal') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="http://buildbot.xfce.org"><?php E_('Buildbot') ?>
+ <span>– <?php E_('view the buildslaves activity') ?></span>
+ </a>
+ </li>
+</ul>
diff --git a/pages/getinvolved/translation.php b/pages/getinvolved/translation.php
index fbd110d..a69fee5 100644
--- a/pages/getinvolved/translation.php
+++ b/pages/getinvolved/translation.php
@@ -2,12 +2,6 @@
$head['title'] = R_('Translation');
-$toc['anchors'] = array (
- 'started' => R_('Getting Started'),
- 'teamwork' => R_('Team Work'),
- 'coordinator' => R_('Team Coordinator'),
- 'transifex' => R_('Transifex Usage'));
-
?>
<h1><?php echo $head['title'] ?></h1>
diff --git a/pages/header.php b/pages/header.php
index f77d37e..45dd732 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -45,8 +45,8 @@ else
<div id="xfce-header-clear"></div>
</div>
-<div class="page-wrap">
- <div id="menu-main">
+<div id="main">
+ <div id="mainnav">
<div>
<h5 class="hidden"><?php E_('Categories') ?></h5>
<ul>
@@ -78,50 +78,14 @@ else
<div class="clearboth"></div>
</div>
+ <div id="content">
<?php
if (isset($toc['filename']))
{
+ echo '<div id="sidebar">';
include ($toc['filename']);
-
- echo '<div id="menu-sub">';
-
- if (isset($toc['menu']))
- {
- echo '<h5>'.R_('Category Pages').'</h5>';
- echo '<ul>';
- foreach ($toc['menu'] as $link => $name)
- {
- echo '<li><a href="/'.$link.'">'.$name.'</a>';
-
- if (isset ($toc['anchors']) && strcmp ($uri, $link) == 0)
- {
- echo '<ul>';
- foreach ($toc['anchors'] as $id => $name)
- echo '<li><a href="#'.$id.'">'.$name.'</a></li>';
- echo '</ul>';
- }
-
- echo '</li>';
- }
- echo '</ul>';
- }
-
- if (isset($toc['external']))
- {
- echo '<h5>'.R_('Related Sites').'</h5>';
- echo '<ul>';
- foreach ($toc['external'] as $link => $name)
- echo '<li><a href="'.$link.'" class="external">'.$name.'</a></li>';
- echo '</ul>';
- }
-
echo '</div>';
}
-
- if (!isset ($head['pagediv']) || $head['pagediv'] == true)
- {
-?>
- <div class="page_contents file_<?php echo $page_class ?>">
-<?php
- }
?>
+
+ <div id="article" class="file_<?php echo $page_class ?>">
diff --git a/pages/projects/index.php b/pages/projects/index.php
index 94a67d1..ae0d804 100644
--- a/pages/projects/index.php
+++ b/pages/projects/index.php
@@ -3,10 +3,6 @@
$head['title'] = R_('Projects');
$head['stylesheet'] = array ('/style/projects.css');
-$toc['anchors'] = array (
- 'core' => R_('Core Components'),
- 'applications' => R_('Applications'));
-
?>
<h1><?php echo $head['title'] ?></h1>
<p>
@@ -16,69 +12,78 @@ $toc['anchors'] = array (
<h2 id="core"><?php E_('Core Components') ?></h2>
<div class="column"><div class="lcolumn">
- <h3><a href="http://docs.xfce.org/xfce/xfwm4/start" class="external"><?php E_('Window Manager') ?></a></h3>
+ <h3><?php E_('Window Manager') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfwm4.png')">
<?php E_('It manages the placement of application windows on the screen, provides window decorations and manages workspaces or virtual desktops.') ?>
+ <a href="http://docs.xfce.org/xfce/xfwm4/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="column"><div class="rcolumn">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-panel/start" class="external"><?php E_('Panel') ?></a></h3>
+ <h3><?php E_('Panel') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfce4-panel.png')">
<?php E_('The panel is a bar which allows you to have at all times program launchers, panel menus, a clock, a desktop switcher and more.') ?>
+ <a href="http://docs.xfce.org/xfce/xfce4-panel/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="clearboth"></div>
<div class="column"><div class="lcolumn">
- <h3><a href="http://docs.xfce.org/xfce/xfdesktop/start" class="external"><?php E_('Desktop Manager') ?></a></h3>
+ <h3><?php E_('Desktop Manager') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfdesktop.png')">
<?php E_('This program sets the background image and provides a root window menu, desktop icons or minimized icons and a windows list.') ?>
+ <a href="http://docs.xfce.org/xfce/xfdesktop/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="column"><div class="rcolumn">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-session/start" class="external"><?php E_('Session Manager') ?></a></h3>
+ <h3><?php E_('Session Manager') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfce4-session.png')">
<?php E_('The session manager controls all aspects of the startup and the shutdown of the user session.') ?>
+ <a href="http://docs.xfce.org/xfce/xfce4-session/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="clearboth"></div>
<div class="column"><div class="lcolumn">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-settings/start" class="external"><?php E_('Settings Manager') ?></a></h3>
+ <h3><?php E_('Settings Manager') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfce4-settings.png')">
<?php E_('It allows you to configure every detail of your desktop environment.') ?>
+ <a href="http://docs.xfce.org/xfce/xfce4-settings/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="column"><div class="rcolumn">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-appfinder/start" class="external"><?php E_('Application Finder') ?></a></h3>
+ <h3><?php E_('Application Finder') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfce4-appfinder.png')">
<?php E_('Allows you to search, launch and find information about applications installed on your system.') ?>
+ <a href="http://docs.xfce.org/xfce/xfce4-appfinder/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="clearboth"></div>
<div class="column"><div class="lcolumn">
- <h3><a href="http://docs.xfce.org/xfce/exo/start" class="external"><?php E_('Xfce Libraries') ?></a></h3>
+ <h3><?php E_('Xfce Libraries') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/library.png')">
<?php E_('They provide additional functions and widgets which ease the development of applications.') ?>
+ <a href="http://docs.xfce.org/xfce/exo/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="column"><div class="rcolumn">
- <h3><a href="http://docs.xfce.org/xfce/xfconf/start" class="external">Xfconf</a></h3>
+ <h3>Xfconf</h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/library.png')">
<?php E_('Simple client-server configuration storage and query system.') ?>
+ <a href="http://docs.xfce.org/xfce/xfconf/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="clearboth"></div>
<div class="column"><div class="lcolumn">
- <h3><a href="http://docs.xfce.org/xfce/thunar/start" class="external"><?php E_('Thunar File Manager') ?></a></h3>
+ <h3><?php E_('Thunar File Manager') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/thunar.png')">
<?php E_('Thunar is a new modern file manager designed from the ground up to be fast and easy-to-use.') ?>
+ <a href="http://docs.xfce.org/xfce/thunar/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="clearboth"></div>
@@ -87,15 +92,17 @@ $toc['anchors'] = array (
<h2 id="applications"><?php E_('Applications') ?></h2>
<div class="column"><div class="lcolumn">
- <h3><a href="http://www.twotoasts.de/index.php?/pages/midori_summary.html" class="external"><?php E_('Web Browser') ?></a></h3>
+ <h3><?php E_('Web Browser') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/midori.png')">
<?php E_('Midori is a lightweight Web browser.') ?>
+ <a href="http://www.twotoasts.de/index.php?/pages/midori_summary.html"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="column"><div class="rcolumn">
- <h3><a href="http://docs.xfce.org/apps/terminal/start" class="external"><?php E_('Terminal') ?></a></h3>
+ <h3><?php E_('Terminal') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/terminal.png')">
<?php E_('Terminal is a modern terminal emulator featuring tabs and transparent backgrounds.') ?>
+ <a href="http://docs.xfce.org/apps/terminal/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="clearboth"></div>
@@ -125,9 +132,10 @@ $toc['anchors'] = array (
</p>
</div></div>
<div class="column"><div class="rcolumn">
- <h3><a href="http://docs.xfce.org/apps/ristretto/start" class="external"><?php E_('Image Viewer') ?></a></h3>
+ <h3><?php E_('Image Viewer') ?></h3>
<p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/ristretto.png')">
<?php E_('Ristretto is a lightweight image viewer.') ?>
+ <a href="http://docs.xfce.org/apps/ristretto/start"><?php E_('Learn More →') ?></a>
</p>
</div></div>
<div class="clearboth"></div>
diff --git a/pages/projects/nav.php b/pages/projects/nav.php
index 56e0958..fe81a21 100644
--- a/pages/projects/nav.php
+++ b/pages/projects/nav.php
@@ -1,10 +1,13 @@
-<?php
-
-$toc['menu'] = array (
- 'projects' => R_('Projects'));
-
-$toc['external'] = array (
- 'http://goodies.xfce.org' => R_('Xfce Goodies'),
- 'http://docs.xfce.org' => R_('Xfce Docs Wiki'));
-
-?>
+<h2><?php E_('Related Sites') ?></h2>
+<ul>
+ <li>
+ <a href="http://docs.xfce.org"><?php E_('Docs') ?>
+ <span>– <?php E_('online documentation for the core modules of Xfce') ?></span>
+ </a>
+ </li>
+ <li>
+ <a href="http://goodies.xfce.org"><?php E_('Goodies') ?>
+ <span>– <?php E_('wiki with information on additional software for Xfce') ?></span>
+ </a>
+ </li>
+</ul>
diff --git a/style/base.css b/style/base.css
index 1d7ef09..7d68b4f 100644
--- a/style/base.css
+++ b/style/base.css
@@ -1,99 +1,96 @@
-body {
+body, h1, h2, h3, h4, ol, ul, li {
margin: 0;
- padding: 0;
- font-family: 'Helvetica Neue Light', HelveticaNeue-Light, 'Helvetica Neue', Helvetica, Arial, sans-serif;
- font-size: 80%;
- line-height: 1.7em;
+ padding: 0;
+ font-weight: normal;
+ font-style: normal;
+}
+
+body {
+ font: 12px/18px "Bitstream Vera Sans", "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
background-color: #eee;
+ color: #000;
}
-.page-wrap {
+#main {
margin: auto;
+ padding: 0 6px;
text-align: left;
- padding: 12px;
min-width: 850px;
max-width: 1000px;
}
-.page_contents {
- margin-right: 205px;
- background: #fff;
- padding: 1.2em;
+#content {
+ background-color: #fff;
+
box-shadow: 0 0 3px rgba(0, 0, 0, .25);
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
+
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+#article {
+ margin-right: 230px;
+ padding: 2em;
+ border-right: 1px solid #ccc;
+ line-height: 1.7em;
}
-#menu-main {
+#article p {
+ text-align: justify;
+}
+
+#article ul, #article ol {
+ list-style-position: outside;
+ margin-left: 3em;
+}
+
+#mainnav {
padding: 6px 0;
}
-#menu-main ul {
+#mainnav ul {
list-style: none;
- margin: 0;
- padding: 0;
line-height: 2em;
}
-#menu-main ul li {
+
+#mainnav ul li {
border-left: 1px solid #ccc;
float: left;
padding: 0 1em 0 1em;
- margin: 0;
font-weight: bold;
}
-#menu-main ul li:first-child {
+
+#mainnav ul li:first-child {
border-left: 0;
- padding-left: 0;
-}
-#menu-main ul li a {
- color: #666;
- text-decoration: none;
}
-#menu-main ul li a:hover {
- color: #06c;
- text-decoration: underline;
-}
-#menu-main select {
+
+#mainnav select {
float: right;
}
-#menu-sub {
+#sidebar {
float: right;
- width: 170px;
- background: #fff;
- border: 1px solid #ccc;
- padding: 10px;
- padding-top: 0;
- box-shadow: 0 0 3px rgba(0, 0, 0, .25);
- -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
- -moz-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
-}
-#menu-sub ul {
- list-style: none;
- list-style-image: url('img/bullit.gif');
- margin: 0;
- padding: 0;
- font-weight: bold;
- margin-left: 10px;
-}
-#menu-sub ul li ul {
- list-style-image: none;
- font-weight: normal;
-}
-#menu-sub a {
- display: block;
- color: #666;
+ width: 230px;
+ border-left: 1px solid #ccc;
}
-#menu-sub a:hover {
- color: #06c;
+
+#sidebar ul {
+ margin-left: 3em;
+ margin-right: 1em;
}
-#menu-sub h5 {
- margin-top: 10px;
- font-size: 140%;
+
+#sidebar ul li {
+ margin-bottom: 6px;
}
-.page_contents p {
- text-align: justify;
+#sidebar h2 {
+ font-size: 16px;
+ font-weight: normal;
+ padding: 0;
+ margin: 2em 1em 6px 1em;
}
#footer {
@@ -102,88 +99,52 @@ body {
text-align: center;
}
-#footer hr {
- display: none;
-}
+h1, h2, h3, h4, dl dt { color: #333;}
+h1 { font-size: 24px; font-weight: normal; }
+h2, h3, h4 { font-weight: bold; margin: 1em 0; }
+h2 { font-size: 16px; }
+h3 { font-size: 1em; }
+h4 { font-size: 10px; }
-#footer a {
- color: #999;
- text-decoration: underline;
+a {
+ color: #06c;
+ text-decoration: none;
}
-#footer a:hover {
+a:hover {
color: #f00;
+ text-decoration: underline;
}
-table th {
- text-align: left;
-}
-
-p em {
- background-color: #ccc;
- font-family: monospace;
- font-style: normal;
- padding: 0.1em 0.2em;
-}
-
-table tr:nth-child(even) {
- background: #ccc;
-}
-table td {
- padding: 0.2em;
+a span {
+ color: #333;
}
-h1, h2, h3, h4, h5 {
- color: #666;
- border-bottom: 1px solid #ccc;
- font-weight: normal;
- margin: 0 0 1em 0;
- padding: 0.5em 0 0 0;
-}
-h3, h4, h5 {
- border-bottom: none;
- margin: 0 0 0.2em 0;
- padding: 0.2em 0 0 0;
+a:hover span {
+ color: #f00;
}
ul {
list-style-type: square;
}
-dt {
+dl dt {
font-weight: bold;
}
-a {
- color: #06c;
- text-decoration: none;
-}
-
-a:hover {
- color: #f00;
- text-decoration: underline;
-}
-
-code {
- font-family: monospace;
- color: #fff;
- background-color: #333;
- display: inline-block;
- padding: 0.7em;
- white-space: pre;
-}
-
-blockquote {
- margin: 0 1em;
+dl dd {
+ margin: 0 0 1em 3em;
}
div.column {
float: left;
width: 50%;
}
+
div.lcolumn {
margin-right: 12px;
}
+
div.rcolumn {
margin-left: 12px;
}
@@ -195,14 +156,14 @@ div.column p.colicon {
min-height: 48px;
}
-.clearboth {
- clear: both;
+p.image img {
+ margin: auto;
+ display: block;
+
}
-.external {
- background: url('img/external.gif') no-repeat 100% 50%;
- padding: 0 15px 0 0;
- margin: 0 5px 0 0;
+.clearboth {
+ clear: both;
}
.hidden {
@@ -213,11 +174,3 @@ div.column p.colicon {
unicode-bidi: bidi-override;
direction: rtl;
}
-
-.center {
- text-align: center;
-}
-
-.image {
- margin-left: 50px;
-}
diff --git a/style/frontpage.css b/style/frontpage.css
index 218955a..099a60e 100644
--- a/style/frontpage.css
+++ b/style/frontpage.css
@@ -1,21 +1,30 @@
-.file_frontpage {
+#article.file_frontpage {
margin-right: 0;
+ padding: 0;
+ border-right: 0;
}
-.file_frontpage h2, .file_frontpage h3 {
- padding-top: 0;
+#article.file_frontpage .post-wrap p, #article.file_frontpage h2 {
+ margin-top: 0;
}
-.file_frontpage .post-wrap p {
- margin-top: 0;
+.frontpage_cols {
+ padding: 2em;
}
#slidewrap {
margin: auto;
- background: #bcbcbc;
- margin-bottom: 12px;
- padding: 0;
+ border-bottom: 1px solid #bcbcbc;
+ background-color: #bcbcbc;
+
+ -webkit-border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ -moz-border-radius-topleft: 4px;
+ -moz-border-radius-topright: 4px;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
}
+
#slide {
position: relative;
overflow: hidden;
@@ -26,6 +35,7 @@
overflow: hidden;
margin: auto;
}
+
#slide ul {
position: absolute;
list-style: none;
@@ -34,11 +44,13 @@
margin: 0;
padding: 0;
}
+
#slide li {
float: left;
width: 800px;
height: 400px;
}
+
#slide li p {
text-align: left;
padding:6px;
@@ -54,19 +66,23 @@
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
}
+
#slide li p {
background:rgba(0, 0, 0, 0.8)
}
+
#slidenavwrap {
background: #fff;
}
-#slidenav {
+
+ul#slidenav {
list-style:none;
width: 156px;
margin: 0 auto;
padding:0;
line-height: 0;
}
+
#slidenav li {
border: 1px solid #bcbcbc;
width: 12px;
@@ -85,6 +101,7 @@
-webkit-transition: background 0.2s linear;
-o-transition: background 0.2s linear;
}
+
#slidenav li:hover {
background: #bababa;
}
diff --git a/style/img/bullit.gif b/style/img/bullit.gif
deleted file mode 100644
index b2aeb8b..0000000
Binary files a/style/img/bullit.gif and /dev/null differ
diff --git a/style/img/external.gif b/style/img/external.gif
deleted file mode 100644
index 59f8276..0000000
Binary files a/style/img/external.gif and /dev/null differ
diff --git a/style/news.css b/style/news.css
index be5ef1c..e95a473 100644
--- a/style/news.css
+++ b/style/news.css
@@ -26,9 +26,11 @@
.post-wrap {
margin-left: 65px;
+ padding-bottom: 1em;
}
.rss {
- padding-left: 17px;
- background: url('img/feed.gif') no-repeat left center;
+ padding-right: 17px;
+ background: url('img/feed.gif') no-repeat right center;
+ float: right;
}
More information about the Xfce4-commits
mailing list