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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
This commit is contained in:
Romain Neutron
2014-02-20 16:05:23 +01:00
parent 405dbb7533 53c7af3dbb
commit 12f9575a8b
60 changed files with 168 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/web/prod/upload/lazaret.html.twig
View File

@@ -2,10 +2,27 @@
{% if lazaretFiles is not none %}
{% if lazaretFiles|length > 0 %}
<div class="btn-group" style="text-align:center; padding:5px 0;">
<button class="btn empty-lazaret" title="{{ "Empty quarantine" | trans }}">
<img src="/skins/icons/delete.png">{{ "Empty quarantine" | trans }}
</button>
<div class="btn-toolbar">
<div class="btn-group" style="text-align:center; padding:5px 0;">
<button class="btn empty-lazaret" title="{{ "Empty quarantine" | trans }}">
<img src="/skins/icons/delete.png">{{ "Empty quarantine" | trans }}
</button>
</div>
<div class="btn-group" style="text-align:center; padding:5px 0;">
<button class="btn" title="{{ "Page" | trans }}">
{{ "Page" | trans }}
</button>
{% set items = lazaretFiles | length %}
{% set pages = (items / perPage) | ceil | min(10) %}
{% for i in 1..pages %}
<button class="btn page-lazaret{% if currentPage == i %} active{% endif %}" title="{{ i }}">
<a href="{{ path('lazaret_elements', { 'page' : i }) }}">
{{ i }}
</a>
</button>
{% endfor %}
</div>
</div>
<ul class="unstyled">

16
templates/web/prod/upload/upload.html.twig
View File

@@ -10,7 +10,7 @@
</li>
<li>
{# template prod/upload/lazaret.html.twig loaded via ajax #}
<a href="{{ path('lazaret_elements') }}">
<a class="lazaret-target" href="{{ path('lazaret_elements') }}">
{# <span>&nbsp;</span> element is required for the jQuery loading spinner appears && disappears properly #}
{{ 'Quarantine' | trans }}<span>&nbsp;</span>
</a>
@@ -174,11 +174,18 @@ $(document).ready(function () {
$( anchor.hash ).html(language.error);
});
ui.tab.find('span').html(language.loading + '<img src="/skins/icons/loader404040.gif"/>');
ui.tab.find('span').html(' <img src="/skins/icons/loader404040.gif"/>');
},
load: function(event, ui)
{
ui.tab.find('span').empty();
$('.btn.page-lazaret', UploaderManager.getContainer()).bind('click', function () {
$('.lazaret-target').attr('href', $('a', $(this)).attr('href'));
$(".upload-tabs", UploaderManager.getContainer()).tabs('load', 1);
$('#lazaretBox').empty();
return false;
});
},
create : function () {
$('#tab-upload').css('overflow', 'hidden');
@@ -488,3 +495,8 @@ $(document).ready(function () {
});
});
</script>
<style>
.btn.page-lazaret a {
color: black;
}
</style>