JavaScriptCollection
diff --git a/‎Gruntfile.js‎
Lines changed: 6 additions & 1 deletion b/‎Gruntfile.js‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎bower.json‎
Lines changed: 2 additions & 1 deletion b/‎bower.json‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎dist/css/evolutility.css‎
Lines changed: 5 additions & 0 deletions b/‎dist/css/evolutility.css‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎dist/css/evolutility.min.css‎
Lines changed: 1 addition & 1 deletion b/‎dist/css/evolutility.min.css‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/css/select2-spinner.gif‎
1.81 KB b/‎dist/css/select2-spinner.gif‎
1.81 KB
diff --git a/‎dist/css/select2.png‎
613 Bytes b/‎dist/css/select2.png‎
613 Bytes
diff --git a/‎dist/css/select2x2.png‎
845 Bytes b/‎dist/css/select2x2.png‎
845 Bytes
diff --git a/‎dist/css/vendors.min.css‎
Lines changed: 1 addition & 1 deletion b/‎dist/css/vendors.min.css‎
Lines changed: 1 addition & 1 deletion
@@ -24,6 +24,7 @@ module.exports = function (grunt) {
                     // jQuery & jQuery UI
                     'bower_components/jquery/dist/jquery.js',
                     //'bower_components/jquery-ui/ui/jquery.ui.widget.js',
+                    //'bower_components/jquery.csv.js',
 
                     // Backbone & Underscore
                     'bower_components/underscore/underscore.js',
@@ -38,7 +39,8 @@ module.exports = function (grunt) {
                     'bower_components/bootstrap/js/dropdown.js',
 
                     // Widgets
-                    'bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js'
+                    'bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js',
+                    'bower_components/select2/select2.js'
                 ],
                 dest: '<%= pkg.target %>/vendors.js'
             },
@@ -61,6 +63,7 @@ module.exports = function (grunt) {
                     'js/action.js',
                     'js/action-*.js',
 
+                    //'js/navbar.js',
                     'js/toolbar.js'
                     //'js/ui-models/dico/field.js'
                 ],
@@ -85,7 +88,9 @@ module.exports = function (grunt) {
                 'js/one*.js',
                 'js/action-*.js',
 
+                //'js/navbar.js',
                 'js/toolbar.js',
+
                 'js/ui-models/dico/*.js',
 
                 // --- ui models ---
 
@@ -7,6 +7,7 @@
     "backbone.localStorage": "v1.1.7",
     "underscore": "1.6.0",
     "bootstrap": "v3.1.1",
-    "bootstrap-datepicker": "1.3.0"
+    "bootstrap-datepicker": "1.3.0",
+    "select2": "3.4.8"
   }
 }
@@ -134,6 +134,11 @@
 .evo-msg > div {
   margin-top: 5px;
 }
+.evo-color-box {
+  height: 20px;
+  width: 20px;
+  border: solid 1px silver;
+}
 /* --- mini --- */
 .evol-mini-holder {
   margin: 10px -10px;
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`"backbone.localStorage": "v1.1.7",`
`8`	`8`	`"underscore": "1.6.0",`
`9`	`9`	`"bootstrap": "v3.1.1",`
`10`		`- "bootstrap-datepicker": "1.3.0"`
	`10`	`+ "bootstrap-datepicker": "1.3.0",`
	`11`	`+ "select2": "3.4.8"`
`11`	`12`	`}`
`12`	`13`	`}`