Merge pull request #23 from agoravoting/next

version 3.3.0
sequentech · Jul 26, 2016 · 798606c · 798606c
2 parents ba1ac92 + 70b4327
commit 798606c
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 31 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,7 +19,7 @@
 'use strict';
 
 var pkg = require('./package.json');
-var AV_CONFIG_VERSION = '3.2.0';
+var AV_CONFIG_VERSION = '3.3.0';
 
 //Using exclusion patterns slows down Grunt significantly
 //instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**'
@@ -81,6 +81,9 @@ module.exports = function (grunt) {
 
   // Project configuration.
   grunt.initConfig({
+    variables: {
+      booth_html_body_include: ''
+    },
     connect: {
       main: {
         options: {
@@ -200,6 +203,7 @@ module.exports = function (grunt) {
         options: {
           remove: ['script[data-remove!="false"]','link[data-remove!="false"]'],
           append: [
+            {selector:'body',html:'<%= variables.booth_html_body_include %>'},
             {selector:'body',html:'<!--[if lte IE 8]><script src="/booth/libcompat-v3.0.1.min.js"></script><![endif]--><!--[if gte IE 9]><script src="/booth/libnocompat-v3.0.1.min.js"></script><![endif]--><!--[if !IE]><!--><script src="/booth/libnocompat-v3.0.1.min.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="/booth/lib-v3.0.1.min.js"></script>'},
@@ -248,10 +252,10 @@ module.exports = function (grunt) {
     "merge-json": {
       main: {
         files: {
-            "dist/locales/en.json": ["locales/en.json", "plugins/**/locales/en.json"],
-            "dist/locales/es.json": ["locales/es.json", "plugins/**/locales/es.json"],
-            "dist/locales/gl.json": ["locales/gl.json", "plugins/**/locales/gl.json"],
-            "dist/locales/ca.json": ["locales/ca.json", "plugins/**/locales/ca.json"]
+            "dist/locales/en.json": ["locales/en.json", "plugins/**/locales/en.json", "bower_components/avCommon/locales/en.json"],
+            "dist/locales/es.json": ["locales/es.json", "plugins/**/locales/es.json", "bower_components/avCommon/locales/es.json"],
+            "dist/locales/gl.json": ["locales/gl.json", "plugins/**/locales/gl.json", "bower_components/avCommon/locales/gl.json"],
+            "dist/locales/ca.json": ["locales/ca.json", "plugins/**/locales/ca.json", "bower_components/avCommon/locales/ca.json"]
         }
       }
     },

diff --git a/avBooth/booth.js b/avBooth/booth.js
@@ -15,7 +15,14 @@
  * along with agora-gui-booth.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-angular.module('avBooth', ['ui.bootstrap','ui.utils','ui.router','ngAnimate']);
+angular.module(
+ 'avBooth', 
+ ['ui.bootstrap',
+ 'ui.utils',
+ 'ui.router',
+ 'ngAnimate',
+ 'avUi'
+]);
 
 angular.module('avBooth').config(function($stateProvider) {
     /* Add New States Above */

diff --git a/avBooth/help-screen-directive/help-screen-directive.html b/avBooth/help-screen-directive/help-screen-directive.html
@@ -23,6 +23,8 @@ <h1 ng-i18next="avBooth.helpTitle"></h1>
   </div>
 </div>
 
+
+
 <div id="avb-toggle" class="text-center item-block hidden">
   <span class="glyphicon glyphicon-play"></span>
 </div>
@@ -31,23 +33,8 @@ <h1 ng-i18next="avBooth.helpTitle"></h1>
   <div class="container">
     <div class="row">
       <div class="col-xs-12">
-        <div ng-bind-html="helpInfo">
+        <div documentation-directive>
         </div>
-<!--        <p ng-i18next>avBooth.relatedLinksText</p>
-        <ul>
-          <li>
-            <a href="#/election/{{election.id}}/public/view/faqs.html" target="_blank" ng-i18next>avElection.public.faqsLink</a>
-          </li>
-          <li>
-            <a href="#/election/{{election.id}}/public/authorities" target="_blank" ng-i18next>avElection.public.authoritiesLink</a>
-          </li>
-          <li>
-            <a href="#/election/{{election.id}}/public/view/overview.html" target="_blank" ng-i18next>avElection.public.overviewLink</a>
-          </li>
-          <li>
-            <a href="/election/{{election.id}}/public/view/tech_overview.pdf" target="_blank" ng-i18next>avElection.public.technicalOverviewLink</a>
-          </li>-->
-        </ul>
       </div>
     </div>
 

diff --git a/avBooth/help-screen-directive/help-screen-directive.js b/avBooth/help-screen-directive/help-screen-directive.js
@@ -20,14 +20,8 @@
  */
 angular.module('avBooth')
   .directive('avbHelpScreen', function(ConfigService) {
-
-    function link(scope, element, attrs) {
-        scope.helpInfo = ConfigService.help.info;
-    }
-
     return {
       restrict: 'AE',
-      link: link,
       templateUrl: 'avBooth/help-screen-directive/help-screen-directive.html'
     };
   });
diff --git a/avBooth/simultaneous-questions-screen-directive/simultaneous-questions-screen-directive.html b/avBooth/simultaneous-questions-screen-directive/simultaneous-questions-screen-directive.html
@@ -23,6 +23,11 @@
     <div class="container">
       <div class="hidden unfixed-top-height"></div>
       <h1>{{election.title}}</h1>
+      <p
+        ng-if="election.description"
+        class="description"
+        ng-bind-html="election.description | addTargetBlank">
+      </p>
     </div>
   </div>
 </div>
@@ -32,6 +37,10 @@ <h1>{{election.title}}</h1>
     <div class="row options-row" ng-repeat="question in groupQuestions">
       <div class="col-xs-12">
         <h3>{{question.title}}</h3>
+        <p
+          ng-if="question.description"
+          ng-bind-html="question.description | addTargetBlank">
+        </p>
       </div>
       <div class="col-xs-6" ng-repeat="answer in question.answers">
         <div class="opt" ng-click="toggleSelectItem(question, answer)">

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "agoraGuiBooth",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "main": "index.html",
   "ignore": [
     "**/.*",

diff --git a/index.html b/index.html
@@ -33,7 +33,7 @@
 
   <!-- avCommon -->
   <script src="bower_components/avCommon/dist/appCommon-v3.0.1.js" class="app"></script>
-
+  
   <script src="crypto/crypto.js" class="app"></script>
   <script src="crypto/random-service.js" class="app"></script>
   <script src="crypto/random-helper-service.js" class="app"></script>
@@ -46,6 +46,7 @@
   <script src="crypto/hmac-service.js" class="app"></script>
   <script src="crypto/answer-encoder-service.js" class="app"></script>
   <script src="crypto/cast-ballot-service.js" class="app"></script>
+
 
   <script src="app.js" class="app"></script>
   <script src="avBooth/booth.js" class="app"></script>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "agora-gui-booth",
-  "version": "0.0.0",
+  "version": "3.3.0",
   "devDependencies": {
     "grunt": "~0.4",
     "grunt-angular-templates": "~0.5",