diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php index 496e1d3581..7c2f7e1c4e 100644 --- a/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php +++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php @@ -40,10 +40,8 @@ class Thesaurus implements ControllerProviderInterface $controllers->match('linkfield2.php', $this->call('linkFieldStep2')); $controllers->match('linkfield3.php', $this->call('linkFieldStep3')); $controllers->match('loadth.php', $this->call('loadThesaurus'))->bind('thesaurus_loadth'); - $controllers->match('newsy_dlg.php', $this->call('newSynonymDialog')); $controllers->match('newterm.php', $this->call('newTerm')); $controllers->match('properties.php', $this->call('properties')); - $controllers->match('search.php', $this->call('search')); $controllers->match('thesaurus.php', $this->call('thesaurus'))->bind('thesaurus_thesaurus'); $controllers->match('xmlhttp/accept.x.php', $this->call('acceptXml')); @@ -1121,23 +1119,6 @@ class Thesaurus implements ControllerProviderInterface )); } - public function newSynonymDialog(Application $app, Request $request) - { - $languages = array(); - - foreach ($app['locales.available'] as $lng_code => $lng) { - $lng_code = explode('_', $lng_code); - $languages[$lng_code[0]] = $lng; - } - - return $app['twig']->render('thesaurus/new-synonym-dialog.html.twig', array( - 'piv' => $request->get('piv'), - 'typ' => $request->get('typ'), - 'languages' => $languages, - )); - } - - public function newTerm(Application $app, Request $request) { list($term, $context) = $this->splitTermAndContext($request->get("t")); @@ -1220,11 +1201,6 @@ class Thesaurus implements ControllerProviderInterface )); } - public function search(Application $app, Request $request) - { - return $app['twig']->render('thesaurus/search.html.twig'); - } - public function thesaurus(Application $app, Request $request) { $flags = $jsFlags = array(); diff --git a/templates/web/thesaurus/new-synonym-dialog.html.twig b/templates/web/thesaurus/new-synonym-dialog.html.twig deleted file mode 100644 index 7a18595bfb..0000000000 --- a/templates/web/thesaurus/new-synonym-dialog.html.twig +++ /dev/null @@ -1,86 +0,0 @@ -{% if 'TS' == typ %} - {% set title = 'thesaurus:: Nouveau terme' | trans %} - {% set label = 'thesaurus:: terme' | trans %} -{% elseif 'SY' == typ %} - {% set title = 'thesaurus:: Nouveau synonyme' | trans %} - {% set label = 'thesaurus:: synonyme' | trans %} -{% else %} - {% set title = '' %} - {% set label = '' %} -{% endif %} - - - - {{ title }} - - - - - - - -
-
- - - - - - - - - - - - - - - - -
{{ label }} : 
{% trans 'thesaurus:: contexte' %} : (  )
{% trans 'phraseanet:: language' %} :  - {% for code, language in languages %} - - - - -    - {% endfor %} -
-
-
- -    - -
-
-
-
- - diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig index a71cff8013..12ade717e7 100644 --- a/templates/web/thesaurus/properties.html.twig +++ b/templates/web/thesaurus/properties.html.twig @@ -47,7 +47,6 @@
@@ -193,14 +192,6 @@ document.getElementById("delete_sy").className = ""; } } - // si on ne connait pas encore le client mais que start est ouvert, on lui demande - // if(!opener.wClient && opener.opener.wClient) - // opener.wClient = opener.opener.wClient; - // si on connait le client et qu'on peut s'en servir pour chercher, on active l'option dans le menu - // if(opener.wClient && opener.wClient.externQuery) - // document.getElementById("searchcli_sy").className = ""; - // else - // document.getElementById("searchcli_sy").className = "disabled"; return; } @@ -250,30 +241,6 @@ } } break; - case "searchcli_sy": // cbParm = objet 'TR' - url = "xmlhttp/getsy.x.php"; - url += "?bid={{ bid | url_encode }}"; - url += "&id=" + cbParm.id.substr(4); - url += "&typ={{ typ | url_encode }}"; - ret = loadXMLDoc(url, null, true); - t = ret.getElementsByTagName("sy").item(0).getAttribute("t"); - - if(opener.wClient && opener.wClient.externQuery) - { - opener.wClient.focus(); - opener.wClient.externQuery(opener.currentBaseId, t); - } - - break; - case "replace_sy": - url = "replace.php"; - url += "?bid={{ bid }}"; - url += "&piv={{ piv }}"; - url += "&pid={{ id }}" - url += "&id=" + o.id.substr(4); - url += "&typ={{ typ | url_encode }}"; - w = window.open(url, "REPLACE", "directories=no, height=300, width=500, location=no, menubar=no, resizable=yes, scrollbars=yes, status=no, toolbar=no"); - break; } } diff --git a/templates/web/thesaurus/search.html.twig b/templates/web/thesaurus/search.html.twig deleted file mode 100644 index 5c52ba1c2e..0000000000 --- a/templates/web/thesaurus/search.html.twig +++ /dev/null @@ -1,65 +0,0 @@ - - - - - {% trans 'Chercher' %} - - - - -
-
-
-
- - - - - - - - - - - -
{% trans 'thesaurus:: le terme' %}{% trans 'thesaurus:: est egal a ' %}
- {% trans 'thesaurus:: commence par' %}
- {% trans 'thesaurus:: contient' %}
-
- -
-
-
- -     - -
-
- - diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig index c32e70b53c..4459a200a1 100644 --- a/templates/web/thesaurus/thesaurus.html.twig +++ b/templates/web/thesaurus/thesaurus.html.twig @@ -9,6 +9,8 @@ display: none; } + +