From 6fbaf70cce0f53d7dcc0283281e7dcb3e57df421 Mon Sep 17 00:00:00 2001 From: John Walsh Date: Sun, 14 May 2017 15:49:52 +0100 Subject: [PATCH 01/32] Changed track UI loading & other changes Changed the way track config loading is done, it relies on local images & json files instead of contentPath. This will be helpful for linux installation. Fixed some HTML issues, tags, clean up & updated help page image. Changed server.js inconsistencies related to quotes. Updated messages displayed to user, nicer output :) Tested on Windows, seems to all work fine. Will test on my Linux install later... --- frontend/advanced.html | 13 +- frontend/app/controllers.js | 130 +++++++++--------- frontend/entrylist.html | 5 - frontend/help.html | 2 +- frontend/img/sidebar-6.jpg | Bin 0 -> 23787 bytes frontend/img/tracks/drift/ui/preview.png | Bin 0 -> 125450 bytes frontend/img/tracks/drift/ui/ui_track.json | 12 ++ frontend/img/tracks/imola/ui/preview.png | Bin 0 -> 96893 bytes frontend/img/tracks/imola/ui/ui_track.json | 12 ++ .../ks_barcelona/ui/layout_gp/preview.png | Bin 0 -> 121258 bytes .../ks_barcelona/ui/layout_gp/ui_track.json | 12 ++ .../ks_barcelona/ui/layout_moto/preview.png | Bin 0 -> 149177 bytes .../ks_barcelona/ui/layout_moto/ui_track.json | 12 ++ .../ui/layout_int/preview.png | Bin 0 -> 137291 bytes .../ui/layout_int/ui_track.json | 12 ++ .../ui/layout_long/preview.png | Bin 0 -> 157616 bytes .../ui/layout_long/ui_track.json | 12 ++ .../ui/layout_short/preview.png | Bin 0 -> 143793 bytes .../ui/layout_short/ui_track.json | 12 ++ .../tracks/ks_brands_hatch/ui/gp/preview.png | Bin 0 -> 82592 bytes .../ks_brands_hatch/ui/gp/ui_track.json | 12 ++ .../ks_brands_hatch/ui/indy/preview.png | Bin 0 -> 117126 bytes .../ks_brands_hatch/ui/indy/ui_track.json | 12 ++ .../tracks/ks_drag/ui/drag1000/preview.png | Bin 0 -> 164702 bytes .../tracks/ks_drag/ui/drag1000/ui_track.json | 12 ++ .../img/tracks/ks_drag/ui/drag200/preview.png | Bin 0 -> 164702 bytes .../tracks/ks_drag/ui/drag200/ui_track.json | 12 ++ .../tracks/ks_drag/ui/drag2000/preview.png | Bin 0 -> 164702 bytes .../tracks/ks_drag/ui/drag2000/ui_track.json | 12 ++ .../img/tracks/ks_drag/ui/drag400/preview.png | Bin 0 -> 164702 bytes .../tracks/ks_drag/ui/drag400/ui_track.json | 12 ++ .../img/tracks/ks_drag/ui/drag500/preview.png | Bin 0 -> 164702 bytes .../tracks/ks_drag/ui/drag500/ui_track.json | 12 ++ .../ks_highlands/ui/layout_drift/preview.png | Bin 0 -> 78073 bytes .../ui/layout_drift/ui_track.json | 12 ++ .../ks_highlands/ui/layout_int/preview.png | Bin 0 -> 118839 bytes .../ks_highlands/ui/layout_int/ui_track.json | 12 ++ .../ks_highlands/ui/layout_long/preview.png | Bin 0 -> 98790 bytes .../ks_highlands/ui/layout_long/ui_track.json | 12 ++ .../ks_highlands/ui/layout_short/preview.png | Bin 0 -> 100039 bytes .../ui/layout_short/ui_track.json | 12 ++ .../img/tracks/ks_monza66/ui/full/preview.png | Bin 0 -> 143419 bytes .../tracks/ks_monza66/ui/full/ui_track.json | 12 ++ .../tracks/ks_monza66/ui/junior/preview.png | Bin 0 -> 80975 bytes .../tracks/ks_monza66/ui/junior/ui_track.json | 12 ++ .../img/tracks/ks_monza66/ui/people_stand.dds | Bin 0 -> 524416 bytes .../img/tracks/ks_monza66/ui/road/preview.png | Bin 0 -> 76437 bytes .../tracks/ks_monza66/ui/road/ui_track.json | 12 ++ .../ks_nordschleife/ui/endurance/preview.png | Bin 0 -> 87236 bytes .../ui/endurance/ui_track.json | 12 ++ .../ui/endurance_cup/preview.png | Bin 0 -> 87236 bytes .../ui/endurance_cup/ui_track.json | 12 ++ .../ui/nordschleife/preview.png | Bin 0 -> 130655 bytes .../ui/nordschleife/ui_track.json | 12 ++ .../ui/touristenfahrten/preview.png | Bin 0 -> 97343 bytes .../ui/touristenfahrten/ui_track.json | 12 ++ .../ks_nurburgring/ui/layout_gp_a/preview.png | Bin 0 -> 97862 bytes .../ui/layout_gp_a/ui_track.json | 12 ++ .../ks_nurburgring/ui/layout_gp_b/preview.png | Bin 0 -> 93918 bytes .../ui/layout_gp_b/ui_track.json | 12 ++ .../ui/layout_sprint_a/preview.png | Bin 0 -> 82698 bytes .../ui/layout_sprint_a/ui_track.json | 12 ++ .../ui/layout_sprint_b/preview.png | Bin 0 -> 82698 bytes .../ui/layout_sprint_b/ui_track.json | 12 ++ .../ks_red_bull_ring/ui/layout_gp/preview.png | Bin 0 -> 174279 bytes .../ui/layout_gp/ui_track.json | 12 ++ .../ui/layout_national/preview.png | Bin 0 -> 27876 bytes .../ui/layout_national/ui_track.json | 12 ++ .../tracks/ks_silverstone/ui/gp/preview.png | Bin 0 -> 113257 bytes .../tracks/ks_silverstone/ui/gp/ui_track.json | 12 ++ .../ui/international/preview.png | Bin 0 -> 109775 bytes .../ui/international/ui_track.json | 12 ++ .../ks_silverstone/ui/national/preview.png | Bin 0 -> 106667 bytes .../ks_silverstone/ui/national/ui_track.json | 12 ++ .../tracks/ks_silverstone1967/ui/preview.png | Bin 0 -> 108044 bytes .../ks_silverstone1967/ui/ui_track.json | 12 ++ .../ui/classic_circuit/preview.png | Bin 0 -> 125076 bytes .../ui/classic_circuit/ui_track.json | 12 ++ .../ks_vallelunga/ui/club_circuit/preview.png | Bin 0 -> 127180 bytes .../ui/club_circuit/ui_track.json | 12 ++ .../ui/extended_circuit/preview.png | Bin 0 -> 125076 bytes .../ui/extended_circuit/ui_track.json | 12 ++ .../img/tracks/ks_zandvoort/ui/preview.png | Bin 0 -> 95692 bytes .../img/tracks/ks_zandvoort/ui/ui_track.json | 12 ++ frontend/img/tracks/magione/ui/preview.png | Bin 0 -> 103422 bytes frontend/img/tracks/magione/ui/ui_track.json | 12 ++ frontend/img/tracks/monza/ui/preview.png | Bin 0 -> 96675 bytes frontend/img/tracks/monza/ui/ui_track.json | 12 ++ frontend/img/tracks/mugello/ui/preview.png | Bin 0 -> 95256 bytes frontend/img/tracks/mugello/ui/ui_track.json | 12 ++ frontend/img/tracks/spa/ui/preview.png | Bin 0 -> 141875 bytes frontend/img/tracks/spa/ui/ui_track.json | 12 ++ .../img/tracks/trento-bondone/ui/preview.png | Bin 0 -> 103717 bytes .../tracks/trento-bondone/ui/ui_track.json | 12 ++ frontend/index.html | 3 - frontend/rules.html | 9 +- frontend/server.html | 13 +- logs/server_20170414_151905_log.txt | 80 +++++++++++ logs/server_20170414_152005_log.txt | 80 +++++++++++ server.js | 75 +++++----- 100 files changed, 801 insertions(+), 137 deletions(-) create mode 100644 frontend/img/sidebar-6.jpg create mode 100644 frontend/img/tracks/drift/ui/preview.png create mode 100644 frontend/img/tracks/drift/ui/ui_track.json create mode 100644 frontend/img/tracks/imola/ui/preview.png create mode 100644 frontend/img/tracks/imola/ui/ui_track.json create mode 100644 frontend/img/tracks/ks_barcelona/ui/layout_gp/preview.png create mode 100644 frontend/img/tracks/ks_barcelona/ui/layout_gp/ui_track.json create mode 100644 frontend/img/tracks/ks_barcelona/ui/layout_moto/preview.png create mode 100644 frontend/img/tracks/ks_barcelona/ui/layout_moto/ui_track.json create mode 100644 frontend/img/tracks/ks_black_cat_county/ui/layout_int/preview.png create mode 100644 frontend/img/tracks/ks_black_cat_county/ui/layout_int/ui_track.json create mode 100644 frontend/img/tracks/ks_black_cat_county/ui/layout_long/preview.png create mode 100644 frontend/img/tracks/ks_black_cat_county/ui/layout_long/ui_track.json create mode 100644 frontend/img/tracks/ks_black_cat_county/ui/layout_short/preview.png create mode 100644 frontend/img/tracks/ks_black_cat_county/ui/layout_short/ui_track.json create mode 100644 frontend/img/tracks/ks_brands_hatch/ui/gp/preview.png create mode 100644 frontend/img/tracks/ks_brands_hatch/ui/gp/ui_track.json create mode 100644 frontend/img/tracks/ks_brands_hatch/ui/indy/preview.png create mode 100644 frontend/img/tracks/ks_brands_hatch/ui/indy/ui_track.json create mode 100644 frontend/img/tracks/ks_drag/ui/drag1000/preview.png create mode 100644 frontend/img/tracks/ks_drag/ui/drag1000/ui_track.json create mode 100644 frontend/img/tracks/ks_drag/ui/drag200/preview.png create mode 100644 frontend/img/tracks/ks_drag/ui/drag200/ui_track.json create mode 100644 frontend/img/tracks/ks_drag/ui/drag2000/preview.png create mode 100644 frontend/img/tracks/ks_drag/ui/drag2000/ui_track.json create mode 100644 frontend/img/tracks/ks_drag/ui/drag400/preview.png create mode 100644 frontend/img/tracks/ks_drag/ui/drag400/ui_track.json create mode 100644 frontend/img/tracks/ks_drag/ui/drag500/preview.png create mode 100644 frontend/img/tracks/ks_drag/ui/drag500/ui_track.json create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_drift/preview.png create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_drift/ui_track.json create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_int/preview.png create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_int/ui_track.json create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_long/preview.png create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_long/ui_track.json create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_short/preview.png create mode 100644 frontend/img/tracks/ks_highlands/ui/layout_short/ui_track.json create mode 100644 frontend/img/tracks/ks_monza66/ui/full/preview.png create mode 100644 frontend/img/tracks/ks_monza66/ui/full/ui_track.json create mode 100644 frontend/img/tracks/ks_monza66/ui/junior/preview.png create mode 100644 frontend/img/tracks/ks_monza66/ui/junior/ui_track.json create mode 100644 frontend/img/tracks/ks_monza66/ui/people_stand.dds create mode 100644 frontend/img/tracks/ks_monza66/ui/road/preview.png create mode 100644 frontend/img/tracks/ks_monza66/ui/road/ui_track.json create mode 100644 frontend/img/tracks/ks_nordschleife/ui/endurance/preview.png create mode 100644 frontend/img/tracks/ks_nordschleife/ui/endurance/ui_track.json create mode 100644 frontend/img/tracks/ks_nordschleife/ui/endurance_cup/preview.png create mode 100644 frontend/img/tracks/ks_nordschleife/ui/endurance_cup/ui_track.json create mode 100644 frontend/img/tracks/ks_nordschleife/ui/nordschleife/preview.png create mode 100644 frontend/img/tracks/ks_nordschleife/ui/nordschleife/ui_track.json create mode 100644 frontend/img/tracks/ks_nordschleife/ui/touristenfahrten/preview.png create mode 100644 frontend/img/tracks/ks_nordschleife/ui/touristenfahrten/ui_track.json create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_gp_a/preview.png create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_gp_a/ui_track.json create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_gp_b/preview.png create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_gp_b/ui_track.json create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_sprint_a/preview.png create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_sprint_a/ui_track.json create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_sprint_b/preview.png create mode 100644 frontend/img/tracks/ks_nurburgring/ui/layout_sprint_b/ui_track.json create mode 100644 frontend/img/tracks/ks_red_bull_ring/ui/layout_gp/preview.png create mode 100644 frontend/img/tracks/ks_red_bull_ring/ui/layout_gp/ui_track.json create mode 100644 frontend/img/tracks/ks_red_bull_ring/ui/layout_national/preview.png create mode 100644 frontend/img/tracks/ks_red_bull_ring/ui/layout_national/ui_track.json create mode 100644 frontend/img/tracks/ks_silverstone/ui/gp/preview.png create mode 100644 frontend/img/tracks/ks_silverstone/ui/gp/ui_track.json create mode 100644 frontend/img/tracks/ks_silverstone/ui/international/preview.png create mode 100644 frontend/img/tracks/ks_silverstone/ui/international/ui_track.json create mode 100644 frontend/img/tracks/ks_silverstone/ui/national/preview.png create mode 100644 frontend/img/tracks/ks_silverstone/ui/national/ui_track.json create mode 100644 frontend/img/tracks/ks_silverstone1967/ui/preview.png create mode 100644 frontend/img/tracks/ks_silverstone1967/ui/ui_track.json create mode 100644 frontend/img/tracks/ks_vallelunga/ui/classic_circuit/preview.png create mode 100644 frontend/img/tracks/ks_vallelunga/ui/classic_circuit/ui_track.json create mode 100644 frontend/img/tracks/ks_vallelunga/ui/club_circuit/preview.png create mode 100644 frontend/img/tracks/ks_vallelunga/ui/club_circuit/ui_track.json create mode 100644 frontend/img/tracks/ks_vallelunga/ui/extended_circuit/preview.png create mode 100644 frontend/img/tracks/ks_vallelunga/ui/extended_circuit/ui_track.json create mode 100644 frontend/img/tracks/ks_zandvoort/ui/preview.png create mode 100644 frontend/img/tracks/ks_zandvoort/ui/ui_track.json create mode 100644 frontend/img/tracks/magione/ui/preview.png create mode 100644 frontend/img/tracks/magione/ui/ui_track.json create mode 100644 frontend/img/tracks/monza/ui/preview.png create mode 100644 frontend/img/tracks/monza/ui/ui_track.json create mode 100644 frontend/img/tracks/mugello/ui/preview.png create mode 100644 frontend/img/tracks/mugello/ui/ui_track.json create mode 100644 frontend/img/tracks/spa/ui/preview.png create mode 100644 frontend/img/tracks/spa/ui/ui_track.json create mode 100644 frontend/img/tracks/trento-bondone/ui/preview.png create mode 100644 frontend/img/tracks/trento-bondone/ui/ui_track.json create mode 100644 logs/server_20170414_151905_log.txt create mode 100644 logs/server_20170414_152005_log.txt diff --git a/frontend/advanced.html b/frontend/advanced.html index 827c4dd..8605f74 100644 --- a/frontend/advanced.html +++ b/frontend/advanced.html @@ -130,7 +130,7 @@
- +
@@ -162,33 +162,32 @@
-
-
Plugin
-
+
- +
-
+
-
+
diff --git a/frontend/app/controllers.js b/frontend/app/controllers.js index 246e83d..a544e25 100644 --- a/frontend/app/controllers.js +++ b/frontend/app/controllers.js @@ -28,7 +28,7 @@ angular.module('acServerManager') $scope.startACServer = function() { ProcessService.StartACServer(function(result) { if (!(result[0] === 'O' && result[1] === 'K')) { - createAlert('warning', 'Failed to start AC server', true) + createAlert('warning', 'Failed to start AC server', 'pe-7s-server'); } }) } @@ -37,7 +37,7 @@ angular.module('acServerManager') $scope.stopSTrackerServer(); ProcessService.StopACServer(function(result) { if (!(result[0] === 'O' && result[1] === 'K')) { - createAlert('warning', 'Failed to stop AC server', true) + createAlert('warning', 'Failed to stop AC server', 'pe-7s-server'); } }) } @@ -45,7 +45,7 @@ angular.module('acServerManager') $scope.restartACServer = function() { ProcessService.RestartACServer(function(result) { if (!(result[0] === 'O' && result[1] === 'K')) { - createAlert('warning', 'Failed to restart AC server', true) + createAlert('warning', 'Failed to restart AC server', 'pe-7s-server'); } }) } @@ -53,7 +53,7 @@ angular.module('acServerManager') $scope.startSTrackerServer = function() { ProcessService.StartSTrackerServer(function(result) { if (!(result[0] === 'O' && result[1] === 'K')) { - createAlert('warning', 'Failed to start stracker', true) + createAlert('warning', 'Failed to start stracker', 'pe-7s-server'); } }) } @@ -61,7 +61,7 @@ angular.module('acServerManager') $scope.stopSTrackerServer = function() { ProcessService.StopSTrackerServer(function(result) { if (!(result[0] === 'O' && result[1] === 'K')) { - createAlert('warning', 'Failed to stop stracker', true) + createAlert('warning', 'Failed to stop stracker', 'pe-7s-server'); } }) } @@ -69,7 +69,7 @@ angular.module('acServerManager') $scope.restartSTrackerServer = function() { ProcessService.RestartSTrackerServer(function(result) { if (!(result[0] === 'O' && result[1] === 'K')) { - createAlert('warning', 'Failed to restart stracker', true) + createAlert('warning', 'Failed to restart stracker', 'pe-7s-server'); } }) } @@ -78,14 +78,14 @@ angular.module('acServerManager') $scope.alerts.splice(index, 1); }; - function createAlert(type, msg, autoClose) { - var alert = { type: type, msg: msg}; - $scope.alerts.push(alert); - if (autoClose) { - $timeout(function(){ - $scope.alerts.splice($scope.alerts.indexOf(alert), 1); - }, 3000); - } + function createAlert(type, msg, icon) { + $.notify({ + icon: icon, + message: msg + },{ + type: type, + timer: 3000 + }); } }) .controller('ServerCtrl', function ($scope, $filter, $timeout, CarService, TrackService, ServerService, BookService, PracticeService, QualifyService, RaceService, TyreService, WeatherService) { @@ -328,7 +328,7 @@ angular.module('acServerManager') $scope.$broadcast('show-errors-check-validity'); if ($scope.form.$invalid) { - createAlert('warning', 'There are errors on the form', true); + createAlert('warning', 'There are errors on the form', 'pe-7s-note'); return; } @@ -418,9 +418,9 @@ angular.module('acServerManager') }); if (saved) { - createAlert('success', 'Saved successfully', true); - } else { - createAlert('warning', 'Save failed', true); + createAlert('success', 'Saved successfully', 'pe-7s-star'); + } else { + createAlert('warning', 'Save failed', 'pe-7s-close-circle'); } } catch (e) { console.log('Error - ' + e); @@ -448,15 +448,15 @@ angular.module('acServerManager') var sunAngle = multiplier * 16; return sunAngle; } - - function createAlert(type, msg, autoClose) { - var alert = { type: type, msg: msg}; - $scope.alerts.push(alert); - if (autoClose) { - $timeout(function(){ - $scope.alerts.splice($scope.alerts.indexOf(alert), 1); - }, 3000); - } + + function createAlert(type, msg, icon) { + $.notify({ + icon: icon, + message: msg + },{ + type: type, + timer: 3000 + }); } function findInArray(arr, search) { @@ -529,7 +529,7 @@ angular.module('acServerManager') $scope.$broadcast('show-errors-check-validity'); if ($scope.form.$invalid) { - createAlert('warning', 'There are errors on the form', true); + createAlert('warning', 'There are errors on the form', 'pe-7s-note'); return; } @@ -562,9 +562,9 @@ angular.module('acServerManager') EntryListService.SaveEntryList(data, function(result) { if (result[0] === 'O' && result[1] === 'K') { - createAlert('success', 'Saved successfully', true); - } else { - createAlert('warning', 'Save failed', true); + createAlert('success', 'Saved successfully', 'pe-7s-star'); + } else { + createAlert('warning', 'Save failed', 'pe-7s-close-circle'); } }); } @@ -579,7 +579,7 @@ angular.module('acServerManager') $scope.$broadcast('show-errors-check-validity'); if ($scope.createForm.$invalid) { - createAlert('warning', 'There are errors on the form', true); + createAlert('warning', 'There are errors on the form', 'pe-7s-note'); return; } @@ -588,7 +588,7 @@ angular.module('acServerManager') $scope.drivers.push($scope.newDriver); $scope.newDriver = {}; } else { - createAlert('warning', 'Save failed', true); + createAlert('warning', 'Save failed', 'pe-7s-close-circle'); } }); } @@ -605,7 +605,7 @@ angular.module('acServerManager') }); } } else { - createAlert('warning', 'Delete failed', true); + createAlert('warning', 'Delete failed', 'pe-7s-close-circle'); } }); } @@ -616,14 +616,14 @@ angular.module('acServerManager') $scope.newEntry.GUID = driver.GUID; } - function createAlert(type, msg, autoClose) { - var alert = { type: type, msg: msg}; - $scope.alerts.push(alert); - if (autoClose) { - $timeout(function(){ - $scope.alerts.splice($scope.alerts.indexOf(alert), 1); - }, 3000); - } + function createAlert(type, msg, icon) { + $.notify({ + icon: icon, + message: msg + },{ + type: type, + timer: 3000 + }); } }) .controller('RulesCtrl', function($scope, $timeout, ServerService, DynamicTrackService) { @@ -662,7 +662,7 @@ angular.module('acServerManager') $scope.$broadcast('show-errors-check-validity'); if ($scope.form.$invalid) { - createAlert('warning', 'There are errors on the form', true); + createAlert('warning', 'There are errors on the form', 'pe-7s-note'); return; } @@ -693,23 +693,23 @@ angular.module('acServerManager') }); if (saved) { - createAlert('success', 'Saved successfully', true); - } else { - reateAlert('success', 'Save failed', true); + createAlert('success', 'Saved successfully', 'pe-7s-star'); + } else { + createAlert('warning', 'Save failed', 'pe-7s-close-circle'); } } catch (e) { console.log('Error - ' + e); } } - function createAlert(type, msg, autoClose) { - var alert = { type: type, msg: msg}; - $scope.alerts.push(alert); - if (autoClose) { - $timeout(function(){ - $scope.alerts.splice($scope.alerts.indexOf(alert), 1); - }, 3000); - } + function createAlert(type, msg, icon) { + $.notify({ + icon: icon, + message: msg + },{ + type: type, + timer: 3000 + }); } }) .controller('AdvancedCtrl', function($scope, $timeout, ServerService) { @@ -726,7 +726,7 @@ angular.module('acServerManager') $scope.$broadcast('show-errors-check-validity'); if ($scope.form.$invalid) { - createAlert('warning', 'There are errors on the form', true); + createAlert('warning', 'There are errors on the form', 'pe-7s-note'); return; } @@ -738,9 +738,9 @@ angular.module('acServerManager') ServerService.SaveServerDetails($scope.server, function(result) { if (result[0] === 'O' && result[1] === 'K') { - createAlert('success', 'Saved successfully', true); + createAlert('success', 'Saved successfully', 'pe-7s-star'); } else { - createAlert('warning', 'Save failed', true); + createAlert('warning', 'Save failed', 'pe-7s-close-circle'); } }); } catch (e) { @@ -749,14 +749,14 @@ angular.module('acServerManager') } - function createAlert(type, msg, autoClose) { - var alert = { type: type, msg: msg}; - $scope.alerts.push(alert); - if (autoClose) { - $timeout(function(){ - $scope.alerts.splice($scope.alerts.indexOf(alert), 1); - }, 3000); - } + function createAlert(type, msg, icon) { + $.notify({ + icon: icon, + message: msg + },{ + type: type, + timer: 3000 + }); } }) .controller('HelpCtrl', function($scope) { diff --git a/frontend/entrylist.html b/frontend/entrylist.html index 9e19936..178eabd 100644 --- a/frontend/entrylist.html +++ b/frontend/entrylist.html @@ -104,7 +104,6 @@
Add Player -
@@ -237,8 +236,6 @@
- -