summaryrefslogtreecommitdiff
path: root/modules/organize
diff options
context:
space:
mode:
Diffstat (limited to 'modules/organize')
-rw-r--r--modules/organize/controllers/organize.php32
-rw-r--r--modules/organize/css/organize.css22
-rw-r--r--modules/organize/js/organize.js68
-rw-r--r--modules/organize/views/organize_dialog.html.php5
-rw-r--r--modules/organize/views/organize_thumb_grid.html.php8
-rw-r--r--modules/organize/views/organize_tree.html.php53
6 files changed, 102 insertions, 86 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 2b966657..27299e85 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -25,7 +25,7 @@ class Organize_Controller extends Controller {
$v = new View("organize_dialog.html");
$v->album = $album;
- $v->album_tree = self::_tree($album);
+ $v->album_tree = self::_expanded_tree(ORM::factory("item", 1), $album);
$v->micro_thumb_grid = self::_get_micro_thumb_grid($album, 0);
print $v;
}
@@ -46,11 +46,14 @@ class Organize_Controller extends Controller {
$album = ORM::factory("item", $album_id);
foreach ($this->input->post("source_ids") as $source_id) {
- item::move(ORM::factory("item", $source_id), $album);
+ $source = ORM::factory("item", $source_id);
+ if (!$album->is_descendant($source)) {
+ item::move($source, $album);
+ }
}
print json_encode(
- array("tree" => self::_tree($album)->__toString(),
+ array("tree" => self::_expanded_tree(ORM::factory("item", 1), $album)->__toString(),
"grid" => self::_get_micro_thumb_grid($album, 0)->__toString()));
}
@@ -132,17 +135,22 @@ class Organize_Controller extends Controller {
return $v;
}
- private static function _tree($album) {
- $v = new View("organize_tree.html");
- $v->parents = $album->parents();
- $v->album = $album;
+ public function tree($album_id) {
+ $album = ORM::factory("item", $album_id);
+ access::required("view", $album);
- if ($album->id == 1) {
- $v->peers = array($album);
- } else {
- $v->peers = $album->parent()->children(null, 0, array("type" => "album"));
- }
+ print self::_expanded_tree($album);
+ }
+ /**
+ * Create an HTML representation of the tree from the root down to the selected album. We only
+ * include albums along the descendant hierarchy that includes the selected album, and the
+ * immediate child albums.
+ */
+ private static function _expanded_tree($root, $selected_album=null) {
+ $v = new View("organize_tree.html");
+ $v->album = $root;
+ $v->selected = $selected_album;
return $v;
}
}
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 85168810..4a65d20e 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -2,10 +2,6 @@
/*******************************************************************
* Dialog wide stylings
*/
-#gOrganizeDialog {
- text-align: left;
-}
-
#gOrganize {
overflow: hidden;
}
@@ -51,7 +47,7 @@
padding-left: 1.2em;
}
-.gAlbumText:hover {
+.gOrganizeAlbumText:hover {
border: 1px dashed #999;
padding: 1px;
}
@@ -67,14 +63,14 @@
cursor: pointer;
}
-.gAlbumText {
+.gOrganizeAlbumText {
cursor: pointer;
width: auto;
}
/*******************************************************************
* Album Panel Styles
*/
-#gMicroThumbPanel {
+#gOrganizeMicroThumbPanel {
margin: 0 !important;
padding: 0 !important;
background-color: #cfdeff;
@@ -85,11 +81,11 @@
overflow-y: auto;
}
-#gMicroThumbGrid {
+#gOrganizeMicroThumbGrid {
padding: 1em;
}
-.gMicroThumbGridCell {
+.gOrganizeMicroThumbGridCell {
float: left;
font-size: 0.8em;
padding: .5em !important;
@@ -98,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;
}
@@ -118,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 04e14a2f..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,15 +152,41 @@
},
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);
- $(".gAlbumText").click($.organize.show_album);
+ $(".gOrganizeAlbumText").click($.organize.show_album);
+ $("#gOrganizeAlbumTree .ui-icon-plus,#gOrganizeAlbumTree .ui-icon-minus").click($.organize.toggle_branch);
},
+ toggle_branch: function(event) {
+ event.preventDefault();
+ var target = $(event.currentTarget);
+ var branch = $(target).parent();
+ var id = $(event.currentTarget).parent().attr("ref");
+
+ if ($(target).hasClass("ui-icon-plus")) {
+ // Expanding
+ if (!branch.find("ul").length) {
+ $.get(tree_url.replace("__ALBUM_ID__", id), { },
+ function(data) {
+ branch.replaceWith(data);
+ $.organize.set_handlers();
+ }
+ );
+ } else {
+ branch.find("ul:eq(0)").slideDown();
+ }
+ } else {
+ // Contracting
+ branch.find("ul:eq(0)").slideUp();
+ }
+ $(target).toggleClass("ui-icon-plus");
+ $(target).toggleClass("ui-icon-minus");
+ },
/**
* When the text of a selection is clicked, then show that albums contents
@@ -174,14 +200,14 @@
if ($(parent).hasClass("gViewOnly")) {
return;
}
- $("#gMicroThumbPanel").selectable("destroy");
+ $("#gOrganizeMicroThumbPanel").selectable("destroy");
var id = $(event.currentTarget).attr("ref");
$("#gOrganizeAlbumTree .selected").removeClass("selected");
- $(".gAlbumText[ref=" + id + "]").addClass("selected");
- var url = $("#gMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
+ $(".gOrganizeAlbumText[ref=" + id + "]").addClass("selected");
+ 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();
@@ -199,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 857499aa..cbc2e4f9 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -3,6 +3,7 @@
var move_url = "<?= url::site("organize/move_to/__ALBUM_ID__?csrf=$csrf") ?>";
var rearrange_url = "<?= url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf") ?>";
var sort_order_url = "<?= url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf") ?>";
+ var tree_url = "<?= url::site("organize/tree/__ALBUM_ID__") ?>";
</script>
<div id="gOrganize" class="gDialogPanel">
<h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1>
@@ -22,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();
}
);
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 5b676889..50c202b0 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,44 +1,29 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($parents as $parent): ?>
-<li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $parent) ? "" : "gViewOnly" ?>"
- ref="<?= $parent->id ?>">
+<li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $album) ? "" : "gViewOnly" ?>"
+ ref="<?= $album->id ?>">
<span class="ui-icon ui-icon-minus">
</span>
- <span class="gAlbumText" ref="<?= $parent->id ?>">
- <?= html::clean($parent->title) ?>
+ <span class="gOrganizeAlbumText
+ <?= $selected && $album->id == $selected->id ? "selected" : "" ?>
+ "
+ ref="<?= $album->id ?>">
+ <?= html::clean($album->title) ?>
</span>
- <ul class="ui-icon-plus">
- <? endforeach ?>
-
- <? foreach ($peers as $peer): ?>
- <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $peer) ? "" : "gViewOnly" ?>"
- ref="<?= $peer->id ?>">
- <span class="ui-icon <?= $peer->id == $album->id ? "ui-icon-minus" : "ui-icon-plus" ?>">
+ <ul>
+ <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
+ <? if ($selected && $child->is_descendant($selected)): ?>
+ <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
+ <? else: ?>
+ <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
+ ref="<?= $child->id ?>">
+ <span class="ui-icon ui-icon-plus">
</span>
- <span class="gAlbumText <?= $peer->id == $album->id ? "selected" : "" ?>"
- ref="<?= $peer->id ?>">
- <?= html::clean($peer->title) ?>
+ <span class="gOrganizeAlbumText" ref="<?= $child->id ?>">
+ <?= html::clean($child->title) ?>
</span>
-
- <? if ($peer->id == $album->id): ?>
- <ul class="ui-icon-plus">
- <? foreach ($album->children(null, 0, array("type" => "album")) as $child): ?>
- <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
- ref="<?= $child->id ?>">
- <span class="ui-icon ui-icon-plus">
- </span>
- <span class="gAlbumText"
- ref="<?= $child->id ?>">
- <?= html::clean($child->title) ?>
- </span>
- </li>
- <? endforeach ?>
- </ul>
- <? endif ?>
</li>
+ <? endif ?>
<? endforeach ?>
-
- <? foreach ($parents as $parent): ?>
</ul>
</li>
-<? endforeach ?>
+
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 14:37:40 +0000