mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-14 13:33:14 +00:00
Remove unusued files
Enhance bootstrap multiselect CSS
This commit is contained in:
@@ -116,6 +116,16 @@
|
|||||||
|
|
||||||
{% block left_content %}
|
{% block left_content %}
|
||||||
{{ parent() }}
|
{{ 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 %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block scripts %}
|
{% block scripts %}
|
||||||
|
@@ -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
|
|
||||||
};
|
|
||||||
});
|
|
@@ -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'
|
|
||||||
});
|
|
||||||
});
|
|
@@ -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;
|
|
||||||
});
|
|
@@ -722,6 +722,7 @@ form[name=registerForm] .multiselect {
|
|||||||
|
|
||||||
form[name=registerForm] .multiselect-container {
|
form[name=registerForm] .multiselect-container {
|
||||||
width: 99%;
|
width: 99%;
|
||||||
|
z-index: 1020;
|
||||||
}
|
}
|
||||||
|
|
||||||
form[name=registerForm] .multiselect-container li.active label{
|
form[name=registerForm] .multiselect-container li.active label{
|
||||||
|
Reference in New Issue
Block a user