From daa3a2b43cd6e1458014e763e9640b8db16cc0c1 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 30 Sep 2009 00:32:52 -0600
Subject: First round of CSS refactor updates. Added calls to
 gallery.common.css from wind and admin_wind. Replaced basic text align and
 block float classes. Removed section #2 from both themes screen styles.

---
 lib/gallery.common.css                             | 10 +++++----
 modules/comment/views/admin_comments.html.php      |  2 +-
 modules/gallery/views/admin_maintenance.html.php   |  6 +++---
 .../gallery/views/admin_maintenance_task.html.php  |  2 +-
 modules/tag/views/admin_tags.html.php              |  4 ++--
 modules/user/views/admin_users.html.php            |  2 +-
 themes/admin_wind/css/screen.css                   | 24 ----------------------
 themes/admin_wind/views/admin.html.php             |  1 +
 themes/admin_wind/views/pager.html.php             |  2 +-
 themes/wind/css/fix-ie.css                         |  2 +-
 themes/wind/css/screen.css                         | 24 ----------------------
 themes/wind/views/movie.html.php                   |  2 +-
 themes/wind/views/page.html.php                    |  1 +
 themes/wind/views/pager.html.php                   |  2 +-
 themes/wind/views/photo.html.php                   |  2 +-
 15 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index eb686bcf..0aa9cc29 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -108,12 +108,14 @@ form .g-error {
  * 3) Positioning and order
  **********************************************************************/
 
-.g-right {
-  float: right;
-}
-
 .g-left {
   float: left;
+  margin: 1em 1em 1em 0;
+}
+
+.g-right {
+  float: right;
+  margin: 1em 0 1em 1em;
 }
 
 .g-first {
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 455cd714..5e9ffb1a 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -116,7 +116,7 @@
               title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
       </td>
       <td>
-        <div class="right">
+        <div class="g-right">
           <? $item = $comment->item() ?>
           <div class="gItem gPhoto">
             <a href="<?= $item->url() ?>">
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index ce693d73..cdfe6cfd 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -63,7 +63,7 @@
         <th>
           <?= t("Action") ?>
           <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+             class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all">
             <?= t("cancel all") ?></a>
         </th>
       </tr>
@@ -102,7 +102,7 @@
           </a>
           <? endif ?>
           <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
-             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+             class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all">
             <?= t("cancel") ?>
           </a>
         </td>
@@ -136,7 +136,7 @@
         <th>
           <?= t("Action") ?>
           <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-               class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+               class="gButtonLink g-right ui-icon-left ui-state-default ui-corner-all">
              <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
         </th>
       </tr>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index ddd5bd17..c0bc0d43 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -57,7 +57,7 @@
   <div id="gStatus">
     <?= t("Starting up...") ?>
   </div>
-  <div class="txtright">
+  <div class="g-txt-right">
     <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
     <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
   </div>
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 8f3693aa..23a00567 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -23,7 +23,7 @@
   <? $column_tag_count = 0 ?>
 
   <table id="gTagAdmin" class="gBlockContent">
-    <caption class="understate">
+    <caption class="g-understate">
       <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
     </caption>
     <tr>
@@ -48,7 +48,7 @@
 
           <li>
             <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= html::clean($tag->name) ?></span>
-            <span class="understate">(<?= $tag->count ?>)</span>
+            <span class="g-understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
                class="gDialogLink delete-link gButtonLink">
                 <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index c065e4b1..348747dd 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -43,7 +43,7 @@
 </script>
 <div class="gBlock">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
+      class="gDialogLink gButtonLink g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new user")->for_html_attr() ?>">
     <span class="ui-icon ui-icon-circle-plus"></span>
     <?= t("Add a new user") ?>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 3aee0719..d006463d 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -5,7 +5,6 @@
  *
  * Sheet organization:
  *  1)  Basic HTML elements
- *  2)  Reusable classes
  *  3)  Reusable content blocks
  *  4)  Page layout containers
  *  5)  Content blocks in specific layout containers
@@ -239,29 +238,6 @@ li.gError select {
   border: 2px solid red;
 }
 
-/** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
-  color: #ccc;
-  font-weight: normal;
-}
-
-.left {
-  float: left;
-  margin: 1em 1em 1em 0;
-}
-
-.right {
-  float: right;
-  margin: 1em 0 1em 1em;
-}
-
-.txtright {
-  text-align: right;
-}
-
 /** *******************************************************************
  * 3) Reusable content blocks
  *********************************************************************/
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index ef15ed25..b18f010a 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -10,6 +10,7 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
+    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 5034ec19..90c71446 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_wind/views/pager.html.php
@@ -25,7 +25,7 @@
   <? endif ?>
   </li>
   <li class="gInfo"><?= $from_to_msg ?></li>
-  <li class="txtright">
+  <li class="g-txt-right">
   <? if ($next_page): ?>
     <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index eee88c15..4c13764f 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -28,7 +28,7 @@ input.submit {
   float: none !important;
 }
 
-.gPager .txtright {
+.gPager .g-txt-right {
   width: 29%;
 }
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index df46b443..9f3a53e6 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -5,7 +5,6 @@
  *
  * Sheet organization:
  *  1)  Basic HTML elements
- *  2)  Reusable classes
  *  3)  Reusable content blocks
  *  4)  Page layout containers
  *  5)  Content blocks in specific layout containers
@@ -242,29 +241,6 @@ li.gError select {
   border: 2px solid red;
 }
 
-/** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
-  color: #ccc;
-  font-weight: normal;
-}
-
-.left {
-  float: left;
-  margin: 1em 1em 1em 0;
-}
-
-.right {
-  float: right;
-  margin: 1em 0 1em 1em;
-}
-
-.txtright {
-  text-align: right;
-}
-
 /** *******************************************************************
  * 3) Reusable content blocks
  *********************************************************************/
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 910814dd..8b8e43a8 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -13,7 +13,7 @@
       <? endif; ?>
     </li>
     <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="txtright">
+    <li class="g-txt-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 19d8cc00..414174b6 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -27,6 +27,7 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
+    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 7cdc9bb0..b57e0c9d 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -25,7 +25,7 @@
   <? endif ?>
   </li>
   <li class="gInfo"><?= $from_to_msg ?></li>
-  <li class="txtright">
+  <li class="g-txt-right">
   <? if ($next_page): ?>
     <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index b0096043..25e1ad39 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -26,7 +26,7 @@
       <? endif; ?>
     </li>
     <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="txtright">
+    <li class="g-txt-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
-- 
cgit v1.2.3