dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed UI dialog layout (mobile breakpoint) for "route search" dialog

Browse Source 
- Fixed a bug where route search ignores flag for 'shortest/secure' route search requests
This commit is contained in:
Mark Friedrich
2019-12-08 23:28:38 +01:00
parent 2ef92459c8
commit e68d9bad4a
7 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/main/controller/api/route.php
View File

@@ -866,7 +866,6 @@ class Route extends Controller\AccessController {
echo json_encode($return);
}
}

3
js/app/ui/module/system_route.js
View File

@@ -350,7 +350,8 @@ define([
wormholesThera: routeDialogData.hasOwnProperty('wormholesThera') ? parseInt(routeDialogData.wormholesThera) : 0,
wormholesSizeMin: routeDialogData.wormholesSizeMin || '',
excludeTypes: getLowerSizeConnectionTypes(routeDialogData.wormholesSizeMin),
endpointsBubble: routeDialogData.hasOwnProperty('endpointsBubble') ? parseInt(routeDialogData.endpointsBubble) : 0
endpointsBubble: routeDialogData.hasOwnProperty('endpointsBubble') ? parseInt(routeDialogData.endpointsBubble) : 0,
flag: routeDialogData.hasOwnProperty('flag') ? routeDialogData.flag : 'shortest'
}]
};

2
public/css/v1.5.5/pathfinder.css
View File

File diff suppressed because one or more lines are too long

2
public/css/v1.5.5/pathfinder.css.map
View File

File diff suppressed because one or more lines are too long

3
public/js/v1.5.5/app/ui/module/system_route.js
View File

@@ -350,7 +350,8 @@ define([
wormholesThera: routeDialogData.hasOwnProperty('wormholesThera') ? parseInt(routeDialogData.wormholesThera) : 0,
wormholesSizeMin: routeDialogData.wormholesSizeMin || '',
excludeTypes: getLowerSizeConnectionTypes(routeDialogData.wormholesSizeMin),
endpointsBubble: routeDialogData.hasOwnProperty('endpointsBubble') ? parseInt(routeDialogData.endpointsBubble) : 0
endpointsBubble: routeDialogData.hasOwnProperty('endpointsBubble') ? parseInt(routeDialogData.endpointsBubble) : 0,
flag: routeDialogData.hasOwnProperty('flag') ? routeDialogData.flag : 'shortest'
}]
};

20
public/templates/dialog/route.html
View File

@@ -83,7 +83,7 @@
<div class="col-xs-12 col-sm-5">
<div class="form-group">
<label class="col-sm-3 col-xs-2 control-label">Type</label>
<label class="col-xs-2 col-sm-3 control-label">Type</label>
<div class="col-sm-offset-1 col-xs-3 col-sm-8 checkbox checkbox-primary">
<input id="form_wormholes" name="wormholes" value="1" type="checkbox" checked>
@@ -94,7 +94,7 @@
<i class="fas fa-tree-child col-sm-offset-4 hidden-xs"></i>
<div class="checkbox checkbox-warning checkbox-circle">
<div class="col-xs-4 checkbox checkbox-warning checkbox-circle">
<input id="form_wormholes_reduced" name="wormholesReduced" value="1" type="checkbox" checked>
<label for="form_wormholes_reduced">Stage 2 (reduced)
<i class="fas fa-fw fa-question-circle pf-help-light" title="include reduced connections"></i>
@@ -103,7 +103,7 @@
<i class="fas fa-tree-child col-sm-offset-4 hidden-xs"></i>
<div class="checkbox checkbox-danger checkbox-circle">
<div class="col-xs-3 checkbox checkbox-danger checkbox-circle">
<input id="form_wormholes_critical" name="wormholesCritical" value="1" type="checkbox" checked>
<label for="form_wormholes_critical">Stage 3 (critical)
<i class="fas fa-fw fa-question-circle pf-help-light" title="include critical connections"></i>
@@ -112,21 +112,21 @@
<i class="fas fa-tree-child col-sm-offset-4 hidden-xs"></i>
<div class="checkbox checkbox-danger">
<div class="col-xs-offset-9 col-xs-3 checkbox checkbox-danger">
<input id="form_wormholes_eol" name="wormholesEOL" value="1" type="checkbox" checked>
<label for="form_wormholes_eol">End of life (EOL)
<i class="fas fa-fw fa-question-circle pf-help-light" title="include EOL connections"></i>
</label>
</div>
<div class="col-sm-offset-4 checkbox checkbox-primary">
<div class="col-xs-offset-2 col-sm-offset-4 col-xs-3 col-sm-8 checkbox checkbox-primary">
<input id="form_stargates" name="stargates" value="1" type="checkbox" checked>
<label for="form_stargates">Stargates
<i class="fas fa-fw fa-question-circle pf-help-light" title="include stargate connections"></i>
</label>
</div>
<div class="col-sm-offset-4 checkbox checkbox-primary">
<div class="col-sm-offset-4 col-xs-3 col-sm-8 checkbox checkbox-primary">
<input id="form_jumpbridges" name="jumpbridges" value="1" type="checkbox" checked>
<label for="form_jumpbridges">Jump Bridges
<i class="fas fa-fw fa-question-circle pf-help-light" title="include jump bridge connections"></i>
@@ -136,7 +136,7 @@
</div>
</div>
<div class="col-xs-12 col-sm-7">
<div class="col-xs-6 col-sm-7">
<div class="form-group">
<label for="{{routeDialogSizeSelectId}}" class="col-sm-2 control-label">Size min</label>
<div class="col-sm-10">
@@ -149,10 +149,10 @@
</div>
</div>
<div class="col-sm-offset-3 col-xs-12 col-sm-4">
<div class="col-sm-offset-3 col-xs-6 col-sm-4">
<div class="pf-dynamic-area">
<div class="form-group">
<div class="col-sm-offset-1 checkbox checkbox-default">
<div class="col-xs-offset-1 checkbox checkbox-default">
<input id="form_connections_thera" name="wormholesThera" value="1" type="checkbox" checked>
<label for="form_connections_thera">Thera
<i class="fas fa-fw fa-question-circle pf-help-light" title="include known Thera connections"></i>
@@ -160,7 +160,7 @@
</label>
</div>
<div class="col-sm-offset-1 checkbox checkbox-default">
<div class="col-xs-offset-1 checkbox checkbox-default">
<input id="form_endpoints_bubble" name="endpointsBubble" value="1" type="checkbox" checked>
<label for="form_endpoints_bubble">Bubbled
<i class="fas fa-fw fa-question-circle pf-help-light" title="include bubbled source/destination endpoints"></i>

10
sass/layout/_dialogs.scss
View File

@@ -87,9 +87,13 @@
}
// checkbox list ============================================================
.fa-tree-child + .checkbox{
margin-left: 5px;
display: inline-block;
@media (min-width: $screen-sm-min) {
.fa-tree-child + .checkbox{
margin-left: 5px;
display: inline-block;
float: none;
width: unset;
}
}
// form wizard ==============================================================