summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/views/admin_maintenance.html.php20
-rw-r--r--modules/gallery/views/admin_maintenance_task.html.php1
-rw-r--r--modules/organize/css/organize.css53
-rw-r--r--modules/organize/js/organize.js15
-rw-r--r--modules/organize/views/organize_tree.html.php4
5 files changed, 49 insertions, 44 deletions
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 05bc0923..4bca8653 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -22,7 +22,7 @@
<? $i = 0; ?>
<? foreach ($task_definitions as $task): ?>
<tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
- <td>
+ <td class="<?= log::severity_class($task->severity) ?>">
<?= $task->name ?>
</td>
<td>
@@ -42,10 +42,6 @@
<? if ($running_tasks->count()): ?>
<div id="gRunningTasks">
- <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
- class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
- <?= t("cancel all") ?></a>
-
<h2> <?= t("Running Tasks") ?> </h2>
<table>
<tr>
@@ -66,12 +62,15 @@
</th>
<th>
<?= t("Action") ?>
+ <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
+ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+ <?= t("cancel all") ?></a>
</th>
</tr>
<? $i = 0; ?>
<? foreach ($running_tasks as $task): ?>
<tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
- <td>
+ <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
<?= gallery::date_time($task->updated) ?>
</td>
<td>
@@ -116,10 +115,6 @@
<? if ($finished_tasks->count()): ?>
<div id="gFinishedTasks">
- <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
- class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
- <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
-
<h2> <?= t("Finished Tasks") ?> </h2>
<table>
<tr>
@@ -140,12 +135,15 @@
</th>
<th>
<?= t("Action") ?>
+ <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+ <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
</th>
</tr>
<? $i = 0; ?>
<? foreach ($finished_tasks as $task): ?>
<tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
- <td>
+ <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
<?= gallery::date_time($task->updated) ?>
</td>
<td>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 509e87b5..0f33d508 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -23,6 +23,7 @@
animation = null;
delta = 1;
}
+ $.fn.gallery_hover_init();
}
update = function() {
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 4a65d20e..15b5538d 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -1,6 +1,6 @@
/*******************************************************************
- * Dialog wide stylings
+ * Dialog wide styles
*/
#gOrganize {
overflow: hidden;
@@ -18,7 +18,7 @@
width: 25%;
}
-#gOrganize .yui-gf #gMessage {
+#gMessage {
margin-bottom: .4em;
width: 75%;
white-space: nowrap;
@@ -34,7 +34,7 @@
}
/*******************************************************************
- * Album Tree styling
+ * Album Tree styles
*/
#gOrganizeTreeContainer {
height: 100%;
@@ -43,20 +43,14 @@
padding: 0 !important;
}
-#gOrganizeTreeContainer ul ul li {
- padding-left: 1.2em;
-}
-
-.gOrganizeAlbumText:hover {
- border: 1px dashed #999;
- padding: 1px;
+#gOrganizeAlbumTree .selected {
+ background-color: #cfdeff;
+ border-bottom: 1px solid #999;
+ margin-right: 0px;
}
-#gOrganizeAlbumTree .selected {
- background-color: #cfdeff !important;
- border-bottom: 1px solid #999 !important;
- display: block;
- padding: .3em 0;
+#gOrganizeAlbumTree ul li {
+ padding-left: 1.2em;
}
.gOrganizeAlbum span {
@@ -66,15 +60,22 @@
.gOrganizeAlbumText {
cursor: pointer;
width: auto;
+ margin: 2px 0px 1px 2px;
+ display: block;
}
+
+.gOrganizeAlbumText:hover {
+ background: #eee;
+}
+
/*******************************************************************
- * Album Panel Styles
+ * Album panel styles
*/
#gOrganizeMicroThumbPanel {
margin: 0 !important;
padding: 0 !important;
background-color: #cfdeff;
- border: 1px solid #999 !important;
+ border: 1px solid #999;
border-top: none !important;
border-left: none !important;
overflow-x: hidden;
@@ -89,9 +90,9 @@
float: left;
font-size: 0.8em;
padding: .5em !important;
- opacity: .5;
border-left: 1px hidden #13A;
border-right: 1px hidden #13A;
+ margin: 4px;
}
.gOrganizeMicroThumb {
@@ -102,28 +103,32 @@
}
.gOrganizeMicroThumbGridCell.ui-state-selected {
- opacity: 1;
+ margin: 2px;
+ border: 2px solid #13A;
}
.ui-selectable-lasso {
z-index: 2000 !important;
- border: 1px dashed #13A;
+ border: 1px dashed #00F;
+ opacity: 0.25;
+ background: #13A;
}
.gThumbnail {
padding: .5em;
}
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid .gAlbum {
+#gOrganizeMicroThumbGrid .gAlbum {
background-color: #e8e8e8;
}
-#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid :hover {
- opacity: 1;
+.gOrganizeMicroThumbGridCell:hover {
+ margin: 2px;
+ border: 2px solid #13A;
}
/****************************************************************
- * Organize Controls styling
+ * Controls styles
*/
#gOrganizeControls {
padding-left: 8px;
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index edafae61..d4449b38 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -94,7 +94,9 @@
if (source_ids.length) {
$.post(options.url,
{ "source_ids[]": source_ids },
- function(data) { $.organize._refresh(data); },
+ function(data) {
+ $.organize._refresh(data);
+ },
"json");
}
},
@@ -152,11 +154,12 @@
},
set_handlers: function() {
- $("#gOrganizeMicroThumbPanel").selectable({filter: ".gOrganizeMicroThumbGridCell"});
- $("#gOrganizeMicroThumbPanel").droppable($.organize.content_droppable);
-
- $(".gOrganizeMicroThumbGridCell").draggable($.organize.micro_thumb_draggable);
- $(".gOrganizeMicroThumbGridCell").mousemove($.organize.mouse_move_handler);
+ $("#gOrganizeMicroThumbPanel")
+ .selectable({filter: ".gOrganizeMicroThumbGridCell"})
+ .droppable($.organize.content_droppable);
+ $(".gOrganizeMicroThumbGridCell")
+ .draggable($.organize.micro_thumb_draggable)
+ .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);
diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php
index 50c202b0..c0c23f94 100644
--- a/modules/organize/views/organize_tree.html.php
+++ b/modules/organize/views/organize_tree.html.php
@@ -3,9 +3,7 @@
ref="<?= $album->id ?>">
<span class="ui-icon ui-icon-minus">
</span>
- <span class="gOrganizeAlbumText
- <?= $selected && $album->id == $selected->id ? "selected" : "" ?>
- "
+ <span class="gOrganizeAlbumText <?= $selected && $album->id == $selected->id ? "selected" : "" ?>"
ref="<?= $album->id ?>">
<?= html::clean($album->title) ?>
</span>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 11:33:48 +0000