diff --git a/builder.php b/builder.php index 59ba897505..2b2ebb74a7 100755 --- a/builder.php +++ b/builder.php @@ -96,8 +96,6 @@ $finder ->name('.svn') ->name('.git') ->name('flash') - ->name('angular-mocks') - ->name('angular-scenario') ->name('qunit') ->name('features') ->name('chai') diff --git a/component.json b/component.json index 01f43b5742..00b2f94088 100644 --- a/component.json +++ b/component.json @@ -5,10 +5,6 @@ "bootstrap": "~2.2.2", "jquery": "~1.8.3", "font-awesome": "~3.0.2", - "angular": "~1.0.5", - "angular-mocks": "~1.0.5", - "angular-scenario": "~1.0.5", - "angular-ui": "~0.4.0", "underscore": "~1.4.4", "modernizr": "~2.6.2", "normalize-css" : "~2.1.0", diff --git a/lib/conf.d/minifyGroupsConfig.php b/lib/conf.d/minifyGroupsConfig.php index a7dd2972f2..bcf94085af 100644 --- a/lib/conf.d/minifyGroupsConfig.php +++ b/lib/conf.d/minifyGroupsConfig.php @@ -21,9 +21,7 @@ $groups = array( '//assets/angular/angular.js', '//assets/angular-ui/build/angular-ui.js', '//assets/bootstrap-switch/static/js/bootstrapSwitch.js', - '//assets/underscore/underscore.js', - '//skins/login/js/main.js', - '//skins/login/js/app.js', + '//assets/underscore/underscore.js' ), 'client' => array( '//include/jslibs/swfobject/swfobject.js' diff --git a/templates/web/login/common/form_div_layout.html.twig b/templates/web/login/common/form_div_layout.html.twig index 15b63ee171..ddbbbe5eef 100644 --- a/templates/web/login/common/form_div_layout.html.twig +++ b/templates/web/login/common/form_div_layout.html.twig @@ -13,7 +13,7 @@ {% block form_widget_simple %} {% spaceless %} {% set type = type|default('text') %} - + {% endspaceless %} {% endblock form_widget_simple %} diff --git a/templates/web/login/common/macros.html.twig b/templates/web/login/common/macros.html.twig index 32f9f9ca65..340c111328 100644 --- a/templates/web/login/common/macros.html.twig +++ b/templates/web/login/common/macros.html.twig @@ -1,23 +1,14 @@ {% macro fieldInput(field, form_name, icon_name, custom_attributes, validation_messages) %} {% set input_name = field.vars.name %} - {% set validation_messages = { - "required_message" : "This field is required" |trans, - "is_valid_message" : "This field is not valid"|trans, - "validate_message" : "This field is not valid"|trans - }|merge(validation_messages|default({})) - %} - {% set attributes = custom_attributes|default({})|merge({ 'class': app['browser'].getBrowser() == constant('Browser::BROWSER_IE') and app['browser'].getVersion() <= 8 ? '' : 'input-block-level', - 'ng-model' : input_name|camelize, - 'force-model-update' : '' }) %} {{ form_label(field) }} - +
@@ -27,23 +18,7 @@
- - {% if field.vars.required %} -
- {{ _self.fieldError(validation_messages.required_message) }} -
- {% endif %} - -
- {{ _self.fieldError(validation_messages.is_valid_message) }} -
- - {% if attributes['ui-validate'] is defined %} -
- {{ _self.fieldError(validation_messages.validate_message) }} -
- {% endif %} - +
{{ form_errors(field) }} {% endmacro %} diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig index 87db17a819..74f245db6a 100644 --- a/templates/web/login/index.html.twig +++ b/templates/web/login/index.html.twig @@ -1,9 +1,3 @@ -{# - variable "feed" to get public feeds - variable "recaptcha_display" should be setted Tell whether the recaptch should be displayed - variable "guest_allowed" phrasea::guest_allowed($app) - #} - {% extends "login/layout/sidebar-layout.html.twig" %} {% import "common/macros.html.twig" as macro %} @@ -22,6 +16,11 @@ {% endfor %} {% endblock %} +{% block header_javascript %} + {{ parent() }} + {% include "login/common/templates.html.twig" %} +{% endblock header_javascript %} + {% block sidebar %}
@@ -48,13 +47,10 @@ {% endif %}
@@ -122,14 +118,4 @@ {% 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 %} diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index 0b8148416c..79d0e731ef 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -1,11 +1,10 @@ -{# variable "login" a login object for all template as i is inherited #} - - - + + + - + {% block header %} @@ -34,23 +33,7 @@ {% endblock header_stylesheet %} {% block header_javascript %} - - - - + {% endblock header_javascript %} {% endblock header %} @@ -107,5 +90,9 @@ {% endblock footer_scaffholding %}
{% include 'common/analytics.html.twig' %} + + {% block scripts %} + + {% endblock %} diff --git a/tests/js/login/config/testacular.conf.js b/tests/js/login/config/testacular.conf.js deleted file mode 100644 index 412643cf6c..0000000000 --- a/tests/js/login/config/testacular.conf.js +++ /dev/null @@ -1,16 +0,0 @@ -basePath = '../../../../'; - -files = [ - JASMINE, - JASMINE_ADAPTER, - 'www/assets/angular/angular.js', - 'www/assets/angular-ui/build/angular-ui.js', - 'www/assets/underscore/underscore.js', - 'www/assets/angular-mocks/angular-mocks.js', - 'www/skins/login/js/app.js', - 'tests/js/login/tests/unit/*.js' -]; - -autoWatch = true; - -browsers = ['PhantomJS']; diff --git a/tests/js/login/tests/unit/controllersSpec.js b/tests/js/login/tests/unit/controllersSpec.js deleted file mode 100644 index 969b9cd2e4..0000000000 --- a/tests/js/login/tests/unit/controllersSpec.js +++ /dev/null @@ -1,312 +0,0 @@ -'use strict'; - -describe('LoginFormController', function(){ - var scope; - beforeEach(inject(function($rootScope) { - scope = $rootScope.$new(); - scope.isSubmitted = false; - scope.loginForm = { - login : { - errors:{}, - $valid : true, - $error : { - required : false - } - }, - password : { - errors:{}, - $valid : true, - $error : { - required : false - } - } - }; - })); - - it('should create model errors with 2 validation for each input', inject(function($controller) { - $controller(LoginFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(Object.keys(scope.loginForm.login.errors).length).toEqual(2); - expect(Object.keys(scope.loginForm.password.errors).length).toEqual(2); - })); - - it('should return input-table-error class when input is not valid', inject(function($controller) { - scope.loginForm.login.errors.valid = false; - scope.loginForm.password.errors.valid = true; - - $controller(LoginFormCtrl, { - $scope: scope - }); - - expect(scope.getInputClass('password')).toBe(''); - expect(scope.getInputClass('login')).toEqual('input-table-error'); - })); - - it('The valid login input validation should be equal to input form validation if form is submited and not valid', inject(function($controller) { - scope.loginForm.$valid = false; - - $controller(LoginFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.loginForm.login.errors.valid).toBe(scope.loginForm.login.$valid); - })); - - it('The filled password and login input validation should be true if input is not required and form is submited and not valid', inject(function($controller) { - scope.loginForm.$valid = false; - - $controller(LoginFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.loginForm.login.errors.filled).not.toBe(scope.loginForm.login.$error.required); - expect(scope.loginForm.password.errors.filled).not.toBe(scope.loginForm.password.$error.required); - })); - - it('Should reset input validation errors when form is submited and valid', inject(function($controller) { - $controller(LoginFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - var startLoginState = _.clone(scope.loginForm.login.errors); - var startPasswordState = _.clone(scope.loginForm.password.errors); - - scope.loginForm.$valid = true; - - scope.loginForm.login.errors.valid = false; - scope.loginForm.password.errors.valid = false; - - scope.submit(); - - expect(scope.loginForm.login.errors).toEqual(startLoginState); - expect(scope.loginForm.password.errors).toEqual(startPasswordState); - })); - - it('should not submit form if it is not valid', inject(function($controller) { - scope.loginForm.$valid = false; - - $controller(LoginFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.submit()).toBe(false); - })); -}); - -describe('passwordChangeFormController', function(){ - var scope; - beforeEach(inject(function($rootScope) { - scope = $rootScope.$new(); - scope.isSubmitted = false; - scope.passwordChangeForm = { - passwordConfirm : { - errors:{}, - $valid : true, - $error : { - required : false - } - }, - password : { - errors:{}, - $valid : true, - $error : { - required : false - } - }, - oldPassword : { - errors:{}, - $valid : true, - $error : { - required : false - } - } - }; - })); - - it('should create model errors with 2 validation for each input', inject(function($controller) { - $controller(passwordChangeFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(Object.keys(scope.passwordChangeForm.passwordConfirm.errors).length).toEqual(2); - expect(Object.keys(scope.passwordChangeForm.password.errors).length).toEqual(2); - })); - - it('should return input-table-error class when input is not valid', inject(function($controller) { - scope.passwordChangeForm.passwordConfirm.errors.valid = false; - scope.passwordChangeForm.password.errors.valid = true; - - $controller(passwordChangeFormCtrl, { - $scope: scope - }); - - expect(scope.getInputClass('password')).toBe(''); - expect(scope.getInputClass('passwordConfirm')).toEqual('input-table-error'); - })); - - it('The valid passwordConfirm input validation should be equal to input form validation if form is submited and not valid', inject(function($controller) { - scope.passwordChangeForm.$valid = false; - - $controller(passwordChangeFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.passwordChangeForm.passwordConfirm.errors.valid).toBe(scope.passwordChangeForm.passwordConfirm.$valid); - })); - - it('The filled password and passwordConfirm input validation should be true if input is not required and form is submited and not valid', inject(function($controller) { - scope.passwordChangeForm.$valid = false; - - $controller(passwordChangeFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.passwordChangeForm.passwordConfirm.errors.filled).not.toBe(scope.passwordChangeForm.passwordConfirm.$error.required); - expect(scope.passwordChangeForm.password.errors.filled).not.toBe(scope.passwordChangeForm.password.$error.required); - })); - - it('Should reset input validation errors when form is submited and valid', inject(function($controller) { - $controller(passwordChangeFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - var startPasswordCondfirmState = _.clone(scope.passwordChangeForm.passwordConfirm.errors); - var startPasswordState = _.clone(scope.passwordChangeForm.password.errors); - - scope.passwordChangeForm.$valid = true; - - scope.passwordChangeForm.passwordConfirm.errors.valid = false; - scope.passwordChangeForm.password.errors.valid = false; - - scope.submit(); - - expect(scope.passwordChangeForm.passwordConfirm.errors).toEqual(startPasswordCondfirmState); - expect(scope.passwordChangeForm.password.errors).toEqual(startPasswordState); - })); - - it('should not submit form if it is not valid', inject(function($controller) { - scope.passwordChangeForm.$valid = false; - - $controller(passwordChangeFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.submit()).toBe(false); - })); -}); - - -describe('forgottenPasswordFormCtrl', function(){ - var scope; - beforeEach(inject(function($rootScope) { - scope = $rootScope.$new(); - scope.isSubmitted = false; - scope.forgottenPasswordForm = { - email : { - errors:{}, - $valid : true, - $error : { - required : false - } - } - }; - })); - - it('should create model errors with 2 validation for email input', inject(function($controller) { - $controller(forgottenPasswordFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(Object.keys(scope.forgottenPasswordForm.email.errors).length).toEqual(2); - })); - - it('should return input-table-error class when input is not valid', inject(function($controller) { - scope.forgottenPasswordForm.email.errors.valid = true; - - $controller(forgottenPasswordFormCtrl, { - $scope: scope - }); - - expect(scope.getInputClass('email')).toBe(''); - })); - - it('The valid email input validation should be equal to input form validation if form is submited and not valid', inject(function($controller) { - scope.forgottenPasswordForm.$valid = false; - - $controller(forgottenPasswordFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.forgottenPasswordForm.email.errors.valid).toBe(scope.forgottenPasswordForm.email.$valid); - })); - - it('The filled email input validation should be true if input is not required and form is submited and not valid', inject(function($controller) { - scope.forgottenPasswordForm.$valid = false; - - $controller(forgottenPasswordFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.forgottenPasswordForm.email.errors.filled).not.toBe(scope.forgottenPasswordForm.email.$error.required); - })); - - it('Should reset input validation errors when form is submited and valid', inject(function($controller) { - $controller(forgottenPasswordFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - var startEmailState = _.clone(scope.forgottenPasswordForm.email.errors); - - scope.forgottenPasswordForm.$valid = true; - - scope.forgottenPasswordForm.email.errors.valid = false; - - scope.submit(); - - expect(scope.forgottenPasswordForm.email.errors).toEqual(startEmailState); - })); - - it('should not submit form if it is not valid', inject(function($controller) { - scope.forgottenPasswordForm.$valid = false; - - $controller(forgottenPasswordFormCtrl, { - $scope: scope - }); - - scope.$digest(); - - expect(scope.submit()).toBe(false); - })); -}); - - diff --git a/tests/js/run.sh b/tests/js/run.sh index d9cb4dbf4f..7d768c360d 100755 --- a/tests/js/run.sh +++ b/tests/js/run.sh @@ -10,6 +10,4 @@ phantomjs "$ROOTDIR/www/assets/qunit/addons/phantomjs/runner.js" "$ROOTDIR/www/i # run backbone tests mocha-phantomjs "$ROOTDIR/www/scripts/tests/index.html" -# run angular tests -sh "$BASEDIR/scripts/run.sh" diff --git a/tests/js/scripts/run.bat b/tests/js/scripts/run.bat deleted file mode 100755 index 19eed49bd0..0000000000 --- a/tests/js/scripts/run.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off - -REM Windows script for running unit tests -REM You have to run server and capture some browser first -REM -REM Requirements: -REM - NodeJS (http://nodejs.org/) -REM - Testacular (npm install -g testacular) - -set BASE_DIR=%~dp0 -karma start "%BASE_DIR%\..\login\config\testacular.conf.js" %* diff --git a/tests/js/scripts/run.sh b/tests/js/scripts/run.sh deleted file mode 100755 index f9d641c800..0000000000 --- a/tests/js/scripts/run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -BASE_DIR=`dirname $0` - -echo "" -echo "Starting Testacular Server (http://vojtajina.github.com/testacular)" -echo "-------------------------------------------------------------------" - -karma start $BASE_DIR/../login/config/testacular.conf.js --single-run $* diff --git a/tests/js/scripts/watchr.rb b/tests/js/scripts/watchr.rb deleted file mode 100644 index 89ef656d27..0000000000 --- a/tests/js/scripts/watchr.rb +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env watchr - -# config file for watchr http://github.com/mynyml/watchr -# install: gem install watchr -# run: watch watchr.rb -# note: make sure that you have jstd server running (server.sh) and a browser captured - -log_file = File.expand_path(File.dirname(__FILE__) + '/../logs/jstd.log') - -`cd ..` -`touch #{log_file}` - -puts "String watchr... log file: #{log_file}" - -watch( '(app/js|test/unit)' ) do - `echo "\n\ntest run started @ \`date\`" > #{log_file}` - `scripts/test.sh &> #{log_file}` -end - diff --git a/www/skins/login/js/app.js b/www/skins/login/js/app.js deleted file mode 100644 index 8b56568a08..0000000000 --- a/www/skins/login/js/app.js +++ /dev/null @@ -1,234 +0,0 @@ -// controllers -function LoginFormCtrl($scope) { - $scope.isSubmitted = false; - - $scope.$watch('loginForm', function() { - $scope.loginForm.login.errors = {'filled' : true, 'valid' : true}; - $scope.loginForm.password.errors = {'filled' : true, 'valid' : true}; - }); - - $scope.submit = function() { - $scope.$broadcast('event:force-model-update'); - - if (true === $scope.loginForm.$valid) { - $scope.isSubmitted = true; - - $scope.loginForm.login.errors = {'filled' : true, 'valid' : true}; - $scope.loginForm.password.errors = {'filled' : true,'valid' : true}; - - return true; - } - - $scope.loginForm.login.errors.filled = !$scope.loginForm.login.$error.required; - - $scope.loginForm.password.errors.filled = !$scope.loginForm.password.$error.required; - - return false; - }; - - $scope.getInputClass = function(name) { - return _.every($scope.loginForm[name].errors, function(value) { - return value === true; - }) ? '' : 'input-table-error'; - }; -} - -function forgottenPasswordFormCtrl($scope) { - $scope.isSubmitted = false; - - $scope.$watch('forgottenPasswordForm', function() { - $scope.forgottenPasswordForm.email.errors = {'filled' : true, 'valid' : true}; - }); - - $scope.submit = function() { - $scope.$broadcast('event:force-model-update'); - - if (true === $scope.forgottenPasswordForm.$valid) { - $scope.forgottenPasswordForm.email.errors = {'filled' : true, 'valid' : true}; - $scope.isSubmitted = true; - - return true; - } - - $scope.forgottenPasswordForm.email.errors.valid = $scope.forgottenPasswordForm.email.$valid; - $scope.forgottenPasswordForm.email.errors.filled = !$scope.forgottenPasswordForm.email.$error.required; - - return false; - }; - - $scope.getInputClass = function(name) { - return _.every($scope.forgottenPasswordForm[name].errors, function(value) { - return value === true; - }) ? '' : 'input-table-error'; - }; -} - -function passwordChangeFormCtrl($scope) { - $scope.isSubmitted = false; - - $scope.$watch('passwordChangeForm', function() { - $scope.passwordChangeForm.oldPassword.errors = {'filled' : true, 'valid' : true}; - $scope.passwordChangeForm.password.errors = {'filled' : true, 'valid' : true}; - $scope.passwordChangeForm.passwordConfirm.errors = {'filled' : true, 'valid' : true}; - }); - - $scope.submit = function() { - $scope.$broadcast('event:force-model-update'); - - if (true === $scope.passwordChangeForm.$valid) { - $scope.passwordChangeForm.oldPassword.errors = {'filled' : true, 'valid' : true}; - $scope.passwordChangeForm.password.errors = {'filled' : true, 'valid' : true}; - $scope.passwordChangeForm.passwordConfirm.errors = {'filled' : true, 'valid' : true}; - - $scope.isSubmitted = true; - - return true; - } - - $scope.passwordChangeForm.password.errors.filled = !$scope.passwordChangeForm.password.$error.required; - $scope.passwordChangeForm.passwordConfirm.errors.filled = !$scope.passwordChangeForm.passwordConfirm.$error.required; - - return false; - }; - - $scope.getInputClass = function(name) { - return _.every($scope.passwordChangeForm[name].errors, function(value) { - return value === true; - }) ? '' : 'input-table-error'; - }; -} - -//@todo add tests -function registerFormCtrl($scope, $http) { - $scope.isSubmitted = false; - $scope.fields = []; - - $scope.$watch('registerForm', function() { - $scope.registerForm.email.errors = {'filled' : true, 'valid' : true}; - $scope.registerForm.password.errors = {'filled' : true, 'valid' : true}; - $scope.registerForm.passwordConfirm.errors = {'filled' : true, 'valid' : true}; - - $http.get('/login/registration-fields/').success(function(data, status) { - $scope.fields = data; - _.each($scope.fields, function(field){ - $scope.registerForm[camelize(field.name)].errors = {'filled' : true, 'valid' : true}; - }); - }); - }); - - $scope.submit = function() { - $scope.$broadcast('event:force-model-update'); - - if (true === $scope.registerForm.$valid) { - $scope.registerForm.email.errors = {'filled' : true, 'valid' : true}; - $scope.registerForm.password.errors = {'filled' : true, 'valid' : true}; - $scope.registerForm.passwordConfirm.errors = {'filled' : true, 'valid' : true}; - - _.each($scope.fields, function(field){ - $scope.registerForm[camelize(field.name)].errors = {'filled' : true, 'valid' : true}; - }); - - $scope.isSubmitted = true; - - return true; - } - - $scope.registerForm.password.errors.filled = !$scope.registerForm.password.$error.required; - $scope.registerForm.passwordConfirm.errors.filled = !$scope.registerForm.passwordConfirm.$error.required; - - _.each($scope.fields, function(field){ - if (field.required) { - $scope.registerForm[camelize(field.name)].errors.filled = !$scope.registerForm[camelize(field.name)].$error.required; - } - }); - - return false; - }; - - $scope.getInputClass = function(name) { - return _.every($scope.registerForm[name].errors, function(value) { - return value === true; - }) ? '' : 'input-table-error'; - }; - -} - -function camelize(name) { - return name.replace(/\-(\w)/g, function(all, letter, offset){ - return (offset === 0 && letter === 'w') ? 'w' : letter.toUpperCase(); - }); -} - -// bootstrap angular -angular.element(document).ready(function() { - angular.bootstrap(document, ['phraseanetAuthentication']); -}); - -// angular app -angular.module('phraseanetAuthentication', ['ui']) -// force model update for autofill inputs. Yuck. -.directive('forceModelUpdate', function($compile) { - return { - restrict: 'A', - require: 'ngModel', - link: function(scope, element, attrs, ctrl) { - scope.$on('event:force-model-update', function() { - ctrl.$setViewValue(element.val()); - }); - } - }; -}).directive('checkFormSubmission', function () { - // Angular does not prevent form submission if form is not valid and if action attribute is defined. - // This directive change angular's behavior by cancelling form submission - // if form is not valid even if action attribute is defined - return { - link: function (scope, element, attrs, controller) { - scope.$watch('isSubmitted', function(value) { - if(false === value && !!element.attr('action')) { - element.bind('submit', function(event) { - event.preventDefault(); - return false; - }); - } else { - element.unbind('submit').trigger('submit'); - } - }); - } - }; -}).directive('phraseanetFlash', function () { - return { - restrict:'EA', - template: [ - '
', - '', - '', - '', - '', - '
×
', - '
' - ].join(''), - transclude:true, - replace:true, - scope:{ - type: '@' - }, - compile: function (element, attrs, transclude) { - return function (scope, element, attr) { - if (true === 'type' in attrs) { - switch (attrs.type) { - case 'error' : - scope.icon = 'icon-warning-sign'; - break; - case 'success' : - scope.icon = 'icon-ok-sign'; - break; - case 'info' : - scope.icon = 'icon-info-sign'; - break; - } - } - }; - } - }; -}); - diff --git a/www/skins/login/js/main.js b/www/skins/login/js/main.js deleted file mode 100644 index abbd1196e0..0000000000 --- a/www/skins/login/js/main.js +++ /dev/null @@ -1,8 +0,0 @@ -// dom ready -$(document).ready(function() { - $(document).on("click", ".alert .alert-block-close a", function(e){ - e.preventDefault(); - $(this).closest('.alert').alert('close'); - return false; - }); -});