[Xfce4-commits] <www:master> Change image style and add image tips.

Nick Schermer noreply at xfce.org
Sat Apr 21 17:02:01 CEST 2012


Updating branch refs/heads/master
         to 90b8db8a06f2944613ac2f072ad04b3e37c989c3 (commit)
       from f89f6997c2c9dc71418632c7e2c56496b4858c84 (commit)

commit 90b8db8a06f2944613ac2f072ad04b3e37c989c3
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Apr 21 17:01:31 2012 +0200

    Change image style and add image tips.

 pages/about/tour.php   |   24 ++++++++++++------------
 pages/about/tour44.php |    2 +-
 pages/about/tour46.php |    2 +-
 pages/about/tour48.php |    2 +-
 style/base.css         |   24 +++++++++++++++++-------
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/pages/about/tour.php b/pages/about/tour.php
index ee6e467..ac9c7f8 100644
--- a/pages/about/tour.php
+++ b/pages/about/tour.php
@@ -6,7 +6,7 @@ function print_img ($file, $title)
 {
   global $static_media;
 
-  echo '<p class="image"><img src="'.$static_media.'/about/tour/4.10/'.$file.'.png" alt="'.$file.'" title="'.$title.'" /></p>';
+  echo '<div class="image"><div><img src="'.$static_media.'/about/tour/4.10/'.$file.'.png" alt="'.$file.'"" /></div>'.$title.'</div>';
 }
 
 ?>
@@ -19,7 +19,7 @@ function print_img ($file, $title)
 
   <p><?php E_("During the 4.10 development we've decided to remove the user manuals from the packages and move all manuals in an online wiki at <a href=\"http://docs.xfce.org\">docs.xfce.org</a>. Reason for this change that there was hardly any documentation contributed after the Xfce 4.6 release and a lot of pages were outdated or missing.") ?></p>
   
-  <?php print_img ("online-help", R_("")) ?>
+  <?php print_img ("online-help", R_("Xfce will ask to go online when you click a Help button")) ?>
 
   <p><?php E_("We hope that with the introduction of a wiki it will be easier for contributers to help maintaining the docs and of course for developers it is easier as well.") ?></p>
 
@@ -27,9 +27,9 @@ function print_img ($file, $title)
 
   <p><?php E_("The application finder has been completely rewritten and merges the functionality of the old appfinder and xfrun4. It also allows to create custom actions that match a prefix or a regex pattern.") ?></p>
   
-  <?php print_img ("appfinder-collapsed", R_("")) ?>
+  <?php print_img ("appfinder-collapsed", R_("Collapsed view of the Application Finder")) ?>
   
-  <?php print_img ("appfinder-expanded", R_("")) ?>
+  <?php print_img ("appfinder-expanded", R_("Expanded view of the Application Finder")) ?>
 
 <h2><?php E_("Panel") ?> <em>(xfce4-panel)</em></h2>
 
@@ -37,19 +37,19 @@ function print_img ($file, $title)
 
     <p><?php E_("In 4.10 there is a general setting to configure the number of rows of a panel. Rows are used to keep some plugins small (Launchers) and give other plugins more space (like the Window Buttons).") ?></p>
 
-    <?php print_img ("panel-rows", R_("")) ?>
+    <?php print_img ("panel-rows", R_("A horizontal panel with 3 rows")) ?>
 
   <h3><?php E_("Deskbar Mode") ?></h3>
 
     <p><?php E_("The panel features a new display mode called Deskbar. In Deskbar mode the panel is aligned vertical, but the orientation of the plugins is horizontal. In combination with the new rows setting, this allows to create panels that are suitable for wide-screen setups.") ?></p>
     
-    <?php print_img ("panel-deskbar", R_("")) ?>
+    <?php print_img ("panel-deskbar", R_("A panel in Deskbar mode with 5 rows")) ?>
 
   <h3><?php E_("Actions Plugin") ?></h3>
 
     <p><?php E_("This plugin has been rewritten and merges the functionality of the session plugin that was previously shipped with the xfce4-session package.") ?></p>
     
-    <?php print_img ("panel-actions", R_("")) ?>
+    <?php print_img ("panel-actions", R_("On the left the Action plugin in menu mode, on the right showing buttons")) ?>
 
   <h3><?php E_("Window Buttons") ?></h3>
 
@@ -67,7 +67,7 @@ function print_img ($file, $title)
 
     <p><?php E_("Another noticeable change is the way GNOME and KDE compatibility work. The compatibility check boxes only enable the services that need to be started before other applications (<em>gnome-keyring</em> and <em>gconf</em> for GNOME and <em>kdeinit</em> for KDE). All other autostart applications are always visible in the <strong>Applications Autostart</strong>, but listed italic and not enabled by default if they are for a non-Xfce desktop.") ?></p>
     
-    <?php print_img ("session-autostart", R_("")) ?>
+    <?php print_img ("session-autostart", R_("Italic items are not belonging to Xfce, but can be started separately")) ?>
 
 <h2><?php E_("Settings") ?> <em>(xfce4-settings)</em></h2>
 
@@ -79,13 +79,13 @@ function print_img ($file, $title)
   
     <p><?php E_("The Settings dialog has support for categories and searching. Most of the dialogs are also embedded in the window (this was a compile-time option in 4.8).") ?></p>
     
-    <?php print_img ("settings-manager", R_("")) ?>
+    <?php print_img ("settings-manager", R_("New settings manager with categories and a filter")) ?>
 
   <h3><?php E_("Settings Editor") ?></h3>
 
     <p><?php E_("The Settings Editor has been modified to reload the changed properties per-cell instead of reloading the entire tree, so it does not collapse when you modify a property. It also has in-line editing of the values (for most value types), making it easier to quickly adjust a setting.") ?></p>
     
-    <?php print_img ("settings-editor", R_("")) ?>
+    <?php print_img ("settings-editor", R_("Settings editor with a channel monitor dialog opened while in-line editing a property")) ?>
 
     <p><?php E_("Another new feature in the settings editor is channel monitoring. If you right-click a channel in the main window, you can open a <strong>Monitor</strong> dialog which will show the property activity in a channel.") ?></p>
 
@@ -93,13 +93,13 @@ function print_img ($file, $title)
 
     <p><?php E_("A lot of people ask for an editor to manage their file associations in the last couple of years, so there is it is: a simple MIME Type Editor. The editor does not allow to modify MIME information (add/remove types or modify icons), but allows you to easily assign a default application to a type, show your local modifications and reset to the default.") ?></p>
     
-    <?php print_img ("settings-mime", R_("")) ?>
+    <?php print_img ("settings-mime", R_("List of all the MIME types matching the filter")) ?>
 
   <h3><?php E_("Mouse and Touchpad") ?></h3>
 
     <p><?php E_("The pointer settings dialog has support for handling the basic Synaptics and Wacom properties. In the background the settings daemon has support for setting all kinds of <em>device properties</em>, which is explained in the <a href=\"http://docs.xfce.org/xfce/xfce4-settings/mouse\">mouse settings</a> wiki.") ?></p>
     
-    <?php print_img ("settings-mouse", R_("")) ?>
+    <?php print_img ("settings-mouse", R_("Synaptics settings in the Mouse and Touchpad dialog")) ?>
 
   <h3><?php E_("Appearance Settings") ?></h3>
   
diff --git a/pages/about/tour44.php b/pages/about/tour44.php
index 8d4aa4c..907b7fa 100644
--- a/pages/about/tour44.php
+++ b/pages/about/tour44.php
@@ -6,7 +6,7 @@ function print_img ($file, $title)
 {
   global $static_media;
 
-  echo '<p class="image"><img src="'.$static_media.'/about/tour/4.4/'.$file.'.png" alt="'.$file.'" title="'.$title.'" /></p>';
+  echo '<div class="image"><div><img src="'.$static_media.'/about/tour/4.4/'.$file.'.png" alt="'.$file.'"" /></div>'.$title.'</div>';
 }
 
 ?>
diff --git a/pages/about/tour46.php b/pages/about/tour46.php
index 9fb7d24..5591c30 100644
--- a/pages/about/tour46.php
+++ b/pages/about/tour46.php
@@ -6,7 +6,7 @@ function print_img ($file, $title)
 {
   global $static_media;
 
-  echo '<p class="image"><img src="'.$static_media.'/about/tour/4.6/'.$file.'.png" alt="'.$file.'" title="'.$title.'" /></p>';
+  echo '<div class="image"><div><img src="'.$static_media.'/about/tour/4.6/'.$file.'.png" alt="'.$file.'"" /></div>'.$title.'</div>';
 }
 
 ?>
diff --git a/pages/about/tour48.php b/pages/about/tour48.php
index 21e2359..4f3cb1a 100644
--- a/pages/about/tour48.php
+++ b/pages/about/tour48.php
@@ -6,7 +6,7 @@ function print_img ($file, $title)
 {
   global $static_media;
 
-  echo '<p class="image"><img src="'.$static_media.'/about/tour/4.8/'.$file.'.png" alt="'.$file.'" title="'.$title.'" /></p>';
+  echo '<div class="image"><div><img src="'.$static_media.'/about/tour/4.8/'.$file.'.png" alt="'.$file.'"" /></div>'.$title.'</div>';
 }
 
 ?>
diff --git a/style/base.css b/style/base.css
index 60f4625..ee48975 100644
--- a/style/base.css
+++ b/style/base.css
@@ -21,11 +21,11 @@ body {
 
 #content {
 	background-color: #fff;
-	
+
 	box-shadow: 0 0 3px rgba(0, 0, 0, .25);
 	-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
 	-moz-box-shadow: 0 0 3px rgba(0, 0, 0, .25);
-	
+
 	border-radius: 4px;
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
@@ -38,7 +38,7 @@ body {
 	line-height: 1.7em;
 }
 
-#article p {
+#article {
 	text-align: justify;
 }
 
@@ -160,10 +160,20 @@ div.column p.colicon {
 	min-height: 48px;
 }
 
-p.image img {
-	margin: auto;
-	display: block;
-	
+div.image {
+	background-color: #eee;
+	border: 1px solid #ccc;
+	padding: 6px;
+	padding-bottom: 0;
+	text-align: center;
+	margin: 1em auto;
+}
+
+div.image div {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	padding: 6px;
+	overflow: auto;
 }
 
 .clearboth {


More information about the Xfce4-commits mailing list