- increased rout search depth 7000 -> 9000

- UI improvements on new /admin/settings page
- Updated notice panel information for upcoming v1.3.3
This commit is contained in:
Mark Friedrich
2018-02-17 18:43:01 +01:00
parent e3c7c25562
commit fa0daca5fe
7 changed files with 82 additions and 11 deletions

View File

@@ -125,7 +125,7 @@ SEND_RALLY_Mail_ENABLED = 0
[PATHFINDER.ROUTE]
; max recursive search depth for routes (default: 7000)
; decrease it on performance problems
SEARCH_DEPTH = 7000
SEARCH_DEPTH = 9000
; default count of routes that will be checked (initial) when a system is selected (default: 2)
SEARCH_DEFAULT_COUNT = 2
; max count of routes that can be selected in "route settings" dialog (default: 4)

View File

@@ -24,6 +24,39 @@ define([
$('.' + config.triggerOverlayClass).on('click', function(){
$('.' + config.splashOverlayClass).showSplashOverlay();
});
// set fieldset toggled by checkbox ---------------------------------------------------------------------------
$('input[type="checkbox"][data-target]').on('change', function(){
let targetId = $(this).attr('data-target');
if(targetId){
let targetElement = $('[data-id="' + targetId + '"]');
let targetFormFields = targetElement.find('input[type="radio"]');
let checkFormFields = [];
for(let formField of targetFormFields) {
if(this.checked){
if(formField.hasAttribute('data-default') || formField.getAttribute('data-default-value')){
checkFormFields.push(formField);
}
}else{
formField.setAttribute('data-default-value', formField.checked ? 'checked' : '');
if(formField.hasAttribute('data-default')){
checkFormFields.push(formField);
}
}
}
for(let checkFormField of checkFormFields) {
checkFormField.checked = true;
}
}
});
$('input[type="radio"]').on('change', function(){
if(this.checked){
let targetId = $(this).parents('fieldset').attr('data-id');
$('input[type="checkbox"][data-target="' + targetId + '"]').prop('checked', true);
}
});
};
/**

View File

@@ -24,6 +24,39 @@ define([
$('.' + config.triggerOverlayClass).on('click', function(){
$('.' + config.splashOverlayClass).showSplashOverlay();
});
// set fieldset toggled by checkbox ---------------------------------------------------------------------------
$('input[type="checkbox"][data-target]').on('change', function(){
let targetId = $(this).attr('data-target');
if(targetId){
let targetElement = $('[data-id="' + targetId + '"]');
let targetFormFields = targetElement.find('input[type="radio"]');
let checkFormFields = [];
for(let formField of targetFormFields) {
if(this.checked){
if(formField.hasAttribute('data-default') || formField.getAttribute('data-default-value')){
checkFormFields.push(formField);
}
}else{
formField.setAttribute('data-default-value', formField.checked ? 'checked' : '');
if(formField.hasAttribute('data-default')){
checkFormFields.push(formField);
}
}
}
for(let checkFormField of checkFormFields) {
checkFormField.checked = true;
}
}
});
$('input[type="radio"]').on('change', function(){
if(this.checked){
let targetId = $(this).parents('fieldset').attr('data-id');
$('input[type="checkbox"][data-target="' + targetId + '"]').prop('checked', true);
}
});
};
/**

View File

@@ -6,6 +6,9 @@
<div class="row text-center">
<repeat group="{{ @tplSettings->corporations }}" value="{{ @corporation }}" key="{{@corpName}}" counter="{{ @corpCount }}">
<set fieldsetId = "{{ 'settings-map-' . @corporation->_id }}" />
<form role="form" class="form-horizontal" action="/admin/{{ @tplPage}}/save/{{ @corporation->_id }}">
<div class="col-sm-12 col-md-6 col-lg-4 pf-landing-pricing-panel">
<div class="panel panel-default pricing-big">
@@ -19,7 +22,7 @@
<set isManaged = "" />
<fieldset class="reverse-order-footer">
<fieldset class="reverse-order-footer" data-id="{{ @fieldsetId}}">
<h4 class="pf-dynamic-area">Map roles</h4>
<repeat group="{{ @corporation->getRights() }}" value="{{ @corporationRight }}" >
@@ -37,8 +40,8 @@
<div class="col-sm-12 col-md-6">
<div class="form-group">
<div class="col-xs-6 col-sm-12 checkbox checkbox-warning">
<input id="form_managed" name="managed" value="1" type="checkbox" {{ @isManaged }}>
<label for="form_managed">Managed mode
<input id="{{ @fieldsetId}}" name="managed" value="1" type="checkbox" data-target="{{ @fieldsetId}}" {{ @isManaged }}>
<label for="{{ @fieldsetId}}">Managed mode
<i class="fas fa-fw fa-sm fa-question-circle pf-help-light" title="If active only corporation admins can add/update/delete corporation map settings"></i>
</label>
</div>

View File

@@ -12,6 +12,10 @@
<repeat group="{{ @roles }}" value="{{ @role }}" >
<set roleType="" />
<set default="" />
<check if="{{ @role->_id==1 }}">
<set default="true" />
</check>
<check if="{{ @role->_id==2 }}">
<set roleType="radio-danger" />
</check>
@@ -28,7 +32,7 @@
<div class="form-group">
<div class="col-xs-12">
<div class="radio {{ @roleType }}">
<input id="form_role_{{ (int)@@id }}_{{ (int)@right->rightId->_id }}_{{ (int)@role->_id }}" name="rights[{{(int)@right->rightId->_id}}][roleId]" value="{{ (int)@role->_id }}" type="radio" {{ @checked }}>
<input id="form_role_{{ (int)@@id }}_{{ (int)@right->rightId->_id }}_{{ (int)@role->_id }}" name="rights[{{(int)@right->rightId->_id}}][roleId]" value="{{ (int)@role->_id }}" type="radio" <check if="{{ @default }}">data-default</check> {{ @checked }}>
<label for="form_role_{{ (int)@@id }}_{{ (int)@right->rightId->_id }}_{{ (int)@role->_id }}">{{ @role->label }}</label >
</div>
</div>

View File

@@ -7,11 +7,9 @@
<div class="panel-body no-padding text-align-center">
<div class="price-features" style="min-height: inherit;">
<ul class="list-unstyled text-left">
<li><i class="fas fa-fw fa-angle-right"></i>New <em>Discord</em> integration with <em>Webhooks</em> <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/547">#547</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>New feature added for sorting map tabs (drag&drop) <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/571">#571</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>New "map recovery" option added to admin section <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/547">#547</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>Improvements and fixes for ship "mass log" panel <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/560">#560</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>Improved system positions on map. Prevents overlapping. <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/570">#570</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>New "adjustable map height" <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/553">#553</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>New "role management" for corporation managers <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues/164">#164</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>Performance tweeks and minor bug fixes.</li>
<li><i class="fas fa-fw fa-angle-double-right"></i>Complete <a href="javascript:void(0)" class="pf-navbar-version-info">changelog</a></li>
</ul>
</div>

View File

@@ -4,7 +4,7 @@
<div class="timeline-heading">
<h4 class="timeline-title">
<a href="{{releaseData.html_url}}" target="_blank">
<i class="fas fa-fw fa-tag"></i>{{ releaseData.name }}
<i class="fas fa-fw fa-tag"></i>&nbsp;{{ releaseData.name }}
</a>
<span class="text-muted pull-right">