mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 09:53:15 +00:00
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2504-ginga-subtitle
This commit is contained in:
aynsix
@@ -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">' %}
|
||||
@@ -177,21 +176,27 @@
|
||||
<input type="hidden" name="lst" value="{{lst}}"/>
|
||||
<input type="hidden" name="ssttid" value="{{ssttid}}"/>
|
||||
<div>
|
||||
{{ 'export::mail: destinataire' | trans }}
|
||||
<span style="min-width: 21px;display: inline-block; ">
|
||||
{{ 'export::mail: destinataire' | trans }}</span>
|
||||
<input type="text" value="" name="destmail" class="required span4">
|
||||
<div class="acceptDl-info" style="padding-top: 4px; margin-left: 25px;">
|
||||
<span style="font-style: italic">{{ 'Entrez plusieurs adresses email en les separant par des points-virgules' | trans }}</span>
|
||||
</div>
|
||||
{% 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;">{{ 'export:email:: acknowledgement info' | trans }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<p>{{ 'export::mail: contenu du mail' | trans }}</p>
|
||||
@@ -235,7 +240,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 +393,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 +474,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">' %}
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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 %}
|
||||
|
||||
@@ -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;">
|
||||
|
||||
@@ -92,7 +92,9 @@
|
||||
</video>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="videotools-spinner ui-widget-overlay ui-front hidden" id="videotools-spinner" style="opacity: 0.9">
|
||||
<img src="/assets/common/images/icons/loading.svg" alt="" id="gif-loader">
|
||||
</div>
|
||||
<div id="thumb_camera_button"></div>
|
||||
|
||||
<div class="vertical-divider"></div>
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
<label for="feed_add_title"><b>{{ 'publication : titre' | trans }}</b> <span>( {{ 'publication : title warning' | trans }} )</span></label>
|
||||
<input class="required_text input-block-level" style="max-width:500px" type="text" name="title" id="feed_add_title" value="{{title}}" />
|
||||
<label><span class="feed_title_warning feed_warning">{{ 'publication : title alert' | trans }}</span></label>
|
||||
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> <span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle warning' | trans }}</span></label>
|
||||
<label for="feed_add_subtitle"><b>{{ 'publication : sous titre' | trans }}</b> <span>( {{ 'publication : subtitle warning' | trans }} )</span></label>
|
||||
<textarea id="feed_add_subtitle" style="max-width:500px" class="input-block-level" name="subtitle" rows="5">{{desc}}</textarea>
|
||||
<label><span class="feed_subtitle_warning feed_warning">{{ 'publication : subtitle alert' | trans }}</span></label>
|
||||
<label for="feed_add_author_name"><b>{{ 'publication : autheur' | trans }}</b></label>
|
||||
|
||||
Reference in New Issue
Block a user