From 1855642bd169a1cae69cd9efb8da4458ea6e4a3c Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Fri, 28 Aug 2009 16:19:41 -0400
Subject: improved UI for the languages admin this should take care of bug #329

---
 themes/admin_default/css/admin_screen.css | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'themes/admin_default/css')

diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css
index d408acf0..913631dc 100644
--- a/themes/admin_default/css/admin_screen.css
+++ b/themes/admin_default/css/admin_screen.css
@@ -451,8 +451,20 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   cursor: pointer;
 }
 
-#gLanguageSettingsForm .checklist li {
-  width: 150px;
-  overflow: hidden;
+#gLanguagesForm table {
+	width: 400px;
+	float: left;
+	margin: 0 3em 1em 0;
+}
+#gLanguagesForm .installed {
+  background-color: #EEEEEE;
 }
+#gLanguagesForm .default {
+	background-color: #C5DBEC;
+	font-weight: bold;
+}
+#gLanguagesForm input, #gShareTranslationsForm, #gLanguages h2 {
+	clear: both;
+}
+
 
-- 
cgit v1.2.3


From c428e49f3273f04fd220107b4992e6177aa1b265 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 28 Aug 2009 15:24:21 -0600
Subject: Make gMessage 100% of the width of its container.

---
 themes/admin_default/css/screen.css | 2 +-
 themes/default/css/screen.css       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/admin_default/css')

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 88631e81..062c0e41 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -276,7 +276,7 @@ li.gError select {
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gMessage {
-  width: 99%;
+  width: 100%;
 }
 
 #gAdminAkismet .gSuccess,
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 26339e35..8a8f634a 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -276,7 +276,7 @@ li.gError select {
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gMessage {
-  width: 99%;
+  width: 100%;
 }
 
 #gAdminAkismet .gSuccess,
-- 
cgit v1.2.3


From c234f9fd392d355bb7a143e28474bb689ed65e48 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Fri, 28 Aug 2009 20:53:06 -0400
Subject: improved translations admin interface

---
 modules/gallery/controllers/l10n_client.php    | 13 +++--
 modules/gallery/views/admin_languages.html.php | 80 ++++++++++++++++++--------
 themes/admin_default/css/admin_screen.css      | 12 +++-
 3 files changed, 75 insertions(+), 30 deletions(-)

(limited to 'themes/admin_default/css')

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 831c79c1..0775791e 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -90,10 +90,15 @@ class L10n_Client_Controller extends Controller {
     }
 
     $session = Session::instance();
-    $session->set("l10n_mode",
-                  !$session->get("l10n_mode", false));
-
-    url::redirect("albums/1");
+		$l10n_mode = $session->get("l10n_mode", false);
+    $session->set("l10n_mode", !$l10n_mode);
+
+    $redirect_url = "admin/languages";
+		if (!$l10n_mode) {
+			$redirect_url .= "#l10n-client";
+		}
+ 
+    url::redirect($redirect_url);
   }
 
   private static function _l10n_client_search_form() {
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index fc3a87dc..4025437a 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -2,7 +2,7 @@
 <div id="gLanguages">
   <h1> <?= t("Languages") ?> </h1>
   <p>
-    <?= t("Here you can install new languages, update installed ones and set the default language for your Gallery.") ?>
+    <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?>
   </p>
 
   <form id="gLanguagesForm" method="post" action="<?= url::site("admin/languages/save") ?>">
@@ -40,31 +40,61 @@
   </form>
 	
 	<script type="text/javascript">
-		var old_default_locale = "<?= $default_locale ?>";
-		
-		$("input[name='installed_locales[]']").change(function (event) {
-			if (this.checked) {
-				$("input[type='radio'][value='" + this.value + "']").enable();
-			} else {
-				if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language
-					$("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked");
-				}
-				$("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled");
-			}
-		});
-		
+    var old_default_locale = "<?= $default_locale ?>";
+    
+    $("input[name='installed_locales[]']").change(function (event) {
+      if (this.checked) {
+        $("input[type='radio'][value='" + this.value + "']").enable();
+      } else {
+        if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language
+          $("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked");
+        }
+        $("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled");
+      }
+    });
+    
     $("#gLanguagesForm").ajaxForm({
-			dataType: "json",
-			success: function(data) {
-				if (data.result == "success") {
-					el = $('<a href="<?= url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf") ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
-					el.gallery_dialog();
-					el.trigger('click');
-				}
-			}
-		});
-	</script>
+      dataType: "json",
+      success: function(data) {
+        if (data.result == "success") {
+          el = $('<a href="<?= url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf") ?>"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+          el.gallery_dialog();
+          el.trigger('click');
+        }
+      }
+    });
+  </script>
+</div>
 
-  <h2> <?= t("Your Own Translations") ?> </h2>
+<div id="gTranslations">
+  <h1> <?= t("Translations") ?> </h1>
+	<p>
+    <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
+  </p>
+	
+	<h3><?= t("Translating Gallery") ?></h3>
+	
+	<div class="gBlock">
+		<a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
+		  class="gDocLink ui-state-default ui-corner-all ui-icon ui-icon-help"
+			title="<?= t("Localization documentation") ?>">
+      <?= t("Localization documentation") ?>
+    </a>
+		
+		<p><strong><?= t("Step 1") ?>:</strong> <?= t("Make sure the target language is installed and updated (check above).") ?></p>
+		
+		<p><strong><?= t("Step 2") ?>:</strong> <?= t("Make sure the target language is the active one (currently '").locales::display_name()."')." ?></p>
+		
+		<p><strong><?= t("Step 3") ?>:</strong> <?= t("Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
+		
+		<a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
+		  class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
+		  <span class="ui-icon ui-icon-power"></span>
+		  <?= t((Session::instance()->get("l10n_mode", false)) ? "Stop translation mode" : "Start translation mode") ?>
+	  </a>
+	</div>
+	
+	<h3>Sharing your translations</h3>
+	
   <?= $share_translations_form ?>
 </div>
diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css
index 913631dc..3083114c 100644
--- a/themes/admin_default/css/admin_screen.css
+++ b/themes/admin_default/css/admin_screen.css
@@ -463,8 +463,18 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 	background-color: #C5DBEC;
 	font-weight: bold;
 }
-#gLanguagesForm input, #gShareTranslationsForm, #gLanguages h2 {
+#gLanguagesForm input {
 	clear: both;
 }
 
+#gTranslations {
+	padding: 2em 0 0 0;
+	clear: both;
+}
+#gTranslations .gButtonLink {
+	padding: .5em;
+}
 
+.gDocLink {
+  float: right;
+}
-- 
cgit v1.2.3


From 5db0b68a70434a16d8881a6e560a9526530a8a60 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 29 Aug 2009 14:01:04 -0600
Subject: Update status message styles. Lighten backgrounds, don't show
 background on Admin Maintenance rows, and added gModuleStatus class.

---
 modules/akismet/views/admin_akismet.html.php       |  2 +-
 modules/comment/views/admin_comments.html.php      |  2 +-
 modules/gallery/views/admin_graphics_gd.html.php   | 12 ++--
 .../views/admin_graphics_graphicsmagick.html.php   | 10 +--
 .../views/admin_graphics_imagemagick.html.php      | 10 +--
 modules/gallery/views/admin_graphics_none.html.php |  5 +-
 modules/gallery/views/admin_maintenance.html.php   | 16 +++--
 modules/gallery/views/admin_modules.html.php       |  2 +-
 themes/admin_default/css/admin_screen.css          |  9 ++-
 themes/admin_default/css/screen.css                | 80 ++++++++++------------
 themes/default/css/screen.css                      | 60 +++++-----------
 11 files changed, 92 insertions(+), 116 deletions(-)

(limited to 'themes/admin_default/css')

diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index 410902a5..009d8810 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -8,7 +8,7 @@
   </p>
 
   <? if ($valid_key): ?>
-  <div class="gSuccess">
+  <div class="gModuleStatus gSuccess">
     <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
   </div>
   <? endif ?>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 9fe7164b..03511d91 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -103,7 +103,7 @@
       </th>
     </tr>
     <? foreach ($comments as $i => $comment): ?>
-    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
+    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
       <td>
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
index aa9ee67c..010a31b4 100644
--- a/modules/gallery/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
@@ -7,26 +7,24 @@
         array("url" => "http://www.boutell.com/gd")) ?>
   </p>
   <? if ($tk->installed && $tk->rotate): ?>
-  <p class="gSuccess">
+  <div class="gModuleStatus gInfo">
     <?= t("You have GD version %version.", array("version" => $tk->version)) ?>
-  </p>
+  </div>
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? elseif ($tk->installed): ?>
-
   <? if ($tk->error): ?>
-  <p class="gWarning">
+  <p class="gModuleStatus gWarning">
     <?= $tk->error ?>
   </p>
   <? endif ?>
-
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? else: ?>
-  <p class="gInfo">
+  <div class="gModuleStatus gInfo">
     <?= t("You do not have GD installed.") ?>
-  </p>
+  </div>
   <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index bf3ad339..97624850 100644
--- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
@@ -1,21 +1,21 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="graphicsmagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
-  <h3> <?= t("GraphicsMagick") ?> </h3>
   <img class="logo" width="107" height="76" src="<?= url::file("modules/gallery/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" />
+  <h3> <?= t("GraphicsMagick") ?> </h3>
   <p>
     <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">GraphicsMagick website</a> for more information.",
         array("url" => "http://www.graphicsmagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <p class="gSuccess">
+  <div class="gModuleStatus gInfo">
     <?= t("GraphicsMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
-  </p>
+  </div>
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
   </p>
   <? else: ?>
-  <p class="gWarning">
+  <div class="gModuleStatus gWarning">
     <?= $tk->error ?>
-  </p>
+  </div>
   <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index b8f7ffb8..cdff7c2c 100644
--- a/modules/gallery/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
@@ -1,21 +1,21 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="imagemagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
-  <h3> <?= t("ImageMagick") ?> </h3>
   <img class="logo" width="114" height="118" src="<?= url::file("modules/gallery/images/imagemagick.jpg"); ?>" alt="<? t("Visit the ImageMagick project site") ?>" />
+  <h3> <?= t("ImageMagick") ?> </h3>
   <p>
     <?= t("ImageMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">ImageMagick website</a> for more information.",
         array("url" => "http://www.imagemagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <p class="gSuccess">
+  <div class="gModuleStatus gInfo">
     <?= t("ImageMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
-  </p>
+  </div>
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
   </p>
   <? elseif ($tk->error): ?>
-  <p class="gWarning">
+  <div class="gModuleStatus gWarning">
     <?= $tk->error ?>
-  </p>
+  </div>
   <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index be2a580d..e6923a5a 100644
--- a/modules/gallery/views/admin_graphics_none.html.php
+++ b/modules/gallery/views/admin_graphics_none.html.php
@@ -1,6 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="none" class="gBlock">
-  <h3 class="gWarning"> <?= t("No Active Toolkit") ?> </h3>
+
+<div id="none" class="gModuleStatus gWarning gBlock">
+  <h3> <?= t("No Active Toolkit") ?> </h3>
   <p>
     <?= t("We were unable to detect a graphics program.  You must install one of the toolkits below in order to use many Gallery features.") ?>
   </p>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 450eb754..3649ea58 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -7,7 +7,7 @@
 
   <div id="gAvailableTasks">
     <h2> <?= t("Available Tasks") ?> </h2>
-    <table>
+    <table class="gMessages">
       <tr>
         <th>
           <?= t("Name") ?>
@@ -19,8 +19,9 @@
           <?= t("Action") ?>
         </th>
       </tr>
+      <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= log::severity_class($task->severity) ?>">
+      <tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <td>
           <?= $task->name ?>
         </td>
@@ -34,17 +35,18 @@
           </a>
         </td>
       </tr>
+      <? $i++ ?>
       <? endforeach ?>
     </table>
   </div>
 
   <? if ($running_tasks->count()): ?>
   <div id="gRunningTasks">
-    <h2> <?= t("Running Tasks") ?> </h2>
     <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
        class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
       <?= t("cancel all") ?></a>
 
+    <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
         <th>
@@ -66,8 +68,9 @@
           <?= t("Action") ?>
         </th>
       </tr>
+      <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
+      <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <td>
           <?= gallery::date_time($task->updated) ?>
         </td>
@@ -105,6 +108,7 @@
           </a>
         </td>
       </tr>
+      <? $i++ ?>
       <? endforeach ?>
     </table>
   </div>
@@ -138,8 +142,9 @@
           <?= t("Action") ?>
         </th>
       </tr>
+      <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
+      <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <td>
           <?= gallery::date_time($task->updated) ?>
         </td>
@@ -183,6 +188,7 @@
         </td>
       </tr>
       <? endforeach ?>
+      <? $i++ ?>
     </table>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 3fddd6cd..168e20d0 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -16,7 +16,7 @@
       </tr>
       <? $i = 0 ?>
       <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <? $data = array("name" => $module_name); ?>
         <? if ($module_info->locked) $data["disabled"] = 1; ?>
         <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css
index 913631dc..7e468442 100644
--- a/themes/admin_default/css/admin_screen.css
+++ b/themes/admin_default/css/admin_screen.css
@@ -35,13 +35,12 @@
 .gSelected img,
 .gAvailable .gBlock img {
   float: left;
-  margin-right: 1em;
+  margin: 0 1em 1em 0;
 }
 
 .rtl .gSelected img,
 .rtl .gAvailable .gBlock img {
   float: right;
-  margin-left: 1em;
 }
 
 .gSelected {
@@ -202,7 +201,7 @@
 #gAdminGraphics .gAvailable .gBlock {
   clear: none;
   float: left;
-  height: 16em;
+  height: 17em;
   margin-right: 1em;
   width: 30%;
 }
@@ -263,8 +262,8 @@ li.gGroup {
 }
 
 li.gGroup h4 {
-  background-color: #EEEEEE;
-  border-bottom: 1px dashed #CCCCCC;
+  background-color: #eee;
+  border-bottom: 1px dashed ccc;
   padding: .5em 0 .5em .5em;
 }
 li.gGroup .gButtonLink {
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 062c0e41..c275eb10 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -108,7 +108,7 @@ table {
 }
 
 #gContent table {
-  margin: 1em 0;
+  margin: 1em 0 3em 0;
 }
 
 caption,
@@ -124,6 +124,10 @@ td {
   vertical-align: top;
 }
 
+#gAdminMaintenance td {
+  vertical-align: middle;
+}
+
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 fieldset {
@@ -279,9 +283,9 @@ li.gError select {
   width: 100%;
 }
 
-#gAdminAkismet .gSuccess,
 #gSiteStatus li,
-#gMessage li {
+#gMessage li,
+.gModuleStatus {
   border: 1px solid #ccc;
   margin-bottom: .4em;
 }
@@ -292,71 +296,62 @@ li.gError select {
   border-bottom: 1px solid #ccc;
 }
 
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError,
-#gSiteStatus .gInfo,
-#gMessage .gInfo,
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess,
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
+.gModuleStatus {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.gError,
+.gInfo,
+.gSuccess,
+.gWarning {
   background-position: .4em 50%;
   background-repeat: no-repeat;
   padding: .4em .5em .4em 30px;
 }
 
 .gError {
-  background-color: #fcc;
-}
-
-form .gError {
-  color: #f00;
-}
-
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError {
+  background-color: #f6cbca;
+  color: red;
   background-image: url('../images/ico-error.png');
 }
 
 .gInfo {
   background-color: #e8e8e8;
-}
-
-#gSiteStatus .gInfo,
-#gMessage .gInfo {
   background-image: url('../images/ico-info.png');
 }
 
 .gSuccess {
-  background-color: #96EF95;
-}
-
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess {
+  background-color: #d9efc2;
   background-image: url('../images/ico-success.png');
 }
 
 .gWarning {
-  background-color: #ff9;
+  background-color: #fcf9ce;
+  background-image: url('../images/ico-warning.png');
 }
 
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
-  background-image: url('../images/ico-warning.png');
+table .gError {
+  background-color: #f6cbca !important;
+}
+
+table .gWarning {
+  background-color: #fcf9ce !important;
 }
 
+.gPager .gInfo,
 form .gError,
-.gPager .gInfo {
-  background-color: #fff;
+table .gInfo,
+table .gSuccess {
+  background-color: transparent !important;
 }
 
-#gAdminMaintenance .gError,
-#gAdminMaintenance .gInfo,
-#gAdminMaintenance .gWarning,
-#gAdminMaintenance .gSuccess {
-  background-image: none;
+.gPager .gInfo,
+table .gError,
+table .gInfo,
+table .gSuccess,
+table .gWarning {
+  background-image: none !important;
 }
 
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
@@ -823,7 +818,6 @@ form .gError,
 .ui-widget-overlay {
   background: #000;
   opacity: .7;
-  filter: Alpha(Opacity=70);
 }
 
 #gDialog {
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index d39152e4..82cdb331 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -279,9 +279,9 @@ li.gError select {
   width: 100%;
 }
 
-#gAdminAkismet .gSuccess,
 #gSiteStatus li,
-#gMessage li {
+#gMessage li,
+.gModuleStatus {
   border: 1px solid #ccc;
   margin-bottom: .4em;
 }
@@ -292,71 +292,49 @@ li.gError select {
   border-bottom: 1px solid #ccc;
 }
 
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError,
-#gSiteStatus .gInfo,
-#gMessage .gInfo,
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess,
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
+.gModuleStatus {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.gError,
+.gInfo,
+.gSuccess,
+.gWarning {
   background-position: .4em 50%;
   background-repeat: no-repeat;
   padding: .4em .5em .4em 30px;
 }
 
 .gError {
-  background-color: #fcc;
-}
-
-form .gError {
-  color: #f00;
-}
-
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError {
+  background-color: #f6cbca;
+  color: #fc0;
   background-image: url('../images/ico-error.png');
 }
 
 .gInfo {
   background-color: #e8e8e8;
-}
-
-#gSiteStatus .gInfo,
-#gMessage .gInfo {
   background-image: url('../images/ico-info.png');
 }
 
 .gSuccess {
-  background-color: #96EF95;
-}
-
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess {
+  background-color: #d9efc2;
   background-image: url('../images/ico-success.png');
 }
 
 .gWarning {
-  background-color: #ff9;
-}
-
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
+  background-color: #fcf9ce;
   background-image: url('../images/ico-warning.png');
 }
 
 form .gError,
 .gPager .gInfo {
-  background-color: #fff;
+  background-color: #fff !important;
 }
 
-#gAdminMaintenance .gError,
-#gAdminMaintenance .gInfo,
-#gAdminMaintenance .gWarning,
-#gAdminMaintenance .gSuccess {
-  background-image: none;
+.gPager .gInfo {
+  background-image: none !important;
+  padding: 0 !important;
 }
 
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
-- 
cgit v1.2.3