From 3ac9e84e200dc2c883a080bbdc834bbd4355255c Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 20 Oct 2009 21:35:35 -0600
Subject: Move basic form styles from wind themes to gallery.common.css.

---
 themes/admin_wind/css/screen.css | 101 -------------------------------------
 themes/wind/css/screen.css       | 106 ---------------------------------------
 2 files changed, 207 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 74323067..7c0149c8 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -114,107 +114,6 @@ th {
   white-space: nowrap;
 }
 
-/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-fieldset {
-  border: 1px solid #ccc;
-  padding-bottom: .8em;
-}
-
-#g-header fieldset,
-#g-sidebar fieldset {
-  border: none;
-}
-
-legend {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-#g-header legend,
-#g-sidebar legend,
-#g-content #g-search-form legend,
-input[type="hidden"] {
-  display: none;
-}
-
-label {
-  cursor: help;
-}
-
-input[type="text"],
-input[type="password"] {
-  width: 50%;
-}
-
-input[type="text"],
-input[type="password"],
-textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-}
-
-textarea {
-  width: 100%;
-  height: 12em;
-}
-
-input:focus,
-textarea:focus,
-option:focus {
-  background-color: #ffc;
-  color: #000;
-}
-
-/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form li {
-  margin: 0 !important;
-  padding: .3em 1.5em .3em 1em;
-}
-
-form ul ul {
-  clear: both;
-}
-
-form ul ul li {
-  float: left;
-}
-
-input,
-select,
-textarea {
-  display: block;
-  clear: both;
-  padding: .2em;
-}
-
-input[type="submit"],
-input[type="reset"] {
-  display: inline;
-  clear: none;
-  float: left;
-}
-
-/* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form.g-error input[type="text"],
-li.g-error input[type="text"],
-form.g-error input[type="password"],
-li.g-error input[type="password"],
-form.g-error input[type="checkbox"],
-li.g-error input[type="checkbox"],
-form.g-error input[type="radio"],
-li.g-error input[type="radio"],
-form.g-error textarea,
-li.g-error textarea,
-form.g-error select,
-li.g-error select {
-  border: 2px solid red;
-}
-
 /** *******************************************************************
  * 2) Reusable content blocks
  *********************************************************************/
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index d7eb19e6..d4fdcade 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -118,112 +118,6 @@ td {
   vertical-align: top;
 }
 
-/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-sidebar form {
-  padding-left: 0;
-  padding-right: 0;
-}
-
-fieldset {
-  border: 1px solid #ccc;
-  padding: .8em 1em !important;
-}
-
-#g-banner fieldset,
-#g-sidebar fieldset {
-  border: none;
-}
-
-legend {
-  font-weight: bold;
-  margin-left: .8em;
-}
-
-#g-banner legend,
-#g-sidebar legend,
-#g-content #g-search-form legend,
-input[type="hidden"] {
-  display: none;
-}
-
-label {
-  cursor: help;
-}
-
-input[type="text"],
-input[type="password"] {
-  width: 50%;
-}
-
-input[type="text"],
-input[type="password"],
-textarea {
-  border: 1px solid #e8e8e8;
-  border-top-color: #ccc;
-  border-left-color: #ccc;
-  color: #333;
-}
-
-textarea {
-  width: 100%;
-  height: 12em;
-}
-
-input:focus,
-textarea:focus,
-option:focus {
-  background-color: #ffc;
-  color: #000;
-}
-
-/* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form li {
-  margin: 0 !important;
-  padding: .3em 0;
-}
-
-form ul ul {
-  clear: both;
-}
-
-form ul ul li {
-  float: left;
-}
-
-input,
-select,
-textarea {
-  display: block;
-  clear: both;
-  padding: .2em;
-}
-
-input[type="submit"],
-input[type="reset"] {
-  display: inline;
-  clear: none;
-  float: left;
-}
-
-/* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form.g-error input[type="text"],
-li.g-error input[type="text"],
-form.g-error input[type="password"],
-li.g-error input[type="password"],
-form.g-error input[type="checkbox"],
-li.g-error input[type="checkbox"],
-form.g-error input[type="radio"],
-li.g-error input[type="radio"],
-form.g-error textarea,
-li.g-error textarea,
-form.g-error select,
-li.g-error select {
-  border: 2px solid red;
-}
-
 /** *******************************************************************
  * 2) Reusable content blocks
  *********************************************************************/
-- 
cgit v1.2.3


From bb8ece06e26c1163f6013b5c8b849cf5eff9dee5 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 20 Oct 2009 22:47:12 -0600
Subject: Remove g-add-photos selectors from admin_wind, they're only needed in
 wind. Updated case in hex color spec., prefer lowercase.

---
 themes/admin_wind/css/screen.css | 48 ----------------------------------------
 themes/wind/css/screen.css       |  2 +-
 2 files changed, 1 insertion(+), 49 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 7c0149c8..31de58f8 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -568,54 +568,6 @@ li.g-default-group h4, li.g-default-group .g-user {
   display: inline-block;
 }
 
-#g-add-photos p {
-  margin: 0;
-  padding: 0;
-}
-
-#g-add-photos-canvas {
-  height: 325px;
-  width: 450px;
-  overflow: auto;
-}
-
-#g-add-photos-queue .progressbar {
-  height: 4px;
-}
-
-#g-add-photos-queue .title {
-  font-size: 1.25em;
-}
-
-#g-add-photos-queue .status {
-  font-size: .75em;
-}
-
-#g-add-photos-queue .box {
-  margin-bottom: 8px;
-  padding: 4px;
-}
-
-#g-add-photos-queue .pending {
-  background-color: #e8e8e8;
-  border: 1px solid #d7d7d7;
-}
-
-#g-add-photos-queue .error {
-  background-color: #fcc;
-  border: 1px solid #ebb;
-}
-
-#g-add-photos-queue .uploading {
-  background-color: #ff9;
-  border: 1px solid #ee8;
-}
-
-#g-add-photos-queue .complete {
-  background-color: #cfc;
-  border: 1px solid #beb;
-}
-
 #g-admin-g2-import-notes {
   padding-bottom: 20px;
 }
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index d4fdcade..fcbf63ea 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -591,7 +591,7 @@ td {
   padding-left:10px;
 }
 #g-add-photos-canvas {
-  border: 1px solid  #CCCCCC;
+  border: 1px solid  #ccc;
   margin: .5em 0 .5em 0;
   width: 469px;
 	height: 325px;
-- 
cgit v1.2.3


From 055c410126d3ec56aac34dabf1cee5a57459afaf Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 20 Oct 2009 23:20:38 -0600
Subject: Fix block management UI. Block list height is now dynamically set
 based on the total number of available blocks which will grow without
 hardcoding CSS heights and setting the div to be scrollable.

---
 modules/gallery/views/admin_sidebar.html.php | 41 ++++++++++++++++------------
 themes/admin_wind/css/screen.css             | 25 ++++++++++++-----
 2 files changed, 41 insertions(+), 25 deletions(-)

(limited to 'themes')

diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index 030dfdce..834429c3 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,11 +1,13 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(document).ready(function(){
-    $(".g-blocks-list").equal_heights();
+    $(".g-admin-blocks-list").equal_heights();
+    var extra_ht = $(".g-admin-blocks-list li").length * $(".g-admin-blocks-list li:first").height();
+    $(".g-admin-blocks-list").height($(".g-admin-blocks-list").height() + extra_ht);
   });
 
   $(function() {
-    $(".g-blocks-list ul").sortable({
+    $(".g-admin-blocks-list ul").sortable({
       connectWith: ".g-sortable-blocks",
       opacity: .7,
       placeholder: "g-target",
@@ -15,7 +17,7 @@
           $("ul#g-active-blocks li").each(function(i) {
             active_blocks += "&block["+i+"]="+$(this).attr("ref");
           });
-          $.getJSON($("#g-admin-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
+          $.getJSON($("#g-site-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
             if (data.result == "success") {
               $("ul#g-available-blocks").html(data.available);
               $("ul#g-active-blocks").html(data.active);
@@ -26,27 +28,30 @@
     }).disableSelection();
   });
 </script>
-<div class="g-block">
+
+<div class="g-block ui-helper-clearfix">
   <h1> <?= t("Manage Sidebar") ?> </h1>
   <p>
     <?= t("Select and drag blocks from the available column to the active column to add to the sidebar; remove by dragging the other way.") ?>
   </p>
 
-  <div id="g-admin-blocks" class="g-block-content ui-helper-clearfix" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
-    <div class="g-block g-left">
-      <h3><?= t("Available Blocks") ?></h3>
-      <div class="g-blocks-list g-block-content">
-        <ul id="g-available-blocks" class="g-sortable-blocks">
-        <?= $available ?>
-        </ul>
+  <div class="g-block-content">
+    <div id="g-site-blocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
+      <div class="g-admin-blocks-list">
+        <div><h3><?= t("Available Blocks") ?></h3></div>
+        <div>
+          <ul id="g-available-blocks" class="g-sortable-blocks">
+          <?= $available ?>
+          </ul>
+        </div>
       </div>
-    </div>
-    <div class="g-block g-left">
-      <h3><?= t("Active Blocks") ?></h3>
-      <div class="g-blocks-list g-block-content">
-        <ul id="g-active-blocks" class="g-sortable-blocks">
-        <?= $active ?>
-        </ul>
+      <div class="g-admin-blocks-list">
+        <div><h3><?= t("Active Blocks") ?></h3></div>
+        <div>
+          <ul id="g-active-blocks" class="g-sortable-blocks">
+          <?= $active ?>
+          </ul>
+        </div>
       </div>
     </div>
   </div>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 31de58f8..a889545b 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -424,16 +424,27 @@ li.g-default-group h4, li.g-default-group .g-user {
 
 /* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-admin-blocks .g-block {
-  clear: none;
+.g-admin-blocks-list {
+  float: left;
+  margin: 0 2em 2em 0;
   width: 30%;
 }
 
-#g-admin-blocks .g-block .g-draggable {
-  background: #e7e7e7;
-  /*border: 1px solid #fff;*/
-  margin-bottom: 1em;
-  padding: .4em .8em;
+.g-admin-blocks-list div:last-child {
+  border: .1em solid;
+  height: 100%;
+}
+
+.g-admin-blocks-list ul {
+  height: 98%;
+  margin: .1em .1em;
+  padding: .1em;
+}
+
+.g-admin-blocks-list ul li.g-draggable {
+  background-color: #e8e8e8;
+  margin: .5em;
+  padding: .3em .8em;
 }
 
 /** *******************************************************************
-- 
cgit v1.2.3