diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index bdcc4eeb1..ecf07a680 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -327,7 +327,7 @@ p.albumTitle img {margin-bottom:-3px;} .groups .GroupContainer, .groups .showCreateGroup, .groups .addGroupFormBlock{ - box-shadow: 0px 0px 5px #acacac; + box-shadow: 0px 2px 5px #00000024; } .groups #addGroupForm:hover #addGroup, @@ -648,7 +648,6 @@ table.dataTable thead th, table.dataTable.no-footer { FORM#categoryOrdering p.albumTitle a { color: #5B5B5B; } FORM#categoryOrdering p.albumActions a { border-left:1px solid #D6D6D6; background-color: #E8E8E8;} -.albumInfos {color: #999999;} FORM#categoryOrdering p.albumActions a:hover {background-color: #FFA844; color: #3A3A3A;} FORM#categoryOrdering p.albumActions .userSeparator {border: 1px solid #E1E1E1;} #addAlbumOpen, #autoOrderOpen {border: 1px solid #D6D6D6; color: #5B5B5B;} @@ -742,7 +741,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; } .albumInfos { - color: #aaa; + color: #d5d5d5; } .albumActions a { @@ -750,7 +749,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; } .albumActions a:hover { - color: #3c3c3c; + color: #FFA646; text-decoration: none; } diff --git a/admin/themes/default/js/cat_move.js b/admin/themes/default/js/cat_move.js index de95be019..f60914c28 100644 --- a/admin/themes/default/js/cat_move.js +++ b/admin/themes/default/js/cat_move.js @@ -30,7 +30,7 @@ $(document).ready(() => { cont.append($(icon.replace(/%icon%/g, 'icon-grip-vertical-solid'))); if (node.children.length != 0) { - cont.append($(icon.replace(/%icon%/g, 'icon-flow-tree'))); + cont.append($(icon.replace(/%icon%/g, 'icon-sitemap'))); } else { cont.append($(icon.replace(/%icon%/g, 'icon-folder-open'))); } @@ -59,7 +59,7 @@ $(document).ready(() => { var colors = ["icon-red", "icon-blue", "icon-yellow", "icon-purple", "icon-green"]; var colorId = Number(node.id)%5; - cont.find(".icon-folder-open, .icon-flow-tree").addClass(colors[colorId]); + cont.find(".icon-folder-open, .icon-sitemap").addClass(colors[colorId]); } $('.tree').on( 'click', '.move-cat-toogler', function(e) { @@ -134,7 +134,6 @@ $(document).ready(() => { $('.tree').on( 'click', '.move-cat-order', function(e) { var node_id = $(this).attr('data-id'); var node = $('.tree').tree('getNodeById', node_id); - console.log(node); if (node) { $('.cat-move-order-popin').fadeIn(); $('.cat-move-order-popin .album-name').html(getPathNode(node)); @@ -200,7 +199,9 @@ function applyMove(event) { moveParent = getId(target); } moveRank = 1; - } + } else if (event.move_info.position == 'before') { + moveRank = 1; + } moveNode(id, moveRank, moveParent).then(() => { event.move_info.do_move(); clearTimeout(waitingTimeout); diff --git a/admin/themes/default/js/tags.js b/admin/themes/default/js/tags.js index b18f55dea..b78af304c 100644 --- a/admin/themes/default/js/tags.js +++ b/admin/themes/default/js/tags.js @@ -302,8 +302,6 @@ function removeTag(id, name) { } function renameTag(id, new_name) { - console.log('problème'); - return new Promise((resolve, reject) => { jQuery.ajax({ url: "ws.php?format=json&method=pwg.tags.rename", diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl index 8011aafc6..8faff9dea 100644 --- a/admin/themes/default/template/cat_list.tpl +++ b/admin/themes/default/template/cat_list.tpl @@ -30,7 +30,7 @@ jQuery(document).ready(function(){