mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
PHRAS-3084
This commit is contained in:
Harrys Ravalomanana
@@ -189,6 +189,31 @@ $mainMenuLinkBackgroundHoverColor: transparent;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.select-all-line {
|
||||
color: #afafaf;
|
||||
cursor: pointer;
|
||||
}
|
||||
.users_check_line_wrap {
|
||||
position: absolute;
|
||||
div {
|
||||
padding: 5px 10px;
|
||||
background-color: #cccccc;
|
||||
color: #000000;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
padding: 5px 10px;
|
||||
background-color: #4d4d4d;
|
||||
color: #ffffff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.fa-right {
|
||||
color: #2475b5;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
/******* EDIT USERS ***********************************************************/
|
||||
div.no_switch {
|
||||
width: 12px;
|
||||
@@ -211,7 +236,7 @@ div.switch_quota.mixed,
|
||||
div.switch_masks.mixed,
|
||||
div.switch_time.mixed,
|
||||
div.switch_right.mixed {
|
||||
background-image: url('#{$iconsPath}ccoch2.gif');
|
||||
background-image: url('#{$iconsPath}square-duotone.svg');
|
||||
background-repeat: no-repeat;
|
||||
background-position: center center;
|
||||
}
|
||||
@@ -219,7 +244,7 @@ div.switch_quota.checked,
|
||||
div.switch_masks.checked,
|
||||
div.switch_time.checked,
|
||||
div.switch_right.checked {
|
||||
background-image: url('#{$iconsPath}ccoch1.gif');
|
||||
background-image: url('#{$iconsPath}check-square-regular.svg');
|
||||
background-repeat: no-repeat;
|
||||
background-position: center center;
|
||||
}
|
||||
@@ -227,7 +252,7 @@ div.switch_quota.unchecked,
|
||||
div.switch_masks.unchecked,
|
||||
div.switch_time.unchecked,
|
||||
div.switch_right.unchecked {
|
||||
background-image: url('#{$iconsPath}ccoch0.gif');
|
||||
background-image: url('#{$iconsPath}square-regular.svg');
|
||||
background-repeat: no-repeat;
|
||||
background-position: center center;
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="check-square" class="svg-inline--fa fa-check-square fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M400 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h352c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zm0 400H48V80h352v352zm-35.864-241.724L191.547 361.48c-4.705 4.667-12.303 4.637-16.97-.068l-90.781-91.516c-4.667-4.705-4.637-12.303.069-16.971l22.719-22.536c4.705-4.667 12.303-4.637 16.97.069l59.792 60.277 141.352-140.216c4.705-4.667 12.303-4.637 16.97.068l22.536 22.718c4.667 4.706 4.637 12.304-.068 16.971z"></path></svg>
|
||||
|
After Width: | Height: | Size: 664 B |
1
resources/www/common/images/icons/square-duotone.svg
Normal file
1
resources/www/common/images/icons/square-duotone.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg aria-hidden="true" focusable="false" data-prefix="fa" data-icon="square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" class="svg-inline--fa fa-square fa-w-14 fa-2x"><g class="fa-group"><path fill="currentColor" d="M400 32H48A48 48 0 0 0 0 80v352a48 48 0 0 0 48 48h352a48 48 0 0 0 48-48V80a48 48 0 0 0-48-48zm-16 368a16 16 0 0 1-16 16H80a16 16 0 0 1-16-16V112a16 16 0 0 1 16-16h288a16 16 0 0 1 16 16z" class="fa-secondary"></path><path fill="currentColor" d="M64 400V112a16 16 0 0 1 16-16h288a16 16 0 0 1 16 16v288a16 16 0 0 1-16 16H80a16 16 0 0 1-16-16z" class="fa-primary"></path></g></svg>
|
||||
|
After Width: | Height: | Size: 619 B |
1
resources/www/common/images/icons/square-regular.svg
Normal file
1
resources/www/common/images/icons/square-regular.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="square" class="svg-inline--fa fa-square fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-6 400H54c-3.3 0-6-2.7-6-6V86c0-3.3 2.7-6 6-6h340c3.3 0 6 2.7 6 6v340c0 3.3-2.7 6-6 6z"></path></svg>
|
||||
|
After Width: | Height: | Size: 424 B |
@@ -61,24 +61,6 @@
|
||||
div.no_switch{
|
||||
background-image:url(/assets/common/images/icons/ccoch5.gif);
|
||||
}
|
||||
div.switch_quota.mixed,
|
||||
div.switch_masks.mixed,
|
||||
div.switch_time.mixed,
|
||||
div.switch_right.mixed{
|
||||
background-image:url(/assets/common/images/icons/ccoch2.gif);
|
||||
}
|
||||
div.switch_quota.checked,
|
||||
div.switch_masks.checked,
|
||||
div.switch_time.checked,
|
||||
div.switch_right.checked{
|
||||
background-image:url(/assets/common/images/icons/ccoch1.gif);
|
||||
}
|
||||
div.switch_quota.unchecked,
|
||||
div.switch_masks.unchecked,
|
||||
div.switch_time.unchecked,
|
||||
div.switch_right.unchecked{
|
||||
background-image:url(/assets/common/images/icons/ccoch0.gif);
|
||||
}
|
||||
td.users_col{
|
||||
vertical-align:middle;
|
||||
text-align:center;
|
||||
@@ -188,49 +170,49 @@
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_access"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_actif"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_canputinalbum"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_candwnldpreview"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_nowatermark"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_candwnldhd"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_cancmd"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
@@ -252,70 +234,70 @@
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_canaddrecord"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_canmodifrecord"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_chgstatus"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_candeleterecord"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_imgtools"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_canadmin"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_canreport"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_canpush"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_manage"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
</td>
|
||||
<td class="users_col options">
|
||||
<div>
|
||||
▼
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
<input type="hidden" name="right" value="right_modify_struct"/>
|
||||
<input type="hidden" name="sbas_id" value="{{rights['sbas_id']}}"/>
|
||||
</div>
|
||||
@@ -333,35 +315,32 @@
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::BAS_MODIFY_STRUCT'), users, 'sbas')}}
|
||||
</td>
|
||||
<td style="text-align:center;width:48px;">
|
||||
<span class="select-all-bdd-right btn btn-primary btn-small">
|
||||
{{ 'admin::users:edit:select all having rights' | trans }}
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr class="right-items" style="line-height: 40px;">
|
||||
<td style="overflow:hidden;white-space:nowrap;">
|
||||
<td style="overflow:hidden;white-space:nowrap;" title="{{rights['base_id']|bas_labels(app)}}">
|
||||
{{rights['base_id']|bas_labels(app)}}
|
||||
</td>
|
||||
<td class="users_col case_right_access" title="{{ 'Access' | trans }}">
|
||||
<td class="users_col case_right_access left-right" title="{{ 'Access' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::ACCESS'), users, 'base')}}
|
||||
</td>
|
||||
<td class="users_col case_right_actif" title="{{ 'Active' | trans }}">
|
||||
<td class="users_col case_right_actif left-right" title="{{ 'Active' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::ACTIF'), users, 'base')}}
|
||||
</td>
|
||||
<td class="users_col case_right_canputinalbum" title="{{ 'Allowed to add in basket' | trans }}">
|
||||
<td class="users_col case_right_canputinalbum left-right" title="{{ 'Allowed to add in basket' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANPUTINALBUM'), users, 'base')}}
|
||||
</td>
|
||||
<td class="users_col case_right_candwnldpreview" title="{{ 'Access to preview' | trans }}">
|
||||
<td class="users_col case_right_candwnldpreview left-right" title="{{ 'Access to preview' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANDWNLDPREVIEW'), users, 'base')}}
|
||||
</td>
|
||||
<td class="users_col case_right_nowatermark" title="{{ 'Remove watermark' | trans }}">
|
||||
<td class="users_col case_right_nowatermark left-right" title="{{ 'Remove watermark' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::NOWATERMARK'), users, 'base')}}
|
||||
</td>
|
||||
<td class="users_col case_right_candwnldhd" title="{{ 'Access to HD' | trans }}">
|
||||
<td class="users_col case_right_candwnldhd left-right" title="{{ 'Access to HD' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANDWNLDHD'), users, 'base')}}
|
||||
</td>
|
||||
<td class="users_col case_right_cancmd" title="{{ 'Allowed to order' | trans }}">
|
||||
<td class="users_col case_right_cancmd left-right" title="{{ 'Allowed to order' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::CANCMD'), users, 'base')}}
|
||||
</td>
|
||||
<td class="users_col case_right_quota" title="{{ 'Set download quotas' | trans }}">
|
||||
@@ -427,13 +406,15 @@
|
||||
<td class="users_col case_right_modify" title="{{ 'Manage values lists' | trans }}">
|
||||
{{_self.format_checkbox(app.getAuthenticatedUser(), rights, constant('\\ACL::COLL_MODIFY_STRUCT'), users, 'base')}}
|
||||
</td>
|
||||
<td colspan="5">
|
||||
<span class="select-all-bdd btn btn-success btn-small">
|
||||
{{ 'admin::users:edit:select all ' | trans }}
|
||||
</span>
|
||||
<span class=" btn btn-danger btn-small unselect-all-bdd hide">
|
||||
{{ 'admin::users:edit:unselect all ' | trans }}
|
||||
</span>
|
||||
|
||||
<td class="select-all-line" colspan="5" title="{{'admin::users:edit: Manage inline selection' | trans }}">
|
||||
<div class="select-all-line-btn">
|
||||
<i class="fa fa-caret-down fa-right"></i>
|
||||
</div>
|
||||
<div class="users_check_line_wrap hide">
|
||||
<div class="checker check_left_right">{{'admin::users:edit: check read right' | trans }}</div>
|
||||
<div class="unchecker check-all_right">{{'admin::users:edit: check all right' | trans }}</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
@@ -1109,35 +1090,30 @@
|
||||
}
|
||||
});
|
||||
|
||||
$('.select-all-bdd-right').click(function () {
|
||||
$('.main-right-item > div').removeClass('unchecked').addClass('checked');
|
||||
$('.main-right-item > div > input').val(1);
|
||||
|
||||
$('body').click(function() {
|
||||
$('.users_check_line_wrap').addClass('hide');
|
||||
});
|
||||
$('.select-all-line-btn').click(function (event) {
|
||||
event.stopPropagation();
|
||||
var top = $(this).offset().top - 50;
|
||||
var left = $(this).offset().left + 60;
|
||||
$('.users_check_line_wrap').addClass('hide');
|
||||
$(this).closest('.select-all-line').find('.users_check_line_wrap').removeClass('hide').css('top', +top+'px');
|
||||
|
||||
});
|
||||
$('.check_left_right').click(function () {
|
||||
$(this).closest('.right-items').find('.left-right div').show().removeClass('unchecked').addClass('checked');
|
||||
$(this).closest('.right-items').find('.left-right input').val(1);
|
||||
$('.users_check_line_wrap').addClass('hide');
|
||||
});
|
||||
|
||||
$('.select-all-bdd').click(function () {
|
||||
$('.check-all_right').click(function () {
|
||||
$(this).closest('.right-items').find('div').show().removeClass('unchecked').addClass('checked');
|
||||
$(this).closest('.right-items').find('input').val(1);
|
||||
$(this).closest('.right-items').find('.unselect-all-bdd').removeClass('hide');
|
||||
$(this).addClass('hide');
|
||||
});
|
||||
$('.unselect-all-bdd').click(function () {
|
||||
$(this).closest('.right-items').find('div').hide().addClass('unchecked').remove('checked');
|
||||
$(this).closest('.right-items').find('.case_right_access div').show();
|
||||
$(this).closest('.right-items').find('input').val(0);
|
||||
$(this).closest('.right-items').find('.select-all-bdd').removeClass('hide');
|
||||
$(this).addClass('hide');
|
||||
$('.users_check_line_wrap').addClass('hide');
|
||||
});
|
||||
|
||||
function countCheckedRight() {
|
||||
$(".right-items" ).each(function() {
|
||||
let count_checked = $( this ).find('input.checked').length;
|
||||
if ( count_checked == 17) {
|
||||
$(this).find('.select-all-bdd').addClass('hide');
|
||||
$(this).find('.unselect-all-bdd').removeClass('hide');
|
||||
}
|
||||
});
|
||||
};
|
||||
countCheckedRight();
|
||||
});
|
||||
|
||||
require([
|
||||
|
||||
@@ -42,6 +42,8 @@
|
||||
serverDisconnected: '{{ 'phraseanet::erreur: Votre session est fermee, veuillez vous re-authentifier' | trans | e('js') }}',
|
||||
check_all : '{{ 'Cocher toute la colonne' | trans | e('js') }}',
|
||||
uncheck_all : '{{ 'Decocher toute la colonne' | trans | e('js') }}',
|
||||
check_left_right : '{{ 'admin::users:edit: check left right' | trans | e('js') }}',
|
||||
check_all_right : '{{ 'admin::users:edit: check all right' | trans | e('js') }}',
|
||||
create_template : '{{ 'Creer un model' | trans | e('js') }}',
|
||||
create_user : '{{ 'Creer un utilisateur' | trans | e('js') }}',
|
||||
annuler : '{{ 'boutton::annuler' | trans | e('js') }}',
|
||||
|
||||
Reference in New Issue
Block a user