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

Merge branch 'master' into PHRAS-3159-lazaret-storage-file

Browse Source
This commit is contained in:
Nicolas Maillat
2020-07-08 09:41:00 +02:00
committed by GitHub
parent a6f01624e8 43c343439e
commit bb2eff0752
8 changed files with 62 additions and 26 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.248-d",
"phraseanet-production-client": "0.34.252-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

17
resources/www/common/styles/main.scss
View File

@@ -164,3 +164,20 @@ $mainMenuLinkBackgroundHoverColor: transparent;
}
.acceptDl-info {
background-color: #d9edf7;
border: 1px solid #bce8f1;
border-radius: 3px;
color: #3a87ad;
display: inline-block;
padding: 9px 24px 5px 9px;
margin-bottom: 20px;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
a, label {
color: #3a87ad!important;
}
a {
text-decoration: underline;
}
}

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

@@ -713,3 +713,21 @@ a.btn-info {
}
/** End Lightbox summary modal**/
.humane{
position: fixed;
z-index: 100000;
font-family: Ubuntu, Arial, sans-serif;
text-align: center;
font-size: 15px;
top: 100px;
right: 70px;
width: 400px;
background: #2d2d72;
color: rgb(255, 255, 255);
box-shadow: rgb(0, 0, 0) 0px 4px 4px -4px;
transform: translateY(-40px);
transition: all 0.3s ease-out 0s;
padding: 10px;
border-radius: 5px;
}

35
templates/web/common/dialog_export.html.twig
View File

@@ -152,9 +152,8 @@
</div>
{% endif %}
{{ _self.choose_title('download', choose_export_title, default_export_title) }}
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptDL" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptDL" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -180,18 +179,20 @@
{{ 'export::mail: destinataire' | trans }}
<input type="text" value="" name="destmail" class="required span4">
{% set my_email = app.getAuthenticatedUser().getEmail() %}
{% if my_email != '' %}
<label class="checkbox">
<input type="checkbox" name="reading_confirm" value="1" />
{% trans with {'%my_email%' : my_email} %}Recevoir un accuse de reception a %my_email%{% endtrans %}
</label>
{% else %}
<label class="checkbox">
{{ 'Accuse de reception indisponible, vous n\'avez pas declare d\'adresse email' | trans }}
<input type="checkbox" name="reading_confirm" value="1" readonly />
</label>
{% endif %}
<span style="font-style: italic; color: #999999;">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
<div class="acceptDl-info">
{% if my_email != '' %}
<label class="checkbox">
<input type="checkbox" name="reading_confirm" value="1" />
{% trans with {'%my_email%' : my_email} %}Recevoir un accuse de reception a %my_email%{% endtrans %}
</label>
{% else %}
<label class="checkbox">
{{ 'Accuse de reception indisponible, vous n\'avez pas declare d\'adresse email' | trans }}
<input type="checkbox" name="reading_confirm" value="1" readonly />
</label>
{% endif %}
<span style="font-style: italic; color: #999999;">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
</div>
</div>
<div>
<p>{{ 'export::mail: contenu du mail' | trans }}</p>
@@ -235,7 +236,7 @@
{{ _self.choose_title('sendmail', choose_export_title, default_export_title) }}
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptMail" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptMail" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -388,7 +389,7 @@
</div>
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptOrder" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptOrder" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}
@@ -469,7 +470,7 @@
{% endif %}
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %}
<div class="well-small">
<div class="well-small acceptDl-info">
<label for="TOU_acceptFTP" class="checkbox">
<input type="checkbox" name="TOU_accept" id="TOU_acceptFTP" value="1" />
{% set beginning_link = '<a href="' ~ path('get_tou') ~ '" class="TOUview">' %}

4
templates/web/lightbox/index.html.twig
View File

@@ -11,10 +11,6 @@
<link type="text/css" rel="stylesheet" href="/assets/lightbox/css/lightbox{% if not app.debug %}.min{% endif %}.css" media="screen"/>
{% endblock %}
{% block icon %}
<link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
{% endblock %}
{% block content %}
<div id="main_index" style="margin-top:50px;">
<table id="main_wrapper" cellspacing="0" cellpadding="0">

3
templates/web/lightbox/index_layout.html.twig
View File

@@ -1,5 +1,8 @@
{% extends "common/index_bootstrap.html.twig" %}
{% block icon %}
<link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
{% endblock %}
{% block extra_content %}
<div id="DIALOG"></div>
{% endblock %}

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

@@ -15,6 +15,7 @@
{% block content %}
{% set basket_element = basket.getElements().first() %}
<div class="PNB10">
<input type="hidden" id="export-send-mail-notif" value="{{ 'prod::export: send mail notification' | trans }} ">
<div class="PNB" id="top_container">
<div id="record_wrapper" class="PNB single" style="right:250px;">
<div id="record_main" class="PNB record_display_box" style="bottom:auto;right:auto;">

8
yarn.lock
View File

@@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.248-d:
version "0.34.248-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.248-d.tgz#92b23159cff6437b9aba0a2a9cbc63979b4c68c6"
integrity sha512-DgIToC7zdKBIvH47Rr2fceMJT4Aj8WQcHftEBqqFVTH/qQ4kLFMOZqR6aTezwlHms11opZ5s5CFVvM3kkVqa/w==
phraseanet-production-client@0.34.252-d:
version "0.34.252-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.252-d.tgz#e3a628d08d825c2554220cfcbbda3f8e3c3c6127"
integrity sha512-jSfa47v3TcwIbv6ItpzzXER/1U7ydrLyiUFRpJn+H0FapPUJCoKZ9Iy1PqNmUIzlTjqewQlatXSCLzMfzBcMlg==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"