This commit is contained in:
Nicolas Le Goff
2015-02-27 12:50:39 +01:00
parent 2924d8f29f
commit 709af5bba0
3 changed files with 9 additions and 6 deletions

View File

@@ -102,10 +102,13 @@ class Root implements ControllerProviderInterface
}
}
$helper = new Helper\Prod($app, $app['request']);
return $app['twig']->render('prod/index.html.twig', [
'module_name' => 'Production',
'WorkZone' => new Helper\WorkZone($app, $app['request']),
'module_prod' => new Helper\Prod($app, $app['request']),
'module_prod' => $helper,
'search_datas' => $helper->get_search_datas(),
'cssfile' => $cssfile,
'module' => 'prod',
'events' => $app['events-manager'],

View File

@@ -147,7 +147,7 @@
{% endblock %}
{% block content %}
{% set search_datas = module_prod.get_search_datas() %}
<div style="position:absolute; top:0; left:0; right:0; bottom:0; background-color:#1a1a1a; z-index:32766;">
<div id="loader" style="top:200px; margin:0 auto; -webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px; background-color:#CCCCCC; position:relative; margin:0 auto; text-align:center; width:400px; height:100px; padding:20px; z-index:32767;">
<div style="margin:0 10px 10px; font-family:Helvetica,Arial,sans-serif; font-size:18px; color:#1A1A1A; text-align:left;">Phraseanet</div>
@@ -1154,7 +1154,7 @@
{% endif %}
<script type="text/javascript">
{% include "prod/thesaurus.js.twig" %}
{% include "prod/thesaurus.js.twig" with {'search_datas': search_datas} %}
</script>
<script type="text/javascript" src="{{ path('minifier', { 'g' : 'prod' }) }}"></script>
<script type="text/javascript">

View File

@@ -692,9 +692,9 @@ function Xclick(e)
var idx0 = lip.index(p4.thesau.lastClickedCandidate.item);
var idx1 = lip.index(li);
if(idx0 < idx1)
lip.filter(function(index){return(index >= idx0 && index <idx1); }).addClass('selected');
lip.filter(function(index){return(index >= idx0 && index < idx1); }).addClass('selected');
else
lip.filter(function(index){return(index > idx1 && index <=idx0); }).addClass('selected');
lip.filter(function(index){return(index > idx1 && index <= idx0); }).addClass('selected');
}
}
}
@@ -1185,7 +1185,7 @@ function startThesaurus(){
p4.thesau.thlist = {
{% set first = 1 %}
{% for base in module_prod.get_search_datas['bases'] %}
{% for base in search_datas['bases'] %}
{% if base['thesaurus'] %}
{% if first == 0 %},{% endif %}
"s{{base['sbas_id']}}": new ThesauThesaurusSeeker({{base['sbas_id']}})