Merge pull request #34 from agoravoting/release-17-04

Release 17 04

Gruntfile.js

@@ -19,7 +19,7 @@
 'use strict';
 
 var pkg = require('./package.json');
-var AV_CONFIG_VERSION = '3.4.0';
+var AV_CONFIG_VERSION = '17.04';
 
 //Using exclusion patterns slows down Grunt significantly
 //instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**'
@@ -192,10 +192,10 @@ module.exports = function (grunt) {
         options: {
           remove: ['script[data-remove!="false"]','link[data-remove!="false"]'],
           append: [
-            {selector:'body',html:'<!--[if lte IE 8]><script src="/libcompat-v3.4.0.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v3.4.0.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v3.4.0.js"></script><!--<![endif]-->'},
+            {selector:'body',html:'<!--[if lte IE 8]><script src="/libcompat-v17.04.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v17.04.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v17.04.js"></script><!--<![endif]-->'},
             {selector:'body',html:'<!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-view/blob/master/README.md -->'},
-            {selector:'body',html:'<script src="/appCommon-v3.4.0.js"></script>'},
-            {selector:'body',html:'<script src="/avPlugins-v3.4.0.js"></script>'},
+            {selector:'body',html:'<script src="/appCommon-v17.04.js"></script>'},
+            {selector:'body',html:'<script src="/avPlugins-v17.04.js"></script>'},
             {selector:'head',html:'<link rel="stylesheet" id="theme" href="/themes/default/app.min.css">'}
           ]
         },
@@ -225,9 +225,9 @@ module.exports = function (grunt) {
           'temp/libnocompat.js': ['<%= dom_munger.data.libnocompatjs %>'],
           'temp/lib.js': ['<%= dom_munger.data.libjs %>'],
           'temp/app.js': ['<%= dom_munger.data.appjs %>','<%= ngtemplates.main.dest %>'],
-          'dist/avConfig-v3.4.0.js': ['avConfig.js'],
-          'dist/avThemes-v3.4.0.js': ['avThemes.js'],
-          'dist/avPlugins-v3.4.0.js': ['plugins/**/*.js']
+          'dist/avConfig-v17.04.js': ['avConfig.js'],
+          'dist/avThemes-v17.04.js': ['avThemes.js'],
+          'dist/avPlugins-v17.04.js': ['plugins/**/*.js']
         }
       }
     },
@@ -259,10 +259,10 @@ module.exports = function (grunt) {
           beautify: true
         },
         files: {
-          'dist/appCommon-v3.4.0.js': 'temp/app.js',
-          'dist/libCommon-v3.4.0.js': 'temp/lib.js',
-          'dist/libnocompat-v3.4.0.js': 'temp/libnocompat.js',
-          'dist/libcompat-v3.4.0.js': 'temp/libcompat.js',
+          'dist/appCommon-v17.04.js': 'temp/app.js',
+          'dist/libCommon-v17.04.js': 'temp/lib.js',
+          'dist/libnocompat-v17.04.js': 'temp/libnocompat.js',
+          'dist/libcompat-v17.04.js': 'temp/libcompat.js',
           'dist/avWidgets.js': 'avWidgets.js',
 
           "dist/locales/moment/es.js": "bower_components/moment/lang/es.js",

avConfig.js

@@ -20,7 +20,7 @@
  * in this same file, which you might want to edit and tune if needed.
  */
 
-var AV_CONFIG_VERSION = '3.4.0';
+var AV_CONFIG_VERSION = '17.04';
 
 var avConfigData = {
   // the base url path for ajax requests, for example for sending ballots or

avRegistration/login-directive/login-directive.js

@@ -147,13 +147,13 @@ angular.module('avRegistration')
                     } else {
                         scope.sendingData = false;
                         scope.status = 'Not found';
-                        scope.error = $i18next('avRegistration.invalidCredentials');
+                        scope.error = $i18next('avRegistration.invalidCredentials', { support: ConfigService.contact.email });
                     }
                 })
                 .error(function(error) {
                     scope.sendingData = false;
                     scope.status = 'Registration error: ' + error.message;
-                    scope.error = $i18next('avRegistration.invalidCredentials');
+                    scope.error = $i18next('avRegistration.invalidCredentials', { support: ConfigService.contact.email });
                 });
         };
 

avRegistration/login-directive/login-directive.less

@@ -7,6 +7,10 @@
     text-align: center;
   }
 
+  .error.text-danger.ng-binding.ng-scope {
+    white-space: pre;
+  }
+
   .help-h3 {
     margin-top: 0;
   }

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "avCommon",
-  "version" : "3.4.0",
+  "version" : "17.04",
   "main": "index.html",
   "ignore": [
     "tests",

dist/avConfig-v3.4.0.js → dist/avConfig-v17.04.js

@@ -20,7 +20,7 @@
  * in this same file, which you might want to edit and tune if needed.
  */
 
-var AV_CONFIG_VERSION = '3.4.0';
+var AV_CONFIG_VERSION = '17.04';
 
 var avConfigData = {
   // the base url path for ajax requests, for example for sending ballots or

dist/avWidgets.js

@@ -9,7 +9,7 @@
             var link = links[i], href = link.getAttribute("href");
             void 0 !== callback && callback(link, i, className);
             var iframe = createElement("iframe", {
-                "class": className + "-iframe",
+                class: className + "-iframe",
                 src: href,
                 style: "border: 0; width: 100%; height: 100%",
                 seamless: ""

dist/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html id="ng-app" ng-app="agora-gui-common"><head><title>Agora Voting</title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><base href="/"><meta charset="utf-8"><link rel="stylesheet" id="theme" href="/themes/default/app.min.css"></head><body><!-- Livereload script for development only (stripped during dist build) --><!-- IE8 bind workaround (needed for less) --><!-- JS from Bower Components --><!-- Add New Bower Component JS Above --><!-- JS from Vendor Components --><!-- Add New Vendor Component JS Above --><!-- Configuration file JS --><!-- Themes JS --><!-- Main App JS --><!-- registration --><!-- ui --><!-- for security, we do not include the dynamic directive in the app,
-       so in the compiled app e2e tests are not expected work. --><!-- IE10 viewport hack for Surface/desktop Windows 8 bug --><!-- IE9 console workaround --><!-- Add New Component JS Above --><div id="no-js">Page is taking some time to load, wait a moment please. If it takes too long, please check that you have javascript activated, try with another browser or contact us.</div><div id="unsupported-browser">For security reasons, your browser is unsupported. Please use a newer web browser (if you are using Internet Explorer, use version 9 or newer).</div><div><!-- Shown while loading --><div id="angular-preloading" class="avb-start-loading"></div><!-- Main content --><div id="content"><!-- This is where angular injects its content --><div ui-view=""></div></div></div><!--[if lte IE 8]><script src="/libcompat-v3.4.0.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v3.4.0.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v3.4.0.js"></script><!--<![endif]--><!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-view/blob/master/README.md --><script src="/appCommon-v3.4.0.js"></script><script src="/avPlugins-v3.4.0.js"></script></body></html>
+       so in the compiled app e2e tests are not expected work. --><!-- IE10 viewport hack for Surface/desktop Windows 8 bug --><!-- IE9 console workaround --><!-- Add New Component JS Above --><div id="no-js">Page is taking some time to load, wait a moment please. If it takes too long, please check that you have javascript activated, try with another browser or contact us.</div><div id="unsupported-browser">For security reasons, your browser is unsupported. Please use a newer web browser (if you are using Internet Explorer, use version 9 or newer).</div><div><!-- Shown while loading --><div id="angular-preloading" class="avb-start-loading"></div><!-- Main content --><div id="content"><!-- This is where angular injects its content --><div ui-view=""></div></div></div><!--[if lte IE 8]><script src="/libcompat-v17.04.js"></script><![endif]--><!--[if gte IE 9]><script src="/libnocompat-v17.04.js"></script><![endif]--><!--[if !IE]><!--><script src="/libnocompat-v17.04.js"></script><!--<![endif]--><!--All the source code of this program under copyright. Take a look at the license details at https://github.com/agoravoting/agora-core-view/blob/master/README.md --><script src="/appCommon-v17.04.js"></script><script src="/avPlugins-v17.04.js"></script></body></html>