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 pull request #1209 from nlegoff/patch-387

Browse Source 
[3.8.7] Fix some easy pick
This commit is contained in:
Nicolas Le Goff
2015-01-21 17:19:02 +01:00
parent 721441aede 3daa96a141
commit 5fe09febb7
35 changed files with 451 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/web/prod/index.html.twig
View File

@@ -119,6 +119,20 @@
</div>
<div id="desktop" class="PNB" style="overflow:hidden;">
{% if app.flash('client_deprecated') %}
<div id="clientModal" class="modal hide fade" >
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>{{ 'Client application is deprecated'|trans }}</h3>
</div>
<div class="modal-body">
<p>{{ 'You have been redirected to production application.'|trans }}</p>
</div>
</div>
<script type="text/javascript">
$('#clientModal').modal();
</script>
{% endif %}
{% set ratio = app['authentication'].getUser().getPrefs('search_window') %}
{% if ratio == 0 %}
{% set ratio = '0.333' %}
@@ -289,11 +303,11 @@
<div class="controls">
{% if GV_multiAndReport %}
<label for="mode_type_doc" class="radio inline">
<input type="radio" value="0" class="mode_type_doc_reg" name="search_type" {% if GV_defaultQuery_type == 0 %}checked="checked"{% endif %} id="mode_type_doc"/>
<input type="radio" value="0" class="mode_type_doc" name="search_type" {% if GV_defaultQuery_type == 0 %}checked="checked"{% endif %} id="mode_type_doc"/>
{% trans 'phraseanet::type:: documents' %}
</label>
<label for="mode_type_reg" class="radio inline">
<input type="radio" value="1" class="mode_type_doc_reg" name="search_type" {% if GV_defaultQuery_type != 0 %}checked="checked"{% endif %} id="mode_type_reg"/>
<input type="radio" value="1" class="mode_type_reg" name="search_type" {% if GV_defaultQuery_type != 0 %}checked="checked"{% endif %} id="mode_type_reg"/>
{% trans 'phraseanet::type:: reportages' %}
</label>
{% else %}