summaryrefslogtreecommitdiff
path: root/modules/organize
diff options
context:
space:
mode:
Diffstat (limited to 'modules/organize')
-rw-r--r--modules/organize/css/organize.css63
-rw-r--r--modules/organize/helpers/organize_event.php6
-rw-r--r--modules/organize/js/organize.js94
-rw-r--r--modules/organize/views/organize_dialog.html.php34
-rw-r--r--modules/organize/views/organize_thumb_grid.html.php12
-rw-r--r--modules/organize/views/organize_tree.html.php8
6 files changed, 105 insertions, 112 deletions
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index b1cef33c..41695cae 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -2,76 +2,73 @@
/*******************************************************************
* Dialog wide styles
*/
-#gOrganize {
+#g-organize {
+ height: 100%;
overflow: hidden;
}
-#gOrganize #bd {
+#g-organize #bd {
height: 100%;
}
-#gOrganize .yui-u {
- width: 75%;
+#g-organize #g-organize-detail {
+ width: auto;
}
-#gOrganize .yui-gf .first {
+#g-organize #g-organize-tree-container {
+ height: 100%;
width: 25%;
}
-#gMessage {
+#g-organize #g-action-status {
margin-bottom: .4em;
width: 75%;
white-space: nowrap;
}
-#gOrganizeDetail {
+#g-organize-detail {
height: 100%;
}
-#gMessage .gInfo {
- font-weight: bold;
- padding-left: 2em;
-}
-
/*******************************************************************
* Album Tree styles
*/
-#gOrganizeTreeContainer {
+#g-organize-tree-container {
height: 100%;
overflow: auto;
margin: 0 !important;
padding: 0 !important;
}
-#gOrganizeAlbumTree .selected {
+#g-organize-album-tree .g-selected {
background-color: #cfdeff;
border-bottom: 1px solid #999;
- margin-right: 0px;
+ margin-right: 0;
}
-#gOrganizeAlbumTree ul li {
+#g-organize-album-tree ul li {
padding-left: 1.2em;
}
-.gOrganizeAlbum span {
+.g-organize-album span {
cursor: pointer;
}
-.gOrganizeAlbumText {
+.g-organize-album-text {
cursor: pointer;
width: auto;
margin: 2px 0px 1px 2px;
display: block;
}
-.gOrganizeAlbumText:hover {
+.g-organize-album-text:hover {
background: #eee;
}
/*******************************************************************
* Album panel styles
*/
-#gOrganizeMicroThumbPanel {
+#g-organize-microthumb-panel {
margin: 0 !important;
padding: 0 !important;
background-color: #cfdeff;
@@ -82,28 +79,27 @@
overflow-y: auto;
}
-#gOrganizeMicroThumbGrid {
+#g-organize-microthumb-grid {
padding: 1em;
}
-.gOrganizeMicroThumbGridCell {
- float: left;
- font-size: 0.8em;
+.g-organize-microthumb-grid-cell {
+ font-size: .8em;
padding: .5em !important;
border-left: 1px hidden #13A;
border-right: 1px hidden #13A;
margin: 4px;
}
-.gOrganizeMicroThumb {
+.g-organize-microthumb {
display: block;
height: 9em;
text-align: center;
width: 9em;
}
-.gOrganizeMicroThumbGridCell.ui-selecting,
-.gOrganizeMicroThumbGridCell.ui-selected {
+.g-organize-microthumb-grid-cell.ui-selecting,
+.g-organize-microthumb-grid-cell.ui-selected {
margin: 2px;
border: 2px solid #13A;
}
@@ -115,15 +111,15 @@
background: #13A;
}
-.gThumbnail {
+.g-thumbnail {
padding: .5em;
}
-#gOrganizeMicroThumbGrid .gAlbum {
+#g-organize-microthumb-grid .g-album {
background-color: #e8e8e8;
}
-.gOrganizeMicroThumbGridCell:hover {
+.g-organize-microthumb-grid-cell:hover {
margin: 2px;
border: 2px solid #13A;
}
@@ -131,18 +127,17 @@
/****************************************************************
* Controls styles
*/
-#gOrganizeControls {
+#g-organize-controls {
padding-left: 8px;
background-color: #13A;
color: #ccc;
width: 100% !important;
}
-#gOrganizeControls select {
+#g-organize-controls select {
display: inline;
}
-#gOrganizeClose {
- float: right;
+#g-organize-close {
margin-right: 12px;
}
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index d6043116..6aa6da81 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -25,8 +25,8 @@ class organize_event_Core {
$menu->get("options_menu")
->append(Menu::factory("dialog")
->id("organize")
- ->label(t("Organize Album"))
- ->css_id("gOrganizeLink")
+ ->label(t("Organize album"))
+ ->css_id("g-organize-link")
->url(url::site("organize/dialog/{$item->id}")));
}
}
@@ -37,7 +37,7 @@ class organize_event_Core {
->append(Menu::factory("dialog")
->id("organize")
->label(t("Organize album"))
- ->css_id("gOrganizeLink")
+ ->css_id("g-organize-link")
->css_class("ui-icon-folder-open")
->url(url::site("organize/dialog/{$item->id}")));
}
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index cfaff01c..d125e2df 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -4,11 +4,11 @@
handle: ".ui-selected",
distance: 10,
cursorAt: { left: -10, top: -10},
- appendTo: "#gOrganizeMicroThumbPanel",
+ appendTo: "#g-organize-microthumb-panel",
helper: function(event, ui) {
var selected = $(".ui-draggable.ui-selected img");
if (selected.length) {
- var set = $('<div class="gDragHelper"></div>')
+ var set = $('<div class="g-drag-helper"></div>')
.css({
zIndex: 2000,
width: 80,
@@ -37,16 +37,16 @@
},
start: function(event, ui) {
- $("#gOrganizeMicroThumbPanel .ui-selected").hide();
+ $("#g-organize-microthumb-panel .ui-selected").hide();
},
drag: function(event, ui) {
- var top = $("#gOrganizeMicroThumbPanel").offset().top;
- var height = $("#gOrganizeMicroThumbPanel").height();
+ var top = $("#g-organize-microthumb-panel").offset().top;
+ var height = $("#g-organize-microthumb-panel").height();
if (ui.offset.top > height + top - 20) {
- $("#gOrganizeMicroThumbPanel").get(0).scrollTop += 100;
+ $("#g-organize-microthumb-panel").get(0).scrollTop += 100;
} else if (ui.offset.top < top + 20) {
- $("#gOrganizeMicroThumbPanel").get(0).scrollTop = Math.max(0, $("#gOrganizeMicroThumbPanel").get(0).scrollTop - 100);
+ $("#g-organize-microthumb-panel").get(0).scrollTop = Math.max(0, $("#g-organize-microthumb-panel").get(0).scrollTop - 100);
}
}
},
@@ -63,7 +63,7 @@
target_id = $(".currentDropTarget").attr("ref");
} else {
before_or_after = "after";
- target_id = $("#gOrganizeMicroThumbGrid li:last").attr("ref");
+ target_id = $("#g-organize-microthumb-grid li:last").attr("ref");
}
$.organize.do_drop({
url: rearrange_url
@@ -79,9 +79,9 @@
tolerance: "pointer",
greedy: true,
drop: function(event, ui) {
- if ($(event.target).hasClass("gViewOnly")) {
+ if ($(event.target).hasClass("g-view-only")) {
$(".ui-selected").show();
- $(".gOrganizeMicroThumbGridCell").css("borderStyle", "none");
+ $(".g-organize-microthumb-grid-cell").css("borderStyle", "none");
} else {
$.organize.do_drop({
url: move_url.replace("__ALBUM_ID__", $(event.target).attr("ref")),
@@ -92,7 +92,7 @@
},
do_drop: function(options) {
- $("#gOrganizeMicroThumbPanel").selectable("destroy");
+ $("#g-organize-microthumb-panel").selectable("destroy");
var source_ids = [];
$(options.source).each(function(i) {
source_ids.push($(this).attr("ref"));
@@ -110,19 +110,19 @@
_refresh: function(data) {
if (data.tree) {
- $("#gOrganizeAlbumTree").html(data.tree);
+ $("#g-organize-album-tree").html(data.tree);
}
if (data.grid) {
- $("#gOrganizeMicroThumbGrid").html(data.grid);
- $("#gOrganizeSortColumn").attr("value", data.sort_column);
- $("#gOrganizeSortOrder").attr("value", data.sort_order);
+ $("#g-organize-microthumb-grid").html(data.grid);
+ $("#g-organize-sort-column").attr("value", data.sort_column);
+ $("#g-organize-sort-order").attr("value", data.sort_order);
}
$.organize.set_handlers();
},
mouse_move_handler: function(event) {
- if ($(".gDragHelper").length) {
- $(".gOrganizeMicroThumbGridCell").css({borderStyle: "hidden", margin: "4px"});
+ if ($(".g-drag-helper").length) {
+ $(".g-organize-microthumb-grid-cell").css({borderStyle: "hidden", margin: "4px"});
$(".currentDropTarget").removeClass("currentDropTarget");
var borderStyle = event.pageX < $(this).offset().left + $(this).width() / 2 ?
{borderLeftStyle: "solid", marginLeft: "2px"} : {borderRightStyle: "solid", marginRight: "2px"};
@@ -138,39 +138,39 @@
var self = this;
// Deal with ui.jquery bug: http://dev.jqueryui.com/ticket/4475 (target 1.8?)
$(".sf-menu li.sfHover ul").css("z-index", 68);
- $("#gDialog").dialog("option", "zIndex", 70);
- $("#gDialog").bind("dialogopen", function(event, ui) {
- $("#gOrganize").height($("#gDialog").innerHeight() - 20);
- $("#gOrganizeMicroThumbPanel").height($("#gDialog").innerHeight() - 90);
- $("#gOrganizeTreeContainer").height($("#gDialog").innerHeight() - 59);
+ $("#g-dialog").dialog("option", "zIndex", 70);
+ $("#g-dialog").bind("dialogopen", function(event, ui) {
+ $("#g-organize").height($("#g-dialog").innerHeight() - 20);
+ $("#g-organize-microthumb-panel").height($("#g-dialog").innerHeight() - 90);
+ $("#g-organize-tree-container").height($("#g-dialog").innerHeight() - 59);
});
- $("#gDialog").bind("dialogclose", function(event, ui) {
+ $("#g-dialog").bind("dialogclose", function(event, ui) {
window.location.reload();
});
- $("#gDialog #gOrganizeClose").click(function(event) {
- $("#gDialog").dialog("close");
+ $("#g-dialog #g-organize-close").click(function(event) {
+ $("#g-dialog").dialog("close");
});
- $("#gOrganizeSortColumn,#gOrganizeSortOrder").change(function(event) {
- $.organize.resort($("#gOrganizeSortColumn").attr("value"), $("#gOrganizeSortOrder").attr("value"));
+ $("#g-organize-sort-column,#g-organize-sort-order").change(function(event) {
+ $.organize.resort($("#g-organize-sort-column").attr("value"), $("#g-organize-sort-order").attr("value"));
});
$.organize.set_handlers();
},
set_handlers: function() {
- $("#gOrganizeMicroThumbPanel")
- .selectable({filter: ".gOrganizeMicroThumbGridCell"})
+ $("#g-organize-microthumb-panel")
+ .selectable({filter: ".g-organize-microthumb-grid-cell"})
.droppable($.organize.content_droppable);
- $(".gOrganizeMicroThumbGridCell")
+ $(".g-organize-microthumb-grid-cell")
.draggable($.organize.micro_thumb_draggable)
.mouseleave($.organize.mouse_leave_handler)
.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);
+ $(".g-organize-album").droppable($.organize.branch_droppable);
+ $(".g-organize-album-text").click($.organize.show_album);
+ $("#g-organize-album-tree .ui-icon-plus,#g-organize-album-tree .ui-icon-minus").click($.organize.toggle_branch);
},
toggle_branch: function(event) {
@@ -204,23 +204,23 @@
*/
show_album: function(event) {
event.preventDefault();
- if ($(event.currentTarget).hasClass("selected")) {
+ if ($(event.currentTarget).hasClass("g-selected")) {
return;
}
- var parent = $(event.currentTarget).parents(".gOrganizeBranch");
- if ($(parent).hasClass("gViewOnly")) {
+ var parent = $(event.currentTarget).parents(".g-organize-branch");
+ if ($(parent).hasClass("g-view-only")) {
return;
}
- $("#gOrganizeMicroThumbPanel").selectable("destroy");
+ $("#g-organize-microthumb-panel").selectable("destroy");
var id = $(event.currentTarget).attr("ref");
- $("#gOrganizeAlbumTree .selected").removeClass("selected");
- $(".gOrganizeAlbumText[ref=" + id + "]").addClass("selected");
- var url = $("#gOrganizeMicroThumbPanel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
+ $("#g-organize-album-tree .g-selected").removeClass("g-selected");
+ $(".g-organize-album-text[ref=" + id + "]").addClass("g-selected");
+ var url = $("#g-organize-microthumb-panel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0);
$.get(url, {},
function(data) {
- $("#gOrganizeMicroThumbGrid").html(data.grid);
- $("#gOrganizeSortColumn").attr("value", data.sort_column);
- $("#gOrganizeSortOrder").attr("value", data.sort_order);
+ $("#g-organize-microthumb-grid").html(data.grid);
+ $("#g-organize-sort-column").attr("value", data.sort_column);
+ $("#g-organize-sort-order").attr("value", data.sort_order);
$.organize.set_handlers();
},
"json");
@@ -231,14 +231,14 @@
*/
resort: function(column, dir) {
var url = sort_order_url
- .replace("__ALBUM_ID__", $("#gOrganizeAlbumTree .selected").attr("ref"))
+ .replace("__ALBUM_ID__", $("#g-organize-album-tree .g-selected").attr("ref"))
.replace("__COL__", column)
.replace("__DIR__", dir);
$.get(url, {},
function(data) {
- $("#gOrganizeMicroThumbGrid").html(data.grid);
- $("#gOrganizeSortColumn").attr("value", data.sort_column);
- $("#gOrganizeSortOrder").attr("value", data.sort_order);
+ $("#g-organize-microthumb-grid").html(data.grid);
+ $("#g-organize-sort-column").attr("value", data.sort_column);
+ $("#g-organize-sort-order").attr("value", data.sort_order);
$.organize.set_handlers();
},
"json");
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index cbc2e4f9..57a0bdc6 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -5,37 +5,35 @@
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">
+<div id="g-organize" class="g-dialog-panel">
<h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1>
<div id="bd">
- <div class="yui-gf">
- <div class="yui-u first">
+ <div>
+ <div class="g-first g-left">
<h3><?= t("Albums") ?></h3>
</div>
- <div id="gMessage" class="yui-u">
- <div class="gInfo"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
- </div>
+ <div id="g-action-status" class="g-message-block g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
</div>
- <div id="gOrganizeContentPane" class="yui-gf">
- <div id="gOrganizeTreeContainer" class="yui-u first">
- <ul id="gOrganizeAlbumTree">
+ <div id="g-organize-content-pane">
+ <div id="g-organize-tree-container" class="g-first g-left">
+ <h3><?= t("Albums") ?></h3><ul id="g-organize-album-tree">
<?= $album_tree ?>
</ul>
</div>
- <div id="gOrganizeDetail" class="yui-u">
- <div id="gOrganizeMicroThumbPanel"
+ <div id="g-organize-detail">
+ <div id="g-organize-microthumb-panel"
ref="<?= url::site("organize/album/__ITEM_ID__/__OFFSET__") ?>">
- <ul id="gOrganizeMicroThumbGrid">
+ <ul id="g-organize-microthumb-grid">
<?= $micro_thumb_grid ?>
</ul>
</div>
- <div id="gOrganizeControls">
- <a id="gOrganizeClose" href="#" ref="done"
- class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+ <div id="g-organize-controls">
+ <a id="g-organize-close" href="#" ref="done"
+ class="g-button g-right ui-corner-all ui-state-default"><?= t("Close") ?></a>
<form>
<?= t("Sort order") ?>
- <?= form::dropdown(array("id" => "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?>
- <?= form::dropdown(array("id" => "gOrganizeSortOrder"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
+ <?= form::dropdown(array("id" => "g-organize-sort-column"), album::get_sort_order_options(), $album->sort_column) ?>
+ <?= form::dropdown(array("id" => "g-organize-sort-order"), array("ASC" => "Ascending", "DESC" => "Descending"), $album->sort_order) ?>
</form>
</div>
</div>
@@ -44,5 +42,5 @@
</div>
<script type="text/javascript">
- $("#gOrganize").ready($.organize.init);
+ $("#g-organize").ready($.organize.init);
</script>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index af7136fc..f28176de 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -1,20 +1,20 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<? foreach ($album->children(25, $offset) as $child): ?>
-<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) ?>
+<li class="g-organize-microthumb-grid-cell g-left" ref="<?= $child->id ?>">
+ <div id="g-organize-microthumb_<?= $child->id ?>"
+ class="g-organize-microthumb <?= $child->is_album() ? "g-album" : "g-photo" ?>">
+ <?= $child->thumb_img(array("class" => "g-thumbnail", "ref" => $child->id), 90, true) ?>
</div>
</li>
<? endforeach ?>
<? if ($album->children_count() > $offset): ?>
-<script>
+<script type="text/javascript">
setTimeout(function() {
$.get("<?= url::site("organize/album/$album->id/" . ($offset + 25)) ?>",
{},
function(data) {
- $("#gOrganizeMicroThumbGrid").append(data.grid);
+ $("#g-organize-microthumb-grid").append(data.grid);
$.organize.set_handlers();
},
"json");
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index e5d91c04..924a1bd6 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -1,9 +1,9 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $album) ? "" : "gViewOnly" ?>"
+<li class="g-organize-album ui-icon-left <?= access::can("edit", $album) ? "" : "g-view-only" ?>"
ref="<?= $album->id ?>">
<span class="ui-icon ui-icon-minus">
</span>
- <span class="gOrganizeAlbumText <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
+ <span class="g-organize-album-text <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
ref="<?= $album->id ?>">
<?= html::clean($album->title) ?>
</span>
@@ -12,11 +12,11 @@
<? if ($selected && $child->contains($selected)): ?>
<?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?>
<? else: ?>
- <li class="gOrganizeAlbum ui-icon-left <?= access::can("edit", $child) ? "" : "gViewOnly" ?>"
+ <li class="g-organize-album ui-icon-left <?= access::can("edit", $child) ? "" : "g-view-only" ?>"
ref="<?= $child->id ?>">
<span class="ui-icon ui-icon-plus">
</span>
- <span class="gOrganizeAlbumText" ref="<?= $child->id ?>">
+ <span class="g-organize-album-text" ref="<?= $child->id ?>">
<?= html::clean($child->title) ?>
</span>
</li>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-28 01:16:44 +0000