Issue #1200 : Minor design fixes

This commit is contained in:
Zacharie
2020-08-12 11:52:20 +02:00
committed by plegall
parent 4aac6fbe5f
commit cf4a861bdf
4 changed files with 13 additions and 12 deletions

View File

@@ -115,7 +115,6 @@ $template->set_filename('cat_move', 'cat_move.tpl');
$template->assign(
array(
'U_HELP' => get_root_url().'admin/popuphelp.php?page=cat_move',
'F_ACTION' => get_root_url().'admin.php?page=cat_move',
)
);

View File

@@ -34,10 +34,11 @@ $(document).ready(() => {
} else {
cont.append($(icon.replace(/%icon%/g, 'icon-folder-open')));
}
cont.append($(title.replace(/%name%/g, node.name)));
if (node.status == 'private') {
cont.append($(icon.replace(/%icon%/g, 'icon-lock')));
cont.find(".move-cat-title").addClass('icon-lock');
}
cont.append(actions);

View File

@@ -6,7 +6,7 @@ var str_hide_sub = "{'Hide sub-albums'|@translate}";
var str_manage_sub_album = "{'Manage sub-albums'|@translate}";
var str_apply_order = "{'Apply an automatic order to sub-albums'|@translate}";
var str_edit = "{'Edit album'|@translate}";
var str_are_you_sure = "{'Album \'%s\' status and his sub-albums will change to private. Are you sure ?'|@translate}";
var str_are_you_sure = "{'The status of the album \'%s\' and its sub-albums will change to private. Are you sure?'|@translate}";
var str_yes_change_parent = "{'Yes change parent anyway'|@translate}"
var str_no_change_parent = "{'No, don\'t move this album here'|@translate}"
var str_root = "{'Root'|@translate}"
@@ -26,14 +26,11 @@ var openCat = {$open_cat};
<h2>{'Move albums'|@translate}</h2>
</div>
<div class="waiting-message"> <i class='icon-spin6 animate-spin'> </i> {"Waiting for a response from Piwigo"|@translate}</div>
<div class="cat-move-order-popin">
<div class="order-popin-container">
<a class="close-popin icon-cancel" onClick="$('.cat-move-order-popin').fadeOut()"> </a>
<div class="popin-title"><span class="icon-sort-number-up icon-green"></span>{"Apply an automatic order"|@translate}</div>
<div class="album-name icon-flow-tree"></div>
<div class="popin-title"><span class="icon-sort-name-up icon-purple"></span>{"Apply an automatic order"|@translate}</div>
<div class="album-name icon-sitemap"></div>
<form action="{$F_ACTION}" method="post">
<input type="hidden" name="id" value="-1">
<div class="choice-container">

View File

@@ -2820,6 +2820,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: 600;
}
.move-cat-container .move-cat-toogler {
@@ -2829,6 +2830,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
align-items: center;
cursor: pointer;
z-index: 2;
font-weight: 600;
}
.move-cat-action-cont {
@@ -2897,8 +2899,10 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
}
.cat-move-order-popin .album-name {
font-size: 16px;
font-size: 14px;
color: #3C3C3C;
font-weight: 600;
text-align: center;
}
.cat-move-order-popin .choice-container {
@@ -2921,11 +2925,11 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
margin: 10px 0px;
}
.cat-move-order-popin input[name=recursive] {
.cat-move-order-popin input[name=recursiveAutoOrder] {
background-color: #d9d9d9;
}
.cat-move-order-popin input[name=recursive]:hover {
.cat-move-order-popin input[name=recursiveAutoOrder]:hover {
background-color: #ffc17e;
}