hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +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

1
templates/web/thesaurus/thesaurus.html.twig
View File

@@ -1011,6 +1011,7 @@
case "kterm_newts": // nouveau terme specifique
case "kterm_newsy": // nouveau synonyme
var typ = menuelem_id=="kterm_newts" ? "TS" : "SY";
$("#NEWSY_DLG input[type=\"text\"]").val("");
$("#NEWSY_DLG .label").html(
typ=="TS" ? "{{ 'thesaurus:: terme' | trans }}" : "{{ 'thesaurus:: synonyme' | trans }}"
);