Merge branch '3.8'

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

lib/classes/patch/383alpha2a.php

@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2012 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Alchemy\Phrasea\Application;
+
+class patch_383alpha2a implements patchInterface
+{
+    /** @var string */
+    private $release = '3.8.3-alpha.2';
+
+    /** @var array */
+    private $concern = array(base::APPLICATION_BOX);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get_release()
+    {
+        return $this->release;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concern()
+    {
+        return $this->concern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(base $appbox, Application $app)
+    {
+        // Clean validation sessions where initiator_id does not exist anymore
+        $sql = 'SELECT DISTINCT(v.id) AS validation_session_id FROM `ValidationSessions` v LEFT JOIN usr u ON (v.initiator_id = u.usr_id) WHERE u.usr_id IS NULL';
+        $stmt = $appbox->get_connection()->prepare($sql);
+        $stmt->execute();
+        $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+        $stmt->closeCursor();
+
+        foreach ($rows as $row) {
+            if (null !== $vsession = $app['EM']->find('Entities\ValidationSession', $row['validation_session_id'])) {
+                $app['EM']->remove($vsession);
+            }
+        }
+
+        $app['EM']->flush();
+
+        return true;
+    }
+}

templates/web/admin/collection/collection.html.twig

@@ -116,21 +116,21 @@
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{% if collection.is_active() %}{{ path('admin_collection_disable', { 'bas_id' : bas_id }) }}{% else %}{{ path('admin_collection_enable', { 'bas_id' : bas_id }) }}{% endif %}">
-        <button class="btn confirm reload submiter" data-confirm-msg="{{ collection.is_active() ? 'admin::base:collection: etes vous sur darreter la publication de cette collection'|trans  : 'admin::base:collection: etes vous sur de publier cette collection ?'|trans }}">
+        <button type="button" class="btn confirm reload submiter" data-confirm-msg="{{ collection.is_active() ? 'admin::base:collection: etes vous sur darreter la publication de cette collection'|trans  : 'admin::base:collection: etes vous sur de publier cette collection ?'|trans }}">
             <img src="/skins/icons/db-remove.png"/>
             {{ collection.is_active() ? 'admin::base:collection: descativer la collection' | trans  : 'admin::base:collection: activer la collection'| trans }}
         </button>
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_empty', { 'bas_id' : bas_id }) }}">
-        <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" 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>
     </form>
 
     <form style="display:inline; margin:0;" method="post" action="{{ path('admin_collection_delete', { 'bas_id' : bas_id }) }}">
-        <button class="btn confirm submiter reload-tree" data-confirm-msg="{{ 'admin::collection: Confirmez vous la suppression de cette collection ?' | trans }}">
+        <button type="button" class="btn confirm submiter reload-tree" data-confirm-msg="{{ 'admin::collection: Confirmez vous la suppression de cette collection ?' | trans }}">
             <img src="/skins/icons/delete.gif" />
             {{ 'boutton::supprimer' | trans }}
         </button>

templates/web/admin/collection/suggested_value.html.twig

@@ -809,7 +809,7 @@ pref["{{ value['key']|escapeDoubleQuote|raw }}"].valsug["{{ value['value']|escap
 
 function getSruct()
 {
-    var dom = document.implementation.createDocument(null, 'baseprefs');
+    var dom = document.implementation.createDocument(null, 'baseprefs', null);
     var values = dom.createElement('sugestedValues');
 
     for (a in pref ) {

templates/web/admin/databox/databox.html.twig

@@ -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>

templates/web/login/layout/base-layout.html.twig

@@ -108,7 +108,7 @@
                                                        {% if has_terms_of_use %}
                                                            <li>
                                                                {% block tou_link %}
-                                                                   <a href="{{ path("login_cgus") }}">{{ "Terms of use" | trans }}</a>
+                                                                   <a href="{{ path("login_cgus") }}" target="_blank">{{ "Terms of use" | trans }}</a>
                                                                {% endblock tou_link %}
                                                            </li>
                                                        {% endif %}

www/skins/login/less/skin.less

@@ -878,7 +878,7 @@ form[name=registerForm] .multiselect-group {
     #authentication-sidebar-language {
         position: absolute;
         top: 0;
-        left: 0;
+        left: 20px;
         right: 20px;
     }
 

www/skins/prod/Push.css

@@ -258,7 +258,7 @@
 
 .ui-autocomplete li.list-item {
     width:280px;
-    height:45px;
+    min-height:45px;
     display:block;
 }