diff --git a/.gitignore b/.gitignore
index 1cea188a..5ef3821d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ Temporary Items
# ========================
# project files
# ========================
+.idea
.sass-cache
.build_js
.css
diff --git a/.htaccess b/.htaccess
index 9ff9acf7..ddf4a3bf 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,21 @@
# Enable rewrite engine and route requests to framework
RewriteEngine On
+# HTTP to HTTPS ----------------------------------------------------------------
+RewriteCond %{HTTPS} off
+RewriteCond %{HTTP_HOST} !=localhost
+
+# First rewrite to HTTPS:
+# Don't put www. here. If it is already there it will be included, if not
+# the subsequent rule will catch it.
+RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+# Now, rewrite any request to the wrong domain to use www.
+RewriteCond %{HTTP_HOST} !^www\.
+RewriteCond %{HTTP_HOST} !=localhost
+RewriteRule .* https://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+
# Some servers require you to specify the `RewriteBase` directive
# In such cases, it should be the path (relative to the document root)
# containing this .htaccess file
@@ -16,15 +31,17 @@ RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule .* index.php [L,QSA]
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+
# PHP global Vars
php_value max_input_vars 5000
php_value suhosin.get.max_vars 5000
php_value suhosin.post.max_vars 5000
php_value suhosin.request.max_vars 5000
+
# PHP error logs
php_flag log_errors on
-# php_value error_log "/www/htdocs/w0128162/pathfinder.exodus4d.de/php_errors.html"
+# php_value error_log "/www/htdocs/w0128162/www.pathfinder.exodus4d.de/logs/php_errors.log"
# cache images/pdf docs
@@ -56,3 +73,5 @@ php_flag log_errors on
ExpiresDefault "access plus 1 week"
+
+
diff --git a/.idea/dataSources.ids b/.idea/dataSources.ids
index 063c261a..c1a1daf2 100644
--- a/.idea/dataSources.ids
+++ b/.idea/dataSources.ids
@@ -1,14 +1,15 @@
-
+
#@
`
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
@@ -363,7 +365,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -444,11 +446,14 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -521,6 +526,7 @@
+
@@ -529,12 +535,12 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -925,6 +1080,7 @@
+
@@ -936,6 +1092,7 @@
+
@@ -1028,10 +1185,10 @@
-
+
-
+
@@ -1041,14 +1198,13 @@
-
-
+
+
-
@@ -1246,7 +1402,7 @@
-
+
@@ -1254,19 +1410,19 @@
-
+
-
+
-
+
@@ -1280,6 +1436,7 @@
+
@@ -1344,4 +1501,542 @@
+
+
+ #@
+ `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 10c46f9a..8429f892 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -3,8 +3,14 @@
root
- eve_phoebe.* pathfinder.*
- eve_phoebe.* pathfinder.*
+ eve_aegis.* eve_test.* pathfinder.*
+ pathfinder.*
+
+
+ master_key
+ d01d8636
+ d01d8636.*
+ d01d8636.*
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 7aeb6464..7dee49de 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,6 +1,6 @@
-
+
mysql
true
@@ -12,5 +12,19 @@
+
+ mysql
+ true
+ com.mysql.jdbc.Driver
+ jdbc:mysql://exodus4d.de:3306
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index b05f9a37..5fac34b7 100644
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,4 +1,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index b8387eb1..5ebc0ea4 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,6 +1,7 @@
+
\ No newline at end of file
diff --git a/.idea/pathfinder.iml b/.idea/pathfinder.iml
index e5631ff2..6af6f2a8 100644
--- a/.idea/pathfinder.iml
+++ b/.idea/pathfinder.iml
@@ -11,18 +11,14 @@
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 37585f35..8b9ad5b3 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -5,7 +5,7 @@
-
+
@@ -15,10 +15,10 @@
-
+
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 90ac9278..93d0edb1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,11 +6,75 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -30,6 +94,13 @@
+
+
+
+
+
+
+
@@ -49,7 +120,7 @@
-
+
@@ -58,34 +129,24 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -94,38 +155,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -135,17 +166,119 @@
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -154,98 +287,65 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
@@ -253,18 +353,78 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -274,11 +434,11 @@
-
-
+
+
-
+
@@ -286,11 +446,11 @@
-
-
+
+
-
+
@@ -298,41 +458,11 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -340,11 +470,51 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -372,57 +542,57 @@
@@ -435,6 +605,7 @@
true
+
@@ -442,10 +613,10 @@
-
-
-
-
+
+
+
+
@@ -454,18 +625,45 @@
+
+ Assignment issuesJavaScript
+
CSS
+
+ Code StylePHP
+
+
+ Code style issuesJavaScript
+
+
+ CoffeeScript
+
+
+ Control flow issuesJavaScript
+
+
+ DOM issuesJavaScript
+
+
+ Error handlingJavaScript
+
General
+
+ GeneralCoffeeScript
+
GeneralJavaScript
GeneralPHP
+
+ HAML
+
HTML
@@ -478,19 +676,28 @@
PHP
+
+ Potentially confusing code constructsJavaScript
+
+
+ Probable bugsCoffeeScript
+
SQL
UndefinedPHP
+
+ XML
+
XPath
- Blade files
+ Invalid elementsCSS
@@ -522,197 +729,36 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
@@ -721,6 +767,10 @@
+
+
+
+
@@ -821,10 +871,378 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -832,8 +1250,8 @@
-
-
+
+
@@ -870,8 +1288,9 @@
-
-
+
+
+
@@ -1150,52 +1569,38 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
@@ -1244,366 +1649,222 @@
-
+
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
+
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1611,38 +1872,186 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1652,6 +2061,7 @@
+ Test Scope
+
+
+
diff --git a/app/config.ini b/app/config.ini
index 9ef8f337..39e21507 100644
--- a/app/config.ini
+++ b/app/config.ini
@@ -1,7 +1,7 @@
[globals]
-
-; Verbosity level of the stack trace. Assign values between 0 to 3 for increasing verbosity levels
-DEBUG = 3
+; Default Verbosity level of the stack trace.
+; Assign values between 0 to 3 for increasing verbosity levels. Check "PATHFINDER" config for overwriting
+DEBUG = 0
; If TRUE, the framework, after having logged stack trace and errors, stops execution (die without any status) when a non-fatal error is detected.
HALT = FALSE
@@ -14,10 +14,8 @@ TZ = "UTC"
; Cache backend. Can handle Memcache module, APC, WinCache, XCache and a filesystem-based cache.
CACHE = TRUE
-; Path configurations =====================================================================================
-; Path to the index.php main/front controller.
-BASE = /exodus4d/pathfinder
-; BASE = /www/htdocs/w0128162/pathfinder.exodus4d.de
+; Path configurations ==================================================================================
+; relative to "BASE" dir
; Temporary folder for cache, filesystem locks, compiled F3 templates, etc.
TEMP = tmp/
@@ -31,107 +29,5 @@ UI = public/
; Search path(s) for user-defined PHP classes that the framework will attempt to autoload at runtime
AUTOLOAD = app/main/
-; Pathfinder Databases ====================================================================================
-; Develop
-DB_DNS = mysql:host=localhost;port=3306;dbname=
-DB_NAME = pathfinder
-DB_USER = root
-DB_PASS =
-; Live
-; DB_DNS = mysql:host=localhost;port=3306;dbname=
-; DB_NAME = d01d8636
-; DB_USER = d01d8636
-; DB_PASS = bQ9VAd6fE86sVs4s
-
-; EVE-Online CCP Database export
-DB_CCP_DNS = mysql:host=localhost;port=3306;dbname=
-DB_CCP_NAME = eve_phoebe
-DB_CCP_USER = root
-DB_CCP_PASS =
-
-; ======================================================================================================
-[PATHFINDER]
-
-NAME = "PATHFINDER"
-VERSION = "v0.10"
-CONTACT = "https://github.com/exodus4d"
-
-; Max number of maps an entity can create
-MAX_MAPS_PRIVATE = 3
-MAX_MAPS_CORPORATION = 3
-MAX_MAPS_ALLIANCE = 3
-
-; Max number of shared entities per map
-MAX_SHARED_USER = 10
-MAX_SHARED_CORPORATION = 3
-MAX_SHARED_ALLIANCE = 2
-
-; Lifetime for map types
-[PATHFINDER.MAP.PRIVATE]
-LIFETIME = 2
-
-[PATHFINDER.MAP.CORPORATION]
-LIFETIME = 99999
-
-[PATHFINDER.MAP.ALLIANCE]
-LIFETIME = 99999
-; ======================================================================================================
-[PATHFINDER.CACHE]
-
-; cache character log informations in seconds. This is ignored if ship/system switch was detected
-CHARACTER_LOG = 600
-
-; cache time for all system data within a constellation (this will never change) 30d
-CONSTELLATION_SYSTEMS = 2592000
-
-; ======================================================================================================
-[PATHFINDER.TIMER]
-
-; login time (minutes)
-LOGGED = 120
-
-; double click timer (ms)
-DBL_CLICK = 250
-
-; time for status change visibility in header (ms)
-PROGRAM_STATUS_VISIBLE = 5000
-
-; get all client map data (ms)
-[PATHFINDER.TIMER.GET_CLIENT_MAP_DATA]
-EXECUTION_LIMIT = 50
-
-; main map update ping (ajax) (ms)
-[PATHFINDER.TIMER.UPDATE_SERVER_MAP]
-DELAY = 5000
-EXECUTION_LIMIT = 200
-
-; update client map data (ms)
-[PATHFINDER.TIMER.UPDATE_CLIENT_MAP]
-EXECUTION_LIMIT = 50
-
-; map user update ping (ajax) (ms)
-[PATHFINDER.TIMER.UPDATE_SERVER_USER_DATA]
-DELAY = 5000
-EXECUTION_LIMIT = 200
-
-; update client user data (ms)
-[PATHFINDER.TIMER.UPDATE_CLIENT_USER_DATA]
-EXECUTION_LIMIT = 50
-
-; ======================================================================================================
-[PATHFINDER.LOGFILES]
-
-; just for manuel debug during development
-DEBUG = "debug"
-
-; user login information
-LOGIN = "login"
-
-; ======================================================================================================
-[api_path]
-
-; Path for CCPs XML APIv2
-CCP_XML = "https://api.eveonline.com"
-
diff --git a/app/cron.ini b/app/cron.ini
index c3962710..89ae8f63 100644
--- a/app/cron.ini
+++ b/app/cron.ini
@@ -1,7 +1,7 @@
[CRON]
log = TRUE
cli = TRUE
-web = FALSE
+web = TRUE
[CRON.presets]
; run every minute
diff --git a/app/main/controller/CcpApiController.php b/app/main/controller/CcpApiController.php
index c9972a56..ed1f28e9 100644
--- a/app/main/controller/CcpApiController.php
+++ b/app/main/controller/CcpApiController.php
@@ -53,7 +53,8 @@ class CcpApiController extends Controller{
* @return bool|\SimpleXMLElement
*/
public function requestCharacters($keyID, $vCode){
- $apiPath = $this->f3->get('api_path.CCP_XML') . '/account/APIKeyInfo.xml.aspx';
+
+ $apiPath = $this->f3->get('PATHFINDER.API.CCP_XML') . '/account/APIKeyInfo.xml.aspx';
$xml = false;
diff --git a/app/main/controller/Controller.php b/app/main/controller/Controller.php
index f5eed12d..c435ac8c 100644
--- a/app/main/controller/Controller.php
+++ b/app/main/controller/Controller.php
@@ -37,12 +37,19 @@ class Controller {
return $this->template;
}
+
/**
- * event handler
+ * event handler for all "views"
+ * some global template variables are set in here
* @param $f3
*/
function beforeroute($f3) {
+ // check if user is in game
+ $f3->set('isIngame', self::isIGB() );
+
+ // js path (build/minified or raw uncompressed files)
+ $f3->set('pathJs', self::getEnvironmentData('PATH_JS') );
}
/**
@@ -169,7 +176,6 @@ class Controller {
return $validUser;
}
-
/**
* log the current user out
* @param $f3
@@ -184,7 +190,7 @@ class Controller {
$f3->reroute('@landing');
}else{
$return = (object) [];
- $return->reroute = $f3->get('BASE') . $f3->alias('landing');
+ $return->reroute = self::getEnvironmentData('URL') . $f3->alias('landing');
$return->error[] = $this->getUserLoggedOffError();
echo json_encode($return);
@@ -204,6 +210,15 @@ class Controller {
return $userError;
}
+ /**
+ * get the current registration status
+ * 0=registration stop |1=new registration allowed
+ * @return int
+ */
+ static function getRegistrationStatus(){
+ return (int)\Base::instance()->get('PATHFINDER.REGISTRATION.STATUS');
+ }
+
/**
* get a log controller e.g. "debug"
* @param $loggerType
@@ -223,5 +238,22 @@ class Controller {
return str_replace($illegalCharacters, '', $key);
}
+ /**
+ * get environment specific configuration data
+ * @param $key
+ * @return mixed|null
+ */
+ static function getEnvironmentData($key){
+ $f3 = \Base::instance();
+ $environment = $f3->get('PATHFINDER.ENVIRONMENT.SERVER');
+ $environmentKey = 'PATHFINDER.ENVIRONMENT[' . $environment . '][' . $key . ']';
+ $data = null;
+
+ if( $f3->exists($environmentKey) ){
+ $data = $f3->get($environmentKey);
+ }
+
+ return $data;
+ }
}
\ No newline at end of file
diff --git a/app/main/controller/MapController.php b/app/main/controller/MapController.php
index c3e9cfd7..cc69a4c5 100644
--- a/app/main/controller/MapController.php
+++ b/app/main/controller/MapController.php
@@ -26,7 +26,7 @@ class MapController extends \Controller\AccessController {
$this->f3->set('trusted', (int)self::isIGBTrusted());
// JS main file
- $this->f3->set('jsView', 'main');
+ $this->f3->set('jsView', 'mappage');
$this->setTemplate('templates/view/index.html');
}
diff --git a/app/main/controller/api/Map.php b/app/main/controller/api/Map.php
index dccda3f5..c7e47fd8 100644
--- a/app/main/controller/api/Map.php
+++ b/app/main/controller/api/Map.php
@@ -517,9 +517,9 @@ class Map extends \Controller\AccessController {
// IMPORTANT for now -> just update a single map (save performance)
$mapIds = array_slice($mapIds, 0, 1);
- // the maps are cached per map (this must be changed if multiple maps
+ // the userMasData is cached per map (this must be changed if multiple maps
// will be allowed in future...
- $tempId = $mapIds[0];
+ $tempId = (int)$mapIds[0];
$cacheKey = 'user_data_' . $tempId . '_' . $requestSystemData->systemId;
if( $f3->exists($cacheKey) === false ){
diff --git a/app/main/controller/api/User.php b/app/main/controller/api/User.php
index 8b26cca7..038fce46 100644
--- a/app/main/controller/api/User.php
+++ b/app/main/controller/api/User.php
@@ -40,7 +40,7 @@ class User extends Controller\Controller{
$user->updateApiData();
// route user to map app
- $return->reroute = $f3->get('BASE') . $f3->alias('map');
+ $return->reroute = self::getEnvironmentData('URL') . $f3->alias('map');
}
echo json_encode($return);
@@ -57,7 +57,7 @@ class User extends Controller\Controller{
// try to verify user
$user = $this->_verifyUser($userName, $password);
- if($user !== false){
+ if( !is_null($user)){
// user is verified -> ready for login
// set Session login
@@ -244,7 +244,6 @@ class User extends Controller\Controller{
if($user === false){
// new user registration
$user = $mapType = Model\BasicModel::getNew('UserModel');
-
$loginAfterSave = true;
// set username
@@ -320,12 +319,8 @@ class User extends Controller\Controller{
$api->userId = $user;
}
-
-
$api->keyId = $keyId;
$api->vCode = $settingsData['vCode'][$i];
-
- // -----
$api->save();
$characterCount = $api->updateCharacters();
@@ -369,7 +364,7 @@ class User extends Controller\Controller{
$this->logUserIn( $user->name, $settingsData['password'] );
// return reroute path
- $return->reroute = $this->f3->get('BASE') . $this->f3->alias('map');
+ $return->reroute = self::getEnvironmentData('URL') . $this->f3->alias('map');
}
// get fresh updated user object
@@ -382,9 +377,13 @@ class User extends Controller\Controller{
$validationError->field = $e->getField();
$validationError->message = $e->getMessage();
$return->error[] = $validationError;
+ }catch(Exception\RegistrationException $e){
+ $registrationError = (object) [];
+ $registrationError->type = 'error';
+ $registrationError->message = $e->getMessage();
+ $return->error[] = $registrationError;
}
-
// return new/updated user data
$return->userData = $newUserData;
diff --git a/app/main/controller/appcontroller.php b/app/main/controller/appcontroller.php
index 120391b1..9d8461a2 100644
--- a/app/main/controller/appcontroller.php
+++ b/app/main/controller/appcontroller.php
@@ -29,10 +29,6 @@ class AppController extends Controller {
// JS main file
$f3->set('jsView', 'landingpage');
- // check if user is in game
- $f3->set('isIngame', self::isIGB() );
- $this->f3->set('igbTest', 123 );
-
$this->setTemplate('templates/view/index.html');
}
diff --git a/app/main/cron/ccpSystemsUpdate.php b/app/main/cron/ccpSystemsUpdate.php
index 5fa02c5d..4dea721b 100644
--- a/app/main/cron/ccpSystemsUpdate.php
+++ b/app/main/cron/ccpSystemsUpdate.php
@@ -15,7 +15,8 @@ class CcpSystemsUpdate {
const LOG_TEXT = '%s prepare table (%.3F s), jump (%.3F s), kill (%.3F s), update all (%.3F s)';
protected $apiRequestOptions = [
- 'timeout' => 5
+ 'timeout' => 5,
+ 'follow_location' => false // otherwise CURLOPT_FOLLOWLOCATION will fail
];
/**
@@ -57,7 +58,7 @@ class CcpSystemsUpdate {
if($systemData['type']['name'] == 'k-space'){
$f3->get('DB')->exec($sqlInsertSystem, array(
':systemId' => $systemData['systemId']
- ));
+ ), 0, false);
}
}
@@ -84,7 +85,7 @@ class CcpSystemsUpdate {
// get current jump Data -------------------------------------------------------
$time_start = microtime(true);
- $apiPath = $f3->get('api_path.CCP_XML') . '/map/Jumps.xml.aspx';
+ $apiPath = $f3->get('PATHFINDER.API.CCP_XML') . '/map/Jumps.xml.aspx';
$apiResponse = \Web::instance()->request($apiPath, $this->apiRequestOptions );
@@ -109,7 +110,7 @@ class CcpSystemsUpdate {
// get current kill Data -------------------------------------------------------
$time_start = microtime(true);
- $apiPath = $f3->get('api_path.CCP_XML') . '/map/Kills.xml.aspx';
+ $apiPath = $f3->get('PATHFINDER.API.CCP_XML') . '/map/Kills.xml.aspx';
$apiResponse = \Web::instance()->request($apiPath, $this->apiRequestOptions );
$killData = [];
@@ -171,8 +172,7 @@ class CcpSystemsUpdate {
value2 = value1,
value1 = :value
WHERE
- systemId = :systemId AND
- HOUR(TIMEDIFF(NOW(), updated)) > 0
+ systemId = :systemId
";
foreach($systemsData as $systemData){
@@ -190,7 +190,7 @@ class CcpSystemsUpdate {
$f3->get('DB')->exec($sql, array(
':systemId' => $systemData['systemId'],
':value' => $currentJumps
- ));
+ ), 0, false);
}else if($updateKills){
// update kill data (if available)
@@ -204,7 +204,7 @@ class CcpSystemsUpdate {
$f3->get('DB')->exec($sql, array(
':systemId' => $systemData['systemId'],
':value' => $currentKills
- ));
+ ), 0, false);
}
}
}
diff --git a/app/main/data/mapper/CcpSystemsMapper.php b/app/main/data/mapper/CcpSystemsMapper.php
index bf7e8b9b..898f7f72 100644
--- a/app/main/data/mapper/CcpSystemsMapper.php
+++ b/app/main/data/mapper/CcpSystemsMapper.php
@@ -85,8 +85,8 @@ class CcpSystemsMapper extends \RecursiveArrayIterator {
// format functions
self::$map['type'] = function($iterator){
- // TODO refactore
- $type = 'wh';
+ // TODO refactor
+ $type = 'w-space';
$typeId = 1;
if(
$iterator['security'] == 7 ||
diff --git a/app/main/db/database.php b/app/main/db/database.php
index 22616b85..c8fb7756 100644
--- a/app/main/db/database.php
+++ b/app/main/db/database.php
@@ -7,6 +7,8 @@
*/
namespace DB;
+use Controller;
+use controller\LogController;
class Database extends \Prefab {
@@ -14,6 +16,7 @@ class Database extends \Prefab {
function __construct($database = 'PF'){
// set database
$this->setDB($database);
+ $this->setDB($database);
}
/**
@@ -26,20 +29,36 @@ class Database extends \Prefab {
if($database === 'CCP'){
// CCP DB
- $db = $this->connect($f3->get('DB_CCP_DNS'), $f3->get('DB_CCP_NAME'), $f3->get('DB_CCP_USER'), $f3->get('DB_CCP_PASS'));
+ $dns = Controller\Controller::getEnvironmentData('DB_CCP_DNS');
+ $name = Controller\Controller::getEnvironmentData('DB_CCP_NAME');
+ $user = Controller\Controller::getEnvironmentData('DB_CCP_USER');
+ $password = Controller\Controller::getEnvironmentData('DB_CCP_PASS');
}else{
// Pathfinder DB
- $db = $this->connect($f3->get('DB_DNS'), $f3->get('DB_NAME'), $f3->get('DB_USER'), $f3->get('DB_PASS'));
+ $dns = Controller\Controller::getEnvironmentData('DB_DNS');
+ $name = Controller\Controller::getEnvironmentData('DB_NAME');
+ $user = Controller\Controller::getEnvironmentData('DB_USER');
+ $password = Controller\Controller::getEnvironmentData('DB_PASS');
}
- $f3->set('DB', $db);
+ // check for DB switch. If current DB equal new DB -> no switch needed
+ if(
+ !$f3->exists('DB') ||
+ $name !== $f3->get('DB')->name()
+ ){
- // set DB timezone to UTC +00:00 (eve server time)
- $f3->get('DB')->exec('SET @@session.time_zone = "+00:00";');
+ $db = $this->connect($dns, $name, $user, $password);
+
+ $f3->set('DB', $db);
+
+ // set DB timezone to UTC +00:00 (eve server time)
+ $f3->get('DB')->exec('SET @@session.time_zone = "+00:00";');
+
+ // disable innoDB schema (relevant vor MySql 5.5)
+ // not necessary for MySql > v.5.6
+ //$f3->get('DB')->exec('SET GLOBAL innodb_stats_on_metadata = OFF;');
+ }
- // disable innoDB schema (relevant vor MySql 5.5)
- // not necessary for MySql 5.6
- //$f3->get('DB')->exec('SET GLOBAL innodb_stats_on_metadata = OFF;');
}
/**
@@ -52,11 +71,19 @@ class Database extends \Prefab {
*/
protected function connect($dns, $name, $user, $password){
- $db = new SQL(
- $dns . $name,
- $user,
- $password
- );
+ try {
+ $db = new SQL(
+ $dns . $name,
+ $user,
+ $password,
+ [
+ \PDO::MYSQL_ATTR_COMPRESS => TRUE
+ ]
+ );
+ }catch(\PDOException $e){
+ // DB connection error
+ LogController::getLogger('error')->write($e->getMessage());
+ }
return $db;
}
diff --git a/app/main/exception/BaseException.php b/app/main/exception/BaseException.php
index 0f4d79d4..5d590dc6 100644
--- a/app/main/exception/BaseException.php
+++ b/app/main/exception/BaseException.php
@@ -12,6 +12,7 @@ namespace Exception;
class BaseException extends \Exception {
const VALIDATION_FAILED = 403;
+ const REGISTRATION_FAILED = 403;
public function __construct($message, $code = 0){
parent::__construct($message, $code);
diff --git a/app/main/exception/registrationexception.php b/app/main/exception/registrationexception.php
new file mode 100644
index 00000000..e7521759
--- /dev/null
+++ b/app/main/exception/registrationexception.php
@@ -0,0 +1,18 @@
+ array(
+ protected $fieldConf = [
+ 'allianceId' => [
'belongs-to-one' => 'Model\AllianceModel'
- ),
- 'mapId' => array(
+ ],
+ 'mapId' => [
'belongs-to-one' => 'Model\MapModel'
- )
- );
+ ]
+ ];
/**
* see parent
diff --git a/app/main/model/BasicModel.php b/app/main/model/BasicModel.php
index 2e074cb2..de498e1e 100644
--- a/app/main/model/BasicModel.php
+++ b/app/main/model/BasicModel.php
@@ -60,8 +60,14 @@ class BasicModel extends \DB\Cortex {
$this->afterupdate( function($self){
$self->clearCacheData();
});
+
+ // model updated
+ $this->beforeinsert( function($self){
+ $self->beforeInsertEvent($self);
+ });
}
+
/**
* @param string $key
* @param mixed $val
@@ -243,7 +249,7 @@ class BasicModel extends \DB\Cortex {
*/
public function getById($id, $ttl = 3) {
- return $this->getByForeignKey('id', (int)$id, array('limit' => 1), $ttl);
+ return $this->getByForeignKey('id', (int)$id, ['limit' => 1], $ttl);
}
/**
@@ -277,7 +283,7 @@ class BasicModel extends \DB\Cortex {
* @param int $ttl
* @return \DB\Cortex
*/
- public function getByForeignKey($key, $id, $options = array(), $ttl = 60){
+ public function getByForeignKey($key, $id, $options = [], $ttl = 60){
$querySet = [];
$query = [];
@@ -297,6 +303,15 @@ class BasicModel extends \DB\Cortex {
return $this->load( $querySet, $options, $ttl );
}
+ /**
+ * Event "Hook" function
+ * can be overwritten
+ * return false will stop any further action
+ */
+ public function beforeInsertEvent(){
+ return true;
+ }
+
/**
* function should be overwritten in child classes with access restriction
* @param $accessObject
diff --git a/app/main/model/CharacterLogModel.php b/app/main/model/CharacterLogModel.php
index 60952d2c..8424f676 100644
--- a/app/main/model/CharacterLogModel.php
+++ b/app/main/model/CharacterLogModel.php
@@ -13,11 +13,11 @@ class CharacterLogModel extends BasicModel {
protected $table = 'character_log';
- protected $fieldConf = array(
- 'characterId' => array(
+ protected $fieldConf = [
+ 'characterId' => [
'belongs-to-one' => 'Model\CharacterModel'
- )
- );
+ ]
+ ];
/**
* get all character log data
diff --git a/app/main/model/CharacterModel.php b/app/main/model/CharacterModel.php
index 8e7ef299..016b1214 100644
--- a/app/main/model/CharacterModel.php
+++ b/app/main/model/CharacterModel.php
@@ -13,17 +13,17 @@ class CharacterModel extends BasicModel {
protected $table = 'character';
- protected $fieldConf = array(
- 'corporationId' => array(
+ protected $fieldConf = [
+ 'corporationId' => [
'belongs-to-one' => 'Model\CorporationModel'
- ),
- 'allianceId' => array(
+ ],
+ 'allianceId' => [
'belongs-to-one' => 'Model\AllianceModel'
- ),
- 'characterLog' => array(
- 'has-one' => array('Model\CharacterLogModel', 'characterId')
- )
- );
+ ],
+ 'characterLog' => [
+ 'has-one' => ['Model\CharacterLogModel', 'characterId']
+ ]
+ ];
/**
* get character data
@@ -33,6 +33,7 @@ class CharacterModel extends BasicModel {
public function getData($addCharacterLogData = false){
// check if there is cached data
+ // temporary disabled (performance test)
$characterData = null; //$this->getCacheData();
if(is_null($characterData)){
diff --git a/app/main/model/ConnectionModel.php b/app/main/model/ConnectionModel.php
index d0224f26..21bca62d 100644
--- a/app/main/model/ConnectionModel.php
+++ b/app/main/model/ConnectionModel.php
@@ -14,20 +14,20 @@ class ConnectionModel extends BasicModel{
protected $table = 'connection';
- protected $fieldConf = array(
- 'mapId' => array(
+ protected $fieldConf = [
+ 'mapId' => [
'belongs-to-one' => 'Model\MapModel'
- ),
- 'source' => array(
+ ],
+ 'source' => [
'belongs-to-one' => 'Model\SystemModel'
- ),
- 'target' => array(
+ ],
+ 'target' => [
'belongs-to-one' => 'Model\SystemModel'
- ),
- 'type' => array(
+ ],
+ 'type' => [
'type' => self::DT_JSON
- )
- );
+ ]
+ ];
/**
* set an array with all data for a system
diff --git a/app/main/model/CorporationMapModel.php b/app/main/model/CorporationMapModel.php
index 00976022..7ddac177 100644
--- a/app/main/model/CorporationMapModel.php
+++ b/app/main/model/CorporationMapModel.php
@@ -13,14 +13,14 @@ class CorporationMapModel extends BasicModel {
protected $table = 'corporation_map';
- protected $fieldConf = array(
- 'corporationId' => array(
+ protected $fieldConf = [
+ 'corporationId' => [
'belongs-to-one' => 'Model\CorporationModel'
- ),
- 'mapId' => array(
+ ],
+ 'mapId' => [
'belongs-to-one' => 'Model\MapModel'
- )
- );
+ ]
+ ];
/**
* see parent
diff --git a/app/main/model/SystemModel.php b/app/main/model/SystemModel.php
index 7b2108ea..6939d131 100644
--- a/app/main/model/SystemModel.php
+++ b/app/main/model/SystemModel.php
@@ -12,30 +12,30 @@ namespace Model;
class SystemModel extends BasicModel {
const MAX_POS_X = 2300;
- const MAX_POS_Y = 500;
+ const MAX_POS_Y = 498;
protected $table = 'system';
- protected $fieldConf = array(
- 'mapId' => array(
+ protected $fieldConf = [
+ 'mapId' => [
'belongs-to-one' => 'Model\MapModel'
- ),
- 'typeId' => array(
+ ],
+ 'typeId' => [
'belongs-to-one' => 'Model\SystemTypeModel'
- ),
- 'statusId' => array(
+ ],
+ 'statusId' => [
'belongs-to-one' => 'Model\SystemStatusModel'
- ),
- 'createdCharacterId' => array(
+ ],
+ 'createdCharacterId' => [
'belongs-to-one' => 'Model\CharacterModel'
- ),
- 'updatedCharacterId' => array(
+ ],
+ 'updatedCharacterId' => [
'belongs-to-one' => 'Model\CharacterModel'
- ),
- 'signatures' => array(
- 'has-many' => array('Model\SystemSignatureModel', 'systemId')
- ),
- );
+ ],
+ 'signatures' => [
+ 'has-many' => ['Model\SystemSignatureModel', 'systemId']
+ ],
+ ];
/**
* set an array with all data for a system
@@ -230,7 +230,7 @@ class SystemModel extends BasicModel {
$signature = null;
if($this->hasAccess($accessObject)){
- $this->filter('signatures', array('active = ? AND id = ?', 1, $id));
+ $this->filter('signatures', ['active = ? AND id = ?', 1, $id]);
if($this->signatures){
$signature = reset( $this->signatures );
}
@@ -249,7 +249,7 @@ class SystemModel extends BasicModel {
$signature = null;
if($this->hasAccess($accessObject)){
- $this->filter('signatures', array('active = ? AND name = ?', 1, $name));
+ $this->filter('signatures', ['active = ? AND name = ?', 1, $name]);
if($this->signatures){
$signature = reset( $this->signatures );
}
diff --git a/app/main/model/SystemSignatureModel.php b/app/main/model/SystemSignatureModel.php
index ea8f5a7b..bab1648c 100644
--- a/app/main/model/SystemSignatureModel.php
+++ b/app/main/model/SystemSignatureModel.php
@@ -13,17 +13,17 @@ class SystemSignatureModel extends BasicModel {
protected $table = 'system_signature';
- protected $fieldConf = array(
- 'systemId' => array(
+ protected $fieldConf = [
+ 'systemId' => [
'belongs-to-one' => 'Model\SystemModel'
- ),
- 'createdCharacterId' => array(
+ ],
+ 'createdCharacterId' => [
'belongs-to-one' => 'Model\CharacterModel'
- ),
- 'updatedCharacterId' => array(
+ ],
+ 'updatedCharacterId' => [
'belongs-to-one' => 'Model\CharacterModel'
- )
- );
+ ]
+ ];
protected $validate = [
'name' => [
diff --git a/app/main/model/UserApiModel.php b/app/main/model/UserApiModel.php
index 7bb662cc..1cb0ae37 100644
--- a/app/main/model/UserApiModel.php
+++ b/app/main/model/UserApiModel.php
@@ -13,14 +13,14 @@ class UserApiModel extends BasicModel {
protected $table = 'user_api';
- protected $fieldConf = array(
- 'userId' => array(
+ protected $fieldConf = [
+ 'userId' => [
'belongs-to-one' => 'Model\UserModel'
- ),
- 'userCharacters' => array(
- 'has-many' => array('Model\UserCharacterModel', 'apiId')
- )
- );
+ ],
+ 'userCharacters' => [
+ 'has-many' => ['Model\UserCharacterModel', 'apiId']
+ ]
+ ];
/**
* get all data for this api
diff --git a/app/main/model/UserCharacterModel.php b/app/main/model/UserCharacterModel.php
index d1d5b2a5..3c8effa4 100644
--- a/app/main/model/UserCharacterModel.php
+++ b/app/main/model/UserCharacterModel.php
@@ -13,17 +13,17 @@ class UserCharacterModel extends BasicModel {
protected $table = 'user_character';
- protected $fieldConf = array(
- 'userId' => array(
+ protected $fieldConf = [
+ 'userId' => [
'belongs-to-one' => 'Model\UserModel'
- ),
- 'apiId' => array(
+ ],
+ 'apiId' => [
'belongs-to-one' => 'Model\UserApiModel'
- ),
- 'characterId' => array(
+ ],
+ 'characterId' => [
'belongs-to-one' => 'Model\CharacterModel'
- )
- );
+ ]
+ ];
/**
* set an array with all data for a character
diff --git a/app/main/model/UserMapModel.php b/app/main/model/UserMapModel.php
index bb1c5cba..9b21a72e 100644
--- a/app/main/model/UserMapModel.php
+++ b/app/main/model/UserMapModel.php
@@ -13,14 +13,14 @@ class UserMapModel extends BasicModel {
protected $table = 'user_map';
- protected $fieldConf = array(
- 'userId' => array(
+ protected $fieldConf = [
+ 'userId' => [
'belongs-to-one' => 'Model\UserModel'
- ),
- 'mapId' => array(
+ ],
+ 'mapId' => [
'belongs-to-one' => 'Model\MapModel'
- )
- );
+ ]
+ ];
/**
* see parent
diff --git a/app/main/model/UserModel.php b/app/main/model/UserModel.php
index 04ad42ba..de611f99 100644
--- a/app/main/model/UserModel.php
+++ b/app/main/model/UserModel.php
@@ -10,6 +10,7 @@ namespace Model;
use DB\SQL\Schema;
use Controller;
+use Exception;
class UserModel extends BasicModel {
@@ -82,7 +83,7 @@ class UserModel extends BasicModel {
// set active character with log data
$activeUserCharacter = $this->getActiveUserCharacter();
if($activeUserCharacter){
- $userData->character = $activeUserCharacter->getData(true);
+ $userData->character = $activeUserCharacter->getData();
}
return $userData;
@@ -128,6 +129,28 @@ class UserModel extends BasicModel {
return \Bcrypt::instance()->hash($password, $salt);
}
+ /**
+ * check if new user registration is allowed
+ * @return bool
+ * @throws Exception\RegistrationException
+ */
+ public function beforeInsertEvent(){
+ $registrationStatus = Controller\Controller::getRegistrationStatus();
+
+ switch($registrationStatus){
+ case 0:
+ $f3 = self::getF3();
+ throw new Exception\RegistrationException($f3->get('PATHFINDER.REGISTRATION.MSG_DISABLED'));
+ return false;
+ break;
+ case 1:
+ return true;
+ break;
+ default:
+ return false;
+ }
+ }
+
/**
* search for user by unique username
* @param $name
@@ -200,6 +223,12 @@ class UserModel extends BasicModel {
return $maps;
}
+ /**
+ * get mapModel by id and check if user has access
+ * @param $mapId
+ * @return null
+ * @throws \Exception
+ */
public function getMap($mapId){
$map = self::getNew('MapModel');
$map->getById( (int)$mapId );
@@ -287,8 +316,6 @@ class UserModel extends BasicModel {
}
}
-
-
return $userCharacters;
}
@@ -386,7 +413,6 @@ class UserModel extends BasicModel {
$this->apis->current()->updateCharacters();
$this->apis->next();
}
-
}
}
diff --git a/app/pathfinder.ini b/app/pathfinder.ini
new file mode 100644
index 00000000..7a528b01
--- /dev/null
+++ b/app/pathfinder.ini
@@ -0,0 +1,136 @@
+[PATHFINDER]
+NAME = "PATHFINDER"
+; installed version (used for CSS/JS cache busting)
+VERSION = "v0.0.3"
+; contact information (DO NOT CHANGE)
+CONTACT = "https://github.com/exodus4d"
+; source code (DO NOT CHANGE)
+REPO = "https://github.com/exodus4d/pathfinder"
+
+; Max number of maps an entity can create
+MAX_MAPS_PRIVATE = 3
+MAX_MAPS_CORPORATION = 3
+MAX_MAPS_ALLIANCE = 3
+
+; Max number of shared entities per map
+MAX_SHARED_USER = 10
+MAX_SHARED_CORPORATION = 3
+MAX_SHARED_ALLIANCE = 2
+
+[PATHFINDER.ENVIRONMENT]
+; project environment ("DEVELOP", "PRODUCTION").
+; This affects: DB connection, JS build path
+SERVER = "DEVELOP"
+
+[PATHFINDER.ENVIRONMENT.DEVELOP]
+BASE = /exodus4d/pathfinder
+
+; deployment URL (what you type in the browser
+URL = http://localhost/exodus4d/pathfinder
+
+; Verbosity level of the stack trace
+DEBUG = 3
+
+; main db
+PATH_JS = "js"
+DB_DNS = mysql:host=localhost;port=3306;dbname=
+DB_NAME = pathfinder
+DB_USER = root
+DB_PASS =
+; EVE-Online CCP Database export
+DB_CCP_DNS = mysql:host=localhost;port=3306;dbname=
+DB_CCP_NAME = eve_test
+DB_CCP_USER = root
+DB_CCP_PASS =
+
+[PATHFINDER.ENVIRONMENT.PRODUCTION]
+BASE = /www/htdocs/w0128162/www.pathfinder.exodus4d.de
+
+; deployment URL (what you type in the browser
+URL = https://www.pathfinder.exodus4d.de
+
+; Verbosity level of the stack trace
+DEBUG = 0
+
+; main db
+PATH_JS = "build_js"
+DB_DNS = mysql:host=localhost;port=3306;dbname=
+DB_NAME = d01d8636
+DB_USER = d01d8636
+DB_PASS = bQ9VAd6fE86sVs4s
+; EVE-Online CCP Database export
+DB_CCP_DNS = mysql:host=localhost;port=3306;dbname=
+DB_CCP_NAME = d01f20be
+DB_CCP_USER = d01f20be
+DB_CCP_PASS = 2gkBWs87zDcApH4A
+
+; ======================================================================================================
+[PATHFINDER.REGISTRATION]
+; registration status (0=disabled, 1=enabled)
+STATUS = 1
+; disabled message
+MSG_DISABLED = "User registration is currently not allowed"
+
+; ======================================================================================================
+; Lifetime for map types
+[PATHFINDER.MAP.PRIVATE]
+LIFETIME = 2
+
+[PATHFINDER.MAP.CORPORATION]
+LIFETIME = 99999
+
+[PATHFINDER.MAP.ALLIANCE]
+LIFETIME = 99999
+; ======================================================================================================
+[PATHFINDER.CACHE]
+
+; cache character log informations in seconds. This is ignored if ship/system switch was detected
+CHARACTER_LOG = 600
+
+; cache time for all system data within a constellation (this will never change) 30d
+CONSTELLATION_SYSTEMS = 2592000
+
+; ======================================================================================================
+[PATHFINDER.TIMER]
+; login time (minutes)
+LOGGED = 120
+
+; double click timer (ms)
+DBL_CLICK = 250
+
+; time for status change visibility in header (ms)
+PROGRAM_STATUS_VISIBLE = 5000
+
+; get all client map data (ms)
+[PATHFINDER.TIMER.GET_CLIENT_MAP_DATA]
+EXECUTION_LIMIT = 50
+
+; main map update ping (ajax) (ms)
+[PATHFINDER.TIMER.UPDATE_SERVER_MAP]
+DELAY = 5000
+EXECUTION_LIMIT = 200
+
+; update client map data (ms)
+[PATHFINDER.TIMER.UPDATE_CLIENT_MAP]
+EXECUTION_LIMIT = 50
+
+; map user update ping (ajax) (ms)
+[PATHFINDER.TIMER.UPDATE_SERVER_USER_DATA]
+DELAY = 5000
+EXECUTION_LIMIT = 200
+
+; update client user data (ms)
+[PATHFINDER.TIMER.UPDATE_CLIENT_USER_DATA]
+EXECUTION_LIMIT = 50
+
+; ======================================================================================================
+[PATHFINDER.LOGFILES]
+; just for manuel debug during development
+DEBUG = "debug"
+
+; user login information
+LOGIN = "login"
+
+[PATHFINDER.API]
+; Path for CCPs XML APIv2
+CCP_XML = "https://api.eveonline.com"
\ No newline at end of file
diff --git a/app/routes.ini b/app/routes.ini
index 0ed211b1..ebf46f3f 100644
--- a/app/routes.ini
+++ b/app/routes.ini
@@ -4,7 +4,7 @@
GET|POST @landing: /= Controller\AppController->showLandingpage, 0
GET|POST @map: /map= Controller\MapController->showMap, 0
-; ajax wildcard APIs
+; ajax wildcard APIs (throttled)
GET|POST /api/@controller/@action [ajax] = Controller\Api\@controller->@action, 0, 512
GET|POST /api/@controller/@action/@arg1 [ajax] = Controller\Api\@controller->@action, 0, 512
GET|POST /api/@controller/@action/@arg1/@arg2 [ajax] = Controller\Api\@controller->@action, 0, 512
diff --git a/config.rb b/config.rb
index 177e9d68..9974c77a 100644
--- a/config.rb
+++ b/config.rb
@@ -1,7 +1,6 @@
# Compass 1.0.1 (Polaris)
require 'compass/import-once/activate'
-require 'bootstrap-sass'
require 'compass/import-once/activate'
# Require any additional compass plugins here.
diff --git a/index.php b/index.php
index 5df3ef05..59f08d6c 100644
--- a/index.php
+++ b/index.php
@@ -8,10 +8,19 @@ $f3->config('app/config.ini');
// load route config
$f3->config('app/routes.ini');
+// load pathfinder config
+$f3->config('app/pathfinder.ini');
+
// load cron config
$f3->config('app/cron.ini');
+// set base dir
+$f3->set('BASE', \Controller\Controller::getEnvironmentData('BASE'));
+
+// set debug level (stacktrace)
+$f3->set('DEBUG', \Controller\Controller::getEnvironmentData('DEBUG'));
+
// initiate cron-jobs
Cron::instance();
-$f3->run();
+$f3->run();
\ No newline at end of file
diff --git a/js/app.js b/js/app.js
index abbcf78c..3f5affd3 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,12 +1,24 @@
+// main script path
+var mainScriptPath = document.body.getAttribute('data-script');
+// js baseURL. Depends on the environment.
+// e.g. use raw files (develop) or build files (production)
+var jsBaseUrl = document.body.getAttribute('data-js-path');
+
+// requireJs configuration
requirejs.config({
- baseUrl: 'js', // user build_js files, change to "js" for un-compressed source
+ baseUrl: 'js', // path for baseUrl - dynamically set !below! ("build_js" | "js")
+
paths: {
layout: 'layout',
config: 'app/config', // path for "configuration" files dir
dialog: 'app/ui/dialog', // path for "dialog" files dir
+
+ // main views
+ landingpage: './app/landingpage', // initial start "landing page" view
+ mappage: './app/mappage', // initial start "map page" view
+
jquery: 'lib/jquery-1.11.3.min', // v1.11.3 jQuery
- //jquery: "lib/jquery-2.1.1.min", // v2.1.1 jQuery
bootstrap: 'lib/bootstrap.min', // v3.3.0 Bootstrap js code - http://getbootstrap.com/javascript/
text: 'lib/requirejs/text', // v2.0.12 A RequireJS/AMD loader plugin for loading text resources.
mustache: 'lib/mustache.min', // v1.0.0 Javascript template engine - http://mustache.github.io/
@@ -18,7 +30,7 @@ requirejs.config({
jsPlumb: 'lib/dom.jsPlumb-1.7.6-min', // v1.7.6 jsPlumb (Vanilla)- main map draw plugin https://jsplumbtoolkit.com/
customScrollbar: 'lib/jquery.mCustomScrollbar.concat.min', // v3.0.9 Custom scroll bars - http://manos.malihu.gr/
datatables: 'lib/datatables/jquery.dataTables.min', // v1.10.7 DataTables - https://datatables.net/
- datatablesBootstrap: 'lib/datatables/dataTables.bootstrap', // DataTables - not used (bootstrap style)
+ //datatablesBootstrap: 'lib/datatables/dataTables.bootstrap', // DataTables - not used (bootstrap style)
datatablesResponsive: 'lib/datatables/extensions/responsive/dataTables.responsive', // v1.0.6 TableTools (PlugIn) - https://datatables.net/extensions/responsive/
datatablesTableTools: 'lib/datatables/extensions/tabletools/js/dataTables.tableTools', // v2.2.3 TableTools (PlugIn) - https://datatables.net/extensions/tabletools/
@@ -39,7 +51,6 @@ requirejs.config({
bootstrapConfirmation: 'lib/bootstrap-confirmation', // v1.0.1 Bootstrap extension for inline confirm dialog - https://github.com/tavicu/bs-confirmation
bootstrapToggle: 'lib/bootstrap2-toggle.min', // v2.2.0 Bootstrap Toggle (Checkbox) - http://www.bootstraptoggle.com/
-
// header animation
easePack: 'lib/EasePack.min',
tweenLite: 'lib/TweenLite.min',
@@ -131,7 +142,12 @@ requirejs.config({
}
});
-var mainScriptPath = document.body.getAttribute('data-script');
+// switch baseUrl to js "build_js" in production environment
+// this has no effect for js build process!
+// check build.js for build configuration
+require.config({
+ baseUrl: jsBaseUrl
+});
-// load the main app module in order to start the app
+// load the main app module -> initial app start
requirejs( [mainScriptPath] );
diff --git a/js/app/landingpage.js b/js/app/landingpage.js
index ed0495d4..9c693b44 100644
--- a/js/app/landingpage.js
+++ b/js/app/landingpage.js
@@ -15,7 +15,8 @@ define([
'app/ui/demo_map',
'dialog/account_settings',
'dialog/notification',
- 'dialog/manual'
+ 'dialog/manual',
+ 'dialog/credit'
], function($, Init, Util, Render, CCP, Gallery, bootbox) {
'use strict';
@@ -35,7 +36,8 @@ define([
// navigation
navigationElementId: 'pf-navbar', // id for navbar element
- navigationLinkManualClass: 'pf-navbar-manual', // class for the "manual" trigger link
+ navigationLinkManualClass: 'pf-navbar-manual', // class for "manual" trigger link
+ navigationLinkLicenseClass : 'pf-navbar-license', // class for "license" trigger link
// login form
loginFormId: 'pf-login-form', // id for login form
@@ -102,7 +104,7 @@ define([
loginFormMessageContainer.showMessage({title: 'Login failed', text: ' Invalid username and password', type: 'error'});
}else if(data.reroute !== undefined){
- window.location = Util.buildUrl(data.reroute);
+ window.location = data.reroute;
}
}).fail(function( jqXHR, status, error) {
$('.' + config.splashOverlayClass).hideSplashOverlay();
@@ -118,22 +120,26 @@ define([
});
// manual -------------------------------------------------------
- $('.' + config.navigationLinkManualClass).on('click', function(){
+ $('.' + config.navigationLinkManualClass).on('click', function(e){
+ e.preventDefault();
$.fn.showMapManual();
});
+ // license ------------------------------------------------------
+ $('.' + config.navigationLinkLicenseClass).on('click', function(e){
+ e.preventDefault();
+ $.fn.showCreditsDialog(false, true);
+ });
// tooltips -----------------------------------------------------
- /*
var mapTooltipOptions = {
toggle: 'tooltip',
- placement: 'top',
container: 'body',
delay: 150
};
- $('[title]').tooltip(mapTooltipOptions);
- */
+ $('[title]').not('.slide img').tooltip(mapTooltipOptions);
+
};
@@ -184,7 +190,7 @@ define([
// initialize carousel ------------------------------------------
var carousel = Gallery([
{
- title: '',
+ title: 'IGB',
href: 'ui/map',
type: 'text/html'
},
@@ -347,9 +353,11 @@ define([
*/
$(function(){
+ // show app information in browser console
+ Util.showVersionInfo();
+
// show log off message
var isLogOut = location.search.split('logout')[1];
-
if(isLogOut !== undefined){
// show logout dialog
var options = {
diff --git a/js/app/map/contextmenu.js b/js/app/map/contextmenu.js
index a1bcff35..7f4f7178 100644
--- a/js/app/map/contextmenu.js
+++ b/js/app/map/contextmenu.js
@@ -2,7 +2,10 @@
* context menu
*/
-define(['jquery'], function($) {
+define([
+ 'jquery',
+ 'app/ccp'
+], function($, CCP) {
'use strict';
@@ -42,10 +45,10 @@ define(['jquery'], function($) {
left: getLeftLocation(originalEvent),
top: getTopLocation(originalEvent)
}).velocity('transition.flipXIn', {
- duration: 150,
+ duration: CCP.isInGameBrowser() ? 0 : 150,
complete: function(){
// set context menu "click" observer
- $(this).one('click', {component: component, position:{x: getLeftLocation(originalEvent), y: getTopLocation(originalEvent)}}, function (e) {
+ $(this).off('click').one('click', {component: component, position:{x: getLeftLocation(originalEvent), y: getTopLocation(originalEvent)}}, function (e) {
// hide contextmenu
$(this).hide();
@@ -64,7 +67,7 @@ define(['jquery'], function($) {
//make sure menu closes on any click
$(document).one('click.closeContextmenu', function () {
$('.dropdown-menu[role="menu"]').velocity('transition.flipXOut', {
- duration: 150
+ duration: CCP.isInGameBrowser() ? 0 : 150
});
});
diff --git a/js/app/map/map.js b/js/app/map/map.js
index 25a655a6..60cfc311 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -838,7 +838,7 @@ define([
overlayElements.css('opacity', 0);
systemElements.velocity('transition.whirlIn', {
- stagger: 50,
+ stagger: 30,
drag: true,
duration: 100,
//display: 'auto',
@@ -849,8 +849,8 @@ define([
});
connectorElements.velocity('transition.fadeIn', {
- stagger: 50,
- duration: 180
+ stagger: 30,
+ duration: 120
});
// show overlay elements (if some exist)
@@ -895,7 +895,7 @@ define([
});
systemElements.delay(100).velocity('transition.slideUpOut', {
- stagger: 50,
+ stagger: 30,
drag: true,
duration: 180,
display: 'block',
@@ -1032,18 +1032,22 @@ define([
type: 'POST',
url: Init.path.deleteSystem,
data: requestData,
- dataType: 'json'
- }).done(function(data){
+ dataType: 'json',
+ context: {
+ map: map,
+ systems: systems
+ }
+ }).done(function(){
// deleted SystemIds
var triggerData = {
systemIds: []
};
// remove systems from map
- for(var i = 0; i < systems.length; i++){
- var system = $(systems[i]);
+ for(var i = 0; i < this.systems.length; i++){
+ var system = $(this.systems[i]);
triggerData.systemIds.push( system.data('id') );
- removeSystem(map, system );
+ removeSystem(this.map, system );
}
callback();
@@ -1246,11 +1250,12 @@ define([
type: 'POST',
url: Init.path.saveConnection,
data: requestData,
- dataType: 'json'
+ dataType: 'json',
+ context: connection
}).done(function(newConnectionData){
// update connection data e.g. "scope" has auto detected
- updateConnection(connection, connectionData, newConnectionData);
+ updateConnection(this, connectionData, newConnectionData);
// connection scope
var scope = Util.getScopeInfoForConnection(newConnectionData.scope, 'label');
@@ -1264,7 +1269,7 @@ define([
}).fail(function( jqXHR, status, error) {
// remove this connection from map
- connection._jsPlumb.instance.detach(connection);
+ this._jsPlumb.instance.detach(this);
var reason = status + ' ' + error;
Util.showNotify({title: jqXHR.status + ': saveConnection', text: reason, type: 'warning'});
@@ -1316,11 +1321,12 @@ define([
type: 'POST',
url: Init.path.deleteConnection,
data: requestData,
- dataType: 'json'
+ dataType: 'json',
+ context: connections
}).done(function(data){
// remove connections from map
- removeConnections(connections);
+ removeConnections(this);
// optional callback
if(callback){
@@ -1798,7 +1804,7 @@ define([
// context menu =====================================================================================
// trigger context menu
- system.on('contextmenu', function(e){
+ system.off('contextmenu').on('contextmenu', function(e){
e.preventDefault();
e.stopPropagation();
@@ -1904,8 +1910,7 @@ define([
var systemName = currentSystem.getSystemInfo(['alias']);
deleteSystems(map, [currentSystem], function(){
// callback function after delete -> close dialog
-
- $(systemDeleteDialog).modal('hide');
+ bootbox.hideAll();
Util.showNotify({title: 'System deleted', text: systemName, type: 'success'});
});
@@ -2375,7 +2380,7 @@ define([
});
- // catch menu events ====================================================
+ // catch events =========================================================
// toggle "snap to grid" option
$(mapContainer).on('pf:menuGrid', function(e, data){
@@ -2403,7 +2408,12 @@ define([
}
Util.showNotify({title: 'Grid snapping', text: notificationText, type: 'info'});
+ });
+ // delete system event
+ // triggered from "map info" dialog scope
+ $(mapContainer).on('pf:deleteSystems', function(e, data){
+ deleteSystems(map, data.systems, data.callback);
});
$(mapContainer).on('pf:menuSelectSystem', function(e, data){
@@ -2419,7 +2429,6 @@ define([
// select system
system.showSystemInfo(map);
}
-
});
@@ -2544,9 +2553,7 @@ define([
// get invisible menu entries
var hideOptions = getHiddenContextMenuOptions(component);
-
var activeOptions = getActiveContextMenuOptions(component);
-
$(e.target).trigger('pf:openContextMenu', [e, component, hideOptions, activeOptions]);
return false;
@@ -2556,7 +2563,6 @@ define([
* init context menu for all connections
* must be triggered manually on demand
*/
-
$(connection.canvas).contextMenu({
menuSelector: "#" + config.connectionContextMenuId,
menuSelected: function (params){
@@ -2726,10 +2732,7 @@ define([
buttons: {
close: {
label: 'cancel',
- className: 'btn-default',
- callback: function(){
- $(systemDialog).modal('hide');
- }
+ className: 'btn-default'
},
success: {
label: ' save',
@@ -2788,7 +2791,7 @@ define([
};
saveSystem(map, requestData, sourceSystem, function(){
- $(systemDialog).modal('hide');
+ bootbox.hideAll();
});
return false;
}
@@ -2803,7 +2806,7 @@ define([
// init system select live search - some delay until modal transition has finished
var selectElement = modalContent.find('.' + config.systemDialogSelectClass);
- selectElement.delay(200).initSystemSelect({
+ selectElement.delay(240).initSystemSelect({
key: 'systemId',
disabledOptions: mapSystemIds
});
@@ -2837,11 +2840,15 @@ define([
type: 'POST',
url: Init.path.saveSystem,
data: requestData,
- dataType: 'json'
+ dataType: 'json',
+ context: {
+ map: map,
+ sourceSystem: sourceSystem
+ }
}).done(function(newSystemData){
// draw new system to map
- drawSystem(map, newSystemData, sourceSystem);
+ drawSystem(this.map, newSystemData, this.sourceSystem);
Util.showNotify({title: 'New system', text: newSystemData.name, type: 'success'});
@@ -3274,7 +3281,7 @@ define([
outlineWidth: 2 // width of the outline for an Endpoint or Connector. An integer.
},
Connector:[ 'Bezier', { curviness: 40 } ], // default connector style (this is not used!) all connections have their own style (by scope)
- Endpoints: [ [ 'Dot', { radius: 6 } ], [ 'Dot', { radius: 6 } ] ],
+ Endpoints: [ [ 'Dot', { radius: 5 } ], [ 'Dot', { radius: 5 } ] ],
// Endpoint: 'Blank', // does not work... :(
ReattachConnections: false, // re-attach connection if dragged with mouse to "nowhere"
Scope: Init.defaultMapScope, // default map scope for connections
diff --git a/js/app/mappage.js b/js/app/mappage.js
new file mode 100644
index 00000000..5a79d355
--- /dev/null
+++ b/js/app/mappage.js
@@ -0,0 +1,284 @@
+/**
+ * Main map application
+ */
+
+define([
+ 'jquery',
+ 'app/init',
+ 'app/util',
+ 'app/render',
+ 'app/logging',
+ 'app/ccp',
+ 'app/page',
+ 'app/ui/form_element',
+ 'app/module_map'
+], function($, Init, Util, Render, Logging, CCP, Page) {
+
+ 'use strict';
+
+ $(function(){
+ // load page
+ $('body').loadPageStructure();
+
+ // show app information in browser console
+ Util.showVersionInfo();
+
+ // init logging
+ Logging.init();
+
+ if( !CCP.isTrusted() ){
+ // show trust message
+ $(document).trigger('pf:showTrustDialog');
+ return;
+ }
+ var mapModule = $('#' + Util.config.mapModuleId);
+
+ // map init load static data =======================================================
+ $.getJSON( Init.path.initMap, function( initData ) {
+
+ Init.timer = initData.timer;
+ Init.mapTypes = initData.mapTypes;
+ Init.mapScopes = initData.mapScopes;
+ Init.connectionScopes = initData.connectionScopes;
+ Init.systemStatus = initData.systemStatus;
+ Init.systemType = initData.systemType;
+ Init.characterStatus = initData.characterStatus;
+ Init.maxSharedCount = initData.maxSharedCount;
+
+ // init tab change observer, Once the timers are available
+ Page.initTabChangeObserver();
+
+ // init map module
+ mapModule.initMapModule();
+
+ }).fail(function( jqXHR, status, error) {
+ var reason = status + ' ' + jqXHR.status + ': ' + error;
+
+ $(document).trigger('pf:shutdown', {reason: reason});
+ });
+
+ /**
+ * main function for init all map relevant trigger calls
+ */
+ $.fn.initMapModule = function(){
+
+ var mapModule = $(this);
+
+ // log keys ------------------------------------------------------------------------
+ // get map data from client
+ var logKeyGetClientMapData = 'GET_CLIENT_MAP_DATA';
+
+ // ajax request update map data
+ var logKeyServerMapData = 'UPDATE_SERVER_MAP';
+
+ // update client map data
+ var logKeyClientMapData = 'UPDATE_CLIENT_MAP';
+
+ // ajax request update map user data
+ var logKeyServerUserData = 'UPDATE_SERVER_USER_DATA';
+
+ // update client map user data
+ var logKeyClientUserData = 'UPDATE_CLIENT_USER_DATA';
+
+ // main update intervals/trigger (heartbeat)
+ var updateTimeouts = {
+ mapUpdate: 0,
+ userUpdate: 0
+ };
+
+ // ping for main map update ========================================================
+ var triggerMapUpdatePing = function(){
+
+ // check each execution time if map module is still available
+ var check = $('#' + mapModule.attr('id')).length;
+
+ if(check === 0){
+ // program crash stop any update
+ return;
+ }
+
+ // get updated map data
+ Util.timeStart(logKeyGetClientMapData);
+ var updatedMapData = mapModule.getMapModuleDataForUpdate();
+ var mapDataLogDuration = Util.timeStop(logKeyGetClientMapData);
+
+ // log execution time
+ Util.log(logKeyGetClientMapData, {duration: mapDataLogDuration, type: 'client', description: 'get client data'});
+
+ // wrap array to object
+ updatedMapData = {mapData: updatedMapData};
+
+ // start log
+ Util.timeStart(logKeyServerMapData);
+
+ // store updatedMapData
+ $.ajax({
+ type: 'POST',
+ url: Init.path.updateMapData,
+ data: updatedMapData,
+ dataType: 'json'
+ }).done(function(data){
+
+ // log request time
+ var duration = Util.timeStop(logKeyServerMapData);
+ Util.log(logKeyServerMapData, {duration: duration, type: 'server', description: 'request map data'});
+
+ if(
+ data.error &&
+ data.error.length > 0
+ ){
+ // any error in the main trigger functions result in a user log-off
+ $(document).trigger('pf:menuLogout');
+ }else{
+
+ $(document).setProgramStatus('online');
+
+ if(data.mapData.length === 0){
+ // no map data available -> show "new map" dialog
+ $(document).trigger('pf:menuShowMapSettings', {tab: 'new'});
+ }else{
+ // map data found
+
+ // start log
+ Util.timeStart(logKeyClientMapData);
+
+ // load/update main map module
+ mapModule.updateMapModule(data.mapData);
+
+ // log client map update time
+ duration = Util.timeStop(logKeyClientMapData);
+ Util.log(logKeyClientMapData, {duration: duration, type: 'client', description: 'update map'});
+ }
+
+ // get the current update delay (this can change if a user is inactive)
+ var mapUpdateDelay = Util.getCurrentTriggerDelay( logKeyServerMapData, 0 );
+
+ // init new trigger
+ updateTimeouts.mapUpdate = setTimeout(function(){
+ triggerMapUpdatePing();
+ }, mapUpdateDelay);
+
+ // initial start for the userUpdate trigger
+ // this should only be called at the first time!
+ if(updateTimeouts.userUpdate === 0){
+
+ // start user update trigger after map loaded
+ updateTimeouts.userUpdate = setTimeout(function(){
+ triggerUserUpdatePing();
+ }, 3000);
+ }
+ }
+
+ }).fail(function( jqXHR, status, error) {
+
+ // clear both main update request trigger timer
+ clearUpdateTimeouts();
+
+ var reason = status + ' ' + jqXHR.status + ': ' + error;
+ $(document).trigger('pf:shutdown', {reason: reason});
+ });
+ };
+
+ // ping for user data update =======================================================
+ var triggerUserUpdatePing = function(){
+
+ // IMPORTANT: Get user data for ONE map that is currently visible
+ // On later releases this can be easy changed to "full update" all maps for a user
+ //
+ var mapIds = [];
+ var activeMap = Util.getMapModule().getActiveMap();
+ if(activeMap){
+ mapIds = [ activeMap.data('id') ];
+ }
+
+ var updatedUserData = {
+ mapIds: mapIds,
+ systemData: Util.getCurrentSystemData()
+ };
+
+ Util.timeStart(logKeyServerUserData);
+
+ $.ajax({
+ type: 'POST',
+ url: Init.path.updateUserData,
+ data: updatedUserData,
+ dataType: 'json'
+ }).done(function(data){
+
+ // log request time
+ var duration = Util.timeStop(logKeyServerUserData);
+ Util.log(logKeyServerUserData, {duration: duration, type: 'server', description:'request user data'});
+
+ if(data.error.length > 0){
+ // any error in the main trigger functions result in a user log-off
+ $(document).trigger('pf:menuLogout');
+ }else{
+
+ $(document).setProgramStatus('online');
+
+ if(data.userData !== undefined){
+ // store current user data global (cache)
+ var userData = Util.setCurrentUserData(data.userData);
+
+ if(userData.character === undefined){
+ // no active character found -> show settings dialog
+
+ Util.showNotify({title: 'No main character found', text: 'Set up your main character', type: 'error'});
+
+ $(document).triggerMenuEvent('ShowSettingsDialog');
+ }
+
+ // start log
+ Util.timeStart(logKeyClientUserData);
+
+ // active character data found
+ mapModule.updateMapModuleData(data);
+
+ // log client user data update time
+ duration = Util.timeStop(logKeyClientUserData);
+ Util.log(logKeyClientUserData, {duration: duration, type: 'client', description:'update users'});
+
+ // get the current update delay (this can change if a user is inactive)
+ var mapUserUpdateDelay = Util.getCurrentTriggerDelay( logKeyServerUserData, 0 );
+
+ // init new trigger
+ updateTimeouts.userUpdate = setTimeout(function(){
+ triggerUserUpdatePing();
+ }, mapUserUpdateDelay);
+
+ }
+ }
+
+ }).fail(function( jqXHR, status, error) {
+
+ // clear both main update request trigger timer
+ clearUpdateTimeouts();
+
+ var reason = status + ' ' + jqXHR.status + ': ' + error;
+ $(document).trigger('pf:shutdown', {reason: reason});
+ });
+
+ };
+
+ /**
+ * clear both main update timeouts
+ * -> stop program from working -> shutdown
+ */
+ var clearUpdateTimeouts = function(){
+ for(var intervalKey in updateTimeouts) {
+
+ if(updateTimeouts.hasOwnProperty(intervalKey)){
+ clearTimeout( updateTimeouts[intervalKey] );
+ }
+ }
+ };
+
+ // initial start of the map update function
+ triggerMapUpdatePing();
+
+ };
+
+
+ });
+
+});
\ No newline at end of file
diff --git a/js/app/module_map.js b/js/app/module_map.js
index 04b781da..83e59d40 100644
--- a/js/app/module_map.js
+++ b/js/app/module_map.js
@@ -2,12 +2,14 @@ define([
'jquery',
'app/init',
'app/util',
+ 'app/counter',
'app/ui/system_info',
'app/ui/system_graph',
'app/ui/system_signature',
'app/ui/system_route',
'app/ui/system_killboard',
'datatablesTableTools',
+ 'datatablesResponsive',
'app/map/map'
], function($, Init, Util) {
diff --git a/js/app/ui/dialog/account_settings.js b/js/app/ui/dialog/account_settings.js
index 92ac0acc..7cae9ea3 100644
--- a/js/app/ui/dialog/account_settings.js
+++ b/js/app/ui/dialog/account_settings.js
@@ -232,7 +232,7 @@ define([
if(register){
if(reroutePath !== undefined){
// root user to main app
- window.location = Util.buildUrl(reroutePath);
+ window.location = reroutePath;
}
}else{
// close dialog
@@ -330,7 +330,7 @@ define([
}
});
- Util.showNotify({title: 'Account data saved', type: 'success'});
+ Util.showNotify({title: 'Account saved', type: 'success'});
}
}).fail(function( jqXHR, status, error) {
diff --git a/js/app/ui/dialog/credit.js b/js/app/ui/dialog/credit.js
index b7ae3b29..dd671502 100644
--- a/js/app/ui/dialog/credit.js
+++ b/js/app/ui/dialog/credit.js
@@ -21,12 +21,13 @@ define([
/**
* show jump info dialog
*/
- $.fn.showCreditsDialog = function(){
+ $.fn.showCreditsDialog = function(callback, enableHover){
requirejs(['text!templates/dialog/credit.html', 'mustache'], function(template, Mustache) {
var data = {
- logoContainerId: config.creditsDialogLogoContainerId
+ logoContainerId: config.creditsDialogLogoContainerId,
+ version: $('body').data('version')
};
var content = Mustache.render(template, data);
@@ -41,7 +42,7 @@ define([
creditDialog.on('shown.bs.modal', function(e) {
// load Logo svg
- $('#' + config.creditsDialogLogoContainerId).drawLogo();
+ creditDialog.find('#' + config.creditsDialogLogoContainerId).drawLogo(callback, enableHover);
});
});
diff --git a/js/app/ui/dialog/map_info.js b/js/app/ui/dialog/map_info.js
index 94374d2c..276e572d 100644
--- a/js/app/ui/dialog/map_info.js
+++ b/js/app/ui/dialog/map_info.js
@@ -26,6 +26,8 @@ define([
tableActionCellClass: 'pf-table-action-cell', // class for table "action" cells
tableCounterCellClass: 'pf-table-counter-cell', // cell for table "counter" cells
+ systemIdPrefix: 'pf-system-', // id prefix for a system
+
loadingOptions: { // config for loading overlay
icon: {
size: 'fa-2x'
@@ -33,6 +35,18 @@ define([
}
};
+ // confirmation dialog settings (e.g. delete row)
+ var confirmationSettings = {
+ container: 'body',
+ placement: 'left',
+ btnCancelClass: 'btn btn-sm btn-default',
+ btnCancelLabel: 'cancel',
+ btnCancelIcon: 'fa fa-fw fa-ban',
+ btnOkClass: 'btn btn-sm btn-danger',
+ btnOkLabel: 'delete',
+ btnOkIcon: 'fa fa-fw fa-close'
+ };
+
/**
* loads the map info data into an element
* @param mapData
@@ -132,80 +146,159 @@ define([
systemsElement.showLoadingAnimation(config.loadingOptions);
+ // table init complete
+ systemTable.on( 'init.dt', function () {
+ systemsElement.hideLoadingAnimation();
+
+ // init table tooltips
+ var tooltipElements = systemsElement.find('[data-toggle="tooltip"]');
+ tooltipElements.tooltip();
+ });
// prepare data for dataTables
var systemsData = [];
for(var i = 0; i < mapData.data.systems.length; i++){
var tempSystemData = mapData.data.systems[i];
- var tempData = [];
+ var tempData = {};
+
+ // system id
+ tempData.id = tempSystemData.id;
// current position
if(tempSystemData.currentUser === true){
- tempData.push( '' );
+ tempData.position = {
+ position: '',
+ position_sort: 1
+ };
}else{
- tempData.push( '' );
+ tempData.position = {
+ position: '',
+ position_sort: 0
+ };
}
// active pilots
if(tempSystemData.userCount > 0){
- tempData.push(tempSystemData.userCount);
+ tempData.userCount = tempSystemData.userCount;
}else{
- tempData.push( '' );
+ tempData.userCount = '';
}
// type
- tempData.push(Util.getSystemTypeInfo(tempSystemData.type.id, 'name'));
+ tempData.type = {
+ type: Util.getSystemTypeInfo(tempSystemData.type.id, 'name'),
+ type_sort: tempSystemData.type.id
+ };
// name
- tempData.push( tempSystemData.name );
+ tempData.name = tempSystemData.name;
+
+ // region
+ tempData.region = tempSystemData.region.name;
+
+ // static
+ var statics = [];
+ for(var j = 0; j < tempSystemData.statics.length; j++){
+ var security = tempSystemData.statics[j].security;
+ var secClass = Util.getSecurityClassForSystem(security);
+ statics.push('' + security + '');
+ }
+ tempData.static = statics.join(' ');
// status
var systemStatusClass = Util.getStatusInfoForSystem(tempSystemData.status.id, 'class');
if(systemStatusClass !== ''){
- tempData.push( '' );
+ tempData.status = {
+ status: '',
+ status_sort: tempSystemData.status.id
+ };
}else{
- tempData.push( '' );
+ tempData.status = {
+ status: '',
+ status_sort: tempSystemData.status.id
+ };
}
// effect
var systemEffectClass = Util.getEffectInfoForSystem(tempSystemData.effect, 'class');
if(systemEffectClass !== ''){
- tempData.push( '' );
+ tempData.effect = {
+ effect: '',
+ effect_sort: tempSystemData.effect
+ };
}else{
- tempData.push( '' );
+ tempData.effect = {
+ effect: '',
+ effect_sort: ''
+ };
}
// trueSec
var systemTrueSecClass = Util.getTrueSecClassForSystem(tempSystemData.trueSec);
if(systemTrueSecClass !== ''){
- tempData.push( '' + tempSystemData.trueSec.toFixed(1) + '' );
+ tempData.trueSec = {
+ trueSec: '' + tempSystemData.trueSec.toFixed(1) + '',
+ trueSec_sort: tempSystemData.trueSec
+ };
}else{
- tempData.push( '' );
+ tempData.trueSec = {
+ trueSec: '',
+ trueSec_sort: tempSystemData.trueSec
+ };
}
// locked
if(tempSystemData.locked === 1){
- tempData.push( '' );
+ tempData.locked = {
+ locked: '',
+ locked_sort: tempSystemData.locked
+ };
}else{
- tempData.push( '' );
+ tempData.locked = {
+ locked: '',
+ locked_sort: 0
+ };
}
// rally point
if(tempSystemData.rally === 1){
- tempData.push( '' );
+ tempData.rally = {
+ rally: '',
+ rally_sort: tempSystemData.rally
+ };
}else{
- tempData.push( '' );
+ tempData.rally = {
+ rally: '',
+ rally_sort: 0
+ };
}
+ // updated
+ tempData.updated = tempSystemData.updated.updated;
+
+ // delete row
+ tempData.clear = '';
+
systemsData.push(tempData);
}
var systemsDataTable = systemTable.dataTable( {
- paging: false,
+ pageLength: 20,
+ paging: true,
+ lengthMenu: [[5, 10, 20, 50, -1], [5, 10, 20, 50, 'All']],
ordering: true,
- order: [ 0, 'desc' ],
+ order: [[ 7, 'desc' ], [ 2, 'asc' ]],
autoWidth: false,
+ responsive: {
+ breakpoints: [
+ { name: 'desktop', width: Infinity },
+ { name: 'tablet', width: 1200 },
+ { name: 'fablet', width: 780 },
+ { name: 'phone', width: 480 }
+ ],
+ details: false
+ },
hover: false,
data: systemsData,
columnDefs: [],
@@ -217,52 +310,144 @@ define([
},
columns: [
{
- title: '',
- width: '15px',
- searchable: false
- },{
- title: '',
- width: '18px',
- searchable: false
- },{
title: 'type',
- width: '50px'
+ width: '25px',
+ className: ['min-desktop'].join(' '),
+ data: 'type',
+ render: {
+ _: 'type',
+ sort: 'type_sort'
+ }
},{
- title: 'system'
- },{
- title: 'status',
- width: '30px',
- class: 'text-center',
- orderable: false,
- searchable: false
- },{
- title: 'effect',
- width: '30px',
- class: 'text-center',
- orderable: false,
- searchable: false
- },{
- title: 'sec.',
- width: '20px',
- class: 'text-center',
- orderable: false,
- searchable: false
- },{
- title: '',
- width: '30px',
- class: 'text-center',
- searchable: false
- },{
- title: '',
- width: '30px',
+ title: 'sec',
+ width: '18px',
className: 'text-center',
- searchable: false
+ searchable: false,
+ data: 'trueSec',
+ render: {
+ _: 'trueSec',
+ sort: 'trueSec_sort'
+ }
+ },{
+ title: 'system',
+ data: 'name'
+ },{
+ title: 'region',
+ data: 'region'
+ },{
+ title: '',
+ width: '12px',
+ searchable: false,
+ data: 'status',
+ render: {
+ _: 'status',
+ sort: 'status_sort'
+ }
+ },{
+ title: '',
+ width: '12px',
+ className: 'text-center',
+ searchable: false,
+ data: 'effect',
+ render: {
+ _: 'effect',
+ sort: 'effect_sort'
+ }
+ },{
+ title: 'static',
+ width: '30px',
+ data: 'static'
+ },{
+ title: '',
+ width: '8px',
+ searchable: false,
+ data: 'position',
+ render: {
+ _: 'position',
+ sort: 'position_sort'
+ }
+ },{
+ title: '',
+ width: '12px',
+ className: 'text-center',
+ searchable: false,
+ data: 'userCount'
+ },{
+ title: '',
+ width: '10px',
+ searchable: false,
+ data: 'locked',
+ render: {
+ _: 'locked',
+ sort: 'locked_sort'
+ }
+ },{
+ title: '',
+ width: '15px',
+ className: ['min-desktop'].join(' '),
+ searchable: false,
+ data: 'rally',
+ render: {
+ _: 'rally',
+ sort: 'rally_sort'
+ }
+ },{
+ title: 'updated',
+ width: '80px',
+ searchable: false,
+ className: ['text-right', config.tableCounterCellClass, 'min-desktop'].join(' '),
+ data: 'updated',
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ $(cell).initTimestampCounter();
+
+ // highlight cell
+ var diff = new Date().getTime() - cellData * 1000;
+ var dateDiff = new Date(diff);
+ if(dateDiff.getUTCDate() > 1){
+ $(cell).addClass('txt-color txt-color-warning');
+ }
+ }
+ },{
+ title: '',
+ orderable: false,
+ searchable: false,
+ width: '10px',
+ className: ['text-center', config.tableActionCellClass].join(' '),
+ data: 'clear',
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex) {
+ var tempTableElement = this;
+
+ var tempConfirmationSettings = confirmationSettings;
+ tempConfirmationSettings.title = 'Delete system';
+ tempConfirmationSettings.onConfirm = function(e, target){
+ var deleteRowElement = $(target).parents('tr');
+
+ var activeMap = Util.getMapModule().getActiveMap();
+ var systemElement = $('#' + config.systemIdPrefix + mapData.config.id + '-' + rowData.id);
+
+ if(systemElement){
+ // trigger system delete event
+ activeMap.trigger('pf:deleteSystems', [{
+ systems: [systemElement],
+ callback: function(){
+ // callback function after ajax "delete" success
+ // remove table row
+ tempTableElement.DataTable().rows(deleteRowElement).remove().draw();
+
+ Util.showNotify({title: 'System deleted', text: rowData.name, type: 'success'});
+ }
+ }]);
+ }
+ };
+
+ // init confirmation dialog
+ $(cell).confirmation(tempConfirmationSettings);
+
+ }
}
]
});
- systemsElement.hideLoadingAnimation();
-
};
/**
@@ -281,6 +466,11 @@ define([
connectionsElement.showLoadingAnimation(config.loadingOptions);
+ // table init complete
+ connectionTable.on( 'init.dt', function () {
+ connectionsElement.hideLoadingAnimation();
+ });
+
// connections table ==================================================
// prepare data for dataTables
@@ -292,7 +482,10 @@ define([
tempConData.id = tempConnectionData.id;
- tempConData.scope = Util.getScopeInfoForConnection( tempConnectionData.scope, 'label');
+ tempConData.scope = {
+ scope: Util.getScopeInfoForConnection(tempConnectionData.scope, 'label'),
+ scope_sort: tempConnectionData.scope
+ };
// source system name
tempConData.source = tempConnectionData.sourceName;
@@ -319,7 +512,9 @@ define([
}
var connectionDataTable = connectionTable.dataTable( {
- paging: false,
+ pageLength: 20,
+ paging: true,
+ lengthMenu: [[5, 10, 20, 50, -1], [5, 10, 20, 50, 'All']],
ordering: true,
order: [ 0, 'desc' ],
autoWidth: false,
@@ -336,15 +531,19 @@ define([
{
title: 'scope',
width: '50px',
- orderable: false,
- data: 'scope'
+ orderable: true,
+ data: 'scope',
+ render: {
+ _: 'scope',
+ sort: 'scope_sort'
+ }
},{
title: 'source system',
data: 'source'
},{
title: 'connection',
width: '80px',
- class: 'text-center',
+ className: 'text-center',
orderable: false,
searchable: false,
data: 'connection'
@@ -353,57 +552,51 @@ define([
data: 'target'
},{
title: 'updated',
- width: '90px',
+ width: '80px',
searchable: false,
- className: [config.tableCounterCellClass, 'min-tablet-l'].join(' '),
+ className: ['text-right', config.tableCounterCellClass].join(' '),
data: 'updated',
createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
$(cell).initTimestampCounter();
+
+ // highlight cell
+ var diff = new Date().getTime() - cellData * 1000;
+ var dateDiff = new Date(diff);
+ if(dateDiff.getUTCDate() > 1){
+ $(cell).addClass('txt-color txt-color-warning');
+ }
}
},{
title: '',
orderable: false,
searchable: false,
width: '10px',
- class: ['text-center', config.tableActionCellClass].join(' '),
+ className: ['text-center', config.tableActionCellClass].join(' '),
data: 'clear',
createdCell: function(cell, cellData, rowData, rowIndex, colIndex) {
var tempTableElement = this;
- var confirmationSettings = {
- container: 'body',
- placement: 'left',
- btnCancelClass: 'btn btn-sm btn-default',
- btnCancelLabel: 'cancel',
- btnCancelIcon: 'fa fa-fw fa-ban',
- title: 'Delete connection',
- btnOkClass: 'btn btn-sm btn-danger',
- btnOkLabel: 'delete',
- btnOkIcon: 'fa fa-fw fa-close',
- onConfirm : function(e, target){
- var deleteRowElement = $(target).parents('tr');
+ var tempConfirmationSettings = confirmationSettings;
+ tempConfirmationSettings.title = 'Delete connection';
+ tempConfirmationSettings.onConfirm = function(e, target){
+ var deleteRowElement = $(target).parents('tr');
- // deleteSignatures(row);
- var connection = $().getConnectionById(mapData.config.id, rowData.id);
+ // deleteSignatures(row);
+ var connection = $().getConnectionById(mapData.config.id, rowData.id);
- $().deleteConnections([connection], function(){
- // callback function after ajax "delete" success
- // remove table row
- tempTableElement.DataTable().rows(deleteRowElement).remove().draw();
- });
- }
+ $().deleteConnections([connection], function(){
+ // callback function after ajax "delete" success
+ // remove table row
+ tempTableElement.DataTable().rows(deleteRowElement).remove().draw();
+ });
};
// init confirmation dialog
- $(cell).confirmation(confirmationSettings);
-
+ $(cell).confirmation(tempConfirmationSettings);
}
}
]
});
-
-
- connectionsElement.hideLoadingAnimation();
};
/**
diff --git a/js/app/ui/header.js b/js/app/ui/header.js
index 6acea9ca..7444ac19 100644
--- a/js/app/ui/header.js
+++ b/js/app/ui/header.js
@@ -203,7 +203,7 @@ define([
*/
$.fn.initHeader = function(callback){
largeHeader = $(this)[0];
- canvas = $(this).find('canvas')[0];
+ canvas = $(this).find('canvas:visible')[0];
// header preview elements
$('.' + config.previewElementClass).velocity('transition.bounceIn', {
@@ -211,21 +211,24 @@ define([
stagger: 60,
delay: 120,
complete: function(){
- // header animation
- initHeader();
- initAnimation();
- addListeners();
// show header canvas animation
- $(canvas).velocity('fadeIn', {
- duration: 900,
- visibility: 'visible',
- complete: function(){
- if(callback !== undefined){
- callback();
+ if(canvas){
+ // header animation
+ initHeader();
+ initAnimation();
+ addListeners();
+
+ $(canvas).velocity('fadeIn', {
+ duration: 900,
+ visibility: 'visible',
+ complete: function(){
+ if(callback !== undefined){
+ callback();
+ }
}
- }
- });
+ });
+ }
}
});
diff --git a/js/app/ui/logo.js b/js/app/ui/logo.js
index 33e6731d..fa8052a4 100644
--- a/js/app/ui/logo.js
+++ b/js/app/ui/logo.js
@@ -91,7 +91,7 @@ define([
});
// show full logo
- $('#' + config.staticLogoId + '').velocity({
+ canvasElement.find('#' + config.staticLogoId + '').velocity({
opacity: 1
},{
delay: 100,
@@ -99,7 +99,7 @@ define([
complete: function(){
// execute callback
- if(callback !== undefined){
+ if(typeof callback === 'function'){
callback();
}
diff --git a/js/app/ui/system_info.js b/js/app/ui/system_info.js
index 1ea02bb4..99e00866 100644
--- a/js/app/ui/system_info.js
+++ b/js/app/ui/system_info.js
@@ -18,8 +18,9 @@ define([
systemInfoModuleClass: 'pf-system-info-module', // module wrapper
// breadcrumb
- constellationLinkClass: 'pf-system-info-constellation', // class for "constellation" link
- regionLinkClass: 'pf-system-info-region', // class for "region" link
+ constellationLinkClass: 'pf-system-info-constellation', // class for "constellation" name
+ regionLinkClass: 'pf-system-info-region', // class for "region" name
+ typeLinkClass: 'pf-system-info-type', // class for "type" name
// info table
systemInfoTableClass: 'pf-system-info-table', // class for system info table
@@ -397,7 +398,8 @@ define([
ajaxConstellationInfoUrl: Init.path.getConstellationData,
systemConstellationLinkClass: config.constellationLinkClass,
- systemRegionLinkClass: config.regionLinkClass
+ systemRegionLinkClass: config.regionLinkClass,
+ systemTypeLinkClass: config.typeLinkClass
};
diff --git a/js/app/ui/system_killboard.js b/js/app/ui/system_killboard.js
index 8651c443..4a3699f3 100644
--- a/js/app/ui/system_killboard.js
+++ b/js/app/ui/system_killboard.js
@@ -233,7 +233,7 @@ define([
if(data.count === 0){
labelOptions.type = 'label-success';
- label = getLabel( 'No kills found within 24h', labelOptions );
+ label = getLabel( 'No kills found within the last 24h', labelOptions );
killboardGraphElement.append( label );
minifyKillboardGraphElement(killboardGraphElement);
diff --git a/js/app/ui/system_route.js b/js/app/ui/system_route.js
index 56452758..dafe6169 100644
--- a/js/app/ui/system_route.js
+++ b/js/app/ui/system_route.js
@@ -95,7 +95,7 @@ define([
$.fn.modal.Constructor.prototype.enforceFocus = function() {};
var findRouteDialog = bootbox.dialog({
- title: 'Search route',
+ title: 'Search shortest route',
message: content,
buttons: {
close: {
@@ -150,10 +150,9 @@ define([
var modalContent = $('#' + config.routeDialogId);
- // init system select live search
+ // init system select live search - some delay until modal transition has finished
var selectElement = modalContent.find('.' + config.systemDialogSelectClass);
-
- selectElement.initSystemSelect({key: 'name'});
+ selectElement.delay(240).initSystemSelect({key: 'name'});
});
});
};
@@ -188,7 +187,8 @@ define([
*/
var formatRouteData = function(routeData){
- var rowData = false;
+ var tableRowData = {};
+
if(
routeData.routePossible === true &&
routeData.route.length > 0
@@ -196,9 +196,10 @@ define([
// route data available
// add route Data
- rowData = [routeData.route[ routeData.route.length - 1 ].system.toLowerCase(), routeData.routeJumps];
+ var rowData = [routeData.route[ routeData.route.length - 1 ].system.toLowerCase(), routeData.routeJumps];
var jumpData = [];
+ var avgSecTemp = 0;
// loop all systems on this route
for(var i = 0; i < routeData.route.length; i++){
@@ -215,16 +216,26 @@ define([
var system = '';
+ system += 'title="' + routeNodeData.system.toLowerCase() + ' [' + systemSec + '] ">';
jumpData.push( system );
+ avgSecTemp += Number(routeNodeData.security);
}
- rowData.push( jumpData.join(' ') );
+ var avgSec = ( avgSecTemp / routeData.route.length).toFixed(2);
+ var avgSecClass = config.systemSecurityClassPrefix + ( avgSecTemp / routeData.route.length).toFixed(1).toString().replace('.', '-');
+
+ tableRowData.system = rowData[0];
+ tableRowData.jumps = rowData[1];
+ tableRowData.avgTrueSec = {
+ value: avgSec,
+ formatted: '' + avgSec + ''
+ };
+ tableRowData.route = jumpData.join(' ');
+
}
-
- return rowData;
+ return tableRowData;
};
/**
@@ -294,17 +305,31 @@ define([
{
targets: 0,
orderable: true,
- title: 'system '
+ title: 'system ',
+ data: 'system'
},{
targets: 1,
orderable: true,
title: 'jumps ',
width: '40px',
- class: 'text-right'
+ class: 'text-right',
+ data: 'jumps'
},{
targets: 2,
+ orderable: true,
+ title: 'Ø ',
+ width: '25px',
+ class: 'text-right',
+ data: 'avgTrueSec',
+ render: {
+ _: 'formatted',
+ sort: 'value'
+ }
+ },{
+ targets: 3,
orderable: false,
- title: 'route'
+ title: 'route',
+ data: 'route'
}
],
data: [] // will be added dynamic
diff --git a/js/app/ui/system_signature.js b/js/app/ui/system_signature.js
index 5cfdd325..a36cbd76 100644
--- a/js/app/ui/system_signature.js
+++ b/js/app/ui/system_signature.js
@@ -8,9 +8,7 @@ define([
'app/util',
'app/render',
'config/signature_type',
- 'bootbox',
- 'app/counter',
- 'datatablesResponsive'
+ 'bootbox'
], function($, Init, Util, Render, SignatureType, bootbox) {
'use strict';
@@ -931,9 +929,6 @@ define([
// open next field dialog ---------------------------------------------------------------
openNextEditDialogOnSave(sigNameFields);
openNextEditDialogOnSave(sigGroupFields);
-
- // init signature counter ---------------------------------------------------------------
- tableElement.find('.' + config.sigTableCounterClass + '[data-counter!="init"]').initTimestampCounter();
};
/**
@@ -1485,22 +1480,35 @@ define([
title: 'created',
width: '90px',
searchable: false,
- className: [config.sigTableCounterClass, config.sigTableCreatedCellClass, 'min-tablet-l'].join(' '),
+ className: ['text-right', config.sigTableCounterClass, config.sigTableCreatedCellClass, 'min-tablet-l'].join(' '),
data: 'created',
render: {
_: 'created',
sort: 'created'
+ },
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ $(cell).initTimestampCounter();
}
},{
targets: 6,
title: 'updated',
width: '90px',
searchable: false,
- className: [config.sigTableCounterClass, config.sigTableUpdatedCellClass, 'min-tablet-l'].join(' '),
+ className: ['text-right', config.sigTableCounterClass, config.sigTableUpdatedCellClass, 'min-tablet-l'].join(' '),
data: 'updated',
render: {
_: 'updated',
sort: 'updated'
+ },
+ createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+ $(cell).initTimestampCounter();
+
+ // highlight cell
+ var diff = new Date().getTime() - cellData.updated * 1000;
+ var dateDiff = new Date(diff);
+ if(dateDiff.getUTCDate() > 1){
+ $(cell).addClass('txt-color txt-color-warning');
+ }
}
},{
targets: 7,
diff --git a/js/app/util.js b/js/app/util.js
index 20ffa1b6..3d4c0712 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -540,6 +540,14 @@ define([
* ==========================================================================================================
*/
+ /**
+ * show current program version information in browser console
+ */
+ var showVersionInfo = function(){
+ var versionNumber = $('body').data('version');
+ console.info('PATHFINDER', versionNumber);
+ };
+
/**
* get the current main trigger delay for the main trigger functions
* optional in/decrease the delay
@@ -566,7 +574,6 @@ define([
Init.timer[updateKey]['CURRENT_DELAY'] += value;
}
-
return Init.timer[updateKey]['CURRENT_DELAY'];
};
@@ -633,15 +640,6 @@ define([
return duration;
};
- /**
- * build a program URL by a given path
- * @param path
- * @returns {string}
- */
- var buildUrl = function(path){
- return document.location.protocol + '//' + document.location.host + path;
- };
-
/**
* trigger main logging event with log information
* @param message
@@ -1438,7 +1436,7 @@ define([
}).done(function(data){
if(data.reroute !== undefined){
- var landingPageUrl = buildUrl(data.reroute);
+ var landingPageUrl = data.reroute;
var currentUrl = document.URL;
// relocate to landing page
@@ -1455,11 +1453,11 @@ define([
return {
config: config,
+ showVersionInfo: showVersionInfo,
getCurrentTriggerDelay: getCurrentTriggerDelay,
getServerTime: getServerTime,
timeStart: timeStart,
timeStop: timeStop,
- buildUrl: buildUrl,
log: log,
showNotify: showNotify,
getLogInfo: getLogInfo,
diff --git a/js/lib/jquery-2.1.1.min.js b/js/lib/jquery-2.1.1.min.js
deleted file mode 100644
index e5ace116..00000000
--- a/js/lib/jquery-2.1.1.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)
-},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*\s*$/g,ib={option:[1,""],thead:[1,""],col:[2,""],tr:[2,""],td:[3,""],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("")).appendTo(b.documentElement),b=qb[0].contentDocument,b.write(),b.close(),c=sb(a,b),qb.detach()),rb[a]=c),c}var ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};function xb(a,b,c){var d,e,f,g,h=a.style;return c=c||wb(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),vb.test(g)&&ub.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function yb(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];function Fb(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Eb.length;while(e--)if(b=Eb[e]+c,b in a)return b;return d}function Gb(a,b,c){var d=Ab.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Hb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ib(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wb(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xb(a,b,f),(0>e||null==e)&&(e=a.style[b]),vb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Hb(a,b,c||(g?"border":"content"),d,f)+"px"}function Jb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",tb(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Kb(a,b,c,d,e){return new Kb.prototype.init(a,b,c,d,e)}n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sb(){return setTimeout(function(){Lb=void 0}),Lb=n.now()}function Tb(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ub(a,b,c){for(var d,e=(Rb[b]||[]).concat(Rb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Vb(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||tb(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Nb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?tb(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ub(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xb(a,b,c){var d,e,f=0,g=Qb.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Lb||Sb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:Lb||Sb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wb(k,j.opts.specialEasing);g>f;f++)if(d=Qb[f].call(j,a,k,j.opts))return d;return n.map(k,Ub,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:Yb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))
-},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});var bc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec,fc,gc=/#.*$/,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,lc=/^\/\//,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=l.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[];function rc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function sc(a,b,c,d){var e={},f=a===oc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function tc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function uc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function vc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,n.ajaxSettings),b):tc(n.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=ic.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(gc,"").replace(lc,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var wc=/%20/g,xc=/\[\]$/,yc=/\r?\n/g,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;function Bc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||xc.test(a)?d(a,e):Bc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Bc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(wc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(yc,"\r\n")}}):{name:b.name,value:c.replace(yc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Dc)Dc[a]()}),k.cors=!!Fc&&"withCredentials"in Fc,k.ajax=Fc=!!Fc,n.ajaxTransport(function(a){var b;return k.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("
diff --git a/public/templates/view/landingpage.html b/public/templates/view/landingpage.html
index d69bb095..f51a5b6e 100644
--- a/public/templates/view/landingpage.html
+++ b/public/templates/view/landingpage.html
@@ -1,3 +1,10 @@
+{* config *}
+