summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/organize/css/organize.css14
-rw-r--r--modules/organize/js/organize.js38
-rw-r--r--modules/organize/views/organize_dialog.html.php4
-rw-r--r--modules/organize/views/organize_thumb_grid.html.php8
4 files changed, 32 insertions, 32 deletions
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 3a8a6412..4a65d20e 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -70,7 +70,7 @@
/*******************************************************************
* Album Panel Styles
*/
-#gMicroThumbPanel {
+#gOrganizeMicroThumbPanel {
margin: 0 !important;
padding: 0 !important;
background-color: #cfdeff;
@@ -81,11 +81,11 @@
overflow-y: auto;
}
-#gMicroThumbGrid {
+#gOrganizeMicroThumbGrid {
padding: 1em;
}
-.gMicroThumbGridCell {
+.gOrganizeMicroThumbGridCell {
float: left;
font-size: 0.8em;
padding: .5em !important;
@@ -94,14 +94,14 @@
border-right: 1px hidden #13A;
}
-.gMicroThumb {
+.gOrganizeMicroThumb {
display: block;
height: 9em;
text-align: center;
width: 9em;
}
-.gMicroThumbGridCell.ui-state-selected {
+.gOrganizeMicroThumbGridCell.ui-state-selected {
opacity: 1;
}
@@ -114,11 +114,11 @@
padding: .5em;
}
-#gMicroThumbPanel #gMicroThumbGrid .gAlbum {
+#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid .gAlbum {
background-color: #e8e8e8;
}
-#gMicroThumbPanel #gMicroThumbGrid :hover {
+#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid :hover {
opacity: 1;
}
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index ad14a99e..edafae61 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -4,7 +4,7 @@
handle: ".ui-state-selected",
distance: 10,
cursorAt: { left: -10, top: -10},
- appendTo: "#gMicroThumbPanel",
+ appendTo: "#gOrganizeMicroThumbPanel",
helper: function(event, ui) {
var selected = $(".ui-draggable.ui-state-selected img");
if (selected.length) {
@@ -37,16 +37,16 @@
},
start: function(event, ui) {
- $("#gMicroThumbPanel .ui-state-selected").hide();
+ $("#gOrganizeMicroThumbPanel .ui-state-selected").hide();
},
drag: function(event, ui) {
- var top = $("#gMicroThumbPanel").offset().top;
- var height = $("#gMicroThumbPanel").height();
+ var top = $("#gOrganizeMicroThumbPanel").offset().top;
+ var height = $("#gOrganizeMicroThumbPanel").height();
if (ui.offset.top > height + top - 20) {
- $("#gMicroThumbPanel").get(0).scrollTop += 100;
+ $("#gOrganizeMicroThumbPanel").get(0).scrollTop += 100;
} else if (ui.offset.top < top + 20) {
- $("#gMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gMicroThumbPanel").get(0).scrollTop - 100);
+ $("#gOrganizeMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gOrganizeMicroThumbPanel").get(0).scrollTop - 100);
}
}
},
@@ -74,7 +74,7 @@
drop: function(event, ui) {
if ($(event.target).hasClass("gViewOnly")) {
$(".ui-state-selected").show();
- $(".gMicroThumbGridCell").css("borderStyle", "none");
+ $(".gOrganizeMicroThumbGridCell").css("borderStyle", "none");
} else {
$.organize.do_drop({
url: move_url.replace("__ALBUM_ID__", $(event.target).attr("ref")),
@@ -85,7 +85,7 @@
},
do_drop: function(options) {
- $("#gMicroThumbPanel").selectable("destroy");
+ $("#gOrganizeMicroThumbPanel").selectable("destroy");
var source_ids = [];
$(options.source).each(function(i) {
source_ids.push($(this).attr("ref"));
@@ -104,7 +104,7 @@
$("#gOrganizeAlbumTree").html(data.tree);
}
if (data.grid) {
- $("#gMicroThumbGrid").html(data.grid);
+ $("#gOrganizeMicroThumbGrid").html(data.grid);
$("#gOrganizeSortColumn").attr("value", data.sort_column);
$("#gOrganizeSortOrder").attr("value", data.sort_order);
}
@@ -113,7 +113,7 @@
mouse_move_handler: function(event) {
if ($(".gDragHelper").length) {
- $(".gMicroThumbGridCell").css("borderStyle", "hidden");
+ $(".gOrganizeMicroThumbGridCell").css("borderStyle", "hidden");
$(".currentDropTarget").removeClass("currentDropTarget");
var borderStyle = event.pageX < $(this).offset().left + $(this).width() / 2 ?
"borderLeftStyle" : "borderRightStyle";
@@ -132,7 +132,7 @@
$("#gDialog").dialog("option", "zIndex", 70);
$("#gDialog").bind("dialogopen", function(event, ui) {
$("#gOrganize").height($("#gDialog").innerHeight() - 20);
- $("#gMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
+ $("#gOrganizeMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
$("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 59);
});
@@ -152,11 +152,11 @@
},
set_handlers: function() {
- $("#gMicroThumbPanel").selectable({filter: ".gMicroThumbGridCell"});
- $("#gMicroThumbPanel").droppable($.organize.content_droppable);
+ $("#gOrganizeMicroThumbPanel").selectable({filter: ".gOrganizeMicroThumbGridCell"});
+ $("#gOrganizeMicroThumbPanel").droppable($.organize.content_droppable);
- $(".gMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
- $(".gMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
+ $(".gOrganizeMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
+ $(".gOrganizeMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
$(".gOrganizeAlbum").droppable($.organize.branch_droppable);
$(".gOrganizeAlbumText").click($.organize.show_album);
$("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
@@ -200,14 +200,14 @@
if ($(parent).hasClass("gViewOnly")) {
return;
}
- $("#gMicroThumbPanel").selectable("destroy");
+ $("#gOrganizeMicroThumbPanel").selectable("destroy");
var id = $(event.currentTarget).attr("ref");
$("#gOrganizeAlbumTree .selected").removeClass("selected");
$(".gOrganizeAlbumText[ref=" + id + "]").addClass("selected");
- var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
+ var url = $("#gOrganizeMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
$.get(url, {},
function(data) {
- $("#gMicroThumbGrid").html(data.grid);
+ $("#gOrganizeMicroThumbGrid").html(data.grid);
$("#gOrganizeSortColumn").attr("value", data.sort_column);
$("#gOrganizeSortOrder").attr("value", data.sort_order);
$.organize.set_handlers();
@@ -225,7 +225,7 @@
.replace("__DIR__", dir);
$.get(url, {},
function(data) {
- $("#gMicroThumbGrid").html(data.grid);
+ $("#gOrganizeMicroThumbGrid").html(data.grid);
$("#gOrganizeSortColumn").attr("value", data.sort_column);
$("#gOrganizeSortOrder").attr("value", data.sort_order);
$.organize.set_handlers();
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index d4196460..54f21178 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -23,9 +23,9 @@
</ul>
</div>
<div id="gOrganizeDetail" class="yui-u">
- <div id="gMicroThumbPanel"
+ <div id="gOrganizeMicroThumbPanel"
ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
- <ul id="gMicroThumbGrid">
+ <ul id="gOrganizeMicroThumbGrid">
<?= $micro_thumb_grid ?>
</ul>
</div>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 31dc9af5..929d9ec3 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,8 +1,8 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<? foreach ($album->children(25, $offset) as $child): ?>
-<li class="gMicroThumbGridCell" ref="<?= $child->id ?>">
- <div id="gMicroThumb_<?= $child->id ?>"
- class="gMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
+<li class="gOrganizeMicroThumbGridCell" ref="<?= $child->id ?>">
+ <div id="gOrganizeMicroThumb_<?= $child->id ?>"
+ class="gOrganizeMicroThumb <?= $child->is_album() ? "gAlbum" : "gPhoto" ?>">
<?= $child->thumb_img(array("class" => "gThumbnail", "ref" => $child->id), 90, true) ?>
</div>
</li>
@@ -13,7 +13,7 @@
setTimeout(function() {
$.get("<?= url::site("organize/content/$album->id/" . ($offset + 25)) ?>",
function(data) {
- $("#gMicroThumbGrid").append(data);
+ $("#gOrganizeMicroThumbGrid").append(data);
$.organize.set_handlers();
}
);