', {
+ class: ['compact', 'stripe', 'order-column', 'row-border', config.mapInfoTableClass].join(' ')
+ });
+ connectionsElement.append(connectionTable);
+
+ connectionsElement.showLoadingAnimation(loadingOptions);
+
+ // systems table ==================================================
+
+ // prepare data for dataTables
+ var systemsData = [];
+ for(var i = 0; i < mapData.data.systems.length; i++){
+ var tempSystemData = mapData.data.systems[i];
+
+ var tempData = [];
+
+ // current position
+ if(tempSystemData.currentUser === true){
+ tempData.push( '' );
+ }else{
+ tempData.push( '' );
+ }
+
+ tempData.push( tempSystemData.name );
+
+ if( tempSystemData.name !== tempSystemData.alias){
+ tempData.push( tempSystemData.alias );
+ }else{
+ tempData.push( '' );
+ }
+
+ // status
+ var systemStatusClass = Util.getStatusInfoForSystem(tempSystemData.status, 'class');
+ if(systemStatusClass !== ''){
+ tempData.push( '' );
+ }else{
+ tempData.push( '' );
+ }
+
+ // effect
+ var systemEffectClass = Util.getEffectInfoForSystem(tempSystemData.effect, 'class');
+ if(systemEffectClass !== ''){
+ tempData.push( '' );
+ }else{
+ tempData.push( '' );
+ }
+
+ // trueSec
+ var systemTrueSecClass = Util.getTrueSecClassForSystem(tempSystemData.trueSec);
+ if(systemTrueSecClass !== ''){
+ tempData.push( '' + tempSystemData.trueSec.toFixed(1) + '' );
+ }else{
+ tempData.push( '' );
+ }
+
+ // locked
+ if(tempSystemData.locked === true){
+ tempData.push( '' );
+ }else{
+ tempData.push( '' );
+ }
+
+ // rally point
+ if(tempSystemData.rally === true){
+ tempData.push( '' );
+ }else{
+ tempData.push( '' );
+ }
+
+ systemsData.push(tempData);
+ }
+
+ var systemsDataTable = systemTable.dataTable( {
+ paging: false,
+ ordering: true,
+ order: [ 0, 'desc' ],
+ autoWidth: false,
+ hover: false,
+ data: systemsData,
+ columnDefs: [],
+ language: {
+ emptyTable: 'Map is empty',
+ zeroRecords: 'No systems found',
+ lengthMenu: 'Show _MENU_ systems',
+ info: 'Showing _START_ to _END_ of _TOTAL_ systems'
+ },
+ columns: [
+ {
+ title: '',
+ width: '15px',
+ searchable: false
+ },{
+ title: 'system',
+ width: '50px'
+ },{
+ title: 'alias'
+ },{
+ title: 'status',
+ width: '30px',
+ class: 'text-center',
+ orderable: false,
+ searchable: false
+ },{
+ title: 'effect',
+ width: '30px',
+ class: 'text-center',
+ orderable: false,
+ searchable: false
+ },{
+ title: 'sec.',
+ width: '20px',
+ class: 'text-center',
+ orderable: false,
+ searchable: false
+ },{
+ title: '',
+ width: '30px',
+ class: 'text-center',
+ searchable: false
+ },{
+ title: '',
+ width: '30px',
+ className: 'text-center',
+ searchable: false
+ }
+ ]
+ });
+
+ systemsElement.hideLoadingAnimation();
+
+ // connections table ==================================================
+
+ // prepare data for dataTables
+ var connectionData = [];
+ for(var j = 0; j < mapData.data.connections.length; j++){
+ var tempConnectionData = mapData.data.connections[j];
+
+ var tempConData = [];
+
+ tempConData.push( Util.getScopeInfoForMap( tempConnectionData.scope, 'label') );
+
+ // source system name
+ tempConData.push( tempConnectionData.sourceName );
+
+ // connection
+ var connectionClasses = [];
+ for(var k = 0; k < tempConnectionData.type.length; k++){
+ connectionClasses.push( Util.getConnectionInfo( tempConnectionData.type[k], 'cssClass') );
+
+ }
+
+ connectionClasses = connectionClasses.join(' ');
+
+ tempConData.push( '' );
+
+
+ tempConData.push( tempConnectionData.targetName );
+
+ connectionData.push(tempConData);
+ }
+
+ var connectionDataTable = connectionTable.dataTable( {
+ paging: false,
+ ordering: true,
+ order: [ 0, 'desc' ],
+ autoWidth: false,
+ hover: false,
+ data: connectionData,
+ columnDefs: [],
+ language: {
+ emptyTable: 'No connections',
+ zeroRecords: 'No connections found',
+ lengthMenu: 'Show _MENU_ connections',
+ info: 'Showing _START_ to _END_ of _TOTAL_ connections'
+ },
+ columns: [
+ {
+ title: 'scope',
+ width: '50px',
+ orderable: false
+ },{
+ title: 'source system'
+ },{
+ title: 'connection',
+ width: '80px',
+ class: 'text-center',
+ orderable: false,
+ searchable: false
+ },{
+ title: 'target system'
+ }
+ ]
+ });
+
+
+ connectionsElement.hideLoadingAnimation();
+
+
+ });
+
+ });
+
+ };
+
+ /**
+ * shows the map manual modal dialog
+ */
+ var showMapManual = function(){
+
+ requirejs(['text!templates/modules/map_manual_dialog.html', 'lib/mustache'], function(template, Mustache) {
+
+ var data = {
+ scrollspyId: config.mapManualScrollspyId,
+ scrollspyNavClass: config.mapManualScrollspyNavClass,
+ scrollspyNavLiClass: config.mapManualNavigationListItemClass,
+ pieChartClass : Init.classes.pieChart.pieChartMapCounterClass,
+ mapCounterClass : Init.classes.pieChart.pieChartMapCounterClass,
+
+ mapTypeGlobalClass: Util.getInfoForMap( 'global', 'class'),
+ mapTypeGlobalLabel: Util.getInfoForMap( 'global', 'label'),
+ mapTypeAllianceClass: Util.getInfoForMap( 'alliance', 'class'),
+ mapTypeAllianceLabel: Util.getInfoForMap( 'alliance', 'label'),
+ mapTypePrivateClass: Util.getInfoForMap( 'private', 'class'),
+ mapTypePrivateLabel: Util.getInfoForMap( 'private', 'label')
+ };
+
+
+ var content = Mustache.render(template, data);
// show dialog
- var mapLegendDialog = bootbox.dialog({
- title: 'Map legend',
+ var mapManualDialog = bootbox.dialog({
+ title: 'Pathfinder manual',
message: content,
className: 'medium',
buttons: {
@@ -331,20 +624,55 @@ define([
label: 'close',
className: "btn-primary",
callback: function() {
- $(mapLegendDialog).modal('hide');
+ $(mapManualDialog).modal('hide');
}
}
},
show: false
});
- mapLegendDialog.modal('show');
+ mapManualDialog.modal('show');
- mapLegendDialog.on('shown.bs.modal', function(e) {
- // modal os open
+ // modal offset top
+ var modalOffsetTop = 200;
+
+ // disable on scroll event
+ var disableOnScrollEvent = false;
+
+ // scroll breakpoints
+ var scrolLBreakpointElements = null;
+ // scroll navigation links
+ var scrollNavLiElements = null;
+
+ mapManualDialog.on('shown.bs.modal', function(e) {
+ // modal on open
+ scrolLBreakpointElements = $('.pf-manual-scroll-break');
+ scrollNavLiElements = $('.' + config.mapManualNavigationListItemClass);
});
- var scrollspyElement = $('#' + config.mapLegendScrollspyId);
+ var scrollspyElement = $('#' + config.mapManualScrollspyId);
+
+ var whileScrolling = function(){
+
+ if(disableOnScrollEvent === false){
+ for(var i = 0; i < scrolLBreakpointElements.length; i++){
+ var offset = $(scrolLBreakpointElements[i]).offset().top;
+
+ if( (offset - modalOffsetTop) > 0){
+
+ if(! $( scrollNavLiElements[i]).hasClass('active')){
+ // remove all active classes
+ scrollNavLiElements.removeClass('active');
+ // remove focus on links
+ scrollNavLiElements.find('a').blur();
+
+ $( scrollNavLiElements[i]).addClass('active');
+ }
+ break;
+ }
+ }
+ }
+ };
// init scrollbar
scrollspyElement.mCustomScrollbar({
@@ -366,7 +694,7 @@ define([
scrollspyElement.find('.' + data.mapCounterClass).initMapUpdateCounter();
// set navigation button observer
- var mainNavigationLinks = $('.' + config.mapLegendScrollspyNavClass).find('a');
+ var mainNavigationLinks = $('.' + config.mapManualScrollspyNavClass).find('a');
// text anchor links
var subNavigationLinks = scrollspyElement.find('a[data-target]');
@@ -375,15 +703,21 @@ define([
navigationLinks.on('click', function(e){
e.preventDefault();
+ disableOnScrollEvent = true;
+
// scroll to anchor
scrollspyElement.mCustomScrollbar("scrollTo", $(this).attr('data-target'));
- var mainNavigationLiElement = $(this).parent('.' + config.mapLegendNavigationListItemClass);
+ var mainNavigationLiElement = $(this).parent('.' + config.mapManualNavigationListItemClass);
+
+
+ whileScrolling();
// 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');
+ scrollNavLiElements.removeClass('active');
// set new active class
$(this).parent().addClass('active');
@@ -391,7 +725,13 @@ define([
});
- }
+ },
+ onScroll: function(){
+ disableOnScrollEvent = false;
+
+ whileScrolling();
+ },
+ whileScrolling: whileScrolling
},
mouseWheel:{
enable: true,
@@ -403,8 +743,6 @@ define([
autoDraggerLength: true
});
-
-
});
};
@@ -413,7 +751,14 @@ define([
* shows a test notification for desktop messages
*/
var notificationTest = function(){
- Util.showNotify({title: 'Test Notification', text: 'Accept browser security question'}, {desktop: true, stack: 'barBottom'});
+ Util.showNotify({
+ title: 'Test Notification',
+ text: 'Accept browser security question'},
+ {
+ desktop: true,
+ stack: 'barBottom'
+ }
+ );
};
/**
diff --git a/js/app/util.js b/js/app/util.js
index d310b2a8..de6e0b22 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -21,7 +21,19 @@ define([
/**
* displays a loading indicator on an element
*/
- $.fn.showLoadingAnimation = function(){
+ $.fn.showLoadingAnimation = function(options){
+
+ var iconSize = 'fa-lg';
+
+ if(options){
+ if(options.icon){
+ if(options.icon.size){
+ iconSize = options.icon.size;
+ }
+ }
+
+ }
+
var overlay = $('', {
class: config.ajaxOverlayClass
}).append(
@@ -29,7 +41,7 @@ define([
class: [config.ajaxOverlayWrapperClass].join(' ')
}).append(
$('', {
- class: ['fa', 'fa-lg', 'fa-circle-o-notch', 'fa-spin'].join(' ')
+ class: ['fa', iconSize, 'fa-circle-o-notch', 'fa-spin'].join(' ')
})
)
);
@@ -152,6 +164,74 @@ define([
};
+ /**
+ * get all available map Types
+ * @returns {Array}
+ */
+ var getMapTypes = function(){
+
+ var mapTypes = [];
+
+ $.each(Init.classes.mapTypes, function(prop, data){
+ var tempData = {
+ type: prop,
+ label: data.label
+ };
+
+ mapTypes.push(tempData);
+ });
+
+ return mapTypes;
+ };
+
+ /**
+ * get map info
+ * @param mapType
+ * @param option
+ * @returns {string}
+ */
+ var getInfoForMap = function(mapType, option){
+
+ var mapInfo = '';
+
+ if(Init.classes.mapTypes.hasOwnProperty(mapType)){
+ mapInfo = Init.classes.mapTypes[mapType][option];
+ }
+
+ return mapInfo;
+ };
+
+ /**
+ * get all available scopes for a map
+ * @returns {Array}
+ */
+ var getMapScopes = function(){
+
+ var scopes = [];
+ $.each(Init.mapScopes, function(prop, data){
+ scopes.push(prop);
+ });
+
+ return scopes;
+ };
+
+ /**
+ * get some scope info for a given info string
+ * @param info
+ * @param option
+ * @returns {string}
+ */
+ var getScopeInfoForMap = function(info, option){
+
+ var scopeInfo = '';
+
+ if(Init.mapScopes.hasOwnProperty(info)){
+ scopeInfo = Init.mapScopes[info][option];
+ }
+
+ return scopeInfo;
+ };
+
/**
* get some system info for a given info string (e.g. rally class)
* @param info
@@ -259,14 +339,22 @@ define([
var getTrueSecClassForSystem = function(trueSec){
var trueSecClass = '';
- if(trueSec < 0){
- trueSec = 0;
- }
+ trueSec = parseFloat(trueSec);
- trueSec = trueSec.toFixed(1).toString();
+ // check for valid decimal number
+ if(
+ !isNaN( trueSec ) &&
+ isFinite( trueSec )
+ ){
+ if(trueSec < 0){
+ trueSec = 0;
+ }
- if( Init.classes.trueSec.hasOwnProperty(trueSec) ){
- trueSecClass = Init.classes.trueSec[trueSec]['class'];
+ trueSec = trueSec.toFixed(1).toString();
+
+ if( Init.classes.trueSec.hasOwnProperty(trueSec) ){
+ trueSecClass = Init.classes.trueSec[trueSec]['class'];
+ }
}
return trueSecClass;
@@ -289,6 +377,22 @@ define([
return statusInfo;
};
+ /**
+ * get Connection Info by option
+ * @param connectionTyp
+ * @param option
+ * @returns {string}
+ */
+ var getConnectionInfo = function(connectionTyp, option){
+
+ var connectionInfo = '';
+ if(Init.connectionTypes.hasOwnProperty(connectionTyp)){
+ connectionInfo = Init.connectionTypes[connectionTyp][option];
+ }
+
+ return connectionInfo;
+ };
+
var getSignatureGroupInfo = function(option){
@@ -395,6 +499,10 @@ define([
return {
showNotify: showNotify,
+ getMapTypes: getMapTypes,
+ getInfoForMap: getInfoForMap,
+ getMapScopes: getMapScopes,
+ getScopeInfoForMap: getScopeInfoForMap,
getInfoForSystem: getInfoForSystem,
getEffectInfoForSystem: getEffectInfoForSystem,
getSystemEffectData: getSystemEffectData,
@@ -402,6 +510,7 @@ define([
getSecurityClassForSystem: getSecurityClassForSystem,
getTrueSecClassForSystem: getTrueSecClassForSystem,
getStatusInfoForSystem: getStatusInfoForSystem,
+ getConnectionInfo: getConnectionInfo,
getSignatureGroupInfo: getSignatureGroupInfo,
getAllSignatureNames: getAllSignatureNames,
getSignatureTypeIdByName: getSignatureTypeIdByName,
diff --git a/sass/_bootstrap.scss b/sass/_bootstrap.scss
index 176b5670..3658d01e 100644
--- a/sass/_bootstrap.scss
+++ b/sass/_bootstrap.scss
@@ -17,6 +17,7 @@
// @import "bootstrap/normalize";
// @import "bootstrap/print";
+
// Core CSS
@import "bootstrap/scaffolding";
@import "bootstrap/type";
diff --git a/sass/_variables.scss b/sass/_variables.scss
index ccdfe6cd..9f5fb734 100644
--- a/sass/_variables.scss
+++ b/sass/_variables.scss
@@ -17,7 +17,7 @@ $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")
//** Background color for ``.
$body-bg: $gray-dark;
//** Global text color on ``.
-$text-color: $gray-dark;
+$text-color: $gray-light;
//** Global textual link color.
$link-color: $brand-primary;
@@ -31,10 +31,68 @@ $link-hover-color: darken($link-color, 15%);
$pf-font-path: "../fonts" !default;
-$font-family-sans-serif: 'Oxygen Light', "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+@font-face {
+ font-family: 'Oxygen';
+ src: url('#{$pf-font-path}/oxygen-regular-webfont.eot');
+ src: url('#{$pf-font-path}/oxygen-regular-webfont.eot') format('embedded-opentype'),
+ url('#{$pf-font-path}/oxygen-regular-webfont.woff') format('woff'),
+ url('#{$pf-font-path}/oxygen-regular-webfont.ttf') format('truetype');
+ font-weight: 400;
+ font-style: normal;
+}
+/*
+@include font-face(
+ 'Oxygen',
+ font-files(
+ 'oxygen-regular-webfont.woff', woff,
+ 'oxygen-regular-webfont.ttf', truetype
+ ),
+ 'oxygen-regular-webfont.eot',
+ 400
+);
+*/
+/* not used jet
+@include font-face(
+ 'Oxygen Light',
+ font-files(
+ 'oxygen-light-webfont.woff', woff,
+ 'oxygen-light-webfont.ttf', truetype
+ ),
+ 'oxygen-light-webfont.eot',
+ 300
+);
+*/
+/*
+@include font-face(
+ 'Oxygen Bold',
+ font-files(
+ 'oxygen-bold-webfont.woff', woff,
+ 'oxygen-bold-webfont.ttf', truetype
+ ),
+ 'oxygen-bold-webfont.eot',
+ 700
+);
+*/
+@font-face {
+ font-family: 'Oxygen Bold';
+ src: url('#{$pf-font-path}/oxygen-bold-webfont.eot');
+ src: url('#{$pf-font-path}/oxygen-bold-webfont.eot') format('embedded-opentype'),
+ url('#{$pf-font-path}/oxygen-bold-webfont.woff') format('woff'),
+ url('#{$pf-font-path}/oxygen-bold-webfont.ttf') format('truetype');
+ font-weight: 700;
+ font-style: normal;
+}
+
+
+
+
+$font-family-sans-serif: 'Oxygen', "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-serif: 'Oxygen Regular' Georgia, "Times New Roman", Times, serif !default;
$font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
+$font-family-bold: 'Oxygen Bold', "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-base: $font-family-sans-serif;
+$font-style-base: normal;
+$font-weight-base: 400;
$font-size-base: 12px;
$font-size-large: ceil(($font-size-base * 1.24)); // ~16px
@@ -47,34 +105,19 @@ $font-size-h4: $font-size-base; //ceil(($font-size-base * 1.32)); //
$font-size-h5: ceil(($font-size-base * 1.24)); // ~16px
$font-size-h6: ceil(($font-size-base * 1.08)); // ~14px
-$line-height-base: 1.428571429; // 20/14
-$line-height-computed: floor(($font-size-base * $line-height-base)); // ~20px
+//$line-height-base: 1.428571429; // 20/14
+$line-height-base: 1.5; // 18/12
+$line-height-computed: floor(($font-size-base * $line-height-base)); // ~18px
$headings-font-family: $font-family-base;
-$headings-font-weight: 500;
+$headings-font-weight: 700;
$headings-line-height: 1.1;
$headings-color: inherit;
-@font-face {
- font-family: 'Oxygen Regular';
- src: url('#{$pf-font-path}/Oxygen-Regular.ttf');
- font-style: normal;
- font-weight: 400;
-}
-@font-face {
- font-family: 'Oxygen Bold';
- src: url('#{$pf-font-path}/Oxygen-Bold.ttf');
- font-style: normal;
- font-weight: 700;
-}
-@font-face {
- font-family: 'Oxygen Light';
- src: url('#{$pf-font-path}/Oxygen-Light.ttf');
- font-style: normal;
- font-weight: 300;
-}
+
+
//-- Iconography
//
@@ -203,7 +246,7 @@ $dropdown-divider-bg: $gray-light;
$dropdown-link-color: $gray-dark;
$dropdown-link-hover-color: $gray-darkest;
$dropdown-link-hover-bg: $gray-light;
-$dropdown-link-active-color: #fff;
+$dropdown-link-active-color: $gray-lighter;
$dropdown-link-active-bg: $component-active-bg;
$dropdown-link-disabled-color: $gray-light;
@@ -504,7 +547,7 @@ $label-info-bg: $brand-info;
$label-warning-bg: $brand-warning;
$label-danger-bg: $brand-danger;
-$label-color: #fff;
+$label-color: $gray-darkest;
$label-link-hover-color: #fff;
diff --git a/sass/bootstrap/_bootstrap.scss b/sass/bootstrap/_bootstrap.scss
deleted file mode 100644
index cb5147d3..00000000
--- a/sass/bootstrap/_bootstrap.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-// Core variables and mixins
-@import "variables";
-@import "mixins";
-
-// Reset
-@import "normalize";
-@import "print";
-
-// Core CSS
-@import "scaffolding";
-@import "type";
-@import "code";
-@import "grid";
-@import "tables";
-@import "forms";
-@import "buttons";
-
-// Components
-@import "component-animations";
-@import "glyphicons";
-@import "dropdowns";
-@import "button-groups";
-@import "input-groups";
-@import "navs";
-@import "navbar";
-@import "breadcrumbs";
-@import "pagination";
-@import "pager";
-@import "labels";
-@import "badges";
-@import "jumbotron";
-@import "thumbnails";
-@import "alerts";
-@import "progress-bars";
-@import "media";
-@import "list-group";
-@import "panels";
-@import "wells";
-@import "close";
-
-// Components w/ JavaScript
-@import "modals";
-@import "tooltip";
-@import "popovers";
-@import "carousel";
-
-// Utility classes
-@import "utilities";
-@import "responsive-utilities";
diff --git a/sass/bootstrap/_labels.scss b/sass/bootstrap/_labels.scss
index 8353eb1a..d738ac4d 100644
--- a/sass/bootstrap/_labels.scss
+++ b/sass/bootstrap/_labels.scss
@@ -4,7 +4,7 @@
.label {
display: inline;
- padding: .2em .6em .3em;
+ padding: 2px 5px;
font-size: 75%;
font-weight: bold;
line-height: 1;
@@ -12,7 +12,7 @@
text-align: center;
white-space: nowrap;
vertical-align: baseline;
- border-radius: .25em;
+ border-radius: 3px;
// Add hover effects, but only for links
&[href] {
diff --git a/sass/bootstrap/_list-group.scss b/sass/bootstrap/_list-group.scss
index 4a2918dd..a2284e92 100644
--- a/sass/bootstrap/_list-group.scss
+++ b/sass/bootstrap/_list-group.scss
@@ -21,9 +21,10 @@
.list-group-item {
position: relative;
display: block;
- padding: 7px 8px;
+ padding: 6px 8px;
background-color: $list-group-bg;
border-bottom: 1px solid $list-group-border;
+ font-family: $font-family-bold;
// Round the first and last items
&:first-child {
diff --git a/sass/bootstrap/_navbar.scss b/sass/bootstrap/_navbar.scss
index 053777a3..ed6e4783 100644
--- a/sass/bootstrap/_navbar.scss
+++ b/sass/bootstrap/_navbar.scss
@@ -155,6 +155,7 @@
font-size: $font-size-large;
line-height: $line-height-computed;
height: $navbar-height;
+ font-family: $font-family-bold;
&:hover,
&:focus {
@@ -364,6 +365,7 @@
.navbar-text {
@include navbar-vertical-align($line-height-computed);
+ font-family: $font-family-bold;
//@media (min-width: $grid-float-breakpoint) {
float: left;
diff --git a/sass/bootstrap/_scaffolding.scss b/sass/bootstrap/_scaffolding.scss
index 3215b447..b07e2bfc 100644
--- a/sass/bootstrap/_scaffolding.scss
+++ b/sass/bootstrap/_scaffolding.scss
@@ -26,6 +26,8 @@ html {
body {
font-family: $font-family-base;
+ font-style: $font-style-base;
+ font-weight: $font-weight-base;
font-size: $font-size-base;
line-height: $line-height-base;
color: $text-color;
diff --git a/sass/bootstrap/_wells.scss b/sass/bootstrap/_wells.scss
index a662f439..85a3cecc 100644
--- a/sass/bootstrap/_wells.scss
+++ b/sass/bootstrap/_wells.scss
@@ -12,6 +12,7 @@
border: 1px solid $well-border;
@include border-radius(5px);
color: $gray-darker;
+ font-family: $font-family-bold;
blockquote {
border-color: #ddd;
border-color: rgba(0,0,0,.15);
diff --git a/sass/layout/_all.scss b/sass/layout/_all.scss
index 63e50be4..52b8471d 100644
--- a/sass/layout/_all.scss
+++ b/sass/layout/_all.scss
@@ -2,4 +2,5 @@
@import "map";
@import "system-info";
@import "_forms";
-@import "_images";
\ No newline at end of file
+@import "_images";
+@import "_dialogs";
\ No newline at end of file
diff --git a/sass/layout/_dialogs.scss b/sass/layout/_dialogs.scss
new file mode 100644
index 00000000..dbe5e04d
--- /dev/null
+++ b/sass/layout/_dialogs.scss
@@ -0,0 +1,23 @@
+
+// map manual dialog ======================================
+#pf-manual-scrollspy{
+ position: relative;
+ height: 500px;
+ overflow: auto;
+}
+
+// map info dialog ========================================
+#pf-map-info-systems, #pf-map-info-connections{
+ padding: 10px;
+ min-height: 130px;
+ position: relative;
+ background-color: $gray-dark;
+ overflow: hidden;
+ @include border-radius(5px);
+
+ // data tables
+ .pf-map-info-table{
+ font-size: 10px;
+ font-family: $font-family-bold;
+ }
+}
\ No newline at end of file
diff --git a/sass/layout/_forms.scss b/sass/layout/_forms.scss
index 88188a07..268f9e44 100644
--- a/sass/layout/_forms.scss
+++ b/sass/layout/_forms.scss
@@ -1,7 +1,10 @@
-.tab-content{
- input, select{
- background-color: $gray-dark;
- color: $gray-lighter;
- border: 1px solid $gray-light;
+input, select{
+ background-color: $gray-dark;
+ color: $gray-lighter;
+ border: 1px solid $gray-light;
+ font-family: $font-family-bold;
+
+ &:focus{
+ border-color: $teal;
}
}
\ No newline at end of file
diff --git a/sass/layout/_main.scss b/sass/layout/_main.scss
index 34a62bd4..1a09d73e 100644
--- a/sass/layout/_main.scss
+++ b/sass/layout/_main.scss
@@ -1,20 +1,17 @@
-@import "compass/css3/border-radius";
-
-body{
- font-family: 'Oxygen Bold';
- color: $gray-light;
-}
a{
color: $teal-dark;
&:hover{
- color: $teal;
+ color: $teal-light;
}
}
// emphasized text
em{
+
+ font-style: italic;
+
&.pf-brand{
text-transform: uppercase;
}
@@ -35,8 +32,8 @@ em{
.pf-loading-overlay-wrapper{
- width: 20px;
- height: 20px;
+ width: 25px;
+ height: 25px;
margin: auto;
text-align: center;
position: absolute;
@@ -51,7 +48,7 @@ em{
opacity: 0.5;
}
-// page menu ================================================
+// page menu =====================================================
.sb-left{
.list-group-item{
@include box-shadow(inset -10px 0px 5px -5px rgba(0,0,0,0.4));
@@ -64,6 +61,18 @@ em{
}
}
+// map types =====================================================
+.pf-map-type-global{
+ color: $teal;
+}
+
+.pf-map-type-alliance{
+ color: $blue;
+}
+
+.pf-map-type-private{
+ color: $green;
+}
// maps module ===================================================
#pf-map-module{
@@ -72,19 +81,19 @@ em{
// Tabs (colored)
#pf-map-tabs {
- .pf-map-type-default{
+ .pf-map-type-tab-default{
border-top: 2px solid transparent;
}
- .pf-map-type-global{
+ .pf-map-type-tab-global{
border-top: 2px solid $green;
}
- .pf-map-type-alliance{
+ .pf-map-type-tab-alliance{
border-top: 2px solid $blue;
}
- .pf-map-type-private{
+ .pf-map-type-tab-private{
border-top: 2px solid $teal;
}
}
@@ -98,11 +107,12 @@ em{
// alle Module innerhalb einer row
.pf-module{
- @include border-radius(5px);
+ font-family: $font-family-bold;
background: rgba($gray, 0.3);
padding: 10px;
width: 100%;
margin-bottom: 10px;
+ @include border-radius(5px);
}
}
@@ -277,32 +287,69 @@ em{
}
}
-// "fake connection" classes for the map legend
-.pf-connection{
+// "fake connection" classes for the map manual
+.pf-fake-connection{
box-sizing: content-box;
display: inline-block;
- width: 30px;
+ width: 70px;
height: 4px;
margin-right: 5px;
border-top: 2px solid $gray-light;
border-bottom: 2px solid $gray-light;
background-color: #3c3f41;
+ position: relative;
+ font-family: $font-family-sans-serif;
- &.pf-connection-eol{
+ &.pf-map-connection-stargate{
+ background-color: $gray-light;
+ border-color: $gray-light;
+ }
+
+ &.pf-map-connection-jumpbridge{
+ background-color: $teal-light;
+ border-color: $teal-light;
+ }
+
+ &.pf-map-connection-wh-eol{
border-color: $pink-dark;
}
- &.pf-connection-reduced{
+ &.pf-map-connection-wh-reduced{
background-color: $orange;
}
- &.pf-connection-critical{
+ &.pf-map-connection-wh-critical{
background-color: $red-darker;
}
- &.pf-connection-frig{
+
+ &.pf-map-connection-frig{
border-style: dashed;
border-left: none;
border-right: none;
+
+ &:after{
+ content: 'frig';
+ background-color: $orange;
+ color: $gray-darkest;
+ padding: 0px 3px;
+ position: absolute;
+ left: 25px;
+ top: -6px;
+ @include border-radius(3px);
+ }
+ }
+
+ &.pf-map-connection-preserve-mass{
+ &:after{
+ content: 'save mass';
+ background-color: $red-darker;
+ color: $gray-lightest;
+ padding: 0px 3px;
+ position: absolute;
+ left: 9px;
+ top: -6px;
+ @include border-radius(3px);
+ }
}
}
@@ -312,7 +359,7 @@ em{
.tooltip-inner{
color: $green;
background-color: $gray;
- font-family: 'Oxygen Bold';
+ font-family: $font-family-bold;
padding: 5px 5px;
@include border-radius(3px);
@include box-shadow(0 6px 12px rgba(0,0,0,.4));
@@ -382,16 +429,3 @@ Animate the stripes
-// 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 c9aafe71..e02394fc 100644
--- a/sass/layout/_map.scss
+++ b/sass/layout/_map.scss
@@ -71,12 +71,14 @@
width: 2000px;
height: 500px;
position: relative;
+ font-family: $font-family-bold;
.pf-system{
position: absolute;
min-width: 80px;
height: auto;
background-color: $gray-dark;
+ font-family: $font-family-bold;
z-index: 100;
//@include bounce-up-down;
@@ -89,7 +91,7 @@
}
.pf-system-head{
- padding: 0px 3px 2px 3px;
+ padding: 0px 3px 0px 3px;
cursor: pointer;
.pf-system-head-name{
@@ -254,6 +256,39 @@
}
}
+ svg.pf-map-connection-stargate {
+
+ path:first-child{
+ stroke: $gray-light;
+ }
+
+ path:not(first-child){
+ stroke: $gray-light;
+ }
+
+ &:hover{
+ path:first-child{
+ stroke: $gray-lightest;
+ }
+ }
+ }
+
+ svg.pf-map-connection-jumpbridge {
+
+ path:first-child{
+ stroke: $teal-light;
+ }
+
+ path:not(first-child){
+ stroke: $teal-light;
+ }
+
+ &:hover{
+ path:first-child{
+ stroke: $gray-lightest;
+ }
+ }
+ }
svg.pf-map-connection-wh {
// special wh-connection style (
@@ -290,7 +325,9 @@
.pf-map-connection-overlay{
padding: 1px 4px;
font-size: 10.4px;
+ z-index: 1020;
@include border-radius(3px);
+ @include box-shadow(0 6px 12px rgba(0,0,0,.4));
}
.frig{
@@ -315,6 +352,7 @@
// context menu ==================================================
.dropdown-menu{
+ font-family: $font-family-bold;
z-index: 1020; // over tooltips
i{
diff --git a/sass/layout/_system-info.scss b/sass/layout/_system-info.scss
index 2d0b1659..e3dbf8e3 100644
--- a/sass/layout/_system-info.scss
+++ b/sass/layout/_system-info.scss
@@ -2,6 +2,9 @@
// breadcrumb ============================================================
.breadcrumb{
+
+ font-family: $font-family-bold;
+
li{
text-transform: capitalize;
}
@@ -10,6 +13,7 @@
// system info table =====================================================
.pf-system-info-table{
padding-right: 7px;
+ font-family: $font-family-bold;
}
// system effects popover ================================================
diff --git a/sass/library/data-tables/_dataTables-bootstrap.scss b/sass/library/data-tables/_dataTables-bootstrap.scss
index affa7ece..60272c9b 100644
--- a/sass/library/data-tables/_dataTables-bootstrap.scss
+++ b/sass/library/data-tables/_dataTables-bootstrap.scss
@@ -44,6 +44,7 @@ table.dataTable {
margin-top: 6px !important;
margin-bottom: 6px !important;
max-width: none !important;
+ font-family: $font-family-bold;
}
table.dataTable thead .sorting,
diff --git a/sass/library/data-tables/_dataTables-fontAwesome.scss b/sass/library/data-tables/_dataTables-fontAwesome.scss
index f44f13bb..72277a62 100644
--- a/sass/library/data-tables/_dataTables-fontAwesome.scss
+++ b/sass/library/data-tables/_dataTables-fontAwesome.scss
@@ -71,7 +71,7 @@ div.dataTables_paginate a.paginate_button.last {
div.dataTables_paginate a.first:before,
div.dataTables_paginate a.previous:before {
position: absolute;
- top: 5px;
+ top: 4px;
left: 10px;
display: block;
font-family: FontAwesome;
@@ -80,7 +80,7 @@ div.dataTables_paginate a.previous:before {
div.dataTables_paginate a.next:after,
div.dataTables_paginate a.last:after {
position: absolute;
- top: 5px;
+ top: 4px;
right: 10px;
display: block;
font-family: FontAwesome;
diff --git a/sass/library/data-tables/_dataTables.scss b/sass/library/data-tables/_dataTables.scss
index 88afe6f5..cc794b9a 100644
--- a/sass/library/data-tables/_dataTables.scss
+++ b/sass/library/data-tables/_dataTables.scss
@@ -21,7 +21,7 @@ table.dataTable tfoot th {
table.dataTable thead th,
table.dataTable thead td {
padding: 10px 18px;
- border-bottom: 1px solid #111111;
+ border-bottom: 1px solid $gray;
}
table.dataTable thead th:active,
table.dataTable thead td:active {
@@ -30,7 +30,7 @@ table.dataTable thead td:active {
table.dataTable tfoot th,
table.dataTable tfoot td {
padding: 10px 18px 6px 18px;
- border-top: 1px solid #111111;
+ border-top: 1px solid $gray;
}
table.dataTable thead .sorting_asc,
table.dataTable thead .sorting_desc,
@@ -206,7 +206,7 @@ table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_3 {
background-color: #a4b2cb;
}
table.dataTable.no-footer {
- border-bottom: 1px solid #111111;
+ border-bottom: 1px solid $gray;
}
table.dataTable.nowrap th, table.dataTable.nowrap td {
white-space: nowrap;
@@ -433,7 +433,7 @@ table.dataTable td {
.dataTables_wrapper .dataTables_info,
.dataTables_wrapper .dataTables_processing,
.dataTables_wrapper .dataTables_paginate {
- color: #333333;
+ color: $gray-light;
}
.dataTables_wrapper .dataTables_scroll {
clear: both;
diff --git a/sass/library/fontawesome/_path.scss b/sass/library/fontawesome/_path.scss
index fd21c351..4d6591aa 100644
--- a/sass/library/fontawesome/_path.scss
+++ b/sass/library/fontawesome/_path.scss
@@ -12,3 +12,14 @@
font-weight: normal;
font-style: normal;
}
+
+/*
+@include font-face(
+ 'FontAwesome',
+ font-files(
+ 'fontawesome-webfont.woff', woff,
+ 'fontawesome-webfont.ttf', truetype
+ ),
+ 'fontawesome-webfont.eot'
+);
+*/
\ No newline at end of file
diff --git a/sass/library/fontawesome/_variables.scss b/sass/library/fontawesome/_variables.scss
index 669c307f..3472a31b 100644
--- a/sass/library/fontawesome/_variables.scss
+++ b/sass/library/fontawesome/_variables.scss
@@ -7,7 +7,7 @@ $fa-css-prefix: fa !default;
$fa-version: "4.2.0" !default;
$fa-border-color: #eee !default;
$fa-inverse: #fff !default;
-$fa-li-width: (30em / 14) !default;
+$fa-li-width: (30em / 12) !default;
$fa-var-adjust: "\f042";
$fa-var-adn: "\f170";
diff --git a/sass/pathfinder.scss b/sass/pathfinder.scss
index 6d39e320..096b1b34 100644
--- a/sass/pathfinder.scss
+++ b/sass/pathfinder.scss
@@ -9,9 +9,9 @@
*
*/
+@import "compass/reset";
@import "compass/css3";
-@import "compass/css3/border-radius";
-@import "compass/css3/box-shadow";
+
// Core variables and mixins
@import "colors";
@@ -24,8 +24,8 @@
@import "font-awesome";
// Libraries (Remove if not needed)
-@import "library/animation/animation-engine";
-@import "library/jqueryui/jquery-ui-1.10.3.custom";
+//@import "library/animation/animation-engine";
+//@import "library/jqueryui/jquery-ui-1.10.3.custom";
@import "library/custom-scrollbar/_mCustomScrollbar"; // malihu-custom-scrollbar-plugin
@import "library/data-tables/_dataTables"; // DataTables 1.10.3
@import "library/data-tables/_dataTables-bootstrap"; // DataTables 1.10.3 bootsrap integration
diff --git a/sass/smartadmin/_main.scss b/sass/smartadmin/_main.scss
index debe811a..195ed673 100644
--- a/sass/smartadmin/_main.scss
+++ b/sass/smartadmin/_main.scss
@@ -19,10 +19,6 @@ 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 {
@@ -31,8 +27,7 @@ a:hover, a:active, a:focus, button, button:active, button:focus, object, embed,
h1,h3,h4 {
margin:0;
- font-family: "Oxygen Bold";
- font-weight:300;
+ font-family: $font-family-bold;
}
.page-title {
@@ -1047,6 +1042,7 @@ input[type="text"]:focus + .input-group-addon {
.nav-tabs>li>a {
color: $gray-lighter;
+ font-family: $font-family-bold;
&:hover{
color: $gray-darkest;
@@ -1304,6 +1300,7 @@ input[type="text"]:focus + .input-group-addon {
}
.btn {
+ font-family: $font-family-bold;
border-radius:2px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
diff --git a/templates/modules/contextmenu.html b/templates/modules/contextmenu.html
index fde914ca..6556ac69 100644
--- a/templates/modules/contextmenu.html
+++ b/templates/modules/contextmenu.html
@@ -1,12 +1,12 @@