- ![Logo Image]()
diff --git a/avBooth/accordion-option-directive/accordion-option-directive.html b/avBooth/accordion-option-directive/accordion-option-directive.html
index e81cccef..4e0c2b50 100644
--- a/avBooth/accordion-option-directive/accordion-option-directive.html
+++ b/avBooth/accordion-option-directive/accordion-option-directive.html
@@ -1,10 +1,25 @@
+ 'selected-options': selectedOptions,
+ 'preset': isPreset}">
+
+
-
-
+
+
+
+
+
+
- ![{{option.text}}]()
@@ -36,94 +51,121 @@
-
+
- {{option.selected + 1}}.
+ {{option.selected + 1}}.
-
-
+
-
+
-
-
-
+ ++
-
-
+
+
-
+
-
-
-
-
-
-
+
+
+ {{option.category}}
+
+
+
+
+
+
+
+ ![{{option.text}}]()
-
-
-
-
-
+
+
+
-
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/avBooth/accordion-option-directive/accordion-option-directive.js b/avBooth/accordion-option-directive/accordion-option-directive.js
index d70c0680..5d62531f 100644
--- a/avBooth/accordion-option-directive/accordion-option-directive.js
+++ b/avBooth/accordion-option-directive/accordion-option-directive.js
@@ -19,10 +19,11 @@
* Directive that shows an accordion option.
*/
angular.module('avBooth')
- .directive('avbAccordionOption', function($sce) {
+ .directive('avbAccordionOption', function($sce, IsService) {
var link = function(scope, element, attrs) {
+ scope.isTouchDevice = IsService.touchDevice();
scope.urls = _.object(_.map(scope.option.urls, function(url) {
return [url.title, url.url];
}));
@@ -74,7 +75,7 @@ angular.module('avBooth')
scope.showPoints = false;
- if (angular.isDefined(scope.question.extra_options) &&
+ if (angular.isDefined(scope.question.extra_options) &&
!!scope.question.extra_options.show_points) {
scope.showPoints = true;
}
@@ -130,4 +131,4 @@ angular.module('avBooth')
link: link,
templateUrl: 'avBooth/accordion-option-directive/accordion-option-directive.html'
};
- });
\ No newline at end of file
+ });
diff --git a/avBooth/accordion-option-directive/accordion-option-directive.less b/avBooth/accordion-option-directive/accordion-option-directive.less
index 66f270ba..9a04c139 100644
--- a/avBooth/accordion-option-directive/accordion-option-directive.less
+++ b/avBooth/accordion-option-directive/accordion-option-directive.less
@@ -16,12 +16,11 @@
**/
[avb-accordion-option] {
- cursor: pointer;
line-height: 15px;
position: relative;
display: block;
- padding-left: 15px;
width: 100%;
+ padding-left: 15px;
clear: both;
overflow: hidden;
@@ -33,6 +32,14 @@
padding-right: 55px;
min-height: 40px;
+ &.selected-options.no-handle {
+ cursor: move;
+ }
+
+ &.has-handle {
+ cursor: default;
+ }
+
&.show-category {
margin-top: 15px;
@@ -76,6 +83,10 @@
}
}
+ &.selected-options .vertilize-col {
+ padding-left: 12px;
+ }
+
.vertilize-col {
padding: 10px 0;
vertical-align: middle;
@@ -205,9 +216,36 @@
background-color: @gray-lighter;
}
+ [dnd-handle] {
+ cursor: move;
+ position: absolute;
+ left: 15px;
+ top: 25px;
+
+ span {
+ font-size: 14px;
+ padding: 15px;
+ top: -15px;
+ left: -15px;
+ }
+ }
+
+ .remove-selected-item {
+ position: absolute;
+ right: 15px;
+ top: 25px;
+
+ span {
+ font-size: 14px;
+ padding: 15px;
+ top: -15px;
+ right: -15px;
+ }
+ }
+
span.label {
position: absolute;
- top: 9px;
+ top: 0px;
left: 2%;
}
-}
\ No newline at end of file
+}
diff --git a/avBooth/accordion-options-directive/accordion-options-directive.js b/avBooth/accordion-options-directive/accordion-options-directive.js
index eec5758b..bfb5ff48 100644
--- a/avBooth/accordion-options-directive/accordion-options-directive.js
+++ b/avBooth/accordion-options-directive/accordion-options-directive.js
@@ -44,7 +44,7 @@ angular.module('avBooth')
scope.canSelect = function (category) {
var selectedOptions = scope.numSelectedOptions();
var selectedOnThisCat = scope.numSelectedByCategory(category);
- var newSelectedOptions =
+ var newSelectedOptions =
selectedOptions - selectedOnThisCat + category.options.length;
return scope.question.max >= newSelectedOptions;
};
@@ -120,6 +120,22 @@ angular.module('avBooth')
}
}
+ // set category order so that it can be used in
+ // avbAvailableOptions.scope.selectAllLastCategory
+ _.each(
+ scope.categories,
+ function (category)
+ {
+ _.each(
+ category.options,
+ function (option, index)
+ {
+ option.category_index = index;
+ }
+ );
+ }
+ );
+
scope.nonEmptyCategories = _.filter(scope.categories, function (cat) {
return !!cat.title && cat.title.length > 0;
});
@@ -153,4 +169,4 @@ angular.module('avBooth')
link: link,
templateUrl: 'avBooth/accordion-options-directive/accordion-options-directive.html'
};
- });
\ No newline at end of file
+ });
diff --git a/avBooth/audit-ballot-screen-directive/audit-ballot-screen-directive.less b/avBooth/audit-ballot-screen-directive/audit-ballot-screen-directive.less
index f1f9b601..de4dd84c 100644
--- a/avBooth/audit-ballot-screen-directive/audit-ballot-screen-directive.less
+++ b/avBooth/audit-ballot-screen-directive/audit-ballot-screen-directive.less
@@ -25,5 +25,14 @@
display: block;
overflow-y: scroll;
max-height: 200px;
+ &::selection {
+ background: #056ff0;
+ color: #fff;
+ }
+ }
+
+ a {
+ color: #444;
+ font-weight: bold;
}
}
\ No newline at end of file
diff --git a/avBooth/available-options-directive/available-options-directive.js b/avBooth/available-options-directive/available-options-directive.js
index a668da14..102f3866 100644
--- a/avBooth/available-options-directive/available-options-directive.js
+++ b/avBooth/available-options-directive/available-options-directive.js
@@ -21,12 +21,24 @@
* Lists the available options for a question, allowing to change selection.
*/
angular.module('avBooth')
- .directive('avbAvailableOptions', function($filter) {
+ .directive(
+ 'avbAvailableOptions',
+ function($filter, $cookies, $modal)
+ {
- var link = function(scope, element, attrs) {
+ var link = function(scope, element, attrs)
+ {
scope.options = scope.question.answers;
scope.tagMax = null;
scope.noTagMax = null;
+
+ // This counter is used to show a popup when many clicks selecting options
+ // in a category to select all
+ scope.question.lastCategorySelected = {
+ name: null,
+ clicks: 0
+ };
+
if (angular.isDefined(scope.question.extra_options))
{
if (angular.isDefined(scope.question.extra_options.restrict_choices_by_tag__max))
@@ -102,6 +114,12 @@ angular.module('avBooth')
}
});
option.selected = -1;
+
+ // restart lastCategorySelected count
+ scope.question.lastCategorySelected = {
+ name: null,
+ clicks: 0
+ };
} else {
// if max options selectable is 1, deselect any other and select
// this
@@ -138,9 +156,79 @@ angular.module('avBooth')
}
option.selected = numSelected;
+
+ // update last category selected
+ if (scope.question.lastCategorySelected.name === option.category)
+ {
+ scope.question.lastCategorySelected.clicks += 1;
+
+ // if many clicks, show dialog to select all
+ if (scope.question.lastCategorySelected.clicks === 10 &&
+ !$cookies["do_not_show_select_all_category_dialog"] &&
+ scope.question.lastCategorySelected.name !== null)
+ {
+ $modal.open({
+ templateUrl: "avBooth/select-all-category-controller/select-all-category-controller.html",
+ controller: "SelectAllCategoryController",
+ size: 'lg',
+ backdrop: 'static',
+ windowClass: "select-all-category-controller",
+ resolve: {
+ category: function() { return option.category; }
+ }
+ }).result.then(scope.selectAllLastCategory);
+ }
+ }
+ else
+ {
+ scope.question.lastCategorySelected = {
+ name: option.category,
+ clicks: 1
+ };
+ }
}
};
+ // Try to select all the options in a category. Called only by the
+ // select all category controller when many options of a category have
+ // been selected sequentially
+ scope.selectAllLastCategory = function()
+ {
+ var numSelected = _.filter(
+ scope.question.answers,
+ function (element) {
+ return element.selected > -1;
+ }
+ ).length;
+
+ // use the sorted category so that when the category is displayed with
+ // random order the options are selected in that order too. The
+ // category_index attribute is set inside accordionOptionsDirective
+ var sortedCategoryOptions = _.sortBy(
+ _.filter(
+ scope.question.answers,
+ function (option)
+ {
+ return option.category === scope.question.lastCategorySelected.name;
+ }
+ ),
+ 'category_index'
+ );
+
+ _.each(
+ sortedCategoryOptions,
+ function(option)
+ {
+ if (option.selected <= -1 &&
+ numSelected < parseInt(scope.max,10))
+ {
+ scope.toggleSelectItem(option);
+ numSelected++;
+ }
+ }
+ );
+ };
+
// TODO: only use this when localeCompare is unavailable
function removeAccents(value) {
return value
@@ -197,4 +285,5 @@ angular.module('avBooth')
link: link,
templateUrl: 'avBooth/available-options-directive/available-options-directive.html'
};
- });
+ }
+);
diff --git a/avBooth/booth-directive/booth-directive.js b/avBooth/booth-directive/booth-directive.js
index f999aec0..635d17a3 100644
--- a/avBooth/booth-directive/booth-directive.js
+++ b/avBooth/booth-directive/booth-directive.js
@@ -24,7 +24,8 @@ angular.module('avBooth')
$timeout,
HmacService,
ConfigService,
- InsideIframeService)
+ InsideIframeService,
+ Authmethod)
{
// we use it as something similar to a controller here
@@ -442,6 +443,10 @@ angular.module('avBooth')
scope.election = angular.fromJson(value.payload.configuration);
+ // global variables
+ $window.isDemo = scope.isDemo;
+ $window.election = scope.election;
+
// index questions
_.each(scope.election.questions, function(q, num) { q.num = num; });
@@ -455,6 +460,13 @@ angular.module('avBooth')
.error(function (error) {
showError($i18next("avBooth.errorLoadingElection"));
});
+
+ Authmethod.viewEvent(scope.electionId)
+ .success(function(data) {
+ if (data.status === "ok") {
+ scope.authEvent = data.events;
+ }
+ });
} catch (error) {
showError($i18next("avBooth.errorLoadingElection"));
}
diff --git a/avBooth/booth-directive/booth-directive.less b/avBooth/booth-directive/booth-directive.less
index ad291bdb..e5966b26 100644
--- a/avBooth/booth-directive/booth-directive.less
+++ b/avBooth/booth-directive/booth-directive.less
@@ -141,8 +141,9 @@
}
.start-screen {
- h3 {
+ h2 {
margin-top: 0;
+ font-size:24px;
}
}
@@ -156,8 +157,7 @@
.warning-demo {
background-color: @btn-warning-bg;
- color: @av-primary-contrast;
- color: white;
+ color: #4a4a4a;
margin-top: -30px;
padding-top: 10px;
margin-bottom: 30px;
@@ -167,7 +167,6 @@
.text-brand-warning {
display: inline-block;
background-color: @btn-warning-bg;
- color: @av-primary;
&.flashing, &.flashing-out {
transition: color .4s ease, background-color .4s ease;
diff --git a/avBooth/conditional-accordion-screen-directive/conditional-accordion-screen-directive.html b/avBooth/conditional-accordion-screen-directive/conditional-accordion-screen-directive.html
index f02787ec..e4d5b5eb 100644
--- a/avBooth/conditional-accordion-screen-directive/conditional-accordion-screen-directive.html
+++ b/avBooth/conditional-accordion-screen-directive/conditional-accordion-screen-directive.html
@@ -4,7 +4,8 @@
-
-
+
+
+
+
+
+
+
-
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+ {{option.selected + 1}}.
+
+
+
+
+
+
+
+
+ +
+
- ![Logo Image]()
diff --git a/avBooth/confirm-audit-controller/confirm-audit-controller.html b/avBooth/confirm-audit-controller/confirm-audit-controller.html
index 4abacde2..691d84f3 100644
--- a/avBooth/confirm-audit-controller/confirm-audit-controller.html
+++ b/avBooth/confirm-audit-controller/confirm-audit-controller.html
@@ -1,11 +1,11 @@
+
avBooth.confirmAuditBallot.header -
diff --git a/avBooth/confirm-null-vote-controller/confirm-null-vote-controller.html b/avBooth/confirm-null-vote-controller/confirm-null-vote-controller.html
index 4dd60345..03ca64a7 100644
--- a/avBooth/confirm-null-vote-controller/confirm-null-vote-controller.html
+++ b/avBooth/confirm-null-vote-controller/confirm-null-vote-controller.html
@@ -5,7 +5,7 @@
avBooth.confirmNullVote.header - +
diff --git a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.html b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.html
index 6b59f708..9412a990 100644
--- a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.html
+++ b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.html
@@ -7,7 +7,8 @@
- ![Logo Image]()
@@ -99,6 +100,7 @@
diff --git a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js
index b39ea2a6..da81b295 100644
--- a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js
+++ b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js
@@ -118,10 +118,15 @@ angular.module('avBooth')
updateDomImages();
}
}
+
+ function getImageAlt(imagePath) {
+ return imagePath.substr(imagePath.lastIndexOf('/')+1);
+ }
for(var i = 0; i < busyImageKeys.length; i++) {
busyImageObj[busyImageKeys[i]].onload = checkCount();
busyImageObj[busyImageKeys[i]].src = busyImageKeys[i];
+ busyImageObj[busyImageKeys[i]].setAttribute('alt', getImageAlt(busyImageKeys[i]));
}
function removeAllChilds(elem) {
diff --git a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less
index 52082e24..5b709f8d 100644
--- a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less
+++ b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less
@@ -72,7 +72,7 @@
}
.step-working {
- color: @btn-warning-bg;
+ color: #a06b20;
}
.step-finished {
diff --git a/avBooth/help-screen-directive/help-screen-directive.html b/avBooth/help-screen-directive/help-screen-directive.html
index 3fe3019f..b8ed3181 100644
--- a/avBooth/help-screen-directive/help-screen-directive.html
+++ b/avBooth/help-screen-directive/help-screen-directive.html
@@ -4,6 +4,7 @@
diff --git a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js
index b39ea2a6..da81b295 100644
--- a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js
+++ b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.js
@@ -118,10 +118,15 @@ angular.module('avBooth')
updateDomImages();
}
}
+
+ function getImageAlt(imagePath) {
+ return imagePath.substr(imagePath.lastIndexOf('/')+1);
+ }
for(var i = 0; i < busyImageKeys.length; i++) {
busyImageObj[busyImageKeys[i]].onload = checkCount();
busyImageObj[busyImageKeys[i]].src = busyImageKeys[i];
+ busyImageObj[busyImageKeys[i]].setAttribute('alt', getImageAlt(busyImageKeys[i]));
}
function removeAllChilds(elem) {
diff --git a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less
index 52082e24..5b709f8d 100644
--- a/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less
+++ b/avBooth/encrypting-ballot-screen-directive/encrypting-ballot-screen-directive.less
@@ -72,7 +72,7 @@
}
.step-working {
- color: @btn-warning-bg;
+ color: #a06b20;
}
.step-finished {
diff --git a/avBooth/help-screen-directive/help-screen-directive.html b/avBooth/help-screen-directive/help-screen-directive.html
index 3fe3019f..b8ed3181 100644
--- a/avBooth/help-screen-directive/help-screen-directive.html
+++ b/avBooth/help-screen-directive/help-screen-directive.html
@@ -4,6 +4,7 @@
@@ -33,7 +34,7 @@
-
+
diff --git a/avBooth/help-screen-directive/help-screen-directive.js b/avBooth/help-screen-directive/help-screen-directive.js
index 9db834f4..33985900 100644
--- a/avBooth/help-screen-directive/help-screen-directive.js
+++ b/avBooth/help-screen-directive/help-screen-directive.js
@@ -20,8 +20,18 @@
*/
angular.module('avBooth')
.directive('avbHelpScreen', function(ConfigService) {
+ function link(scope, element, attrs) {
+ scope.extra = {};
+ if (_.isObject(scope.election)) {
+ scope.extra.election = scope.election;
+ }
+ if (_.isObject(scope.authEvent)) {
+ scope.extra.authEvent = scope.authEvent;
+ }
+ }
return {
restrict: 'AE',
+ link: link,
templateUrl: 'avBooth/help-screen-directive/help-screen-directive.html'
};
});
diff --git a/avBooth/multi-question-directive/multi-question-directive.html b/avBooth/multi-question-directive/multi-question-directive.html
index 063db5a2..ec112618 100644
--- a/avBooth/multi-question-directive/multi-question-directive.html
+++ b/avBooth/multi-question-directive/multi-question-directive.html
@@ -4,8 +4,9 @@
- ![Logo Image]()
@@ -27,6 +28,24 @@
>
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82,7 +101,7 @@
-
-
-
-
-
-
-
-
-
-
@@ -33,7 +34,7 @@
+
+
@@ -82,7 +101,7 @@
-
-
diff --git a/avBooth/help-screen-directive/help-screen-directive.js b/avBooth/help-screen-directive/help-screen-directive.js
index 9db834f4..33985900 100644
--- a/avBooth/help-screen-directive/help-screen-directive.js
+++ b/avBooth/help-screen-directive/help-screen-directive.js
@@ -20,8 +20,18 @@
*/
angular.module('avBooth')
.directive('avbHelpScreen', function(ConfigService) {
+ function link(scope, element, attrs) {
+ scope.extra = {};
+ if (_.isObject(scope.election)) {
+ scope.extra.election = scope.election;
+ }
+ if (_.isObject(scope.authEvent)) {
+ scope.extra.authEvent = scope.authEvent;
+ }
+ }
return {
restrict: 'AE',
+ link: link,
templateUrl: 'avBooth/help-screen-directive/help-screen-directive.html'
};
});
diff --git a/avBooth/multi-question-directive/multi-question-directive.html b/avBooth/multi-question-directive/multi-question-directive.html
index 063db5a2..ec112618 100644
--- a/avBooth/multi-question-directive/multi-question-directive.html
+++ b/avBooth/multi-question-directive/multi-question-directive.html
@@ -4,8 +4,9 @@
+
- ![Logo Image]()
@@ -27,6 +28,24 @@
>
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-