From 5f56cbf997c12ab1aaf14403873fd9dfc33690ef Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 20:22:10 -0600
Subject: Wrap all admin views in g-block and g-block content. This provides
 the means to visually separate the view's title and description from
 everything else. Primary admin view title should always be h1, and only one
 h1 per view. Removed some unused admin CSS id's.

---
 modules/gallery/views/admin_sidebar.html.php | 43 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'modules/gallery/views/admin_sidebar.html.php')

diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index b4f339ae..ea950b54 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(function() {
-    $(".g-admin-blocks-list ul").sortable({
+    $(".g-blocks-list ul").sortable({
       connectWith: ".g-sortable-blocks",
       opacity: .7,
       placeholder: "g-target",
@@ -11,7 +11,7 @@
           $("ul#g-active-blocks li").each(function(i) {
             active_blocks += "&block["+i+"]="+$(this).attr("ref");
           });
-          $.getJSON($("#g-site-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
+          $.getJSON($("#g-admin-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);
@@ -22,25 +22,28 @@
     }).disableSelection();
   });
 </script>
-<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-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 class="g-block">
+  <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>
     </div>
-  </div>
-  <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 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>
     </div>
   </div>
 </div>
-- 
cgit v1.2.3


From b2d0b3ebbb1764593e387a2e07e0d4e67f4f5474 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 23:38:27 -0600
Subject: Fix sidebar block admin layout. Don't hardcode block list height, use
 the equal_heights() function to set it.

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

(limited to 'modules/gallery/views/admin_sidebar.html.php')

diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index ea950b54..030dfdce 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,5 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
+  $(document).ready(function(){
+    $(".g-blocks-list").equal_heights();
+  });
+
   $(function() {
     $(".g-blocks-list ul").sortable({
       connectWith: ".g-sortable-blocks",
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 20593e9c..74323067 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -526,12 +526,11 @@ li.g-default-group h4, li.g-default-group .g-user {
 /* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-admin-blocks .g-block {
-  margin-right: 2em;
-  height: 200px;
-  width: 30% !important;
+  clear: none;
+  width: 30%;
 }
 
-#g-admin-blocks .g-block li {
+#g-admin-blocks .g-block .g-draggable {
   background: #e7e7e7;
   /*border: 1px solid #fff;*/
   margin-bottom: 1em;
-- 
cgit v1.2.3