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 branch '3.8'

Browse Source 
Conflicts:
	.gitignore
	.travis.yml
	Vagrantfile
	lib/Alchemy/Phrasea/Controller/Datafiles.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/classes/connection/pdo.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/setup/step2.html.twig
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt
This commit is contained in:
Nicolas Le Goff
2014-09-09 15:05:13 +02:00
parent 6ae61245dd 46794e0b22
commit 7eb1a506fa
18 changed files with 318 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/web/admin/databox/databox.html.twig
View File

@@ -287,6 +287,9 @@
{
t += (t==""?"":" ; ") + i + ": " + data.jeton_subdef[i];
}
if(t == "") {
t = "0";
}
$("#subdefs_todo").text(t);
}

9
templates/web/admin/task-manager/task-editor/write-metadata.html.twig
View File

@@ -9,6 +9,14 @@
</label>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input class="formElem" type="checkbox" name="mwg">
{{ 'task::writemeta:Compatibilité MWG' | trans }}
</label>
</div>
</div>
{% endblock %}
@@ -22,6 +30,7 @@
with(document.forms['graphicForm'])
{
cleardoc.checked = Number(xml.find("cleardoc").text()) > 0;
mwg.checked = Number(xml.find("mwg").text()) > 0;
}
}
}