[Xfce4-commits] <www:master> Experiment with speedups a bit and move static data.

Nick Schermer noreply at xfce.org
Tue Apr 17 20:22:06 CEST 2012


Updating branch refs/heads/master
         to da333fdbc604150c34e5b43e5c214f968ecabb74 (commit)
       from 88f7d8738388a971d2bb678511147441044c8a49 (commit)

commit da333fdbc604150c34e5b43e5c214f968ecabb74
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Apr 9 15:19:04 2012 +0200

    Experiment with speedups a bit and move static data.

 .htaccess                                          |    3 +
 images/about/releasemodel/feature-branching.png    |  Bin 40247 -> 0 bytes
 images/about/tour/4.4/xfwm4-argb32.png             |  Bin 47968 -> 0 bytes
 images/about/tour/4.4/xfwm4-themes.png             |  Bin 32661 -> 0 bytes
 .../tour/4.6/xfce4-keyboard-settings-shortcuts.png |  Bin 99932 -> 0 bytes
 images/about/tour/4.6/xfdesktop-menu.png           |  Bin 48410 -> 0 bytes
 images/about/tour/4.6/xfwm4-fill-operation.png     |  Bin 50518 -> 0 bytes
 images/about/tour/4.6/xfwm4-new-menu.png           |  Bin 62917 -> 0 bytes
 images/about/tour/4.8/panel-directorymenu.png      |  Bin 61045 -> 0 bytes
 images/about/tour/4.8/thunar-eject.png             |  Bin 48963 -> 0 bytes
 images/about/tour/4.8/thunar-progress.png          |  Bin 29342 -> 0 bytes
 images/projects/xfce4-panel.png                    |  Bin 2503 -> 0 bytes
 index.php                                          |    2 +
 pages/about/releasemodel.php                       |   12 +-
 pages/about/screenshots.php                        |    6 +-
 pages/download/index.php                           |    3 +-
 pages/download/requirements.php                    |  121 -------------
 pages/footer.php                                   |   12 +-
 pages/frontpage.php                                |  182 ++++++++++----------
 pages/header.php                                   |   16 +-
 pages/projects/index.php                           |   30 ++--
 robots.txt                                         |    2 +-
 .../about/releasemodel/code-freeze-branching.png   |  Bin 37391 -> 37391 bytes
 .../about/releasemodel/code-freeze-branching.svg   |    0
 .../about/releasemodel/example-release-cycle.png   |  Bin 44431 -> 44431 bytes
 .../about/releasemodel/example-release-cycle.svg   |    0
 static/about/releasemodel/feature-branching.png    |  Bin 0 -> 40221 bytes
 .../about/releasemodel/feature-branching.svg       |    0
 .../about/screenshots/4.0-1-small.jpg              |  Bin 13792 -> 13792 bytes
 {images => static}/about/screenshots/4.0-1.png     |  Bin 349704 -> 349704 bytes
 .../about/screenshots/4.0-2-small.jpg              |  Bin 12809 -> 12809 bytes
 {images => static}/about/screenshots/4.0-2.png     |  Bin 346576 -> 346576 bytes
 .../about/screenshots/4.2-1-small.jpg              |  Bin 8050 -> 8050 bytes
 {images => static}/about/screenshots/4.2-1.jpg     |  Bin 146476 -> 146476 bytes
 .../about/screenshots/4.2-2-small.jpg              |  Bin 9007 -> 9007 bytes
 {images => static}/about/screenshots/4.2-2.jpg     |  Bin 203826 -> 203826 bytes
 .../about/screenshots/4.2-3-small.jpg              |  Bin 9584 -> 9584 bytes
 {images => static}/about/screenshots/4.2-3.jpg     |  Bin 154038 -> 154038 bytes
 .../about/screenshots/4.2-4-small.jpg              |  Bin 7309 -> 7309 bytes
 {images => static}/about/screenshots/4.2-4.jpg     |  Bin 125216 -> 125216 bytes
 .../about/screenshots/4.2-5-small.jpg              |  Bin 2891 -> 2891 bytes
 {images => static}/about/screenshots/4.2-5.jpg     |  Bin 28680 -> 28680 bytes
 .../about/screenshots/4.4-1-small.jpg              |  Bin 11167 -> 11167 bytes
 {images => static}/about/screenshots/4.4-1.png     |  Bin 406781 -> 406781 bytes
 .../about/screenshots/4.4-2-small.jpg              |  Bin 12819 -> 12819 bytes
 {images => static}/about/screenshots/4.4-2.png     |  Bin 417976 -> 417976 bytes
 .../about/screenshots/4.4-3-small.jpg              |  Bin 13229 -> 13229 bytes
 {images => static}/about/screenshots/4.4-3.png     |  Bin 1595391 -> 1595391 bytes
 .../about/screenshots/4.4-4-small.jpg              |  Bin 14129 -> 14129 bytes
 {images => static}/about/screenshots/4.4-4.png     |  Bin 178238 -> 178238 bytes
 .../about/screenshots/4.4-5-small.jpg              |  Bin 13105 -> 13105 bytes
 {images => static}/about/screenshots/4.4-5.png     |  Bin 920312 -> 920312 bytes
 .../about/screenshots/4.4-6-small.jpg              |  Bin 10330 -> 10330 bytes
 {images => static}/about/screenshots/4.4-6.png     |  Bin 170708 -> 170708 bytes
 .../about/screenshots/4.4-8-small.jpg              |  Bin 12429 -> 12429 bytes
 {images => static}/about/screenshots/4.4-8.png     |  Bin 1208082 -> 1208082 bytes
 .../about/screenshots/4.6-1-small.jpg              |  Bin 12921 -> 12921 bytes
 {images => static}/about/screenshots/4.6-1.png     |  Bin 1546162 -> 1546162 bytes
 .../about/screenshots/4.6-2-small.jpg              |  Bin 8661 -> 8661 bytes
 {images => static}/about/screenshots/4.6-2.png     |  Bin 493720 -> 493720 bytes
 .../about/screenshots/4.6-3-small.jpg              |  Bin 10067 -> 10067 bytes
 {images => static}/about/screenshots/4.6-3.png     |  Bin 325250 -> 325250 bytes
 .../about/screenshots/4.6-4-small.jpg              |  Bin 9801 -> 9801 bytes
 {images => static}/about/screenshots/4.6-4.png     |  Bin 1350028 -> 1350028 bytes
 .../about/screenshots/4.6-5-small.jpg              |  Bin 7980 -> 7980 bytes
 {images => static}/about/screenshots/4.6-5.png     |  Bin 133741 -> 133741 bytes
 .../about/screenshots/4.6-6-small.jpg              |  Bin 9716 -> 9716 bytes
 {images => static}/about/screenshots/4.6-6.png     |  Bin 1101895 -> 1101895 bytes
 .../about/screenshots/4.6-7-small.jpg              |  Bin 10704 -> 10704 bytes
 {images => static}/about/screenshots/4.6-7.png     |  Bin 1141318 -> 1141318 bytes
 .../about/screenshots/4.8-1-small.jpg              |  Bin 9645 -> 9645 bytes
 {images => static}/about/screenshots/4.8-1.png     |  Bin 1831382 -> 1831382 bytes
 .../about/screenshots/4.8-2-small.jpg              |  Bin 9770 -> 9770 bytes
 {images => static}/about/screenshots/4.8-2.png     |  Bin 349128 -> 349128 bytes
 .../about/screenshots/4.8-3-small.jpg              |  Bin 8362 -> 8362 bytes
 {images => static}/about/screenshots/4.8-3.png     |  Bin 133615 -> 133615 bytes
 .../about/screenshots/4.8-4-small.jpg              |  Bin 9390 -> 9390 bytes
 {images => static}/about/screenshots/4.8-4.png     |  Bin 270669 -> 270669 bytes
 {images => static}/about/tour/4.4/autostart.png    |  Bin 35727 -> 35727 bytes
 .../about/tour/4.4/desktop-icons.png               |  Bin 15800 -> 15800 bytes
 .../about/tour/4.4/desktop-settings.png            |  Bin 23410 -> 23410 bytes
 {images => static}/about/tour/4.4/mousepad.png     |  Bin 21853 -> 21853 bytes
 {images => static}/about/tour/4.4/orage.png        |  Bin 62389 -> 62389 bytes
 .../about/tour/4.4/panel-additem.png               |  Bin 55185 -> 55185 bytes
 .../about/tour/4.4/panel-iconbox.png               |  Bin 76039 -> 76039 bytes
 .../about/tour/4.4/panel-manager.png               |  Bin 19204 -> 19204 bytes
 .../about/tour/4.4/preferences-applications.png    |  Bin 35906 -> 35906 bytes
 .../about/tour/4.4/preferences-keyboard.png        |  Bin 60986 -> 60986 bytes
 .../about/tour/4.4/removable-volumes.png           |  Bin 57386 -> 57386 bytes
 {images => static}/about/tour/4.4/terminal.png     |  Bin 26324 -> 26324 bytes
 .../about/tour/4.4/thunar-bulk-rename.png          |  Bin 66237 -> 66237 bytes
 {images => static}/about/tour/4.4/thunar.png       |  Bin 110489 -> 110489 bytes
 .../about/tour/4.4/xfprint-dialog.png              |  Bin 51516 -> 51516 bytes
 {images => static}/about/tour/4.4/xfprint.png      |  Bin 31397 -> 31397 bytes
 static/about/tour/4.4/xfwm4-argb32.png             |  Bin 0 -> 47954 bytes
 .../about/tour/4.4/xfwm4-switcher.png              |  Bin 58935 -> 58935 bytes
 static/about/tour/4.4/xfwm4-themes.png             |  Bin 0 -> 32618 bytes
 {images => static}/about/tour/4.4/xfwm4-tweaks.png |  Bin 59083 -> 59083 bytes
 .../about/tour/4.6/thunar-encrypted.png            |  Bin 65688 -> 65688 bytes
 .../about/tour/4.6/thunar-mounting.png             |  Bin 74608 -> 74608 bytes
 .../about/tour/4.6/thunar-wallpaper-plugin.png     |  Bin 60533 -> 60533 bytes
 .../about/tour/4.6/thunar-xdg-user-dirs.png        |  Bin 82927 -> 82927 bytes
 .../tour/4.6/xfce4-accessibility-settings.png      |  Bin 49041 -> 49041 bytes
 .../about/tour/4.6/xfce4-appearance-settings.png   |  Bin 31058 -> 31058 bytes
 .../about/tour/4.6/xfce4-appfinder.png             |  Bin 66513 -> 66513 bytes
 .../about/tour/4.6/xfce4-display-settings.png      |  Bin 25563 -> 25563 bytes
 .../tour/4.6/xfce4-keyboard-settings-layout.png    |  Bin 64556 -> 64556 bytes
 .../tour/4.6/xfce4-keyboard-settings-shortcuts.png |  Bin 0 -> 99924 bytes
 {images => static}/about/tour/4.6/xfce4-mixer.png  |  Bin 64643 -> 64643 bytes
 .../about/tour/4.6/xfce4-mouse-settings.png        |  Bin 35253 -> 35253 bytes
 .../about/tour/4.6/xfce4-panel-clock.png           |  Bin 59088 -> 59088 bytes
 .../about/tour/4.6/xfce4-session-logout.png        |  Bin 19764 -> 19764 bytes
 .../about/tour/4.6/xfce4-session-settings.png      |  Bin 87135 -> 87135 bytes
 .../about/tour/4.6/xfce4-settings-manager.png      |  Bin 62469 -> 62469 bytes
 static/about/tour/4.6/xfdesktop-menu.png           |  Bin 0 -> 48385 bytes
 .../about/tour/4.6/xfdesktop-rubberbanding.png     |  Bin 29596 -> 29596 bytes
 .../about/tour/4.6/xfdesktop-settings.png          |  Bin 59142 -> 59142 bytes
 static/about/tour/4.6/xfwm4-fill-operation.png     |  Bin 0 -> 50487 bytes
 .../about/tour/4.6/xfwm4-net-ping.png              |  Bin 23692 -> 23692 bytes
 static/about/tour/4.6/xfwm4-new-menu.png           |  Bin 0 -> 62911 bytes
 .../about/tour/4.6/xfwm4-new-tweaks.png            |  Bin 44123 -> 44123 bytes
 {images => static}/about/tour/4.6/xfwm4-resize.png |  Bin 13046 -> 13046 bytes
 .../about/tour/4.6/xfwm4-settings.png              |  Bin 50507 -> 50507 bytes
 .../about/tour/4.6/xfwm4-tweaks-settings.png       |  Bin 53478 -> 53478 bytes
 .../about/tour/4.6/xfwm4-workspace-settings.png    |  Bin 50509 -> 50509 bytes
 .../tour/4.8/display-settings-confirmation.png     |  Bin 21433 -> 21433 bytes
 .../about/tour/4.8/display-settings.png            |  Bin 25654 -> 25654 bytes
 .../about/tour/4.8/keyboard-settings-list.png      |  Bin 8313 -> 8313 bytes
 .../about/tour/4.8/minimal-display-settings.png    |  Bin 17791 -> 17791 bytes
 static/about/tour/4.8/panel-directorymenu.png      |  Bin 0 -> 60724 bytes
 {images => static}/about/tour/4.8/panel-editor.png |  Bin 40499 -> 40499 bytes
 .../about/tour/4.8/panel-fuzzy-clock.png           |  Bin 10983 -> 10983 bytes
 .../about/tour/4.8/panel-transparent.png           |  Bin 50669 -> 50669 bytes
 .../about/tour/4.8/settings-editor.png             |  Bin 14461 -> 14461 bytes
 static/about/tour/4.8/thunar-eject.png             |  Bin 0 -> 39657 bytes
 .../about/tour/4.8/thunar-progess.png              |  Bin 30832 -> 30832 bytes
 static/about/tour/4.8/thunar-progress.png          |  Bin 0 -> 22245 bytes
 .../about/tour/4.8/thunar-remote.png               |  Bin 28625 -> 28625 bytes
 .../downloads}/xfce_artwork.tar.bz2                |  Bin 783862 -> 783862 bytes
 {images => static}/frontpage/slider-apps.jpg       |  Bin 84026 -> 84026 bytes
 {images => static}/frontpage/slider-desktop.jpg    |  Bin 75731 -> 75731 bytes
 {images => static}/frontpage/slider-panel.jpg      |  Bin 83099 -> 83099 bytes
 {images => static}/frontpage/slider-settings.jpg   |  Bin 71845 -> 71845 bytes
 {images => static}/frontpage/slider-thunar.jpg     |  Bin 74993 -> 74993 bytes
 {images => static}/frontpage/slider-xfwm4.jpg      |  Bin 87827 -> 87827 bytes
 {images => static}/frontpage/src/slider-apps.png   |  Bin 213034 -> 213034 bytes
 .../frontpage/src/slider-desktop.png               |  Bin 243863 -> 243863 bytes
 {images => static}/frontpage/src/slider-panel.png  |  Bin 222720 -> 222720 bytes
 .../frontpage/src/slider-settings.png              |  Bin 163125 -> 163125 bytes
 {images => static}/frontpage/src/slider-thunar.png |  Bin 209036 -> 209036 bytes
 {images => static}/frontpage/src/slider-xfwm4.png  |  Bin 152125 -> 152125 bytes
 {images => static}/index.html                      |    0
 {images => static}/projects/library.png            |  Bin 1499 -> 1499 bytes
 {images => static}/projects/midori.png             |  Bin 3628 -> 3628 bytes
 {images => static}/projects/orage.png              |  Bin 2310 -> 2310 bytes
 {images => static}/projects/ristretto.png          |  Bin 2946 -> 2946 bytes
 {images => static}/projects/terminal.png           |  Bin 2584 -> 2584 bytes
 {images => static}/projects/thunar.png             |  Bin 4261 -> 4261 bytes
 {images => static}/projects/xarchiver.png          |  Bin 1885 -> 1885 bytes
 {images => static}/projects/xfburn.png             |  Bin 3956 -> 3956 bytes
 {images => static}/projects/xfce4-appfinder.png    |  Bin 3560 -> 3560 bytes
 {images => static}/projects/xfce4-mixer.png        |  Bin 2527 -> 2527 bytes
 static/projects/xfce4-panel.png                    |  Bin 0 -> 2456 bytes
 {images => static}/projects/xfce4-session.png      |  Bin 2490 -> 2490 bytes
 {images => static}/projects/xfce4-settings.png     |  Bin 3339 -> 3339 bytes
 {images => static}/projects/xfdesktop.png          |  Bin 3067 -> 3067 bytes
 {images => static}/projects/xfwm4.png              |  Bin 958 -> 958 bytes
 style/base.css                                     |    2 +-
 style/bundle.php                                   |   18 ++
 style/img/bullit.gif                               |  Bin 49 -> 0 bytes
 style/img/logointro.png                            |  Bin 7076 -> 0 bytes
 style/news.css                                     |    2 +-
 172 files changed, 156 insertions(+), 255 deletions(-)

diff --git a/.htaccess b/.htaccess
index 708750f..1948955 100755
--- a/.htaccess
+++ b/.htaccess
@@ -39,6 +39,9 @@ Redirect 301 /release_notes/4.1.x_changelog.html http://www.xfce.org/download/ch
 Redirect 301 /release_notes/4.2.2_changelog.html http://www.xfce.org/download/changelogs/4.2.2
 Redirect 301 /release_notes/4.2_changelog.html http://www.xfce.org/download/changelogs/4.2.0
 
+Redirect 301 /images/ http://cms.xfce.org/
+Redirect 301 /downloads/ http://cms.xfce.org/downloads/
+
 # for correcting the version number style
 Redirect 301 /download/changelogs/4.8 http://www.xfce.org/download/changelogs/4.8.0
 
diff --git a/images/about/releasemodel/feature-branching.png b/images/about/releasemodel/feature-branching.png
deleted file mode 100644
index a41a393..0000000
Binary files a/images/about/releasemodel/feature-branching.png and /dev/null differ
diff --git a/images/about/tour/4.4/xfwm4-argb32.png b/images/about/tour/4.4/xfwm4-argb32.png
deleted file mode 100644
index 7e0e882..0000000
Binary files a/images/about/tour/4.4/xfwm4-argb32.png and /dev/null differ
diff --git a/images/about/tour/4.4/xfwm4-themes.png b/images/about/tour/4.4/xfwm4-themes.png
deleted file mode 100644
index 0bf6731..0000000
Binary files a/images/about/tour/4.4/xfwm4-themes.png and /dev/null differ
diff --git a/images/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png b/images/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png
deleted file mode 100644
index 989c57c..0000000
Binary files a/images/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png and /dev/null differ
diff --git a/images/about/tour/4.6/xfdesktop-menu.png b/images/about/tour/4.6/xfdesktop-menu.png
deleted file mode 100644
index c8c68e3..0000000
Binary files a/images/about/tour/4.6/xfdesktop-menu.png and /dev/null differ
diff --git a/images/about/tour/4.6/xfwm4-fill-operation.png b/images/about/tour/4.6/xfwm4-fill-operation.png
deleted file mode 100644
index c0ddb3d..0000000
Binary files a/images/about/tour/4.6/xfwm4-fill-operation.png and /dev/null differ
diff --git a/images/about/tour/4.6/xfwm4-new-menu.png b/images/about/tour/4.6/xfwm4-new-menu.png
deleted file mode 100644
index 9561c8f..0000000
Binary files a/images/about/tour/4.6/xfwm4-new-menu.png and /dev/null differ
diff --git a/images/about/tour/4.8/panel-directorymenu.png b/images/about/tour/4.8/panel-directorymenu.png
deleted file mode 100644
index 10ba27e..0000000
Binary files a/images/about/tour/4.8/panel-directorymenu.png and /dev/null differ
diff --git a/images/about/tour/4.8/thunar-eject.png b/images/about/tour/4.8/thunar-eject.png
deleted file mode 100644
index 185efc0..0000000
Binary files a/images/about/tour/4.8/thunar-eject.png and /dev/null differ
diff --git a/images/about/tour/4.8/thunar-progress.png b/images/about/tour/4.8/thunar-progress.png
deleted file mode 100644
index 3cf8dff..0000000
Binary files a/images/about/tour/4.8/thunar-progress.png and /dev/null differ
diff --git a/images/projects/xfce4-panel.png b/images/projects/xfce4-panel.png
deleted file mode 100644
index 89afa6e..0000000
Binary files a/images/projects/xfce4-panel.png and /dev/null differ
diff --git a/index.php b/index.php
index a541908..1ca962a 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,7 @@
 <?php
 
+$static_media = "/static";
+
 /*error_reporting(E_ALL | E_STRICT);*/
 date_default_timezone_set ('UTC');
 
diff --git a/pages/about/releasemodel.php b/pages/about/releasemodel.php
index ebb6b80..8131a38 100644
--- a/pages/about/releasemodel.php
+++ b/pages/about/releasemodel.php
@@ -72,8 +72,8 @@ $toc['anchors'] = array (
 </p>
 
 <p>
-  <a href="/images/about/releasemodel/example-release-cycle.svg">
-    <img src="/images/about/releasemodel/example-release-cycle.png" title="<?php E_('Example Release Cycle') ?>" alt="" />
+  <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>
 
@@ -198,8 +198,8 @@ $toc['anchors'] = array (
 </p>
 
 <p>
-  <a href="/images/about/releasemodel/feature-branching.svg">
-    <img src="/images/about/releasemodel/feature-branching.png" title="<?php E_('Development Workflow') ?>" alt="" />
+  <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>
 
@@ -267,8 +267,8 @@ $toc['anchors'] = array (
 </p>
 
 <p>
-  <a href="/images/about/releasemodel/code-freeze-branching.svg">
-    <img src="/images/about/releasemodel/code-freeze-branching.png" title="<?php E_('Tagging and Branching for Releases') ?>" alt="" />
+  <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>
 
diff --git a/pages/about/screenshots.php b/pages/about/screenshots.php
index e010dc2..05525ea 100644
--- a/pages/about/screenshots.php
+++ b/pages/about/screenshots.php
@@ -3,10 +3,12 @@
 <?php
 function print_shots ($group, $count, $format = 'png')
 {
+  global $static_media;
+
   for ($i = 1; $i <= $count; $i++)
   {
-    echo "<a href=\"http://cdn.xfce.org/about/screenshots/$group-$i.$format\">".
-           "<img src=\"/images/about/screenshots/$group-$i-small.jpg\" alt=\"$group-$i\" width=\"200\" ".
+    echo "<a href=\"$static_media/about/screenshots/$group-$i.$format\">".
+           "<img src=\"$static_media/about/screenshots/$group-$i-small.jpg\" alt=\"$group-$i\" width=\"200\" ".
            "height=\"150\" hspace=\"2\" vspace=\"2\" border=\"0\" />".
          "</a>";
   }
diff --git a/pages/download/index.php b/pages/download/index.php
index 681fdd2..9760e96 100644
--- a/pages/download/index.php
+++ b/pages/download/index.php
@@ -63,5 +63,6 @@ if($preview_visible) {
 
 <h2 id="artwork"><?php E_('Artwork') ?></h2>
 <p>
-  <?php E_('You can download the Xfce artwork tarball <a href="/downloads/xfce_artwork.tar.bz2">here</a>. It contains some high-quality logos and banners. Copying of the Xfce logo is subject to the LGPL copyright license.') ?>
+  <?php printf (R_('You can download the Xfce artwork tarball <a href="%s">here</a>. It contains some high-quality logos and banners. Copying of the Xfce logo is subject to the LGPL copyright license.'),
+                $static_media .'/downloads/xfce_artwork.tar.bz2') ?>
 </p>
diff --git a/pages/download/requirements.php b/pages/download/requirements.php
deleted file mode 100644
index 863e9c1..0000000
--- a/pages/download/requirements.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php $head['title'] = R_('System requirements') ?>
-
-<h1><?php echo $head['title'] ?></h1>
-<p>
-  <?php printf (R_('All packages (except xfce4-dev-tools) depend on both gtk+ %s and glib %s.'), '>= 2.14', '>= 2.18') ?>
-</p>
-
-<p>
-  <?php E_('It is also recommended to build all Xfce components from the same release version.') ?>
-</p>
-
-<h2><?php E_('Build order') ?></h2>
-<ol>
-  <li>xfce4-dev-tools</li>
-  <li>garcon</li>
-  <li>libxfce4util</li>
-  <li>xfconf</li>
-  <li>libxfce4ui, libexo</li>
-  <li>xfce4-panel</li>
-  <li>thunar</li>
-  <li>xfce4-settings, xfce4-session, xfdesktop, xfwm4, xfce-utils, xfce4-mixer, xfce4-appfinder</li>
-</ol>
-
-<h2><?php E_('Package dependencies') ?></h2>
-<table>
-  <tr>
-    <th><?php E_('Package') ?></th>
-    <th><?php E_('Dependency(-ies)') ?></th>
-    <th><?php E_('Optional Dependency(-ies)') ?></th>
-  </tr>
-  <tr>
-    <td>xfce4-dev-tools</td>
-    <td>autoconf, automake, intltool, pkgconfig </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td>garcon</td>
-    <td>glib</td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td>libxfce4util</td>
-    <td>glib, gobject </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td>xfconf</td>
-    <td>libxfce4util, dbus, dbus-glib, gtk+ </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td>libxfce4ui</td>
-    <td>libxfce4util, gtk+, glib</td>
-    <td>libstartup-notification, libgladeui, xfconf</td>
-  </tr>
-  <tr>
-    <td>libexo</td>
-    <td>libxfce4util, gtk+, p5-uri </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td>xfce4-panel</td>
-    <td>libxfce4util, libxfce4ui, libexo, cairo, libwnck</td>
-    <td>libstartup-notification</td>
-  </tr>
-  <tr>
-    <td>thunar</td>
-    <td>libxfce4util, libxfce4ui, libexo, libpng, gtk+, gdk-pixbuf</td>
-    <td>libexif, dbus-glib, gconf, libstartup-notification, libnotify, freetype, libjpeg, gio-unix, gudev, libxfce4panel, xfconf</td>
-  </tr>
-  <tr>
-    <td>xfce4-settings</td>
-    <td>libxfce4util, libxfce4ui, libexo, xfconf, dbus-glib, libXi, libXrandr</td>
-    <td>libXcursor, libnotify</td>
-  </tr>
-  <tr>
-    <td>xfce4-session</td>
-    <td>libxfce4util, libxfce4ui, p5-xml-parser, libwnck</td>
-    <td>libgnome >= 2.4.0, dbus</td>
-  </tr>
-  <tr>
-    <td>xfwm4</td>
-    <td>libxfce4util, libxfce4ui, libxfconf, dbus-glib, libwnck</td>
-    <td>libstartup-notification</td>
-  </tr>
-  <tr>
-    <td>xfdesktop</td>
-    <td>libxfce4util, libxfce4ui, libxfconf, libwnck, gtk+, glib</td>
-    <td>dbus-glib, gio-unix, garcon, libexo, libnotify, thunarx</td>
-  </tr>
-  <tr>
-    <td>xfce4-appfinder</td>
-    <td>libxfce4util, garcon, gtk+, glib</td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td>xfce4-mixer</td>
-    <td>libxfce4util, libxfce4ui, libxfce4panel, gst-plugins-base-0.10</td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td>xfce-utils</td>
-    <td>libxfce4util, libxfce4ui, perl w/XML::Parser</td>
-    <td>gdm, dbus</td>
-  </tr>
-  <tr>
-    <td>gtk-xfce-engine-2</td>
-    <td> </td>
-    <td> </td>
-  </tr>
-</table>
-
-<p><?php E_('The build dependencies tree is also available as a <a href="/images/documentation/xfce-bdeps.svg">SVG file</a>.') ?></p>
-
-<h2><?php E_('Recommended packages') ?></h2>
-<ul>
-    <li>librsvg (<?php E_('support for scalable icons') ?>)</li>
-    <li>hicolor-icon-theme (<?php E_('better support for icon themes') ?>)</li>
-    <li>openssh</li>
-    <li>xscreensaver (<?php E_('locking the screen') ?>)</li>
-</ul>
diff --git a/pages/footer.php b/pages/footer.php
index ec4a426..03b0844 100644
--- a/pages/footer.php
+++ b/pages/footer.php
@@ -1,10 +1,8 @@
-    </div> <!-- page-contents -->
-    <div id="footer">
-        <hr />
-        <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-contents -->
+	<div id="footer">
+		<hr />
+		<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 -->
 
 </body>
diff --git a/pages/frontpage.php b/pages/frontpage.php
index 3019a92..5ecc325 100644
--- a/pages/frontpage.php
+++ b/pages/frontpage.php
@@ -6,113 +6,113 @@ 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['javascript'] = '/style/tinyslider.js';
 $head['pagediv'] = false;
 ?>
 
 <div id="slidewrap" class="page_contents">
-  <div id="slide">
-    <ul>
-      <li>
-        <img src="/images/frontpage/slider-desktop.jpg" width="800" height="400" alt="Xfce Desktop" />
-        <p><?php E_('The default Xfce Desktop provides a simple and attractive desktop for Unix users.') ?></p>
-      </li>
-      <li>
-        <img src="/images/frontpage/slider-thunar.jpg" width="800" height="400" alt="File Manager" />
-        <p><?php E_('Thunar is the file manager for the Xfce Desktop Environment. It has been designed from the ground up to be fast and easy-to-use. Its user interface is clean and intuitive, and does not include any confusing or useless options by default.') ?></p>
-      </li>
-      <li>
-        <img src="/images/frontpage/slider-settings.jpg" width="800" height="400" alt="Settings" />
-        <p><?php E_('The Xfce Desktop Environement provides all the required settings to configure your hardware, desktop appearance and other desktop-critical settings allowing you to easily manage your system.') ?></p>
-      </li>
-      <li>
-        <img src="/images/frontpage/slider-xfwm4.jpg" width="800" height="400" alt="Window Manager" />
-        <p><?php E_('The Xfce Window Manager is the core of the desktop. It can be tuned to make window management quick and predictable. It also features around 100 border styles giving it the look you want!') ?></p>
-      </li>
-      <li>
-        <img src="/images/frontpage/slider-panel.jpg" width="800" height="400" alt="Panel" />
-        <p><?php E_('The Xfce Panel can be customized in numerous ways so it provides all the items you need right where you need them. It has three different display modes, transparency and a few dozen different plugins.') ?></p>
-      </li>
-      <li>
-        <img src="/images/frontpage/slider-apps.jpg" width="800" height="400" alt="Applications" />
-        <p><?php E_('Beside the core desktop functionality, a number of other applications are developed in the Xfce repositories, like an image viewer, the Midori web browser, task manager, notes plugin and calendar.') ?></p>
-      </li>
-    </ul>
-  </div>
-  <div id="slidenavwrap">
-    <ul id="slidenav">
-      <li onclick="slideshow.pos(0)"></li>
-      <li onclick="slideshow.pos(1)"></li>
-      <li onclick="slideshow.pos(2)"></li>
-      <li onclick="slideshow.pos(3)"></li>
-      <li onclick="slideshow.pos(4)"></li>
-      <li onclick="slideshow.pos(5)"></li>
-    </ul>
-  </div>
+<div id="slide">
+	<ul>
+		<li>
+			<img src="<?php echo $static_media; ?>/frontpage/slider-desktop.jpg" width="800" height="400" alt="Xfce Desktop" />
+			<p><?php E_('The default Xfce Desktop provides a simple and attractive desktop for Unix users.') ?></p>
+		</li>
+		<li>
+			<img src="<?php echo $static_media; ?>/frontpage/slider-thunar.jpg" width="800" height="400" alt="File Manager" />
+			<p><?php E_('Thunar is the file manager for the Xfce Desktop Environment. It has been designed from the ground up to be fast and easy-to-use. Its user interface is clean and intuitive, and does not include any confusing or useless options by default.') ?></p>
+		</li>
+		<li>
+			<img src="<?php echo $static_media; ?>/frontpage/slider-settings.jpg" width="800" height="400" alt="Settings" />
+			<p><?php E_('The Xfce Desktop Environement provides all the required settings to configure your hardware, desktop appearance and other desktop-critical settings allowing you to easily manage your system.') ?></p>
+		</li>
+		<li>
+			<img src="<?php echo $static_media; ?>/frontpage/slider-xfwm4.jpg" width="800" height="400" alt="Window Manager" />
+			<p><?php E_('The Xfce Window Manager is the core of the desktop. It can be tuned to make window management quick and predictable. It also features around 100 border styles giving it the look you want!') ?></p>
+		</li>
+		<li>
+			<img src="<?php echo $static_media; ?>/frontpage/slider-panel.jpg" width="800" height="400" alt="Panel" />
+			<p><?php E_('The Xfce Panel can be customized in numerous ways so it provides all the items you need right where you need them. It has three different display modes, transparency and a few dozen different plugins.') ?></p>
+		</li>
+		<li>
+			<img src="<?php echo $static_media; ?>/frontpage/slider-apps.jpg" width="800" height="400" alt="Applications" />
+			<p><?php E_('Beside the core desktop functionality, a number of other applications are developed in the Xfce repositories, like an image viewer, the Midori web browser, task manager, notes plugin and calendar.') ?></p>
+		</li>
+	</ul>
+</div>
+<div id="slidenavwrap">
+	<ul id="slidenav">
+		<li onclick="slideshow.pos(0)"></li>
+		<li onclick="slideshow.pos(1)"></li>
+		<li onclick="slideshow.pos(2)"></li>
+		<li onclick="slideshow.pos(3)"></li>
+		<li onclick="slideshow.pos(4)"></li>
+		<li onclick="slideshow.pos(5)"></li>
+	</ul>
+</div>
 </div>
 
 <script type="text/javascript">
+<?php include ('style/tinyslider.js'); ?>;
+
 var slideshow=new TINY.slider.slide('slideshow',{
-  id:'slide',
-  auto:10,
-  vertical:false,
-  navid:'slidenav',
-  activeclass:'current',
-  position:0,
-  rewind:false,
-  elastic:false
+	id:'slide',
+	auto:10,
+	vertical:false,
+	navid:'slidenav',
+	activeclass:'current',
+	position:0,
+	rewind:false,
+	elastic:false
 });
 </script>
 
 <div class="page_contents file_frontpage">
-        
+
 <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>
-    </ul>
-  </div>
+	<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>
+		</ul>
+	</div>
 </div>
 
 <div class="column">
-  <div class="rcolumn">
-    <h2><?php E_('Latest News') ?></h2>
-    <?php
-      $count = 2;
-      foreach ($news as $item)
-      {
-        if (isset ($item['version']) && !empty ($item['version']))
-          $title = sprintf (R_('Xfce %s released'), $item['version']);
-        else
-          $title = $item['title'];
-    
-        $link = '/about/news/?post='.strtotime ($item['date']);
-        
-        echo '<h3>'.$title.'</h3>';
-    
-        $stamp = strtotime ($item['date']);
-        echo '<div class="post-date"><span class="post-month">'. date ('M', $stamp).
-           '</span> <span class="post-day">'. date ('d', $stamp).
-           '<br />'.date ('Y', $stamp).'</span></div>';
-        
-        echo '<div class="post-wrap">';
-        echo '<p>'.$item['paragraphs'][0];
-        
-        echo ' <a href="'.$link.'">';
-        E_('Learn More →');
-        echo '</a></p></div>';
-    
-        if (--$count <= 0)
-          break;
-      }
-    ?>
-  </div>
+	<div class="rcolumn">
+		<h2><?php E_('Latest News') ?></h2>
+		<?php
+			$count = 2;
+			foreach ($news as $item)
+			{
+				if (isset ($item['version']) && !empty ($item['version']))
+					$title = sprintf (R_('Xfce %s released'), $item['version']);
+				else
+					$title = $item['title'];
+
+				$link = '/about/news/?post='.strtotime ($item['date']);
+
+				echo '<h3>'.$title.'</h3>';
+
+				$stamp = strtotime ($item['date']);
+				echo '<div class="post-date"><span class="post-month">'. date ('M', $stamp).
+					 '</span> <span class="post-day">'. date ('d', $stamp).
+					 '<br />'.date ('Y', $stamp).'</span></div>';
+
+				echo '<div class="post-wrap">';
+				echo '<p>'.$item['paragraphs'][0];
+
+				echo ' <a href="'.$link.'">';
+				E_('Learn More →');
+				echo '</a></p></div>';
+
+				if (--$count <= 0)
+					break;
+			}
+		?>
+	</div>
 </div>
 
 <div class="clearboth"></div>
diff --git a/pages/header.php b/pages/header.php
index ce304f0..02a93b1 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -14,14 +14,12 @@ else
 	<link rel="shortcut icon" href="/style/favicon.png" type="image/png" />
 	<link rel="stylesheet" media="screen" href="/style/bundle.php" type="text/css" />
 <?php
-        if (isset ($head['description']))
-                echo "\t<meta name=\"description\" content=\"".$head['description']."\" />\n";
-        if (isset ($head['keywords']))
-                echo "\t<meta name=\"keywords\" content=\"".$head['keywords']."\" />\n";
-        if (isset ($head['feed']))
-                echo "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS 2.0\" href=\"".$head['feed']."\" />\n";
-        if (isset ($head['javascript']))
-                echo "\t<script type=\"text/javascript\" src=\"".$head['javascript']."\"></script>\n";
+	if (isset ($head['description']))
+		echo "\t<meta name=\"description\" content=\"".$head['description']."\" />\n";
+	if (isset ($head['keywords']))
+		echo "\t<meta name=\"keywords\" content=\"".$head['keywords']."\" />\n";
+	if (isset ($head['feed']))
+		echo "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS 2.0\" href=\"".$head['feed']."\" />\n";
 ?>
 </head>
 
@@ -119,7 +117,7 @@ else
 
 		echo '</div>';
 	}
-	
+
 	if (!isset ($head['pagediv']) || $head['pagediv'] == true)
 	{
 ?>
diff --git a/pages/projects/index.php b/pages/projects/index.php
index 84dc1c9..94a67d1 100644
--- a/pages/projects/index.php
+++ b/pages/projects/index.php
@@ -17,13 +17,13 @@ $toc['anchors'] = array (
 
 <div class="column"><div class="lcolumn">
   <h3><a href="http://docs.xfce.org/xfce/xfwm4/start" class="external"><?php E_('Window Manager') ?></a></h3>
-  <p class="colicon" style="background-image: url('/images/projects/xfwm4.png')">
+  <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.') ?>
   </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>
-  <p class="colicon" style="background-image: url('/images/projects/xfce4-panel.png')">
+  <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.') ?>
   </p>
 </div></div>
@@ -32,13 +32,13 @@ $toc['anchors'] = array (
 
 <div class="column"><div class="lcolumn">
   <h3><a href="http://docs.xfce.org/xfce/xfdesktop/start" class="external"><?php E_('Desktop Manager') ?></a></h3>
-  <p class="colicon" style="background-image: url('/images/projects/xfdesktop.png')">
+  <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.') ?>
   </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>
-  <p class="colicon" style="background-image: url('/images/projects/xfce4-session.png')">
+  <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.') ?>
   </p>
 </div></div>
@@ -47,13 +47,13 @@ $toc['anchors'] = array (
 
 <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>
-  <p class="colicon" style="background-image: url('/images/projects/xfce4-settings.png')">
+  <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.') ?>
   </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>
-  <p class="colicon" style="background-image: url('/images/projects/xfce4-appfinder.png')">
+  <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.') ?>
   </p>
 </div></div>
@@ -62,13 +62,13 @@ $toc['anchors'] = array (
 
 <div class="column"><div class="lcolumn">
   <h3><a href="http://docs.xfce.org/xfce/exo/start" class="external"><?php E_('Xfce Libraries') ?></a></h3>
-  <p class="colicon" style="background-image: url('/images/projects/library.png')">
+  <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.') ?>
   </p>
 </div></div>
 <div class="column"><div class="rcolumn">
   <h3><a href="http://docs.xfce.org/xfce/xfconf/start" class="external">Xfconf</a></h3>
-  <p class="colicon" style="background-image: url('/images/projects/library.png')">
+  <p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/library.png')">
     <?php E_('Simple client-server configuration storage and query system.') ?>
   </p>
 </div></div>
@@ -77,7 +77,7 @@ $toc['anchors'] = array (
 
 <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>
-  <p class="colicon" style="background-image: url('/images/projects/thunar.png')">
+  <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.') ?>
   </p>
 </div></div>
@@ -88,13 +88,13 @@ $toc['anchors'] = array (
 
 <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>
-  <p class="colicon" style="background-image: url('/images/projects/midori.png')">
+  <p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/midori.png')">
     <?php E_('Midori is a lightweight Web browser.') ?>
   </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>
-  <p class="colicon" style="background-image: url('/images/projects/terminal.png')">
+  <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.') ?>
   </p>
 </div></div>
@@ -104,13 +104,13 @@ $toc['anchors'] = array (
 
 <div class="column"><div class="lcolumn">
   <h3><?php E_('Xfburn') ?></h3>
-  <p class="colicon" style="background-image: url('/images/projects/xfburn.png')">
+  <p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfburn.png')">
     <?php E_('Xfburn is an application to create and burn CD\'s and DVD\'s.') ?>
   </p>
 </div></div>
 <div class="column"><div class="rcolumn">
   <h3><?php E_('Orage') ?></h3>
-  <p class="colicon" style="background-image: url('/images/projects/orage.png')">
+  <p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/orage.png')">
     <?php E_('A simple calendar application with reminders.') ?>
   </p>
 </div></div>
@@ -120,13 +120,13 @@ $toc['anchors'] = array (
 
 <div class="column"><div class="lcolumn">
   <h3><?php E_('Mixer') ?></h3>
-  <p class="colicon" style="background-image: url('/images/projects/xfce4-mixer.png')">
+  <p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/xfce4-mixer.png')">
     <?php E_('Allows you to change the volume of the different audio tracks.') ?>
   </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>
-  <p class="colicon" style="background-image: url('/images/projects/ristretto.png')">
+  <p class="colicon" style="background-image: url('<?php echo $static_media; ?>/projects/ristretto.png')">
     <?php E_('Ristretto is a lightweight image viewer.') ?>
   </p>
 </div></div>
diff --git a/robots.txt b/robots.txt
index d6d32fc..514f67b 100644
--- a/robots.txt
+++ b/robots.txt
@@ -1,4 +1,4 @@
 User-agent: *
-Disallow: /images/
+Disallow: /static/
 Disallow: /style/
 Disallow: /archive/
diff --git a/images/about/releasemodel/code-freeze-branching.png b/static/about/releasemodel/code-freeze-branching.png
similarity index 100%
rename from images/about/releasemodel/code-freeze-branching.png
rename to static/about/releasemodel/code-freeze-branching.png
diff --git a/images/about/releasemodel/code-freeze-branching.svg b/static/about/releasemodel/code-freeze-branching.svg
similarity index 100%
rename from images/about/releasemodel/code-freeze-branching.svg
rename to static/about/releasemodel/code-freeze-branching.svg
diff --git a/images/about/releasemodel/example-release-cycle.png b/static/about/releasemodel/example-release-cycle.png
similarity index 100%
rename from images/about/releasemodel/example-release-cycle.png
rename to static/about/releasemodel/example-release-cycle.png
diff --git a/images/about/releasemodel/example-release-cycle.svg b/static/about/releasemodel/example-release-cycle.svg
similarity index 100%
rename from images/about/releasemodel/example-release-cycle.svg
rename to static/about/releasemodel/example-release-cycle.svg
diff --git a/static/about/releasemodel/feature-branching.png b/static/about/releasemodel/feature-branching.png
new file mode 100644
index 0000000..c3e5842
Binary files /dev/null and b/static/about/releasemodel/feature-branching.png differ
diff --git a/images/about/releasemodel/feature-branching.svg b/static/about/releasemodel/feature-branching.svg
similarity index 100%
rename from images/about/releasemodel/feature-branching.svg
rename to static/about/releasemodel/feature-branching.svg
diff --git a/images/about/screenshots/4.0-1-small.jpg b/static/about/screenshots/4.0-1-small.jpg
similarity index 100%
rename from images/about/screenshots/4.0-1-small.jpg
rename to static/about/screenshots/4.0-1-small.jpg
diff --git a/images/about/screenshots/4.0-1.png b/static/about/screenshots/4.0-1.png
similarity index 100%
rename from images/about/screenshots/4.0-1.png
rename to static/about/screenshots/4.0-1.png
diff --git a/images/about/screenshots/4.0-2-small.jpg b/static/about/screenshots/4.0-2-small.jpg
similarity index 100%
rename from images/about/screenshots/4.0-2-small.jpg
rename to static/about/screenshots/4.0-2-small.jpg
diff --git a/images/about/screenshots/4.0-2.png b/static/about/screenshots/4.0-2.png
similarity index 100%
rename from images/about/screenshots/4.0-2.png
rename to static/about/screenshots/4.0-2.png
diff --git a/images/about/screenshots/4.2-1-small.jpg b/static/about/screenshots/4.2-1-small.jpg
similarity index 100%
rename from images/about/screenshots/4.2-1-small.jpg
rename to static/about/screenshots/4.2-1-small.jpg
diff --git a/images/about/screenshots/4.2-1.jpg b/static/about/screenshots/4.2-1.jpg
similarity index 100%
rename from images/about/screenshots/4.2-1.jpg
rename to static/about/screenshots/4.2-1.jpg
diff --git a/images/about/screenshots/4.2-2-small.jpg b/static/about/screenshots/4.2-2-small.jpg
similarity index 100%
rename from images/about/screenshots/4.2-2-small.jpg
rename to static/about/screenshots/4.2-2-small.jpg
diff --git a/images/about/screenshots/4.2-2.jpg b/static/about/screenshots/4.2-2.jpg
similarity index 100%
rename from images/about/screenshots/4.2-2.jpg
rename to static/about/screenshots/4.2-2.jpg
diff --git a/images/about/screenshots/4.2-3-small.jpg b/static/about/screenshots/4.2-3-small.jpg
similarity index 100%
rename from images/about/screenshots/4.2-3-small.jpg
rename to static/about/screenshots/4.2-3-small.jpg
diff --git a/images/about/screenshots/4.2-3.jpg b/static/about/screenshots/4.2-3.jpg
similarity index 100%
rename from images/about/screenshots/4.2-3.jpg
rename to static/about/screenshots/4.2-3.jpg
diff --git a/images/about/screenshots/4.2-4-small.jpg b/static/about/screenshots/4.2-4-small.jpg
similarity index 100%
rename from images/about/screenshots/4.2-4-small.jpg
rename to static/about/screenshots/4.2-4-small.jpg
diff --git a/images/about/screenshots/4.2-4.jpg b/static/about/screenshots/4.2-4.jpg
similarity index 100%
rename from images/about/screenshots/4.2-4.jpg
rename to static/about/screenshots/4.2-4.jpg
diff --git a/images/about/screenshots/4.2-5-small.jpg b/static/about/screenshots/4.2-5-small.jpg
similarity index 100%
rename from images/about/screenshots/4.2-5-small.jpg
rename to static/about/screenshots/4.2-5-small.jpg
diff --git a/images/about/screenshots/4.2-5.jpg b/static/about/screenshots/4.2-5.jpg
similarity index 100%
rename from images/about/screenshots/4.2-5.jpg
rename to static/about/screenshots/4.2-5.jpg
diff --git a/images/about/screenshots/4.4-1-small.jpg b/static/about/screenshots/4.4-1-small.jpg
similarity index 100%
rename from images/about/screenshots/4.4-1-small.jpg
rename to static/about/screenshots/4.4-1-small.jpg
diff --git a/images/about/screenshots/4.4-1.png b/static/about/screenshots/4.4-1.png
similarity index 100%
rename from images/about/screenshots/4.4-1.png
rename to static/about/screenshots/4.4-1.png
diff --git a/images/about/screenshots/4.4-2-small.jpg b/static/about/screenshots/4.4-2-small.jpg
similarity index 100%
rename from images/about/screenshots/4.4-2-small.jpg
rename to static/about/screenshots/4.4-2-small.jpg
diff --git a/images/about/screenshots/4.4-2.png b/static/about/screenshots/4.4-2.png
similarity index 100%
rename from images/about/screenshots/4.4-2.png
rename to static/about/screenshots/4.4-2.png
diff --git a/images/about/screenshots/4.4-3-small.jpg b/static/about/screenshots/4.4-3-small.jpg
similarity index 100%
rename from images/about/screenshots/4.4-3-small.jpg
rename to static/about/screenshots/4.4-3-small.jpg
diff --git a/images/about/screenshots/4.4-3.png b/static/about/screenshots/4.4-3.png
similarity index 100%
rename from images/about/screenshots/4.4-3.png
rename to static/about/screenshots/4.4-3.png
diff --git a/images/about/screenshots/4.4-4-small.jpg b/static/about/screenshots/4.4-4-small.jpg
similarity index 100%
rename from images/about/screenshots/4.4-4-small.jpg
rename to static/about/screenshots/4.4-4-small.jpg
diff --git a/images/about/screenshots/4.4-4.png b/static/about/screenshots/4.4-4.png
similarity index 100%
rename from images/about/screenshots/4.4-4.png
rename to static/about/screenshots/4.4-4.png
diff --git a/images/about/screenshots/4.4-5-small.jpg b/static/about/screenshots/4.4-5-small.jpg
similarity index 100%
rename from images/about/screenshots/4.4-5-small.jpg
rename to static/about/screenshots/4.4-5-small.jpg
diff --git a/images/about/screenshots/4.4-5.png b/static/about/screenshots/4.4-5.png
similarity index 100%
rename from images/about/screenshots/4.4-5.png
rename to static/about/screenshots/4.4-5.png
diff --git a/images/about/screenshots/4.4-6-small.jpg b/static/about/screenshots/4.4-6-small.jpg
similarity index 100%
rename from images/about/screenshots/4.4-6-small.jpg
rename to static/about/screenshots/4.4-6-small.jpg
diff --git a/images/about/screenshots/4.4-6.png b/static/about/screenshots/4.4-6.png
similarity index 100%
rename from images/about/screenshots/4.4-6.png
rename to static/about/screenshots/4.4-6.png
diff --git a/images/about/screenshots/4.4-8-small.jpg b/static/about/screenshots/4.4-8-small.jpg
similarity index 100%
rename from images/about/screenshots/4.4-8-small.jpg
rename to static/about/screenshots/4.4-8-small.jpg
diff --git a/images/about/screenshots/4.4-8.png b/static/about/screenshots/4.4-8.png
similarity index 100%
rename from images/about/screenshots/4.4-8.png
rename to static/about/screenshots/4.4-8.png
diff --git a/images/about/screenshots/4.6-1-small.jpg b/static/about/screenshots/4.6-1-small.jpg
similarity index 100%
rename from images/about/screenshots/4.6-1-small.jpg
rename to static/about/screenshots/4.6-1-small.jpg
diff --git a/images/about/screenshots/4.6-1.png b/static/about/screenshots/4.6-1.png
similarity index 100%
rename from images/about/screenshots/4.6-1.png
rename to static/about/screenshots/4.6-1.png
diff --git a/images/about/screenshots/4.6-2-small.jpg b/static/about/screenshots/4.6-2-small.jpg
similarity index 100%
rename from images/about/screenshots/4.6-2-small.jpg
rename to static/about/screenshots/4.6-2-small.jpg
diff --git a/images/about/screenshots/4.6-2.png b/static/about/screenshots/4.6-2.png
similarity index 100%
rename from images/about/screenshots/4.6-2.png
rename to static/about/screenshots/4.6-2.png
diff --git a/images/about/screenshots/4.6-3-small.jpg b/static/about/screenshots/4.6-3-small.jpg
similarity index 100%
rename from images/about/screenshots/4.6-3-small.jpg
rename to static/about/screenshots/4.6-3-small.jpg
diff --git a/images/about/screenshots/4.6-3.png b/static/about/screenshots/4.6-3.png
similarity index 100%
rename from images/about/screenshots/4.6-3.png
rename to static/about/screenshots/4.6-3.png
diff --git a/images/about/screenshots/4.6-4-small.jpg b/static/about/screenshots/4.6-4-small.jpg
similarity index 100%
rename from images/about/screenshots/4.6-4-small.jpg
rename to static/about/screenshots/4.6-4-small.jpg
diff --git a/images/about/screenshots/4.6-4.png b/static/about/screenshots/4.6-4.png
similarity index 100%
rename from images/about/screenshots/4.6-4.png
rename to static/about/screenshots/4.6-4.png
diff --git a/images/about/screenshots/4.6-5-small.jpg b/static/about/screenshots/4.6-5-small.jpg
similarity index 100%
rename from images/about/screenshots/4.6-5-small.jpg
rename to static/about/screenshots/4.6-5-small.jpg
diff --git a/images/about/screenshots/4.6-5.png b/static/about/screenshots/4.6-5.png
similarity index 100%
rename from images/about/screenshots/4.6-5.png
rename to static/about/screenshots/4.6-5.png
diff --git a/images/about/screenshots/4.6-6-small.jpg b/static/about/screenshots/4.6-6-small.jpg
similarity index 100%
rename from images/about/screenshots/4.6-6-small.jpg
rename to static/about/screenshots/4.6-6-small.jpg
diff --git a/images/about/screenshots/4.6-6.png b/static/about/screenshots/4.6-6.png
similarity index 100%
rename from images/about/screenshots/4.6-6.png
rename to static/about/screenshots/4.6-6.png
diff --git a/images/about/screenshots/4.6-7-small.jpg b/static/about/screenshots/4.6-7-small.jpg
similarity index 100%
rename from images/about/screenshots/4.6-7-small.jpg
rename to static/about/screenshots/4.6-7-small.jpg
diff --git a/images/about/screenshots/4.6-7.png b/static/about/screenshots/4.6-7.png
similarity index 100%
rename from images/about/screenshots/4.6-7.png
rename to static/about/screenshots/4.6-7.png
diff --git a/images/about/screenshots/4.8-1-small.jpg b/static/about/screenshots/4.8-1-small.jpg
similarity index 100%
rename from images/about/screenshots/4.8-1-small.jpg
rename to static/about/screenshots/4.8-1-small.jpg
diff --git a/images/about/screenshots/4.8-1.png b/static/about/screenshots/4.8-1.png
similarity index 100%
rename from images/about/screenshots/4.8-1.png
rename to static/about/screenshots/4.8-1.png
diff --git a/images/about/screenshots/4.8-2-small.jpg b/static/about/screenshots/4.8-2-small.jpg
similarity index 100%
rename from images/about/screenshots/4.8-2-small.jpg
rename to static/about/screenshots/4.8-2-small.jpg
diff --git a/images/about/screenshots/4.8-2.png b/static/about/screenshots/4.8-2.png
similarity index 100%
rename from images/about/screenshots/4.8-2.png
rename to static/about/screenshots/4.8-2.png
diff --git a/images/about/screenshots/4.8-3-small.jpg b/static/about/screenshots/4.8-3-small.jpg
similarity index 100%
rename from images/about/screenshots/4.8-3-small.jpg
rename to static/about/screenshots/4.8-3-small.jpg
diff --git a/images/about/screenshots/4.8-3.png b/static/about/screenshots/4.8-3.png
similarity index 100%
rename from images/about/screenshots/4.8-3.png
rename to static/about/screenshots/4.8-3.png
diff --git a/images/about/screenshots/4.8-4-small.jpg b/static/about/screenshots/4.8-4-small.jpg
similarity index 100%
rename from images/about/screenshots/4.8-4-small.jpg
rename to static/about/screenshots/4.8-4-small.jpg
diff --git a/images/about/screenshots/4.8-4.png b/static/about/screenshots/4.8-4.png
similarity index 100%
rename from images/about/screenshots/4.8-4.png
rename to static/about/screenshots/4.8-4.png
diff --git a/images/about/tour/4.4/autostart.png b/static/about/tour/4.4/autostart.png
similarity index 100%
rename from images/about/tour/4.4/autostart.png
rename to static/about/tour/4.4/autostart.png
diff --git a/images/about/tour/4.4/desktop-icons.png b/static/about/tour/4.4/desktop-icons.png
similarity index 100%
rename from images/about/tour/4.4/desktop-icons.png
rename to static/about/tour/4.4/desktop-icons.png
diff --git a/images/about/tour/4.4/desktop-settings.png b/static/about/tour/4.4/desktop-settings.png
similarity index 100%
rename from images/about/tour/4.4/desktop-settings.png
rename to static/about/tour/4.4/desktop-settings.png
diff --git a/images/about/tour/4.4/mousepad.png b/static/about/tour/4.4/mousepad.png
similarity index 100%
rename from images/about/tour/4.4/mousepad.png
rename to static/about/tour/4.4/mousepad.png
diff --git a/images/about/tour/4.4/orage.png b/static/about/tour/4.4/orage.png
similarity index 100%
rename from images/about/tour/4.4/orage.png
rename to static/about/tour/4.4/orage.png
diff --git a/images/about/tour/4.4/panel-additem.png b/static/about/tour/4.4/panel-additem.png
similarity index 100%
rename from images/about/tour/4.4/panel-additem.png
rename to static/about/tour/4.4/panel-additem.png
diff --git a/images/about/tour/4.4/panel-iconbox.png b/static/about/tour/4.4/panel-iconbox.png
similarity index 100%
rename from images/about/tour/4.4/panel-iconbox.png
rename to static/about/tour/4.4/panel-iconbox.png
diff --git a/images/about/tour/4.4/panel-manager.png b/static/about/tour/4.4/panel-manager.png
similarity index 100%
rename from images/about/tour/4.4/panel-manager.png
rename to static/about/tour/4.4/panel-manager.png
diff --git a/images/about/tour/4.4/preferences-applications.png b/static/about/tour/4.4/preferences-applications.png
similarity index 100%
rename from images/about/tour/4.4/preferences-applications.png
rename to static/about/tour/4.4/preferences-applications.png
diff --git a/images/about/tour/4.4/preferences-keyboard.png b/static/about/tour/4.4/preferences-keyboard.png
similarity index 100%
rename from images/about/tour/4.4/preferences-keyboard.png
rename to static/about/tour/4.4/preferences-keyboard.png
diff --git a/images/about/tour/4.4/removable-volumes.png b/static/about/tour/4.4/removable-volumes.png
similarity index 100%
rename from images/about/tour/4.4/removable-volumes.png
rename to static/about/tour/4.4/removable-volumes.png
diff --git a/images/about/tour/4.4/terminal.png b/static/about/tour/4.4/terminal.png
similarity index 100%
rename from images/about/tour/4.4/terminal.png
rename to static/about/tour/4.4/terminal.png
diff --git a/images/about/tour/4.4/thunar-bulk-rename.png b/static/about/tour/4.4/thunar-bulk-rename.png
similarity index 100%
rename from images/about/tour/4.4/thunar-bulk-rename.png
rename to static/about/tour/4.4/thunar-bulk-rename.png
diff --git a/images/about/tour/4.4/thunar.png b/static/about/tour/4.4/thunar.png
similarity index 100%
rename from images/about/tour/4.4/thunar.png
rename to static/about/tour/4.4/thunar.png
diff --git a/images/about/tour/4.4/xfprint-dialog.png b/static/about/tour/4.4/xfprint-dialog.png
similarity index 100%
rename from images/about/tour/4.4/xfprint-dialog.png
rename to static/about/tour/4.4/xfprint-dialog.png
diff --git a/images/about/tour/4.4/xfprint.png b/static/about/tour/4.4/xfprint.png
similarity index 100%
rename from images/about/tour/4.4/xfprint.png
rename to static/about/tour/4.4/xfprint.png
diff --git a/static/about/tour/4.4/xfwm4-argb32.png b/static/about/tour/4.4/xfwm4-argb32.png
new file mode 100644
index 0000000..d5670e3
Binary files /dev/null and b/static/about/tour/4.4/xfwm4-argb32.png differ
diff --git a/images/about/tour/4.4/xfwm4-switcher.png b/static/about/tour/4.4/xfwm4-switcher.png
similarity index 100%
rename from images/about/tour/4.4/xfwm4-switcher.png
rename to static/about/tour/4.4/xfwm4-switcher.png
diff --git a/static/about/tour/4.4/xfwm4-themes.png b/static/about/tour/4.4/xfwm4-themes.png
new file mode 100644
index 0000000..08d3110
Binary files /dev/null and b/static/about/tour/4.4/xfwm4-themes.png differ
diff --git a/images/about/tour/4.4/xfwm4-tweaks.png b/static/about/tour/4.4/xfwm4-tweaks.png
similarity index 100%
rename from images/about/tour/4.4/xfwm4-tweaks.png
rename to static/about/tour/4.4/xfwm4-tweaks.png
diff --git a/images/about/tour/4.6/thunar-encrypted.png b/static/about/tour/4.6/thunar-encrypted.png
similarity index 100%
rename from images/about/tour/4.6/thunar-encrypted.png
rename to static/about/tour/4.6/thunar-encrypted.png
diff --git a/images/about/tour/4.6/thunar-mounting.png b/static/about/tour/4.6/thunar-mounting.png
similarity index 100%
rename from images/about/tour/4.6/thunar-mounting.png
rename to static/about/tour/4.6/thunar-mounting.png
diff --git a/images/about/tour/4.6/thunar-wallpaper-plugin.png b/static/about/tour/4.6/thunar-wallpaper-plugin.png
similarity index 100%
rename from images/about/tour/4.6/thunar-wallpaper-plugin.png
rename to static/about/tour/4.6/thunar-wallpaper-plugin.png
diff --git a/images/about/tour/4.6/thunar-xdg-user-dirs.png b/static/about/tour/4.6/thunar-xdg-user-dirs.png
similarity index 100%
rename from images/about/tour/4.6/thunar-xdg-user-dirs.png
rename to static/about/tour/4.6/thunar-xdg-user-dirs.png
diff --git a/images/about/tour/4.6/xfce4-accessibility-settings.png b/static/about/tour/4.6/xfce4-accessibility-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-accessibility-settings.png
rename to static/about/tour/4.6/xfce4-accessibility-settings.png
diff --git a/images/about/tour/4.6/xfce4-appearance-settings.png b/static/about/tour/4.6/xfce4-appearance-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-appearance-settings.png
rename to static/about/tour/4.6/xfce4-appearance-settings.png
diff --git a/images/about/tour/4.6/xfce4-appfinder.png b/static/about/tour/4.6/xfce4-appfinder.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-appfinder.png
rename to static/about/tour/4.6/xfce4-appfinder.png
diff --git a/images/about/tour/4.6/xfce4-display-settings.png b/static/about/tour/4.6/xfce4-display-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-display-settings.png
rename to static/about/tour/4.6/xfce4-display-settings.png
diff --git a/images/about/tour/4.6/xfce4-keyboard-settings-layout.png b/static/about/tour/4.6/xfce4-keyboard-settings-layout.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-keyboard-settings-layout.png
rename to static/about/tour/4.6/xfce4-keyboard-settings-layout.png
diff --git a/static/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png b/static/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png
new file mode 100644
index 0000000..be57557
Binary files /dev/null and b/static/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png differ
diff --git a/images/about/tour/4.6/xfce4-mixer.png b/static/about/tour/4.6/xfce4-mixer.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-mixer.png
rename to static/about/tour/4.6/xfce4-mixer.png
diff --git a/images/about/tour/4.6/xfce4-mouse-settings.png b/static/about/tour/4.6/xfce4-mouse-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-mouse-settings.png
rename to static/about/tour/4.6/xfce4-mouse-settings.png
diff --git a/images/about/tour/4.6/xfce4-panel-clock.png b/static/about/tour/4.6/xfce4-panel-clock.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-panel-clock.png
rename to static/about/tour/4.6/xfce4-panel-clock.png
diff --git a/images/about/tour/4.6/xfce4-session-logout.png b/static/about/tour/4.6/xfce4-session-logout.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-session-logout.png
rename to static/about/tour/4.6/xfce4-session-logout.png
diff --git a/images/about/tour/4.6/xfce4-session-settings.png b/static/about/tour/4.6/xfce4-session-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-session-settings.png
rename to static/about/tour/4.6/xfce4-session-settings.png
diff --git a/images/about/tour/4.6/xfce4-settings-manager.png b/static/about/tour/4.6/xfce4-settings-manager.png
similarity index 100%
rename from images/about/tour/4.6/xfce4-settings-manager.png
rename to static/about/tour/4.6/xfce4-settings-manager.png
diff --git a/static/about/tour/4.6/xfdesktop-menu.png b/static/about/tour/4.6/xfdesktop-menu.png
new file mode 100644
index 0000000..a566849
Binary files /dev/null and b/static/about/tour/4.6/xfdesktop-menu.png differ
diff --git a/images/about/tour/4.6/xfdesktop-rubberbanding.png b/static/about/tour/4.6/xfdesktop-rubberbanding.png
similarity index 100%
rename from images/about/tour/4.6/xfdesktop-rubberbanding.png
rename to static/about/tour/4.6/xfdesktop-rubberbanding.png
diff --git a/images/about/tour/4.6/xfdesktop-settings.png b/static/about/tour/4.6/xfdesktop-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfdesktop-settings.png
rename to static/about/tour/4.6/xfdesktop-settings.png
diff --git a/static/about/tour/4.6/xfwm4-fill-operation.png b/static/about/tour/4.6/xfwm4-fill-operation.png
new file mode 100644
index 0000000..da758df
Binary files /dev/null and b/static/about/tour/4.6/xfwm4-fill-operation.png differ
diff --git a/images/about/tour/4.6/xfwm4-net-ping.png b/static/about/tour/4.6/xfwm4-net-ping.png
similarity index 100%
rename from images/about/tour/4.6/xfwm4-net-ping.png
rename to static/about/tour/4.6/xfwm4-net-ping.png
diff --git a/static/about/tour/4.6/xfwm4-new-menu.png b/static/about/tour/4.6/xfwm4-new-menu.png
new file mode 100644
index 0000000..7a831ec
Binary files /dev/null and b/static/about/tour/4.6/xfwm4-new-menu.png differ
diff --git a/images/about/tour/4.6/xfwm4-new-tweaks.png b/static/about/tour/4.6/xfwm4-new-tweaks.png
similarity index 100%
rename from images/about/tour/4.6/xfwm4-new-tweaks.png
rename to static/about/tour/4.6/xfwm4-new-tweaks.png
diff --git a/images/about/tour/4.6/xfwm4-resize.png b/static/about/tour/4.6/xfwm4-resize.png
similarity index 100%
rename from images/about/tour/4.6/xfwm4-resize.png
rename to static/about/tour/4.6/xfwm4-resize.png
diff --git a/images/about/tour/4.6/xfwm4-settings.png b/static/about/tour/4.6/xfwm4-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfwm4-settings.png
rename to static/about/tour/4.6/xfwm4-settings.png
diff --git a/images/about/tour/4.6/xfwm4-tweaks-settings.png b/static/about/tour/4.6/xfwm4-tweaks-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfwm4-tweaks-settings.png
rename to static/about/tour/4.6/xfwm4-tweaks-settings.png
diff --git a/images/about/tour/4.6/xfwm4-workspace-settings.png b/static/about/tour/4.6/xfwm4-workspace-settings.png
similarity index 100%
rename from images/about/tour/4.6/xfwm4-workspace-settings.png
rename to static/about/tour/4.6/xfwm4-workspace-settings.png
diff --git a/images/about/tour/4.8/display-settings-confirmation.png b/static/about/tour/4.8/display-settings-confirmation.png
similarity index 100%
rename from images/about/tour/4.8/display-settings-confirmation.png
rename to static/about/tour/4.8/display-settings-confirmation.png
diff --git a/images/about/tour/4.8/display-settings.png b/static/about/tour/4.8/display-settings.png
similarity index 100%
rename from images/about/tour/4.8/display-settings.png
rename to static/about/tour/4.8/display-settings.png
diff --git a/images/about/tour/4.8/keyboard-settings-list.png b/static/about/tour/4.8/keyboard-settings-list.png
similarity index 100%
rename from images/about/tour/4.8/keyboard-settings-list.png
rename to static/about/tour/4.8/keyboard-settings-list.png
diff --git a/images/about/tour/4.8/minimal-display-settings.png b/static/about/tour/4.8/minimal-display-settings.png
similarity index 100%
rename from images/about/tour/4.8/minimal-display-settings.png
rename to static/about/tour/4.8/minimal-display-settings.png
diff --git a/static/about/tour/4.8/panel-directorymenu.png b/static/about/tour/4.8/panel-directorymenu.png
new file mode 100644
index 0000000..9997723
Binary files /dev/null and b/static/about/tour/4.8/panel-directorymenu.png differ
diff --git a/images/about/tour/4.8/panel-editor.png b/static/about/tour/4.8/panel-editor.png
similarity index 100%
rename from images/about/tour/4.8/panel-editor.png
rename to static/about/tour/4.8/panel-editor.png
diff --git a/images/about/tour/4.8/panel-fuzzy-clock.png b/static/about/tour/4.8/panel-fuzzy-clock.png
similarity index 100%
rename from images/about/tour/4.8/panel-fuzzy-clock.png
rename to static/about/tour/4.8/panel-fuzzy-clock.png
diff --git a/images/about/tour/4.8/panel-transparent.png b/static/about/tour/4.8/panel-transparent.png
similarity index 100%
rename from images/about/tour/4.8/panel-transparent.png
rename to static/about/tour/4.8/panel-transparent.png
diff --git a/images/about/tour/4.8/settings-editor.png b/static/about/tour/4.8/settings-editor.png
similarity index 100%
rename from images/about/tour/4.8/settings-editor.png
rename to static/about/tour/4.8/settings-editor.png
diff --git a/static/about/tour/4.8/thunar-eject.png b/static/about/tour/4.8/thunar-eject.png
new file mode 100644
index 0000000..a2fd18e
Binary files /dev/null and b/static/about/tour/4.8/thunar-eject.png differ
diff --git a/images/about/tour/4.8/thunar-progess.png b/static/about/tour/4.8/thunar-progess.png
similarity index 100%
rename from images/about/tour/4.8/thunar-progess.png
rename to static/about/tour/4.8/thunar-progess.png
diff --git a/static/about/tour/4.8/thunar-progress.png b/static/about/tour/4.8/thunar-progress.png
new file mode 100644
index 0000000..1036b73
Binary files /dev/null and b/static/about/tour/4.8/thunar-progress.png differ
diff --git a/images/about/tour/4.8/thunar-remote.png b/static/about/tour/4.8/thunar-remote.png
similarity index 100%
rename from images/about/tour/4.8/thunar-remote.png
rename to static/about/tour/4.8/thunar-remote.png
diff --git a/downloads/xfce_artwork.tar.bz2 b/static/downloads/xfce_artwork.tar.bz2
similarity index 100%
rename from downloads/xfce_artwork.tar.bz2
rename to static/downloads/xfce_artwork.tar.bz2
diff --git a/images/frontpage/slider-apps.jpg b/static/frontpage/slider-apps.jpg
similarity index 100%
rename from images/frontpage/slider-apps.jpg
rename to static/frontpage/slider-apps.jpg
diff --git a/images/frontpage/slider-desktop.jpg b/static/frontpage/slider-desktop.jpg
similarity index 100%
rename from images/frontpage/slider-desktop.jpg
rename to static/frontpage/slider-desktop.jpg
diff --git a/images/frontpage/slider-panel.jpg b/static/frontpage/slider-panel.jpg
similarity index 100%
rename from images/frontpage/slider-panel.jpg
rename to static/frontpage/slider-panel.jpg
diff --git a/images/frontpage/slider-settings.jpg b/static/frontpage/slider-settings.jpg
similarity index 100%
rename from images/frontpage/slider-settings.jpg
rename to static/frontpage/slider-settings.jpg
diff --git a/images/frontpage/slider-thunar.jpg b/static/frontpage/slider-thunar.jpg
similarity index 100%
rename from images/frontpage/slider-thunar.jpg
rename to static/frontpage/slider-thunar.jpg
diff --git a/images/frontpage/slider-xfwm4.jpg b/static/frontpage/slider-xfwm4.jpg
similarity index 100%
rename from images/frontpage/slider-xfwm4.jpg
rename to static/frontpage/slider-xfwm4.jpg
diff --git a/images/frontpage/src/slider-apps.png b/static/frontpage/src/slider-apps.png
similarity index 100%
rename from images/frontpage/src/slider-apps.png
rename to static/frontpage/src/slider-apps.png
diff --git a/images/frontpage/src/slider-desktop.png b/static/frontpage/src/slider-desktop.png
similarity index 100%
rename from images/frontpage/src/slider-desktop.png
rename to static/frontpage/src/slider-desktop.png
diff --git a/images/frontpage/src/slider-panel.png b/static/frontpage/src/slider-panel.png
similarity index 100%
rename from images/frontpage/src/slider-panel.png
rename to static/frontpage/src/slider-panel.png
diff --git a/images/frontpage/src/slider-settings.png b/static/frontpage/src/slider-settings.png
similarity index 100%
rename from images/frontpage/src/slider-settings.png
rename to static/frontpage/src/slider-settings.png
diff --git a/images/frontpage/src/slider-thunar.png b/static/frontpage/src/slider-thunar.png
similarity index 100%
rename from images/frontpage/src/slider-thunar.png
rename to static/frontpage/src/slider-thunar.png
diff --git a/images/frontpage/src/slider-xfwm4.png b/static/frontpage/src/slider-xfwm4.png
similarity index 100%
rename from images/frontpage/src/slider-xfwm4.png
rename to static/frontpage/src/slider-xfwm4.png
diff --git a/images/index.html b/static/index.html
similarity index 100%
rename from images/index.html
rename to static/index.html
diff --git a/images/projects/library.png b/static/projects/library.png
similarity index 100%
rename from images/projects/library.png
rename to static/projects/library.png
diff --git a/images/projects/midori.png b/static/projects/midori.png
similarity index 100%
rename from images/projects/midori.png
rename to static/projects/midori.png
diff --git a/images/projects/orage.png b/static/projects/orage.png
similarity index 100%
rename from images/projects/orage.png
rename to static/projects/orage.png
diff --git a/images/projects/ristretto.png b/static/projects/ristretto.png
similarity index 100%
rename from images/projects/ristretto.png
rename to static/projects/ristretto.png
diff --git a/images/projects/terminal.png b/static/projects/terminal.png
similarity index 100%
rename from images/projects/terminal.png
rename to static/projects/terminal.png
diff --git a/images/projects/thunar.png b/static/projects/thunar.png
similarity index 100%
rename from images/projects/thunar.png
rename to static/projects/thunar.png
diff --git a/images/projects/xarchiver.png b/static/projects/xarchiver.png
similarity index 100%
rename from images/projects/xarchiver.png
rename to static/projects/xarchiver.png
diff --git a/images/projects/xfburn.png b/static/projects/xfburn.png
similarity index 100%
rename from images/projects/xfburn.png
rename to static/projects/xfburn.png
diff --git a/images/projects/xfce4-appfinder.png b/static/projects/xfce4-appfinder.png
similarity index 100%
rename from images/projects/xfce4-appfinder.png
rename to static/projects/xfce4-appfinder.png
diff --git a/images/projects/xfce4-mixer.png b/static/projects/xfce4-mixer.png
similarity index 100%
rename from images/projects/xfce4-mixer.png
rename to static/projects/xfce4-mixer.png
diff --git a/static/projects/xfce4-panel.png b/static/projects/xfce4-panel.png
new file mode 100644
index 0000000..36f19b6
Binary files /dev/null and b/static/projects/xfce4-panel.png differ
diff --git a/images/projects/xfce4-session.png b/static/projects/xfce4-session.png
similarity index 100%
rename from images/projects/xfce4-session.png
rename to static/projects/xfce4-session.png
diff --git a/images/projects/xfce4-settings.png b/static/projects/xfce4-settings.png
similarity index 100%
rename from images/projects/xfce4-settings.png
rename to static/projects/xfce4-settings.png
diff --git a/images/projects/xfdesktop.png b/static/projects/xfdesktop.png
similarity index 100%
rename from images/projects/xfdesktop.png
rename to static/projects/xfdesktop.png
diff --git a/images/projects/xfwm4.png b/static/projects/xfwm4.png
similarity index 100%
rename from images/projects/xfwm4.png
rename to static/projects/xfwm4.png
diff --git a/style/base.css b/style/base.css
index 87c0aba..656a336 100644
--- a/style/base.css
+++ b/style/base.css
@@ -70,7 +70,7 @@ body {
 }
 #menu-sub ul {
 	list-style: none;
-	list-style-image: url('img/bullit.gif');
+	list-style-image: url('img/bullit.png');
 	margin: 0;
 	padding: 0;
 	font-weight: bold;
diff --git a/style/bundle.php b/style/bundle.php
index 895e0fe..69a0c26 100644
--- a/style/bundle.php
+++ b/style/bundle.php
@@ -17,6 +17,21 @@ function write_header ($mtime)
   header ('Last-Modified: '. gmdate ($dateformat, $mtime ) .' GMT');
 }
 
+function base64data ($matches)
+{
+  $file = $matches[1] .'.png';
+  $size = filesize ($file);
+  if ($size > 0)
+  {
+    $imgbinary = fread (fopen ($file, "r"), $size);
+    $base64 = base64_encode ($imgbinary);
+    
+    return "url('data:image/png;base64,$base64')";
+  }
+
+  return $matches[0];
+}
+
 /* try to load the cached minified css */
 $have_apc = false;
 if (function_exists ('apc_fetch'))
@@ -54,6 +69,9 @@ $buf = preg_replace ('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $buf); /* strip commen
 $buf = str_replace (array (': ', ' {', ', '), array (':', '{', ','), $buf); /* compress code */
 $buf = str_replace (array ("\r\n", "\r", "\n", "\t", '  '), '', $buf); /* strip lines and spaces */
 
+/* embed images in css */
+$buf = preg_replace_callback ('!url\(\'([a-z/]*?).png\'\)!', 'base64data', $buf);
+
 /* output */
 write_header ($mtime);
 echo $buf;
diff --git a/style/img/bullit.gif b/style/img/bullit.gif
deleted file mode 100644
index 3a4546d..0000000
Binary files a/style/img/bullit.gif and /dev/null differ
diff --git a/style/img/logointro.png b/style/img/logointro.png
deleted file mode 100644
index a90e5b3..0000000
Binary files a/style/img/logointro.png and /dev/null differ
diff --git a/style/news.css b/style/news.css
index 855035b..e0a77a9 100644
--- a/style/news.css
+++ b/style/news.css
@@ -30,5 +30,5 @@
 
 .rss {
 	padding-left: 17px;
-	background: url(img/feed.png) no-repeat left center;
+	background: url('img/feed.png') no-repeat left center;
 }


More information about the Xfce4-commits mailing list