diff --git a/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php b/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php index f81ac98cd8..d5fa8fb919 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php +++ b/lib/Alchemy/Phrasea/Command/Setup/XSendFileMappingGenerator.php @@ -84,6 +84,8 @@ class XSendFileMappingGenerator extends Command private function extractPath(\appbox $appbox) { + $paths = array(); + foreach ($appbox->get_databoxes() as $databox) { $paths[] = (string) $databox->get_sxml_structure()->path; foreach ($databox->get_subdef_structure() as $group => $subdefs) { diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Root.php b/lib/Alchemy/Phrasea/Controller/Admin/Root.php index 3ae8a00388..24b578f9d8 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Root.php @@ -104,8 +104,6 @@ class Root implements ControllerProviderInterface return $app->redirectPath('logout'); } - $section = $request->query->get('section', false); - $available = [ 'connected', 'registrations', diff --git a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php index cb0c9e1b40..25a06ca974 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php +++ b/lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php @@ -134,7 +134,7 @@ class Migration38 implements MigrationInterface private function fetchInstanceKey() { - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare('SELECT `value` FROM registry WHERE `key` = "GV_SIT"'); + $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare('SELECT `value` FROM registry WHERE `key` = "GV_sit"'); $stmt->execute(); $rs = $stmt->fetch(\PDO::FETCH_ASSOC); $stmt->closeCursor(); diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig index 366abf90cd..ef05e57983 100644 --- a/templates/web/admin/collection/collection.html.twig +++ b/templates/web/admin/collection/collection.html.twig @@ -123,7 +123,7 @@
- @@ -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); } diff --git a/templates/web/admin/databox/databox.html.twig b/templates/web/admin/databox/databox.html.twig index aa24b775c5..0e4e6fc99a 100644 --- a/templates/web/admin/databox/databox.html.twig +++ b/templates/web/admin/databox/databox.html.twig @@ -146,7 +146,7 @@
- diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig index 75896073bf..0dd0b73b6f 100644 --- a/templates/web/admin/index.html.twig +++ b/templates/web/admin/index.html.twig @@ -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'); } diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig index efebc143a6..ab65d59a6b 100644 --- a/templates/web/admin/tree.html.twig +++ b/templates/web/admin/tree.html.twig @@ -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 %} +
  • -
    +
    {{ collection.get_name() }} diff --git a/templates/web/email-template.html.twig b/templates/web/email-template.html.twig index f74b5dfc39..27ea33876e 100644 --- a/templates/web/email-template.html.twig +++ b/templates/web/email-template.html.twig @@ -22,22 +22,22 @@ {{ subject }} - +
    -
    + {{ 'Si cet email contient des liens non cliquables, copiez/collez ces liens dans votre navigateur.' | trans }}
    - +
    -
    + {% if logoUrl is not none %} {{ logoText }} {% else %} @@ -50,7 +50,7 @@ - @@ -66,7 +66,7 @@ - - @@ -124,7 +124,7 @@ -
    + {{ subject }}
    + {% if senderName is not none and senderMail is not none %} {{ senderName }} - {{ senderMail }}
    @@ -105,7 +105,7 @@ {% endif %} {% if expiration is not none %}
    + Ce lien est valable jusqu'au {{ app['date-formatter'].getDate(expiration) }} {{ app['date-formatter'].getTime(expiration) }}
    + {{ 'Message automatique de Phraseanet' | trans }}
    {% set link %} diff --git a/www/skins/admin/css/Main.css b/www/skins/admin/css/Main.css index 944237edcd..63b26947c4 100644 --- a/www/skins/admin/css/Main.css +++ b/www/skins/admin/css/Main.css @@ -283,3 +283,12 @@ div.switch_right.unchecked { margin: 10px 0; line-height: 22px; } + +#tab_demandes .dl-horizontal dd { + word-break: break-all; + margin-left: 140px; +} + +#tab_demandes .dl-horizontal dt { + width: 130px; +}