hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upgrade_phraseanet-production-client-dependencies__

Browse Source
This commit is contained in:
Nicolas Maillat
2020-06-01 21:02:47 +02:00
committed by GitHub
parent be5b675f9d 7ce01cc09c
commit 006b0cf234
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/www/common/images/icons/info-circle-green.svg Normal file
View File

@@ -0,0 +1 @@
<svg fill="#3d8b3d" aria-hidden="true" focusable="false" data-prefix="far" data-icon="info-circle" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-info-circle fa-w-16 fa-3x"><path d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm0-338c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z" class=""></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 774 B

1
resources/www/common/images/icons/info-circle-grey.svg Normal file
View File

@@ -0,0 +1 @@
<svg fill="#333333" aria-hidden="true" focusable="false" data-prefix="far" data-icon="info-circle" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-info-circle fa-w-16 fa-3x"><path d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm0-338c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z" class=""></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 774 B

1
resources/www/common/images/icons/info-circle-red.svg Normal file
View File

@@ -0,0 +1 @@
<svg fill="#da4f49" aria-hidden="true" focusable="false" data-prefix="far" data-icon="info-circle" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-info-circle fa-w-16 fa-3x"><path d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm0-338c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z" class=""></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 774 B

14
templates/web/admin/editusers.html.twig
View File

@@ -203,7 +203,7 @@
</td> </td>
<td class="users_col"> <td class="users_col">
<div class="time_trigger time_sbas_{{rights['sbas_id']}}"> <div class="time_trigger time_sbas_{{rights['sbas_id']}}">
<img src="/assets/common/images/icons/user_details_gray.png" /> <img width="14" src="/assets/common/images/icons/info-circle-grey.svg" />
<input type="hidden" name="time_sbas_id" value="{{rights['sbas_id']}}"/> <input type="hidden" name="time_sbas_id" value="{{rights['sbas_id']}}"/>
</div> </div>
</td> </td>
@@ -336,9 +336,9 @@
<td class="users_col case_right_quota" title="{{ 'Set download quotas' | trans }}"> <td class="users_col case_right_quota" title="{{ 'Set download quotas' | trans }}">
<div class="quota_trigger quota_{{rights['base_id']}} base_{{rights['base_id']}}"> <div class="quota_trigger quota_{{rights['base_id']}} base_{{rights['base_id']}}">
{% if rights[constant('\\ACL::RESTRICT_DWNLD')] > 0 %} {% if rights[constant('\\ACL::RESTRICT_DWNLD')] > 0 %}
<img src="/assets/common/images/icons/user_details_on.png" /> <img width="14" src="/assets/common/images/icons/info-circle-red.svg" />
{% else %} {% else %}
<img src="/assets/common/images/icons/user_details_off.png" /> <img width="14" src="/assets/common/images/icons/info-circle-green.svg" />
{% endif %} {% endif %}
<input type="hidden" name="quota_base_id" value="{{rights['base_id']}}"/> <input type="hidden" name="quota_base_id" value="{{rights['base_id']}}"/>
</div> </div>
@@ -346,9 +346,9 @@
<td class="users_col case_right_time" title="{{ 'Set time restrictions' | trans }}"> <td class="users_col case_right_time" title="{{ 'Set time restrictions' | trans }}">
<div class="time_trigger time_{{rights['base_id']}} base_{{rights['base_id']}}"> <div class="time_trigger time_{{rights['base_id']}} base_{{rights['base_id']}}">
{% if rights['time_limited'] > 0 %} {% if rights['time_limited'] > 0 %}
<img src="/assets/common/images/icons/user_details_on.png" /> <img width="14" src="/assets/common/images/icons/info-circle-red.svg" />
{% else %} {% else %}
<img src="/assets/common/images/icons/user_details_off.png" /> <img width="14" src="/assets/common/images/icons/info-circle-green.svg" />
{% endif %} {% endif %}
<input type="hidden" name="time_base_id" value="{{rights['base_id']}}"/> <input type="hidden" name="time_base_id" value="{{rights['base_id']}}"/>
</div> </div>
@@ -356,9 +356,9 @@
<td class="users_col case_right_masks" title="{{ 'Set statuses restrictions' | trans }}"> <td class="users_col case_right_masks" title="{{ 'Set statuses restrictions' | trans }}">
<div class="masks_trigger quotatime_{{rights['base_id']}} base_{{rights['base_id']}}"> <div class="masks_trigger quotatime_{{rights['base_id']}} base_{{rights['base_id']}}">
{% if rights['masks'] > 0 %} {% if rights['masks'] > 0 %}
<img src="/assets/common/images/icons/user_details_on.png" /> <img width="14" src="/assets/common/images/icons/info-circle-red.svg" />
{% else %} {% else %}
<img src="/assets/common/images/icons/user_details_off.png" /> <img width="14" src="/assets/common/images/icons/info-circle-green.svg" />
{% endif %} {% endif %}
<input type="hidden" name="masks_base_id" value="{{rights['base_id']}}"/> <input type="hidden" name="masks_base_id" value="{{rights['base_id']}}"/>
</div> </div>

13
templates/web/prod/templates/upload.html.twig
View File

@@ -42,10 +42,19 @@
</script> </script>
<script type="text/template" id="download_finish_tpl"> <script type="text/template" id="download_finish_tpl">
<b><%= heading %></b> <b class="show_more_message" ><%= heading %></b>
<br /> <br />
<% _.each(reasons, function(reason) { %> <% _.each(reasons, function(reason) { %>
<div>*<%= reason %></div> <b class="hidden alert alert-error more-warning" role="alert" style="position: absolute">*<%= reason %></b>
<% }); %> <% }); %>
</script> </script>
<script>
$(document).on('mouseover','.show_more_message', function (e) {
$(this).parent().find('.more-warning').removeClass('hidden')
})
$(document).on('mouseout','.show_more_message',function (e) {
$(this).parent().find('.more-warning').addClass('hidden')
})
</script>