diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig index ff81759490..6ec17964dd 100644 --- a/templates/web/login/index.html.twig +++ b/templates/web/login/index.html.twig @@ -116,6 +116,16 @@ {% block left_content %} {{ parent() }} + + {% set display_layout = app['phraseanet.registry'].get('GV_home_publi') %} + + {% if display_layout == 'DISPLAYx1' %} + {% include 'login/include/x1-content.html.twig' %} + {% elseif display_layout == "COOLIRIS" %} + {% include 'login/include/cooliris-content.html.twig' %} + {% elseif display_layout == "SCROLL" %} + {% include 'login/include/scroll-content.html.twig' %} + {% endif %} {% endblock %} {% block scripts %} diff --git a/www/scripts/apps/login/home/app.js b/www/scripts/apps/login/home/app.js deleted file mode 100644 index 86cbde94e1..0000000000 --- a/www/scripts/apps/login/home/app.js +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of Phraseanet - * - * (c) 2005-2013 Alchemy - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -define([ - "jquery", - "underscore", - "backbone", - "apps/login/home/views/loginForm" -], function($, _, Backbone, LoginForm) { - var initialize = function() { - var loginFormView = new LoginForm({ - el : $("form[name=loginForm]"), - rules: [{ - name: "login", - rules: "required", - message: "This field is requerid" - },{ - name: "login", - rules: "valid_email", - message: "This field must be a valid email" - },{ - name: "password", - rules: "required", - message: "This field is requerid" - }] - }); - }; - - return { - initialize: initialize - }; -}); diff --git a/www/scripts/apps/login/home/main.js b/www/scripts/apps/login/home/main.js deleted file mode 100644 index 8c88bf5d31..0000000000 --- a/www/scripts/apps/login/home/main.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of Phraseanet - * - * (c) 2005-2013 Alchemy - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -// configure AMD loading -require.config({ - baseUrl: "/scripts", - paths: { - jquery: "../include/jslibs/jquery-1.7.1", - jqueryui: "../include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min", - underscore: "../assets/underscore-amd/underscore", - backbone: "../assets/backbone-amd/backbone", - bootstrap: "../skins/html5/bootstrap/js/bootstrap.min" - }, - shim: { - bootstrap : ["jquery"], - jqueryui: { - deps: ["jquery"] - } - } -}); - -// launch application -require(["apps/login/home/app"], function(App) { - App.initialize(); -}); - -// close alerts -$(document).ready(function() { - $(document).on("click", ".alert .alert-block-close a", function(e){ - e.preventDefault(); - $(this).closest('.alert').alert('close'); - return false; - }); - - $("select[multiple='multiple']").multiselect({ - buttonWidth : "100%", - buttonClass: 'btn btn-inverse' - }); -}); diff --git a/www/scripts/apps/login/home/views/loginForm.js b/www/scripts/apps/login/home/views/loginForm.js deleted file mode 100644 index 820dc901ed..0000000000 --- a/www/scripts/apps/login/home/views/loginForm.js +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of Phraseanet - * - * (c) 2005-2013 Alchemy - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -define([ - "jquery", - "underscore", - "backbone", - "bootstrap", - "common/validator", - "apps/login/home/views/inputView" -], function($, _, Backbone, bootstrap, Validator, InputView) { - var LoginFormView = Backbone.View.extend({ - events: { - "submit": "onSubmit" - }, - initialize: function(options) { - var self = this; - var rules = []; - - if (options) { - rules = options.rules || []; - } - // get a new validator defined rules - this.validator = new Validator(rules); - - this.inputViews = {}; - - // creates input views for each input - _.each(this.$el.serializeArray(), function (input) { - var name = input.name; - self.inputViews[name] = new InputView({ - name: name, - el : $("input[name="+name+"]", self.$el).closest("div") - }); - }); - }, - onSubmit: function (event) { - var self = this; - - // reset previous errors in the view - this._resetInputErrors(); - - // validate new values - this.validator.validate(this.$el.serializeArray()); - - if (this.validator.hasErrors()) { - // cancel submit - event.preventDefault(); - // group errors by input - _.each(_.groupBy(this.validator.getErrors(), function(error){ - return error.name; - }), function (errors, name) { - // show new errors in the views - self.inputViews[name].showErrors(errors); - }); - } - }, - _resetInputErrors: function() { - _.each(this.inputViews, function(view) { - view.resetErrors(); - }); - } - }); - - return LoginFormView; -}); diff --git a/www/skins/login/less/skin.less b/www/skins/login/less/skin.less index 7fd3f9f042..e6b01c0c85 100644 --- a/www/skins/login/less/skin.less +++ b/www/skins/login/less/skin.less @@ -722,6 +722,7 @@ form[name=registerForm] .multiselect { form[name=registerForm] .multiselect-container { width: 99%; + z-index: 1020; } form[name=registerForm] .multiselect-container li.active label{