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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig
This commit is contained in:
Romain Neutron
2013-12-09 14:17:03 +01:00
parent 5154fcac93 ef55bd29cc
commit 9580ff7585
7 changed files with 76 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@
</form>
<form style="display:inline;" method="post" action="{{ path('admin_database_unmount', {'databox_id': databox.get_sbas_id()}) }}">
<button class="btn confirm" data-confirm-msg="{{ 'admin::base: Confirmer vous l\'arret de la publication de la base' | trans }}">
<button type="button" class="btn confirm" data-confirm-msg="{{ 'admin::base: Confirmer vous l\'arret de la publication de la base' | trans }}">
<img src="/skins/icons/db-remove.png" />
{{ "admin::base: arreter la publication de la base" | trans }}
</button>