Merge branch 'master' of git@github.com:gallery/gallery3

8 files changed, 46 insertions, 43 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 5ca69908..c80dc90f 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -12,7 +12,6 @@
  *  7)  Right to left language styles
  *
  *  @todo Update .g-message-block, don't force it to 100%, bad things happen is themes when you do.
- *  @todo Remove extra white space at the top of the add comment form, above the first field
  */
 
 /** *******************************************************************
@@ -41,7 +40,7 @@ form {
 
 fieldset {
   border: 1px solid #ccc;
-  padding: .4em 1em .8em 1em;
+  padding: 0 1em .8em 1em;
 }
 
 #g-banner fieldset,
@@ -52,7 +51,8 @@ fieldset {
 
 legend {
   font-weight: bold;
-  margin: 0 0 .4em .8em;
+  margin: 0;
+  padding: 0 .2em;
 }
 
 #g-banner legend,
@@ -99,7 +99,11 @@ input[type=radio] {
 
 form li {
   margin: 0;
-  padding: .3em 0;
+  padding: 0 0 .2em 0;
+}
+
+form ul {
+  margin-top: 0;
 }
 
 form ul ul {
@@ -125,13 +129,22 @@ input[type="reset"] {
   float: left;
 }
 
-/* Forms in dialogs ~~~~~~~~~~~~~~~~~~ */
+/* Forms in dialogs and panels ~~~~~~~~~ */
 
-#g-dialog form fieldset {
+#g-dialog ul li {
+  padding-bottom: .8em;
+}
+
+#g-dialog fieldset,
+#g-panel fieldset {
   border: none;
   padding: 0;
 }
 
+#g-panel legend {
+  display: none;
+}
+
 #g-dialog input.textbox,
 #g-dialog input[type=text],
 #g-dialog input[type=password],
@@ -549,7 +562,7 @@ div#g-action-status {
   width: 40%;
 }
 
-/* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
 
 #g-dialog {
   text-align: left;
@@ -563,6 +576,11 @@ div#g-action-status {
   margin: .4em 1em;
 }
 
+#g-panel {
+  display: none;
+  padding: 1em;
+}
+
 /* Inline layout  ~~~~~~~~~~ */
 
 .g-inline li {
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index da69e476..9aaac1ce 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -125,7 +125,7 @@
 
   // Initialize context menus
   $.fn.gallery_context_menu = function() {
-    if ($(".g-context-menu li").length) {  
+    if ($(".g-context-menu li").length) {
       var hover_target = ".g-context-menu";
       var in_progress = 0;
       $(hover_target + " *").removeAttr('title');
diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php
index 06668dc2..04a15619 100644
--- a/modules/image_block/helpers/image_block_installer.php
+++ b/modules/image_block/helpers/image_block_installer.php
@@ -19,13 +19,11 @@
  */
 class image_block_installer {
   static function install() {
-    block_manager::add("site.sidebar", "image_block", "random_image");
     module::set_version("image_block", 2);
   }
 
   static function upgrade($version) {
     if ($version == 1) {
-      block_manager::add("site.sidebar", "image_block", "random_image");
       module::set_version("image_block", 2);
     }
   }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 661f1532..18ad9403 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -85,7 +85,7 @@
             <td>
               <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
             </td>
-            <td class="g-actions">
+            <td>
               <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
                   open_text="<?= t("Close") ?>"
                   class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 97e0bfd0..73ec8ac5 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -12,8 +12,7 @@
  *  6)  jQuery and jQuery UI
  *  7)  Right-to-left language styles
  *
- * @todo Consider moving g-panel to gallery.common
- * @todo Review g-actions along with g-buttonset-vertical
+ * @todo Review g-buttonset-vertical
  */
 
 /** *******************************************************************
@@ -92,6 +91,10 @@ fieldset {
   margin-bottom: 1em;
 }
 
+#g-content form ul li {
+  padding: .4em 0;
+}
+
 #g-dialog form {
   width: 270px;
 }
@@ -157,6 +160,12 @@ th {
   padding: 0;
 }
 
+#g-content .g-selected,
+#g-content .g-available .g-block {
+  border: 1px solid #ccc;
+  padding: .8em;
+}
+
 .g-selected img,
 .g-available .g-block img {
   float: left;
@@ -359,11 +368,6 @@ th {
   margin-right: 1em;
 }
 
-.g-actions a,
-.g-actions span {
-  margin-right: 3em;
-}
-
 /* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-admin-blocks-list {
@@ -428,19 +432,6 @@ th {
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-panel {
-  display: none;
-  padding: 1em;
-}
-
-#g-panel legend {
-  display: none;
-}
-
-#g-panel fieldset {
-  border: none;
-}
-
 #g-admin-dashboard .ui-state-highlight,
 #g-sidebar .ui-state-highlight {
   height: 2em;
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 1a7fc110..e46ba8e6 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -11,8 +11,6 @@
  *  5)  Navigation and menus
  *  6)  jQuery and jQuery UI
  *  7)  Right-to-left language styles
- *
- *  @todo Review g-buttonset and it's usage here and admin_wind
  */
 
 /** *******************************************************************
@@ -73,7 +71,9 @@ h3 {
   font-size: .8em;
 }
 
-#g-content #g-album-grid .g-item {
+#g-album-grid .g-item,
+#g-item #g-photo,
+#g-item #g-movie {
   font-size: .7em;
 }
 
@@ -284,11 +284,7 @@ td {
 
 #g-item #g-photo,
 #g-item #g-movie {
-  padding: 1em 0;
-}
-
-#g-item #g-photo,
-#g-item #g-movie {
+  padding: 2.2em 0;
   position: relative;
 }
 
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 0126c36b..be03b6a8 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -87,12 +87,12 @@ $(document).ready(function() {
   }
 
   // Photo/Item item view
-  if ($("#g-item").length) {
+  if ($("#g-photo").length) {
     // Ensure the resized image fits within its container
-    $("#g-item").gallery_fit_photo();
+    $("#g-photo").gallery_fit_photo();
 
     // Initialize context menus
-    var resize = $("#g-item").gallery_get_photo();
+    var resize = $("#g-photo").gallery_get_photo();
     $(resize).hover(function(){
       $(this).gallery_context_menu();
     });
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 116fd95e..d91ffbc5 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -26,6 +26,7 @@
 
   <div id="g-movie" class="ui-helper-clearfix">
     <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
+    <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
   </div>
   
   <div id="g-info">
@@ -34,5 +35,4 @@
   </div>
 
   <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
 </div>