[Xfce4-commits] <www:master> Some more polishing.
Nick Schermer
noreply at xfce.org
Tue Apr 17 20:22:05 CEST 2012
Updating branch refs/heads/master
to 88f7d8738388a971d2bb678511147441044c8a49 (commit)
from 047a8d5bb1850124ba64ba93f0ae0b3437bf72c5 (commit)
commit 88f7d8738388a971d2bb678511147441044c8a49
Author: Nick Schermer <nick at xfce.org>
Date: Mon Apr 9 14:11:33 2012 +0200
Some more polishing.
images/frontpage/slider-panel.jpg | Bin 83130 -> 83099 bytes
images/frontpage/src/slider-panel.png | Bin 203631 -> 222720 bytes
pages/footer.php | 12 +-
pages/frontpage.php | 72 +++++++---
pages/projects/index.php | 249 +++++++++++++++------------------
style/base.css | 34 +++--
style/bundle.php | 2 +-
style/frontpage.css | 13 ++-
style/projects.css | 12 --
9 files changed, 207 insertions(+), 187 deletions(-)
diff --git a/images/frontpage/slider-panel.jpg b/images/frontpage/slider-panel.jpg
index ad2e31d..9e5d8fa 100644
Binary files a/images/frontpage/slider-panel.jpg and b/images/frontpage/slider-panel.jpg differ
diff --git a/images/frontpage/src/slider-panel.png b/images/frontpage/src/slider-panel.png
index f5942b5..5f9e6b1 100644
Binary files a/images/frontpage/src/slider-panel.png and b/images/frontpage/src/slider-panel.png differ
diff --git a/pages/footer.php b/pages/footer.php
index be94529..ec4a426 100644
--- a/pages/footer.php
+++ b/pages/footer.php
@@ -1,10 +1,10 @@
- <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 0861159..3019a92 100644
--- a/pages/frontpage.php
+++ b/pages/frontpage.php
@@ -15,7 +15,7 @@ $head['pagediv'] = false;
<ul>
<li>
<img src="/images/frontpage/slider-desktop.jpg" width="800" height="400" alt="Xfce Desktop" />
- <p><?php E_('Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue.') ?></p>
+ <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" />
@@ -27,11 +27,11 @@ $head['pagediv'] = false;
</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 adjusted in a lot of ways to make window management quick and predictable. It also features around 100 border styles giving it the look you want!') ?></p>
+ <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 it. It has three different display modes, transparency and a dozen different plugins.') ?></p>
+ <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" />
@@ -65,22 +65,54 @@ var slideshow=new TINY.slider.slide('slideshow',{
</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>
-<h2><?php E_('Latest News') ?></h2>
-<?php
- $count = 3;
- foreach ($news as $item)
- {
- if (isset ($item['version']) && !empty ($item['version']))
- $title = sprintf (R_('Xfce %s released'), $item['version']);
- else
- $title = $item['title'];
-
- echo '<h3><a href="/about/news/?post='.strtotime ($item['date']).'">'.$title.'</a></h3>';
-
- echo '<p>'.$item['paragraphs'][0].'</p>';
+<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>
- if (--$count <= 0)
- break;
- }
-?>
+<div class="clearboth"></div>
diff --git a/pages/projects/index.php b/pages/projects/index.php
index 8e754d9..84dc1c9 100644
--- a/pages/projects/index.php
+++ b/pages/projects/index.php
@@ -15,141 +15,120 @@ $toc['anchors'] = array (
<h2 id="core"><?php E_('Core Components') ?></h2>
-<div class="group">
- <div class="module">
- <h3><a href="http://docs.xfce.org/xfce/xfwm4/start" class="external"><?php E_('Window Manager') ?></a></h3>
- <p style="background-image: url('/images/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 class="module">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-panel/start" class="external"><?php E_('Panel') ?></a></h3>
- <p style="background-image: url('/images/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 class="clearboth"></div>
-</div>
-
-<div class="group">
- <div class="module">
- <h3><a href="http://docs.xfce.org/xfce/xfdesktop/start" class="external"><?php E_('Desktop Manager') ?></a></h3>
- <p style="background-image: url('/images/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 class="module">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-session/start" class="external"><?php E_('Session Manager') ?></a></h3>
- <p style="background-image: url('/images/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 class="clearboth"></div>
-</div>
-
-<div class="group">
- <div class="module">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-settings/start" class="external"><?php E_('Settings Manager') ?></a></h3>
- <p style="background-image: url('/images/projects/xfce4-settings.png')">
- <?php E_('It allows you to configure every detail of your desktop environment.') ?>
- </p>
- </div>
-
- <div class="module">
- <h3><a href="http://docs.xfce.org/xfce/xfce4-appfinder/start" class="external"><?php E_('Application Finder') ?></a></h3>
- <p style="background-image: url('/images/projects/xfce4-appfinder.png')">
- <?php E_('Allows you to search, launch and find information about applications installed on your system.') ?>
- </p>
- </div>
-
- <div class="clearboth"></div>
-</div>
-
-<div class="group">
- <div class="module">
- <h3><a href="http://docs.xfce.org/xfce/exo/start" class="external"><?php E_('Xfce Libraries') ?></a></h3>
- <p style="background-image: url('/images/projects/library.png')">
- <?php E_('They provide additional functions and widgets which ease the development of applications.') ?>
- </p>
- </div>
-
- <div class="module">
- <h3><a href="http://docs.xfce.org/xfce/xfconf/start" class="external">Xfconf</a></h3>
- <p style="background-image: url('/images/projects/library.png')">
- <?php E_('Simple client-server configuration storage and query system.') ?>
- </p>
- </div>
-
- <div class="clearboth"></div>
-</div>
-
-<div class="group">
- <div class="module">
- <h3><a href="http://docs.xfce.org/xfce/thunar/start" class="external"><?php E_('Thunar File Manager') ?></a></h3>
- <p style="background-image: url('/images/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 class="clearboth"></div>
-</div>
+<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')">
+ <?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')">
+ <?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>
+<div class="clearboth"></div>
+
+
+<div class="column"><div class="lcolumn">
+ <h3><a href="http://docs.xfce.org/xfce/xfdesktop/start" class="external"><?php E_('Desktop Manager') ?></a></h3>
+ <p class="colicon" style="background-image: url('/images/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')">
+ <?php E_('The session manager controls all aspects of the startup and the shutdown of the user session.') ?>
+ </p>
+</div></div>
+<div class="clearboth"></div>
+
+
+<div class="column"><div class="lcolumn">
+ <h3><a href="http://docs.xfce.org/xfce/xfce4-settings/start" class="external"><?php E_('Settings Manager') ?></a></h3>
+ <p class="colicon" style="background-image: url('/images/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')">
+ <?php E_('Allows you to search, launch and find information about applications installed on your system.') ?>
+ </p>
+</div></div>
+<div class="clearboth"></div>
+
+
+<div class="column"><div class="lcolumn">
+ <h3><a href="http://docs.xfce.org/xfce/exo/start" class="external"><?php E_('Xfce Libraries') ?></a></h3>
+ <p class="colicon" style="background-image: url('/images/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')">
+ <?php E_('Simple client-server configuration storage and query system.') ?>
+ </p>
+</div></div>
+<div class="clearboth"></div>
+
+
+<div class="column"><div class="lcolumn">
+ <h3><a href="http://docs.xfce.org/xfce/thunar/start" class="external"><?php E_('Thunar File Manager') ?></a></h3>
+ <p class="colicon" style="background-image: url('/images/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>
+<div class="clearboth"></div>
+
<h2 id="applications"><?php E_('Applications') ?></h2>
-<div class="group">
- <div class="module">
- <h3><a href="http://www.twotoasts.de/index.php?/pages/midori_summary.html" class="external"><?php E_('Web Browser') ?></a></h3>
- <p style="background-image: url('/images/projects/midori.png')">
- <?php E_('Midori is a lightweight Web browser.') ?>
- </p>
- </div>
-
- <div class="module">
- <h3><a href="http://docs.xfce.org/apps/terminal/start" class="external"><?php E_('Terminal') ?></a></h3>
- <p style="background-image: url('/images/projects/terminal.png')">
- <?php E_('Terminal is a modern terminal emulator featuring tabs and transparent backgrounds.') ?>
- </p>
- </div>
-
- <div class="clearboth"></div>
-</div>
-
-<div class="group">
- <div class="module">
- <h3><?php E_('Xfburn') ?></h3>
- <p style="background-image: url('/images/projects/xfburn.png')">
- <?php E_('Xfburn is an application to create and burn CD\'s and DVD\'s.') ?>
- </p>
- </div>
-
- <div class="module">
- <h3><?php E_('Orage') ?></h3>
- <p style="background-image: url('/images/projects/orage.png')">
- <?php E_('A simple calendar application with reminders.') ?>
- </p>
- </div>
-
- <div class="clearboth"></div>
-</div>
-
-<div class="group">
- <div class="module">
- <h3><?php E_('Mixer') ?></h3>
- <p style="background-image: url('/images/projects/xfce4-mixer.png')">
- <?php E_('Allows you to change the volume of the different audio tracks.') ?>
- </p>
- </div>
-
- <div class="module">
- <h3><a href="http://docs.xfce.org/apps/ristretto/start" class="external"><?php E_('Image Viewer') ?></a></h3>
- <p style="background-image: url('/images/projects/ristretto.png')">
- <?php E_('Ristretto is a lightweight image viewer.') ?>
- </p>
- </div>
-
- <div class="clearboth"></div>
-</div>
+<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')">
+ <?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')">
+ <?php E_('Terminal is a modern terminal emulator featuring tabs and transparent backgrounds.') ?>
+ </p>
+</div></div>
+<div class="clearboth"></div>
+
+
+
+<div class="column"><div class="lcolumn">
+ <h3><?php E_('Xfburn') ?></h3>
+ <p class="colicon" style="background-image: url('/images/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')">
+ <?php E_('A simple calendar application with reminders.') ?>
+ </p>
+</div></div>
+<div class="clearboth"></div>
+
+
+
+<div class="column"><div class="lcolumn">
+ <h3><?php E_('Mixer') ?></h3>
+ <p class="colicon" style="background-image: url('/images/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')">
+ <?php E_('Ristretto is a lightweight image viewer.') ?>
+ </p>
+</div></div>
+<div class="clearboth"></div>
+
diff --git a/style/base.css b/style/base.css
index 23eb989..87c0aba 100644
--- a/style/base.css
+++ b/style/base.css
@@ -32,6 +32,7 @@ body {
list-style: none;
margin: 0;
padding: 0;
+ line-height: 2em;
}
#menu-main ul li {
border-left: 1px solid #ccc;
@@ -50,6 +51,7 @@ body {
}
#menu-main ul li a:hover {
color: #06c;
+ text-decoration: underline;
}
#menu-main select {
float: right;
@@ -90,25 +92,18 @@ body {
font-size: 140%;
}
-#page-contents p {
+.page_contents p {
text-align: justify;
}
#footer {
color: #999;
font-size: small;
+ text-align: center;
}
#footer hr {
- margin: 2em 0 0.5em 0;
- height: 1px;
- background: #ccc;
- border: 0;
-}
-
-#footer p {
- margin: 0;
- padding: 0;
+ display: none;
}
#footer a {
@@ -166,6 +161,7 @@ a {
a:hover {
color: #f00;
+ text-decoration: underline;
}
code {
@@ -181,6 +177,24 @@ blockquote {
margin: 0 1em;
}
+div.column {
+ float: left;
+ width: 50%;
+}
+div.lcolumn {
+ margin-right: 12px;
+}
+div.rcolumn {
+ margin-left: 12px;
+}
+
+div.column p.colicon {
+ margin: 0 10px 10px 0;
+ padding-left: 58px;
+ background: no-repeat 0% 0%;
+ min-height: 48px;
+}
+
.clearboth {
clear: both;
}
diff --git a/style/bundle.php b/style/bundle.php
index ab3df80..895e0fe 100644
--- a/style/bundle.php
+++ b/style/bundle.php
@@ -39,7 +39,7 @@ $buf = '';
$mtime = 0;
/* load contents */
-$files = array ('header.css', 'base.css', 'frontpage.css', 'news.css', 'projects.css');
+$files = array ('header.css', 'base.css', 'frontpage.css', 'news.css');
foreach ($files as $file)
{
$buf .= file_get_contents ($file);
diff --git a/style/frontpage.css b/style/frontpage.css
index 272d097..95a5b00 100644
--- a/style/frontpage.css
+++ b/style/frontpage.css
@@ -2,6 +2,14 @@
margin-right: 0;
}
+.file_frontpage h2, .file_frontpage h3 {
+ padding-top: 0;
+}
+
+.file_frontpage .post-wrap p {
+ margin-top: 0;
+}
+
#slidewrap {
text-align: center;
margin: auto;
@@ -14,11 +22,10 @@
overflow: hidden;
width: 800px;
height: 400px;
- background: #000;
+ background: #bcbcbc;
cursor: default;
overflow: hidden;
margin: auto;
- border: 12px #bcbcbc solid;
}
#slide ul {
position: absolute;
@@ -40,7 +47,7 @@
position:absolute;
bottom:0;
width:450px;
- background:#333;
+ background:#333; /* override by rgba below */
color:#fff;
border: 0;
diff --git a/style/projects.css b/style/projects.css
deleted file mode 100644
index 533357f..0000000
--- a/style/projects.css
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#page-contents div.module {
- float: left;
- width: 50%;
-}
-
-#page-contents div.module p {
- margin: 0 10px 10px 0;
- padding-left: 58px;
- background: no-repeat 0% 0%;
- min-height: 48px;
-}
More information about the Xfce4-commits
mailing list