closed #131 new "route search" algorithm, added current map systems to live search, added refresh/update functionality for each found route, added bulk route refresh function, added "meta map" route search (search on multiple maps), added route "filters" (restrict search on "stargates", "wormholes", "jumpbridges"), added route "filter" for wormholes (reduced/critical wormholes)

closed #89 fixed "loop connections" on same system
#84 added error messages for "invalid" CREST "Client ID"
added "bootboxjs" (customized styled checkboxes/radio buttons) CSS only
"Font Awesome" version upgrade 4.4.0 -> 4.61
"Bootbox.js" version upgrade 4.3.0 -> 4.4.0
fixed "system dialog" (added responsive layout)

app/main/controller/api/connection.php

@@ -64,6 +64,7 @@ class Connection extends Controller\AccessController{
 
                         // search if systems are neighbors
                         $routeController = new Route();
+                        $routeController->initJumpData();
                         $route = $routeController->findRoute($connectionData['sourceName'], $connectionData['targetName'], 1);
 
                         if($route['routePossible'] == true){
@@ -103,7 +104,6 @@ class Connection extends Controller\AccessController{
      */
     public function delete(\Base $f3){
         $connectionIds = $f3->get('POST.connectionIds');
-        $activeCharacter = $this->getCharacter();
 
         if($activeCharacter = $this->getCharacter()){
             /**
@@ -118,7 +118,6 @@ class Connection extends Controller\AccessController{
             }
         }
 
-
         echo json_encode([]);
     }
 

app/main/controller/api/route.php

@@ -18,10 +18,16 @@ use Model;
 class Route extends \Controller\AccessController {
 
     /**
-     * cache time for static jump data
+     * cache time for static jump data (e.g. K-Space stargates)
      * @var int
      */
-    private $jumpDataCacheTime = 86400;
+    private $staticJumpDataCacheTime = 86400;
+
+    /**
+     * cache time for dynamic jump data (e.g. W-Space systems, Jumpbridges. ...)
+     * @var int
+     */
+    private $dynamicJumpDataCacheTime = 10;
 
     /**
      * array system information grouped by systemId
@@ -41,11 +47,27 @@ class Route extends \Controller\AccessController {
      */
     private $idArray = [];
 
+    /**
+     * set jump data for route search
+     * -> this function is required for route search! (Don´t forget)
+     * @param array $mapIds
+     * @param array $filterData
+     */
+    public function initJumpData($mapIds = [], $filterData = []){
+        // add static data (e.g. K-Space stargates,..)
+        $this->setStaticJumpData();
+
+        // add map specific data
+        $this->setDynamicJumpData($mapIds, $filterData);
+    }
+
     /**
      * set static system jump data for this instance
      * the data is fixed and should not change
+     * -> jump data includes JUST "static" connections (Stargates)
+     * -> this data is equal for EACH route search (does not depend on map data)
      */
-    private function setSystemJumpData(){
+    private function setStaticJumpData(){
         $cacheKey = 'staticJumpData';
 
         $f3 = $this->getF3();
@@ -59,42 +81,167 @@ class Route extends \Controller\AccessController {
             $f3->exists($cacheKeyJumpArray) &&
             $f3->exists($cacheKeyIdArray)
         ){
-            // get cached values
 
+            // get cached values
             $this->nameArray = $f3->get($cacheKeyNamedArray);
             $this->jumpArray = $f3->get($cacheKeyJumpArray);
             $this->idArray = $f3->get($cacheKeyIdArray);
         }else{
             // nothing cached
-
-            $pfDB = $this->getDB('PF');
-
             $query = "SELECT * FROM system_neighbour";
-
-            $rows = $pfDB->exec($query, null, $this->jumpDataCacheTime);
+            $rows = $this->getDB()->exec($query, null, $this->staticJumpDataCacheTime);
 
             if(count($rows) > 0){
-                foreach($rows as $row){
-                    $regionId = $row['regionId'];
-                    $constId = $row['constellationId'];
-                    $systemName = strtoupper($row['systemName']);
-                    $systemId = $row['systemId'];
-                    $secStatus = $row['trueSec'];
+                $this->updateJumpData($rows);
 
-                    $this->nameArray[$systemId][0] = $systemName;
-                    $this->nameArray[$systemId][1] = $regionId;
-                    $this->nameArray[$systemId][2] = $constId;
-                    $this->nameArray[$systemId][3] = $secStatus;
+                // static data should be cached
+                $f3->set($cacheKeyNamedArray, $this->nameArray, $this->staticJumpDataCacheTime);
+                $f3->set($cacheKeyJumpArray, $this->jumpArray, $this->staticJumpDataCacheTime);
+                $f3->set($cacheKeyIdArray, $this->idArray, $this->staticJumpDataCacheTime);
+            }
+        }
+    }
 
-                    $this->idArray[strtoupper($systemName)] = $systemId;
+    /**
+     * set/add dynamic system jump data for specific "mapId"´s
+     * -> this data is dynamic and could change on any map change
+     * -> (e.g. new system added, connection added/updated, ...)
+     * @param array $mapIds
+     * @param array $filterData
+     */
+    private function setDynamicJumpData($mapIds = [], $filterData = []){
 
-                    $this->jumpArray[$systemName]= explode(":", strtoupper($row['jumpNodes']));
-                    array_push($this->jumpArray[$systemName],$systemId);
+        if( !empty($mapIds) ){
+            // make sure, mapIds are integers (protect against SQL injections)
+            $mapIds = array_map('intval', $mapIds);
+
+            // connection filter --------------------------------------------------------
+            $whereQuery = "";
+            $includeScopes = [];
+            $includeTypes = [];
+
+            if( $filterData['stargates'] === true){
+                // include "stargates" for search
+                $includeScopes[] = 'stargate';
+                $includeTypes[] = 'stargate';
+
+            }
+
+            if( $filterData['jumpbridges'] === true ){
+                // add jumpbridge connections for search
+                $includeScopes[] = 'jumpbridge';
+                $includeTypes[] = 'jumpbridge';
+            }
+
+            if( $filterData['wormholes'] === true ){
+                // add wormhole connections for search
+                $includeScopes[] = 'wh';
+                $includeTypes[] = 'wh_fresh';
+
+
+                if( $filterData['wormholesReduced'] === true ){
+                    $includeTypes[] = 'wh_reduced';
                 }
 
-                $f3->set($cacheKeyNamedArray, $this->nameArray, $this->jumpDataCacheTime);
-                $f3->set($cacheKeyJumpArray, $this->jumpArray, $this->jumpDataCacheTime);
-                $f3->set($cacheKeyIdArray, $this->idArray, $this->jumpDataCacheTime);
+                if( $filterData['wormholesCritical'] === true ){
+                    $includeTypes[] = 'wh_critical';
+                }
+            }
+
+            // search connections -------------------------------------------------------
+
+            if( !empty($includeScopes) ){
+                $whereQuery .= " connection.scope IN ('" . implode("', '", $includeScopes) . "') AND ";
+
+                if( !empty($includeTypes) ){
+                    $whereQuery .= " connection.type REGEXP '" . implode("|", $includeTypes) . "' AND ";
+                }
+
+
+                $query = "SELECT
+                        system_src.regionId regionId,
+                        system_src.constellationId constellationId,
+                        system_src.name systemName,
+                        system_src.systemId systemId,
+                        (
+                          SELECT
+                            GROUP_CONCAT( NULLIF(system_tar.name, NULL) SEPARATOR ':')
+                          FROM
+                            connection INNER JOIN
+                            system system_tar ON
+                              system_tar.id = connection.source OR
+                              system_tar.id = connection.target
+                          WHERE
+                            (
+                              connection.source = system_src.id OR
+                              connection.target = system_src.id
+                            ) AND
+                            " . $whereQuery . "
+                            connection.active = 1 AND
+                            system_tar.id != system_src.id AND
+                            system_tar.active = 1
+                        ) jumpNodes,
+                        system_src.trueSec trueSec
+                    FROM
+                        system system_src INNER JOIN
+                        map ON
+                          map.id = system_src.mapId
+                    WHERE
+                        system_src.mapId IN (" . implode(', ', $mapIds) . ") AND
+                        system_src.active = 1 AND
+                        map.active = 1
+                    HAVING
+                        -- skip systems without neighbors (e.g. WHs)
+	                    jumpNodes IS NOT NULL
+                ";
+
+                $rows = $this->getDB()->exec($query,  null, $this->dynamicJumpDataCacheTime);
+
+                if(count($rows) > 0){
+                    // update jump data for this instance
+                    $this->updateJumpData($rows);
+                }
+
+            }
+        }
+    }
+
+    /**
+     * update jump data for this instance
+     * -> data is either coming from CCPs static export OR from map specific data
+     * @param array $rows
+     */
+    private function updateJumpData($rows = []){
+
+        foreach($rows as $row){
+            $regionId       = (int)$row['regionId'];
+            $constId        = (int)$row['constellationId'];
+            $systemName     = strtoupper($row['systemName']);
+            $systemId       = (int)$row['systemId'];
+            $secStatus      = (float)$row['trueSec'];
+
+            // fill "nameArray" data ----------------------------------------------------
+            if( !isset($this->nameArray[$systemId]) ){
+                $this->nameArray[$systemId][0] = $systemName;
+                $this->nameArray[$systemId][1] = $regionId;
+                $this->nameArray[$systemId][2] = $constId;
+                $this->nameArray[$systemId][3] = $secStatus;
+            }
+
+            // fill "idArray" data ------------------------------------------------------
+            if( !isset($this->idArray[$systemName]) ){
+                $this->idArray[$systemName] = $systemId;
+            }
+
+            // fill "jumpArray" data ----------------------------------------------------
+            if( !is_array($this->jumpArray[$systemName]) ){
+                $this->jumpArray[$systemName] = [];
+            }
+            $this->jumpArray[$systemName] = array_merge( explode(':', strtoupper($row['jumpNodes'])), $this->jumpArray[$systemName] );
+
+            // add systemId to end (if not already there)
+            if(end($this->jumpArray[$systemName]) != $systemId){
+                array_push($this->jumpArray[$systemName],$systemId);
             }
         }
     }
@@ -284,8 +431,6 @@ class Route extends \Controller\AccessController {
             !empty($systemTo)
         ){
 
-            $this->setSystemJumpData();
-
             $from = strtoupper( $systemFrom );
             $to = strtoupper( $systemTo );
 
@@ -294,7 +439,6 @@ class Route extends \Controller\AccessController {
 
             if( isset($this->jumpArray[$from]) ){
 
-
                 // check if the system we are looking for is a direct neighbour
                 foreach( $this->jumpArray[$from] as $n ) {
 
@@ -352,45 +496,146 @@ class Route extends \Controller\AccessController {
         return $routeData;
     }
 
+    /**
+     * get key for route cache
+     * @param $mapIds
+     * @param $systemFrom
+     * @param $systemTo
+     * @param array $filterData
+     * @return string
+     */
+    private function getRouteCacheKey($mapIds, $systemFrom, $systemTo, $filterData = []){
+
+        $keyParts = [
+            implode('_', $mapIds),
+            self::formatHiveKey($systemFrom),
+            self::formatHiveKey($systemTo)
+        ];
+
+        $keyParts += $filterData;
+        $key = 'route_' . hash('md5', implode('_', $keyParts));
+
+        return $key;
+    }
+
     /**
      * search multiple route between two systems
-     * @param $f3
+     * @param \Base $f3
      */
     public function search($f3){
-        $routesData = $data = (array)$f3->get('POST.routeData');
+        $requestData = (array)$f3->get('POST');
+
+        $activeCharacter = $this->getCharacter();
 
         $return = (object) [];
         $return->error = [];
         $return->routesData = [];
 
-        foreach($routesData as $routeData){
-            $cacheKey = self::formatHiveKey($routeData['systemFrom']) . '_' . self::formatHiveKey($routeData['systemTo']);
+        if(
+            $activeCharacter &&
+            !empty($requestData['routeData'])
+        ){
 
-            if($f3->exists($cacheKey)){
-                // get data from cache
-                $return->routesData[] = $f3->get($cacheKey);
-            }else{
-                // no cached route data found
-                $foundRoutData = $this->findRoute($routeData['systemFrom'], $routeData['systemTo']);
+            $routesData = (array)$requestData['routeData'];
 
-                // cache if route was found
-                if(
-                    isset($foundRoutData['routePossible']) &&
-                    $foundRoutData['routePossible'] === true
-                ){
-                    $f3->set($cacheKey, $foundRoutData, $this->jumpDataCacheTime);
+            //  map data where access was already checked -> cached data
+            $validMaps = [];
+
+            /**
+             * @var $map Model\MapModel
+             */
+            $map = Model\BasicModel::getNew('MapModel');
+
+            foreach($routesData as $key => $routeData){
+                // mapIds are optional. If mapIds is empty or not set
+                // route search is limited to CCPs static data
+                $mapData = (array)$routeData['mapIds'];
+                $mapData = array_flip( array_map('intval', $mapData) );
+
+                // check map access (filter requested mapIDs and format) --------------------
+                array_walk($mapData, function(&$item, &$key, $data){
+
+                    if( isset($data[1][$key]) ){
+                        // character has mas access -> do not check again
+                        $item = $data[1][$key];
+                    }else{
+                        // check map access for current character
+                        $data[0]->getById($key);
+
+                        if( $data[0]->hasAccess($data[2]) ){
+                            $item = ['id' => $key, 'name' => $data[0]->name];
+                        }else{
+                            $item = false;
+                        }
+                        $data[0]->reset();
+
+                    }
+
+                }, [$map, $validMaps, $activeCharacter]);
+
+                // filter maps with NO access right
+                $mapData = array_filter($mapData);
+                $mapIds = array_column($mapData, 'id');
+
+                // add map data to cache array
+                $validMaps += $mapData;
+
+                // search route with filter options
+                $filterData = [
+                    'stargates' => (bool) $routeData['stargates'],
+                    'jumpbridges' => (bool) $routeData['jumpbridges'],
+                    'wormholes' => (bool) $routeData['wormholes'],
+                    'wormholesReduced' => (bool) $routeData['wormholesReduced'],
+                    'wormholesCritical' => (bool) $routeData['wormholesCritical']
+                ];
+
+                $returnRoutData = [
+                    'systemFrom' => $routeData['systemFrom'],
+                    'systemTo' => $routeData['systemTo'],
+                    'maps' => $mapData,
+                    'mapIds' => $mapIds
+                ];
+
+                // add filter options for each route as well
+                $returnRoutData += $filterData;
+
+                if(count($mapIds) > 0){
+                    $cacheKey = $this->getRouteCacheKey(
+                        $mapIds,
+                        $routeData['systemFrom'],
+                        $routeData['systemTo'],
+                        $filterData
+                    );
+
+                    if($f3->exists($cacheKey)){
+                        // get data from cache
+                        $returnRoutData = $f3->get($cacheKey);
+                    }else{
+                        // set jump data for following route search
+                        $this->initJumpData($mapIds, $filterData);
+
+                        // no cached route data found
+                        $foundRoutData = $this->findRoute($routeData['systemFrom'], $routeData['systemTo']);
+                        $returnRoutData = array_merge($returnRoutData, $foundRoutData);
+
+                        // cache if route was found
+                        if(
+                            isset($returnRoutData['routePossible']) &&
+                            $returnRoutData['routePossible'] === true
+                        ){
+                            $f3->set($cacheKey, $returnRoutData, $this->dynamicJumpDataCacheTime);
+                        }
+                    }
                 }
 
-                $return->routesData[] = $foundRoutData;
+                $return->routesData[] = $returnRoutData;
             }
-
         }
 
         echo json_encode($return);
     }
 
 
-
 }
 
 

app/main/controller/ccp/sso.php

@@ -42,6 +42,7 @@ class Sso extends Api\User{
     // error messages
     const ERROR_CCP_SSO_URL                         = 'Invalid "ENVIRONMENT.[ENVIRONMENT].SSO_CCP_URL" url. %s';
     const ERROR_CCP_CREST_URL                       = 'Invalid "ENVIRONMENT.[ENVIRONMENT].CCP_CREST_URL" url. %s';
+    const ERROR_CCP_CLIENT_ID                       = 'Missing "ENVIRONMENT.[ENVIRONMENT].SSO_CCP_CLIENT_ID".';
     const ERROR_RESOURCE_DEPRECATED                 = 'Resource: %s has been marked as deprecated. %s';
     const ERROR_ACCESS_TOKEN                        = 'Unable to get a valid "access_token. %s';
     const ERROR_VERIFY_CHARACTER                    = 'Unable to verify character data. %s';
@@ -69,29 +70,38 @@ class Sso extends Api\User{
      * @param \Base $f3
      */
     public function requestAuthorization($f3){
-        $params = $f3->get('GET');
 
-        if(isset($params['characterId'])){
-            // restrict login to this characterId e.g. for character switch
-            $f3->set(self::SESSION_KEY_SSO_CHARACTER_ID, (int)trim($params['characterId']) );
+        if( !empty($ssoCcpClientId = Controller\Controller::getEnvironmentData('SSO_CCP_CLIENT_ID')) ){
+            $params = $f3->get('GET');
+
+            if(isset($params['characterId'])){
+                // restrict login to this characterId e.g. for character switch
+                $f3->set(self::SESSION_KEY_SSO_CHARACTER_ID, (int)trim($params['characterId']) );
+            }
+
+            // used for "state" check between request and callback
+            $state = bin2hex(mcrypt_create_iv(12, MCRYPT_DEV_URANDOM));
+            $f3->set(self::SESSION_KEY_SSO_STATE, $state);
+
+            $urlParams = [
+                'response_type' => 'code',
+                'redirect_uri' => Controller\Controller::getEnvironmentData('URL') . $f3->build('/sso/callbackAuthorization'),
+                'client_id' => Controller\Controller::getEnvironmentData('SSO_CCP_CLIENT_ID'),
+                'scope' => implode(' ', $this->requestScopes),
+                'state' => $state
+            ];
+
+            $ssoAuthUrl = self::getAuthorizationEndpoint() . '?' . http_build_query($urlParams, '', '&', PHP_QUERY_RFC3986 );
+
+            $f3->status(302);
+            $f3->reroute($ssoAuthUrl);
+        }else{
+            // SSO clientId missing
+            $f3->set(self::SESSION_KEY_SSO_ERROR, self::ERROR_CCP_CLIENT_ID);
+            self::getCrestLogger()->write(self::ERROR_CCP_CLIENT_ID);
+
+            $f3->reroute('@login');
         }
-
-        // used for "state" check between request and callback
-        $state = bin2hex(mcrypt_create_iv(12, MCRYPT_DEV_URANDOM));
-        $f3->set(self::SESSION_KEY_SSO_STATE, $state);
-
-        $urlParams = [
-            'response_type' => 'code',
-            'redirect_uri' => Controller\Controller::getEnvironmentData('URL') . $f3->build('/sso/callbackAuthorization'),
-            'client_id' => Controller\Controller::getEnvironmentData('SSO_CCP_CLIENT_ID'),
-            'scope' => implode(' ', $this->requestScopes),
-            'state' => $state
-        ];
-
-        $ssoAuthUrl = self::getAuthorizationEndpoint() . '?' . http_build_query($urlParams, '', '&', PHP_QUERY_RFC3986 );
-
-        $f3->status(302);
-        $f3->reroute($ssoAuthUrl);
     }
 
     /**

app/main/model/charactermodel.php

@@ -456,7 +456,6 @@ class CharacterModel extends BasicModel {
             }
         }
 
-        // get
         if($alliance = $this->getAlliance()){
             $maps = array_merge($maps, $alliance->getMaps());
         }

app/main/model/connectionmodel.php

@@ -117,8 +117,12 @@ class ConnectionModel extends BasicModel{
     public function isValid(){
         $isValid = true;
 
+        // check if source/target system are not equal
         // check if source/target belong to same map
-        if( $this->source->mapId->id !== $this->target->mapId->id ){
+        if(
+            $this->source->_id === $this->target->_id ||
+            $this->source->mapId->_id !== $this->target->mapId->_id
+        ){
             $isValid = false;
         }
 

js/app.js

@@ -39,7 +39,7 @@ requirejs.config({
         xEditable: 'lib/bootstrap-editable.min',                        // v1.5.1 X-editable - in placed editing
         morris: 'lib/morris.min',                                       // v0.5.1 Morris.js - graphs and charts
         raphael: 'lib/raphael-min',                                     // v2.1.2 Raphaël - required for morris (dependency)
-        bootbox: 'lib/bootbox.min',                                     // v4.3.0 Bootbox.js - custom dialogs
+        bootbox: 'lib/bootbox.min',                                     // v4.4.0 Bootbox.js - custom dialogs - http://bootboxjs.com/
         easyPieChart: 'lib/jquery.easypiechart.min',                    // v2.1.6 Easy Pie Chart - HTML 5 pie charts - http://rendro.github.io/easy-pie-chart/
         dragToSelect: 'lib/jquery.dragToSelect',                        // v1.1 Drag to Select - http://andreaslagerkvist.com/jquery/drag-to-select/
         hoverIntent: 'lib/jquery.hoverIntent.minified',                 // v1.8.0 Hover intention - http://cherne.net/brian/resources/jquery.hoverIntent.html

js/app/map/map.js

@@ -1302,30 +1302,36 @@ define([
             dataType: 'json',
             //context: connection
             context: {
-              connection: connection,
-              mapId: mapId
+                connection: connection,
+                map: map,
+                mapId: mapId
             }
         }).done(function(newConnectionData){
 
-            // update connection data e.g. "scope" has auto detected
-            connection = updateConnection(this.connection, connectionData, newConnectionData);
+            if( !$.isEmptyObject(newConnectionData) ){
+                // update connection data e.g. "scope" has auto detected
+                connection = updateConnection(this.connection, connectionData, newConnectionData);
 
-            // new connection should be cached immediately!
-            updateConnectionCache(this.mapId, connection);
+                // new connection should be cached immediately!
+                updateConnectionCache(this.mapId, connection);
 
-            // connection scope
-            var scope = Util.getScopeInfoForConnection(newConnectionData.scope, 'label');
+                // connection scope
+                var scope = Util.getScopeInfoForConnection(newConnectionData.scope, 'label');
 
-            var title = 'New connection established';
-            if(connectionData.id > 0){
-                title = 'Connection switched';
+                var title = 'New connection established';
+                if(connectionData.id > 0){
+                    title = 'Connection switched';
+                }
+
+                Util.showNotify({title: title, text: 'Scope: ' + scope, type: 'success'});
+            }else{
+                // some save errors
+                this.map.detach(this.connection, {fireEvent: false});
             }
 
-            Util.showNotify({title: title, text: 'Scope: ' + scope, type: 'success'});
         }).fail(function( jqXHR, status, error) {
-
             // remove this connection from map
-            this._jsPlumb.instance.detach(this);
+            this.map.detach(this.connection, {fireEvent: false});
 
             var reason = status + ' ' + error;
             Util.showNotify({title: jqXHR.status + ': saveConnection', text: reason, type: 'warning'});

js/app/module_map.js

@@ -129,7 +129,7 @@ define([
         firstCell.drawSignatureTableModule(currentSystemData.systemData);
 
         // draw system routes module
-        secondCell.drawSystemRouteModule(currentSystemData.systemData);
+        secondCell.drawSystemRouteModule(currentSystemData.mapId, currentSystemData.systemData);
 
         // draw system killboard module
         secondCell.drawSystemKillboardModule(currentSystemData.systemData);
@@ -153,7 +153,7 @@ define([
             var clickY = e.pageY - posY;
 
             // check for top-left click
-            if(clickX <= 6 && clickY <= 6){
+            if(clickX <= 8 && clickY <= 8){
 
                 // remember height
                 if(! moduleElement.data('origHeight')){
@@ -175,7 +175,7 @@ define([
                     });
                 }else{
                     moduleElement.velocity('finish').velocity({
-                        height: [ '40px', [ 400, 15 ] ]
+                        height: [ '36px', [ 400, 15 ] ]
                     },{
                         duration: 400,
                         easing: 'easeInSine',

js/app/ui/form_element.js

@@ -10,6 +10,23 @@ define([
 
     'use strict';
 
+    /**
+     * init a select element as "select2" for map selection
+     */
+    $.fn.initMapSelect = function(){
+        var selectElement = $(this);
+
+        $.when(
+            selectElement.select2({
+                dropdownParent: 'body',
+                theme: 'pathfinder',
+                maximumSelectionLength: 5
+            })
+        );
+    };
+
+
+
     /**
      * init a select element as an ajax based "select2" object for system search
      * @param options
@@ -114,7 +131,7 @@ define([
                 theme: 'pathfinder',
                 minimumInputLength: 2,
                 templateResult: formatResultData,
-                placeholder: 'Systemname',
+                placeholder: 'System name',
                 allowClear: true,
                 escapeMarkup: function (markup) {
                     // let our custom formatter work
@@ -252,26 +269,6 @@ define([
             });
         });
 
-
     };
 
-
 });
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

js/app/ui/system_route.js

@@ -14,19 +14,25 @@ define([
         // module info
         moduleClass: 'pf-module',                                               // class for each module
 
+        routeCacheTTL: 10,                                                      // route cache timer (client) in seconds
+
         // system route module
         systemRouteModuleClass: 'pf-system-route-module',                       // class  for this module
 
         // headline toolbar
         systemModuleHeadlineIcon: 'pf-module-icon-button',                      // class for toolbar icons in the head
+        systemModuleHeadlineIconSearch: 'pf-module-icon-button-search',         // class for "search" icon
+        systemModuleHeadlineIconRefresh: 'pf-module-icon-button-refresh',       // class for "refresh" icon
 
         systemSecurityClassPrefix: 'pf-system-security-',                       // prefix class for system security level (color)
 
         // dialog
         routeDialogId: 'pf-route-dialog',                                       // id for route dialog
         systemDialogSelectClass: 'pf-system-dialog-select',                     // class for system select Element
-        systemInfoRoutesTableRowPrefix: 'pf-system-info-routes-row-',           // prefix class for a row in the route table
-        systemInfoRoutesTableClass: 'pf-system-route-table'                     // class for route tables
+        systemInfoRoutesTableClass: 'pf-system-route-table',                    // class for route tables
+        mapSelectId: 'pf-route-dialog-map-select',                              // id for "map" select
+
+        sigTableActionCellClass: 'pf-table-action-cell'                         // class for "action" cells
 
     };
 
@@ -42,41 +48,99 @@ define([
      */
     var callbackAddRouteRow = function(context, routesData){
 
-        for(var i = 0; i < routesData.length; i++){
-            var routeData = routesData[i];
+        if(routesData.length > 0){
+            for(var i = 0; i < routesData.length; i++){
+                var routeData = routesData[i];
 
-            // format routeData
-            var rowData = formatRouteData(routeData);
+                // format routeData
+                var rowData = formatRouteData(routeData);
 
-            if(rowData.route){
-                var cacheKey = routeData.route[0].system + '_' + routeData.route[ routeData.route.length - 1 ].system;
+                if(rowData.route){
+                    var cacheKey = routeData.systemFrom.toLowerCase() + '_' + routeData.systemTo.toLowerCase();
 
-                // update route cache
-                cache.systemRoutes[cacheKey] = rowData;
+                    // update route cache
+                    cache.systemRoutes[cacheKey] = {
+                        data: rowData,
+                        updated: Util.getServerTime().getTime() / 1000
+                    };
 
-                addRow(context.dataTable, rowData);
-            }else{
-                // route not possible
-                Util.showNotify({title: 'Route not found', type: 'warning'});
+                    var rowElement = addRow(context, rowData);
+
+                    rowElement.initTooltips();
+                }
             }
+
+            // redraw dataTable
+            context.dataTable.draw();
         }
     };
 
     /**
-     * add a new dataTable row to the jump table
-     * @param dataTable
+     * add a new dataTable row to the routes table
+     * @param context
      * @param rowData
+     * @returns {*}
      */
-    var addRow = function(dataTable, rowData){
-        var rowClass = config.systemInfoRoutesTableRowPrefix + dataTable.rows().data().length;
+    var addRow = function(context, rowData){
+        var dataTable = context.dataTable;
+        var rowElement = null;
+        var row = null;
+        var animationStatus = 'changed';
 
-        // add new row
-        var rowElement = dataTable.row.add( rowData ).draw().nodes().to$();
-        rowElement.addClass( rowClass );
+        // search for an existing row (e.g. on mass "table refresh" [all routes])
+        // get rowIndex where column 0 (equals to "systemTo") matches rowData.systemTo
+        var indexes = dataTable.rows().eq(0).filter( function (rowIdx) {
+            return (dataTable.cell(rowIdx, 0 ).data() === rowData.systemTo);
+        });
 
-        rowElement.find('i').tooltip();
+        if(indexes.length > 0){
+            // update row with FIRST index
+            // -> systemFrom should be unique!
+            row = dataTable.row( parseInt(indexes[0]) );
+            // update row data
+            row.data(rowData);
+        }else{
+            // no existing route found -> add new row
+            row = dataTable.row.add( rowData );
+
+            animationStatus = 'added';
+        }
+
+        if(row.length > 0){
+            rowElement = row.nodes().to$();
+
+            if(animationStatus !== null){
+                rowElement.data('animationStatus', animationStatus);
+            }
+        }
+
+        return rowElement;
     };
 
+    /**
+     * update complete routes table (refresh all)
+     * @param moduleElement
+     * @param dataTable
+     */
+    var updateRoutesTable = function(moduleElement, dataTable){
+        var context = {
+            moduleElement: moduleElement,
+            dataTable: dataTable
+        };
+
+        var routeData = [];
+        dataTable.rows().every( function() {
+
+            var data = this.data();
+            routeData.push({
+                mapIds: data.mapIds,
+                systemFrom: data.systemFrom,
+                systemTo: data.systemTo
+            });
+        } );
+
+        getRouteData({routeData: routeData}, context, callbackAddRouteRow);
+    };
 
     /**
      * show route dialog. User can search for systems and jump-info for each system is added to a data table
@@ -84,10 +148,23 @@ define([
      */
     var showFindRouteDialog = function(dialogData){
 
+        var mapSelectOptions = [];
+        var currentMapData = Util.getCurrentMapData();
+        if(currentMapData !== false){
+            for(var i = 0; i < currentMapData.length; i++){
+                mapSelectOptions.push({
+                    id: currentMapData[i].config.id,
+                    name: currentMapData[i].config.name,
+                    selected: (dialogData.mapId === currentMapData[i].config.id)
+                });
+            }
+        }
         var data = {
             id: config.routeDialogId,
             selectClass: config.systemDialogSelectClass,
-            systemFrom: dialogData.systemFrom
+            mapSelectId: config.mapSelectId,
+            systemFrom: dialogData.systemFrom,
+            mapSelectOptions: mapSelectOptions
         };
 
         requirejs(['text!templates/dialog/route.html', 'mustache'], function(template, Mustache) {
@@ -98,8 +175,9 @@ define([
             $.fn.modal.Constructor.prototype.enforceFocus = function() {};
 
             var findRouteDialog = bootbox.dialog({
-                title: 'Search shortest route',
+                title: 'Route finder',
                 message: content,
+                show: false,
                 buttons: {
                     close: {
                         label: 'cancel',
@@ -130,55 +208,112 @@ define([
                                 return false;
                             }
 
-
-                            var requestRouteData = [{
-                                systemFrom: dialogData.systemFrom,
-                                systemTo: routeDialogData.systemTo
-                            }];
-
-
-                            var contextData = {
+                            var context = {
                                 moduleElement: dialogData.moduleElement,
                                 dataTable: dialogData.dataTable
                             };
 
-                            getRouteData(requestRouteData, contextData, callbackAddRouteRow);
+                            var requestData = {
+                                routeData: [{
+                                    mapIds: routeDialogData.mapIds,
+                                    systemFrom: dialogData.systemFrom,
+                                    systemTo: routeDialogData.systemTo,
+                                    stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt( routeDialogData.stargates ) : 0,
+                                    jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt( routeDialogData.jumpbridges ) : 0,
+                                    wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt( routeDialogData.wormholes ) : 0,
+                                    wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt( routeDialogData.wormholesReduced ) : 0,
+                                    wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0
+                                }]
+                            };
+
+                            getRouteData(requestData, context, callbackAddRouteRow);
                         }
                     }
                 }
             });
 
+            findRouteDialog.on('show.bs.modal', function(e) {
+                findRouteDialog.initTooltips();
+
+                // init some dialog/form observer
+                setDialogObserver( $(this) );
+
+                // init map select ----------------------------------------------------------------
+                var mapSelect = $(this).find('#' + config.mapSelectId);
+                mapSelect.initMapSelect();
+            });
+
 
-            // init dialog
             findRouteDialog.on('shown.bs.modal', function(e) {
 
-                var modalContent = $('#' + config.routeDialogId);
-
-                // init system select live  search  - some delay until modal transition has finished
-                var selectElement = modalContent.find('.' + config.systemDialogSelectClass);
-                selectElement.delay(240).initSystemSelect({key: 'name'});
+                // init system select live  search ------------------------------------------------
+                // -> add some delay until modal transition has finished
+                var systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
+                systemTargetSelect.delay(240).initSystemSelect({key: 'name'});
             });
+
+            // show dialog
+            findRouteDialog.modal('show');
         });
     };
 
+    /**
+     * set event observer for route finder dialog
+     * @param routeDialog
+     */
+    var setDialogObserver = function(routeDialog){
+        var wormholeCheckbox = routeDialog.find('input[type="checkbox"][name="wormholes"]');
+        var wormholeReducedCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesReduced"]');
+        var wormholeCriticalCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesCritical"]');
+
+        // store current "checked" state for each box ---------------------------------------------
+        var storeCheckboxStatus = function(){
+            wormholeReducedCheckbox.data('selectState', wormholeReducedCheckbox.prop('checked'));
+            wormholeCriticalCheckbox.data('selectState', wormholeCriticalCheckbox.prop('checked'));
+        };
+
+        // on wormhole checkbox change ------------------------------------------------------------
+        var onWormholeCheckboxChange = function(){
+
+            if( $(this).is(':checked') ){
+                wormholeReducedCheckbox.prop('disabled', false);
+                wormholeCriticalCheckbox.prop('disabled', false);
+
+                wormholeReducedCheckbox.prop('checked', wormholeReducedCheckbox.data('selectState'));
+                wormholeCriticalCheckbox.prop('checked', wormholeCriticalCheckbox.data('selectState'));
+            }else{
+                storeCheckboxStatus();
+
+                wormholeReducedCheckbox.prop('checked', false);
+                wormholeReducedCheckbox.prop('disabled', true);
+                wormholeCriticalCheckbox.prop('checked', false);
+                wormholeCriticalCheckbox.prop('disabled', true);
+            }
+        }.bind(wormholeCheckbox);
+
+        wormholeCheckbox.on('change', onWormholeCheckboxChange);
+
+        // initial checkbox check
+        storeCheckboxStatus();
+        onWormholeCheckboxChange();
+    };
+
     /**
      * requests route data from eveCentral API and execute callback
-     * @param requestRouteData
-     * @param contextData
+     * @param requestData
+     * @param context
      * @param callback
      */
-    var getRouteData = function(requestRouteData, contextData, callback){
+    var getRouteData = function(requestData, context, callback){
 
-        var requestData = {routeData: requestRouteData};
-
-        contextData.moduleElement.showLoadingAnimation();
+        context.moduleElement.showLoadingAnimation();
 
         $.ajax({
             url: Init.path.searchRoute,
             type: 'POST',
             dataType: 'json',
             data: requestData,
-            context: contextData
+            context: context
         }).done(function(routesData){
 
             this.moduleElement.hideLoadingAnimation();
@@ -192,11 +327,40 @@ define([
     /**
      * format route data from API request into dataTable row format
      * @param routeData
-     * @returns {*[]}
+     * @returns {{}}
      */
     var formatRouteData = function(routeData){
 
-        var tableRowData = {};
+        var reloadButton = '<i class="fa ' + ['fa-refresh'].join(' ') + '"></i>';
+        var deleteButton = '<i class="fa ' + ['fa-close', 'txt-color', 'txt-color-redDarker'].join(' ') + '"></i>';
+
+        // default row data (e.g. no route found)
+        var tableRowData = {
+            systemFrom:  routeData.systemFrom,
+            systemTo:  routeData.systemTo,
+            jumps: {
+                value: 0,
+                formatted: '---'
+            },
+            avgTrueSec: {
+                value: '',
+                formatted: ''
+            },
+            route: 'not found',
+            stargates: routeData.stargates,
+            jumpbridges: routeData.jumpbridges,
+            wormholes: routeData.wormholes,
+            wormholesReduced: routeData.wormholesReduced,
+            wormholesCritical: routeData.wormholesCritical,
+            reload: {
+                button: reloadButton
+            },
+            delete: {
+                button: deleteButton
+            },
+            maps: routeData.maps,
+            mapIds: routeData.mapIds //map data (mapIds is "redundant")
+        };
 
         if(
             routeData.routePossible === true &&
@@ -205,14 +369,14 @@ define([
             // route data available
 
             // add route Data
-            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++){
                 var routeNodeData = routeData.route[i];
+                // format system name (camelCase)
+                var systemName = routeNodeData.system.charAt(0).toUpperCase() + routeNodeData.system.slice(1).toLowerCase();
 
                 var systemSec = Number(routeNodeData.security).toFixed(1).toString();
                 var tempSystemSec = systemSec;
@@ -225,7 +389,7 @@ define([
 
                 var system = '<i class="fa fa-square ' + systemSecClass + '" ';
                 system += 'data-toggle="tooltip" data-placement="bottom" data-container="body" ';
-                system += 'title="' + routeNodeData.system.toLowerCase() + ' [' + systemSec + '] "></i>';
+                system += 'title="' + systemName + ' [' + systemSec + '] "></i>';
                 jumpData.push( system );
 
                 avgSecTemp += Number(routeNodeData.security);
@@ -234,20 +398,22 @@ define([
             var avgSec = ( avgSecTemp /  routeData.route.length).toFixed(2);
             var avgSecForClass = Number(avgSec).toFixed(1);
 
-            if(avgSecForClass < 0){
+            if(avgSecForClass <= 0){
                 avgSecForClass = '0.0';
             }
 
             var avgSecClass = config.systemSecurityClassPrefix + avgSecForClass.toString().replace('.', '-');
 
-            tableRowData.system = rowData[0];
-            tableRowData.jumps = rowData[1];
+            tableRowData.jumps = {
+                value: routeData.routeJumps,
+                formatted: routeData.routeJumps
+            };
+
             tableRowData.avgTrueSec = {
                 value: avgSec,
                 formatted: '<span class="' + avgSecClass + '">' + avgSec + '</span>'
             };
             tableRowData.route = jumpData.join(' ');
-
         }
 
         return tableRowData;
@@ -255,107 +421,202 @@ define([
 
     /**
      * get the route finder moduleElement
-     * @param systemData
      * @returns {*}
      */
-    var getModule = function(systemData){
+    var getModule = function(){
 
-        var moduleElement = null;
+        // create new module container
+        var moduleElement = $('<div>', {
+            class: [config.moduleClass, config.systemRouteModuleClass].join(' ')
+        });
 
-        // load trade routes for k-space systems
-        if(systemData.type.id === 2){
+        // headline toolbar icons
+        var headlineToolbar  = $('<h5>', {
+            class: 'pull-right'
+        }).append(
+            $('<i>', {
+                class: ['fa', 'fa-fw', 'fa-search', config.systemModuleHeadlineIcon, config.systemModuleHeadlineIconSearch].join(' '),
+                title: 'find&nbsp;route'
+            }).attr('data-html', 'true').attr('data-toggle', 'tooltip'),
+            $('<i>', {
+                class: ['fa', 'fa-fw', 'fa-refresh', config.systemModuleHeadlineIcon, config.systemModuleHeadlineIconRefresh].join(' '),
+                title: 'refresh&nbsp;all'
+            }).attr('data-html', 'true').attr('data-toggle', 'tooltip')
+        );
 
-            // create new module container
-            moduleElement = $('<div>', {
-                class: [config.moduleClass, config.systemRouteModuleClass].join(' ')
-            });
+        moduleElement.append(headlineToolbar);
 
+        // headline
+        var headline = $('<h5>', {
+            class: 'pull-left',
+            text: 'Routes'
+        });
 
-            // headline toolbar icons
-            var headlineToolbar  = $('<h5>', {
-                class: 'pull-right'
-            }).append(
-                    $('<i>', {
-                        class: ['fa', 'fa-fw', 'fa-search', config.systemModuleHeadlineIcon].join(' '),
-                        title: 'find route'
-                    }).attr('data-toggle', 'tooltip')
-                );
+        moduleElement.append(headline);
 
-            moduleElement.append(headlineToolbar);
+        // crate new route table
+        var table = $('<table>', {
+            class: ['compact', 'stripe', 'order-column', 'row-border', config.systemInfoRoutesTableClass].join(' ')
+        });
 
-            // headline
-            var headline = $('<h5>', {
-                class: 'pull-left',
-                text: 'Routes'
-            });
+        moduleElement.append( $(table) );
 
-            moduleElement.append(headline);
-
-            // init tooltips
-            var tooltipElements = moduleElement.find('[data-toggle="tooltip"]');
-            tooltipElements.tooltip({
-                container: 'body'
-            });
-
-            // crate new route table
-            var table = $('<table>', {
-                class: ['compact', 'stripe', 'order-column', 'row-border', config.systemInfoRoutesTableClass].join(' ')
-            });
-
-            moduleElement.append( $(table) );
-
-            // init empty table
-            var routesTable = table.DataTable( {
-                paging: false,
-                ordering: true,
-                order: [ 1, 'asc' ],
-                info: false,
-                searching: false,
-                hover: false,
-                autoWidth: false,
-                language: {
-                    emptyTable:  'No routes added'
-                },
-                columnDefs: [
-                    {
-                        targets: 0,
-                        orderable: true,
-                        title: 'system&nbsp;&nbsp;&nbsp;',
-                        data: 'system'
-                    },{
-                        targets: 1,
-                        orderable: true,
-                        title: 'jumps&nbsp;&nbsp;&nbsp',
-                        width: '40px',
-                        class: 'text-right',
-                        data: 'jumps'
-                    },{
-                        targets: 2,
-                        orderable: true,
-                        title: '&#216;&nbsp;&nbsp;&nbsp',
-                        width: '25px',
-                        class: 'text-right',
-                        data: 'avgTrueSec',
-                        render: {
-                            _: 'formatted',
-                            sort: 'value'
-                        }
-                    },{
-                        targets: 3,
-                        orderable: false,
-                        title: 'route',
-                        data: 'route'
+        // init empty table
+        var routesTable = table.DataTable( {
+            paging: false,
+            ordering: true,
+            order: [ 1, 'asc' ],
+            info: false,
+            searching: false,
+            hover: false,
+            autoWidth: false,
+            rowId: 'systemTo',
+            language: {
+                emptyTable:  'No routes added'
+            },
+            columnDefs: [
+                {
+                    targets: 0,
+                    orderable: true,
+                    title: 'system&nbsp;&nbsp;&nbsp;',
+                    data: 'systemTo'
+                },{
+                    targets: 1,
+                    orderable: true,
+                    title: '<span title="jumps" data-toggle="tooltip"><i class="fa fa-arrows-h"></i>&nbsp;&nbsp;</span>',
+                    width: '18px',
+                    class: 'text-right',
+                    data: 'jumps',
+                    render: {
+                        _: 'formatted',
+                        sort: 'value'
                     }
-                ],
-                data: [] // will be added dynamic
-            });
+                },{
+                    targets: 2,
+                    orderable: true,
+                    title: '<span title="average security" data-toggle="tooltip">&#216;&nbsp;&nbsp;</span>',
+                    width: '15px',
+                    class: 'text-right',
+                    data: 'avgTrueSec',
+                    render: {
+                        _: 'formatted',
+                        sort: 'value'
+                    }
+                },{
+                    targets: 3,
+                    orderable: false,
+                    title: 'route',
+                    data: 'route'
+                },{
+                    targets: 4,
+                    title: '',
+                    orderable: false,
+                    searchable: false,
+                    width: '10px',
+                    class: ['text-center', config.sigTableActionCellClass].join(' '),
+                    data: 'reload',
+                    render: {
+                        _: 'button'
+                    },
+                    createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+                        var tempTableApi = this.api();
 
-        }
+                        $(cell).on('click', function(e) {
+                            // get current row data (important!)
+                            // -> "rowData" param is not current state, values are "on createCell()" state
+                            rowData = tempTableApi.row( $(cell).parents('tr')).data();
+
+                            var context = {
+                                moduleElement: moduleElement,
+                                dataTable: tempTableApi
+                            };
+
+                            var requestData = {
+                                routeData: [{
+                                    mapIds: rowData.mapIds,
+                                    systemFrom: rowData.systemFrom,
+                                    systemTo: rowData.systemTo,
+                                    stargates: rowData.stargates ? 1 : 0,
+                                    jumpbridges: rowData.jumpbridges ? 1 : 0,
+                                    wormholes: rowData.wormholes ? 1 : 0,
+                                    wormholesReduced: rowData.wormholesReduced ? 1 : 0,
+                                    wormholesCritical: rowData.wormholesCritical ? 1 : 0
+                                }]
+                            };
+
+                            getRouteData(requestData, context, callbackAddRouteRow);
+                        });
+                    }
+                },{
+                    targets: 5,
+                    title: '',
+                    orderable: false,
+                    searchable: false,
+                    width: '10px',
+                    class: ['text-center', config.sigTableActionCellClass].join(' '),
+                    data: 'delete',
+                    render: {
+                        _: 'button'
+                    },
+                    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 route',
+                            btnOkClass: 'btn btn-sm btn-danger',
+                            btnOkLabel: 'delete',
+                            btnOkIcon: 'fa fa-fw fa-close',
+                            onConfirm : function(e, target){
+                                var deleteRowElement = $(cell).parents('tr');
+                                tempTableElement.api().rows(deleteRowElement).remove().draw();
+                            }
+                        };
+
+                        // init confirmation dialog
+                        $(cell).confirmation(confirmationSettings);
+                    }
+                }
+            ],
+            drawCallback: function(settings){
+
+                var animationRows = this.api().rows().nodes().to$().filter(function() {
+                    return (
+                        $(this).data('animationStatus') ||
+                        $(this).data('animationTimer')
+                    );
+                });
+
+                for(var i = 0; i < animationRows.length; i++){
+                    $(animationRows[i]).pulseTableRow($(animationRows[i]).data('animationStatus'));
+                    $(animationRows[i]).removeData('animationStatus');
+                }
+
+            },
+            data: [] // will be added dynamic
+        });
+
+        // init tooltips for this module
+        var tooltipElements = moduleElement.find('[data-toggle="tooltip"]');
+        tooltipElements.tooltip({
+            container: 'body'
+        });
 
         return moduleElement;
     };
 
-    var initModule = function(moduleElement, systemData){
+    /**
+     * init route module
+     * -> request route path fore "default" trade hub systems
+     * @param moduleElement
+     * @param mapId
+     * @param systemData
+     */
+    var initModule = function(moduleElement, mapId, systemData){
 
         var systemFrom = systemData.name;
         var systemsTo = ['Jita', 'Amarr', 'Rens', 'Dodixie'];
@@ -364,13 +625,16 @@ define([
 
         var routesTable = routesTableElement.DataTable();
 
-        // init system search dialog -------------------------------------------------------------------------------
-
-        moduleElement.find('.' + config.systemModuleHeadlineIcon).on('click', function(e){
-            // show "find route" dialog
+        // init refresh routes --------------------------------------------------------------------
+        moduleElement.find('.' + config.systemModuleHeadlineIconRefresh).on('click', function(e){
+            updateRoutesTable(moduleElement, routesTable);
+        });
 
+        // init search routes dialog --------------------------------------------------------------
+        moduleElement.find('.' + config.systemModuleHeadlineIconSearch).on('click', function(e){
             var dialogData = {
                 moduleElement: moduleElement,
+                mapId: mapId,
                 systemFrom: systemFrom,
                 dataTable: routesTable
             };
@@ -378,23 +642,40 @@ define([
             showFindRouteDialog(dialogData);
         });
 
-        // fill routesTable with data ------------------------------------------------------------------------------
+        // fill routesTable with data -------------------------------------------------------------
         var requestRouteData = [];
+        var currentTimestamp = Util.getServerTime().getTime();
 
         for(var i = 0; i < systemsTo.length; i++){
             var systemTo = systemsTo[i];
 
             if(systemFrom !== systemTo){
-                var cacheKey = systemFrom.toUpperCase() + '_' + systemTo.toUpperCase();
+                var cacheKey = 'route_' + mapId + '_' + systemFrom.toUpperCase() + '_' + systemTo.toUpperCase();
 
-                if(cache.systemRoutes.hasOwnProperty(cacheKey)){
-                    addRow(routesTable, cache.systemRoutes[cacheKey]);
+                if(
+                    cache.systemRoutes.hasOwnProperty(cacheKey) &&
+                    Math.round(
+                        ( currentTimestamp - (new Date( cache.systemRoutes[cacheKey].updated * 1000).getTime())) / 1000
+                    ) <= config.routeCacheTTL
+                ){
+                    // route data is cached (client side)
+                    var context = {
+                        dataTable: routesTable
+                    };
+
+                    addRow(context, cache.systemRoutes[cacheKey].data);
                 }else{
                     // get route data
 
                     requestRouteData.push({
+                        mapIds: [mapId],
                         systemFrom: systemFrom,
-                        systemTo: systemTo
+                        systemTo: systemTo,
+                        stargates: 1,
+                        jumpbridges: 1,
+                        wormholes: 1,
+                        wormholesReduced: 1,
+                        wormholesCritical: 1
                     });
                 }
             }
@@ -406,16 +687,22 @@ define([
                 moduleElement: moduleElement,
                 dataTable: routesTable
             };
-            getRouteData(requestRouteData, contextData, callbackAddRouteRow);
+
+            var requestData = {
+                routeData: requestRouteData
+            };
+
+            getRouteData(requestData, contextData, callbackAddRouteRow);
         }
     };
 
 
     /**
      * updates an dom element with the system route module
+     * @param mapId
      * @param systemData
      */
-    $.fn.drawSystemRouteModule = function(systemData){
+    $.fn.drawSystemRouteModule = function(mapId, systemData){
 
         var parentElement = $(this);
 
@@ -429,7 +716,7 @@ define([
                     duration: Init.animationSpeed.mapModule,
                     delay: Init.animationSpeed.mapModule,
                     complete: function(){
-                        initModule(moduleElement, systemData);
+                        initModule(moduleElement, mapId, systemData);
                     }
                 });
             }
@@ -444,12 +731,12 @@ define([
                 complete: function(tempElement){
                     $(tempElement).remove();
 
-                    moduleElement = getModule(systemData);
+                    moduleElement = getModule();
                     showModule(moduleElement);
                 }
             });
         }else{
-            moduleElement = getModule(systemData);
+            moduleElement = getModule();
             showModule(moduleElement);
         }
 

js/app/ui/system_signature.js

@@ -43,16 +43,10 @@ define([
         sigTableEditSigDescriptionTextarea: 'pf-sig-table-edit-desc-text',      // class for editable fields (sig description)
         sigTableCreatedCellClass: 'pf-sig-table-created',                       // class for "created" cells
         sigTableUpdatedCellClass: 'pf-sig-table-updated',                       // class for "updated" cells
-        sigTableActionButtonClass: 'pf-sig-table-action-button',                // class for row action button
 
         sigTableCounterClass: 'pf-table-counter-cell',                          // class for "counter" cells
         sigTableActionCellClass: 'pf-table-action-cell',                        // class for "action" cells
 
-
-        // animation
-        animationPulseSuccessClass: 'pf-animation-pulse-success',               // animation class
-        animationPulseWarningClass: 'pf-animation-pulse-warning',               // animation class
-
         // xEditable
         editableDiscriptionInputClass: 'pf-editable-description'                // class for "description" textarea
     };
@@ -207,7 +201,7 @@ define([
             for(var j = 0; j < tableData.length; j++){
                 if(signatureData[i].id === tableData[j].id){
 
-                    // check if row has updated
+                    // check if row was updated
                     if(signatureData[i].updated.updated > tableData[j].updated.updated){
 
                         // row element to remove
@@ -319,36 +313,6 @@ define([
         }
     };
 
-    /**
-     * highlight jquery elements
-     * add/remove css class for keyframe animation
-     * @returns {any|JQuery|*}
-     */
-    $.fn.pulseTableRow = function(status){
-
-        var animationClass = '';
-        switch(status){
-            case 'added':
-                animationClass = config.animationPulseSuccessClass;
-                break;
-            case 'changed':
-                animationClass = config.animationPulseWarningClass;
-                break;
-        }
-
-        return this.each(function(){
-            var element = $(this);
-            element.addClass( animationClass );
-
-            var timer = setTimeout(
-                function() {
-                    element.removeClass( animationClass );
-
-                    clearTimeout( timer );
-                }, 3000);
-        });
-    };
-
     /**
      * update Progressbar for all scanned signatures in a system
      * @param options
@@ -1530,7 +1494,7 @@ define([
 
                 // action icon -------------------------------------------------------------------------------------
 
-                var actionButton = '<i class="fa ' + options.actionClass + ' ' + config.sigTableActionButtonClass + '"></i>';
+                var actionButton = '<i class="fa ' + options.actionClass + '"></i>';
                 tempData.action = {
                     action: options.action,
                     button: actionButton
@@ -1684,7 +1648,6 @@ define([
                         sort: 'action'
                     },
                     createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
-
                         var tempTableElement = this;
                         var rowElement = $(cell).parents('tr');
 
@@ -1747,7 +1710,7 @@ define([
                                     btnCancelClass: 'btn btn-sm btn-default',
                                     btnCancelLabel: 'cancel',
                                     btnCancelIcon: 'fa fa-fw fa-ban',
-                                    title: 'Delete signature',
+                                    title: 'delete signature',
                                     btnOkClass: 'btn btn-sm btn-danger',
                                     btnOkLabel: 'delete',
                                     btnOkIcon: 'fa fa-fw fa-close',

js/app/util.js

@@ -41,12 +41,17 @@ define([
 
         // map module
         mapModuleId: 'pf-map-module',                                           // id for main map module
-        mapTabBarId: 'pf-map-tabs'                                              // id for map tab bar
+        mapTabBarId: 'pf-map-tabs',                                             // id for map tab bar
+
+        // animation
+        animationPulseSuccessClass: 'pf-animation-pulse-success',               // animation class
+        animationPulseWarningClass: 'pf-animation-pulse-warning'                // animation class
 
     };
 
     var stopTimerCache = {};                                                    // cache for stopwatch timer
 
+    var animationTimerCache = {};                                               // cache for table row animation timeout
 
     /*
      *  ===========================================================================================================
@@ -471,7 +476,7 @@ define([
         return this.each(function(){
 
             var tooltipElements = $(this).find('[title]');
-            tooltipElements.tooltip({
+            tooltipElements.tooltip('destroy').tooltip({
                 container:  this,
                 delay: 100
             });
@@ -727,6 +732,52 @@ define([
         });
     };
 
+    /**
+     * highlight jquery elements
+     * add/remove css class for keyframe animation
+     * @returns {any|JQuery|*}
+     */
+    $.fn.pulseTableRow = function(status, clear){
+
+        var animationClass = '';
+        switch(status){
+            case 'added':
+                animationClass = config.animationPulseSuccessClass;
+                break;
+            case 'changed':
+                animationClass = config.animationPulseWarningClass;
+                break;
+        }
+
+        var clearTimer =  function(element) {
+            element.removeClass( animationClass );
+            var currentTimer = element.data('animationTimer');
+
+            if( animationTimerCache.hasOwnProperty(currentTimer) ){
+                clearTimeout( currentTimer );
+                delete animationTimerCache[currentTimer];
+                element.removeData('animationTimer');
+            }
+        };
+
+        return this.each(function(){
+            var element = $(this);
+
+            if( element.hasClass(animationClass) ){
+                // clear timer -> set new timer
+                clearTimer(element);
+            }
+
+            if(clear !== true){
+                element.addClass( animationClass );
+                var timer = setTimeout(clearTimer, 1500, element);
+                element.data('animationTimer', timer);
+                animationTimerCache[timer] = true;
+            }
+
+        });
+    };
+
     /*
      *  ===========================================================================================================
      *   Util functions that are global available for all modules

public/fonts/fontawesome-webfont.svg

@@ -169,7 +169,7 @@
 <glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf092;" d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4 q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4 t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16 q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
 <glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
 <glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
@@ -178,7 +178,7 @@
 <glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
 <glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf09b;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24 q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5 t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12 q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
 <glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
 <glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
 <glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
@@ -484,7 +484,7 @@
 <glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
 <glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf1ed;" d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246 q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598 q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
-<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
+<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M441 864q32 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640 q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
 <glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
 <glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
@@ -641,15 +641,45 @@
 <glyph unicode="&#xf293;" d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5 t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
 <glyph unicode="&#xf294;" horiz-adv-x="1024" d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
 <glyph unicode="&#xf295;" d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5 t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf296;" horiz-adv-x="1792" />
-<glyph unicode="&#xf297;" horiz-adv-x="1792" />
-<glyph unicode="&#xf298;" horiz-adv-x="1792" />
-<glyph unicode="&#xf299;" horiz-adv-x="1792" />
-<glyph unicode="&#xf29a;" horiz-adv-x="1792" />
-<glyph unicode="&#xf29b;" horiz-adv-x="1792" />
-<glyph unicode="&#xf29c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf29d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf29e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf296;" horiz-adv-x="1792" d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+<glyph unicode="&#xf297;" horiz-adv-x="1792" d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111 q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+<glyph unicode="&#xf298;" d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14 t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+<glyph unicode="&#xf299;" horiz-adv-x="1792" d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57 q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285 q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+<glyph unicode="&#xf29a;" horiz-adv-x="1792" d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42 q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298 t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf29b;" d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300 l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+<glyph unicode="&#xf29c;" d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5 t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5 t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5 t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf29d;" horiz-adv-x="1408" d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457 q-67 -192 -92 -234q-16 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521 q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661 q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+<glyph unicode="&#xf29e;" horiz-adv-x="2304" d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10 t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5 t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5 h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96 t9.5 -70.5z" />
+<glyph unicode="&#xf2a0;" horiz-adv-x="1408" d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5 q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127 l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272 t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249 q-18 -19 -45 -19z" />
+<glyph unicode="&#xf2a1;" horiz-adv-x="2176" d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352 q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864 q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136 t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56 t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136 t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+<glyph unicode="&#xf2a2;" horiz-adv-x="1792" d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72 t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45 t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4 q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+<glyph unicode="&#xf2a3;" horiz-adv-x="2304" d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55 q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5 q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101 q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35 q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5 q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+<glyph unicode="&#xf2a4;" horiz-adv-x="1792" d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19 t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74 t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233 l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+<glyph unicode="&#xf2a5;" d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2 q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10 q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf2a6;" horiz-adv-x="1535" d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5 l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5 q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9 q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+<glyph unicode="&#xf2a7;" horiz-adv-x="1664" d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37 t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38 l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147l-4 -4t-5 -4q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148q-34 23 -76 23 q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26l-12 224 q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+<glyph unicode="&#xf2a8;" horiz-adv-x="1792" d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5 q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841 q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5 q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+<glyph unicode="&#xf2a9;" horiz-adv-x="1280" d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5 q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+<glyph unicode="&#xf2aa;" d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5 q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 43 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="&#xf2ab;" d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114 q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5 t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="&#xf2ac;" horiz-adv-x="1664" d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35 q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5 t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+<glyph unicode="&#xf2ad;" d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115 q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15 t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf2ae;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b0;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b1;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b2;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b3;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b4;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b5;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b6;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b7;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b8;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2b9;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2ba;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2bb;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2bc;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2bd;" horiz-adv-x="1792" />
+<glyph unicode="&#xf2be;" horiz-adv-x="1792" />
 <glyph unicode="&#xf500;" horiz-adv-x="1792" />
 </font>
 </defs></svg> 

public/js/v1.0.0RC3/app.js

@@ -39,7 +39,7 @@ requirejs.config({
         xEditable: 'lib/bootstrap-editable.min',                        // v1.5.1 X-editable - in placed editing
         morris: 'lib/morris.min',                                       // v0.5.1 Morris.js - graphs and charts
         raphael: 'lib/raphael-min',                                     // v2.1.2 Raphaël - required for morris (dependency)
-        bootbox: 'lib/bootbox.min',                                     // v4.3.0 Bootbox.js - custom dialogs
+        bootbox: 'lib/bootbox.min',                                     // v4.4.0 Bootbox.js - custom dialogs - http://bootboxjs.com/
         easyPieChart: 'lib/jquery.easypiechart.min',                    // v2.1.6 Easy Pie Chart - HTML 5 pie charts - http://rendro.github.io/easy-pie-chart/
         dragToSelect: 'lib/jquery.dragToSelect',                        // v1.1 Drag to Select - http://andreaslagerkvist.com/jquery/drag-to-select/
         hoverIntent: 'lib/jquery.hoverIntent.minified',                 // v1.8.0 Hover intention - http://cherne.net/brian/resources/jquery.hoverIntent.html

public/js/v1.0.0RC3/app/config/signature_type.js

@@ -192,13 +192,14 @@ define([], function() {
                 },
                 4: {    // Gas
                     1: 'Barren Perimeter Reservoir', //*
-                    2: 'Token Perimeter Reservoir', //*
-                    3: 'Sizeable Perimeter Reservoir', //*
-                    4: 'Ordinary Perimeter Reservoir', //*
-                    5: 'Bountiful Frontier Reservoir', //*
-                    6: 'Instrumental Core Reservoir', //*
-                    7: 'Vital Core Reservoir', //*
-                    8: 'Minor Perimeter Reservoir' //*
+                    2: 'Minor Perimeter Reservoir', //*
+                    3: 'Ordinary Perimeter Reservoir', //*
+                    4: 'Sizeable Perimeter Reservoir', //*
+                    5: 'Token Perimeter Reservoir', //*
+                    6: 'Bountiful Frontier Reservoir', //*
+                    7: 'Vast Frontier Reservoir', //*
+                    8: 'Instrumental Core Reservoir', //*
+                    9: 'Vital Core Reservoir' //*
                 },
                 5: {    // Wormhole
                     1: 'D792 - HS',
@@ -206,9 +207,16 @@ define([], function() {
                     3: 'Z142 - 0.0'
                 },
                 6: {    // ORE
-                    1: 'Ordinary Perimeter Deposit', //*
-                    2: 'Common Perimeter Deposit', //*
-                    3: 'Rarified Core Deposit' //*
+                    1: 'Average Frontier Deposit', //*
+                    2: 'Unexceptional Frontier Deposit', //*
+                    3: 'Uncommon Core Deposit', //*
+                    4: 'Ordinary Perimeter Deposit', //*
+                    5: 'Common Perimeter Deposit', //*
+                    6: 'Exceptional Core Deposit', //*
+                    7: 'Infrequent Core Deposit', //*
+                    8: 'Unusual Core Deposit', //*
+                    9: 'Rarified Core Deposit', //*
+                    10: 'Isolated Core Deposit' //*
                 },
                 7: {    // Ghost
 
@@ -230,14 +238,15 @@ define([], function() {
                     2: 'Unsecured Core Emergence' //*
                 },
                 4: {    // Gas
-                    1: 'Token Perimeter Reservoir', //*
+                    1: 'Barren Perimeter Reservoir', //*
                     2: 'Minor Perimeter Reservoir', //*
-                    3: 'Sizeable Perimeter Reservoir', //*
-                    4: 'Ordinary Perimeter Reservoir', //*
-                    5: 'Bountiful Frontier Reservoir', //*
-                    6: 'Vast Frontier Reservoir', //*
-                    7: 'Instrumental Core Reservoir', //*
-                    8: 'Vital Core Reservoir' //*
+                    3: 'Ordinary Perimeter Reservoir', //*
+                    4: 'Sizeable Perimeter Reservoir', //*
+                    5: 'Token Perimeter Reservoir', //*
+                    6: 'Bountiful Frontier Reservoir', //*
+                    7: 'Vast Frontier Reservoir', //*
+                    8: 'Instrumental Core Reservoir', //*
+                    9: 'Vital Core Reservoir' //*
                 },
                 5: {    // Wormhole
                     1: 'D792 - HS',

public/js/v1.0.0RC3/app/map/map.js

@@ -869,6 +869,7 @@ define([
         // no visual effects in IGB (glitches)
         if(
             systemElements.length === 0 ||
+            systemElements.length > 20 ||
             endpointElements.length === 0 ||
             CCP.isInGameBrowser() === true
         ){
@@ -1301,30 +1302,36 @@ define([
             dataType: 'json',
             //context: connection
             context: {
-              connection: connection,
-              mapId: mapId
+                connection: connection,
+                map: map,
+                mapId: mapId
             }
         }).done(function(newConnectionData){
 
-            // update connection data e.g. "scope" has auto detected
-            connection = updateConnection(this.connection, connectionData, newConnectionData);
+            if( !$.isEmptyObject(newConnectionData) ){
+                // update connection data e.g. "scope" has auto detected
+                connection = updateConnection(this.connection, connectionData, newConnectionData);
 
-            // new connection should be cached immediately!
-            updateConnectionCache(this.mapId, connection);
+                // new connection should be cached immediately!
+                updateConnectionCache(this.mapId, connection);
 
-            // connection scope
-            var scope = Util.getScopeInfoForConnection(newConnectionData.scope, 'label');
+                // connection scope
+                var scope = Util.getScopeInfoForConnection(newConnectionData.scope, 'label');
 
-            var title = 'New connection established';
-            if(connectionData.id > 0){
-                title = 'Connection switched';
+                var title = 'New connection established';
+                if(connectionData.id > 0){
+                    title = 'Connection switched';
+                }
+
+                Util.showNotify({title: title, text: 'Scope: ' + scope, type: 'success'});
+            }else{
+                // some save errors
+                this.map.detach(this.connection, {fireEvent: false});
             }
 
-            Util.showNotify({title: title, text: 'Scope: ' + scope, type: 'success'});
         }).fail(function( jqXHR, status, error) {
-
             // remove this connection from map
-            this._jsPlumb.instance.detach(this);
+            this.map.detach(this.connection, {fireEvent: false});
 
             var reason = status + ' ' + error;
             Util.showNotify({title: jqXHR.status + ': saveConnection', text: reason, type: 'warning'});

public/js/v1.0.0RC3/app/module_map.js

@@ -129,7 +129,7 @@ define([
         firstCell.drawSignatureTableModule(currentSystemData.systemData);
 
         // draw system routes module
-        secondCell.drawSystemRouteModule(currentSystemData.systemData);
+        secondCell.drawSystemRouteModule(currentSystemData.mapId, currentSystemData.systemData);
 
         // draw system killboard module
         secondCell.drawSystemKillboardModule(currentSystemData.systemData);
@@ -153,7 +153,7 @@ define([
             var clickY = e.pageY - posY;
 
             // check for top-left click
-            if(clickX <= 6 && clickY <= 6){
+            if(clickX <= 8 && clickY <= 8){
 
                 // remember height
                 if(! moduleElement.data('origHeight')){
@@ -175,7 +175,7 @@ define([
                     });
                 }else{
                     moduleElement.velocity('finish').velocity({
-                        height: [ '40px', [ 400, 15 ] ]
+                        height: [ '36px', [ 400, 15 ] ]
                     },{
                         duration: 400,
                         easing: 'easeInSine',

public/js/v1.0.0RC3/app/ui/form_element.js

@@ -10,6 +10,23 @@ define([
 
     'use strict';
 
+    /**
+     * init a select element as "select2" for map selection
+     */
+    $.fn.initMapSelect = function(){
+        var selectElement = $(this);
+
+        $.when(
+            selectElement.select2({
+                dropdownParent: 'body',
+                theme: 'pathfinder',
+                maximumSelectionLength: 5
+            })
+        );
+    };
+
+
+
     /**
      * init a select element as an ajax based "select2" object for system search
      * @param options
@@ -114,7 +131,7 @@ define([
                 theme: 'pathfinder',
                 minimumInputLength: 2,
                 templateResult: formatResultData,
-                placeholder: 'Systemname',
+                placeholder: 'System name',
                 allowClear: true,
                 escapeMarkup: function (markup) {
                     // let our custom formatter work
@@ -252,26 +269,6 @@ define([
             });
         });
 
-
     };
 
-
 });
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

public/js/v1.0.0RC3/app/ui/system_route.js

@@ -14,19 +14,25 @@ define([
         // module info
         moduleClass: 'pf-module',                                               // class for each module
 
+        routeCacheTTL: 10,                                                      // route cache timer (client) in seconds
+
         // system route module
         systemRouteModuleClass: 'pf-system-route-module',                       // class  for this module
 
         // headline toolbar
         systemModuleHeadlineIcon: 'pf-module-icon-button',                      // class for toolbar icons in the head
+        systemModuleHeadlineIconSearch: 'pf-module-icon-button-search',         // class for "search" icon
+        systemModuleHeadlineIconRefresh: 'pf-module-icon-button-refresh',       // class for "refresh" icon
 
         systemSecurityClassPrefix: 'pf-system-security-',                       // prefix class for system security level (color)
 
         // dialog
         routeDialogId: 'pf-route-dialog',                                       // id for route dialog
         systemDialogSelectClass: 'pf-system-dialog-select',                     // class for system select Element
-        systemInfoRoutesTableRowPrefix: 'pf-system-info-routes-row-',           // prefix class for a row in the route table
-        systemInfoRoutesTableClass: 'pf-system-route-table'                     // class for route tables
+        systemInfoRoutesTableClass: 'pf-system-route-table',                    // class for route tables
+        mapSelectId: 'pf-route-dialog-map-select',                              // id for "map" select
+
+        sigTableActionCellClass: 'pf-table-action-cell'                         // class for "action" cells
 
     };
 
@@ -42,41 +48,99 @@ define([
      */
     var callbackAddRouteRow = function(context, routesData){
 
-        for(var i = 0; i < routesData.length; i++){
-            var routeData = routesData[i];
+        if(routesData.length > 0){
+            for(var i = 0; i < routesData.length; i++){
+                var routeData = routesData[i];
 
-            // format routeData
-            var rowData = formatRouteData(routeData);
+                // format routeData
+                var rowData = formatRouteData(routeData);
 
-            if(rowData.route){
-                var cacheKey = routeData.route[0].system + '_' + routeData.route[ routeData.route.length - 1 ].system;
+                if(rowData.route){
+                    var cacheKey = routeData.systemFrom.toLowerCase() + '_' + routeData.systemTo.toLowerCase();
 
-                // update route cache
-                cache.systemRoutes[cacheKey] = rowData;
+                    // update route cache
+                    cache.systemRoutes[cacheKey] = {
+                        data: rowData,
+                        updated: Util.getServerTime().getTime() / 1000
+                    };
 
-                addRow(context.dataTable, rowData);
-            }else{
-                // route not possible
-                Util.showNotify({title: 'Route not found', type: 'warning'});
+                    var rowElement = addRow(context, rowData);
+
+                    rowElement.initTooltips();
+                }
             }
+
+            // redraw dataTable
+            context.dataTable.draw();
         }
     };
 
     /**
-     * add a new dataTable row to the jump table
-     * @param dataTable
+     * add a new dataTable row to the routes table
+     * @param context
      * @param rowData
+     * @returns {*}
      */
-    var addRow = function(dataTable, rowData){
-        var rowClass = config.systemInfoRoutesTableRowPrefix + dataTable.rows().data().length;
+    var addRow = function(context, rowData){
+        var dataTable = context.dataTable;
+        var rowElement = null;
+        var row = null;
+        var animationStatus = 'changed';
 
-        // add new row
-        var rowElement = dataTable.row.add( rowData ).draw().nodes().to$();
-        rowElement.addClass( rowClass );
+        // search for an existing row (e.g. on mass "table refresh" [all routes])
+        // get rowIndex where column 0 (equals to "systemTo") matches rowData.systemTo
+        var indexes = dataTable.rows().eq(0).filter( function (rowIdx) {
+            return (dataTable.cell(rowIdx, 0 ).data() === rowData.systemTo);
+        });
 
-        rowElement.find('i').tooltip();
+        if(indexes.length > 0){
+            // update row with FIRST index
+            // -> systemFrom should be unique!
+            row = dataTable.row( parseInt(indexes[0]) );
+            // update row data
+            row.data(rowData);
+        }else{
+            // no existing route found -> add new row
+            row = dataTable.row.add( rowData );
+
+            animationStatus = 'added';
+        }
+
+        if(row.length > 0){
+            rowElement = row.nodes().to$();
+
+            if(animationStatus !== null){
+                rowElement.data('animationStatus', animationStatus);
+            }
+        }
+
+        return rowElement;
     };
 
+    /**
+     * update complete routes table (refresh all)
+     * @param moduleElement
+     * @param dataTable
+     */
+    var updateRoutesTable = function(moduleElement, dataTable){
+        var context = {
+            moduleElement: moduleElement,
+            dataTable: dataTable
+        };
+
+        var routeData = [];
+        dataTable.rows().every( function() {
+
+            var data = this.data();
+            routeData.push({
+                mapIds: data.mapIds,
+                systemFrom: data.systemFrom,
+                systemTo: data.systemTo
+            });
+        } );
+
+        getRouteData({routeData: routeData}, context, callbackAddRouteRow);
+    };
 
     /**
      * show route dialog. User can search for systems and jump-info for each system is added to a data table
@@ -84,10 +148,23 @@ define([
      */
     var showFindRouteDialog = function(dialogData){
 
+        var mapSelectOptions = [];
+        var currentMapData = Util.getCurrentMapData();
+        if(currentMapData !== false){
+            for(var i = 0; i < currentMapData.length; i++){
+                mapSelectOptions.push({
+                    id: currentMapData[i].config.id,
+                    name: currentMapData[i].config.name,
+                    selected: (dialogData.mapId === currentMapData[i].config.id)
+                });
+            }
+        }
         var data = {
             id: config.routeDialogId,
             selectClass: config.systemDialogSelectClass,
-            systemFrom: dialogData.systemFrom
+            mapSelectId: config.mapSelectId,
+            systemFrom: dialogData.systemFrom,
+            mapSelectOptions: mapSelectOptions
         };
 
         requirejs(['text!templates/dialog/route.html', 'mustache'], function(template, Mustache) {
@@ -98,8 +175,9 @@ define([
             $.fn.modal.Constructor.prototype.enforceFocus = function() {};
 
             var findRouteDialog = bootbox.dialog({
-                title: 'Search shortest route',
+                title: 'Route finder',
                 message: content,
+                show: false,
                 buttons: {
                     close: {
                         label: 'cancel',
@@ -130,55 +208,112 @@ define([
                                 return false;
                             }
 
-
-                            var requestRouteData = [{
-                                systemFrom: dialogData.systemFrom,
-                                systemTo: routeDialogData.systemTo
-                            }];
-
-
-                            var contextData = {
+                            var context = {
                                 moduleElement: dialogData.moduleElement,
                                 dataTable: dialogData.dataTable
                             };
 
-                            getRouteData(requestRouteData, contextData, callbackAddRouteRow);
+                            var requestData = {
+                                routeData: [{
+                                    mapIds: routeDialogData.mapIds,
+                                    systemFrom: dialogData.systemFrom,
+                                    systemTo: routeDialogData.systemTo,
+                                    stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt( routeDialogData.stargates ) : 0,
+                                    jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt( routeDialogData.jumpbridges ) : 0,
+                                    wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt( routeDialogData.wormholes ) : 0,
+                                    wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt( routeDialogData.wormholesReduced ) : 0,
+                                    wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0
+                                }]
+                            };
+
+                            getRouteData(requestData, context, callbackAddRouteRow);
                         }
                     }
                 }
             });
 
+            findRouteDialog.on('show.bs.modal', function(e) {
+                findRouteDialog.initTooltips();
+
+                // init some dialog/form observer
+                setDialogObserver( $(this) );
+
+                // init map select ----------------------------------------------------------------
+                var mapSelect = $(this).find('#' + config.mapSelectId);
+                mapSelect.initMapSelect();
+            });
+
 
-            // init dialog
             findRouteDialog.on('shown.bs.modal', function(e) {
 
-                var modalContent = $('#' + config.routeDialogId);
-
-                // init system select live  search  - some delay until modal transition has finished
-                var selectElement = modalContent.find('.' + config.systemDialogSelectClass);
-                selectElement.delay(240).initSystemSelect({key: 'name'});
+                // init system select live  search ------------------------------------------------
+                // -> add some delay until modal transition has finished
+                var systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
+                systemTargetSelect.delay(240).initSystemSelect({key: 'name'});
             });
+
+            // show dialog
+            findRouteDialog.modal('show');
         });
     };
 
+    /**
+     * set event observer for route finder dialog
+     * @param routeDialog
+     */
+    var setDialogObserver = function(routeDialog){
+        var wormholeCheckbox = routeDialog.find('input[type="checkbox"][name="wormholes"]');
+        var wormholeReducedCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesReduced"]');
+        var wormholeCriticalCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesCritical"]');
+
+        // store current "checked" state for each box ---------------------------------------------
+        var storeCheckboxStatus = function(){
+            wormholeReducedCheckbox.data('selectState', wormholeReducedCheckbox.prop('checked'));
+            wormholeCriticalCheckbox.data('selectState', wormholeCriticalCheckbox.prop('checked'));
+        };
+
+        // on wormhole checkbox change ------------------------------------------------------------
+        var onWormholeCheckboxChange = function(){
+
+            if( $(this).is(':checked') ){
+                wormholeReducedCheckbox.prop('disabled', false);
+                wormholeCriticalCheckbox.prop('disabled', false);
+
+                wormholeReducedCheckbox.prop('checked', wormholeReducedCheckbox.data('selectState'));
+                wormholeCriticalCheckbox.prop('checked', wormholeCriticalCheckbox.data('selectState'));
+            }else{
+                storeCheckboxStatus();
+
+                wormholeReducedCheckbox.prop('checked', false);
+                wormholeReducedCheckbox.prop('disabled', true);
+                wormholeCriticalCheckbox.prop('checked', false);
+                wormholeCriticalCheckbox.prop('disabled', true);
+            }
+        }.bind(wormholeCheckbox);
+
+        wormholeCheckbox.on('change', onWormholeCheckboxChange);
+
+        // initial checkbox check
+        storeCheckboxStatus();
+        onWormholeCheckboxChange();
+    };
+
     /**
      * requests route data from eveCentral API and execute callback
-     * @param requestRouteData
-     * @param contextData
+     * @param requestData
+     * @param context
      * @param callback
      */
-    var getRouteData = function(requestRouteData, contextData, callback){
+    var getRouteData = function(requestData, context, callback){
 
-        var requestData = {routeData: requestRouteData};
-
-        contextData.moduleElement.showLoadingAnimation();
+        context.moduleElement.showLoadingAnimation();
 
         $.ajax({
             url: Init.path.searchRoute,
             type: 'POST',
             dataType: 'json',
             data: requestData,
-            context: contextData
+            context: context
         }).done(function(routesData){
 
             this.moduleElement.hideLoadingAnimation();
@@ -192,11 +327,40 @@ define([
     /**
      * format route data from API request into dataTable row format
      * @param routeData
-     * @returns {*[]}
+     * @returns {{}}
      */
     var formatRouteData = function(routeData){
 
-        var tableRowData = {};
+        var reloadButton = '<i class="fa ' + ['fa-refresh'].join(' ') + '"></i>';
+        var deleteButton = '<i class="fa ' + ['fa-close', 'txt-color', 'txt-color-redDarker'].join(' ') + '"></i>';
+
+        // default row data (e.g. no route found)
+        var tableRowData = {
+            systemFrom:  routeData.systemFrom,
+            systemTo:  routeData.systemTo,
+            jumps: {
+                value: 0,
+                formatted: '---'
+            },
+            avgTrueSec: {
+                value: '',
+                formatted: ''
+            },
+            route: 'not found',
+            stargates: routeData.stargates,
+            jumpbridges: routeData.jumpbridges,
+            wormholes: routeData.wormholes,
+            wormholesReduced: routeData.wormholesReduced,
+            wormholesCritical: routeData.wormholesCritical,
+            reload: {
+                button: reloadButton
+            },
+            delete: {
+                button: deleteButton
+            },
+            maps: routeData.maps,
+            mapIds: routeData.mapIds //map data (mapIds is "redundant")
+        };
 
         if(
             routeData.routePossible === true &&
@@ -205,14 +369,14 @@ define([
             // route data available
 
             // add route Data
-            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++){
                 var routeNodeData = routeData.route[i];
+                // format system name (camelCase)
+                var systemName = routeNodeData.system.charAt(0).toUpperCase() + routeNodeData.system.slice(1).toLowerCase();
 
                 var systemSec = Number(routeNodeData.security).toFixed(1).toString();
                 var tempSystemSec = systemSec;
@@ -225,23 +389,31 @@ define([
 
                 var system = '<i class="fa fa-square ' + systemSecClass + '" ';
                 system += 'data-toggle="tooltip" data-placement="bottom" data-container="body" ';
-                system += 'title="' + routeNodeData.system.toLowerCase() + ' [' + systemSec + '] "></i>';
+                system += 'title="' + systemName + ' [' + systemSec + '] "></i>';
                 jumpData.push( system );
 
                 avgSecTemp += Number(routeNodeData.security);
             }
 
             var avgSec = ( avgSecTemp /  routeData.route.length).toFixed(2);
-            var avgSecClass = config.systemSecurityClassPrefix + ( avgSecTemp /  routeData.route.length).toFixed(1).toString().replace('.', '-');
+            var avgSecForClass = Number(avgSec).toFixed(1);
+
+            if(avgSecForClass <= 0){
+                avgSecForClass = '0.0';
+            }
+
+            var avgSecClass = config.systemSecurityClassPrefix + avgSecForClass.toString().replace('.', '-');
+
+            tableRowData.jumps = {
+                value: routeData.routeJumps,
+                formatted: routeData.routeJumps
+            };
 
-            tableRowData.system = rowData[0];
-            tableRowData.jumps = rowData[1];
             tableRowData.avgTrueSec = {
                 value: avgSec,
                 formatted: '<span class="' + avgSecClass + '">' + avgSec + '</span>'
             };
             tableRowData.route = jumpData.join(' ');
-
         }
 
         return tableRowData;
@@ -249,107 +421,202 @@ define([
 
     /**
      * get the route finder moduleElement
-     * @param systemData
      * @returns {*}
      */
-    var getModule = function(systemData){
+    var getModule = function(){
 
-        var moduleElement = null;
+        // create new module container
+        var moduleElement = $('<div>', {
+            class: [config.moduleClass, config.systemRouteModuleClass].join(' ')
+        });
 
-        // load trade routes for k-space systems
-        if(systemData.type.id === 2){
+        // headline toolbar icons
+        var headlineToolbar  = $('<h5>', {
+            class: 'pull-right'
+        }).append(
+            $('<i>', {
+                class: ['fa', 'fa-fw', 'fa-search', config.systemModuleHeadlineIcon, config.systemModuleHeadlineIconSearch].join(' '),
+                title: 'find&nbsp;route'
+            }).attr('data-html', 'true').attr('data-toggle', 'tooltip'),
+            $('<i>', {
+                class: ['fa', 'fa-fw', 'fa-refresh', config.systemModuleHeadlineIcon, config.systemModuleHeadlineIconRefresh].join(' '),
+                title: 'refresh&nbsp;all'
+            }).attr('data-html', 'true').attr('data-toggle', 'tooltip')
+        );
 
-            // create new module container
-            moduleElement = $('<div>', {
-                class: [config.moduleClass, config.systemRouteModuleClass].join(' ')
-            });
+        moduleElement.append(headlineToolbar);
 
+        // headline
+        var headline = $('<h5>', {
+            class: 'pull-left',
+            text: 'Routes'
+        });
 
-            // headline toolbar icons
-            var headlineToolbar  = $('<h5>', {
-                class: 'pull-right'
-            }).append(
-                    $('<i>', {
-                        class: ['fa', 'fa-fw', 'fa-search', config.systemModuleHeadlineIcon].join(' '),
-                        title: 'find route'
-                    }).attr('data-toggle', 'tooltip')
-                );
+        moduleElement.append(headline);
 
-            moduleElement.append(headlineToolbar);
+        // crate new route table
+        var table = $('<table>', {
+            class: ['compact', 'stripe', 'order-column', 'row-border', config.systemInfoRoutesTableClass].join(' ')
+        });
 
-            // headline
-            var headline = $('<h5>', {
-                class: 'pull-left',
-                text: 'Routes'
-            });
+        moduleElement.append( $(table) );
 
-            moduleElement.append(headline);
-
-            // init tooltips
-            var tooltipElements = moduleElement.find('[data-toggle="tooltip"]');
-            tooltipElements.tooltip({
-                container: 'body'
-            });
-
-            // crate new route table
-            var table = $('<table>', {
-                class: ['compact', 'stripe', 'order-column', 'row-border', config.systemInfoRoutesTableClass].join(' ')
-            });
-
-            moduleElement.append( $(table) );
-
-            // init empty table
-            var routesTable = table.DataTable( {
-                paging: false,
-                ordering: true,
-                order: [ 1, 'asc' ],
-                info: false,
-                searching: false,
-                hover: false,
-                autoWidth: false,
-                language: {
-                    emptyTable:  'No routes added'
-                },
-                columnDefs: [
-                    {
-                        targets: 0,
-                        orderable: true,
-                        title: 'system&nbsp;&nbsp;&nbsp;',
-                        data: 'system'
-                    },{
-                        targets: 1,
-                        orderable: true,
-                        title: 'jumps&nbsp;&nbsp;&nbsp',
-                        width: '40px',
-                        class: 'text-right',
-                        data: 'jumps'
-                    },{
-                        targets: 2,
-                        orderable: true,
-                        title: '&#216;&nbsp;&nbsp;&nbsp',
-                        width: '25px',
-                        class: 'text-right',
-                        data: 'avgTrueSec',
-                        render: {
-                            _: 'formatted',
-                            sort: 'value'
-                        }
-                    },{
-                        targets: 3,
-                        orderable: false,
-                        title: 'route',
-                        data: 'route'
+        // init empty table
+        var routesTable = table.DataTable( {
+            paging: false,
+            ordering: true,
+            order: [ 1, 'asc' ],
+            info: false,
+            searching: false,
+            hover: false,
+            autoWidth: false,
+            rowId: 'systemTo',
+            language: {
+                emptyTable:  'No routes added'
+            },
+            columnDefs: [
+                {
+                    targets: 0,
+                    orderable: true,
+                    title: 'system&nbsp;&nbsp;&nbsp;',
+                    data: 'systemTo'
+                },{
+                    targets: 1,
+                    orderable: true,
+                    title: '<span title="jumps" data-toggle="tooltip"><i class="fa fa-arrows-h"></i>&nbsp;&nbsp;</span>',
+                    width: '18px',
+                    class: 'text-right',
+                    data: 'jumps',
+                    render: {
+                        _: 'formatted',
+                        sort: 'value'
                     }
-                ],
-                data: [] // will be added dynamic
-            });
+                },{
+                    targets: 2,
+                    orderable: true,
+                    title: '<span title="average security" data-toggle="tooltip">&#216;&nbsp;&nbsp;</span>',
+                    width: '15px',
+                    class: 'text-right',
+                    data: 'avgTrueSec',
+                    render: {
+                        _: 'formatted',
+                        sort: 'value'
+                    }
+                },{
+                    targets: 3,
+                    orderable: false,
+                    title: 'route',
+                    data: 'route'
+                },{
+                    targets: 4,
+                    title: '',
+                    orderable: false,
+                    searchable: false,
+                    width: '10px',
+                    class: ['text-center', config.sigTableActionCellClass].join(' '),
+                    data: 'reload',
+                    render: {
+                        _: 'button'
+                    },
+                    createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
+                        var tempTableApi = this.api();
 
-        }
+                        $(cell).on('click', function(e) {
+                            // get current row data (important!)
+                            // -> "rowData" param is not current state, values are "on createCell()" state
+                            rowData = tempTableApi.row( $(cell).parents('tr')).data();
+
+                            var context = {
+                                moduleElement: moduleElement,
+                                dataTable: tempTableApi
+                            };
+
+                            var requestData = {
+                                routeData: [{
+                                    mapIds: rowData.mapIds,
+                                    systemFrom: rowData.systemFrom,
+                                    systemTo: rowData.systemTo,
+                                    stargates: rowData.stargates ? 1 : 0,
+                                    jumpbridges: rowData.jumpbridges ? 1 : 0,
+                                    wormholes: rowData.wormholes ? 1 : 0,
+                                    wormholesReduced: rowData.wormholesReduced ? 1 : 0,
+                                    wormholesCritical: rowData.wormholesCritical ? 1 : 0
+                                }]
+                            };
+
+                            getRouteData(requestData, context, callbackAddRouteRow);
+                        });
+                    }
+                },{
+                    targets: 5,
+                    title: '',
+                    orderable: false,
+                    searchable: false,
+                    width: '10px',
+                    class: ['text-center', config.sigTableActionCellClass].join(' '),
+                    data: 'delete',
+                    render: {
+                        _: 'button'
+                    },
+                    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 route',
+                            btnOkClass: 'btn btn-sm btn-danger',
+                            btnOkLabel: 'delete',
+                            btnOkIcon: 'fa fa-fw fa-close',
+                            onConfirm : function(e, target){
+                                var deleteRowElement = $(cell).parents('tr');
+                                tempTableElement.api().rows(deleteRowElement).remove().draw();
+                            }
+                        };
+
+                        // init confirmation dialog
+                        $(cell).confirmation(confirmationSettings);
+                    }
+                }
+            ],
+            drawCallback: function(settings){
+
+                var animationRows = this.api().rows().nodes().to$().filter(function() {
+                    return (
+                        $(this).data('animationStatus') ||
+                        $(this).data('animationTimer')
+                    );
+                });
+
+                for(var i = 0; i < animationRows.length; i++){
+                    $(animationRows[i]).pulseTableRow($(animationRows[i]).data('animationStatus'));
+                    $(animationRows[i]).removeData('animationStatus');
+                }
+
+            },
+            data: [] // will be added dynamic
+        });
+
+        // init tooltips for this module
+        var tooltipElements = moduleElement.find('[data-toggle="tooltip"]');
+        tooltipElements.tooltip({
+            container: 'body'
+        });
 
         return moduleElement;
     };
 
-    var initModule = function(moduleElement, systemData){
+    /**
+     * init route module
+     * -> request route path fore "default" trade hub systems
+     * @param moduleElement
+     * @param mapId
+     * @param systemData
+     */
+    var initModule = function(moduleElement, mapId, systemData){
 
         var systemFrom = systemData.name;
         var systemsTo = ['Jita', 'Amarr', 'Rens', 'Dodixie'];
@@ -358,13 +625,16 @@ define([
 
         var routesTable = routesTableElement.DataTable();
 
-        // init system search dialog -------------------------------------------------------------------------------
-
-        moduleElement.find('.' + config.systemModuleHeadlineIcon).on('click', function(e){
-            // show "find route" dialog
+        // init refresh routes --------------------------------------------------------------------
+        moduleElement.find('.' + config.systemModuleHeadlineIconRefresh).on('click', function(e){
+            updateRoutesTable(moduleElement, routesTable);
+        });
 
+        // init search routes dialog --------------------------------------------------------------
+        moduleElement.find('.' + config.systemModuleHeadlineIconSearch).on('click', function(e){
             var dialogData = {
                 moduleElement: moduleElement,
+                mapId: mapId,
                 systemFrom: systemFrom,
                 dataTable: routesTable
             };
@@ -372,23 +642,40 @@ define([
             showFindRouteDialog(dialogData);
         });
 
-        // fill routesTable with data ------------------------------------------------------------------------------
+        // fill routesTable with data -------------------------------------------------------------
         var requestRouteData = [];
+        var currentTimestamp = Util.getServerTime().getTime();
 
         for(var i = 0; i < systemsTo.length; i++){
             var systemTo = systemsTo[i];
 
             if(systemFrom !== systemTo){
-                var cacheKey = systemFrom.toUpperCase() + '_' + systemTo.toUpperCase();
+                var cacheKey = 'route_' + mapId + '_' + systemFrom.toUpperCase() + '_' + systemTo.toUpperCase();
 
-                if(cache.systemRoutes.hasOwnProperty(cacheKey)){
-                    addRow(routesTable, cache.systemRoutes[cacheKey]);
+                if(
+                    cache.systemRoutes.hasOwnProperty(cacheKey) &&
+                    Math.round(
+                        ( currentTimestamp - (new Date( cache.systemRoutes[cacheKey].updated * 1000).getTime())) / 1000
+                    ) <= config.routeCacheTTL
+                ){
+                    // route data is cached (client side)
+                    var context = {
+                        dataTable: routesTable
+                    };
+
+                    addRow(context, cache.systemRoutes[cacheKey].data);
                 }else{
                     // get route data
 
                     requestRouteData.push({
+                        mapIds: [mapId],
                         systemFrom: systemFrom,
-                        systemTo: systemTo
+                        systemTo: systemTo,
+                        stargates: 1,
+                        jumpbridges: 1,
+                        wormholes: 1,
+                        wormholesReduced: 1,
+                        wormholesCritical: 1
                     });
                 }
             }
@@ -400,16 +687,22 @@ define([
                 moduleElement: moduleElement,
                 dataTable: routesTable
             };
-            getRouteData(requestRouteData, contextData, callbackAddRouteRow);
+
+            var requestData = {
+                routeData: requestRouteData
+            };
+
+            getRouteData(requestData, contextData, callbackAddRouteRow);
         }
     };
 
 
     /**
      * updates an dom element with the system route module
+     * @param mapId
      * @param systemData
      */
-    $.fn.drawSystemRouteModule = function(systemData){
+    $.fn.drawSystemRouteModule = function(mapId, systemData){
 
         var parentElement = $(this);
 
@@ -423,7 +716,7 @@ define([
                     duration: Init.animationSpeed.mapModule,
                     delay: Init.animationSpeed.mapModule,
                     complete: function(){
-                        initModule(moduleElement, systemData);
+                        initModule(moduleElement, mapId, systemData);
                     }
                 });
             }
@@ -438,12 +731,12 @@ define([
                 complete: function(tempElement){
                     $(tempElement).remove();
 
-                    moduleElement = getModule(systemData);
+                    moduleElement = getModule();
                     showModule(moduleElement);
                 }
             });
         }else{
-            moduleElement = getModule(systemData);
+            moduleElement = getModule();
             showModule(moduleElement);
         }
 

public/js/v1.0.0RC3/app/ui/system_signature.js

@@ -43,16 +43,10 @@ define([
         sigTableEditSigDescriptionTextarea: 'pf-sig-table-edit-desc-text',      // class for editable fields (sig description)
         sigTableCreatedCellClass: 'pf-sig-table-created',                       // class for "created" cells
         sigTableUpdatedCellClass: 'pf-sig-table-updated',                       // class for "updated" cells
-        sigTableActionButtonClass: 'pf-sig-table-action-button',                // class for row action button
 
         sigTableCounterClass: 'pf-table-counter-cell',                          // class for "counter" cells
         sigTableActionCellClass: 'pf-table-action-cell',                        // class for "action" cells
 
-
-        // animation
-        animationPulseSuccessClass: 'pf-animation-pulse-success',               // animation class
-        animationPulseWarningClass: 'pf-animation-pulse-warning',               // animation class
-
         // xEditable
         editableDiscriptionInputClass: 'pf-editable-description'                // class for "description" textarea
     };
@@ -184,7 +178,7 @@ define([
         var signatureData = $.extend([], signatureDataOrig);
 
         // disable update until function is ready;
-        disableTableUpdate = true;
+        lockSignatureTable();
 
         var moduleElement = $(this);
 
@@ -207,7 +201,7 @@ define([
             for(var j = 0; j < tableData.length; j++){
                 if(signatureData[i].id === tableData[j].id){
 
-                    // check if row has updated
+                    // check if row was updated
                     if(signatureData[i].updated.updated > tableData[j].updated.updated){
 
                         // row element to remove
@@ -288,43 +282,35 @@ define([
             Util.showNotify({title: 'Signatures updated', text: notification, type: 'success'});
 
             // wait until add/remove animations are finished before enable table for auto update again
-            setTimeout(function(){ disableTableUpdate = false; }, 2000);
+            unlockSignatureTable(false);
         }else{
-            // enable table update
-            disableTableUpdate = false;
+            // enable table for next update
+            unlockSignatureTable(true);
         }
-
-
     };
 
     /**
-     * highlight jquery elements
-     * add/remove css class for keyframe animation
-     * @returns {any|JQuery|*}
+     * lock system signature table for
      */
-    $.fn.pulseTableRow = function(status){
+    var lockSignatureTable = function(){
+        disableTableUpdate = true;
+    };
+
+    /**
+     * unlock system signature table from been locked
+     * -> make table "update-able" again
+     * @param instant
+     */
+    var unlockSignatureTable = function(instant){
+        if(disableTableUpdate === true){
+            if(instant === true){
+                disableTableUpdate = false;
+            }else{
+                // wait until add/remove animations are finished before enable table for auto update again
+                setTimeout(function(){ disableTableUpdate = false; }, 2000);
+            }
 
-        var animationClass = '';
-        switch(status){
-            case 'added':
-                animationClass = config.animationPulseSuccessClass;
-                break;
-            case 'changed':
-                animationClass = config.animationPulseWarningClass;
-                break;
         }
-
-        return this.each(function(){
-            var element = $(this);
-            element.addClass( animationClass );
-
-            var timer = setTimeout(
-                function() {
-                    element.removeClass( animationClass );
-
-                    clearTimeout( timer );
-                }, 3000);
-        });
     };
 
     /**
@@ -463,7 +449,7 @@ define([
                 // save signature data
 
                 // lock update function until request is finished
-                disableTableUpdate = true;
+                lockSignatureTable();
 
                 // lock copy during request (prevent spamming (ctrl + c )
                 disableCopyFromClipboard = true;
@@ -478,7 +464,7 @@ define([
                     data: requestData,
                     dataType: 'json'
                 }).done(function(responseData){
-                    disableTableUpdate = false;
+                    unlockSignatureTable(true);
 
                     // updates table with new/updated signature information
                     moduleElement.updateSignatureTable(responseData.signatures, false);
@@ -487,7 +473,7 @@ define([
                     Util.showNotify({title: jqXHR.status + ': Update signatures', text: reason, type: 'warning'});
                     $(document).setProgramStatus('problem');
                 }).always(function() {
-                    disableTableUpdate = false;
+                    unlockSignatureTable(true);
                     disableCopyFromClipboard = false;
                 });
             }
@@ -766,7 +752,7 @@ define([
 
     /**
      * make a table or row editable
-     * @param systemInfoData
+     * @param systemData
      */
     $.fn.makeEditable = function(systemData){
 
@@ -905,29 +891,37 @@ define([
                     updateSignatureCell(rowElement, 6, newRowData.updated);
                 }
 
-                // find related "name" select (same row) and change options
-                var nameSelect = getNextEditableField(signatureTypeField);
+                // find related "type" select (same row) and change options
+                var typeSelect = getNextEditableField(signatureTypeField);
 
                 var systemTypeId = parseInt( signatureTypeField.attr('data-systemTypeId') );
                 var areaId = parseInt( signatureTypeField.attr('data-areaid') );
 
                 var newSelectOptions = getAllSignatureNames(systemData, systemTypeId, areaId, newValue);
-                nameSelect.editable('option', 'source', newSelectOptions);
-                nameSelect.editable('setValue', null);
+                typeSelect.editable('option', 'source', newSelectOptions);
+                typeSelect.editable('setValue', null);
 
                 if(
                     newValue > 0 &&
                     newSelectOptions.length > 0
                 ){
-                    nameSelect.editable('enable');
+                    typeSelect.editable('enable');
                 }else{
-                    nameSelect.editable('disable');
+                    typeSelect.editable('disable');
                 }
             }
         });
 
 
         // Select sig type (slave: depends on sig type) -----------------------------------------
+        sigTypeFields.on('init', function(e, editable) {
+            // check if there are initial options available
+            var options = editable.input.options.source.bind(e.target)();
+            if(options.length <= 0){
+                editable.disable();
+            }
+        });
+
         sigTypeFields.editable({ mode: 'popup',
             type: 'select',
             title: 'type',
@@ -937,23 +931,12 @@ define([
             showbuttons: false,
             params: modifyFieldParamsOnSend,
             source: function(){
-                var signatureNameField = $(this);
+                var signatureTypeField = $(this);
 
-                var systemTypeId = parseInt( signatureNameField.attr('data-systemTypeId') );
-                var areaId = parseInt( signatureNameField.attr('data-areaid') );
-                var groupId = parseInt( signatureNameField.attr('data-groupId') );
-
-                var cacheKey = [systemTypeId, areaId, groupId].join('_');
-
-                // check for cached signature names
-                if(sigNameCache.hasOwnProperty( cacheKey )){
-                    return sigNameCache[cacheKey];
-                }
-
-                var signatureNames = getAllSignatureNames(systemData, systemTypeId, areaId, groupId);
-
-                // get all available Signature Names
-                var availableSigs = sigNameCache[cacheKey] = signatureNames;
+                var systemTypeId = parseInt( signatureTypeField.attr('data-systemTypeId') );
+                var areaId = parseInt( signatureTypeField.attr('data-areaid') );
+                var groupId = parseInt( signatureTypeField.attr('data-groupId') );
+                var availableSigs = getAllSignatureNames(systemData, systemTypeId, areaId, groupId);
 
                 return availableSigs;
             },
@@ -1019,88 +1002,99 @@ define([
      */
     var getAllSignatureNames = function(systemData, systemTypeId, areaId, groupId){
         var newSelectOptions = [];
+        var cacheKey = [systemTypeId, areaId, groupId].join('_');
         var newSelectOptionsCount = 0;
 
-        // set new Options ----------
-        // get all possible "static" signature names by the selected groupId
-        var tempSelectOptions = Util.getAllSignatureNames(systemTypeId, areaId, groupId);
+        // check for cached signature names
+        if(sigNameCache.hasOwnProperty( cacheKey )){
+            // cached signatures do not include static WHs!
+            newSelectOptions =  sigNameCache[cacheKey].slice(0);
+            newSelectOptionsCount = sumSignaturesRecursive('children', newSelectOptions);
+        }else{
+            // get new Options ----------
+            // get all possible "static" signature names by the selected groupId
+            var tempSelectOptions = Util.getAllSignatureNames(systemTypeId, areaId, groupId);
 
-        // format options into array with objects advantages: keep order, add more options (whs), use optgroup
-        if(tempSelectOptions){
-            var fixSelectOptions = [];
-            for (var key in tempSelectOptions) {
-                if (
-                    key > 0 &&
-                    tempSelectOptions.hasOwnProperty(key)
-                ) {
-                    //newSelectOptions.push({value: key, text: tempSelectOptions[key] });
-                    fixSelectOptions.push( {value: key, text: tempSelectOptions[key] } );
-                    newSelectOptionsCount++;
+            // format options into array with objects advantages: keep order, add more options (whs), use optgroup
+            if(tempSelectOptions){
+                var fixSelectOptions = [];
+                for (var key in tempSelectOptions) {
+                    if (
+                        key > 0 &&
+                        tempSelectOptions.hasOwnProperty(key)
+                    ) {
+                        newSelectOptionsCount++;
+                        fixSelectOptions.push( {value: key, text: tempSelectOptions[key] } );
+                    }
+                }
+
+                if(newSelectOptionsCount > 0){
+                    if(groupId === 5){
+                        // "wormhole" selected => multiple <optgroup> available
+                        newSelectOptions.push({ text: 'Wandering WHs', children: fixSelectOptions});
+                    }else{
+                        newSelectOptions = fixSelectOptions;
+                    }
                 }
             }
 
-            if(newSelectOptionsCount > 0){
-                if(groupId === 5){
-                    // "wormhole" selected => multiple <optgroup> available
-                    newSelectOptions.push({ text: 'Wandering WHs', children: fixSelectOptions});
-                }else{
-                    newSelectOptions = fixSelectOptions;
+            // wormhole (cached signatures)
+            if( groupId === 5 ){
+
+                // add possible frigate holes
+                var frigateHoles = getFrigateHolesBySystem(areaId);
+                var frigateWHData = [];
+                for(var frigKey in frigateHoles){
+                    if (
+                        frigKey > 0 &&
+                        frigateHoles.hasOwnProperty(frigKey)
+                    ) {
+                        newSelectOptionsCount++;
+                        frigateWHData.push( {value: newSelectOptionsCount, text: frigateHoles[frigKey]} );
+                    }
+                }
+
+                if(frigateWHData.length > 0){
+                    newSelectOptions.push({ text: 'Frigate WHs', children: frigateWHData});
+                }
+
+                // add possible incoming holes
+                var incomingWHData = [];
+                for(var incomingKey in Init.incomingWormholes){
+                    if (
+                        incomingKey > 0 &&
+                        Init.incomingWormholes.hasOwnProperty(incomingKey)
+                    ) {
+                        newSelectOptionsCount++;
+                        incomingWHData.push( {value: newSelectOptionsCount, text: Init.incomingWormholes[incomingKey]} );
+                    }
+                }
+
+                if(incomingWHData.length > 0){
+                    newSelectOptions.push({ text: 'Incoming WHs', children: incomingWHData});
                 }
             }
+
+            // update cache (clone array) -> further manipulation to this array, should not be cached
+            sigNameCache[cacheKey] = newSelectOptions.slice(0);
         }
 
-        // wormhole
+        // static wormholes (DO NOT CACHE) (not all C2 WHs have the same statics,...
         if( groupId === 5 ){
             // add static WH(s) for this system
             if(systemData.statics){
                 var staticWHData = [];
                 for(var i = 0; i < systemData.statics.length; i++){
-                    newSelectOptionsCount++;
                     var staticWHName = systemData.statics[i].name + ' - ' + systemData.statics[i].security;
 
-                    staticWHData.push( {value: newSelectOptionsCount, text: staticWHName} );
                     newSelectOptionsCount++;
+                    staticWHData.push( {value: newSelectOptionsCount, text: staticWHName} );
                 }
 
                 if(staticWHData.length > 0){
                     newSelectOptions.unshift({ text: 'Static WHs', children: staticWHData});
                 }
             }
-
-            // add possible frigate holes
-            var frigateHoles = getFrigateHolesBySystem(areaId);
-            var frigateWHData = [];
-            for(var frigKey in frigateHoles){
-                if (
-                    frigKey > 0 &&
-                    frigateHoles.hasOwnProperty(frigKey)
-                ) {
-                    frigateWHData.push( {value: newSelectOptionsCount, text: frigateHoles[frigKey]} );
-                    newSelectOptionsCount++;
-                }
-            }
-
-            if(frigateWHData.length > 0){
-                newSelectOptions.push({ text: 'Frigate WHs', children: frigateWHData});
-            }
-
-            // add possible incoming holes
-            var incomingWHData = [];
-            for(var incomingKey in Init.incomingWormholes){
-                if (
-                    incomingKey > 0 &&
-                    Init.incomingWormholes.hasOwnProperty(incomingKey)
-                ) {
-                    incomingWHData.push( {value: newSelectOptionsCount, text: Init.incomingWormholes[incomingKey]} );
-                    newSelectOptionsCount++;
-                }
-            }
-
-            if(incomingWHData.length > 0){
-                newSelectOptions.push({ text: 'Incoming WHs', children: incomingWHData});
-            }
-
-
         }
 
         // if selectOptions available -> add "empty" option as well
@@ -1108,10 +1102,42 @@ define([
             newSelectOptions.unshift({ value: 0, text: ''});
         }
 
-
         return newSelectOptions;
     };
 
+    /**
+     * recursive sum array.length for a given object key
+     * -> e.g.
+     * {
+     *     first: {
+     *         count = [4, 2, 1]
+     *         test = { ... }
+     *     },
+     *     second: {
+     *         count = [12, 13]
+     *         test = { ... }
+     *     }
+     * }
+     * -> sumSignaturesRecursive('count', obj) => 5;
+     * @param key
+     * @param obj
+     * @returns {number}
+     */
+    var sumSignaturesRecursive = function(key, obj){
+        var sum = 0;
+
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop) && key === prop) {
+                sum += obj[prop].length;
+            }
+            else if (Object.prototype.toString.call(obj[prop]) === '[object Object]') {
+                sum += sumSignaturesRecursive(key, obj[prop]);
+            }
+        }
+
+        return sum;
+    };
+
     /**
      * get possible frig holes that could spawn in a system
      * filtered by "systemTypeId"
@@ -1390,12 +1416,11 @@ define([
                 tempData.id = sigId;
 
                 // set status --------------------------------------------------------------------------------------
-                var status = '';
                 var statusClass = '';
                 if(data.updated.character !== undefined){
                     statusClass = Util.getStatusInfoForCharacter(data.updated.character, 'class');
                 }
-                status =  '<i class="fa fa-fw fa-circle pf-user-status ' + statusClass + '"></i>';
+                var status = '<i class="fa fa-fw fa-circle pf-user-status ' + statusClass + '"></i>';
 
                 tempData.status = {
                     status: status,
@@ -1469,7 +1494,7 @@ define([
 
                 // action icon -------------------------------------------------------------------------------------
 
-                var actionButton = '<i class="fa ' + options.actionClass + ' ' + config.sigTableActionButtonClass + '"></i>';
+                var actionButton = '<i class="fa ' + options.actionClass + '"></i>';
                 tempData.action = {
                     action: options.action,
                     button: actionButton
@@ -1623,7 +1648,6 @@ define([
                         sort: 'action'
                     },
                     createdCell: function(cell, cellData, rowData, rowIndex, colIndex){
-
                         var tempTableElement = this;
                         var rowElement = $(cell).parents('tr');
 
@@ -1642,7 +1666,10 @@ define([
                                     formFields.editable('submit', {
                                         url: Init.path.saveSignatureData,
                                         ajaxOptions: {
-                                            dataType: 'json' //assuming json response
+                                            dataType: 'json', //assuming json response
+                                            beforeSend: function( xhr, settings ){
+                                                lockSignatureTable();
+                                            }
                                         },
                                         data: {
                                             systemId: systemData.id, // additional data to submit
@@ -1650,6 +1677,7 @@ define([
                                         },
                                         error: $.fn.editable.defaults.error, // user default xEditable error function
                                         success: function (data, editableConfig) {
+                                            unlockSignatureTable(false);
 
                                             var newRowElement = addSignatureRow(systemData, data.signatures[0], true);
 
@@ -1682,7 +1710,7 @@ define([
                                     btnCancelClass: 'btn btn-sm btn-default',
                                     btnCancelLabel: 'cancel',
                                     btnCancelIcon: 'fa fa-fw fa-ban',
-                                    title: 'Delete signature',
+                                    title: 'delete signature',
                                     btnOkClass: 'btn btn-sm btn-danger',
                                     btnOkLabel: 'delete',
                                     btnOkIcon: 'fa fa-fw fa-close',
@@ -1886,7 +1914,7 @@ define([
                     duration: Init.animationSpeed.mapModule,
                     delay: Init.animationSpeed.mapModule,
                     complete: function(){
-                        disableTableUpdate = false;
+                        unlockSignatureTable(true);
                     }
                 });
 
@@ -1897,9 +1925,8 @@ define([
         var moduleElement = parentElement.find('.' + config.systemSigModuleClass);
 
         if(moduleElement.length > 0){
-
             // disable update
-            disableTableUpdate = true;
+            lockSignatureTable();
 
             moduleElement.velocity('transition.slideDownOut', {
                 duration: Init.animationSpeed.mapModule,

public/js/v1.0.0RC3/app/util.js

@@ -41,12 +41,17 @@ define([
 
         // map module
         mapModuleId: 'pf-map-module',                                           // id for main map module
-        mapTabBarId: 'pf-map-tabs'                                              // id for map tab bar
+        mapTabBarId: 'pf-map-tabs',                                             // id for map tab bar
+
+        // animation
+        animationPulseSuccessClass: 'pf-animation-pulse-success',               // animation class
+        animationPulseWarningClass: 'pf-animation-pulse-warning'                // animation class
 
     };
 
     var stopTimerCache = {};                                                    // cache for stopwatch timer
 
+    var animationTimerCache = {};                                               // cache for table row animation timeout
 
     /*
      *  ===========================================================================================================
@@ -471,7 +476,7 @@ define([
         return this.each(function(){
 
             var tooltipElements = $(this).find('[title]');
-            tooltipElements.tooltip({
+            tooltipElements.tooltip('destroy').tooltip({
                 container:  this,
                 delay: 100
             });
@@ -727,6 +732,52 @@ define([
         });
     };
 
+    /**
+     * highlight jquery elements
+     * add/remove css class for keyframe animation
+     * @returns {any|JQuery|*}
+     */
+    $.fn.pulseTableRow = function(status, clear){
+
+        var animationClass = '';
+        switch(status){
+            case 'added':
+                animationClass = config.animationPulseSuccessClass;
+                break;
+            case 'changed':
+                animationClass = config.animationPulseWarningClass;
+                break;
+        }
+
+        var clearTimer =  function(element) {
+            element.removeClass( animationClass );
+            var currentTimer = element.data('animationTimer');
+
+            if( animationTimerCache.hasOwnProperty(currentTimer) ){
+                clearTimeout( currentTimer );
+                delete animationTimerCache[currentTimer];
+                element.removeData('animationTimer');
+            }
+        };
+
+        return this.each(function(){
+            var element = $(this);
+
+            if( element.hasClass(animationClass) ){
+                // clear timer -> set new timer
+                clearTimer(element);
+            }
+
+            if(clear !== true){
+                element.addClass( animationClass );
+                var timer = setTimeout(clearTimer, 1500, element);
+                element.data('animationTimer', timer);
+                animationTimerCache[timer] = true;
+            }
+
+        });
+    };
+
     /*
      *  ===========================================================================================================
      *   Util functions that are global available for all modules
@@ -1679,7 +1730,7 @@ define([
      * @returns {Date}
      */
     var convertDateToUTC = function(date) {
-        return new Date(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds());
+        return new Date(date.getUTCFullYear(), date.getUTCMonth() + 1, date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds());
     };
 
     /**
@@ -1688,7 +1739,7 @@ define([
      * @returns {string}
      */
     var convertDateToString = function(date){
-        var dateString = ('0'+date.getDate()).slice(-2) + '.' + ('0'+date.getMonth()).slice(-2) + '.' + date.getFullYear();
+        var dateString = ('0'+date.getMonth()).slice(-2) + '/' + ('0'+date.getDate()).slice(-2) + '/' + date.getFullYear();
         var timeString = ('0'+date.getHours()).slice(-2) + ':' + ('0'+date.getMinutes()).slice(-2);
         return   dateString + ' ' + timeString;
     };

public/templates/dialog/route.html

@@ -1,35 +1,112 @@
-<div class="row" id="{{id}}">
-    <div class="col-sm-12">
-        <form  role="form" class="form-horizontal">
+<div id="{{id}}">
+    <form  role="form" class="form-horizontal">
 
-            <div class="row">
-                <div class="col-sm-5">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">From</label>
-                        <div class="col-sm-9">
-                                <div class=" pull-right">
-                                    <p class="form-control-static">
-                                        <i class="fa fa-arrow-right"></i>
-                                    </p>
-                                </div>
-                                <p class="form-control-static">{{systemFrom}}</p>
+        <div class="row">
+            <div class="col-sm-5">
+                <div class="form-group">
+                    <label class="col-sm-3 col-xs-2 control-label">From</label>
+                    <div class="col-sm-9 col-xs-10">
+                            <div class=" pull-right">
+                                <p class="form-control-static">
+                                    <i class="fa fa-arrow-right"></i>
+                                </p>
+                            </div>
+                            <p class="form-control-static">{{systemFrom}}</p>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-7">
+                <div class="form-group">
+                    <label class="col-sm-1 col-xs-2 control-label" for="to_system">To</label>
+                    <div class="col-sm-11 col-xs-10">
+                        <div class="input-group">
+                            <select id="to_system" name="systemTo" class="form-control {{selectClass}}" data-error="Choose a valid system" required/>
+                            <span class="help-block with-errors">Search system name</span>
                         </div>
                     </div>
                 </div>
+            </div>
+        </div>
 
-                <div class="col-sm-7">
-                    <div class="form-group">
-                        <label class="col-sm-1 control-label" for="to_system">To</label>
-                        <div class="col-sm-11">
-                            <div class="input-group">
-                                <select id="to_system" name="systemTo" class="form-control {{selectClass}}" data-error="Choose a valid system" required/>
-                                <span class="help-block with-errors">Search system name</span>
-                            </div>
+        {{! search options ----------------------------------------------------------- }}
+
+        <h4 class="pf-dynamic-area">Search options</h4>
+
+        <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <div class="col-sm-offset-1 col-sm-11">
+                        <div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include stargate connections">
+                            <input id="form_stargates" name="stargates" value="1" type="checkbox" checked>
+                            <label for="form_stargates">Stargates</label>
+                            <div class="help-block with-errors"></div>
+                        </div>
+
+                        <div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include jump bridge connections">
+                            <input id="form_rally" name="jumpbridges" value="1" type="checkbox" checked>
+                            <label for="form_rally">Jump Bridges</label>
                         </div>
                     </div>
                 </div>
             </div>
 
-        </form>
-    </div>
+            <div class="col-sm-8">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label" for="{{mapSelectId}}">Maps</label>
+                    <div class="col-sm-10">
+                        <div class="input-group" title="add/remove maps for search">
+                            <select id="{{mapSelectId}}" name="mapIds[]" multiple="multiple">
+                                {{#mapSelectOptions}}
+                                <option value="{{id}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+                                {{/mapSelectOptions}}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <hr>
+
+        <div class="row">
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <div class="col-sm-offset-1 col-sm-11">
+                        <div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include wormhole connections">
+                            <input id="form_wormholes" name="wormholes" value="1" type="checkbox" checked>
+                            <label for="form_wormholes">Wormholes</label>
+                            <div class="help-block with-errors"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <div class="col-sm-offset-1 col-sm-11">
+                        <div class="col-sm-12 col-xs-6 checkbox checkbox-warning checkbox-circle" title="include reduced connections">
+                            <input id="form_wormholes_reduced" name="wormholesReduced" value="1" type="checkbox" checked>
+                            <label for="form_wormholes_reduced">Stage 1 (reduced)</label>
+                            <div class="help-block with-errors"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <div class="col-sm-offset-1 col-sm-11">
+                        <div class="col-sm-12 col-xs-6 checkbox checkbox-danger checkbox-circle" title="include critical connections">
+                            <input id="form_wormholes_critical" name="wormholesCritical" value="1" type="checkbox" checked>
+                            <label for="form_wormholes_critical">Stage 2 (critical)</label>
+                            <div class="help-block with-errors"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+    </form>
 </div>

public/templates/dialog/settings.html

@@ -164,12 +164,12 @@
                 </div>
 
                 {{#userData.character}}
-                    <h2 class="pf-dynamic-area"><img src="{{ccpImageServer}}Character/{{id}}_32.jpg">&nbsp;&nbsp;Private maps "<em class="pf-map-type-private">{{name}}</em>"</h2>
+                    <h4 class="pf-dynamic-area"><img src="{{ccpImageServer}}Character/{{id}}_32.jpg">&nbsp;&nbsp;Private maps "<em class="pf-map-type-private">{{name}}</em>"</h4>
 
 
                     <div class="row">
                         <div class="col-sm-9">
-                            <div class="checkbox col-sm-10">
+                            <div class="col-sm-10">
                                 <label for="privateSharing">
                                     <input id="privateSharing" type="checkbox" name="privateSharing" data-toggle="toggle" value="1" {{#shared}}checked{{/shared}}>
                                     &nbsp;map invite for private maps
@@ -182,12 +182,12 @@
                     </div>
 
                     {{#corporation}}
-                    <h2 class="pf-dynamic-area"><img src="{{ccpImageServer}}Corporation/{{id}}_32.png">&nbsp;&nbsp;Corporation maps "<em class="pf-map-type-corporation">{{name}}</em>"</h2>
+                    <h4 class="pf-dynamic-area"><img src="{{ccpImageServer}}Corporation/{{id}}_32.png">&nbsp;&nbsp;Corporation maps "<em class="pf-map-type-corporation">{{name}}</em>"</h4>
 
 
                     <div class="row">
                         <div class="col-sm-9">
-                            <div class="checkbox col-sm-10">
+                            <div class="col-sm-10">
                                 <label for="corporationSharing">
                                     <input id="corporationSharing" type="checkbox" name="corporationSharing" data-toggle="toggle" value="1" {{#shared}}checked{{/shared}}>
                                     &nbsp;map invite for corporation maps
@@ -202,11 +202,11 @@
                     {{/corporation}}
 
                     {{#alliance}}
-                    <h2 class="pf-dynamic-area"><img src="{{ccpImageServer}}Alliance/{{id}}_32.png">&nbsp;&nbsp;Alliance maps "<em class="pf-map-type-alliance">{{name}}</em>"</h2>
+                    <h4 class="pf-dynamic-area"><img src="{{ccpImageServer}}Alliance/{{id}}_32.png">&nbsp;&nbsp;Alliance maps "<em class="pf-map-type-alliance">{{name}}</em>"</h4>
 
                     <div class="row">
                         <div class="col-sm-9">
-                            <div class="checkbox col-sm-10">
+                            <div class="col-sm-10">
                                 <label for="allianceSharing">
                                     <input id="allianceSharing" type="checkbox" name="allianceSharing" data-toggle="toggle" value="1" {{#shared}}checked{{/shared}}>
                                     &nbsp;map invite for alliance maps

public/templates/dialog/system.html

@@ -1,61 +1,58 @@
-<div class="row" id="{{id}}">
-    <div class="col-sm-12">
-        <form  role="form" class="form-horizontal">
+<div id="{{id}}">
+    <form  role="form" class="form-horizontal">
 
-            <div class="row">
-                <div class="col-sm-8">
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label" for="form_system">System</label>
-                        <div class="col-sm-10">
-                            <div class="input-group">
-                                <label for="form_system"></label>
-                                <select id="form_system" name="systemId" class="{{selectClass}}" data-error="Choose a valid system" required>
-                                    {{#currentSystem}}
-                                    <option value="{{id}}">{{name}}</option>
-                                    {{/currentSystem}}
-                                </select>
-                                <span class="help-block with-errors">Search system name</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-sm-4">
-                    <div class="form-group" style="margin-bottom: 0;">
-                        <div class="col-sm-offset-2 col-sm-10">
-                            <div class="checkbox">
-                                <label for="form_lock">
-                                    <input id="form_lock" name="locked" value="1" type="checkbox">
-                                    Lock system
-                                </label>
-                                <div class="help-block with-errors"></div>
-                            </div>
-
-                            <div class="checkbox">
-                                <label for="form_rally">
-                                    <input id="form_rally" name="rally" value="1" type="checkbox">
-                                    Rally point
-                                </label>
-                                <div class="help-block with-errors"></div>
-
-                            </div>
+        <div class="row">
+            <div class="col-xs-8">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label" for="form_system">System</label>
+                    <div class="col-sm-10">
+                        <div class="input-group">
+                            <label for="form_system"></label>
+                            <select id="form_system" name="systemId" class="{{selectClass}}" data-error="Choose a valid system" required>
+                                {{#currentSystem}}
+                                <option value="{{id}}">{{name}}</option>
+                                {{/currentSystem}}
+                            </select>
+                            <span class="help-block with-errors">Search system name</span>
                         </div>
                     </div>
                 </div>
             </div>
 
+            <div class="col-xs-4">
+                <div class="form-group" style="margin-bottom: 0;">
+                    <div class="col-sm-offset-2 col-sm-10">
+                        <div class="checkbox checkbox-primary">
+                            <input id="form_lock" name="locked" value="1" type="checkbox">
+                            <label for="form_lock">
+                                Lock system
+                            </label>
+                            <div class="help-block with-errors"></div>
+                        </div>
 
-            <div class="row">
-                <div class="col-sm-8">
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label" for="form_status">Status</label>
-                        <div class="col-sm-6" style="min-height: 32px;">
-                            <a class="pf-editable pf-editable-system-status" href="#" id="form_status" data-type="select" data-name="statusId"></a>
+                        <div class="checkbox checkbox-primary">
+                            <input id="form_rally" name="rally" value="1" type="checkbox">
+                            <label for="form_rally">
+                                Rally point
+                            </label>
+                            <div class="help-block with-errors"></div>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>
 
-        </form>
-    </div>
+
+        <div class="row">
+            <div class="col-xs-8">
+                <div class="form-group">
+                    <label class="col-sm-2 control-label" for="form_status">Status</label>
+                    <div class="col-sm-6" style="min-height: 32px;">
+                        <a class="pf-editable pf-editable-system-status" href="#" id="form_status" data-type="select" data-name="statusId"></a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </form>
 </div>

sass/_font-awesome.scss

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 
@@ -15,3 +15,4 @@
 @import "library/fontawesome/_rotated-flipped";
 @import "library/fontawesome/_stacked";
 @import "library/fontawesome/_icons";
+@import "library/fontawesome/_screen-reader";

sass/bootstrap/_forms.scss

@@ -207,7 +207,8 @@ input[type="date"] {
 .radio-inline input[type="radio"],
 .checkbox input[type="checkbox"],
 .checkbox-inline input[type="checkbox"] {
-  float: left;
+  position: absolute;
+  //float: left;
   margin-left: -20px;
 }
 .radio + .radio,

sass/bootstrap/_mixins.scss

@@ -34,6 +34,7 @@
   // WebKit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
+  outline-color: $teal-lighter;
 }
 
 // Center-align a block level element

sass/layout/_animation.scss

@@ -38,21 +38,21 @@
 // pulse-out ==========================================
 
 .pf-animation-pulse-success{
-  @include animation( pulseBackgroundSuccess 3s 1 );
+  @include animation( pulseBackgroundSuccess 1.5s 1 );
   @include animation-timing-function( cubic-bezier(0.53, -0.03, 0.68, 0.38) );
 
   .sorting_1{
-    @include animation( pulseBackgroundSuccessActive 3s 1 );
+    @include animation( pulseBackgroundSuccessActive 1.5s 1 );
     @include animation-timing-function( cubic-bezier(0.53, -0.03, 0.68, 0.38) );
   }
 }
 
 .pf-animation-pulse-warning{
-  @include animation( pulseBackgroundWarning 3s 1 );
+  @include animation( pulseBackgroundWarning 1.5s 1 );
   @include animation-timing-function( cubic-bezier(0.53, -0.03, 0.68, 0.38) );
 
   .sorting_1{
-    @include animation( pulseBackgroundWarningActive 3s 1 );
+    @include animation( pulseBackgroundWarningActive 1.5s 1 );
     @include animation-timing-function( cubic-bezier(0.53, -0.03, 0.68, 0.38) );
   }
 }
@@ -60,7 +60,7 @@
 @include keyframes(pulseBackgroundSuccess){
   0%   {}
   5%  {
-    background-color: $green;
+    background-color: $green-dark;
     color: $gray-dark;
   }
   100% {}
@@ -68,7 +68,7 @@
 @include keyframes(pulseBackgroundSuccessActive){
   0%   {}
   5%  {
-    background-color: darken($green, 5%);
+    background-color: darken($green-dark, 5%);
     color: $gray-dark;
   }
   100% {}

sass/layout/_dialogs.scss

@@ -1,6 +1,6 @@
 .modal-content {
 
-  // dialog headline ==============================================================
+  // dialog headline ==========================================================
   h2 {
     font-family: $font-family-sans-serif;
     letter-spacing: 0px;
@@ -9,19 +9,26 @@
     line-height: normal;
   }
 
-  // data tables ==================================================================
+  h2, h4{
+    &.pf-dynamic-area{
+      min-height: 0;
+      margin: 10px 0;
+    }
+  }
+
+  // data tables ==============================================================
   .dataTable, .table{
     font-size: 10px;
     font-family: $font-family-bold;
   }
 
-  // horizontal line ==============================================================
+  // horizontal line ==========================================================
   hr{
     margin: 5px 0 15px 0;
     border-color: $gray-light;
   }
 
-  // form wizard ==================================================================
+  // form wizard ==============================================================
   .pf-wizard-navigation{
     margin: 0;
 
@@ -79,7 +86,7 @@
   }
 }
 
-// settings dialog ======================================================================
+// settings dialog ============================================================
 #pf-settings-dialog{
 
   // smaller buttons
@@ -94,7 +101,7 @@
   }
 }
 
-// map settings dialog ====================================
+// map settings dialog ========================================================
 #pf-map-dialog{
   #pf-map-dialog-character-select,
   #pf-map-dialog-corporation-select,
@@ -103,26 +110,25 @@
   }
 }
 
-// map manual dialog ======================================
+#pf-route-dialog{
+  #pf-route-dialog-map-select{
+    width: 300px !important;
+  }
+}
+
+// map manual dialog ==========================================================
 #pf-manual-scrollspy{
   position: relative;
   height: 500px;
   overflow: auto;
 }
 
-// ad system dialog =======================================
+// ad system dialog ===========================================================
 .pf-system-dialog-select{
   width: 270px !important;
 }
 
-// sharing dialog =========================================
-h2, h4{
-  &.pf-dynamic-area{
-    min-height: 0;
-  }
-}
-
-// credits dialog =========================================
+// credits dialog =============================================================
 .pf-credits-dialog{
 
   .pf-credits-logo-background{

sass/layout/_main.scss

@@ -404,7 +404,7 @@ table{
       top: 0;
       left: 0;
       border-style: solid;
-      border-width: 0 0 6px 6px;
+      border-width: 0 0 8px 8px;
       border-color: transparent transparent transparent $gray;
       cursor: pointer;
     }
@@ -419,6 +419,12 @@ table{
       background: rgba($gray-darker, 0.4);
     }
 
+    h5{
+      // icons in headline
+      .pf-module-icon-button{
+        margin-left: 5px;
+      }
+    }
   }
 
 }

sass/layout/_system-info.scss

@@ -134,6 +134,10 @@
       & > .fa{
         font-size: 10px;
       }
+
+      .fa-refresh{
+        @extend .pf-dialog-icon-button;
+      }
     }
   }
 }

sass/library/bootstrap-checkbox/_awesome-bootstrap-checkbox.scss

@@ -0,0 +1,245 @@
+//
+// Checkboxes
+// --------------------------------------------------
+
+
+$font-family-icon: 'FontAwesome' !default;
+$fa-var-check: "\f00c" !default;
+$check-icon: $fa-var-check !default;
+
+@mixin checkbox-variant($parent, $color) {
+  #{$parent} input[type="checkbox"]:checked + label,
+  #{$parent} input[type="radio"]:checked + label {
+    &::before {
+      background-color: $color;
+      border-color: $color;
+    }
+    &::after{
+      color: #fff;
+    }
+  }
+}
+
+@mixin checkbox-variant-indeterminate($parent, $color) {
+  #{$parent} input[type="checkbox"]:indeterminate + label,
+  #{$parent} input[type="radio"]:indeterminate + label {
+    &::before {
+      background-color: $color;
+      border-color: $color;
+    }
+    &::after{
+      background-color: #fff;
+    }
+  }
+}
+
+
+
+.checkbox{
+  padding-left: 20px;
+
+  label{
+    display: inline-block;
+    vertical-align: middle;
+    position: relative;
+    padding-left: 5px;
+
+    &::before{
+      content: "";
+      display: inline-block;
+      position: absolute;
+      width: 17px;
+      height: 17px;
+      left: 0;
+      margin-left: -20px;
+      border: 1px solid $input-border;
+      border-radius: 3px;
+      background-color: $gray-dark;
+      @include transition(border 0.15s ease-in-out, color 0.15s ease-in-out);
+    }
+
+    &::after{
+      display: inline-block;
+      position: absolute;
+      width: 16px;
+      height: 16px;
+      left: 0;
+      top: 0;
+      margin-left: -20px;
+      padding-left: 3px;
+      padding-top: 1px;
+      font-size: 11px;
+      color: $input-color;
+    }
+  }
+
+  input[type="checkbox"],
+  input[type="radio"] {
+    opacity: 0;
+    z-index: 1;
+
+    &:focus + label::before{
+      @include tab-focus();
+    }
+
+    &:checked + label::after{
+      font-family: $font-family-icon;
+      content: $check-icon;
+    }
+
+    &:indeterminate + label::after{
+      display: block;
+      content: "";
+      width: 10px;
+      height: 3px;
+      background-color: #555555;
+      border-radius: 2px;
+      margin-left: -16.5px;
+      margin-top: 7px;
+    }
+
+    &:disabled + label{
+      opacity: 0.65;
+
+      &::before{
+        background-color: $input-bg-disabled;
+        cursor: not-allowed;
+      }
+    }
+
+  }
+
+  &.checkbox-circle label::before{
+    border-radius: 50%;
+  }
+
+  &.checkbox-inline{
+    margin-top: 0;
+  }
+}
+
+@include checkbox-variant('.checkbox-primary', $brand-primary);
+@include checkbox-variant('.checkbox-danger', $brand-danger);
+@include checkbox-variant('.checkbox-info', $brand-info);
+@include checkbox-variant('.checkbox-warning', $brand-warning);
+@include checkbox-variant('.checkbox-success', $brand-success);
+
+
+@include checkbox-variant-indeterminate('.checkbox-primary', $brand-primary);
+@include checkbox-variant-indeterminate('.checkbox-danger', $brand-danger);
+@include checkbox-variant-indeterminate('.checkbox-info', $brand-info);
+@include checkbox-variant-indeterminate('.checkbox-warning', $brand-warning);
+@include checkbox-variant-indeterminate('.checkbox-success', $brand-success);
+
+//
+// Radios
+// --------------------------------------------------
+
+@mixin radio-variant($parent, $color) {
+  #{$parent} input[type="radio"]{
+    + label{
+      &::after{
+        background-color: $color;
+      }
+    }
+    &:checked + label{
+      &::before {
+        border-color: $color;
+      }
+      &::after{
+        background-color: $color;
+      }
+    }
+  }
+}
+
+.radio{
+  padding-left: 20px;
+
+  label{
+    display: inline-block;
+    vertical-align: middle;
+    position: relative;
+    padding-left: 5px;
+
+    &::before{
+      content: "";
+      display: inline-block;
+      position: absolute;
+      width: 17px;
+      height: 17px;
+      left: 0;
+      margin-left: -20px;
+      border: 1px solid $input-border;
+      border-radius: 50%;
+      background-color: $gray-dark;
+      @include transition(border 0.15s ease-in-out);
+    }
+
+    &::after{
+      display: inline-block;
+      position: absolute;
+      content: " ";
+      width: 11px;
+      height: 11px;
+      left: 3px;
+      top: 3px;
+      margin-left: -20px;
+      border-radius: 50%;
+      background-color: $input-color;
+      @include scale(0, 0);
+
+      @include transition-transform(.1s cubic-bezier(.8,-0.33,.2,1.33));
+      //curve - http://cubic-bezier.com/#.8,-0.33,.2,1.33
+    }
+  }
+
+  input[type="radio"]{
+    opacity: 0;
+    z-index: 1;
+
+    &:focus + label::before{
+      @include tab-focus();
+    }
+
+    &:checked + label::after{
+      @include scale(1, 1);
+    }
+
+    &:disabled + label{
+      opacity: 0.65;
+
+      &::before{
+        cursor: not-allowed;
+      }
+    }
+
+  }
+
+  &.radio-inline{
+    margin-top: 0;
+  }
+}
+
+@include radio-variant('.radio-primary', $brand-primary);
+@include radio-variant('.radio-danger', $brand-danger);
+@include radio-variant('.radio-info', $brand-info);
+@include radio-variant('.radio-warning', $brand-warning);
+@include radio-variant('.radio-success', $brand-success);
+
+
+input[type="checkbox"],
+input[type="radio"] {
+  &.styled:checked + label:after {
+    font-family: $font-family-icon;
+    content: $check-icon;
+  }
+  .styled:checked + label {
+    &::before {
+      color: #fff;
+    }
+    &::after {
+      color: #fff;
+    }
+  }
+}

sass/library/fontawesome/_icons.scss

@@ -695,3 +695,30 @@
 .#{$fa-css-prefix}-bluetooth:before { content: $fa-var-bluetooth; }
 .#{$fa-css-prefix}-bluetooth-b:before { content: $fa-var-bluetooth-b; }
 .#{$fa-css-prefix}-percent:before { content: $fa-var-percent; }
+.#{$fa-css-prefix}-gitlab:before { content: $fa-var-gitlab; }
+.#{$fa-css-prefix}-wpbeginner:before { content: $fa-var-wpbeginner; }
+.#{$fa-css-prefix}-wpforms:before { content: $fa-var-wpforms; }
+.#{$fa-css-prefix}-envira:before { content: $fa-var-envira; }
+.#{$fa-css-prefix}-universal-access:before { content: $fa-var-universal-access; }
+.#{$fa-css-prefix}-wheelchair-alt:before { content: $fa-var-wheelchair-alt; }
+.#{$fa-css-prefix}-question-circle-o:before { content: $fa-var-question-circle-o; }
+.#{$fa-css-prefix}-blind:before { content: $fa-var-blind; }
+.#{$fa-css-prefix}-audio-description:before { content: $fa-var-audio-description; }
+.#{$fa-css-prefix}-volume-control-phone:before { content: $fa-var-volume-control-phone; }
+.#{$fa-css-prefix}-braille:before { content: $fa-var-braille; }
+.#{$fa-css-prefix}-assistive-listening-systems:before { content: $fa-var-assistive-listening-systems; }
+.#{$fa-css-prefix}-asl-interpreting:before,
+.#{$fa-css-prefix}-american-sign-language-interpreting:before { content: $fa-var-american-sign-language-interpreting; }
+.#{$fa-css-prefix}-deafness:before,
+.#{$fa-css-prefix}-hard-of-hearing:before,
+.#{$fa-css-prefix}-deaf:before { content: $fa-var-deaf; }
+.#{$fa-css-prefix}-glide:before { content: $fa-var-glide; }
+.#{$fa-css-prefix}-glide-g:before { content: $fa-var-glide-g; }
+.#{$fa-css-prefix}-signing:before,
+.#{$fa-css-prefix}-sign-language:before { content: $fa-var-sign-language; }
+.#{$fa-css-prefix}-low-vision:before { content: $fa-var-low-vision; }
+.#{$fa-css-prefix}-viadeo:before { content: $fa-var-viadeo; }
+.#{$fa-css-prefix}-viadeo-square:before { content: $fa-var-viadeo-square; }
+.#{$fa-css-prefix}-snapchat:before { content: $fa-var-snapchat; }
+.#{$fa-css-prefix}-snapchat-ghost:before { content: $fa-var-snapchat-ghost; }
+.#{$fa-css-prefix}-snapchat-square:before { content: $fa-var-snapchat-square; }

sass/library/fontawesome/_mixins.scss

@@ -12,15 +12,49 @@
 }
 
 @mixin fa-icon-rotate($degrees, $rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
   -webkit-transform: rotate($degrees);
       -ms-transform: rotate($degrees);
           transform: rotate($degrees);
 }
 
 @mixin fa-icon-flip($horiz, $vert, $rotation) {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)";
   -webkit-transform: scale($horiz, $vert);
       -ms-transform: scale($horiz, $vert);
           transform: scale($horiz, $vert);
 }
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+@mixin sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+@mixin sr-only-focusable {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}

sass/library/fontawesome/_screen-reader.scss

@@ -0,0 +1,5 @@
+// Screen Readers
+// -------------------------
+
+.sr-only { @include sr-only(); }
+.sr-only-focusable { @include sr-only-focusable(); }

sass/library/fontawesome/_variables.scss

@@ -4,9 +4,9 @@
 $fa-font-path:        "../fonts" !default;
 $fa-font-size-base:   14px !default;
 $fa-line-height-base: 1 !default;
-//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.5.0/fonts" !default; // for referencing Bootstrap CDN font files directly
+//$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.6.1/fonts" !default; // for referencing Bootstrap CDN font files directly
 $fa-css-prefix:       fa !default;
-$fa-version:          "4.5.0" !default;
+$fa-version:          "4.6.1" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
 $fa-li-width:         (30em / 14) !default;
@@ -20,6 +20,7 @@ $fa-var-align-left: "\f036";
 $fa-var-align-right: "\f038";
 $fa-var-amazon: "\f270";
 $fa-var-ambulance: "\f0f9";
+$fa-var-american-sign-language-interpreting: "\f2a3";
 $fa-var-anchor: "\f13d";
 $fa-var-android: "\f17b";
 $fa-var-angellist: "\f209";
@@ -50,8 +51,11 @@ $fa-var-arrows: "\f047";
 $fa-var-arrows-alt: "\f0b2";
 $fa-var-arrows-h: "\f07e";
 $fa-var-arrows-v: "\f07d";
+$fa-var-asl-interpreting: "\f2a3";
+$fa-var-assistive-listening-systems: "\f2a2";
 $fa-var-asterisk: "\f069";
 $fa-var-at: "\f1fa";
+$fa-var-audio-description: "\f29e";
 $fa-var-automobile: "\f1b9";
 $fa-var-backward: "\f04a";
 $fa-var-balance-scale: "\f24e";
@@ -86,6 +90,7 @@ $fa-var-bitbucket: "\f171";
 $fa-var-bitbucket-square: "\f172";
 $fa-var-bitcoin: "\f15a";
 $fa-var-black-tie: "\f27e";
+$fa-var-blind: "\f29d";
 $fa-var-bluetooth: "\f293";
 $fa-var-bluetooth-b: "\f294";
 $fa-var-bold: "\f032";
@@ -94,6 +99,7 @@ $fa-var-bomb: "\f1e2";
 $fa-var-book: "\f02d";
 $fa-var-bookmark: "\f02e";
 $fa-var-bookmark-o: "\f097";
+$fa-var-braille: "\f2a1";
 $fa-var-briefcase: "\f0b1";
 $fa-var-btc: "\f15a";
 $fa-var-bug: "\f188";
@@ -196,6 +202,8 @@ $fa-var-cutlery: "\f0f5";
 $fa-var-dashboard: "\f0e4";
 $fa-var-dashcube: "\f210";
 $fa-var-database: "\f1c0";
+$fa-var-deaf: "\f2a4";
+$fa-var-deafness: "\f2a4";
 $fa-var-dedent: "\f03b";
 $fa-var-delicious: "\f1a5";
 $fa-var-desktop: "\f108";
@@ -217,6 +225,7 @@ $fa-var-empire: "\f1d1";
 $fa-var-envelope: "\f0e0";
 $fa-var-envelope-o: "\f003";
 $fa-var-envelope-square: "\f199";
+$fa-var-envira: "\f299";
 $fa-var-eraser: "\f12d";
 $fa-var-eur: "\f153";
 $fa-var-euro: "\f153";
@@ -300,8 +309,11 @@ $fa-var-git-square: "\f1d2";
 $fa-var-github: "\f09b";
 $fa-var-github-alt: "\f113";
 $fa-var-github-square: "\f092";
+$fa-var-gitlab: "\f296";
 $fa-var-gittip: "\f184";
 $fa-var-glass: "\f000";
+$fa-var-glide: "\f2a5";
+$fa-var-glide-g: "\f2a6";
 $fa-var-globe: "\f0ac";
 $fa-var-google: "\f1a0";
 $fa-var-google-plus: "\f0d5";
@@ -325,6 +337,7 @@ $fa-var-hand-rock-o: "\f255";
 $fa-var-hand-scissors-o: "\f257";
 $fa-var-hand-spock-o: "\f259";
 $fa-var-hand-stop-o: "\f256";
+$fa-var-hard-of-hearing: "\f2a4";
 $fa-var-hashtag: "\f292";
 $fa-var-hdd-o: "\f0a0";
 $fa-var-header: "\f1dc";
@@ -397,6 +410,7 @@ $fa-var-long-arrow-down: "\f175";
 $fa-var-long-arrow-left: "\f177";
 $fa-var-long-arrow-right: "\f178";
 $fa-var-long-arrow-up: "\f176";
+$fa-var-low-vision: "\f2a8";
 $fa-var-magic: "\f0d0";
 $fa-var-magnet: "\f076";
 $fa-var-mail-forward: "\f064";
@@ -490,6 +504,7 @@ $fa-var-qq: "\f1d6";
 $fa-var-qrcode: "\f029";
 $fa-var-question: "\f128";
 $fa-var-question-circle: "\f059";
+$fa-var-question-circle-o: "\f29c";
 $fa-var-quote-left: "\f10d";
 $fa-var-quote-right: "\f10e";
 $fa-var-ra: "\f1d0";
@@ -544,8 +559,10 @@ $fa-var-shopping-bag: "\f290";
 $fa-var-shopping-basket: "\f291";
 $fa-var-shopping-cart: "\f07a";
 $fa-var-sign-in: "\f090";
+$fa-var-sign-language: "\f2a7";
 $fa-var-sign-out: "\f08b";
 $fa-var-signal: "\f012";
+$fa-var-signing: "\f2a7";
 $fa-var-simplybuilt: "\f215";
 $fa-var-sitemap: "\f0e8";
 $fa-var-skyatlas: "\f216";
@@ -554,6 +571,9 @@ $fa-var-slack: "\f198";
 $fa-var-sliders: "\f1de";
 $fa-var-slideshare: "\f1e7";
 $fa-var-smile-o: "\f118";
+$fa-var-snapchat: "\f2ab";
+$fa-var-snapchat-ghost: "\f2ac";
+$fa-var-snapchat-square: "\f2ad";
 $fa-var-soccer-ball-o: "\f1e3";
 $fa-var-sort: "\f0dc";
 $fa-var-sort-alpha-asc: "\f15d";
@@ -655,6 +675,7 @@ $fa-var-twitter-square: "\f081";
 $fa-var-umbrella: "\f0e9";
 $fa-var-underline: "\f0cd";
 $fa-var-undo: "\f0e2";
+$fa-var-universal-access: "\f29a";
 $fa-var-university: "\f19c";
 $fa-var-unlink: "\f127";
 $fa-var-unlock: "\f09c";
@@ -673,11 +694,14 @@ $fa-var-venus: "\f221";
 $fa-var-venus-double: "\f226";
 $fa-var-venus-mars: "\f228";
 $fa-var-viacoin: "\f237";
+$fa-var-viadeo: "\f2a9";
+$fa-var-viadeo-square: "\f2aa";
 $fa-var-video-camera: "\f03d";
 $fa-var-vimeo: "\f27d";
 $fa-var-vimeo-square: "\f194";
 $fa-var-vine: "\f1ca";
 $fa-var-vk: "\f189";
+$fa-var-volume-control-phone: "\f2a0";
 $fa-var-volume-down: "\f027";
 $fa-var-volume-off: "\f026";
 $fa-var-volume-up: "\f028";
@@ -687,11 +711,14 @@ $fa-var-weibo: "\f18a";
 $fa-var-weixin: "\f1d7";
 $fa-var-whatsapp: "\f232";
 $fa-var-wheelchair: "\f193";
+$fa-var-wheelchair-alt: "\f29b";
 $fa-var-wifi: "\f1eb";
 $fa-var-wikipedia-w: "\f266";
 $fa-var-windows: "\f17a";
 $fa-var-won: "\f159";
 $fa-var-wordpress: "\f19a";
+$fa-var-wpbeginner: "\f297";
+$fa-var-wpforms: "\f298";
 $fa-var-wrench: "\f0ad";
 $fa-var-xing: "\f168";
 $fa-var-xing-square: "\f169";

sass/library/select2/theme/pathfinder/_layout.scss

@@ -43,7 +43,8 @@
       padding: 0;
     }
 
-    &[aria-disabled=true] {
+    &[aria-disabled=true],
+    &[aria-selected=true]{
       color: $results-choice-fg-unselectable-color;
       background-color:  $results-choice-bg-unselectable-color;
 

sass/library/select2/theme/pathfinder/_multiple.scss

@@ -14,6 +14,7 @@
     list-style: none;
     margin: 0;
     padding: 0 5px;
+    width: 100%;
   }
 
   .select2-selection__clear {
@@ -42,6 +43,10 @@
       color: $remove-hover-color;
     }
   }
+
+  .select2-selection__placeholder {
+    color: $gray-light;
+  }
 }
 
 &[dir="rtl"] {

sass/pathfinder.scss

@@ -5,7 +5,7 @@
  * CSS - Cascading Style Sheets
  * Generated with Compass http://compass-style.org/
  *
- * Copyright 2015 - 2015, Exodus 4D - Mark Friedrich
+ * Copyright 2015 - 2016, Exodus 4D - Mark Friedrich
  *
  */
 
@@ -25,31 +25,30 @@
 @import "font-awesome";
 
 // Libraries (Remove if not needed)
-@import "library/custom-scrollbar/_mCustomScrollbar";           // malihu-custom-scrollbar-plugin
-@import "library/data-tables/_dataTables";                      // DataTables 1.10.3
-@import "library/data-tables/_dataTables-tableTools";           // DataTables 1.10.3 tableTools extension
-//@import "library/data-tables/_dataTables-bootstrap";          // DataTables 1.10.3 bootsrap integration
-@import "library/data-tables/_dataTables-fontAwesome";          // DataTables 1.10.3 fontAwesome support (sort icons)
-@import "library/data-tables/_dataTables-responsive";           // DataTables 1.10.3 fontAwesome support (sort icons)
+@import "library/custom-scrollbar/_mCustomScrollbar";               // malihu-custom-scrollbar-plugin
+@import "library/data-tables/_dataTables";                          // DataTables 1.10.3
+@import "library/data-tables/_dataTables-tableTools";               // DataTables 1.10.3 tableTools extension
+//@import "library/data-tables/_dataTables-bootstrap";              // DataTables 1.10.3 Bootstrap integration
+@import "library/data-tables/_dataTables-fontAwesome";              // DataTables 1.10.3 fontAwesome support (sort icons)
+@import "library/data-tables/_dataTables-responsive";               // DataTables 1.10.3 fontAwesome support (sort icons)
 
 
-@import "library/x-editable/_bootstrap-editable";               // X-editable - v1.5.0
-@import "library/pnotify/_pnotify.core";                        // PNotify styles
-@import "library/slidebars/_slidebars";                         // Slidebars Navigation
-@import "library/easy-pie-chart/_easyPieChart";                 // Easy Pie Chart 2.1.6
-@import "library/drag-to-select/_dragToSelect";                 // Drag to Select 1.1
-@import "library/select2/_core";                                // Select2 4.0.0
-@import "library/blue-imp-gallery/_blueimp-gallery";            // Blue Imp Gallery
-@import "library/blue-imp-gallery/_bootstrap-image-gallery";    // Blue Imp Gallery Bootstrap
-@import "library/blue-imp-gallery/_bootstrap-image-gallery";    // Blue Imp Gallery Bootstrap
-@import "library/bootstrap-toggle/_bootstrap2-toggle";          // Bootstrap Toggle v2.2.0
+@import "library/x-editable/_bootstrap-editable";                   // X-editable - v1.5.0
+@import "library/pnotify/_pnotify.core";                            // PNotify styles
+@import "library/slidebars/_slidebars";                             // Slidebars Navigation
+@import "library/easy-pie-chart/_easyPieChart";                     // Easy Pie Chart 2.1.6
+@import "library/drag-to-select/_dragToSelect";                     // Drag to Select 1.1
+@import "library/select2/_core";                                    // Select2 4.0.0
+@import "library/blue-imp-gallery/_blueimp-gallery";                // Blue Imp Gallery
+@import "library/blue-imp-gallery/_bootstrap-image-gallery";        // Blue Imp Gallery Bootstrap
+@import "library/blue-imp-gallery/_bootstrap-image-gallery";        // Blue Imp Gallery Bootstrap
+@import "library/bootstrap-toggle/_bootstrap2-toggle";              // Bootstrap Toggle v2.2.0
+@import "library/bootstrap-checkbox/_awesome-bootstrap-checkbox";   // Bootstrap Customized Checkboxes v0.3.7 - https://github.com/flatlogic/awesome-bootstrap-checkbox
 
 // Main THEME (Imports by order - do not change order)
 @import "main";
 @import "main-colorpallet";
 
-
-
 // my modules
 @import "layout/all";