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(){
@@ -42,7 +42,7 @@ jQuery(document).ready(function(){
{'Edit'|@translate} - {'sub-albums'|@translate} + {'sub-albums'|@translate} {if cat_admin_access($category.ID)} {'Visit Gallery'|@translate} {else} diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl index e631dab3b..76ab37a94 100644 --- a/admin/themes/default/template/cat_modify.tpl +++ b/admin/themes/default/template/cat_modify.tpl @@ -45,7 +45,7 @@ jQuery(document).ready(function() { success:function(data) { var data = jQuery.parseJSON(data); if (data.stat == 'ok') { - console.log('plouk'); + jQuery(".deleteRepresentative").show(); jQuery(".albumThumbailImage, .albumThumbnailRandom").on('load', function () { cropImage(); @@ -55,9 +55,6 @@ jQuery(document).ready(function() { .attr('src', data.result.src) .end().show(); - - jQuery(".albumThumbnailEdit") - .attr('href', data.result.url) jQuery(".albumThumbnailRandom").hide(); } else { @@ -85,12 +82,9 @@ jQuery(document).ready(function() { success:function(data) { var data = jQuery.parseJSON(data); if (data.stat == 'ok') { + jQuery(".deleteRepresentative").hide(); jQuery(".albumThumbnailImage").hide(); - if (jQuery(".albumThumbnailActions").data('random_allowed') == '') { - jQuery(".deleteRepresentative").hide(); - } else { - jQuery(".albumThumbnailRandom").show(); - } + jQuery(".albumThumbnailRandom").show(); } else { alert("error on "+method); @@ -196,7 +190,7 @@ function cropImage() {
-

{'Edit album'|@translate} #{$CAT_ID} {$CATEGORIES_NAV}

+

{'Edit album'|@translate} #{$CAT_ID} {$CATEGORIES_NAV}

@@ -208,27 +202,28 @@ function cropImage() {
- {if isset($representant) } +
+ {if isset($representant) } - {'Random photo'|@translate} +
{if $representant.ALLOW_SET_RANDOM } - {'Refresh'|@translate} + {'Refresh thumbnail'|@translate} {/if} - {if isset($representant.ALLOW_DELETE) } - {'Delete'|translate} + {if isset($representant.ALLOW_DELETE)} + {'Remove thumbnail'|translate} {/if} - {'Edit photo'|@translate}
+ {else} +
+ {/if}
-
- {/if}
@@ -242,7 +237,9 @@ function cropImage() { {if isset($INFO_DIRECT_SUB)} {$INFO_DIRECT_SUB} {/if} - {$INFO_ID} + {if isset($U_SYNC) } + {'Directory'|@translate} : {$CAT_FULL_DIR} + {/if}
@@ -262,7 +259,7 @@ function cropImage() { {'manage sub-albums'|@translate} {if isset($U_SYNC) } - {'Synchronize'|@translate} ({'Directory'|@translate} = {$CAT_FULL_DIR}) + {'Synchronize'|@translate} {/if} {if isset($U_DELETE) } @@ -274,19 +271,22 @@ function cropImage() {
- {'Publication'|@translate} + + {'Publication'|@translate} + +
- {'Unlock'|@translate} + {'Unlocked'|@translate} - {'Lock'|@translate} + {'Locked'|@translate}
{if isset($CAT_COMMENTABLE)}
- {'Comments'|@translate} + {'Comments'|@translate}
{'Forbidden'|@translate}
diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl index 78132c2dd..726218202 100644 --- a/admin/themes/default/template/cat_move.tpl +++ b/admin/themes/default/template/cat_move.tpl @@ -78,7 +78,7 @@ var openCat = {$open_cat};
\ No newline at end of file diff --git a/admin/themes/default/template/plugins_installed.tpl b/admin/themes/default/template/plugins_installed.tpl index 1485de6fb..680ca2748 100644 --- a/admin/themes/default/template/plugins_installed.tpl +++ b/admin/themes/default/template/plugins_installed.tpl @@ -146,7 +146,6 @@ jQuery(document).ready(function() { } searchNumber += searchNumberInBox; }); - console.log(searchNumber); if (searchNumber == 0) { jQuery(".emptyResearch").fadeIn(); } else { diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 1f0200699..4bf3acf38 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -194,8 +194,10 @@ TABLE.languages TR TD { padding: 7px 20px; } .albumInfos { text-align: center; - color: #aaa; font-weight: 600; + font-size: 14px; + margin-top: 10px; + display: block; } .albumInfos p { @@ -297,6 +299,11 @@ TABLE.languages TR TD { padding: 7px 20px; } display: inline-block; width: 159px; margin-top: 20px; + font-size: 15px; +} + +.addAlbum form input::placeholder { + color: rgb(206, 206, 206); } .addAlbum button, .addAlbum a { @@ -368,13 +375,27 @@ LI.menuLi { padding-top: 100%; } -#catHeader .albumThumbailImage, #catHeader .albumThumbnailRandom, #catHeader .albumThumbnailActions, #catHeader .albumThumbnailActionContainer{ +#catHeader .albumThumbailImage, #catHeader .albumThumbnailRandom, #catHeader .albumThumbnailActions, #catHeader .albumThumbnailActionContainer, #catHeader .albumThumbnailNoPhoto{ position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); } +#catHeader .albumThumbnailRandom, #catHeader .albumThumbnailNoPhoto { + height: 100%; + width: 100%; + background-color: #fafafa; + display: flex; + justify-content: center; + align-items: center; +} + +#catHeader .albumThumbnailRandom span, #catHeader .albumThumbnailNoPhoto span { + font-size: 100px; + opacity: 0.4; +} + #catHeader .albumThumbnailActions { width: 101%; height: 100%; @@ -398,6 +419,7 @@ LI.menuLi { white-space: nowrap; font-weight: bold; color: #3C3C3C; + text-align: center; } #catHeader .albumThumbnailActions a:hover { @@ -413,6 +435,7 @@ LI.menuLi { #catHeader .catInfo { display: flex; justify-content: center; + padding: 10px } #catHeader .catInfo .container{ @@ -3012,7 +3035,6 @@ FORM#categoryOrdering p.albumActions a { padding-top: 22px; } -.albumInfos { font-size: 12px; } .actionTitle span {text-transform: capitalize;} FORM#categoryOrdering p.albumActions a:hover {text-decoration: none;} @@ -3050,6 +3072,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} .tree { margin: 20px; + padding-top: 1px; } .move-cat-container { @@ -3060,17 +3083,17 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} border-radius: 5px; color: #777; padding: 5px 10px; - padding-left: 20px; + padding-left: 28px; } .move-cat-container .icon-grip-vertical-solid { font-size: 16px; opacity: 0.5; position: absolute; - left: 0px; + left: 6px; } -.move-cat-container .icon-folder-open, .move-cat-container .icon-flow-tree { +.move-cat-container .icon-folder-open, .move-cat-container .icon-sitemap { display: inline-block; border-radius: 50%; font-size: 20px; @@ -3103,6 +3126,10 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} font-weight: 600; } +.move-cat-container .move-cat-toogler .icon-left-open{ + transform: rotate(90deg); +} + .move-cat-action-cont { display: none; position: absolute;