Go next merge into next (#188)

* fix widget scope, add widgets to elbasic * remove old form * add for to labels * fix tooltips, add default help url * fix help tooltip * change version to go v3 * making textarea admin field a textarea * Move admin fields to the end of the list of actions when creating an election * moving admin fields also in the .sidebarlinks var * more sane defaults when creating an election * update logo * :update logo size * making logo bigger * making logo wider * updating election default logo url * reverting last commit * remove import from admin sidebar * set correctly the paths of documentation urls for widgets that include external doc * commit tests to resume development later * use help list from config * fix css * fix help menu css when not logged * fix signup link * check req when reg fields * some fixes, add admin profile modal sketch * syntax fix * add dependency * fixes, fill profile modal, update profile on ok click * syntax fix * fixes, css fixes, refactor, head profile menu click working * add dependency to admin-head-directive * some moarr fixes * CSS fixes * change profile menu icon * profile save button locales * refactor: user editable * starting to add configurable admin gui questions options * do not show empty layouts list * set grunt-merge-json to 0.9.5 because last version gives problems with chalk (eirslett/frontend-maven-plugin#629) * fix empty string * small fix * change version to go v4 * check when profile modal is closed * get template el from avConfig.js * fix el template * add default name to census extra fields * refactor * refactor, add service to index.html, add profile to scope on templateel * fix scope error, fix open modal error * add comments * add some abstract settings to question directive * more abstract settings * add abstract settings to auth config * remove well class on auth config * testing census reg with abs settings * changes to census config * go v5 * fix css * fix loop * fix css * refactor css * fix loop * fix * fix logo css * adding glyphicon * changes to abstract settings * fixes * fix css * add short value * refactor abstract settings, add fields * fixes * refactor scope on abstract settings * use ng-show * observe attrs on abstract settings * fix css, disabled * remove click glitch * fix columns for extra small screens * more css changes * remove isDisabled * bower * fix intl-tel deps * add number input directive * fixes * remove disabled ef, refactor must ef service, call must ef service on elections change on create el * fix syntax * fix extra-fields and census on auth method change * small fix * add attrs to abstract settings widget * moar less * fix css * fix hover * fixes mouseover * fix syntax * hover fixes * fix css * fix collapse css * Onboarding (#128) * starting to add ngOnboarding * initial onboarding test * trying hopscotch instead * changing vendor files * remove unnecesary files * make jshint ignore hopscotch * remove i18next dependency in avAdminElections directive * adding vendor css * trying to add vendor css * solving css problems * fixing a typo * trying to fix css * add missing option to grunt * using abs paths * trying to not use minimized vendor hopscotch files * fix hopscotch css * adding jquery integration for state changes * making easier to find through paths dashboard actions * making easier to find through paths dashboard actions 2 * adding onboarding tour * hopscotch ignore * moving start election to the end * improving onboarding tour service * make it compile * missing semicolon * removing jslint ignore * fix nextTour * fix help tour * adding OnboardingTourService to head scope so that it can be shown in helpList * testing onboarding translations * fix typo * adding onboarding tour i18n * launch wizard on first time too * fix typo * change version to go v6 * add ngOnboarding dep to bower * Fix onboarding (#131) * change version to go v6 * remove unneeded dep * add hopscotch dep, remove ngOnboarding * remove hopscotch * Update bower.json * Update bower.json * Fix abstract settings help background color (#136) * fix some colors in abstract settings help * fix again css * making abstract-settings help links distinguishable * adding margin to images in abstract settings help * remove reference to missing video and adding onboarding i18n for ca and gl in es lang (#138) * improve abstract settings doc css (#140) * improve abstract settings doc css * fix css background-color * Fix onboarding 2 (#141) * fixing onboarding * fixing onboarding * trying to add intro video * adding width to the oyutubevideo bubble * improving video looks * Fix onboarding 2 (#142) * improve abstract settings doc css (#140) * improve abstract settings doc css * fix css background-color * fixing onboarding * fixing onboarding * trying to add intro video * adding width to the oyutubevideo bubble * improving video looks * only end tour if it has started * show admin field names on error * refactor * fixes * refactor * fixes * fix el checks before el creation * syntax fix: remove extra commas * fix locale * required * moar * fixes * set admin field border to red on error * set label size to col-sm4 * test 5/7 * refactor code into csv load service * fixes * test * solve dependency issue and other minor things * refactor * fixes * fixes * test * fixes * .error -> .catch * fixes * minor fixes * fixes * add comments * fix adding new question * change version to go v7 * test using * Revert "fix dashboard results presentation (order of winners etc)" * add 2 default options to new questions * Census premium (#157) add census csv error plugin call * Census err (#159) * fix csv error on creation * show add person to census error * Save draft (#158) * test * add draft election directive * fixes * add fix * fix * fix * moar * refactor * fixes * fix * add use draft modal * fixes * fixes * fix * fix css * add erase modal * fix locale * change version to go v8 * remove test/real difference * moar * refactor onboarding call * add dep to admin-head-directive * fix onboarding * refactor * fix * fix urls thingie * refactor * fix * add to admin controller deps * refactor * fix * fixes * css fix * hide features in login and signup * fix css * remove phantomjs (#172) * fix draft election failed creation (#175) * census: Add action buttons for each voter (#174) This patch adds actions buttons for each row in the census table. Buttons added are Activate, Deactivate, Remove and Send auth codes. These buttons select the row and then call the same action as actions dropdown, all other rows are deselected so this should work similar to select only one row and click in the actions dropdown. Buttons are hidden by default and showed on hover the row. I've add translations for these actions but not for gl and ca. * Activity log (#173) * initial work on activity log * fix some compilation errors * fixing name of the directive * fixing activity log html * fix concats of admin controller * adding missing state activityLog * adding missing allowed state * fixing loading * fixing loading of the activity list * adding i18n to activity log * adding missing i18n and removing append already done in previous line * trying to add some filtering * trying to fix build * fix call to activity * fix call to activity 2 * adding more columns filtering * fix some visualization * fix typo * registering more actions * fixing comma in json * show added-to-census activity log item * make reload activity work * allow query parameters to automatically set the initial filter * fixing location search getter * parsing value in get location var * set var was missing * census: Comment for activate/deactivate actions (#176) * census: Comment for activate/deactivate actions This patch allows comments for activate and deactivate actions. A textarea is available in the activate action and the content of that will go as comment. To show the comment in the activity log I've to change a little the code because the angular template always resolve the {{obj.metadata.comment}} as undefined, I don't know why, so I've added other attr to obj called metadatacomment. * Fix deactivate comment problem * census: Autofill field param (#177) * date extra field type (#179) * Tally sheets (#181) * initial work in tally sheets * adding ballot box sidebar link * adding ballot box directive to index * adding en i18n for ballotboxes * adding missing argument to av-admin-ballot-box * allowing filtering by last update in ballot box * fixing column header * Add actions to ballot box listing * Removing select ballot box * remove unneeded comma * updating received objects from ballot boxes list * improve ballot box list styles * improve ballot box list styles 2 * adding ballot box less * improving bb less * improving ballot box list looks * improving ballot box list looks * improving ballot box list looks * starting to work in ballot box modals * make it compile * make it compile 2 * make it compile 3 * try fixing modal * trying to fix create ballot boxes modal * trying to fix create bbs modal * fix build * fix modal * fix modal * fix modal * improve modal * fix typos * fix typos * standarize mouse over on census and activity log as in ballot box tables * adding initial delete ballot box dialog * rename modal * improve deleteBallotBox * fix deleteBallotBox * initial work on writting tally sheet form * use i18next * improving layout * improving layout * improving layout * making dialog bigger * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * fixing modelline * adding number checking * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * remove timeout * remove timeout * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * working on WriteBallotBoxModal * allowing to delete a tally sheet * remove not existant file * num tally sheets filtering * num tally sheets filtering * improving activity log * improving activity log * improving activity log * improving activity log * improving activity log * improving activity log * improving activity log * improving activity log * improving activity log * fixing operator precedence * add has_ballot_boxes when creating election * Tally sheets2 (#183) * adding permissions checking, only showing what you can do with ballot boxes * fixing compilation * fixing compilation * adding has_ballot_boxes * fix index of * try deferred load for ballot box sidebar link * try deferred load for ballot box sidebar link * try deferred load for ballot box sidebar link * try deferred load for ballot box sidebar link * fix activity log ballotbox create * trying to allow non-json to calculate results, and loading by default election configresults if any * trying to allow non-json to calculate results, and loading by default election configresults if any * fix totals (#184) * allow uploading with results_ok (#185) * Add 'user-and-password' as authentication method (#180) * Add 'user-and-password' as authentication method * user-and-password authentication requires username and password fields * allow census query (#186) * fixing sms-otp (#187)
sequentech · Jan 24, 2019 · 81b8d0d · 81b8d0d
1 parent 1751f89
commit 81b8d0d
Show file tree

Hide file tree

Showing 113 changed files with 10,121 additions and 759 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,7 +3,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,7 +19,7 @@
 'use strict';
 
 var pkg = require('./package.json');
-var AV_CONFIG_VERSION = '17.04';
+var AV_CONFIG_VERSION = '103111.8';
 
 //Using exclusion patterns slows down Grunt significantly
 //instead of creating a set of patterns like '**/*.js' and '!**/node_modules/**'
@@ -79,6 +79,64 @@ module.exports = function (grunt) {
     });
   });
 
+  // custom grunt task to check avPluginsConfig.js
+  grunt.registerTask('check_plugins_config', function() {
+    var fs = require('fs');
+    var done = this.async();
+    grunt.log.ok('Checking avPluginsConfig.js...');
+    function checkAvPluginsConfig() {
+        fs.readFile('avPluginsConfig.js', function(err, data) {
+            if (err) {
+                grunt.log.ok('No avPluginsConfig.js file found, creating...');
+                var avPluginsConfigText =
+                    "var AV_PLUGINS_CONFIG_VERSION = '" + AV_CONFIG_VERSION + "';\n" +
+                    "angular.module('avPluginsConfig', [])\n" +
+                    "  .factory('PluginsConfigService', function() {\n" +
+                    "    return {};\n" +
+                    "  });\n" +
+                    "\n" +
+                    "angular.module('avPluginsConfig')\n" +
+                    "  .provider('PluginsConfigService', function PluginsConfigServiceProvider() {\n" +
+                    "    _.extend(this, {});\n" +
+                    "\n" +
+                    "    this.$get = [function PluginsConfigServiceProviderFactory() {\n" +
+                    "    return new PluginsConfigServiceProvider();\n" +
+                    "    }];\n" +
+                    "   });";
+                fs.writeFile("avPluginsConfig.js",
+                    avPluginsConfigText,
+                    function(err) {
+                        if(err) {
+                            grunt.log.error(
+                                'Error creating avPluginsConfig.js file');
+                            done(false);
+                        } else {
+                            grunt.log.ok('Created avPluginsConfig.js file, ' +
+                                'trying to read it again...');
+                            checkAvPluginsConfig();
+                        }
+                });
+            } else {
+                var match = data.toString().match(
+                    /AV_PLUGINS_CONFIG_VERSION = [\'\"]([\w\.]*)[\'\"];/);
+                if (!match) {
+                    grunt.log.error('Invalid avPluginsConfig.js version');
+                } else {
+                    var v = match[1];
+                    if (v === AV_CONFIG_VERSION) {
+                        return done();
+                    } else {
+                        grunt.log.error('Invalid avPluginsConfig.js version: ' +
+                            v);
+                    }
+                }
+                done(false);
+            }
+        });
+    }
+    var conf = checkAvPluginsConfig();
+  });
+
   // Project configuration.
   grunt.initConfig({
     variables: {
@@ -106,7 +164,11 @@ module.exports = function (grunt) {
       main: {
         options: {
             jshintrc: '.jshintrc',
-            reporter: require('jshint-stylish')
+            reporter: require('jshint-stylish'),
+            ignores: [
+                'vendor/hopscotch-0.3.1/js/hopscotch.js'
+            ]
+
         },
         src: createFolderGlobs('*.js')
       }
@@ -162,8 +224,15 @@ module.exports = function (grunt) {
       main: {
         files: [
           {src: ['img/**'], dest: 'dist/'},
+          {
+              expand: true,
+              cwd:'vendor/hopscotch-0.3.1/img/',
+              src: ['**'],
+              dest: 'dist/img/'
+          },
           {src: ['img/**'], dest: 'dist/'},
           {src: ['temp_data/**'], dest: 'dist/'},
+          {src: ['bower_components/avCommon/dist/img/flags.png'], dest: 'dist/img/flags.png'},
           {
             expand: true,
             cwd:'bower_components/avCommon/themes',
@@ -213,15 +282,16 @@ module.exports = function (grunt) {
           remove: ['script[data-remove!="false"]','link[data-remove!="false"]'],
           append: [
             {selector:'body',html:'<%= variables.admin_html_body_include %>'},
-            {selector:'body',html:'<!--[if lte IE 8]><script src="/admin/libcompat-v17.04.min.js"></script><![endif]--><!--[if gte IE 9]><script src="/admin/libnocompat-v17.04.min.js"></script><![endif]--><!--[if !IE]><!--><script src="/admin/libnocompat-v17.04.min.js"></script><!--<![endif]-->'},
+            {selector:'body',html:'<!--[if lte IE 8]><script src="/admin/libcompat-v103111.8.min.js"></script><![endif]--><!--[if gte IE 9]><script src="/admin/libnocompat-v103111.8.min.js"></script><![endif]--><!--[if !IE]><!--><script src="/admin/libnocompat-v103111.8.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="/admin/lib-v17.04.min.js"></script>'},
-            {selector:'body',html:'<script src="/admin/avConfig-v17.04.js"></script>'},
-            {selector:'body',html:'<script src="/admin/avThemes-v17.04.js"></script>'},
-            {selector:'body',html:'<script src="/admin/app-v17.04.min.js"></script>'},
-            {selector:'body',html:'<script src="/admin/avPlugins-v17.04.js"></script>'},
+            {selector:'body',html:'<script src="/admin/lib-v103111.8.min.js"></script>'},
+            {selector:'body',html:'<script src="/admin/avConfig-v103111.8.js"></script>'},
+            {selector:'body',html:'<script src="/admin/avThemes-v103111.8.js"></script>'},
+            {selector:'body',html:'<script src="/admin/app-v103111.8.min.js"></script>'},
+            {selector:'body',html:'<script src="/admin/avPlugins-v103111.8.js"></script>'},
             {selector:'head',html:'<link rel="stylesheet" id="theme" data-base="/admin/" href="/admin/themes/default/app.min.css">'},
-            {selector:'head',html:'<link rel="stylesheet" id="plugins" data-base="/admin/" href="/admin/plugins.css">'}
+            {selector:'head',html:'<link rel="stylesheet" id="plugins" data-base="/admin/" href="/admin/plugins.css">'},
+            {selector:'head',html:'<link rel="stylesheet" id="vendor-css" data-base="/admin/" href="/admin/vendor.min.css">'}
           ]
         },
         src:'index.html',
@@ -230,20 +300,29 @@ module.exports = function (grunt) {
     },
     cssmin: {
       main: {
-        files: [{
-            expand: true,
-            cwd:'temp/bower_components/avCommon/themes',
-            src: ['**/app.css'],
-            dest: 'dist/themes/',
-            ext: '.min.css',
-            extDot: 'first'
-        }]
+        files: [
+            {
+                expand: true,
+                cwd:'temp/bower_components/avCommon/themes',
+                src: ['**/app.css'],
+                dest: 'dist/themes/',
+                ext: '.min.css',
+                extDot: 'first'
+            },
+            {
+                src: ['vendor/hopscotch-0.3.1/css/hopscotch.css'],
+                dest: 'dist/vendor.min.css'
+            }
+        ]
       },
     },
     concat: {
       main: {
         files: {
           'dist/plugins.css': ['temp/plugins/**/*.css'],
+          'dist/vendor.css': [
+            'vendor/hopscotch-0.3.1/css/hopscotch.css'
+          ],
           'temp/libcompat.js': [
             'vendor/jquery.compat/jquery-1.11.1.js',
             'vendor/json3/json-v3.3.2.js',
@@ -252,9 +331,10 @@ 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 %>','<%= ngtemplates.common.dest %>'],
-          'dist/avConfig-v17.04.js': ['avConfig.js'],
-          'dist/avThemes-v17.04.js': ['bower_components/avCommon/dist/avThemes-v17.04.js'],
-          'dist/avPlugins-v17.04.js': [
+          'dist/avConfig-v103111.8.js': ['avConfig.js'],
+          'dist/avThemes-v103111.8.js': ['bower_components/avCommon/dist/avThemes-v103111.8.js'],
+          'dist/avPlugins-v103111.8.js': [
+            'avPluginsConfig.js',
             'plugins/**/*.js',
             '!plugins/**/*-spec.js'
           ]
@@ -289,10 +369,10 @@ module.exports = function (grunt) {
           beautify: true
         },
         files: {
-          'dist/app-v17.04.min.js': 'temp/app.js',
-          'dist/lib-v17.04.min.js': 'temp/lib.js',
-          'dist/libnocompat-v17.04.min.js': 'temp/libnocompat.js',
-          'dist/libcompat-v17.04.min.js': 'temp/libcompat.js',
+          'dist/app-v103111.8.min.js': 'temp/app.js',
+          'dist/lib-v103111.8.min.js': 'temp/lib.js',
+          'dist/libnocompat-v103111.8.min.js': 'temp/libnocompat.js',
+          'dist/libcompat-v103111.8.min.js': 'temp/libcompat.js',
           'dist/avWidgets.min.js': 'avWidgets.js',
 
           "dist/locales/moment/en.js": "bower_components/moment/lang/en-gb.js",
@@ -325,6 +405,7 @@ module.exports = function (grunt) {
           '<%= dom_munger.data.libnocompatjs %>',
           '<%= dom_munger.data.libjs %>',
           'avConfig.js',
+          'avPluginsConfig.js',
           'avThemes.js',
           'avWidgets.js',
           '<%= dom_munger.data.appjs %>',
@@ -377,6 +458,7 @@ module.exports = function (grunt) {
     'build',
     [
       'check_config',
+      'check_plugins_config',
       'jshint',
       'clean:before',
       'less',
@@ -422,6 +504,7 @@ module.exports = function (grunt) {
         files.concat(grunt.config('dom_munger.data.libjs'));
         files.push('bower_components/angular-mocks/angular-mocks.js');
         files.push('avConfig.js');
+        files.push('avPluginsConfig.js');
         files.push('avThemes.js');
         files.push('avWidgets.js');
         files.concat(grunt.config('dom_munger.data.appjs'));

diff --git a/app.js b/app.js
@@ -30,6 +30,7 @@ angular.module(
   'infinite-scroll',
   'angularMoment',
   'avConfig',
+  'avPluginsConfig',
   'jm.i18next',
   'avUi',
   'avRegistration',
@@ -97,6 +98,11 @@ angular.module('agora-gui-admin').config(
         templateUrl: 'avAdmin/admin-login-controller/admin-login-controller.html',
         controller: "AdminLoginController"
       })
+      .state('admin.login_email', {
+        url: '/login/:email',
+        templateUrl: 'avAdmin/admin-login-controller/admin-login-controller.html',
+        controller: "AdminLoginController"
+      })
       .state('admin.signup', {
         url: '/signup',
         templateUrl: 'avAdmin/admin-signup-controller/admin-signup-controller.html',
@@ -108,7 +114,7 @@ angular.module('agora-gui-admin').config(
       })
       // admin directives using the admin controller
       .state('admin.new', {
-        url: '/new',
+        url: '/new/:draft',
         templateUrl: 'avAdmin/admin-controller/admin-controller.html',
         controller: 'AdminController'
       })
@@ -127,6 +133,11 @@ angular.module('agora-gui-admin').config(
         templateUrl: 'avAdmin/admin-controller/admin-controller.html',
         controller: 'AdminController'
       })
+      .state('admin.adminFields', {
+        url: '/admin-fields/:id',
+        templateUrl: 'avAdmin/admin-controller/admin-controller.html',
+        controller: 'AdminController'
+      })
       .state('admin.questions', {
         url: '/questions/:id',
         templateUrl: 'avAdmin/admin-controller/admin-controller.html',
@@ -152,6 +163,11 @@ angular.module('agora-gui-admin').config(
         templateUrl: 'avAdmin/admin-controller/admin-controller.html',
         controller: 'AdminController'
       })
+      .state('admin.activityLog', {
+        url: '/activity/:id',
+        templateUrl: 'avAdmin/admin-controller/admin-controller.html',
+        controller: 'AdminController'
+      })
       .state('admin.tally', {
         url: '/tally/:id',
         templateUrl: 'avAdmin/admin-controller/admin-controller.html',
@@ -177,6 +193,11 @@ angular.module('agora-gui-admin').config(
         templateUrl: 'avAdmin/admin-controller/admin-controller.html',
         controller: 'AdminController'
       })
+      .state('admin.ballotBox', {
+        url: '/ballot-box/:id',
+        templateUrl: 'avAdmin/admin-controller/admin-controller.html',
+        controller: 'AdminController'
+      })
       .state('admin.create', {
           url: '/create/:autocreate',
         templateUrl: 'avAdmin/admin-controller/admin-controller.html',
@@ -229,9 +250,11 @@ angular.module('agora-gui-admin').config(
 /**
  * IF the cookie is there we make the autologin
  */
-angular.module('agora-gui-admin').run(function($cookies, $http, Authmethod) {
-    if ($cookies.auth) {
-        Authmethod.setAuth($cookies.auth, $cookies.isAdmin);
+angular.module('agora-gui-admin').run(function($cookies, $http, Authmethod, ConfigService) {
+    var adminId = ConfigService.freeAuthId + '';
+    var postfix = "_authevent_" + adminId;
+    if ($cookies["auth" + postfix]) {
+        Authmethod.setAuth($cookies["auth" + postfix], $cookies["isAdmin" + postfix], adminId);
     }
 });
 
@@ -258,6 +281,7 @@ angular.module('agora-gui-admin').run(function($http, $rootScope, ConfigService)
     function(event, toState, toParams, fromState, fromParams) {
       console.log("change success");
       $("#angular-preloading").hide();
+      $(window).trigger("angular-state-change-success", [event, toState, toParams, fromState, fromParams]);
     });
 });
 

diff --git a/app.less b/app.less
@@ -20,6 +20,10 @@
 @import "avAdmin/admin-sidebar-directive/admin-sidebar-directive.less";
 @import "avAdmin/admin-head-directive/admin-head-directive.less";
 /* admin directives */
+@import "avAdmin/admin-directives/abstract-setting/abstract-setting.less";
+@import "avAdmin/admin-directives/activity-log/activity-log.less";
+@import "avAdmin/admin-directives/admin-field/admin-field.less";
+@import "avAdmin/admin-directives/ballot-box/ballot-box.less";
 @import "avAdmin/admin-directives/elections/elections.less";
 @import "avAdmin/admin-directives/extra-field/extra-field.less";
 @import "avAdmin/admin-directives/create/create.less";
@@ -33,6 +37,7 @@
 @import "avAdmin/admin-directives/elauth/elauth.less";
 @import "avAdmin/admin-directives/elquestions/elquestions.less";
 @import "avAdmin/admin-directives/elcensus/elcensus.less";
+@import "avAdmin/admin-directives/elcensus/csv-loading-modal.less";
 @import "avAdmin/admin-directives/elcensus-config/elcensus-config.less";
 @import "avAdmin/admin-directives/success-action/success-action.less";
 @import "avAdmin/admin-directives/import/import.less";

diff --git a/avAdmin/admin-controller/admin-controller.html b/avAdmin/admin-controller/admin-controller.html
@@ -12,18 +12,12 @@
         id="content"
         class="col-sm-9 admin-controller-content">
 
-        <div ng-if="isTest" class="head-notification warn-notification">
-          <p>
-            <i class="fa-fw fa fa-info"></i>
-            <strong ng-i18next="avAdmin.notes.noteTag"></strong>
-            <span ng-i18next="avAdmin.notes.thisisATestElection"></span>
-            <a href="{{helpurl}}" target="_blank" ng-i18next="avAdmin.learnMore"></a>
-          </p>
-        </div>
-
         <div av-admin-elections ng-switch-when="admin.elections"></div>
+        <div av-admin-activity-log ng-switch-when="admin.activityLog" election-id="{{electionId}}"></div>
+        <div av-admin-ballot-box ng-switch-when="admin.ballotBox" election-id="{{electionId}}"></div>
         <div av-admin-import ng-switch-when="admin.import"></div>
         <div av-admin-elbasic ng-switch-when="admin.basic"></div>
+        <div av-admin-fields ng-switch-when="admin.adminFields"></div>
         <div av-admin-elquestions ng-switch-when="admin.questions"></div>
         <div av-admin-elcensus-config ng-switch-when="admin.censusConfig"></div>
         <div av-admin-elcensus ng-switch-when="admin.census"></div>