diff --git a/composer.lock b/composer.lock index 7f7fb64ffd..55706da37c 100644 --- a/composer.lock +++ b/composer.lock @@ -1028,12 +1028,12 @@ "source": { "type": "git", "url": "https://github.com/avalanche123/Imagine.git", - "reference": "45aba323391fc079e25382b83561919db117ff51" + "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/45aba323391fc079e25382b83561919db117ff51", - "reference": "45aba323391fc079e25382b83561919db117ff51", + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/64ed228095ec1f99e1124debf87b4b8ebd83070b", + "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b", "shasum": "" }, "require": { @@ -1077,20 +1077,20 @@ "image manipulation", "image processing" ], - "time": "2013-08-15 23:32:14" + "time": "2013-09-02 21:53:44" }, { "name": "jms/metadata", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "2b95de3ff995996cf068314bd4299dbfca2ca668" + "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/2b95de3ff995996cf068314bd4299dbfca2ca668", - "reference": "2b95de3ff995996cf068314bd4299dbfca2ca668", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/0af8423dc23dfeed1592426106d2ffbc69f68057", + "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057", "shasum": "" }, "require": { @@ -1129,7 +1129,7 @@ "xml", "yaml" ], - "time": "2013-08-25 08:44:36" + "time": "2013-08-27 18:10:33" }, { "name": "jms/parser-lib", @@ -1302,16 +1302,16 @@ }, { "name": "media-alchemyst/media-alchemyst", - "version": "0.3.4", + "version": "0.3.5", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git", - "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b" + "reference": "da4dc484cff946a5a2bb1966c538e7132b542b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/3d10c9d3fde4c6e77434b883ed14f08e60b0734b", - "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/da4dc484cff946a5a2bb1966c538e7132b542b8c", + "reference": "da4dc484cff946a5a2bb1966c538e7132b542b8c", "shasum": "" }, "require": { @@ -1321,7 +1321,7 @@ "monolog/monolog": "~1.0", "neutron/temporary-filesystem": "~2.1", "php": ">=5.3.3", - "php-ffmpeg/php-ffmpeg": "~0.3.1", + "php-ffmpeg/php-ffmpeg": "~0.3.4", "php-mp4box/php-mp4box": "~0.3.0", "php-unoconv/php-unoconv": "~0.3.0", "pimple/pimple": "~1.0", @@ -1371,7 +1371,7 @@ "video", "video processing" ], - "time": "2013-08-08 10:18:56" + "time": "2013-09-05 10:26:38" }, { "name": "mediavorus/mediavorus", @@ -1755,16 +1755,16 @@ }, { "name": "php-ffmpeg/php-ffmpeg", - "version": "0.3.2", + "version": "0.3.4", "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-FFmpeg.git", - "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b" + "reference": "c7226654828600e0c44ac6689a07e741b32147dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/9fcb485d497872e674cb14eb3df1386dbda9169b", - "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b", + "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/c7226654828600e0c44ac6689a07e741b32147dd", + "reference": "c7226654828600e0c44ac6689a07e741b32147dd", "shasum": "" }, "require": { @@ -1819,7 +1819,7 @@ "video", "video processing" ], - "time": "2013-08-08 10:15:15" + "time": "2013-09-05 10:09:39" }, { "name": "php-mp4box/php-mp4box", @@ -2264,12 +2264,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Silex.git", - "reference": "d6fe48eaf37e511eef606446012ebf50c68735d2" + "reference": "466beac0e4e05392a1a26e62649347a848a23d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Silex/zipball/d6fe48eaf37e511eef606446012ebf50c68735d2", - "reference": "d6fe48eaf37e511eef606446012ebf50c68735d2", + "url": "https://api.github.com/repos/fabpot/Silex/zipball/466beac0e4e05392a1a26e62649347a848a23d08", + "reference": "466beac0e4e05392a1a26e62649347a848a23d08", "shasum": "" }, "require": { @@ -2339,7 +2339,7 @@ "keywords": [ "microframework" ], - "time": "2013-08-23 16:12:49" + "time": "2013-09-04 08:28:12" }, { "name": "silex/web-profiler", @@ -2543,12 +2543,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "32947b2fc8c199b7aab4475473136ed651c097a0" + "reference": "d1ef0f3fddd9ad92053fec288e3f49bc1fdb7265" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/32947b2fc8c199b7aab4475473136ed651c097a0", - "reference": "32947b2fc8c199b7aab4475473136ed651c097a0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/d1ef0f3fddd9ad92053fec288e3f49bc1fdb7265", + "reference": "d1ef0f3fddd9ad92053fec288e3f49bc1fdb7265", "shasum": "" }, "require": { @@ -2643,15 +2643,15 @@ "keywords": [ "framework" ], - "time": "2013-08-25 08:03:30" + "time": "2013-09-05 08:35:20" }, { "name": "tecnick.com/tcpdf", - "version": "6.0.023", + "version": "6.0.025", "source": { "type": "git", "url": "http://git.code.sf.net/p/tcpdf/code", - "reference": "3ebcb4d8d952ffdcb0fb95db8855da46a8590a26" + "reference": "a8ec5fe7efc5a18d64ad95a760e2626a52674d43" }, "require": { "php": ">=5.3.0" @@ -2700,7 +2700,7 @@ "pdf417", "qrcode" ], - "time": "2013-08-05 19:34:06" + "time": "2013-09-04 18:32:13" }, { "name": "themattharris/tmhoauth", @@ -2708,12 +2708,12 @@ "source": { "type": "git", "url": "https://github.com/themattharris/tmhOAuth.git", - "reference": "0.8.3" + "reference": "47dcee2ac74f8c032d2a1afb836e65108bf582b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/themattharris/tmhOAuth/zipball/0.8.3", - "reference": "0.8.3", + "url": "https://api.github.com/repos/themattharris/tmhOAuth/zipball/47dcee2ac74f8c032d2a1afb836e65108bf582b7", + "reference": "47dcee2ac74f8c032d2a1afb836e65108bf582b7", "shasum": "" }, "require": { diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Language.php b/lib/Alchemy/Phrasea/Controller/Prod/Language.php index 754f165f70..43d1bd9b5b 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Language.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Language.php @@ -104,6 +104,12 @@ class Language implements ControllerProviderInterface $out['forceSendDocument'] = _('Force sending of the document ?'); $out['export'] = _('Export'); $out['share'] = _('Share'); + $out['move'] = _('Move'); + $out['push'] = _('Push'); + $out['feedback'] = _('Feedback'); + $out['toolbox'] = _('Tool box'); + $out['print'] = _('Print'); + $out['attention'] = _('Attention !'); return $app->json($out); }); diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php index e97fd527b7..9c027fe026 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Account.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php @@ -414,7 +414,7 @@ class Account implements ControllerProviderInterface foreach ($app['events-manager']->list_notifications_available() as $notifications) { foreach ($notifications as $notification) { $notifId = $notification['id']; - $notifName = sprintf('notification_%d', $notifId); + $notifName = sprintf('notification_%s', $notifId); if (isset($requestedNotifications[$notifId])) { $app['authentication']->getUser()->setPrefs($notifName, '1'); diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php index 057734fe26..4656a5b1bc 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php @@ -34,6 +34,8 @@ class FilesystemRequirements extends RequirementCollection implements Requiremen $baseDir . '/www/custom', $baseDir . '/tmp/locks', $baseDir . '/tmp/cache_twig', + $baseDir . '/tmp/serializer', + $baseDir . '/tmp/doctrine', $baseDir . '/tmp/cache_minify', $baseDir . '/tmp/lazaret', $baseDir . '/tmp/desc_tmp', diff --git a/lib/classes/appbox.php b/lib/classes/appbox.php index d5f9013e7b..8633ac5732 100644 --- a/lib/classes/appbox.php +++ b/lib/classes/appbox.php @@ -322,6 +322,9 @@ class appbox extends base $finder->in(array( $this->app['root.path'] . '/tmp/cache_minify/', $this->app['root.path'] . '/tmp/cache_twig/', + $this->app['root.path'] . '/tmp/cache/profiler/', + $this->app['root.path'] . '/tmp/doctrine/', + $this->app['root.path'] . '/tmp/serializer/', )) ->depth(0) ->ignoreVCS(true) diff --git a/lib/classes/module/console/systemClearCache.php b/lib/classes/module/console/systemClearCache.php index 8f294a890f..9f350f7188 100644 --- a/lib/classes/module/console/systemClearCache.php +++ b/lib/classes/module/console/systemClearCache.php @@ -41,7 +41,10 @@ class module_console_systemClearCache extends Command ->exclude('.svn') ->in(array( $this->container['root.path'] . '/tmp/cache_minify/', - $this->container['root.path'] . '/tmp/cache_twig/' + $this->container['root.path'] . '/tmp/cache_twig/', + $this->container['root.path'] . '/tmp/cache/profiler/', + $this->container['root.path'] . '/tmp/doctrine/', + $this->container['root.path'] . '/tmp/serializer/', )); $filesystem = new Filesystem(); diff --git a/templates/mobile/common/index.html.twig b/templates/mobile/common/index.html.twig index 37dd970e43..d405170cfc 100644 --- a/templates/mobile/common/index.html.twig +++ b/templates/mobile/common/index.html.twig @@ -8,6 +8,31 @@ + {% block stylesheet %}{% endblock %} {% block icon %}{% endblock %} {% block javascript %}{% endblock %} diff --git a/templates/mobile/common/thumbnail.html.twig b/templates/mobile/common/thumbnail.html.twig index 34ba286549..b8d676b229 100644 --- a/templates/mobile/common/thumbnail.html.twig +++ b/templates/mobile/common/thumbnail.html.twig @@ -71,12 +71,12 @@ {% endmacro %} {% macro format100percent(thumbnail, extraclass)%} - {% set record_type = thumbnail.get_type() %} -
+ {% set record_type = thumbnail.get_type() %} +
{% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} {% set random = thumbnail.get_random() %} -
-
- - +
{% endmacro %} diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 2431c258c4..ddfb3aac0d 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -7,7 +7,7 @@ {% endblock %} {% block stylesheet %} - + {% endblock %} {% block content %} @@ -19,13 +19,12 @@ Home
- {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }} + {{ thumbnail.format100percent(record.get_preview()) }} {% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
-
@@ -45,5 +44,11 @@
+
{% endblock %} diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig index 66006c3a6f..3ae130a7c4 100644 --- a/templates/mobile/lightbox/feed_element.html.twig +++ b/templates/mobile/lightbox/feed_element.html.twig @@ -7,7 +7,7 @@ {% endblock %} {% block stylesheet %} - + {% endblock %} {% block content %} @@ -19,10 +19,16 @@ Home
- {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }} + {{ thumbnail.format100percent(record.get_preview()) }}
+ {% endblock %} diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig index 0960f6b65b..435b4d8464 100644 --- a/templates/mobile/lightbox/index.html.twig +++ b/templates/mobile/lightbox/index.html.twig @@ -39,7 +39,7 @@ {% trans 'a propos'%}
-
@@ -262,6 +262,10 @@ $(".taskMenuItem").bind("click", function() { + if ($(this).hasClass('disabled')) { + return false; + } + var action = $(this).attr("id").split('_'); switch(action[0]) diff --git a/templates/web/admin/user/demand.html.twig b/templates/web/admin/user/demand.html.twig index f235048d72..a06bb5935b 100644 --- a/templates/web/admin/user/demand.html.twig +++ b/templates/web/admin/user/demand.html.twig @@ -19,92 +19,163 @@ $(document).ready(function(){ resize(); + $(window).resize(function(){ resize(); }); - }); + var $form = $("form#accept-demand"); + var $mainBtnAction = $(".btn-all-action", $form); + var $basesBtnAction = $(".btn-single-action", $form); - function checkDeny(el) - { - if(!$(el).hasClass('active')) - { - $('.disabler_'+$(el).attr('id').substring(5)).removeClass('active'); - } - else - { - } - } + $(".btn-all-action, .btn-single-action").on("uncheck-all", function(event) { + $("button", $(event.currentTarget)).removeClass("active"); + }).on("uncheck-deny", function(event) { + var $btnGroup = $(event.currentTarget); + var $denyButton = $(".deny-checker", $btnGroup); + + if ($denyButton.hasClass("active")) { + $denyButton.removeClass("active"); + $(".deny-checker", $mainBtnAction).removeClass("active"); + } + }).on("check-deny", function(event) { + var $btnGroup = $(event.currentTarget); + var $denyButton = $(".deny-checker", $btnGroup); - function checkAdd(el) - { - if(!$(el).hasClass('active')) - { - $('#accept_'+$(el).attr('id').substring(10)).addClass('active'); - $('#deny_'+$(el).attr('id').substring(10)).removeClass('active'); - } - } + if (false === $denyButton.hasClass("active")) { + $btnGroup.trigger("uncheck-all"); + $denyButton.addClass("active"); - function checkRemove(el) - { - if($(el).hasClass('active')) - { - $('.disabler_'+$(el).attr('id').substring(7)).each(function(){ - $(this).removeClass('active'); - }); - $(el).addClass('active'); - } - else - { - $('#deny_'+$(el).attr('id').substring(7)).removeClass('active'); - } - } + var nbActiveButton = $(".deny-checker.active", $basesBtnAction).length; + var totalBtn = $(".deny-checker", $basesBtnAction).length; + + if (nbActiveButton === totalBtn) { + $(".deny-checker", $mainBtnAction).addClass("active"); + } + } + }).on("check-accept", function(event) { + var $btnGroup = $(event.currentTarget); + var $acceptBtn = $(".accept-checker", $btnGroup); - function modelChecker(usr) - { - var val = $('#model_'+usr)[0].value; + if (false === $acceptBtn.hasClass("active")) { + $btnGroup.trigger('uncheck-deny'); + $acceptBtn.addClass("active"); - var bool = false; - if(!isNaN(val) && val!== '') - bool = true; + var nbActiveButton = $(".accept-checker.active", $basesBtnAction).length; + var totalBtn = $(".accept-checker", $basesBtnAction).length; - if(bool) - $('#sub_usr_'+usr).slideToggle('slow'); - else - $('#sub_usr_'+usr).slideToggle('slow'); + if (nbActiveButton === totalBtn) { + $(".accept-checker", $mainBtnAction).addClass("active"); + } + } + }).on("uncheck-accept", function(event) { + var $btnGroup = $(event.currentTarget); + var $acceptBtn = $(".accept-checker", $btnGroup); - if(bool) - $('.checker_'+usr).attr('disabled','disabled'); - else - $('.checker_'+usr).removeAttr('disabled'); + if ($acceptBtn.hasClass("active")) { + $acceptBtn.removeClass("active"); + $(".accept-checker", $mainBtnAction).removeClass("active"); + + $btnGroup.trigger("uncheck-hd"); + $btnGroup.trigger("uncheck-watermark"); + } + }).on('check-hd', function(event) { + var $btnGroup = $(event.currentTarget); + var $hdBtn = $(".accept-hd-checker", $btnGroup); - } + if (false === $hdBtn.hasClass("active")) { + $hdBtn.addClass('active'); - function checkAll(that) - { - var bool = true; - var first = true; - $('.'+that+'_checker:not(.active)').each(function(){ - // if(!$(this)[0].disabled) - // { - if(first && !$(this).hasClass('active')) - bool = false; - if (bool === false) - $(this).removeClass('active'); - else - $(this).addClass('active'); - first = false; - if(that === 'deny') - checkDeny($(this)); - if(that === 'accept_hd') - checkAdd(this); - if(that === 'watermark') - checkAdd(this); - if(that === 'accept') - checkRemove(this); - // } + var nbActiveButton = $(".accept-hd-checker.active", $basesBtnAction).length; + var totalBtn = $(".accept-hd-checker", $basesBtnAction).length; + + if (nbActiveButton === totalBtn) { + $(".accept-hd-checker", $mainBtnAction).addClass("active"); + } + + $btnGroup.trigger('uncheck-deny').trigger('check-accept'); + } + }).on('uncheck-hd', function(event) { + var $btnGroup = $(event.currentTarget); + var $hdBtn = $(".accept-hd-checker", $btnGroup); + + if ($hdBtn.hasClass("active")) { + $hdBtn.removeClass("active"); + $(".accept-hd-checker", $mainBtnAction).removeClass("active"); + } + }).on('check-watermark', function(event) { + var $btnGroup = $(event.currentTarget); + var $watermarkBtn = $(".accept-watermark-checker", $btnGroup); + + if (false === $watermarkBtn.hasClass("active")) { + $watermarkBtn.addClass('active'); + + var nbActiveButton = $(".accept-watermark-checker.active", $basesBtnAction).length; + var totalBtn = $(".accept-watermark-checker", $basesBtnAction).length; + + if (nbActiveButton === totalBtn) { + $(".accept-watermark-checker", $mainBtnAction).addClass("active"); + } + + $btnGroup.trigger('uncheck-deny').trigger('check-accept'); + } + }).on('uncheck-watermark', function(event) { + var $btnGroup = $(event.currentTarget); + var $watermarkBtn = $(".accept-watermark-checker", $btnGroup); + + if ($watermarkBtn.hasClass("active")) { + $watermarkBtn.removeClass('active'); + $(".accept-watermark-checker", $mainBtnAction).removeClass("active"); + } }); - } + + $.each([ + $('.deny-checker', $basesBtnAction), + $('.accept-checker', $basesBtnAction), + $('.accept-hd-checker', $basesBtnAction), + $('.accept-watermark-checker', $basesBtnAction) + ], function(i, buttons) { + buttons.bind("click", function(event) { + var $this = $(this); + var $btnGroup = $this.closest('.btn-group'); + var event = $this.data('event'); + + if ($this.hasClass("active")) { + $btnGroup.trigger("uncheck-"+ event); + } else { + $btnGroup.trigger('check-' + event); + } + }); + }); + + $.each([ + $('.deny-checker', $mainBtnAction), + $('.accept-checker', $mainBtnAction), + $('.accept-hd-checker', $mainBtnAction), + $('.accept-watermark-checker', $mainBtnAction) + ], function(i, buttons) { + buttons.bind("click", function(event) { + var $this = $(this); + var event = $this.data('event'); + + if ($this.hasClass("active")) { + $mainBtnAction.trigger("uncheck-"+ event); + $basesBtnAction.trigger("uncheck-"+ event); + } else { + $mainBtnAction.trigger('check-' + event); + $basesBtnAction.trigger('check-' + event); + } + }); + }); + + $(".submit", $form).bind("click", function (event) { + $(".btn.active", $basesBtnAction).each(function() { + $("").attr("type", "hidden").attr("name", this.name).val(this.value).appendTo($form); + }); + + $form.submit(); + }); + });
@@ -119,19 +190,19 @@ {% endif %} {% if table['user'] | length > 0 %} -
-
- - - -
@@ -139,7 +210,6 @@ {% trans 'Informations' %} - {% trans 'admin::compte-utilisateur date d\'inscription' %} {% trans 'admin::collection' %} {% trans 'Models' %} @@ -152,7 +222,9 @@
- {{ loop.index }} + + {{ app['date-formatter'].getPrettyString(row["date_modif"]) }} + -
@@ -178,52 +250,27 @@
{{ row['ville'] }}
{{ row['pays'] }}
- 		- {{ app['date-formatter'].getPrettyString(row["date_modif"]) }} - {# Delete this when the JS 'll be updated -- - - {% for basId in colls %} - - - - - - - - {% endfor %} -
- - - - - - - - - {{ basId| bas_labels(app) }} -
- {#-- End of delete #} {% for basId in colls %} -
- - - - -

{{ basId| bas_labels(app) }}

+ {% set btn_value = row['usr_id'] ~ "_" ~ basId %} +
+ + + + +
{% endfor %} 		@@ -242,7 +289,7 @@
- +
{% else %} diff --git a/templates/web/prod/actions/Property/type.html.twig b/templates/web/prod/actions/Property/type.html.twig index 15f3b15c1e..591db4ead2 100644 --- a/templates/web/prod/actions/Property/type.html.twig +++ b/templates/web/prod/actions/Property/type.html.twig @@ -11,7 +11,7 @@
- {% for option in typesEnum %} diff --git a/templates/web/prod/actions/collection_default.html.twig b/templates/web/prod/actions/collection_default.html.twig index 0b2a5c4da7..cd775c75e8 100644 --- a/templates/web/prod/actions/collection_default.html.twig +++ b/templates/web/prod/actions/collection_default.html.twig @@ -1,55 +1,55 @@ -
- - {% if records.databoxes() | length > 1 %}1 - {% trans 'prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble' %} -
- +{% set canValid = false %} +
+ + {% if records.databoxes() | length > 1 %} +
+ {% trans 'prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble' %}
- {% elseif records | length == 0 %}2 - {% trans 'prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document' %} -
- + {% elseif records | length == 0 %} +
+ {% trans 'prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document' %}
- {% elseif collections | length == 0 %}3 - {% trans 'erreur : Vous n\'avez pas les droits' %} -
- + {% elseif collections | length == 0 %} +
+ {% trans 'erreur : Vous n\'avez pas les droits' %}
{% else %} + {% set canValid = true %} -
- {% if records | length != records.received() | length %} + {% if records | length != records.received() | length %} +
{% set countable = records.received().count() - records.count() %} {% trans %} - prod::collection {{countable}} documents ne pouvant etres mofiies + One document can not be modified. + {% plural countable %} + {{countable}} documents can not be modified. {% endtrans %} - {% endif %} +
+ {% endif %} + +
+ {% set countable = records | length %} + {% trans %} + Move one record to the chose collection in the list. + {% plural countable %} + Move {{ countable }} records to the chosen collection in the list. + {% endtrans %} +
+ +
+
- {% set countable = records | length %} - {% trans %} - prod::collection {{countable}} documents a deplacer - {% endtrans %} -
-
- -
-
-
{% if records.stories() | length > 0 %} - - - - - -
- - {% trans 'prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s)' %} -
+
+ +
{% endif %} @@ -58,55 +58,53 @@
- + +{% endif %} diff --git a/tmp/cache/profiler/.gitignore b/tmp/cache/profiler/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/tmp/cache/profiler/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/tmp/doctrine/.gitignore b/tmp/doctrine/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/tmp/doctrine/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/tmp/serializer/.gitignore b/tmp/serializer/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/tmp/serializer/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js index 56627efcfa..2d2f8a0b16 100644 --- a/www/skins/prod/jquery.main-prod.js +++ b/www/skins/prod/jquery.main-prod.js @@ -1617,7 +1617,7 @@ function toggleRemoveReg(el) function deleteThis(lst) { if(lst.split(';').length === 0 ) { - alert(langage.nodocselected); + alert(language.nodocselected); return false; } @@ -1643,7 +1643,7 @@ function chgCollThis(datas) { $dialog = p4.Dialog.Create({ size:'Small', - title:'Move', + title: language.move, closeButton:true }); $.ajax({ @@ -1660,7 +1660,7 @@ function pushThis(sstt_id, lst, story) { $dialog = p4.Dialog.Create({ size:'Full', - title:'Push' + title:language.push }); $.post("../prod/push/sendform/", { @@ -1678,7 +1678,7 @@ function feedbackThis(sstt_id, lst, story) /* disable push closeonescape as an over dialog may exist (add user) */ $dialog = p4.Dialog.Create({ size:'Full', - title:'Feedback' + title:language.feedback }); $.post("../prod/push/validateform/", { @@ -1695,7 +1695,7 @@ function toolREFACTOR(datas){ var dialog = p4.Dialog.Create({ size:'Medium', - title:'Tool box', + title:language.toolbox, loading: true }); @@ -2345,7 +2345,7 @@ function checkDeleteThis(type, el) deleteBasket(el); }; - $('#DIALOG').empty().append(language.confirmDel).attr('title','Attention !').dialog({ + $('#DIALOG').empty().append(language.confirmDel).attr('title', language.attention).dialog({ autoOpen:false, resizable:false, modal:true, @@ -2376,7 +2376,7 @@ function printThis(value) if ($("#DIALOG").data("ui-dialog")) { $("#DIALOG").dialog('destroy'); } - $('#DIALOG').attr('title', 'Print') + $('#DIALOG').attr('title', language.print) .empty().addClass('loading') .dialog({ resizable:false,