summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-06-09 21:12:59 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-06-09 21:12:59 -0700
commit1f1cb01a967b508374ec9202815cb190bf4ea463 (patch)
tree56948e93b9c3644e75b148c6bae1384d932074b7
parent16ef912154f7adb1d623ac843f480c5f91f05774 (diff)
parentdab0799b6557b7ea2ac5e5a262bae4ecf054b80e (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
-rw-r--r--modules/gallery/views/admin_dashboard.html.php8
-rw-r--r--themes/admin_default/css/screen.css3
2 files changed, 5 insertions, 6 deletions
diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index c266d7e1..5b8cae2e 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -10,23 +10,23 @@
};
$(document).ready(function(){
- $("#gAdminDashboard .gBlock *:first").addClass("gDraggable");
+ $("#gAdminDashboard .gBlock .ui-widget-header").addClass("gDraggable");
$("#gAdminDashboard").sortable({
connectWith: ["#gAdminDashboardSidebar"],
containment: "document",
cursor: "move",
- handle: $("div:first"),
+ handle: $(".ui-widget-header"),
opacity: 0.6,
placeholder: "gDropTarget",
stop: update_blocks
});
- $("#gAdminDashboardSidebar .gBlock *:first").addClass("gDraggable");
+ $("#gAdminDashboardSidebar .gBlock .ui-widget-header").addClass("gDraggable");
$("#gAdminDashboardSidebar").sortable({
connectWith: ["#gAdminDashboard"],
containment: "document",
cursor: "move",
- handle: $("div:first"),
+ handle: $(".ui-widget-header"),
opacity: 0.6,
placeholder: "gDropTarget",
stop: update_blocks
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 1ad64fa1..82f85f21 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -327,8 +327,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
border: none;
}
-.ui-draggable,
-.ui-sortable {
+.ui-draggable {
cursor: move;
}