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

Merge pull request #1098 from nlegoff/some-385

Browse Source 
[3.8.6] Fix some minor bugs
This commit is contained in:
Nicolas Le Goff
2014-07-25 18:11:13 +02:00
parent 8d569fc8f5 fc2e22c45a
commit e0c749d69a
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Prod/Export.php
View File

@@ -297,7 +297,7 @@ class Export implements ControllerProviderInterface
$mail->setButtonUrl($url); $mail->setButtonUrl($url);
$mail->setExpiration($endDateObject); $mail->setExpiration($endDateObject);
$app['notification.deliverer']->deliver($mail); $app['notification.deliverer']->deliver($mail, !!$request->request->get('reading_confirm', false));
unset($remaingEmails[$key]); unset($remaingEmails[$key]);
} }

6
lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
View File

@@ -77,7 +77,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface
), ),
'address' => array( 'address' => array(
'label' => _('admin::compte-utilisateur adresse'), 'label' => _('admin::compte-utilisateur adresse'),
'type' => 'textarea', 'type' => 'text',
'constraints' => array( 'constraints' => array(
new Assert\NotBlank(), new Assert\NotBlank(),
) )
@@ -96,7 +96,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface
new Assert\NotBlank(), new Assert\NotBlank(),
) )
), ),
'position' => array( 'job' => array(
'label' => _('admin::compte-utilisateur poste'), 'label' => _('admin::compte-utilisateur poste'),
'type' => 'text', 'type' => 'text',
'constraints' => array( 'constraints' => array(
@@ -110,7 +110,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface
new Assert\NotBlank(), new Assert\NotBlank(),
) )
), ),
'job' => array( 'position' => array(
'label' => _('admin::compte-utilisateur activite'), 'label' => _('admin::compte-utilisateur activite'),
'type' => 'text', 'type' => 'text',
'constraints' => array( 'constraints' => array(

7
templates/web/admin/setup.html.twig
View File

@@ -35,7 +35,7 @@
</div> </div>
</form> </form>
<form id="GV_form" class="form-horizontal" method="post" action = "{{ path('setup_submit_globals') }}"> <form id="GV_form" class="form-horizontal" method="post" action = "{{ path('setup_submit_globals') }}" autocomplete="off">
{% for section in GV %} {% for section in GV %}
<fieldset> <fieldset>
<legend> {{ section['section'] }} </legend> <legend> {{ section['section'] }} </legend>
@@ -63,7 +63,10 @@
{% elseif value['type'] == 'string' %} {% elseif value['type'] == 'string' %}
<div class="controls"><input {{ value['required'] is defined ? 'required="required"' : '' }} {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}" type="text" value="{{ currentValue }}" class="input-xxlarge"/> <div class="controls"><input {{ value['required'] is defined ? 'required="required"' : '' }} {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}" type="text" value="{{ currentValue }}" class="input-xxlarge"/>
{% elseif value['type'] == 'password' %} {% elseif value['type'] == 'password' %}
<div class="controls"><input {{ value['required'] is defined ? 'required="required"' : '' }} {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}" type="password" value="{{ currentValue }}" class="input-xxlarge"/> <div class="controls">
{# input type=password is double because of chrome and autofill issue see http://stackoverflow.com/questions/10938891/disable-autofill-in-chrome-without-disabling-autocomplete #}
<input autocomplete="off" {{ value['required'] is defined ? 'required="required"' : '' }} {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}" type="password" value="{{ currentValue }}" class="input-xxlarge" style="display:none"/>
<input autocomplete="off" {{ value['required'] is defined ? 'required="required"' : '' }} {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}" type="password" value="{{ currentValue }}" class="input-xxlarge"/>
{% elseif value['type'] == 'text' %} {% elseif value['type'] == 'text' %}
<div class="controls"><textarea {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}" class="input-xxlarge">{{ currentValue }}</textarea> <div class="controls"><textarea {{ readonly ? 'readonly="readonly"' : '' }} name="{{ value['name'] }}" id="id_{{ value['name'] }}" class="input-xxlarge">{{ currentValue }}</textarea>
{% elseif value['type'] == 'enum' %} {% elseif value['type'] == 'enum' %}

2
templates/web/prod/actions/edit_default.html.twig
View File

@@ -31,7 +31,7 @@
{% set class_status = '' %} {% set class_status = '' %}
{% endif %} {% endif %}
<div pos="{{ i }}" id="idEditDiapo_{{ i }}" class="diapo {{ class_status }}" style="width:{{ cont_width }}px; height:{{ cont_height }}px;"> <div pos="{{ i }}" id="idEditDiapo_{{ i }}" class="diapo selected {{ class_status }}" style="width:{{ cont_width }}px; height:{{ cont_height }}px;">
<div class='titre'> <div class='titre'>
{{ record.get_original_name() }} {{ record.get_original_name() }}
</div> </div>

2
templates/web/prod/preview/appears_in.html.twig
View File

@@ -6,7 +6,7 @@
<li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);" <li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);"
class="otherRegToolTip" {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : par.get_sbas_id(), 'record_id' : par.get_record_id(), 'context' : 'basket' }) }}" {% endif %}> class="otherRegToolTip" {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %}tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : par.get_sbas_id(), 'record_id' : par.get_record_id(), 'context' : 'basket' }) }}" {% endif %}>
<img src="{{par.get_thumbnail().get_url()}}" style="width:25px;height:25px;"/> <img src="{{par.get_thumbnail().get_url()}}" style="width:25px;height:25px;"/>
<span class="title"> {{ par.get_title() }} </span> <span class="title" title="{{ par.get_title() }}"> {{ par.get_title() }} </span>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>

2
www/skins/login/less/skin.less
View File

@@ -514,7 +514,7 @@ button[type=submit] {
box-radius: @inputBorderRadius !important; box-radius: @inputBorderRadius !important;
} }
.input-table input { .input-table input, .input-table select, .input-table textarea {
border: @inputBorder !important; border: @inputBorder !important;
background-color: @inputBackground !important; background-color: @inputBackground !important;
color: @textColor !important; color: @textColor !important;

1
www/skins/prod/000000/prodcolor.css
View File

@@ -2200,7 +2200,6 @@ DIV.thesaurus U.w {
} }
.GRP_IMAGE_REP { .GRP_IMAGE_REP {
background-color: #B1B1B1;
margin: 5px; margin: 5px;
padding: 5px; padding: 5px;
position: absolute; position: absolute;

1
www/skins/prod/959595/prodcolor.css
View File

@@ -2244,7 +2244,6 @@ DIV.thesaurus U.w {
} }
.GRP_IMAGE_REP { .GRP_IMAGE_REP {
background-color: #B1B1B1;
margin: 5px; margin: 5px;
padding: 5px; padding: 5px;
position: absolute; position: absolute;