adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 08:33:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1200 : Add "Move Album" link in direct menu of albums, remove it from "Album List" tabsheet, design fixes

Browse Source
This commit is contained in:
Zacharie
2020-08-03 15:27:36 +02:00
committed by plegall
parent 74447192b0
commit 1dff9fa9b7
8 changed files with 31 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin.php
+1
View File
@@ -181,6 +181,7 @@ $template->assign(
'U_CONFIG_LANGUAGES' => $link_start.'languages',
'U_CONFIG_THEMES'=> $link_start.'themes',
'U_CATEGORIES'=> $link_start.'cat_list',
'U_CAT_MOVE'=> $link_start.'cat_move',
'U_CAT_OPTIONS'=> $link_start.'cat_options',
'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
'U_RATING'=> $link_start.'rating',
admin/cat_move.php
-7
View File
@@ -119,13 +119,6 @@ $template->assign(
'F_ACTION' => get_root_url().'admin.php?page=cat_move',
)
);
// +-----------------------------------------------------------------------+
// | tabs |
// +-----------------------------------------------------------------------+
$page['tab'] = 'move';
include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php');
// +-----------------------------------------------------------------------+
// | Album display |
admin/include/add_core_tabs.inc.php
-1
View File
@@ -32,7 +32,6 @@ function add_core_tabs($sheets, $tab_id)
case 'albums':
global $my_base_url;
$sheets['list'] = array('caption' => '<span class="icon-menu"></span>'.l10n('List'), 'url' => $my_base_url.'cat_list');
$sheets['move'] = array('caption' => '<span class="icon-move"></span>'.l10n('Move'), 'url' => $my_base_url.'cat_move');
$sheets['permalinks'] = array('caption' => '<span class="icon-link-1"></span>'.l10n('Permalinks'), 'url' => $my_base_url.'permalinks');
break;
admin/themes/default/template/admin.tpl
+1
View File
@@ -71,6 +71,7 @@ jQuery(document).ready(function() {
<dd>
<ul>
<li><a href="{$U_CATEGORIES}"><i class="icon-folder-open"></i>{'Manage'|@translate}</a></li>
<li><a href="{$U_CAT_MOVE}"><i class="icon-move"></i>{'Move'|@translate}</a></li>
<li><a href="{$U_CAT_OPTIONS}"><i class="icon-pencil"></i>{'Properties'|@translate}</a></li>
</ul>
</dd>
admin/themes/default/template/cat_move.tpl
+18 -18
View File
@@ -36,40 +36,40 @@ var openCat = {$open_cat};
<form action="{$F_ACTION}" method="post">
<input type="hidden" name="id" value="-1">
<div class="choice-container">
<label>
{'Album name, A &rarr; Z'|@translate}
<label class="font-checkbox">
<span class="icon-dot-circled"> </span>
<input type="radio" value="name ASC" name="order" checked>
<span class="order-checkmark">
{'Album name, A &rarr; Z'|@translate}
</label>
<label>
{'Album name, Z &rarr; A'|@translate}
<label class="font-checkbox">
<span class="icon-dot-circled"> </span>
<input type="radio" value="name DESC" name="order">
<span class="order-checkmark">
{'Album name, Z &rarr; A'|@translate}
</label>
<label>
{'Date created, new &rarr; old'|@translate}
<label class="font-checkbox">
<span class="icon-dot-circled"> </span>
<input type="radio" value="date_creation DESC" name="order">
<span class="order-checkmark">
{'Date created, new &rarr; old'|@translate}
</label>
<label>
{'Date created, old &rarr; new'|@translate}
<label class="font-checkbox">
<span class="icon-dot-circled"> </span>
<input type="radio" value="date_creation ASC" name="order">
<span class="order-checkmark">
{'Date created, old &rarr; new'|@translate}
</label>
<label>
{'Date posted, new &rarr; old'|@translate}
<label class="font-checkbox">
<span class="icon-dot-circled"> </span>
<input type="radio" value="date_available DESC" name="order">
<span class="order-checkmark">
{'Date posted, new &rarr; old'|@translate}
</label>
<label>
{'Date posted, old &rarr; new'|@translate}
<label class="font-checkbox">
<span class="icon-dot-circled"> </span>
<input type="radio" value="date_available ASC" name="order">
<span class="order-checkmark">
{'Date posted, old &rarr; new'|@translate}
</label>
</div>
<input type="submit" name="simpleAutoOrder" value="{'Apply to direct sub-albums'|@translate}"/>
admin/themes/default/template/intro.tpl
+1
View File
@@ -194,6 +194,7 @@ $(window).on('resize', function(){
{elseif $action == "Delete"} <span class="icon-trash tooltip-detail" title="{"%s deletions"|@translate:$number}">{$number}</span>
{elseif $action == "Login"} <span class="icon-key tooltip-detail" title="{"%s login"|@translate:$number}">{$number}</span>
{elseif $action == "Logout"} <span class="icon-logout tooltip-detail" title="{"%s logout"|@translate:$number}">{$number} </span>
{elseif $action == "Move"} <span class="icon-move tooltip-detail" title="{"%s movement"|@translate:$number}">{$number} </span>
{else} <span> ({$action|@translate}) {$number} </span>
{/if}
{/foreach}
admin/themes/default/theme.css
+1 -35
View File
@@ -2887,7 +2887,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
background-color: #f3f3f3;
border-radius: 10px;
display: block;
width: 30%;
width: 25%;
position: absolute;
left: 50%;
top: 50%;
@@ -2910,40 +2910,6 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
.cat-move-order-popin label {
position: relative;
padding: 5px;
padding-left: 25px;
}
.cat-move-order-popin .order-checkmark {
width:16px;
height: 16px;
border-radius: 100%;
background-color: #d5d5d5;
position: absolute;
top: 50%;
left: 0px;
transform: translate(0, -50%);
transition: ease 0.3s;
}
.cat-move-order-popin .order-checkmark::before {
content: "";
padding: 0px;
background-color: #ffa646;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
border-radius: 100%;
transition: ease 0.3s;
opacity: 0.15;
}
.cat-move-order-popin input:checked + .order-checkmark::before {
padding: 15px;
}
.cat-move-order-popin input:checked + .order-checkmark {
background-color: #ffa646;
}
.cat-move-order-popin input[type=radio] {
admin/themes/roma/theme.css
+9
View File
@@ -1035,6 +1035,15 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
box-shadow: none;
}
.cat-move-order-popin .order-popin-container {
background-color: #444;
color: white;
}
.cat-move-order-popin .album-name {
color: white;
}
/* Icon colors*/
.icon-red {