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

Merge pull request #438 from jygaulier/master-fix1210

Browse Source 
[3.8] Master fix1210
This commit is contained in:
Romain Neutron
2013-06-27 09:17:19 -07:00
parent 2a19d351c9 6d631200ee
commit 9def3e4624
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,15 +160,15 @@
</a> </a>
</li> </li>
</ul> </ul>
<div id="baskets" class="PNB ui-tabs-panel ui-accordion" style="top:52px;"> <div id="baskets" class="PNB" style="top:52px;">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %} {% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
{{WorkZoneMacros.make_bloc(app, WorkZone)}} {{WorkZoneMacros.make_bloc(app, WorkZone)}}
</div> </div>
{% if GV_thesaurus %} {% if GV_thesaurus %}
<div id="proposals" class="PNB ui-tabs-panel ui-tabs-hide" style="top:52px;" <div id="proposals" class="PNB" style="top:52px;"
ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));"> ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
</div> </div>
<div id="thesaurus_tab" class="PNB ui-tabs-panel ui-tabs-hide" style="top:52px;"> <div id="thesaurus_tab" class="PNB" style="top:52px;">
<div id="THPD_tabs"> <div id="THPD_tabs">
<ul> <ul>
<li class="th_tab"><a href="#THPD_T"><span>{% trans 'prod::thesaurusTab:thesaurus' %}</span></a></li> <li class="th_tab"><a href="#THPD_T"><span>{% trans 'prod::thesaurusTab:thesaurus' %}</span></a></li>
@@ -188,13 +188,15 @@
<div class="wizard wiz_2" style="display:none"> <div class="wizard wiz_2" style="display:none">
<div class="txt">{% trans 'prod::thesaurusTab:wizard:remplacer par le terme' %}</div> <div class="txt">{% trans 'prod::thesaurusTab:wizard:remplacer par le terme' %}</div>
</div> </div>
<form class="gform" href="#" onsubmit="T_Gfilter(this);return(false);"> <form class="gform form-inline" href="#" onsubmit="T_Gfilter(this);return(false);">
<input type="text" class="input-medium" onkeyup="T_Gfilter_delayed(this.value, 300)" /> <div class="input-append">
<input type="submit" class="th_ok btn" value="{% trans 'boutton::rechercher' %}" /> <input type="text" class="input-medium" onkeyup="T_Gfilter_delayed(this.value, 300)" />
<input type="button" class="th_cancel btn" value="{% trans 'boutton::annuler' %}" onclick="thesauCancelWizard();return(false);"/> <input type="submit" class="th_ok btn" value="{% trans 'boutton::rechercher' %}" />
<input type="button" class="th_cancel btn" value="{% trans 'boutton::annuler' %}" onclick="thesauCancelWizard();return(false);"/>
</div>
</form> </form>
</div> </div>
<div id='THPD_T_treeBox' class="searchZone" style="position:absolute; top:0px; bottom:0px; left:0px; width:100%; overflow:auto"> <div id='THPD_T_treeBox' class="searchZone" style="position:absolute; top:45px; bottom:0px; left:0px; width:100%; overflow:auto">
<div onclick="Xclick(event);return(false);" ondblclick="TXdblClick(event);"> <div onclick="Xclick(event);return(false);" ondblclick="TXdblClick(event);">
<ul class="treeview" id="THPD_T_tree"> <ul class="treeview" id="THPD_T_tree">
{% for base in search_datas['bases'] %} {% for base in search_datas['bases'] %}

5
www/skins/prod/jquery.main-prod.js
View File

@@ -1414,11 +1414,6 @@ $(document).ready(function(){
}); });
$('#idFrameC .tabs').tabs({ $('#idFrameC .tabs').tabs({
load: function(event, ui)
{
if(ui.newTab.hash=="#thesaurus_tab")
thesau_show();
},
activate: function(event, ui){ activate: function(event, ui){
p4.WorkZone.open(); p4.WorkZone.open();
} }