Updating branch refs/heads/master
to d265f762f8db9aa60239c2c2e690cc6072375d5c (commit)
from 72ef22690f047bd30bb2ae783016d9d14658acb5 (commit)
commit d265f762f8db9aa60239c2c2e690cc6072375d5c
Author: Nick Schermer <[email protected]>
Date: Sun Apr 22 14:38:58 2012 +0200
Change image handling.
lib/core.php | 14 +++++
pages/about/releasemodel.php | 28 ++++------
pages/about/tour.php | 37 ++++--------
pages/about/tour44.php | 53 +++++++----------
pages/about/tour46.php | 61 ++++++++------------
pages/about/tour48.php | 37 ++++--------
.../about/releasemodel/code-freeze-branching.png | Bin 37391 -> 30845 bytes
.../about/releasemodel/example-release-cycle.png | Bin 44431 -> 33291 bytes
static/about/releasemodel/feature-branching.png | Bin 40221 -> 31724 bytes
style/base.css | 26 +++++---
10 files changed, 113 insertions(+), 143 deletions(-)
diff --git a/lib/core.php b/lib/core.php
index 1c478d0..864991f 100644
--- a/lib/core.php
+++ b/lib/core.php
@@ -39,6 +39,20 @@ function learnmore ($link)
echo '<a href="'.$link.'">'. R_('Learn More →') .'</a>';
}
+function print_figure ($src, $title, $url = null)
+{
+ global $static_media;
+
+ echo '<table class="figure"><tbody>'.
+ '<tr><th>'.$title.'</th></tr><tr><td>';
+ if ($url != null)
+ echo '<a href="'.$url.'">';
+ echo '<img src="'.$static_media.'/'.$src.'" border="0" alt="'.basename
($src, '.png').'" />';
+ if ($url != null)
+ echo '</a>';
+ echo '</td></tr></tbody></table>';
+}
+
/* lookup the coresponding page for an uri */
function lookup_page($uri)
{
diff --git a/pages/about/releasemodel.php b/pages/about/releasemodel.php
index e41f919..ae79716 100644
--- a/pages/about/releasemodel.php
+++ b/pages/about/releasemodel.php
@@ -68,11 +68,9 @@ $head['title'] = R_('Release Model');
<?php E_('Below you can see a graphical timeline of an example release cycle
and maintenance process for Xfce 4.8 with three components: Thunar, exo and
xfwm4.') ?>
</p>
-<p>
- <a href="<?php echo $static_media;
?>/about/releasemodel/example-release-cycle.svg">
- <img src="<?php echo $static_media;
?>/about/releasemodel/example-release-cycle.png" title="<?php E_('Example
Release Cycle') ?>" alt="" />
- </a>
-</p>
+<?php print_figure ('about/releasemodel/example-release-cycle.png',
+ R_('Example Release Cycle'),
+
$static_media.'/about/releasemodel/example-release-cycle.svg') ?>
<h2><?php E_('Planning Phase (2(+2) Weeks)') ?></h2>
@@ -194,11 +192,9 @@ $head['title'] = R_('Release Model');
<?php E_('This is how the basic development workflow looks like:') ?>
</p>
-<p>
- <a href="<?php echo $static_media;
?>/about/releasemodel/feature-branching.svg">
- <img src="<?php echo $static_media;
?>/about/releasemodel/feature-branching.png" title="<?php E_('Development
Workflow') ?>" alt="" />
- </a>
-</p>
+<?php print_figure ('about/releasemodel/feature-branching.png',
+ R_('Development Workflow'),
+ $static_media.'/about/releasemodel/feature-branching.svg')
?>
<h2><?php E_('Release Phase (10+ Weeks)') ?></h2>
@@ -263,11 +259,9 @@ $head['title'] = R_('Release Model');
<?php E_('The code freeze and its exceptions are supported by commit hooks.
There is an update hook which doesn\'t allow any changes to master unless they
are signed off by the release manager. ') ?>
</p>
-<p>
- <a href="<?php echo $static_media;
?>/about/releasemodel/code-freeze-branching.svg">
- <img src="<?php echo $static_media;
?>/about/releasemodel/code-freeze-branching.png" title="<?php E_('Tagging and
Branching for Releases') ?>" alt="" />
- </a>
-</p>
+<?php print_figure ('about/releasemodel/code-freeze-branching.png',
+ R_('Tagging and Branching for Releases'),
+
$static_media.'/about/releasemodel/code-freeze-branching.svg') ?>
<h4><?php E_('Bugfixes/Changes') ?></h4>
@@ -335,6 +329,6 @@ $head['title'] = R_('Release Model');
</p>
<ul>
- <li>Jannis Pohlmann <<?php echo mungify_mail('[email protected]') ?></li>
- <li>Stephan Arts <<?php echo mungify_mail('[email protected]') ?></li>
+ <li>Jannis Pohlmann <<?php echo mungify_mail('[email protected]')
?>></li>
+ <li>Stephan Arts <<?php echo mungify_mail('[email protected]') ?>></li>
</ul>
diff --git a/pages/about/tour.php b/pages/about/tour.php
index 9580ab1..3deff54 100644
--- a/pages/about/tour.php
+++ b/pages/about/tour.php
@@ -1,15 +1,4 @@
-<?php
-
-$head['title'] = R_('Xfce 4.10 tour');
-
-function print_img ($file, $title)
-{
- global $static_media;
-
- echo '<div class="image"><div><img
src="'.$static_media.'/about/tour/4.10/'.$file.'.png" alt="'.$file.'""
/></div>'.$title.'</div>';
-}
-
-?>
+<?php $head['title'] = R_('Xfce 4.10 tour'); ?>
<h1><?php echo $head['title'] ?></h1>
@@ -19,7 +8,7 @@ function print_img ($file, $title)
<p><?php E_("During the 4.10 development we've decided to remove user
manuals from the packages and move them to an online wiki at <a
href=\"http://docs.xfce.org\";>docs.xfce.org</a>. The reason for this change is
to make <a href=\"http://docs.xfce.org/wiki/documentation\";>contributing</a>
and updating the documentation easier.") ?></p>
- <?php print_img ("online-help", R_("When you click a Help button Xfce will
ask you to go to an online wiki page.")) ?>
+ <?php print_figure ("about/tour/4.10/online-help.png", R_("When you click a
Help button Xfce will ask you to go to an online wiki page.")) ?>
<p><?php E_("We hope that with the introduction of the wiki it will be
easier for developers and contributors to maintain the documentation.") ?></p>
@@ -27,9 +16,9 @@ function print_img ($file, $title)
<p><?php E_("The application finder has been completely rewritten and
combines the functionality of the old appfinder and xfrun4. Apart from user
interface improvements, it now allows creating custom actions matching a prefix
or a regex pattern.") ?></p>
- <?php print_img ("appfinder-collapsed", R_("Collapsed view of the
Application Finder.")) ?>
+ <?php print_figure ("about/tour/4.10/appfinder-collapsed.png", R_("Collapsed
view of the Application Finder.")) ?>
- <?php print_img ("appfinder-expanded", R_("Expanded view of the Application
Finder.")) ?>
+ <?php print_figure ("about/tour/4.10/appfinder-expanded.png", R_("Expanded
view of the Application Finder.")) ?>
<h2><?php E_("Panel") ?> <em>(xfce4-panel)</em></h2>
@@ -37,19 +26,19 @@ function print_img ($file, $title)
<p><?php E_("In 4.10 there is a single panel-wide option for configuring
the number of rows in the panel. Some plugins (e.g. <em>launchers</em>) fit a
single row, while others, like window buttons are allowed to occupy full width
of the panel.") ?></p>
- <?php print_img ("panel-rows", R_("A horizontal panel with a number of
rows set to three.")) ?>
+ <?php print_figure ("about/tour/4.10/panel-rows.png", R_("A horizontal
panel with a number of rows set to three.")) ?>
<h3><?php E_("Deskbar Mode") ?></h3>
<p><?php E_("The panel features a new configuration called a
<em>deskbar</em> mode. In the deskbar mode the panel is aligned vertically,
just like in the vertical mode, but the plugins are laid out horizontally. With
multiple rows, it allows creating wide vertical panels suitable for wide-screen
setups.") ?></p>
- <?php print_img ("panel-deskbar", R_("A panel in Deskbar mode with a
number of rows set to five.")) ?>
+ <?php print_figure ("about/tour/4.10/panel-deskbar.png", R_("A panel in
Deskbar mode with a number of rows set to five.")) ?>
<h3><?php E_("Actions Plugin") ?></h3>
<p><?php E_("Session plugin from the xfce4-session package has been merged
with a rewritten <em>actions</em> plugin") ?></p>
- <?php print_img ("panel-actions", R_("Action plugin in a menu mode (left),
and in a button mode (right).")) ?>
+ <?php print_figure ("about/tour/4.10/panel-actions.png", R_("Action plugin
in a menu mode (left), and in a button mode (right).")) ?>
<h3><?php E_("Window Buttons") ?></h3>
@@ -67,7 +56,7 @@ function print_img ($file, $title)
<p><?php E_("Another noticeable change is the way GNOME and KDE
compatibility works. Compatibility check boxes only enable services, which have
to be started before other applications (<em>gnome-keyring</em> and
<em>gconf</em> for GNOME and <em>kdeinit</em> for KDE). All other autostart
applications are available from <strong>Applications Autostart</strong>, but
they are listed using an italic font and not enabled by default in order to
distinguish them from Xfce applications. Unlike in previous versions of Xfce,
compatibility services can be started independently from each other.") ?></p>
- <?php print_img ("session-autostart", R_("Applications, which are not a
part of Xfce, are listed using an italic font.")) ?>
+ <?php print_figure ("about/tour/4.10/session-autostart.png",
R_("Applications, which are not a part of Xfce, are listed using an italic
font.")) ?>
<h2><?php E_("Settings") ?> <em>(xfce4-settings)</em></h2>
@@ -79,7 +68,7 @@ function print_img ($file, $title)
<p><?php E_("The new <em>settings manager</em> groups configuration
dialogs in categories and allows you to search for their names or descriptions.
Most of the dialogs are also now embedded in the settings manager window (this
was a compile-time option in Xfce 4.8).") ?></p>
- <?php print_img ("settings-manager", R_("The settings manager with icons
grouped by category and a search filter applied.")) ?>
+ <?php print_figure ("about/tour/4.10/settings-manager.png", R_("The
settings manager with icons grouped by category and a search filter applied."))
?>
<h3><?php E_("Settings Editor") ?></h3>
@@ -87,19 +76,19 @@ function print_img ($file, $title)
<p><?php E_("Using settings editor you can also monitor changes of
settings in a selected channel. Right-click on a channel in the main window,
and select <strong>Monitor</strong> to display the monitor window.") ?></p>
- <?php print_img ("settings-editor", R_("Settings editor with an open
channel monitor, while editing a property in-place.")) ?>
+ <?php print_figure ("about/tour/4.10/settings-editor.png", R_("Settings
editor with an open channel monitor, while editing a property in-place.")) ?>
<h3><?php E_("MIME Type Editor") ?></h3>
<p><?php E_("In the last couple of years, many people were asking for a
tool to manage their file type associations. The new <em>MIME type editor</em>
does just that. It allows you to easily assign a default application to a file
type, see your changes and reset them to default settings when necessary. Note
that it does not allow you to change the system MIME Type definitions (add or
remove types and change icons).") ?></p>
- <?php print_img ("settings-mime", R_("MIME types matching a pattern and a
menu for selecting a default application.")) ?>
+ <?php print_figure ("about/tour/4.10/settings-mime.png", R_("MIME types
matching a pattern and a menu for selecting a default application.")) ?>
<h3><?php E_("Mouse and Touchpad") ?></h3>
<p><?php E_("The <em>mouse and touchpad</em> dialog is capable of handling
basic Synaptics and Wacom properties in the GUI. A settings daemon running in
the background handles all kinds of device properties, as documented in the <a
href=\"http://docs.xfce.org/xfce/xfce4-settings/mouse\";>mouse settings</a>
wiki.") ?></p>
- <?php print_img ("settings-mouse", R_("Synaptics touchpad settings in the
<em>mouse and touchpad</em> dialog")) ?>
+ <?php print_figure ("about/tour/4.10/settings-mouse.png", R_("Synaptics
touchpad settings in the <em>mouse and touchpad</em> dialog")) ?>
<h3><?php E_("Appearance Settings") ?></h3>
@@ -109,7 +98,7 @@ function print_img ($file, $title)
<p><?php E_("Although the initial plan for Xfce 4.10 was to integrate
desktop handling in Thunar, we have decided not to do it at this time yet.
Meanwhile, Xfdesktop has gained support for single-click operation, automated
background image cycling and thumbnail rendering.") ?></p>
- <?php print_img ("xfdesktop", R_("Desktop with image thumbnails and support
for single-click operation.")) ?>
+ <?php print_figure ("about/tour/4.10/xfdesktop.png", R_("Desktop with image
thumbnails and support for single-click operation.")) ?>
<p><?php E_("Xfdesktop is now shipped with a new set of background images.")
?></p>
diff --git a/pages/about/tour44.php b/pages/about/tour44.php
index 907b7fa..d99a433 100644
--- a/pages/about/tour44.php
+++ b/pages/about/tour44.php
@@ -1,15 +1,4 @@
-<?php
-
-$head['title'] = R_('Xfce 4.4 tour');
-
-function print_img ($file, $title)
-{
- global $static_media;
-
- echo '<div class="image"><div><img
src="'.$static_media.'/about/tour/4.4/'.$file.'.png" alt="'.$file.'""
/></div>'.$title.'</div>';
-}
-
-?>
+<?php $head['title'] = R_('Xfce 4.4 tour'); ?>
<h1><?php echo $head['title'] ?></h1>
@@ -23,13 +12,13 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('desktop-icons', R_('Desktop Icons')) ?>
+<?php print_figure ('about/tour/4.4/desktop-icons.png', R_('Desktop Icons')) ?>
<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>
-<?php print_img ('desktop-settings', R_('Desktop Settings')) ?>
+<?php print_figure ('about/tour/4.4/desktop-settings.png', R_('Desktop
Settings')) ?>
<p>
<?php E_('<b>Xfdesktop</b> also continues to provide access to the
applications menu, as it did in the previous Xfce releases.') ?>
@@ -42,7 +31,7 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('thunar', R_('Thunar File Manager')) ?>
+<?php print_figure ('about/tour/4.4/thunar.png', R_('Thunar File Manager')) ?>
<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.') ?>
@@ -52,7 +41,7 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('thunar-bulk-rename', R_('Thunar Bulk Rename')) ?>
+<?php print_figure ('about/tour/4.4/thunar-bulk-rename.png', R_('Thunar Bulk
Rename')) ?>
<h2><?php E_('Removable Drives and Media') ?></h2>
@@ -60,7 +49,7 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('removable-volumes', R_('Removable Volumes')) ?>
+<?php print_figure ('about/tour/4.4/removable-volumes.png', R_('Removable
Volumes')) ?>
<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).') ?>
@@ -73,7 +62,7 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('mousepad', R_('MousePad')) ?>
+<?php print_figure ('about/tour/4.4/mousepad.png', R_('MousePad')) ?>
<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.') ?>
@@ -85,25 +74,25 @@ function print_img ($file, $title)
<?php E_('<b>Xfwm4</b> continues to be the window manager of the hearts.') ?>
</p>
-<?php print_img ('xfwm4-argb32', R_('Xfwm4 ARGB32')) ?>
+<?php print_figure ('about/tour/4.4/xfwm4-argb32.png', R_('Xfwm4 ARGB32')) ?>
<p>
<?php E_('This release features an enhanced compositor, supporting
transparent ARGB windows, shadows, window frame transparency and much more.') ?>
</p>
-<?php print_img ('xfwm4-switcher', R_('Xfwm4 Switcher')) ?>
+<?php print_figure ('about/tour/4.4/xfwm4-switcher.png', R_('Xfwm4 Switcher'))
?>
<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>
-<?php print_img ('xfwm4-themes', R_('Xfwm4 Themes')) ?>
+<?php print_figure ('about/tour/4.4/xfwm4-themes.png', R_('Xfwm4 Themes')) ?>
<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>
-<?php print_img ('xfwm4-tweaks', R_('Xfwm4 Tweaks')) ?>
+<?php print_figure ('about/tour/4.4/xfwm4-tweaks.png', R_('Xfwm4 Tweaks')) ?>
<p>
<?php E_('Advanced controls for the window manager were also added, allowing
thorough tweaking of window behavior.') ?>
@@ -116,19 +105,19 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('panel-manager', R_('Panel Manager')) ?>
+<?php print_figure ('about/tour/4.4/panel-manager.png', R_('Panel Manager')) ?>
<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>
-<?php print_img ('panel-additem', R_('Panel Add Item Dialog')) ?>
+<?php print_figure ('about/tour/4.4/panel-additem.png', R_('Panel Add Item
Dialog')) ?>
<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>
-<?php print_img ('panel-iconbox', R_('Panel Icon Box Plugin')) ?>
+<?php print_figure ('about/tour/4.4/panel-iconbox.png', R_('Panel Icon Box
Plugin')) ?>
<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.')
?>
@@ -145,7 +134,7 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('orage', R_('Orage')) ?>
+<?php print_figure ('about/tour/4.4/orage.png', R_('Orage')) ?>
<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.') ?>
@@ -158,7 +147,7 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('terminal', R_('Terminal')) ?>
+<?php print_figure ('about/tour/4.4/terminal.png', R_('Terminal')) ?>
<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.') ?>
@@ -171,13 +160,13 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('xfprint', R_('Xfce Printing')) ?>
+<?php print_figure ('about/tour/4.4/xfprint.png', R_('Xfce Printing')) ?>
<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>
-<?php print_img ('xfprint-dialog', R_('Xfce Print Dialog')) ?>
+<?php print_figure ('about/tour/4.4/xfprint-dialog.png', R_('Xfce Print
Dialog')) ?>
<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.') ?>
@@ -190,7 +179,7 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('autostart', R_('Xfce Autostart Editor')) ?>
+<?php print_figure ('about/tour/4.4/autostart.png', R_('Xfce Autostart
Editor')) ?>
<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.') ?>
@@ -203,13 +192,13 @@ function print_img ($file, $title)
<?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>
-<?php print_img ('preferences-applications', R_('Preferred Applications')) ?>
+<?php print_figure ('about/tour/4.4/preferences-applications.png',
R_('Preferred Applications')) ?>
<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>
-<?php print_img ('preferences-keyboard', R_('Keyboard Shortcuts')) ?>
+<?php print_figure ('about/tour/4.4/preferences-keyboard.png', R_('Keyboard
Shortcuts')) ?>
<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 5591c30..a1b72ae 100644
--- a/pages/about/tour46.php
+++ b/pages/about/tour46.php
@@ -1,15 +1,4 @@
-<?php
-
-$head['title'] = R_('Xfce 4.6 tour');
-
-function print_img ($file, $title)
-{
- global $static_media;
-
- echo '<div class="image"><div><img
src="'.$static_media.'/about/tour/4.6/'.$file.'.png" alt="'.$file.'""
/></div>'.$title.'</div>';
-}
-
-?>
+<?php $head['title'] = R_('Xfce 4.6 tour'); ?>
<h1><?php echo $head['title'] ?></h1>
@@ -23,13 +12,13 @@ function print_img ($file, $title)
<?php E_('Since desktop icons have been introduced in Xfce 4.4, people have
expressed the need to allow the selection of multiple icons (rubber banding).
With <b>Xfce 4.6</b>, the <b>Xfdesktop</b> manager finally implements this
feature: you can select multiple icons, remove them, etcetera...') ?>
</p>
-<?php print_img ('xfdesktop-rubberbanding', R_('Multiple icons selection')) ?>
+<?php print_figure ('about/tour/4.6/xfdesktop-rubberbanding.png', R_('Multiple
icons selection')) ?>
<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>
-<?php print_img ('xfdesktop-menu', R_('New desktop menu')) ?>
+<?php print_figure ('about/tour/4.6/xfdesktop-menu.png', R_('New desktop
menu')) ?>
<h2><?php E_("Panel") ?> <em>(xfce4-panel)</em></h2>
@@ -37,7 +26,7 @@ function print_img ($file, $title)
<?php E_('A lot of long standing bugs have been fixed in <b>Xfce4 Panel</b>,
particularly for multiple screen setups, but this new release also brings an
improved set of panel plugins.') ?>
</p>
-<?php print_img ('xfce4-panel-clock', R_('New binary clock')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-panel-clock.png', R_('New binary
clock')) ?>
<p>
<?php E_('The <b>clock plugin</b> has been rewritten to consume fewer system
resources and to fix some display bugs, but there is also a new clock mode for
the geek in you: binary clock! The new <b>notification area plugin</b> allows
you to hide selected notification icons to keep your notification area clean
and readable.') ?>
@@ -49,7 +38,7 @@ function print_img ($file, $title)
<?php E_('<b>Xfce4 Mixer</b> has been rewritten from scratch to use <a
href="http://www.gstreamer.net/";>Gstreamer</a>. This allows us to more easily
support multiple sound systems, the user interface is more polished, and you
can manage several different sound cards. Additionally, a panel plugin allows
you to set the system sound quickly using the mouse scroll wheel.') ?>
</p>
-<?php print_img ('xfce4-mixer', R_('New sound mixer')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-mixer.png', R_('New sound mixer')) ?>
<h2><?php E_("Session Manager") ?> <em>(xfce4-session)</em></h2>
@@ -57,13 +46,13 @@ function print_img ($file, $title)
<?php E_('<b>Xfce 4.6</b> comes with an enhanced session manager: your
session should be started faster, and the settings dialog has been reworked to
ease the management of session-aware applications. Additionally, the session
manager will now automatically restart session applications which crashed so
that you are not left without a desktop, panel, window manager, etcetera, if a
crash occurs. ') ?>
</p>
-<?php print_img ('xfce4-session-settings', R_('Session settings dialog')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-session-settings.png', R_('Session
settings dialog')) ?>
<p>
<?php E_('The session manager also includes a new long-awaited feature:
support for <b>suspend</b> and <b>hibernate</b> "out of the box." The logout
dialog now has two additional buttons which offer to suspend or hibernate your
computer.') ?>
</p>
-<?php print_img ('xfce4-session-logout', R_('Session logout dialog')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-session-logout.png', R_('Session
logout dialog')) ?>
<h2><?php E_("Window Manager") ?> <em>(xfwm4)</em></h2>
@@ -74,31 +63,31 @@ function print_img ($file, $title)
<p><?php E_('In addition to some other new features, <b>Xfwm4</b> is now able
to detect windows that do not respond and offer to terminate them.') ?>
</p>
-<?php print_img ('xfwm4-net-ping', R_('Dialog to terminate busy
applications')) ?>
+<?php print_figure ('about/tour/4.6/xfwm4-net-ping.png', R_('Dialog to
terminate busy applications')) ?>
<p>
<?php E_('There is also a new <b>actions menu</b> which allows you to
quickly move and resize windows, put them above or below other windows, or
fullscreen them.') ?>
</p>
-<?php print_img ('xfwm4-new-menu', R_('New actions menu')) ?>
+<?php print_figure ('about/tour/4.6/xfwm4-new-menu.png', R_('New actions
menu')) ?>
<p>
<?php E_('A new <b>fill</b> operation has been implemented; it expands a
given window to the available space without overlapping other adjacent
windows.') ?>
</p>
-<?php print_img ('xfwm4-fill-operation', R_('Fill operation')) ?>
+<?php print_figure ('about/tour/4.6/xfwm4-fill-operation.png', R_('Fill
operation')) ?>
<p>
<?php E_('The <b>compositor</b> has been optimized to reduce window
flickering duringresize operations.') ?>
</p>
-<?php print_img ('xfwm4-resize', R_('Flicker free resizing')) ?>
+<?php print_figure ('about/tour/4.6/xfwm4-resize.png', R_('Flicker free
resizing')) ?>
<p>
<?php E_('Some <b>tweakable options</b> have also been added: for example,
you can now disable the blinking of windows when they receive an urgency
hint.') ?>
</p>
-<?php print_img ('xfwm4-new-tweaks', R_('New tweakable options')) ?>
+<?php print_figure ('about/tour/4.6/xfwm4-new-tweaks.png', R_('New tweakable
options')) ?>
<h2><?php E_("File Manager") ?> <em>(thunar)</em></h2>
@@ -106,25 +95,25 @@ function print_img ($file, $title)
<?php E_('There have been many bug fixes and performance improvements in
<b>Thunar</b>. It can use the mouse forward and backward buttons (if available)
to navigate, and it includes a new plugin that allows you to set an image as
wallpaper from the context menu.') ?>
</p>
-<?php print_img ('thunar-wallpaper-plugin', R_('Set an image in a Thunar
folder as wallpaper')) ?>
+<?php print_figure ('about/tour/4.6/thunar-wallpaper-plugin.png', R_('Set an
image in a Thunar folder as wallpaper')) ?>
<p>
<?php E_('<b>Thunar</b> now follows the <a
href="http://freedesktop.org/wiki/Software/xdg-user-dirs";> XDG user
directories</a> specification; this allows you to have themed and localized
user folders to store your music, documents, videos, templates, etcetera...') ?>
</p>
-<?php print_img ('thunar-xdg-user-dirs', R_('Thunar menu for user
directories')) ?>
+<?php print_figure ('about/tour/4.6/thunar-xdg-user-dirs.png', R_('Thunar menu
for user directories')) ?>
<p>
<?php E_('<b>Thunar</b> will now display a translucent icon for drives or
volumes that are not mounted, so that you can distinguish them from the mounted
ones.') ?>
</p>
-<?php print_img ('thunar-mounting', R_('Translucent icons for unmounted drives
and volumes')) ?>
+<?php print_figure ('about/tour/4.6/thunar-mounting.png', R_('Translucent
icons for unmounted drives and volumes')) ?>
<p>
<?php E_('Last, but not least, <b>Thunar</b> now supports encrypted
devices!') ?>
</p>
-<?php print_img ('thunar-encrypted', R_('Thunar support for encrypted
devices')) ?>
+<?php print_figure ('about/tour/4.6/thunar-encrypted.png', R_('Thunar support
for encrypted devices')) ?>
<h2><?php E_("Settings") ?> <em>(xfce4-settings)</em></h2>
@@ -132,11 +121,11 @@ function print_img ($file, $title)
<?php E_('Xfce 4.6 features a new settings interface, <b>Xfce Settings
Manager</b>, which allows you to configure your desktop environment much more
easily than before. The dialogs which are accessible by single clicking on the
icons have been designed to be more compact and to allow you to customize your
desktop quickly and in a more intuitive way.') ?>
</p>
-<?php print_img ('xfce4-settings-manager', R_('Xfce4 Settings Manager')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-settings-manager.png', R_('Xfce4
Settings Manager')) ?>
<h3><?php E_('Accessibility settings') ?></h3>
-<?php print_img ('xfce4-accessibility-settings', R_('Accessibility settings
dialog')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-accessibility-settings.png',
R_('Accessibility settings dialog')) ?>
<p>
<?php E_('The <b>Accessibility settings</b> dialog allows you to set the
accessibility related mouse and keyboard options, such as sticky keys, bounce
keys, or mouse emulation.') ?>
@@ -144,7 +133,7 @@ function print_img ($file, $title)
<h3><?php E_('Appearance settings') ?></h3>
-<?php print_img ('xfce4-appearance-settings', R_('Appearance settings
dialog')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-appearance-settings.png',
R_('Appearance settings dialog')) ?>
<p>
<?php E_('The <b>Appearance settings</b> dialog allows you to set the widget
style, the icon theme, and font, toolbar and menu options.') ?>
@@ -152,7 +141,7 @@ function print_img ($file, $title)
<h3><?php E_('Display settings') ?></h3>
-<?php print_img ('xfce4-display-settings', R_('Display settings dialog')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-display-settings.png', R_('Display
settings dialog')) ?>
<p>
<?php E_('The <b>Display settings</b> dialog allows you to set the
resolution, refresh rate, and the rotation for each screen that is connected.')
?>
@@ -160,13 +149,13 @@ function print_img ($file, $title)
<h3><?php E_('Keyboard settings') ?></h3>
-<?php print_img ('xfce4-keyboard-settings-layout', R_('Keyboard settings
dialog, layout tab')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-keyboard-settings-layout.png',
R_('Keyboard settings dialog, layout tab')) ?>
<p>
<?php E_('The <b>Keyboard settings</b> dialog allows you to set keyboard
preferences such as key repeating, keyboard shortcuts, and your keyboard
layout.') ?>
</p>
-<?php print_img ('xfce4-keyboard-settings-shortcuts', R_('Keyboard settings
dialog, shortcuts tab')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-keyboard-settings-shortcuts.png',
R_('Keyboard settings dialog, shortcuts tab')) ?>
<p>
<?php E_('You can now configure shortcuts more simply, and any shortcut
conflicts are automatically detected.') ?>
@@ -174,7 +163,7 @@ function print_img ($file, $title)
<h3><?php E_('Mouse settings') ?></h3>
-<?php print_img ('xfce4-mouse-settings', R_('Mouse settings dialog')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-mouse-settings.png', R_('Mouse
settings dialog')) ?>
<p>
<?php E_('The <b>Mouse settings</b> dialog allows you to configure the
different mice connected to your computer: button order, acceleration,
double-click speed, mouse cursor theme, etcetera...') ?>
@@ -182,7 +171,7 @@ function print_img ($file, $title)
<h3><?php E_('Desktop settings') ?></h3>
-<?php print_img ('xfdesktop-settings', R_('Desktop settings dialog')) ?>
+<?php print_figure ('about/tour/4.6/xfdesktop-settings.png', R_('Desktop
settings dialog')) ?>
<p>
<?php E_('The <b>Desktop settings</b> dialog is now much more compact; it
allows you to configure per-screen settings: wallpaper, brightness, desktop
menu, displayed icons, etcetera...') ?>
@@ -194,7 +183,7 @@ function print_img ($file, $title)
<?php E_('<b>Xfce 4.6</b> also comes with a brand new application finder
which features a cleaner user interface. It is also easier to use it with the
keyboard, and it monitors installed applications to update the list "on the
fly." It also allows you to create panel launchers quickly by dragging an
application icon to the launcher creation window.') ?>
</p>
-<?php print_img ('xfce4-appfinder', R_('New application finder')) ?>
+<?php print_figure ('about/tour/4.6/xfce4-appfinder.png', R_('New application
finder')) ?>
<h2><?php E_('Links') ?></h2>
diff --git a/pages/about/tour48.php b/pages/about/tour48.php
index 4f3cb1a..852429b 100644
--- a/pages/about/tour48.php
+++ b/pages/about/tour48.php
@@ -1,15 +1,4 @@
-<?php
-
-$head['title'] = R_('Xfce 4.8 tour');
-
-function print_img ($file, $title)
-{
- global $static_media;
-
- echo '<div class="image"><div><img
src="'.$static_media.'/about/tour/4.8/'.$file.'.png" alt="'.$file.'""
/></div>'.$title.'</div>';
-}
-
-?>
+<?php $head['title'] = R_('Xfce 4.8 tour'); ?>
<h1><?php echo $head['title'] ?></h1>
@@ -21,19 +10,19 @@ function print_img ($file, $title)
<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>
- <?php print_img ("thunar-remote", R_("Thunar browsing a remote share")) ?>
+ <?php print_figure ("about/tour/4.8/thunar-remote.png", R_("Thunar
browsing a remote share")) ?>
<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>
- <?php print_img ("thunar-progress", R_("Progress dialog")) ?>
+ <?php print_figure ("about/tour/4.8/thunar-progress.png", R_("Progress
dialog")) ?>
<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>
- <?php print_img ("thunar-eject", R_("Eject button")) ?>
+ <?php print_figure ("about/tour/4.8/thunar-eject.png", R_("Eject button"))
?>
<h2><?php E_("Panel") ?> <em>(xfce4-panel)</em></h2>
@@ -47,13 +36,13 @@ function print_img ($file, $title)
<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>
- <?php print_img ("panel-transparent", R_("Transparent panel background"))
?>
+ <?php print_figure ("about/tour/4.8/panel-transparent.png",
R_("Transparent panel background")) ?>
<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>
- <?php print_img ("panel-editor", R_("Panel item editor")) ?>
+ <?php print_figure ("about/tour/4.8/panel-editor.png", R_("Panel item
editor")) ?>
<h3><?php E_("Drag and drop to create launchers") ?></h3>
@@ -67,13 +56,13 @@ function print_img ($file, $title)
<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>
- <?php print_img ("panel-fuzzy-clock", R_("New fuzzy clock mode")) ?>
+ <?php print_figure ("about/tour/4.8/panel-fuzzy-clock.png", R_("New fuzzy
clock mode")) ?>
<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>
- <?php print_img ("panel-directorymenu", R_("Directory menu plugin")) ?>
+ <?php print_figure ("about/tour/4.8/panel-directorymenu.png",
R_("Directory menu plugin")) ?>
<h3><?php E_("Applications menu edition") ?></h3>
@@ -87,29 +76,29 @@ function print_img ($file, $title)
<p><?php E_("You can enable and disable plugged screens, set their
resolution, refresh rate, rotation and reflection, clone screens or extend
desktops.") ?></p>
- <?php print_img ("display-settings", R_("New display settings dialog")) ?>
+ <?php print_figure ("about/tour/4.8/display-settings.png", R_("New display
settings dialog")) ?>
<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>
- <?php print_img ("display-settings-confirmation", R_("Timed confirmation
for display settings changes")) ?>
+ <?php print_figure ("about/tour/4.8/display-settings-confirmation.png",
R_("Timed confirmation for display settings changes")) ?>
<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>
- <?php print_img ("minimal-display-settings", R_("Quick multihead
setup")) ?>
+ <?php print_figure ("about/tour/4.8/minimal-display-settings.png",
R_("Quick multihead setup")) ?>
<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>
- <?php print_img ("settings-editor", R_("Editing Xfconf properties with the
Settings Editor")) ?>
+ <?php print_figure ("about/tour/4.8/settings-editor.png", R_("Editing
Xfconf properties with the Settings Editor")) ?>
<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>
- <?php print_img ("keyboard-settings-list", R_("Layouts and variants
list")) ?>
+ <?php print_figure ("about/tour/4.8/keyboard-settings-list.png",
R_("Layouts and variants list")) ?>
diff --git a/static/about/releasemodel/code-freeze-branching.png
b/static/about/releasemodel/code-freeze-branching.png
index 975a489..cadf5a4 100644
Binary files a/static/about/releasemodel/code-freeze-branching.png and
b/static/about/releasemodel/code-freeze-branching.png differ
diff --git a/static/about/releasemodel/example-release-cycle.png
b/static/about/releasemodel/example-release-cycle.png
index 68b0628..43eec61 100644
Binary files a/static/about/releasemodel/example-release-cycle.png and
b/static/about/releasemodel/example-release-cycle.png differ
diff --git a/static/about/releasemodel/feature-branching.png
b/static/about/releasemodel/feature-branching.png
index c3e5842..0f40d38 100644
Binary files a/static/about/releasemodel/feature-branching.png and
b/static/about/releasemodel/feature-branching.png differ
diff --git a/style/base.css b/style/base.css
index ee48975..55a6855 100644
--- a/style/base.css
+++ b/style/base.css
@@ -42,6 +42,10 @@ body {
text-align: justify;
}
+#article h1:first-child {
+ margin: 0;
+}
+
#article ul, #article ol {
list-style-position: outside;
margin-left: 3em;
@@ -100,7 +104,7 @@ body {
}
h1, h2, h3, h4, dl dt { color: #333;}
-h1 { font-size: 24px; font-weight: normal; }
+h1 { font-size: 24px; font-weight: normal; margin: 1em 0; }
h2, h3, h4 { font-weight: bold; margin: 1em 0; }
h2 { font-size: 16px; }
h3 { font-size: 1em; }
@@ -160,20 +164,22 @@ div.column p.colicon {
min-height: 48px;
}
-div.image {
- background-color: #eee;
+table.figure {
border: 1px solid #ccc;
- padding: 6px;
- padding-bottom: 0;
+ background-color: #eee;
+ padding: 3px;
+ margin: auto;
+ width: 75%;
+}
+table.figure th {
+ font-weight: bold;
text-align: center;
- margin: 1em auto;
}
-
-div.image div {
- background-color: #fff;
+table.figure td {
border: 1px solid #ccc;
+ background-color: #fff;
padding: 6px;
- overflow: auto;
+ text-align: center;
}
.clearboth {
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
