adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 19:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1167 : Implement group merge function

Browse Source 
* Implement new API function pwg.groups.merge
 * Generalize the delete group function in admin/include/functions.php
 * Implement merge action in Group Manager
 * Add loading state on grouped delete in group manager
 * Member manager's design fixes
This commit is contained in:
Zacharie
2020-05-13 16:57:52 +02:00
committed by plegall
parent 1d3c08616b
commit df46475e1b
8 changed files with 402 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/theme.css
+44 -1
View File
@@ -2044,6 +2044,35 @@ input:checked + .slider:before {
font-size: 13px;
}
.groupDeleteConfirm, .groupDeleteAlert {
padding-bottom: 0 !important;
color: #3c3c3c !important;
line-height: 28px !important;
}
.groupDeleteConfirm ~ .jconfirm-content-pane, .groupDeleteAlert ~ .jconfirm-content-pane {
height: 0px !important;
margin: 0px !important;
}
.groupDeleteConfirm ~ .jconfirm-buttons button {
text-transform: none !important;
}
.groupDeleteAlert .jconfirm-icon-c i {
color: #0a0 !important;
background-color:#c2f5c2 !important;
border-radius: 20px;
padding: 5px 3px;
border-radius: 60px;
padding: 2px;
font-size: 45px;
}
.groupDeleteAlert .jconfirm-icon-c {
margin-bottom: 20px !important;
}
/*Group checkbox*/
.Group-checkbox{
@@ -2421,7 +2450,7 @@ input:checked + .slider:before {
display:inline-block;
font-size:12px;
text-align:left;
padding:2px;
padding: 4px 6px;
border-radius:10px;
margin-left:-5px;
margin-right:10px;
@@ -2431,6 +2460,20 @@ input:checked + .slider:before {
margin:0;
}
.ValidationUserDissociated{
display:inline-block;
text-align:left;
padding: 6px;
border-radius: 30px;
margin-left: 8px;
}
.ValidationUserDissociated p{
margin:0 !important;
font-size:12px !important;
font-weight: 500 !important;
}
#UserList .FilterUserBlock .AmountOfUsersShown {
display:inline-block;