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:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig
This commit is contained in:
Nicolas Le Goff
2014-01-24 18:52:14 +01:00
parent c0919fbdc9 d61917707a
commit 6ba5ce6669
9 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/admin/collection/collection.html.twig
View File

@@ -123,7 +123,7 @@
</form>
<form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_empty', { 'bas_id' : bas_id }) }}">
<button type="button" class="btn confirm submiter" data-confirm-msg="{{ 'admin::base:collection: etes vous sur de vider la collection ?' | trans }}">
<button type="button" class="btn confirm submiter reload" data-confirm-msg="{{ 'admin::base:collection: etes vous sur de vider la collection ?' | trans }}">
<img src="/skins/icons/trash.png" />
{{ 'admin::base:collection: vider la collection' | trans }}
</button>
@@ -331,7 +331,7 @@
success: function(datas) {
if(datas.success) {
if(submitLink.hasClass('reload')) {
reloadTree('base:{{ collection.get_sbas_id() }}', true);
reloadTree('collection:{{ collection.get_base_id() }}', true);
} else if(submitLink.hasClass('reload-tree')) {
reloadTree('bases:bases', true);
}

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

@@ -146,7 +146,7 @@
</form>
<form style="display:inline;" method="post" action="{{ path('admin_database_empty', {'databox_id': databox.get_sbas_id()}) }}">
<button type="button" class="btn submiter confirm" data-confirm-msg="{{ 'admin::base: Confirmer le vidage complet de la base' | trans }}">
<button type="button" class="btn submiter confirm reload" data-confirm-msg="{{ 'admin::base: Confirmer le vidage complet de la base' | trans }}">
<img src="/skins/icons/trash.png" />
{{ "admin::base: vider la base" | trans }}
</button>

4
templates/web/admin/index.html.twig
View File

@@ -151,8 +151,8 @@
});
if(click === true)
{
if($('#tree li.selected').length > 0)
$('#tree li.selected a').trigger('click');
if($('#tree .selected').length > 0)
$('#tree .selected a').trigger('click');
else
$('.zone_online_users').trigger('click');
}

8
templates/web/admin/tree.html.twig
View File

@@ -163,8 +163,14 @@
or collection.get_base_id() in app['acl'].get(app['authentication'].getUser()).get_granted_base(['manage'])|keys
or collection.get_base_id() in app['acl'].get(app['authentication'].getUser()).get_granted_base(['modify_struct'])|keys) %}
{% if feature == 'collection' and featured == collection.get_base_id() %}
{% set coll_selected = true %}
{% else %}
{% set coll_selected = false %}
{% endif %}
<li>
<div style="padding:0 0 2px 0;">
<div style="padding:0 0 2px 0;" {% if coll_selected %}class="selected"{% endif %}>
<a target="right" href="{{ path('admin_display_collection', { 'bas_id' : collection.get_base_id() }) }}" class="ajax">
<span>{{ collection.get_name() }}</span>
</a>