CHANGE bower to npm

Remove bower dependencies and fix jquery bugs.

.gitignore

@@ -37,6 +37,7 @@ circle/*.pem
 # collected static files:
 # collected static files:
 circle/static_collected
 circle/static_collected
 circle/bower_components
 circle/bower_components
+circle/node_modules
 
 
 # jsi18n files
 # jsi18n files
 jsi18n
 jsi18n

circle/bower.json

-{
-  "name": "circle",
-  "version": "0.0.0",
-  "license": "GPL",
-  "private": true,
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "bootstrap": "~3.2.0",
-    "fontawesome": "~4.3.0",
-    "jquery": "~2.1.1",
-    "no-vnc": "0.5.1",
-    "jquery-knob": "~1.2.9",
-    "jquery-simple-slider": "https://github.com/BME-IK/jquery-simple-slider.git",
-    "bootbox": "~4.3.0",
-    "intro.js": "0.9.0",
-    "favico.js": "~0.3.5",
-    "datatables": "~1.10.4",
-    "chart.js": "2.3.0",
-    "clipboard": "~1.6.1"
-  }
-}

circle/circle/settings/base.py

@@ -159,7 +159,7 @@ STATICFILES_FINDERS = (
     'pipeline.finders.PipelineFinder',
     'pipeline.finders.PipelineFinder',
 )
 )
 ########## END STATIC FILE CONFIGURATION
 ########## END STATIC FILE CONFIGURATION
-STATICFILES_DIRS = [normpath(join(SITE_ROOT, 'bower_components'))]
+STATICFILES_DIRS = [normpath(join(SITE_ROOT, 'node_modules'))]
 
 
 p = normpath(join(SITE_ROOT, '../../site-circle/static'))
 p = normpath(join(SITE_ROOT, '../../site-circle/static'))
 if exists(p):
 if exists(p):

circle/dashboard/static/dashboard/dashboard.js

@@ -78,7 +78,7 @@ $(function () {
     return false;
     return false;
   });
   });
 
 
-  $('[href=#index-graph-view]').click(function (e) {
+  $('[href="#index-graph-view"]').click(function (e) {
     var box = $(this).data('index-box');
     var box = $(this).data('index-box');
     $("#" + box + "-list-view").hide();
     $("#" + box + "-list-view").hide();
     $("#" + box + "-graph-view").show();
     $("#" + box + "-graph-view").show();
@@ -88,7 +88,7 @@ $(function () {
     return false;
     return false;
   });
   });
 
 
-  $('[href=#index-list-view]').click(function (e) {
+  $('[href="#index-list-view"]').click(function (e) {
     var box = $(this).data('index-box');
     var box = $(this).data('index-box');
     $('#' + box + '-graph-view').hide();
     $('#' + box + '-graph-view').hide();
     $('#' + box + '-list-view').show();
     $('#' + box + '-list-view').show();
@@ -109,10 +109,10 @@ $(function () {
 
 
   if (window.location.hash) {
   if (window.location.hash) {
     if(window.location.hash.substring(1,4) == "ipv")
     if(window.location.hash.substring(1,4) == "ipv")
-      $("a[href=#network]").tab('show');
+      $("a[href='#network']").tab('show');
     if(window.location.hash == "activity")
     if(window.location.hash == "activity")
       checkNewActivity(false, 1);
       checkNewActivity(false, 1);
-    $("a[href=" + window.location.hash +"]").tab('show');
+    $("a[href='" + window.location.hash +"']").tab('show');
   }
   }
 
 
 
 

circle/package.json

+{
+  "name": "circle",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "bootbox": "^4.4.0",
+    "bootstrap": "^3.3.7",
+    "chart.js": "^2.7.1",
+    "clipboard": "^1.7.1",
+    "datatables": "^1.10.13",
+    "favico.js": "^0.3.10",
+    "fontawesome": "^4.7.2",
+    "intro.js": "^2.8.0-alpha.1",
+    "jquery": "^3.2.1",
+    "jquery-knob": "^1.2.11",
+    "jquery-simple-slider": "https://github.com/BME-IK/jquery-simple-slider.git"
+  }
+}