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

PHRAS-3138

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-06-19 13:19:17 +04:00
parent 34b4f26318
commit bc1ee17272
8 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.235-d",
"phraseanet-production-client": "0.34.236-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

1
resources/www/lightbox/images/file-download-solid-blue.svg Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="file-download" class="svg-inline--fa fa-file-download fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="#2196f3" d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm76.45 211.36l-96.42 95.7c-6.65 6.61-17.39 6.61-24.04 0l-96.42-95.7C73.42 337.29 80.54 320 94.82 320H160v-80c0-8.84 7.16-16 16-16h32c8.84 0 16 7.16 16 16v80h65.18c14.28 0 21.4 17.29 11.27 27.36zM377 105L279.1 7c-4.5-4.5-10.6-7-17-7H256v128h128v-6.1c0-6.3-2.5-12.4-7-16.9z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 625 B

23
resources/www/lightbox/styles/main.scss
View File

@@ -99,7 +99,7 @@ img {
overflow: scroll;
}
.display_id {
top: 5px;
top: 0;
margin: 0 0 0 5px;
}
}
@@ -134,8 +134,8 @@ img {
background-color: #212121;
}
.display_id {
top: 4px;
left: 8px;
top: 5px;
left: 5px;
}
.agreement {
position: absolute;
@@ -173,7 +173,9 @@ img {
.display_id {
background-color: #FFFFFF;
padding: 3px 6px;
padding: 3.5px 6px;
min-width: 15px;
text-align: center;
font-weight: bold;
z-index: 99;
color: #212121;
@@ -229,16 +231,13 @@ img {
font-size: 14px;
line-height: 14px;
border: 0;
bottom: 10px;
bottom: -30px;
.fa-comment.icon-white {
font-size: 15px;
line-height: 18px;
margin-right: 10px;
}
}
.user_infos .comment_button {
bottom: initial;
}
}
#basket_options {
@@ -580,10 +579,14 @@ table th i {
}
.basket_downloader {
background-color: #1F1E1B;
background-color: #ffffff;
margin: 0 10px;
padding: 2px;
padding: 4px 0;
border: 0;
transition: 0.3s all;
&:hover {
background-color: #e6e6e6;
}
}
hr {

12
templates/web/lightbox/agreement_box.html.twig
View File

@@ -47,4 +47,16 @@
</div>
</div>
{% endif %}
{% if basket_element.getBasket().getValidation() %}
<button class="comment_button btn btn-mini btn-inverse">
<i class="fa fa-comment icon-white" aria-hidden="true"></i>
{% set n = 0 %}
{% for validationData in basket_element.getValidationDatas() %}
{% if validationData.getNote() %}
{% set n = n+1 %}
{% endif %}
{% endfor %}
{{ n }}
</button>
{% endif %}
</div>

2
templates/web/lightbox/feed.html.twig
View File

@@ -97,7 +97,7 @@
</td>
<td style="width:40px;">
<button class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
<i class="fa fa-cart-arrow-down download-feed"></i>
<img width="15" src="/assets/lightbox/images/file-download-solid-blue.svg" >
</button>
</td>
<td>

13
templates/web/lightbox/sc_options_box.html.twig
View File

@@ -25,18 +25,7 @@
<input type="hidden" name="basrec" value="{{basket_element.getRecord(app).get_serialize_key()}}"/>
</form>
|
{% if basket_element.getBasket().getValidation() %}
<button class="comment_button btn btn-mini btn-inverse">
<i class="fa fa-comment icon-white" aria-hidden="true"></i>
{% set n = 0 %}
{% for validationData in basket_element.getValidationDatas() %}
{% if validationData.getNote() %}
{% set n = n+1 %}
{% endif %}
{% endfor %}
{{ n }}
</button>
{% endif %}
{% endif %}
</span>

2
templates/web/lightbox/validate.html.twig
View File

@@ -181,7 +181,7 @@
</td>
<td style="width:50px;">
<button style='width:30px;margin:0;' class="ui-corner-all basket_downloader" title="{{ 'boutton::telecharger tous les documents' | trans }}">
<i class="fa fa-cart-arrow-down download-feed"></i>
<img width="15" src="/assets/lightbox/images/file-download-solid-blue.svg" >
</button>
</td>
<td>

8
yarn.lock
View File

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.235-d:
version "0.34.235-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.235-d.tgz#f4d9d0b28ad36090db122ab4885c07890ee5a8e5"
integrity sha512-B55HnN4TTXXM7dS+SAtOMlIY7gzAXiWgdArXllv2EuCWsFK8BZFTGnqmvL0uixei7bO7hFfu0IfuqYOfJRU2cQ==
phraseanet-production-client@0.34.236-d:
version "0.34.236-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.236-d.tgz#083120cc1ff02893b62058ff875742d45975e3ee"
integrity sha512-mOT8S2V2FlhOVZmIo2cWQuXOTQ9D4h7t0jquhLboz2zN4Uo0iLFAEkM0P9GmizYSixh1MYLbU0vFLJUPzvz2Wg==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"