Fixing some polling bugs; fixing some css.

Author: rcreasey

app/js/Data.js

@@ -8,8 +8,8 @@ var Data = {
 	config: {
 		domain: 'https://standing-fleet.herokuapp.com/',
 		apiUrl: '/api',
-		alertStay: 6000,
-		pollInterval: 15000,
+		alertStay: 5000,
+		pollInterval: 5000,
 		maxEvents: 20,
 		maxScans: 8,
 		uiSpeed: 400,

app/js/EventHandler.js

@@ -178,7 +178,9 @@ var EventHandler = {
 
 	statusSelfSystem: function(self) {
 		Data.state.self.systemId = self.systemId;
-		Data.state.self.regionId = Data.systems[self.systemId].regionID;
+		if (Data.state.self.regionId && Data.state.self.systemId) {
+			Data.state.self.regionId = Data.systems[self.systemId].regionID;
+		}
 	},
 
 	statusArmada: function (armada) {

app/styles/main.css

@@ -547,7 +547,6 @@ a.button,
 	font-size: 1rem;
 	text-align: center;
 	background-color: #ffcc2a;
-	background: linear-gradient(#ffd95f, #ffcc2a);
 	box-shadow:
 			inset 0 1px 0 rgba(255,255,255,0.3),
 			0 1px 2px rgba(0,0,0,0.35),

config/settings.js

@@ -18,7 +18,7 @@ module.exports = function () {
 			cookie: {
 				path: '/',
 				httpOnly: true,
-				maxAge: 864000000
+				maxAge: 43200000
 			}
 		},
 
@@ -28,7 +28,7 @@ module.exports = function () {
 		log: 'console',
 
 		memberTtl: 300000,
-		armadaTtl: 86400000,
+		armadaTtl: 43200000,
 		eventTtl: 900000,
 		scanTtl: 900000,