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

Merge remote-tracking branch 'upstream/3.8'

Browse Source 
Conflicts:
	bower.json
	composer.lock
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/User/Query.php
	lib/classes/patch/320alpha4b.php
	templates/web/admin/statusbit.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/lazaret.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	www/scripts/apps/login/home/config.js
	www/skins/prod/000000/prodcolor.css
	www/skins/prod/959595/prodcolor.css
This commit is contained in:
Nicolas Le Goff
2015-02-23 19:16:56 +01:00
parent f06cb7eaec b6f6fe3217
commit 5b3e699599
31 changed files with 740 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -1,7 +1,7 @@
{% set selectionLength = records|length %}
{% set nbHdSubstitute = 0 %}
{% set nbThumbSubstitute = 0 %}
{% set nbSubdefSubstitute = 0 %}
{% for record in records %}
{% set subdefs = record.get_subdefs() %}
@@ -9,10 +9,8 @@
{% for key, subdef in subdefs if subdef.is_substituted() %}
{% if key == 'document' %}
{% set nbHdSubstitute = nbHdSubstitute + 1 %}
{% endif%}
{% if key == 'thumbnail' %}
{% set nbThumbSubstitute = nbThumbSubstitute + 1 %}
{% else %}
{% set nbSubdefSubstitute = nbSubdefSubstitute + 1 %}
{% endif%}
{% endfor %}
@@ -68,7 +66,7 @@
<form id="new-img-form" action="{{ path('prod_tools_image') }}" method="post">
<fieldset style='border:1px solid #999; padding:20px;'>
<legend style='color:#EEE'>&nbsp;<b>{{ "Reconstruire les sous definitions" | trans }}</b>&nbsp;</legend>
{% if nbThumbSubstitute > 0 %}
{% if nbSubdefSubstitute > 0 %}
<div style="color:#A00;">
{{ "Attention, certain documents ont des sous-definitions substituees" | trans }}
</div>