', {
// system
- id: config.systemIdPrefix + data.id,
+ id: systemId,
class: [config.systemClass, statusClass].join(' ')
}).append(
// system head
@@ -321,15 +322,20 @@ define([
href: '#',
class: config.systemHeadNameClass
}).attr('data-value', data.name)
+ ).append(
+ // System locked status
+ $('', {
+ class: ['fa', 'fa-lock', 'fa-fw'].join(' ')
+ }).attr('title', 'locked')
).append(
// System effect color
$('', {
- class: ['fa fa-square ', Util.getEffectInfoForSystem('effect', 'class'), effectClass].join(' ')
- })
+ class: ['fa', 'fa-square ', 'fa-fw', Util.getEffectInfoForSystem('effect', 'class'), effectClass].join(' ')
+ }).attr('title', 'effect')
).append(
// expand option
$('', {
- class: ['fa fa-angle-down ', config.systemHeadExpandClass].join(' ')
+ class: ['fa', 'fa-angle-down ', config.systemHeadExpandClass].join(' ')
})
).prepend(
$('', {
@@ -337,7 +343,6 @@ define([
text: data.security
})
)
-
).append(
// system body
$('
', {
@@ -345,8 +350,27 @@ define([
})
).data('name', data.name).css({ "left": data.position.x + "px", 'top': data.position.y + 'px' });
- system.attr('data-id', data.id);
- system.attr('data-mapid', mapContainer.attr('data-mapid'));
+ system.data('id', data.id);
+ system.data('status', statusLabel);
+ system.attr('data-mapid', mapContainer.data('id'));
+
+ // locked system
+ if(
+ system.data( 'locked') !== true &&
+ data.locked === '1'
+ ){
+ system.toggleLockSystem(false, {hideNotification: true, hideCounter: true, map: map});
+ }
+
+ // rally system
+ if(
+ system.data( 'rally') !== true &&
+ data.rally === '1'
+ ){
+ system.toggleRallyPoint(false, {hideNotification: true, hideCounter: true});
+ }
+
+
return $(system);
};
@@ -365,7 +389,11 @@ define([
var mapContainer = $('
', {
id: config.mapIdPrefix + mapConfig.config.id,
class: [config.mapClass].join(' ')
- }).attr('data-mapid', mapConfig.config.id);
+ });
+
+ // add additional information
+ mapContainer.data('id', mapConfig.config.id);
+ mapContainer.data('name', mapConfig.config.name);
mapWrapper.append(mapContainer);
@@ -467,7 +495,9 @@ define([
makeEditable(newSystem);
// make new system draggable
- makeDraggable(map, newSystem);
+ if(! newSystem.data('locked')){
+ $(newSystem).multiDraggable({map: map, group: newSystem});
+ }
// make target
makeTarget(map, newSystem);
@@ -484,8 +514,8 @@ define([
$.each(connectedSystems, function(i, connectSystem){
var connectionData = {
- source: $(connectSystem).attr('data-id'),
- target: $(newSystem).attr('data-id'),
+ source: $(connectSystem).data('id'),
+ target: $(newSystem).data('id'),
type: 'wh'
};
drawConnection(map, connectionData);
@@ -501,6 +531,8 @@ define([
*/
var deleteSystem = function(map, system){
+ system = $(system);
+
// detach all connections
map.detachAllConnections(system);
@@ -517,7 +549,7 @@ define([
};
/**
- * make a syste name editable by x-editable
+ * make a system name editable by x-editable
* @param system
*/
var makeEditable = function(system){
@@ -530,6 +562,7 @@ define([
title: 'system name',
placement: 'top',
onblur: 'submit',
+ toggle: 'dblclick',
showbuttons: false
});
@@ -541,73 +574,112 @@ define([
};
/**
- * make one or multiple systems draggable
- * @param map
- * @param String[] systems
+ * get map Overlay element by any element within a specific map
+ * @returns {*}
*/
- var makeDraggable = function(map, systems){
+ $.fn.getMapOverlay = function(){
- var mapContainer = $(map.getContainer());
+ return $(this).parents('.' + config.mapWrapperClass).find('.' + config.mapOverlayClass);
+ };
- map.draggable(systems, {
- containment: mapContainer,// 'parent',
- zIndex: 2000,
- start: function(e){
- // drag start
+ /**
+ * get the map counter chart by an overlay
+ * @returns {*}
+ */
+ $.fn.getMapCounter = function(){
- // hide tooltip
- toggleSystemTooltip([e.target], 'hide');
- },
- stop: function(e, ui){
+ var mapOverlay = $(this);
- var system = $(e.target);
+ return mapOverlay.find('.' + Init.classes.pieChart.pieChartMapCounterClass);
+ };
- // drag stop
- var mapContainer = $( system.parent() );
+ /**
+ * draws the map update counter to the map overlay
+ * @param percent
+ * @returns {*}
+ */
+ $.fn.setMapUpdateCounter = function(percent, value){
- // update z-index for dragged system + connections
- updateZIndex(e.target);
+ var mapOverlay = $(this);
- // rerender tooltip
- toggleSystemTooltip([e.target], 'show');
+ // check if counter already exists
+ var counterChart = mapOverlay.getMapCounter();
- // set new position for popover edit field (system name)
- var distanceTop = ui.position.top;
- var distanceLeft = ui.position.left;
+ if(counterChart.length === 0){
+ // create new counter
- var placement = 'top';
- if(distanceTop < 100){
- placement = 'bottom';
- }
- if(distanceLeft < 100){
- placement = 'right';
- }
+ counterChart = $('
', {
+ class: [Init.classes.pieChart.class, Init.classes.pieChart.pieChartMapCounterClass].join(' ')
+ }).attr('data-percent', percent).append(
+ $('', {
+ text: value
+ })
+ );
- $(e.target).find('.' + config.systemHeadNameClass).editable('option', 'placement', placement);
+ mapOverlay.append(counterChart);
- },
- drag: function(e, ui){
+ // init counter
+ counterChart.initMapUpdateCounter();
- // if active make system snapping to a fixed grid
- if(config.mapSnapToGrid){
- var snapTolerance = $(this).draggable('option', 'snapTolerance');
- var topRemainder = ui.position.top % 20;
- var leftRemainder = ui.position.left % 20;
+ // set tooltip
+ mapOverlay.attr('data-toggle', 'tooltip');
+ mapOverlay.attr('data-placement', 'left');
+ mapOverlay.attr('title', 'update counter');
+ mapOverlay.tooltip();
+ }
- if (topRemainder <= snapTolerance) {
- ui.position.top = ui.position.top - topRemainder;
- }
+ return counterChart;
+ };
- if (leftRemainder <= snapTolerance) {
- ui.position.left = ui.position.left - leftRemainder;
- }
+ /**
+ * start the map update counter or reset
+ */
+ $.fn.startMapUpdateCounter = function(){
- map.repaint( e.target );
+ var mapOverlay = $(this);
+ var counterChart = mapOverlay.getMapCounter();
- }
+ var seconds = 10;
+ // get counter interval (in case there is an active one)
+ var interval = counterChart.data('interval');
+
+ if(interval){
+ clearInterval(interval);
+ }
+
+ mapOverlay.fadeIn(200);
+
+ var counterChartLabel = counterChart.find('span');
+
+ var percentPerCount = 100 / seconds;
+
+ var timer = function(){
+ seconds--;
+
+ counterChart.data('easyPieChart').update( percentPerCount * seconds);
+ counterChartLabel.text(seconds);
+ if(seconds <= 0){
+ clearInterval(mapUpdateCounter);
+
+
+ setTimeout(function(){
+ mapOverlay.fadeOut(200);
+ counterChart.data('interval', false);
+ }, 800);
+
+ return;
}
- });
+ };
+
+ // start timer
+ var mapUpdateCounter = setInterval(timer, 1000);
+ counterChart.data('easyPieChart').update( percentPerCount * seconds);
+ counterChartLabel.text(seconds);
+
+ // store counter
+ counterChart.data('interval', mapUpdateCounter);
+
};
/**
@@ -670,6 +742,14 @@ define([
source: config.systemIdPrefix + connectionData.source,
target: config.systemIdPrefix + connectionData.target,
type: connectionData.type
+
+ /* experimental (straight connections)
+ anchors: [
+ [ "Perimeter", { shape: 'Rectangle' }],
+ [ "Perimeter", { shape: 'Rectangle' }]
+ ]
+ */
+
});
// set Observer for new Connection
@@ -679,7 +759,7 @@ define([
};
/**
- * load contextmenu template for map
+ * load context menu template for map
*/
var initMapContextMenu = function(){
@@ -692,7 +772,9 @@ define([
id: config.mapContextMenuId,
items: [
{icon: 'fa-plus', action: 'add_system', text: 'add system'},
- {icon: 'fa-info-circle', action: 'info', text: 'info'}
+ {icon: 'fa-info', action: 'info', text: 'info'},
+ {divider: true},
+ {icon: 'fa-eraser', action: 'delete_systems', text: 'delete systems'}
]
};
@@ -712,10 +794,10 @@ define([
var moduleData = {
id: config.connectionContextMenuId,
items: [
- {icon: 'fa-info-circle', action: 'info', text: 'info'},
+ {icon: 'fa-info', action: 'info', text: 'info'},
{icon: 'fa-plane', action: 'frigate', text: 'frigate hole'},
{icon: 'fa-warning', action: 'preserve_mass', text: 'preserve mass'},
- {text: 'change status', subitems: [
+ {icon: 'fa-reply fa-rotate-180', text: 'change status', subitems: [
{subIcon: 'fa-clock-o', subAction: 'eol', subText: 'toggle EOL'},
{subDivider: true},
{subIcon: 'fa-circle', subAction: 'status_fresh', subText: 'stage 0 (fresh)'},
@@ -724,7 +806,7 @@ define([
]},
{divider: true},
- {icon: 'fa-eraser', action: 'delete', text: 'delete'},
+ {icon: 'fa-eraser', action: 'delete', text: 'delete'}
]
};
@@ -757,10 +839,11 @@ define([
id: config.systemContextMenuId,
items: [
{icon: 'fa-plus', action: 'add_system', text: 'add system'},
- {icon: 'fa-eraser', action: 'delete_system', text: 'delete system'},
- {icon: 'fa-info-circle', action: 'info', text: 'info'},
+ {icon: 'fa-lock', action: 'lock_system', text: 'lock system'},
+ {icon: 'fa-users', action: 'set_rally', text: 'set rally point'},
+ {icon: 'fa-reply fa-rotate-180', text: 'change status', subitems: systemStatus},
{divider: true},
- {text: 'change status', subitems: systemStatus}
+ {icon: 'fa-eraser', action: 'delete_system', text: 'delete system'}
]
};
@@ -769,23 +852,34 @@ define([
};
/**
- * set up contextmenu for all Systems within a given map
+ * set up context menu for all Systems within a given map
* @param endpoints
*/
var setSystemObserver = function(map, system){
- var systemHeadExpand = $( $(system).find('.' + config.systemHeadExpandClass) );
- var systemBody = $( $(system).find('.' + config.systemBodyClass) );
+ system = $(system);
+
+ var systemHeadExpand = $( system.find('.' + config.systemHeadExpandClass) );
+ var systemBody = $( system.find('.' + config.systemBodyClass) );
var bodyItemheight = 16;
- // init system body expand
- systemHeadExpand.hover(function(e){
+ // init system tooltips ================================================================
+ var systemTooltipOptions = {
+ toggle: 'tooltip',
+ placement: 'right',
+ viewport: system.id
+ };
+
+ system.find('.fa').tooltip(systemTooltipOptions);
+
+ // init system body expand ============================================================
+ systemHeadExpand.hoverIntent(function(e){
// hover in
var hoverSystem = $(this).parents('.' + config.systemClass);
// get ship counter and calculate expand height
- var shipCounter = parseInt( $(system).attr('data-original-title') );
+ var shipCounter = parseInt( system.attr('data-original-title') );
var expandheight = shipCounter * bodyItemheight;
@@ -796,7 +890,7 @@ define([
'min-width': '150px'
},
{
- queue:false,
+ // queue:false,
duration: 100,
step: function(){
// repaint connections of current system
@@ -818,7 +912,7 @@ define([
'min-width': '80px'
},
{
- queue:false,
+ // queue:false,
duration: 100,
step: function(){
// repaint connections of current system
@@ -838,14 +932,17 @@ define([
// context menu ==================================================================
// trigger context menu
- $(system).on('contextmenu', function(e){
+ system.on('contextmenu', function(e){
+
+ // hide all map tooltips
+
$(e.target).trigger('pf:openContextMenu', [e, this]);
e.preventDefault();
return false;
});
- // init contextmenu
- $(system).contextMenu({
+ // init context menu
+ system.contextMenu({
menuSelector: "#" + config.systemContextMenuId,
menuSelected: function (params) {
@@ -855,23 +952,60 @@ define([
// current system
var currentSystem = $(params.component);
+ // system name
+ var currentSystemName = currentSystem.getSystemInfo( ['name'] );
+
switch(action){
case 'add_system':
// add a new system
showNewSystemDialog(map, {sourceSystem: currentSystem} );
break;
- case 'delete_system':
- // confirm dialog
- bootbox.confirm('Delete system with all its connections?', function(result) {
- if(result){
- var systemName = currentSystem.getSystemInfo(['name']);
- deleteSystem(map, currentSystem);
+ case 'lock_system':
+ // lock system
- Util.showNotify({title: 'System deleted', text: systemName, type: 'success'});
- }
- });
+ currentSystem.toggleLockSystem(true, {map: map});
+ // repaint connections, -> system changed its size!
+ map.repaint( currentSystem );
+ break;
+ case 'set_rally':
+ // set rally point
+
+ if( ! currentSystem.data( 'rally' ) ){
+
+ // show confirm dialog
+ var rallyDialog = bootbox.dialog({
+ message: 'Do you want to poke active pilots?',
+ title: 'Set rally point for system "' + currentSystemName + '"',
+ buttons: {
+ close: {
+ label: 'cancel',
+ className: 'btn-default',
+ callback: function(){
+ $(rallyDialog).modal('hide');
+ }
+ },
+ setRallyPoke: {
+ label: ' Set rally and poke',
+ className: 'btn-info',
+ callback: function() {
+ currentSystem.toggleRallyPoint(true, {});
+ }
+ },
+ setRallay: {
+ label: ' Set rally',
+ className: 'btn-primary',
+ callback: function() {
+ currentSystem.toggleRallyPoint(false, {});
+ }
+ }
+ }
+ });
+ }else{
+ // remove rally point
+ currentSystem.toggleRallyPoint(false, {});
+ }
break;
case 'change_status_unknown':
case 'change_status_friendly':
@@ -879,6 +1013,10 @@ define([
case 'change_status_hostile':
case 'change_status_empty':
case 'change_status_unscanned':
+
+ $(currentSystem).getMapOverlay().startMapUpdateCounter();
+
+
// remove all status classes from system
$.each(Init.classes.systemStatus, function(status, statusData){
currentSystem.removeClass( statusData.class );
@@ -887,10 +1025,25 @@ define([
// add new class
var statusString = action.split('_');
var statusClass = Util.getStatusInfoForSystem(statusString[2], 'class');
+ var statusLabel = Util.getStatusInfoForSystem(statusString[2], 'label');
+ currentSystem.data('status', statusLabel);
currentSystem.addClass( statusClass );
break;
- case 'info': console.log('info')
+ case 'delete_system':
+ // confirm dialog
+ bootbox.confirm('Delete system and all its connections?', function(result) {
+ if(result){
+ $(currentSystem).getMapOverlay().startMapUpdateCounter();
+
+
+ var systemName = currentSystem.getSystemInfo(['name']);
+ deleteSystem(map, currentSystem);
+
+ Util.showNotify({title: 'System deleted', text: systemName, type: 'success'});
+ }
+ });
+
break;
}
@@ -898,23 +1051,190 @@ define([
});
// load system data =================================================================================
- // trigger event for this system
- $(system).on('click', function(e){
+ system.on('click', function(e){
- // get current map
- var currentSystem = $(e.target).parents('.' + config.systemClass);
+ var system = $(this);
- markSystemActive(map, currentSystem);
+ if(e.which === 1){
+ // left mouse button
- // get parent Tab Content and fire update event
- var tabContentElement = getTabContentElementByMapElement(currentSystem);
+ if(e.ctrlKey === true){
+ // select system
+ system.toggleSelectSystem(map);
+ }else{
+ // activate system
+ markSystemActive(map, system);
- var data = {
- system: currentSystem
- };
+ // get parent Tab Content and fire update event
+ var tabContentElement = getTabContentElementByMapElement( system );
- $(tabContentElement).trigger('pf:updateSystemData', [data]);
+ var data = {
+ system: system
+ };
+
+ $(tabContentElement).trigger('pf:updateSystemData', [data]);
+ }
+
+ }
});
+
+
+ };
+
+ /**
+ * toggle select status of a system
+ */
+ $.fn.toggleSelectSystem = function(map){
+ var system = $(this);
+
+ var mapElement = system.parent();
+
+ if( system.data('locked') !== true ){
+
+ if( system.hasClass( config.systemSelectedClass ) ){
+ system.removeClass( config.systemSelectedClass );
+
+ // set single draggable for this system
+ system.multiDraggable({map: map, group: system});
+ }else{
+ system.addClass( config.systemSelectedClass );
+ }
+
+ // there can still be multiple selected systems :)
+ var selectedSystems = $(mapElement).getSelectedSystems();
+
+ if(selectedSystems.length > 0){
+ $(selectedSystems).multiDraggable({map: map, group: selectedSystems});
+ }
+
+ }else{
+ var systemName = system.getSystemInfo( ['name'] );
+
+ Util.showNotify({title: 'System is locked', text: systemName, type: 'error'});
+ }
+
+ };
+
+ /**
+ * get all selected (NOT active) systems in a map
+ * @returns {*}
+ */
+ $.fn.getSelectedSystems = function(){
+
+ var mapElement = $(this);
+
+ var systems = mapElement.find('.' + config.systemSelectedClass);
+
+ return systems;
+ };
+
+ /**
+ * toggle log status of a system
+ * @param poke
+ * @param options
+ */
+ $.fn.toggleLockSystem = function(poke, options){
+
+ var system = $(this);
+
+ var map = options.map;
+
+ var hideNotification = false;
+ if(options.hideNotification === true){
+ hideNotification = true;
+ }
+
+ var hideCounter = false;
+ if(options.hideCounter === true){
+ hideCounter = true;
+ }
+
+ var systemName = system.getSystemInfo( ['name'] );
+
+ if( system.data( 'locked' ) === true ){
+ system.data('locked', false);
+ system.removeClass( config.systemLockedClass );
+
+ // set draggable capability
+ system.multiDraggable({map: map, group: system});
+
+ if(! hideNotification){
+ Util.showNotify({title: 'System lock removed', text: 'System: ' + systemName, type: 'success'});
+ }
+ }else{
+ system.data('locked', true);
+ system.addClass( config.systemLockedClass );
+
+ // remove draggable capability
+ system.destroySystemDraggable();
+
+ if(! hideNotification){
+ Util.showNotify({title: 'System is locked', text: 'System: ' + systemName, type: 'success'});
+ }
+ }
+
+ if(! hideCounter){
+ $(system).getMapOverlay().startMapUpdateCounter();
+ }
+
+ };
+
+ /**
+ * toggle a system as rally point and display notifications
+ * @param poke
+ * @param options
+ */
+ $.fn.toggleRallyPoint = function(poke, options){
+
+ var system = $(this);
+
+ var rallyClass = Util.getInfoForSystem('rally', 'class');
+
+ var hideNotification = false;
+ if(options.hideNotification === true){
+ hideNotification = true;
+ }
+
+ var hideCounter = false;
+ if(options.hideCounter === true){
+ hideCounter = true;
+ }
+
+ // check of system is already marked as rally
+ if( system.data( 'rally' ) === true ){
+ system.removeClass( rallyClass );
+ system.data( 'rally', false );
+
+ if(! hideNotification){
+ Util.showNotify({title: 'Rally point removed', type: 'success'});
+ }
+ }else{
+ system.addClass( rallyClass );
+ system.data( 'rally', true );
+
+ if(! hideNotification){
+ var systemName = system.getSystemInfo( ['name'] );
+
+ var notificationOptions = {
+ title: 'New rally Point',
+ text: 'System: ' + systemName,
+ type: 'success'
+ };
+
+ if(poke === true){
+ // desktop poke
+ Util.showNotify(notificationOptions, {desktop: true, stack: 'barBottom'});
+ }else{
+ Util.showNotify(notificationOptions, {stack: 'barBottom'});
+ }
+ }
+
+ }
+
+ if(! hideCounter){
+ $(system).getMapOverlay().startMapUpdateCounter();
+ }
+
};
/**
@@ -961,7 +1281,7 @@ define([
// current map
var currentMapElement = $(params.component);
- var currentMapId = parseInt( currentMapElement.attr('data-mapid') );
+ var currentMapId = parseInt( currentMapElement.data('id') );
// get map instance
var currentMap = getMapInstance(currentMapId);
@@ -974,6 +1294,26 @@ define([
// add new system dialog
showNewSystemDialog(currentMap, {position: position});
break;
+ case 'delete_systems':
+ // delete all selected systems with its connections
+ var selectedSystems = $(currentMapElement).getSelectedSystems();
+
+ if(selectedSystems.length > 0){
+ bootbox.confirm('Delete ' + selectedSystems.length + ' selected systems and its connections?', function(result) {
+ if(result){
+
+ for(var i = 0; i < selectedSystems.length; i++){
+ deleteSystem(currentMap, selectedSystems[i]);
+ }
+
+ Util.showNotify({title: selectedSystems.length + ' systems deleted', type: 'success'});
+ }
+ });
+ }else{
+ Util.showNotify({title: 'No systems selected', type: 'error'});
+ }
+
+ break;
}
@@ -981,6 +1321,35 @@ define([
});
+ // init drag-frame selection
+ $(container).dragToSelect({
+ selectables: '.' + config.systemClass,
+ onHide: function (selectBox, deselectedSystems) {
+ var selectedSystems = $(container).getSelectedSystems();
+
+ if(selectedSystems.length > 0){
+ // make all selected systems draggable
+ Util.showNotify({title: selectedSystems.length + ' systems selected', type: 'success'});
+
+ $(selectedSystems).multiDraggable({map: map, group: selectedSystems});
+ }
+
+ // convert former group draggable systems so single draggable
+ for(var i = 0; i < deselectedSystems.length; i++){
+ $(deselectedSystems[i]).multiDraggable({map: map, group: deselectedSystems[i]});
+ }
+
+
+ },
+ onShow: function(){
+ },
+ onRefresh: function(){
+ }
+ });
+
+
+
+
// catch menu events ====================================================
// toggle "snap to grid" option
@@ -1102,8 +1471,11 @@ define([
for(var i = 0; i < info.length; i++){
switch(info[i]){
case 'name':
+ // get current system name/alias
systemInfo.push( $(this).find('.' + config.systemHeadNameClass).text() );
break;
+ default:
+ systemInfo.push('bad system query');
}
}
@@ -1161,6 +1533,8 @@ define([
className: 'btn-primary',
callback: function () {
+ $(options.sourceSystem).getMapOverlay().startMapUpdateCounter();
+
// get form Values
var form = $('#' + config.systemDialogId).find('form');
@@ -1212,7 +1586,7 @@ define([
}
);
- // make editable
+ // make dialog editable
var modalFields = $('.bootbox .modal-dialog').find('.pf-editable-system-status');
modalFields.editable({
@@ -1273,7 +1647,7 @@ define([
if(map.getContainer() !== undefined){
$.each(systems, function(i, system){
// get user Data for System
- var systemId = parseInt( $(system).attr('data-id') );
+ var systemId = parseInt( $(system).data('id') );
var tempUserData = null;
$.each(userData.data.systems, function(j, systemData){
@@ -1296,7 +1670,78 @@ define([
});
}
+ };
+ /**
+ * collect all data for export/save for a map
+ * @returns {{}}
+ */
+ $.fn.getMapData = function(){
+
+ var mapElement = $(this);
+
+ var mapData = {};
+
+ // check if there is an active map counter that prevents collecting map data
+ var overlay = mapElement.getMapOverlay();
+ var counterChart = overlay.getMapCounter();
+
+ var interval = counterChart.data('interval');
+
+ if(! interval){
+ // map config ---------------------------------
+ var mapConfig = {};
+ mapConfig.id = mapElement.data('id');
+ mapConfig.name = mapElement.data('name');
+ mapData.config = mapConfig;
+
+ // map data -----------------------------------
+ var data = {};
+
+ // systems ------------------------------------
+ var systemsData = [];
+
+ var systems = mapElement.find('.' + config.systemClass);
+
+ for(var i = 0; i < systems.length; i++){
+
+ var tempSystem = $(systems[i]);
+ var systemData = {};
+ systemData.id = tempSystem.data('id');
+ systemData.alias = tempSystem.find('.' + config.systemHeadNameClass).editable('getValue', true);
+ systemData.status = tempSystem.data('status');
+ systemData.locked = tempSystem.data('locked');
+ systemData.rally = tempSystem.data('rally');
+
+ // position -------------------------------
+ var positionData = {};
+ var currentX = tempSystem.css('left');
+ var currentY = tempSystem.css('top');
+
+ // remove 'px'
+ positionData.x = parseInt( currentX.substring(0, currentX.length - 2) );
+ positionData.y = parseInt( currentY.substring(0, currentY.length - 2) );
+
+ systemData.position = positionData;
+
+ systemsData.push(systemData);
+ }
+
+
+ data.systems = systemsData;
+
+ // connections --------------------------------
+ var connections = [];
+
+ data.connections = connections;
+
+ mapData.data = data;
+ }else{
+ return false;
+ }
+
+
+ return mapData;
};
/**
@@ -1359,9 +1804,6 @@ define([
});
-
-
-
};
/**
@@ -1371,6 +1813,17 @@ define([
// get Map Scrollbar
var scrollableElement = $(this).find('.' + config.mapWrapperClass);
initCutomScrollbar( scrollableElement );
+
+ // add map overlay container after scrollbar is initiated
+ // because of its absolute positon
+ var mapOverlay = $('
', {
+ class: config.mapOverlayClass
+ });
+ scrollableElement.append(mapOverlay);
+
+
+ // reset map update timer
+ mapOverlay.setMapUpdateCounter(100, '5');
};
/**
@@ -1395,7 +1848,13 @@ define([
callbacks:{
onTotalScrollOffset: 0,
onTotalScrollBackOffset: 0,
- alwaysTriggerOffsets:true
+ alwaysTriggerOffsets:true,
+ whileScrolling:function(){
+ // update scroll position for drag-frame-selection
+ var mapElement = $(scrollableElement).find('.' + config.mapClass);
+ $(mapElement).data('scrollLeft', this.mcs.left);
+ $(mapElement).data('scrollTop', this.mcs.top);
+ }
},
advanced: {
@@ -1405,27 +1864,291 @@ define([
},
mouseWheel:{
enable:true,
- scrollAmount:"auto",
- axis:"x"
+ scrollAmount: 'auto',
+ axis: 'x',
+ preventDefault: true
},
- scrollbarPosition: "inside",
+ scrollbarPosition: 'inside',
autoDraggerLength: true
//autoHideScrollbar: false
});
};
-
/**
* scroll to a specific position in the map
* @returns {*} // string or id
*/
$.fn.scrollTo = function(position){
return this.each(function(){
- // todo re-comment
+ // todo re-comment not used jet
//$(this).mCustomScrollbar('scrollTo', position);
});
};
+ /**
+ * removes all draggable capability for a system
+ */
+ $.fn.destroySystemDraggable = function(){
+
+ var system = $(this);
+
+ if( system.data('ui-draggable') ){
+ system.draggable( 'destroy' );
+ }
+
+ };
+
+ /**
+ * drag function for single or multiple system dragging
+ * @param options
+ * @returns {*}
+ */
+ $.fn.multiDraggable = function (options) {
+
+ // offset for each system in relation to dragSystem
+ var initLeftOffset = [];
+ var initTopOffset = [];
+
+ // max drag distance for each direction. All systems should stay within map
+ var maxDragDistance = {
+ up: 0,
+ right: 0,
+ down: 0,
+ left: 0
+ };
+
+ var mapOffset = {};
+
+
+ /**
+ * function is called during dragging. Check for valid position for each dragable system
+ * @param event
+ * @param ui
+ */
+ var whileDragging = function(event, ui){
+ var dragSystem = $(event.target);
+ var dragSystemPosition = dragSystem.position();
+
+ var uiPosition = ui.position;
+
+ var offset = ui.offset;
+ var items = $(options.group);
+
+ // start map update timer
+ dragSystem.getMapOverlay().startMapUpdateCounter();
+
+ // get position movement from original position --------------------------------------------
+ var leftMove = ui.originalPosition.left - uiPosition.left;
+ var topMove = ui.originalPosition.top - uiPosition.top;
+
+ var dragDistance = {
+ up: 0,
+ right: 0,
+ down: 0,
+ left: 0
+ };
+
+ if(leftMove < 0){
+ dragDistance.right = leftMove * -1;
+ }else{
+ dragDistance.left = leftMove;
+ }
+
+ if(topMove < 0){
+ dragDistance.down = topMove * -1;
+ }else{
+ dragDistance.up = topMove;
+ }
+
+ // grid snapping ----------------------------------------------------------------------------
+ var leftPositionRemainder = 0;
+ var topPositionRemainder = 0;
+
+ // if active make system snapping to a fixed grid
+ if(config.mapSnapToGrid){
+ var snapTolerance = $(this).draggable('option', 'snapTolerance');
+ leftPositionRemainder = uiPosition.left % snapTolerance;
+ topPositionRemainder = uiPosition.top % snapTolerance;
+
+ // manipulate dragDistance
+ if (leftPositionRemainder <= snapTolerance) {
+ // ui.position.left = ui.position.left - leftRemainder;
+ dragDistance.left += leftPositionRemainder;
+ }
+
+ if (topPositionRemainder <= snapTolerance) {
+ // ui.position.top = ui.position.top - topRemainder;
+ dragDistance.up += topPositionRemainder;
+ }
+ }
+
+ // check that all systems are still inside the map -----------------------------------------
+ if(
+ dragDistance.left > maxDragDistance.left ||
+ dragDistance.right > maxDragDistance.right
+ ){
+ // stop move current system
+ ui.position.left = dragSystemPosition.left;
+ // stop move other systems
+ offset.left = dragSystemPosition.left + mapOffset.left;
+ }else{
+ offset.left -= leftPositionRemainder;
+ ui.position.left -= leftPositionRemainder;
+ }
+
+ if(
+ dragDistance.up > maxDragDistance.up ||
+ dragDistance.down > maxDragDistance.down
+ ){
+ // stop move current system
+ ui.position.top = dragSystemPosition.top;
+ // stop move other systems
+ offset.top = dragSystemPosition.top + mapOffset.top;
+ }else{
+ offset.top -= topPositionRemainder;
+ ui.position.top -= topPositionRemainder;
+ }
+
+
+
+ $.each(items || {}, function (key, tempSystem) {
+ tempSystem = $(tempSystem);
+
+ var left = offset.left + initLeftOffset[key];
+ var top = offset.top + initTopOffset[key];
+ var leftOffsetRemainder = 0;
+ var topOffsetRemainder = 0;
+
+ if(config.mapSnapToGrid){
+ leftOffsetRemainder = (initLeftOffset[key] % snapTolerance);
+ topOffsetRemainder = initTopOffset[key] % snapTolerance;
+ }
+
+ tempSystem.offset({
+ left: left - leftOffsetRemainder,
+ top: top - topOffsetRemainder
+ });
+
+ });
+
+ options.map.repaint(items);
+ };
+
+
+ return this.each(function () {
+
+ // remove previous dragging capability
+ $(this).destroySystemDraggable();
+
+
+ $(this).draggable(options, {
+ start: function (e, ui) {
+ // drag start
+
+ var dragSystem = $(e.target);
+ var position = dragSystem.position();
+ var items = $(options.group);
+
+ // start map update timer
+ $(e.target).getMapOverlay().startMapUpdateCounter();
+
+ // get map size
+ var mapElement = dragSystem.parent();
+
+ mapOffset = mapElement.offset();
+
+ var mapWidth = mapElement.width();
+ var mapHeight = mapElement.height();
+
+
+ // calculate offset for each system to dragSystem
+ $.each(items || {}, function (key, tempSystem) {
+ tempSystem = $(tempSystem);
+
+ // hide tooltip
+ toggleSystemTooltip( tempSystem, 'hide' );
+
+ var elemPos = tempSystem.position();
+ initLeftOffset[key] = elemPos.left - position.left;
+ initTopOffset[key] = elemPos.top - position.top;
+
+ var distanceRight = mapWidth - elemPos.left - tempSystem.outerWidth();
+ var distanceBottom = mapHeight - elemPos.top - tempSystem.outerHeight();
+
+ // calculate max drag distance
+ if(key === 0){
+ maxDragDistance.left = elemPos.left;
+ maxDragDistance.up = elemPos.top;
+ maxDragDistance.right = distanceRight;
+ maxDragDistance.down = distanceBottom;
+ }
+
+ if(elemPos.left < maxDragDistance.left){
+ maxDragDistance.left = elemPos.left;
+ }
+
+ if(elemPos.top < maxDragDistance.up){
+ maxDragDistance.up = elemPos.top;
+ }
+
+ if(distanceRight < maxDragDistance.right){
+ maxDragDistance.right = distanceRight;
+ }
+
+ if(distanceBottom < maxDragDistance.down){
+ maxDragDistance.down = distanceBottom;
+ }
+
+
+ });
+
+ },
+ drag: whileDragging,
+ stop: function(e, ui){
+ // stop dragging
+ whileDragging(e, ui);
+
+ var dragSystem = $(e.target);
+ var items = $(options.group);
+
+
+ var distanceTop = ui.position.top;
+ var distanceLeft = ui.position.left;
+
+ // start map update timer
+ dragSystem.getMapOverlay().startMapUpdateCounter();
+
+
+
+ $.each(items || {}, function (key, tempSystem) {
+ tempSystem = $(tempSystem);
+
+ // update z-index for dragged system + connections
+ updateZIndex(tempSystem);
+
+ // render tooltip
+ toggleSystemTooltip([tempSystem], 'show');
+
+ // set new position for popover edit field (system name)
+ var placement = 'top';
+ if(distanceTop < 100){
+ placement = 'bottom';
+ }
+ if(distanceLeft < 100){
+ placement = 'right';
+ }
+
+ tempSystem.find('.' + config.systemHeadNameClass).editable('option', 'placement', placement);
+
+ });
+
+ }
+ });
+ });
+
+
+ };
+
});
\ No newline at end of file
diff --git a/js/app/module_map.js b/js/app/module_map.js
index cc01d3d1..c9a96622 100644
--- a/js/app/module_map.js
+++ b/js/app/module_map.js
@@ -223,7 +223,7 @@ define([
// collect all relevant data for SystemInfoElement
var systemInfoData = {
- systemId: parseInt( $( mapData.system).attr('data-id') ),
+ systemId: parseInt( $( mapData.system).data('id') ),
mapId: parseInt( $( mapData.system).attr('data-mapid') )
};
@@ -1841,7 +1841,7 @@ define([
// get map Data
$.each(mapElements, function(i, mapElement){
- var mapId = parseInt( $(mapElement).attr('data-mapid') );
+ var mapId = parseInt( $(mapElement).data('id') );
var mapUserData = null;
// get user data for each active map
@@ -1953,10 +1953,6 @@ define([
$(scrollableElement).mCustomScrollbar( 'disable' );
});
-
-
-
-
}
}
};
@@ -2000,6 +1996,28 @@ define([
};
+ /**
+ * collect all data for export/save from each active map in the map module
+ * @returns {Array}
+ */
+ $.fn.getMapModuleData = function(){
+
+ // get all active map elements for module
+ var mapElements = $(this).getMaps();
+
+ var data = [];
+ for(var i = 0; i < mapElements.length; i++){
+
+ var mapData = $(mapElements[i]).getMapData();
+
+ if(mapData !== false){
+ data.push(mapData);
+ }
+ }
+
+ return data;
+ };
+
/**
* init map, load into a container and init custom scrollbar
* @param container
diff --git a/js/app/notification.js b/js/app/notification.js
index 0bcf8b7d..6d10192a 100644
--- a/js/app/notification.js
+++ b/js/app/notification.js
@@ -25,7 +25,7 @@ define([
delay: 5000, // visible time for notification in browser
mouse_reset: true, // Reset the hide timer if the mouse moves over the notice.
shadow: true,
- addclass: 'stack-bottomright',
+ addclass: 'stack-bottomright', // class for display, must changed on stack different stacks
width: '250px',
// animation settings
animation: {
@@ -51,24 +51,86 @@ define([
};
// stack container for all notifications
- var stack_bottomright = {
- dir1: 'up',
- dir2: 'left',
- firstpos1: 10,
- firstpos2: 10,
- spacing1: 5,
- spacing2: 5,
- push: 'bottom'
+ var stack = {
+ bottomRight: {
+ stack: {
+ dir1: 'up',
+ dir2: 'left',
+ firstpos1: 30,
+ firstpos2: 10,
+ spacing1: 5,
+ spacing2: 5,
+ push: 'bottom'
+ },
+ addclass: 'stack-bottomright',
+ width: '250px',
+ opacity: 0.8
+ },
+ barTop: {
+ stack: {
+ dir1: 'down',
+ dir2: 'right',
+ push: 'top',
+ spacing1: 0,
+ spacing2: 0,
+
+ },
+ addclass: 'stack-bar-top',
+ width: '80%',
+ opacity: 1
+ },
+ barBottom: {
+ stack: {
+ dir1: 'up',
+ dir2: 'right',
+ firstpos1: 30,
+ spacing1: 0,
+ spacing2: 0
+ },
+ addclass: 'stack-bar-bottom',
+ width: '100%',
+ opacity: 1
+ }
};
/**
* show a notification in browser and/or "Web Notifications" in OS
* @param customConfig
*/
- var showNotify = function(customConfig){
+ var showNotify = function(customConfig, settings){
customConfig = $.extend({}, config, customConfig );
+ // desktop notification
+ if(
+ settings &&
+ settings.desktop === true
+ ){
+ // ask for Web Notifications permission
+ PNotify.desktop.permission();
+
+ customConfig.delay = 10000;
+ customConfig.desktop.desktop = true;
+ }else{
+ customConfig.delay = 5000;
+ customConfig.desktop.desktop = false;
+ }
+
+ // set notification stack
+ if(
+ settings &&
+ settings.stack
+ ){
+ customConfig.stack = stack[settings.stack].stack;
+ customConfig.addclass = stack[settings.stack].addclass;
+ customConfig.width = stack[settings.stack].width;
+ customConfig.opacity = stack[settings.stack].opacity;
+ }else{
+ customConfig.stack = stack.bottomRight.stack;
+ customConfig.addclass = stack.bottomRight.addclass;
+ customConfig.opacity = stack.bottomRight.opacity;
+ }
+
switch(customConfig.type){
case 'info':
customConfig.icon = 'fa fa-info fa-fw fa-lg';
@@ -85,15 +147,6 @@ define([
default:
customConfig.icon = false;
}
- customConfig.stack = stack_bottomright;
-
- if(
- customConfig.desktop &&
- customConfig.desktop.desktop === true
- ){
- // ask for Web Notifications permission
- PNotify.desktop.permission();
- }
new PNotify(customConfig);
};
diff --git a/js/app/page.js b/js/app/page.js
index bdb70909..fac56b3f 100644
--- a/js/app/page.js
+++ b/js/app/page.js
@@ -18,10 +18,10 @@ define([
// page structure slidebars-menu classes
pageId: 'sb-site',
pageSlidebarClass: 'sb-slidebar',
- pageSlidebarLeftClass: 'sb-left',
- pageSlidebarRightClass: 'sb-right',
- pageSlideLeftWidth: '150px',
- pageSlideRightWidth: '150px',
+ pageSlidebarLeftClass: 'sb-left', // class for left menu
+ pageSlidebarRightClass: 'sb-right', // class for right menu
+ pageSlideLeftWidth: '150px', // slide distance left menu
+ pageSlideRightWidth: '150px', // slide distance right menu
// page structure
pageClass: 'pf-site',
@@ -32,16 +32,31 @@ define([
headMenuClass: 'pf-head-menu', // class for page head menu button (left)
headMapClass: 'pf-head-map', // class for page head map button (right)
+ // footer
+ pageFooterId: 'pf-footer', // id for page footer
+
// map module
mapModuleId: 'pf-map-module', // main map module
// system effect dialog
- systemEffectDialogWrapper: 'pf-system-effect-dialog-wrapper', // class for system effect dialog
+ systemEffectDialogWrapperClass: 'pf-system-effect-dialog-wrapper', // class for system effect dialog
+
+ // jump info dialog
+ jumpInfoDialogClass: 'pf-jump-info-dialog', // class for jump info dialog
+
+ // map legend dialog
+ mapLegendScrollspyId: 'pf-legend-scrollspy', // id for map legend scrollspy
+ mapLegendScrollspyNavClass: 'pf-legend-scrollspy-nav', // class for map legend scrollspy navigation
+ mapLegendNavigationListItemClass: 'pf-legend-navigation-list-item', // class for map legend li main navigation elements
// helper element
dynamicElementWrapperId: 'pf-dialog-wrapper'
};
+ var cache = {
+ systemEffectDialog: false // system effect info dialog
+ };
+
/**
* load main page structure elements and navigation container into body
@@ -81,6 +96,9 @@ define([
// load header
$('.' + config.pageClass).loadHeader();
+ // load footer
+ $('.' + config.pageClass).loadFooter();
+
// load left menu
$('.' + config.pageSlidebarLeftClass).loadLeftMenu();
@@ -119,6 +137,28 @@ define([
).on('click', function(){
$(document).triggerMenuEvent('ShowSystemEffectInfo');
})
+ ).append(
+ $('', {
+ class: 'list-group-item',
+ href: '#'
+ }).html(' Jump info').prepend(
+ $('',{
+ class: 'fa fa-space-shuttle fa-fw'
+ })
+ ).on('click', function(){
+ $(document).triggerMenuEvent('ShowJumpInfo');
+ })
+ ).append(
+ $('', {
+ class: 'list-group-item',
+ href: '#'
+ }).html(' Notification test').prepend(
+ $('',{
+ class: 'fa fa-bullhorn fa-fw'
+ })
+ ).on('click', function(){
+ $(document).triggerMenuEvent('NotificationTest');
+ })
).append(
$('', {
class: 'list-group-item',
@@ -150,6 +190,17 @@ define([
).on('click', function(){
$('#' + config.mapModuleId).getActiveMap().triggerMenuEvent('Grid', {button: this});
})
+ ).append(
+ $('', {
+ class: 'list-group-item',
+ href: '#'
+ }).html(' Legend').prepend(
+ $('',{
+ class: 'fa fa-info fa-fw'
+ })
+ ).on('click', function(){
+ $(document).triggerMenuEvent('Legend', {button: this});
+ })
)
);
};
@@ -200,15 +251,202 @@ define([
Render.showModule(moduleConfig, moduleData);
};
+ /**
+ * load page footer
+ */
+ $.fn.loadFooter = function(){
+
+ var pageElement = $(this);
+
+ var moduleConfig = {
+ name: 'modules/footer',
+ position: pageElement,
+ link: 'append',
+ functions: {
+ after: function(){
+
+ }
+ }
+ };
+
+ var moduleData = {
+ id: config.pageFooterId
+ };
+
+ Render.showModule(moduleConfig, moduleData);
+
+ };
+
/**
* catch all global document events
*/
var setDocumentObserver = function(){
$(document).on('pf:menuShowSystemEffectInfo', function(e){
// show system effects info box
+ showSystemEffectInfoDialog();
+ });
+
+ $(document).on('pf:menuShowJumpInfo', function(e){
+ // show system effects info box
+ showJumpInfoDialog();
+ });
+
+ $(document).on('pf:menuNotificationTest', function(e){
+ // show system effects info box
+ notificationTest();
+ });
+
+ $(document).on('pf:menuLegend', function(e){
+ // show map legend
+ showMaplegend();
+ });
+
+ showMaplegend();
+ };
+
+ /**
+ * shows the map legend modal dialog
+ */
+ var showMaplegend = function(){
+
+ requirejs(['text!templates/modules/map_legend_dialog.html', 'lib/mustache'], function(template, Mustache) {
+
+ var data = {
+ scrollspyId: config.mapLegendScrollspyId,
+ scrollspyNavClass: config.mapLegendScrollspyNavClass,
+ scrollspyNavLiClass: config.mapLegendNavigationListItemClass,
+ pieChartClass : Init.classes.pieChart.pieChartMapCounterClass,
+ mapCounterClass : Init.classes.pieChart.pieChartMapCounterClass
+ };
+
+ var content = Mustache.render(template, data);
+
+ // show dialog
+ var mapLegendDialog = bootbox.dialog({
+ title: 'Map legend',
+ message: content,
+ className: 'medium',
+ buttons: {
+ success: {
+ label: 'close',
+ className: "btn-primary",
+ callback: function() {
+ $(mapLegendDialog).modal('hide');
+ }
+ }
+ },
+ show: false
+ });
+
+ mapLegendDialog.modal('show');
+
+ mapLegendDialog.on('shown.bs.modal', function(e) {
+ // modal os open
+ });
+
+ var scrollspyElement = $('#' + config.mapLegendScrollspyId);
+
+ // init scrollbar
+ scrollspyElement.mCustomScrollbar({
+ axis: 'y',
+ theme: 'light-thick',
+ scrollInertia: 200,
+ autoExpandScrollbar: false,
+ scrollButtons:{
+ scrollAmount: 30,
+ enable: true
+ },
+ advanced: {
+ updateOnBrowserResize: true,
+ updateOnContentResize: true
+ },
+ callbacks:{
+ onInit: function(){
+ // init fake-map update counter
+ scrollspyElement.find('.' + data.mapCounterClass).initMapUpdateCounter();
+
+ // set navigation button observer
+ var mainNavigationLinks = $('.' + config.mapLegendScrollspyNavClass).find('a');
+ // text anchor links
+ var subNavigationLinks = scrollspyElement.find('a[data-target]');
+
+ var navigationLinks = mainNavigationLinks.add(subNavigationLinks);
+
+ navigationLinks.on('click', function(e){
+ e.preventDefault();
+
+ // scroll to anchor
+ scrollspyElement.mCustomScrollbar("scrollTo", $(this).attr('data-target'));
+
+ var mainNavigationLiElement = $(this).parent('.' + config.mapLegendNavigationListItemClass);
+
+ // if link is a main navigation link (not an anchor link)
+ if(mainNavigationLiElement.length > 0){
+ // remove all active classes
+ $('.' + config.mapLegendScrollspyNavClass).find('li').removeClass('active');
+
+ // set new active class
+ $(this).parent().addClass('active');
+ }
+
+ });
+
+ }
+ },
+ mouseWheel:{
+ enable: true,
+ scrollAmount: 200,
+ axis: 'y',
+ preventDefault: true // do not scroll parent at the end
+ },
+ scrollbarPosition: 'outsite',
+ autoDraggerLength: true
+ });
+
+
+
+ });
+
+ };
+
+ /**
+ * shows a test notification for desktop messages
+ */
+ var notificationTest = function(){
+ Util.showNotify({title: 'Test Notification', text: 'Accept browser security question'}, {desktop: true, stack: 'barBottom'});
+ };
+
+ /**
+ * show jump info dialog
+ */
+ var showJumpInfoDialog = function(){
+
+ requirejs(['text!templates/modules/jump_info_dialog.html', 'lib/mustache'], function(template, Mustache) {
+
+ var data = {};
+
+ var content = Mustache.render(template, data);
+
+ var signatureReaderDialog = bootbox.dialog({
+ className: config.jumpInfoDialogClass,
+ title: 'Wormhole jump information',
+ message: content
+ });
+
+ });
+
+ };
+
+ /**
+ * show system effect dialog
+ */
+ var showSystemEffectInfoDialog = function(){
+
+ // cache table structure
+ if(!cache.systemEffectDialog){
var dialogWrapperElement = $('
', {
- class: config.systemEffectDialogWrapper
+ class: config.systemEffectDialogWrapperClass
});
$.each( Init.systemEffects.wh, function( effectName, effectData ) {
@@ -266,15 +504,16 @@ define([
dialogWrapperElement.append( table.append( thead ).append( tbody ) );
+ cache.systemEffectDialog = dialogWrapperElement;
});
+ }
- bootbox.dialog({
- title: 'System effect information',
- message: dialogWrapperElement
- });
-
+ bootbox.dialog({
+ title: 'System effect information',
+ message: cache.systemEffectDialog
});
- }
+
+ };
});
\ No newline at end of file
diff --git a/js/app/util.js b/js/app/util.js
index 950e82d2..d310b2a8 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -1,7 +1,11 @@
/**
* Util
*/
-define(['jquery', 'app/init'], function($, Init) {
+define([
+ 'jquery',
+ 'app/init',
+ 'easyPieChart'
+], function($, Init) {
"use strict";
@@ -76,16 +80,96 @@ define(['jquery', 'app/init'], function($, Init) {
return formData;
};
- var showNotify = function(customConfig){
+
+ /**
+ * checks if an element is currently visible in viewport
+ * @returns {boolean}
+ */
+ $.fn.isInViewport = function(){
+
+ var element = $(this)[0];
+ var top = element.offsetTop;
+ var left = element.offsetLeft;
+ var width = element.offsetWidth;
+ var height = element.offsetHeight;
+
+
+ while(element.offsetParent) {
+ element = element.offsetParent;
+ top += element.offsetTop;
+ left += element.offsetLeft;
+ }
+
+ return (
+ top < (window.pageYOffset + window.innerHeight) &&
+ left < (window.pageXOffset + window.innerWidth) &&
+ (top + height) > window.pageYOffset &&
+ (left + width) > window.pageXOffset
+ );
+ };
+
+ /**
+ * trigger a notification (on screen or desktop)
+ * @param customConfig
+ * @param desktop
+ */
+ var showNotify = function(customConfig, desktop){
requirejs(['app/notification'], function(Notification) {
- Notification.showNotify(customConfig);
+ Notification.showNotify(customConfig, desktop);
});
};
// ==================================================================================================
+ /**
+ * init the map-update-counter as "easy-pie-chart"
+ */
+ $.fn.initMapUpdateCounter = function(){
+
+ var counterChart = $(this);
+
+ counterChart.easyPieChart({
+ barColor: function(percent){
+
+ var color = '#568a89';
+ if(percent <= 30){
+ color = '#d9534f';
+ }else if(percent <= 50){
+ color = '#f0ad4e';
+ }
+
+ return color;
+
+ },
+ trackColor: '#2b2b2b',
+ size: 30,
+ scaleColor: false,
+ lineWidth: 2,
+ animate: 1000
+ });
+
+ };
+
+ /**
+ * get some system info for a given info string (e.g. rally class)
+ * @param info
+ * @param option
+ * @returns {string}
+ */
+ var getInfoForSystem = function(info, option){
+
+ var systemInfo = '';
+
+ if(Init.classes.systemInfo.hasOwnProperty(info)){
+ systemInfo = Init.classes.systemInfo[info][option];
+ }
+
+
+ return systemInfo;
+ };
+
/**
* get some info for a given effect string
* @param effect
@@ -311,7 +395,7 @@ define(['jquery', 'app/init'], function($, Init) {
return {
showNotify: showNotify,
-
+ getInfoForSystem: getInfoForSystem,
getEffectInfoForSystem: getEffectInfoForSystem,
getSystemEffectData: getSystemEffectData,
getSystemEffectTable: getSystemEffectTable,
diff --git a/js/lib/bootbox.min.js b/js/lib/bootbox.min.js
index a7ea24fe..a300032c 100644
--- a/js/lib/bootbox.min.js
+++ b/js/lib/bootbox.min.js
@@ -3,4 +3,4 @@
*
* http://bootboxjs.com/license.txt
*/
-!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.bootbox=b(a.jQuery)}(this,function a(b,c){"use strict";function d(a){var b=q[o.locale];return b?b[a]:q.en[a]}function e(a,c,d){a.stopPropagation(),a.preventDefault();var e=b.isFunction(d)&&d(a)===!1;e||c.modal("hide")}function f(a){var b,c=0;for(b in a)c++;return c}function g(a,c){var d=0;b.each(a,function(a,b){c(a,b,d++)})}function h(a){var c,d;if("object"!=typeof a)throw new Error("Please supply an object of options");if(!a.message)throw new Error("Please specify a message");return a=b.extend({},o,a),a.buttons||(a.buttons={}),a.backdrop=a.backdrop?"static":!1,c=a.buttons,d=f(c),g(c,function(a,e,f){if(b.isFunction(e)&&(e=c[a]={callback:e}),"object"!==b.type(e))throw new Error("button with key "+a+" must be an object");e.label||(e.label=a),e.className||(e.className=2>=d&&f===d-1?"btn-primary":"btn-default")}),a}function i(a,b){var c=a.length,d={};if(1>c||c>2)throw new Error("Invalid argument length");return 2===c||"string"==typeof a[0]?(d[b[0]]=a[0],d[b[1]]=a[1]):d=a[0],d}function j(a,c,d){return b.extend(!0,{},a,i(c,d))}function k(a,b,c,d){var e={className:"bootbox-"+a,buttons:l.apply(null,b)};return m(j(e,d,c),b)}function l(){for(var a={},b=0,c=arguments.length;c>b;b++){var e=arguments[b],f=e.toLowerCase(),g=e.toUpperCase();a[f]={label:d(g)}}return a}function m(a,b){var d={};return g(b,function(a,b){d[b]=!0}),g(a.buttons,function(a){if(d[a]===c)throw new Error("button key "+a+" is not allowed (options are "+b.join("\n")+")")}),a}var n={dialog:"",header:"",header:" (http://robert-fleischmann.de)
+ * @version 2.1.6
+ **/
+!function(a,b){"object"==typeof exports?module.exports=b(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],b):b(a.jQuery)}(this,function(a){var b=function(a,b){var c,d=document.createElement("canvas");a.appendChild(d),"undefined"!=typeof G_vmlCanvasManager&&G_vmlCanvasManager.initElement(d);var e=d.getContext("2d");d.width=d.height=b.size;var f=1;window.devicePixelRatio>1&&(f=window.devicePixelRatio,d.style.width=d.style.height=[b.size,"px"].join(""),d.width=d.height=b.size*f,e.scale(f,f)),e.translate(b.size/2,b.size/2),e.rotate((-0.5+b.rotate/180)*Math.PI);var g=(b.size-b.lineWidth)/2;b.scaleColor&&b.scaleLength&&(g-=b.scaleLength+2),Date.now=Date.now||function(){return+new Date};var h=function(a,b,c){c=Math.min(Math.max(-1,c||0),1);var d=0>=c?!0:!1;e.beginPath(),e.arc(0,0,g,0,2*Math.PI*c,d),e.strokeStyle=a,e.lineWidth=b,e.stroke()},i=function(){var a,c;e.lineWidth=1,e.fillStyle=b.scaleColor,e.save();for(var d=24;d>0;--d)d%6===0?(c=b.scaleLength,a=0):(c=.6*b.scaleLength,a=b.scaleLength-c),e.fillRect(-b.size/2+a,0,c,1),e.rotate(Math.PI/12);e.restore()},j=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(a){window.setTimeout(a,1e3/60)}}(),k=function(){b.scaleColor&&i(),b.trackColor&&h(b.trackColor,b.trackWidth||b.lineWidth,1)};this.getCanvas=function(){return d},this.getCtx=function(){return e},this.clear=function(){e.clearRect(b.size/-2,b.size/-2,b.size,b.size)},this.draw=function(a){b.scaleColor||b.trackColor?e.getImageData&&e.putImageData?c?e.putImageData(c,0,0):(k(),c=e.getImageData(0,0,b.size*f,b.size*f)):(this.clear(),k()):this.clear(),e.lineCap=b.lineCap;var d;d="function"==typeof b.barColor?b.barColor(a):b.barColor,h(d,b.lineWidth,a/100)}.bind(this),this.animate=function(a,c){var d=Date.now();b.onStart(a,c);var e=function(){var f=Math.min(Date.now()-d,b.animate.duration),g=b.easing(this,f,a,c-a,b.animate.duration);this.draw(g),b.onStep(a,c,g),f>=b.animate.duration?b.onStop(a,c):j(e)}.bind(this);j(e)}.bind(this)},c=function(a,c){var d={barColor:"#ef1e25",trackColor:"#f9f9f9",scaleColor:"#dfe0e0",scaleLength:5,lineCap:"round",lineWidth:3,trackWidth:void 0,size:110,rotate:0,animate:{duration:1e3,enabled:!0},easing:function(a,b,c,d,e){return b/=e/2,1>b?d/2*b*b+c:-d/2*(--b*(b-2)-1)+c},onStart:function(){},onStep:function(){},onStop:function(){}};if("undefined"!=typeof b)d.renderer=b;else{if("undefined"==typeof SVGRenderer)throw new Error("Please load either the SVG- or the CanvasRenderer");d.renderer=SVGRenderer}var e={},f=0,g=function(){this.el=a,this.options=e;for(var b in d)d.hasOwnProperty(b)&&(e[b]=c&&"undefined"!=typeof c[b]?c[b]:d[b],"function"==typeof e[b]&&(e[b]=e[b].bind(this)));e.easing="string"==typeof e.easing&&"undefined"!=typeof jQuery&&jQuery.isFunction(jQuery.easing[e.easing])?jQuery.easing[e.easing]:d.easing,"number"==typeof e.animate&&(e.animate={duration:e.animate,enabled:!0}),"boolean"!=typeof e.animate||e.animate||(e.animate={duration:1e3,enabled:e.animate}),this.renderer=new e.renderer(a,e),this.renderer.draw(f),a.dataset&&a.dataset.percent?this.update(parseFloat(a.dataset.percent)):a.getAttribute&&a.getAttribute("data-percent")&&this.update(parseFloat(a.getAttribute("data-percent")))}.bind(this);this.update=function(a){return a=parseFloat(a),e.animate.enabled?this.renderer.animate(f,a):this.renderer.draw(a),f=a,this}.bind(this),this.disableAnimation=function(){return e.animate.enabled=!1,this},this.enableAnimation=function(){return e.animate.enabled=!0,this},g()};a.fn.easyPieChart=function(b){return this.each(function(){var d;a.data(this,"easyPieChart")||(d=a.extend({},b,a(this).data()),a.data(this,"easyPieChart",new c(this,d)))})}});
\ No newline at end of file
diff --git a/js/lib/jquery.hoverIntent.minified.js b/js/lib/jquery.hoverIntent.minified.js
new file mode 100644
index 00000000..653a0a65
--- /dev/null
+++ b/js/lib/jquery.hoverIntent.minified.js
@@ -0,0 +1,9 @@
+/*!
+ * hoverIntent v1.8.0 // 2014.06.29 // jQuery v1.9.1+
+ * http://cherne.net/brian/resources/jquery.hoverIntent.html
+ *
+ * You may use hoverIntent under the terms of the MIT license. Basically that
+ * means you are free to use hoverIntent as long as this header is left intact.
+ * Copyright 2007, 2014 Brian Cherne
+ */
+(function($){$.fn.hoverIntent=function(handlerIn,handlerOut,selector){var cfg={interval:100,sensitivity:6,timeout:0};if(typeof handlerIn==="object"){cfg=$.extend(cfg,handlerIn)}else{if($.isFunction(handlerOut)){cfg=$.extend(cfg,{over:handlerIn,out:handlerOut,selector:selector})}else{cfg=$.extend(cfg,{over:handlerIn,out:handlerIn,selector:handlerOut})}}var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if(Math.sqrt((pX-cX)*(pX-cX)+(pY-cY)*(pY-cY)) twbs-font-path('') parsed as string == right side)
// in Sass 3.3 this can be improved with: function-exists(twbs-font-path)
@@ -41,7 +41,7 @@ $font-size-large: ceil(($font-size-base * 1.24)); // ~16px
$font-size-small: ceil(($font-size-base * 0.85)); // ~11px
$font-size-h1: floor(($font-size-base * 1.85)); // ~24px
-$font-size-h2: floor(($font-size-base * 1.7)); // ~22px
+$font-size-h2: floor(($font-size-base * 1.24)); // ~22px
$font-size-h3: ceil(($font-size-base * 1.385)); // ~18px
$font-size-h4: $font-size-base; //ceil(($font-size-base * 1.32)); // ~17px
$font-size-h5: ceil(($font-size-base * 1.24)); // ~16px
@@ -201,8 +201,8 @@ $dropdown-fallback-border: #ccc;
$dropdown-divider-bg: $gray-light;
$dropdown-link-color: $gray-dark;
-$dropdown-link-hover-color: $gray-lighter;
-$dropdown-link-hover-bg: $gray-dark;
+$dropdown-link-hover-color: $gray-darkest;
+$dropdown-link-hover-bg: $gray-light;
$dropdown-link-active-color: #fff;
$dropdown-link-active-bg: $component-active-bg;
@@ -317,10 +317,10 @@ $navbar-default-border: none;
// Navbar links
$navbar-default-link-color: #777;
-$navbar-default-link-hover-color: #333;
-$navbar-default-link-hover-bg: transparent;
-$navbar-default-link-active-color: #555;
-$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%);
+$navbar-default-link-hover-color: #1d1d1d;
+$navbar-default-link-hover-bg: $gray-light;
+$navbar-default-link-active-color: $gray-darker;
+$navbar-default-link-active-bg: $gray-lighter;
$navbar-default-link-disabled-color: #ccc;
$navbar-default-link-disabled-bg: transparent;
@@ -445,7 +445,7 @@ $jumbotron-font-size: ceil(($font-size-base * 1.5));
//## Define colors for form feedback states and, by default, alerts.
$state-success-text: $gray-darker;
-$state-success-bg: lighten($brand-success, 50%);
+$state-success-bg: lighten($brand-success, 40%);
$state-success-border: $brand-success;
$state-info-text: $gray-darker;
@@ -468,7 +468,7 @@ $state-danger-border: $brand-danger;
$tooltip-max-width: 200px;
$tooltip-color: #fff;
$tooltip-bg: #000;
-$tooltip-opacity: .9;
+$tooltip-opacity: 0.9;
$tooltip-arrow-width: 5px;
$tooltip-arrow-color: $tooltip-bg;
@@ -641,8 +641,8 @@ $thumbnail-caption-padding: 9px;
//
//##
-$well-bg: #f5f5f5;
-$well-border: darken($well-bg, 7%);
+$well-bg: $gray-light;
+$well-border: $gray-dark;
//== Badges
@@ -706,8 +706,8 @@ $close-text-shadow: 0 1px 0 #fff;
$code-color: #c7254e;
$code-bg: #f9f2f4;
-$kbd-color: #fff;
-$kbd-bg: #333;
+$kbd-color: $gray-lighter;
+$kbd-bg: $gray-darker;
$pre-bg: #f5f5f5;
$pre-color: $gray-dark;
@@ -724,7 +724,7 @@ $abbr-border-color: $gray-light;
$headings-small-color: $gray-light;
$blockquote-small-color: $gray-light;
$blockquote-font-size: ($font-size-base * 1.25);
-$blockquote-border-color: $gray-lighter;
+$blockquote-border-color: $green;
$page-header-border-color: $gray-lighter;
diff --git a/sass/bootstrap/_dropdowns.scss b/sass/bootstrap/_dropdowns.scss
index 526be5b8..08341079 100644
--- a/sass/bootstrap/_dropdowns.scss
+++ b/sass/bootstrap/_dropdowns.scss
@@ -42,8 +42,9 @@
border: 1px solid $dropdown-fallback-border; // IE8 fallback
border: 1px solid $dropdown-border;
border-radius: $border-radius-base;
- @include box-shadow(0 6px 12px rgba(0,0,0,.175));
+ @include box-shadow(0 6px 12px rgba(0,0,0,.4));
background-clip: padding-box;
+ border-radius: 5px;
// Aligns the dropdown menu to right
//
@@ -61,7 +62,7 @@
// Links within the dropdown menu
> li > a {
display: block;
- padding: 3px 20px;
+ padding: 3px 15px;
clear: both;
font-weight: normal;
line-height: $line-height-base;
diff --git a/sass/bootstrap/_list-group.scss b/sass/bootstrap/_list-group.scss
index 8c5ea4cf..4a2918dd 100644
--- a/sass/bootstrap/_list-group.scss
+++ b/sass/bootstrap/_list-group.scss
@@ -21,7 +21,7 @@
.list-group-item {
position: relative;
display: block;
- padding: 7px 15px;
+ padding: 7px 8px;
background-color: $list-group-bg;
border-bottom: 1px solid $list-group-border;
diff --git a/sass/bootstrap/_navbar.scss b/sass/bootstrap/_navbar.scss
index f3b74c64..053777a3 100644
--- a/sass/bootstrap/_navbar.scss
+++ b/sass/bootstrap/_navbar.scss
@@ -12,7 +12,6 @@
position: relative;
min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: $navbar-margin-bottom;
- border-bottom: 1px solid $gray-dark;
// Prevent floats from breaking the navbar
@include clearfix();
@@ -256,6 +255,7 @@
> li {
float: left;
+ margin-right: 2px;
> a {
padding-top: $navbar-padding-vertical;
padding-bottom: $navbar-padding-vertical;
@@ -384,6 +384,7 @@
.navbar-default {
background: rgba( $navbar-default-bg, $navbar-default-opacity );
border-color: $navbar-default-border;
+ @include box-shadow(0 6px 12px rgba(0,0,0,.4));
.navbar-brand {
color: $navbar-default-brand-color;
diff --git a/sass/bootstrap/_scaffolding.scss b/sass/bootstrap/_scaffolding.scss
index cf020299..3215b447 100644
--- a/sass/bootstrap/_scaffolding.scss
+++ b/sass/bootstrap/_scaffolding.scss
@@ -57,6 +57,7 @@ a {
&:focus {
@include tab-focus();
+ text-decoration: none;
}
}
diff --git a/sass/bootstrap/_wells.scss b/sass/bootstrap/_wells.scss
index b8657118..a662f439 100644
--- a/sass/bootstrap/_wells.scss
+++ b/sass/bootstrap/_wells.scss
@@ -6,16 +6,20 @@
// Base class
.well {
min-height: 20px;
- padding: 19px;
+ padding: 10px;
margin-bottom: 20px;
background-color: $well-bg;
border: 1px solid $well-border;
- border-radius: $border-radius-base;
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+ @include border-radius(5px);
+ color: $gray-darker;
blockquote {
border-color: #ddd;
border-color: rgba(0,0,0,.15);
}
+
+ a {
+ color: $teal-light;
+ }
}
// Sizes
diff --git a/sass/layout/_main.scss b/sass/layout/_main.scss
index c9c49e84..34a62bd4 100644
--- a/sass/layout/_main.scss
+++ b/sass/layout/_main.scss
@@ -13,6 +13,13 @@ a{
}
}
+// emphasized text
+em{
+ &.pf-brand{
+ text-transform: uppercase;
+ }
+}
+
// ajax laoding indicator overlay
.pf-loading-overlay{
@@ -60,10 +67,10 @@ a{
// maps module ===================================================
#pf-map-module{
+ margin: 0 10px;
// Tabs (colored)
#pf-map-tabs {
- margin: 0 10px;
.pf-map-type-default{
border-top: 2px solid transparent;
@@ -82,20 +89,12 @@ a{
}
}
- .tab-content{
- width: calc(100% - 20px);
- }
-
}
// Tab Content Body Grid ========================================
.pf-map-content-row{
margin: 10px 0 0 0;
-
- // Table cell style
- > div{
-
- }
+ padding-bottom: 40px; // space for footer
// alle Module innerhalb einer row
.pf-module{
@@ -111,7 +110,6 @@ a{
// WH effects ==================================================
.pf-system-effect{
- margin-left: 5px;
cursor: default;
color: $gray-lighter;
}
@@ -140,7 +138,30 @@ a{
color: $wh-color-blackhole;
}
-// System security status ============================================
+// system info status ================================================
+.pf-system-info-rally{
+ .pf-system-head{
+ background-color: $pink-darker;
+
+ @include background-image(linear-gradient(-45deg,
+ $purple-dark 25%,
+ transparent 25%,
+ transparent 50%,
+ $purple-dark 50%,
+ $purple-dark 75%,
+ transparent 75%,
+ transparent));
+ background-size:25px 25px;
+ -webkit-animation:move 3s linear infinite;
+ -moz-animation:move 3s linear infinite;
+ -ms-animation:move 3s linear infinite;
+ animation:move 3s linear infinite;
+ }
+}
+
+
+// system security status ============================================
+
.pf-system-security-0-0{
color: $system-color-sec-0-0;
}
@@ -189,7 +210,8 @@ a{
.pf-system-sec{
margin-right: 5px;
- cursor: move;
+ cursor: -moz-grab;
+ cursor: -webkit-grab;
}
.pf-system-sec-highSec{
@@ -244,7 +266,7 @@ a{
}
// system effect info dialog
-.pf-system-effect-dialog-wrapper{
+.pf-system-effect-dialog-wrapper, .pf-jump-info-dialog{
.table{
margin: 15px 0;
font-size: 10px;
@@ -255,22 +277,121 @@ a{
}
}
-// tooltip ======================================================
-.tooltip-inner{
- opacity: 1;
- color: $teal;
- background-color: $gray;
- font-family: 'Oxygen Bold';
- padding: 5px 5px;
- @include border-radius(5px);
+// "fake connection" classes for the map legend
+.pf-connection{
+ box-sizing: content-box;
+ display: inline-block;
+ width: 30px;
+ height: 4px;
+ margin-right: 5px;
+ border-top: 2px solid $gray-light;
+ border-bottom: 2px solid $gray-light;
+ background-color: #3c3f41;
+
+ &.pf-connection-eol{
+ border-color: $pink-dark;
+ }
+
+ &.pf-connection-reduced{
+ background-color: $orange;
+ }
+
+ &.pf-connection-critical{
+ background-color: $red-darker;
+ }
+ &.pf-connection-frig{
+ border-style: dashed;
+ border-left: none;
+ border-right: none;
+ }
}
-.tooltip.top .tooltip-arrow{
+
+// global tooltip settings ======================================
+.tooltip-inner{
+ color: $green;
+ background-color: $gray;
+ font-family: 'Oxygen Bold';
+ padding: 5px 5px;
+ @include border-radius(3px);
+ @include box-shadow(0 6px 12px rgba(0,0,0,.4));
+}
+
+.tooltip.top .tooltip-arrow,{
border-top-color: $gray-light;
}
+.tooltip.right .tooltip-arrow,{
+ border-right-color: $gray-light;
+}
+
.tooltip.bottom .tooltip-arrow{
border-bottom-color: $gray-light;
}
+.tooltip.left .tooltip-arrow{
+ border-left-color: $gray-light;
+}
+
+// footer =======================================================
+#pf-footer{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ margin: 0;
+ background: rgba($gray, 0.3);
+}
+
+/*
+Animate the stripes
+*/
+@-webkit-keyframes move{
+ 0% {
+ background-position: 0 0;
+ }
+ 100% {
+ background-position: 50px 50px;
+ }
+}
+@-moz-keyframes move{
+ 0% {
+ background-position: 0 0;
+ }
+ 100% {
+ background-position: 50px 50px;
+ }
+}
+@-ms-keyframes move{
+ 0% {
+ background-position: 0 0;
+ }
+ 100% {
+ background-position: 50px 50px;
+ }
+}
+@keyframes move{
+ 0% {
+ background-position: 0 0;
+ }
+ 100% {
+ background-position: 50px 50px;
+ }
+}
+
+
+
+// TODO move in seperate file!!! ====================================
+
+#pf-legend-scrollspy{
+ position: relative;
+ height: 500px;
+ overflow: auto;
+}
+
+
+
+
+
+
diff --git a/sass/layout/_map.scss b/sass/layout/_map.scss
index d268f7f3..c9aafe71 100644
--- a/sass/layout/_map.scss
+++ b/sass/layout/_map.scss
@@ -30,26 +30,40 @@
// end bounce mixin ================================================
-.pf-map-wrapper{
- width: 100%;
- height: 530px;
- overflow: auto;
- padding: 5px;
- margin: 0 10px;
- background: rgba($gray-darker, 0.93);
+.pf-map-tab-content{
- box-shadow:inset -1px 1px 6px 0 rgba($black, 0.8);
- @include border-bottom-radius(5px);
- border: {
- width: 1px;
- style: solid;
- color: $gray-lighter;
+ .pf-map-wrapper{
+ position: relative;
+ width: 100%;
+ height: 530px;
+ overflow: auto;
+ padding: 5px;
+ background: rgba($gray-darker, 0.93);
+ box-shadow:inset -3px 3px 10px 0 rgba($black, 0.3);
+ @include border-bottom-radius(5px);
+ border: {
+ width: 1px;
+ style: solid;
+ color: $gray-lighter;
+ }
}
}
+.pf-map-overlay{
+ position: absolute;
+ display: none; // triggered by js
+ z-index: 10000;
+ width: 36px;
+ height: 36px;
+ bottom: 23px;
+ right: 10px;
+ background: rgba($black, 0.2);
+ @include border-radius(5px);
+}
+
// 20x20px grid background
.pf-grid-small{
- background-image: url("#{$base-url}/grid_20x20.png") !important;
+ background: url("#{$base-url}/grid_20x20.png") !important;
}
@@ -58,7 +72,6 @@
height: 500px;
position: relative;
-
.pf-system{
position: absolute;
min-width: 80px;
@@ -84,10 +97,15 @@
display: inline-block;
min-width: 41px;
color: $gray-lighter;
+ margin-right: 2px;
+ }
+
+ .fa-lock{
+ display: none; // triggered by system-lock class
}
.pf-system-head-expand{
- margin-left: 5px;
+ margin-left: 2px;
color: $gray-light;
display: none; // triggered by JS
}
@@ -141,12 +159,58 @@
}
}
+
+ // system specific tooltip style
+ .tooltip{
+
+ &.in{
+ opacity: 1;
+ }
+
+ .tooltip-inner{
+ color: $gray-dark;
+ background-color: $gray-lighter;
+ padding: 3px 3px;
+ }
+
+ }
+
+
+
}
+ // active system
.pf-system-active:not(.pf-map-endpoint-source):not(.pf-map-endpoint-target){
@include box-shadow($yellow-lighter 0px 0px 8px 0px);
}
+
+ // selected system
+ .pf-system-selected:not(.pf-map-endpoint-source):not(.pf-map-endpoint-target){
+ @include box-shadow($red-darkest 0px 0px 8px 0px);
+
+ .pf-system-head, .pf-system-body{
+ background-color: $red-darkest;
+ }
+ }
+
+ // locked system
+ .pf-system-locked{
+ color: $gray-light;
+
+ .pf-system-sec{
+ cursor: default !important;
+ }
+
+ .pf-system-body{
+ cursor: default !important;
+ }
+
+ .fa-lock{
+ display: inline-block !important;
+ }
+ }
+
// Endpoints ====================================================
.pf-map-endpoint-source, .pf-map-endpoint-target{
@@ -222,15 +286,6 @@
}
}
- // Connection status ============================================
-
- svg.pf-map-connection-eol {
-
- path:first-child{
- stroke: red;
- }
- }
-
// Connection overlay ===========================================
.pf-map-connection-overlay{
padding: 1px 4px;
@@ -260,6 +315,8 @@
// context menu ==================================================
.dropdown-menu{
+ z-index: 1020; // over tooltips
+
i{
width: 20px
}
@@ -269,4 +326,3 @@
-
diff --git a/sass/library/drag-to-select/_dragToSelect.scss b/sass/library/drag-to-select/_dragToSelect.scss
new file mode 100644
index 00000000..8be669bf
--- /dev/null
+++ b/sass/library/drag-to-select/_dragToSelect.scss
@@ -0,0 +1,15 @@
+
+// styles for drag-select
+
+div.pf-map-drag-to-select {
+ background: $teal-darker;
+ display: none; // triggered by js
+ opacity: 0.3;
+ z-index: 9000;
+ border: 1px dashed $gray-lighter;
+ @include border-radius(5px);
+
+ &.active {
+ display: block;
+ }
+}
diff --git a/sass/library/easy-pie-chart/_easyPieChart.scss b/sass/library/easy-pie-chart/_easyPieChart.scss
new file mode 100644
index 00000000..bf49eb55
--- /dev/null
+++ b/sass/library/easy-pie-chart/_easyPieChart.scss
@@ -0,0 +1,38 @@
+// global pie chart styles
+.pf-pie-chart {
+ position: relative;
+ display:table-cell;
+ text-align: center;
+ vertical-align:middle;
+
+ span{
+ display: inline-block;
+ }
+
+ canvas {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+}
+
+// pie chart map timer
+.pf-pie-chart-map-timer{
+ width: 36px;
+ height: 36px;
+ margin: 3px;
+
+ canvas {
+ top: 3px;
+ left: 3px;
+ }
+
+ span{
+ font-size: 10px;
+ &:after {
+ content: 's';
+ margin-left: 1px;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/sass/library/pnotify/_pnotify.core.scss b/sass/library/pnotify/_pnotify.core.scss
index c44b53c4..2716d668 100644
--- a/sass/library/pnotify/_pnotify.core.scss
+++ b/sass/library/pnotify/_pnotify.core.scss
@@ -54,3 +54,13 @@ html > body > .ui-pnotify {
bottom: 25px;
top: auto;
}
+.ui-pnotify.stack-bar-top {
+ right: 0;
+ top: 0;
+}
+.ui-pnotify.stack-bar-bottom {
+ right: auto;
+ bottom: 0;
+ top: auto;
+ left: auto;
+}
diff --git a/sass/pathfinder.scss b/sass/pathfinder.scss
index 24a98de8..6d39e320 100644
--- a/sass/pathfinder.scss
+++ b/sass/pathfinder.scss
@@ -1,3 +1,14 @@
+/*!
+ * Pathfinder - Mapping Tool
+ * http://pathfinder.exodus4d.de/
+ *
+ * CSS - Cascading Style Sheets
+ * Generated with Compass http://compass-style.org/
+ *
+ * Copyright 2014 - 2014, Exodus 4D - Mark Friedrich
+ *
+ */
+
@import "compass/css3";
@import "compass/css3/border-radius";
@import "compass/css3/box-shadow";
@@ -22,6 +33,9 @@
@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
+
// Main THEME (Imports by order - do not change order)
@import "smartadmin/main";
diff --git a/sass/smartadmin/_main-colorpallet.scss b/sass/smartadmin/_main-colorpallet.scss
index 20126b09..247cd15d 100644
--- a/sass/smartadmin/_main-colorpallet.scss
+++ b/sass/smartadmin/_main-colorpallet.scss
@@ -7,6 +7,8 @@
&.txt-color-blueLight { color:$blueLight !important; }
&.txt-color-blueDark { color: $blueDark !important; }
&.txt-color-grayLightest { color: $gray-lightest !important; }
+ &.txt-color-gray { color: $gray !important; }
+ &.txt-color-grayDark { color: $gray-dark !important; }
&.txt-color-green { color: $green !important; }
&.txt-color-greenLight { color: $greenLight !important; }
&.txt-color-greenDark { color: $greenDark !important; }
@@ -20,10 +22,15 @@
&.txt-color-darken { color: $darken !important; }
&.txt-color-lighten { color: $lighten !important; }
&.txt-color-white { color: $white !important; }
- &.txt-color-grayDark { color: $greyDark !important; }
&.txt-color-magenta { color: $magenta !important; }
&.txt-color-teal { color: $teal !important; }
&.txt-color-redLight { color: $redLight !important; }
+
+ &.txt-color-primary { color: $brand-primary !important; }
+ &.txt-color-success { color: $brand-success !important; }
+ &.txt-color-information { color: $brand-info !important; }
+ &.txt-color-warning { color: $brand-warning !important; }
+ &.txt-color-danger { color: $brand-danger !important; }
}
/*
* BACKGROUNDS
diff --git a/sass/smartadmin/_main.scss b/sass/smartadmin/_main.scss
index 42f5b269..debe811a 100644
--- a/sass/smartadmin/_main.scss
+++ b/sass/smartadmin/_main.scss
@@ -19,15 +19,19 @@ body.mobile-view-activated.hidden-menu {
body.modal-open {
overflow:hidden !important;
+
+ p{
+ font-family: 'Oxygen';
+ }
}
a:hover, a:active, a:focus, button, button:active, button:focus, object, embed, input::-moz-focus-inner {
outline: 0;
}
-h1,h2,h3,h4 {
+h1,h3,h4 {
margin:0;
- font-family: "Oxygen Bold", "Open Sans", Arial, Helvetica, Sans-Serif;
+ font-family: "Oxygen Bold";
font-weight:300;
}
@@ -141,9 +145,10 @@ h1 {
}
h2 {
- letter-spacing:-1px;
+ font-family: "Oxygen", "Open Sans", Arial, Helvetica, Sans-Serif;;
+ letter-spacing: 0px;
font-size: $font-size-h2;
- margin:20px 0;
+ margin: 20px 0;
line-height:normal;
}
@@ -157,6 +162,7 @@ h3 {
h4 {
line-height:normal;
+ margin: 20px 0 10px 0;
}
h5 {
diff --git a/templates/modules/contextmenu.html b/templates/modules/contextmenu.html
index c3397777..fde914ca 100644
--- a/templates/modules/contextmenu.html
+++ b/templates/modules/contextmenu.html
@@ -2,12 +2,15 @@
{{#items}}
{{#text}}
- {{text}}
+ {{text}}
",footer:"",closeButton:"",form:"",inputs:{text:"",textarea:"",email:"",select:"",checkbox:"",date:"",time:"",number:"",password:""}},o={locale:"en",backdrop:!0,animate:!0,className:null,closeButton:!0,show:!0,container:"body"},p={};p.alert=function(){var a;if(a=k("alert",["ok"],["message","callback"],arguments),a.callback&&!b.isFunction(a.callback))throw new Error("alert requires callback property to be a function when provided");return a.buttons.ok.callback=a.onEscape=function(){return b.isFunction(a.callback)?a.callback():!0},p.dialog(a)},p.confirm=function(){var a;if(a=k("confirm",["cancel","confirm"],["message","callback"],arguments),a.buttons.cancel.callback=a.onEscape=function(){return a.callback(!1)},a.buttons.confirm.callback=function(){return a.callback(!0)},!b.isFunction(a.callback))throw new Error("confirm requires a callback");return p.dialog(a)},p.prompt=function(){var a,d,e,f,h,i,k;if(f=b(n.form),d={className:"bootbox-prompt",buttons:l("cancel","confirm"),value:"",inputType:"text"},a=m(j(d,arguments,["title","callback"]),["cancel","confirm"]),i=a.show===c?!0:a.show,a.message=f,a.buttons.cancel.callback=a.onEscape=function(){return a.callback(null)},a.buttons.confirm.callback=function(){var c;switch(a.inputType){case"text":case"textarea":case"email":case"select":case"date":case"time":case"number":case"password":c=h.val();break;case"checkbox":var d=h.find("input:checked");c=[],g(d,function(a,d){c.push(b(d).val())})}return a.callback(c)},a.show=!1,!a.title)throw new Error("prompt requires a title");if(!b.isFunction(a.callback))throw new Error("prompt requires a callback");if(!n.inputs[a.inputType])throw new Error("invalid prompt type");switch(h=b(n.inputs[a.inputType]),a.inputType){case"text":case"textarea":case"email":case"date":case"time":case"number":case"password":h.val(a.value);break;case"select":var o={};if(k=a.inputOptions||[],!k.length)throw new Error("prompt with select requires options");g(k,function(a,d){var e=h;if(d.value===c||d.text===c)throw new Error("given options in wrong format");d.group&&(o[d.group]||(o[d.group]=b("").attr("label",d.group)),e=o[d.group]),e.append("")}),g(o,function(a,b){h.append(b)}),h.val(a.value);break;case"checkbox":var q=b.isArray(a.value)?a.value:[a.value];if(k=a.inputOptions||[],!k.length)throw new Error("prompt with checkbox requires options");if(!k[0].value||!k[0].text)throw new Error("given options in wrong format");h=b(""),g(k,function(c,d){var e=b(n.inputs[a.inputType]);e.find("input").attr("value",d.value),e.find("label").append(d.text),g(q,function(a,b){b===d.value&&e.find("input").prop("checked",!0)}),h.append(e)})}return a.placeholder&&h.attr("placeholder",a.placeholder),a.pattern&&h.attr("pattern",a.pattern),f.append(h),f.on("submit",function(a){a.preventDefault(),a.stopPropagation(),e.find(".btn-primary").click()}),e=p.dialog(a),e.off("shown.bs.modal"),e.on("shown.bs.modal",function(){h.focus()}),i===!0&&e.modal("show"),e},p.dialog=function(a){a=h(a);var c=b(n.dialog),d=c.find(".modal-dialog"),f=c.find(".modal-body"),i=a.buttons,j="",k={onEscape:a.onEscape};if(g(i,function(a,b){j+="",k[a]=b.callback}),f.find(".bootbox-body").html(a.message),a.animate===!0&&c.addClass("fade"),a.className&&c.addClass(a.className),"large"===a.size&&d.addClass("modal-lg"),"small"===a.size&&d.addClass("modal-sm"),a.title&&f.before(n.header),a.closeButton){var l=b(n.closeButton);a.title?c.find(".modal-header").prepend(l):l.css("margin-top","-10px").prependTo(f)}return a.title&&c.find(".modal-title").html(a.title),j.length&&(f.after(n.footer),c.find(".modal-footer").html(j)),c.on("hidden.bs.modal",function(a){a.target===this&&c.remove()}),c.on("shown.bs.modal",function(){c.find(".btn-primary:first").focus()}),c.on("escape.close.bb",function(a){k.onEscape&&e(a,c,k.onEscape)}),c.on("click",".modal-footer button",function(a){var d=b(this).data("bb-handler");e(a,c,k[d])}),c.on("click",".bootbox-close-button",function(a){e(a,c,k.onEscape)}),c.on("keyup",function(a){27===a.which&&c.trigger("escape.close.bb")}),b(a.container).append(c),c.modal({backdrop:a.backdrop,keyboard:!1,show:!1}),a.show&&c.modal("show"),c},p.setDefaults=function(){var a={};2===arguments.length?a[arguments[0]]=arguments[1]:a=arguments[0],b.extend(o,a)},p.hideAll=function(){return b(".bootbox").modal("hide"),p};var q={br:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Sim"},cs:{OK:"OK",CANCEL:"Zrušit",CONFIRM:"Potvrdit"},da:{OK:"OK",CANCEL:"Annuller",CONFIRM:"Accepter"},de:{OK:"OK",CANCEL:"Abbrechen",CONFIRM:"Akzeptieren"},el:{OK:"Εντάξει",CANCEL:"Ακύρωση",CONFIRM:"Επιβεβαίωση"},en:{OK:"OK",CANCEL:"Cancel",CONFIRM:"OK"},es:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Aceptar"},et:{OK:"OK",CANCEL:"Katkesta",CONFIRM:"OK"},fi:{OK:"OK",CANCEL:"Peruuta",CONFIRM:"OK"},fr:{OK:"OK",CANCEL:"Annuler",CONFIRM:"D'accord"},he:{OK:"אישור",CANCEL:"ביטול",CONFIRM:"אישור"},id:{OK:"OK",CANCEL:"Batal",CONFIRM:"OK"},it:{OK:"OK",CANCEL:"Annulla",CONFIRM:"Conferma"},ja:{OK:"OK",CANCEL:"キャンセル",CONFIRM:"確認"},lt:{OK:"Gerai",CANCEL:"Atšaukti",CONFIRM:"Patvirtinti"},lv:{OK:"Labi",CANCEL:"Atcelt",CONFIRM:"Apstiprināt"},nl:{OK:"OK",CANCEL:"Annuleren",CONFIRM:"Accepteren"},no:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},pl:{OK:"OK",CANCEL:"Anuluj",CONFIRM:"Potwierdź"},pt:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Confirmar"},ru:{OK:"OK",CANCEL:"Отмена",CONFIRM:"Применить"},sv:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},tr:{OK:"Tamam",CANCEL:"İptal",CONFIRM:"Onayla"},zh_CN:{OK:"OK",CANCEL:"取消",CONFIRM:"确认"},zh_TW:{OK:"OK",CANCEL:"取消",CONFIRM:"確認"}};return p.init=function(c){return a(c||b)},p});
\ No newline at end of file
+!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.bootbox=b(a.jQuery)}(this,function a(b,c){"use strict";function d(a){var b=q[o.locale];return b?b[a]:q.en[a]}function e(a,c,d){a.stopPropagation(),a.preventDefault();var e=b.isFunction(d)&&d(a)===!1;e||c.modal("hide")}function f(a){var b,c=0;for(b in a)c++;return c}function g(a,c){var d=0;b.each(a,function(a,b){c(a,b,d++)})}function h(a){var c,d;if("object"!=typeof a)throw new Error("Please supply an object of options");if(!a.message)throw new Error("Please specify a message");return a=b.extend({},o,a),a.buttons||(a.buttons={}),a.backdrop=a.backdrop?"static":!1,c=a.buttons,d=f(c),g(c,function(a,e,f){if(b.isFunction(e)&&(e=c[a]={callback:e}),"object"!==b.type(e))throw new Error("button with key "+a+" must be an object");e.label||(e.label=a),e.className||(e.className=2>=d&&f===d-1?"btn-primary":"btn-default")}),a}function i(a,b){var c=a.length,d={};if(1>c||c>2)throw new Error("Invalid argument length");return 2===c||"string"==typeof a[0]?(d[b[0]]=a[0],d[b[1]]=a[1]):d=a[0],d}function j(a,c,d){return b.extend(!0,{},a,i(c,d))}function k(a,b,c,d){var e={className:"bootbox-"+a,buttons:l.apply(null,b)};return m(j(e,d,c),b)}function l(){for(var a={},b=0,c=arguments.length;c>b;b++){var e=arguments[b],f=e.toLowerCase(),g=e.toUpperCase();a[f]={label:d(g)}}return a}function m(a,b){var d={};return g(b,function(a,b){d[b]=!0}),g(a.buttons,function(a){if(d[a]===c)throw new Error("button key "+a+" is not allowed (options are "+b.join("\n")+")")}),a}var n={dialog:"
",footer:"",closeButton:"",form:"",inputs:{text:"",textarea:"",email:"",select:"",checkbox:"",date:"",time:"",number:"",password:""}},o={locale:"en",backdrop:!0,animate:!0,className:null,closeButton:!0,show:!0,container:"body"},p={};p.alert=function(){var a;if(a=k("alert",["ok"],["message","callback"],arguments),a.callback&&!b.isFunction(a.callback))throw new Error("alert requires callback property to be a function when provided");return a.buttons.ok.callback=a.onEscape=function(){return b.isFunction(a.callback)?a.callback():!0},p.dialog(a)},p.confirm=function(){var a;if(a=k("confirm",["cancel","confirm"],["message","callback"],arguments),a.buttons.cancel.callback=a.onEscape=function(){return a.callback(!1)},a.buttons.confirm.callback=function(){return a.callback(!0)},!b.isFunction(a.callback))throw new Error("confirm requires a callback");return p.dialog(a)},p.prompt=function(){var a,d,e,f,h,i,k;if(f=b(n.form),d={className:"bootbox-prompt",buttons:l("cancel","confirm"),value:"",inputType:"text"},a=m(j(d,arguments,["title","callback"]),["cancel","confirm"]),i=a.show===c?!0:a.show,a.message=f,a.buttons.cancel.callback=a.onEscape=function(){return a.callback(null)},a.buttons.confirm.callback=function(){var c;switch(a.inputType){case"text":case"textarea":case"email":case"select":case"date":case"time":case"number":case"password":c=h.val();break;case"checkbox":var d=h.find("input:checked");c=[],g(d,function(a,d){c.push(b(d).val())})}return a.callback(c)},a.show=!1,!a.title)throw new Error("prompt requires a title");if(!b.isFunction(a.callback))throw new Error("prompt requires a callback");if(!n.inputs[a.inputType])throw new Error("invalid prompt type");switch(h=b(n.inputs[a.inputType]),a.inputType){case"text":case"textarea":case"email":case"date":case"time":case"number":case"password":h.val(a.value);break;case"select":var o={};if(k=a.inputOptions||[],!k.length)throw new Error("prompt with select requires options");g(k,function(a,d){var e=h;if(d.value===c||d.text===c)throw new Error("given options in wrong format");d.group&&(o[d.group]||(o[d.group]=b("").attr("label",d.group)),e=o[d.group]),e.append("")}),g(o,function(a,b){h.append(b)}),h.val(a.value);break;case"checkbox":var q=b.isArray(a.value)?a.value:[a.value];if(k=a.inputOptions||[],!k.length)throw new Error("prompt with checkbox requires options");if(!k[0].value||!k[0].text)throw new Error("given options in wrong format");h=b(""),g(k,function(c,d){var e=b(n.inputs[a.inputType]);e.find("input").attr("value",d.value),e.find("label").append(d.text),g(q,function(a,b){b===d.value&&e.find("input").prop("checked",!0)}),h.append(e)})}return a.placeholder&&h.attr("placeholder",a.placeholder),a.pattern&&h.attr("pattern",a.pattern),f.append(h),f.on("submit",function(a){a.preventDefault(),a.stopPropagation(),e.find(".btn-primary").click()}),e=p.dialog(a),e.off("shown.bs.modal"),e.on("shown.bs.modal",function(){h.focus()}),i===!0&&e.modal("show"),e},p.dialog=function(a){a=h(a);var c=b(n.dialog),d=c.find(".modal-dialog"),f=c.find(".modal-body"),i=a.buttons,j="",k={onEscape:a.onEscape};if(g(i,function(a,b){j+="",k[a]=b.callback}),f.find(".bootbox-body").html(a.message),a.animate===!0&&c.addClass("fade"),a.className&&c.addClass(a.className),"large"===a.size&&d.addClass("modal-lg"),"small"===a.size&&d.addClass("modal-sm"),a.title&&f.before(n.header),a.closeButton){var l=b(n.closeButton);a.title?c.find(".modal-header").prepend(l):l.css("margin-top","-10px").prependTo(f)}return a.title&&c.find(".modal-title").html(a.title),j.length&&(f.after(n.footer),c.find(".modal-footer").html(j)),c.on("hidden.bs.modal",function(a){a.target===this&&c.remove()}),c.on("shown.bs.modal",function(){c.find(".btn-default:first").focus()}),c.on("escape.close.bb",function(a){k.onEscape&&e(a,c,k.onEscape)}),c.on("click",".modal-footer button",function(a){var d=b(this).data("bb-handler");e(a,c,k[d])}),c.on("click",".bootbox-close-button",function(a){e(a,c,k.onEscape)}),c.on("keyup",function(a){27===a.which&&c.trigger("escape.close.bb")}),b(a.container).append(c),c.modal({backdrop:a.backdrop,keyboard:!1,show:!1}),a.show&&c.modal("show"),c},p.setDefaults=function(){var a={};2===arguments.length?a[arguments[0]]=arguments[1]:a=arguments[0],b.extend(o,a)},p.hideAll=function(){return b(".bootbox").modal("hide"),p};var q={br:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Sim"},cs:{OK:"OK",CANCEL:"Zrušit",CONFIRM:"Potvrdit"},da:{OK:"OK",CANCEL:"Annuller",CONFIRM:"Accepter"},de:{OK:"OK",CANCEL:"Abbrechen",CONFIRM:"Akzeptieren"},el:{OK:"Εντάξει",CANCEL:"Ακύρωση",CONFIRM:"Επιβεβαίωση"},en:{OK:"OK",CANCEL:"Cancel",CONFIRM:"OK"},es:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Aceptar"},et:{OK:"OK",CANCEL:"Katkesta",CONFIRM:"OK"},fi:{OK:"OK",CANCEL:"Peruuta",CONFIRM:"OK"},fr:{OK:"OK",CANCEL:"Annuler",CONFIRM:"D'accord"},he:{OK:"אישור",CANCEL:"ביטול",CONFIRM:"אישור"},id:{OK:"OK",CANCEL:"Batal",CONFIRM:"OK"},it:{OK:"OK",CANCEL:"Annulla",CONFIRM:"Conferma"},ja:{OK:"OK",CANCEL:"キャンセル",CONFIRM:"確認"},lt:{OK:"Gerai",CANCEL:"Atšaukti",CONFIRM:"Patvirtinti"},lv:{OK:"Labi",CANCEL:"Atcelt",CONFIRM:"Apstiprināt"},nl:{OK:"OK",CANCEL:"Annuleren",CONFIRM:"Accepteren"},no:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},pl:{OK:"OK",CANCEL:"Anuluj",CONFIRM:"Potwierdź"},pt:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Confirmar"},ru:{OK:"OK",CANCEL:"Отмена",CONFIRM:"Применить"},sv:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},tr:{OK:"Tamam",CANCEL:"İptal",CONFIRM:"Onayla"},zh_CN:{OK:"OK",CANCEL:"取消",CONFIRM:"确认"},zh_TW:{OK:"OK",CANCEL:"取消",CONFIRM:"確認"}};return p.init=function(c){return a(c||b)},p});
\ No newline at end of file
diff --git a/js/lib/jquery.dragToSelect.js b/js/lib/jquery.dragToSelect.js
new file mode 100644
index 00000000..3c6c8cbb
--- /dev/null
+++ b/js/lib/jquery.dragToSelect.js
@@ -0,0 +1,384 @@
+/***
+@title:
+Drag to Select
+
+@version:
+1.1
+
+@author:
+Andreas Lagerkvist
+
+@date:
+2009-04-06
+
+@url:
+http://andreaslagerkvist.com/jquery/drag-to-select/
+
+@license:
+http://creativecommons.org/licenses/by/3.0/
+
+@copyright:
+2008 Andreas Lagerkvist (andreaslagerkvist.com)
+
+@requires:
+jquery, jquery.dragToSelect.css
+
+@does:
+Use this plug-in to allow your users to select certain elements by dragging a "select box". Works very similar to how you can drag-n-select files and folders in most OS:es.
+
+@howto:
+$('#my-files').dragToSelect(selectables: 'li'); would make every li in the #my-files-element selectable by dragging. The li:s will recieve a "selected"-class when they are within range of the select box when user drops.
+
+Make sure a parent-element of the selectables has position: relative as well as overflow: auto or scroll.
+
+@exampleHTML:
+
-
+
+ 
+ 
+