Use 2016 GUI by default

src/main/java/org/genesys2/server/servlet/controller/ChartsController.java

@@ -46,7 +46,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Controller
-@RequestMapping("/explore/0/charts")
+@RequestMapping("/explore/charts")
 public class ChartsController extends BaseController {
 
 	@Autowired
@@ -78,7 +78,7 @@ public class ChartsController extends BaseController {
 		return "/charts/map";
 	}
 
-	@RequestMapping(value = "data/country-collection-size", method = RequestMethod.GET, produces = { MediaType.APPLICATION_JSON_VALUE })
+	@RequestMapping(value = "/data/country-collection-size", method = RequestMethod.GET, produces = { MediaType.APPLICATION_JSON_VALUE })
 	@ResponseBody
 	public List<Map<String, Object>> accessionsCollection(@RequestParam(value = "filter", required = false, defaultValue = "{}") String jsonFilter)
 			throws JsonParseException, JsonMappingException, IOException, SearchException {

src/main/resources/content/language.properties

@@ -81,7 +81,7 @@ i18n.content-not-translated=This content is not available in your language. Plea
 data.error.404=The data you requested was not found in the system.
 page.rendertime=Processing this page took {0}ms.
 
-footer.copyright-statement=© 2013 - 2015 Data Providers and the Crop Trust
+footer.copyright-statement=© 2013 - 2016 Data Providers and the Crop Trust
 
 menu.home=Home
 menu.browse=Browse

src/main/resources/spring/spring.properties

@@ -61,7 +61,7 @@ google.analytics.account=
 # CDN
 cdn.server=${base.url}
 cdn.base=${cdn.server}
-cdn.flags.url=${cdn.base}/html/0/images/flags
+cdn.flags.url=${cdn.base}/html/1/images/flags
 
 
 # Content creation on startup

src/main/sourceapp/0/js/custom.js

-'use strict';
-
-if (typeof Object.create !== 'function') {
-  Object.create = function(object) {
-    var F = function() {
-    };
-    F.prototype = object;
-    return new F();
-  };
-}
-
-(function($, window, document, undefined) {
-
-  var TagComponent = {
-
-    init : function(options) {
-
-      this.options = $.extend({}, $.fn.activateTag.options, options);
-
-      this.buttonId = this.options.buttonId;
-      this.selectId = this.options.selectId;
-      this.containerId = this.options.containerId;
-      this.hiddenId = this.options.hiddenId;
-
-      this._bindListeners();
-    },
-
-    _bindListeners : function() {
-      var scope = this;
-      scope._addTagsListener();
-      scope._removeTagsListener();
-    },
-
-    _addTagsListener : function() {
-      var scope = this;
-      $(document).on(
-          'click',
-          this.buttonId,
-          function() {
-            var selectedOption = $(scope.selectId).find(':selected');
-            var name = selectedOption.text();
-            var id = selectedOption.val();
-            var tagHtml = '<div data-id="' + id + '" data-name="' + name + '" class="alert alert-info inline> ' + name + 
-              ' <span class="deleteTag close">&times;</span>' + '<input type="hidden" name="' + scope.hiddenId + '[0][id]" value="' + id + '" /></div>';
-            $(scope.containerId).append(tagHtml);
-            selectedOption.remove();
-            if ($(scope.selectId).find('option').length === 0) {
-              $(scope.selectId).parent().css('display', 'none');
-            }
-            scope._reindexHiddenFields(scope.hiddenId, scope.containerId);
-          });
-    },
-
-    _removeTagsListener : function() {
-      var scope = this;
-      $(document).on('click', '.deleteTag', function() {
-        var element = $(this);
-        var parent = element.parent();
-        var id = parent.attr('data-id');
-        var name = parent.attr('data-name');
-        var selectElement = $(scope.selectId);
-        if (selectElement.parent().css('display') === 'none') {
-          selectElement.parent().css('display', 'block');
-        }
-        $('<option></option>', {
-          value : id,
-          text : name
-        }).appendTo(selectElement);
-        parent.remove();
-        scope._reindexHiddenFields(scope.hiddenId, scope.containerId);
-      });
-    },
-
-    _reindexHiddenFields : function(hiddenId, containerId) {
-      var hiddenFields = $(containerId).find('input[type="hidden"]');
-      $.each(hiddenFields, function(index, element) {
-        var name = hiddenId + '[' + index + '][id]';
-        $(element).attr('name', name);
-      });
-    }
-  };
-
-  /* === plugin method === */
-  $.fn.activateTag = function(options) {
-
-    return this.each(function() {
-
-      var tagComponent = Object.create(TagComponent);
-
-      tagComponent.init(options);
-    });
-  };
-
-  /* === default options === */
-  $.fn.activateTag.options = {
-    buttonId : '#addOrganizationButton',
-    selectId : '#availableOrganizations',
-    containerId : '#addedOrganizations',
-    hiddenId : 'organizations'
-  };
-
-})($, window, document);
-
-$(document).ready(function() {
-
-  $(document).activateTag({
-    buttonId : '#addOrganizationButton',
-    selectId : '#availableOrganizations',
-    containerId : '#addedOrganizations',
-    hiddenId : 'organizations'
-  });
-
-  $(document).activateTag({
-    buttonId : '#addUserGroupsButton',
-    selectId : '#availableUserGroups',
-    containerId : '#addedUserGroups',
-    hiddenId : 'userGroups'
-  });
-
-  $('body').on('click', 'a[id*="invite"]', function() {
-    var inviteId = $(this).data('invite'), countNetwork = $('input[id*="networks"]').length;
-    $(this).prev().remove();
-    $(this).replaceWith('<span class="btn disabled">' + $(this).text() + '</span>');
-    var hiddenInput = '<input type="hidden" value="' + inviteId + '" name="networks[' + countNetwork + '][id]" id="networks[' + countNetwork + '][id]" />';
-    $('#invite-list').append(hiddenInput);
-  });
-});

src/main/sourceapp/0/js/main.js

-'use strict';
-
-/*
- * JavaScript for Controllers
- * 
- * @depends on: jQuery 1.7+ @depends on: jQuery Validation plugin 1.9+ @depends
- * on: Handlebars 1.0+ @depends on: Globalize
- * 
- */
-  
-(function($) {
-
-  // add new functionality to jQuery
-  // borrowed from
-  // http://stackoverflow.com/questions/1184624/convert-form-data-to-js-object-with-jquery
-  $.fn.serializeObject = function() {
-
-    var self = this, json = {}, pushCounters = {}, patterns = {
-      'validate' : /^[a-zA-Z][a-zA-Z0-9_]*(?:\[(?:\d*|[a-zA-Z0-9_]+)\])*$/,
-      'key' : /[a-zA-Z0-9_]+|(?=\[\])/g,
-      'push' : /^$/,
-      'fixed' : /^\d+$/,
-      'named' : /^[a-zA-Z0-9_]+$/
-    };
-
-    this.build = function(base, key, value) {
-      base[key] = value;
-      return base;
-    };
-
-    this.pushCounter = function(key) {
-      if (pushCounters[key] === undefined) {
-        pushCounters[key] = 0;
-      }
-      return pushCounters[key]++;
-    };
-
-    $.each($(this).serializeArray(), function() {
-
-      // skip invalid keys
-      if (!patterns.validate.test(this.name)) {
-        return;
-      }
-
-      var k, keys = this.name.match(patterns.key), merge = this.value, reverseKey = this.name;
-
-      while ((k = keys.pop()) !== undefined) {
-