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

- added head navigation to /setup page

Browse Source 
- updated release notes panel
This commit is contained in:
Mark Friedrich
2018-09-17 22:14:43 +02:00
parent ec05738cce
commit 17039ae22d
25 changed files with 169 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/app/login.js
View File

@@ -449,16 +449,7 @@ define([
showVisibleElements();
// event listener for navigation links
$('.page-scroll').on('click', function(){
// get element to scroll
let anchorTag = $(this).attr('data-anchor');
// scroll to container
$(anchorTag).velocity('scroll', {
duration: 300,
easing: 'swing'
});
});
Util.initPageScroll('#' + config.navigationElementId);
};
/**

1
js/app/page.js
View File

@@ -562,7 +562,6 @@ define([
Util.showNotify({title: 'Map tracking: ' + tracking, text: trackingText, type: trackingType}, false);
});
// init all tooltips
let tooltipElements = $('#' + config.pageHeaderId).find('[title]');
tooltipElements.tooltip({

3
js/app/setup.js
View File

@@ -48,6 +48,9 @@ define([
let setPageObserver = () => {
let body = $('body');
// navigation (scroll) ----------------------------------------------------------------------------------------
Util.initPageScroll(body);
// collapse ---------------------------------------------------------------------------------------------------
body.find('[data-toggle="collapse"]').css({cursor: 'pointer'}).on('click', function(){
$(this).find('.pf-animate-rotate').toggleClass('right');

4
js/app/ui/dialog/manual.js
View File

@@ -8,7 +8,7 @@ define([
'app/util',
'app/render',
'bootbox',
], function($, Init, Util, Render, bootbox){
], ($, Init, Util, Render, bootbox) => {
'use strict';
@@ -26,7 +26,7 @@ define([
*/
$.fn.showMapManual = function(){
requirejs(['text!templates/dialog/map_manual.html', 'mustache'], function(template, Mustache){
requirejs(['text!templates/dialog/map_manual.html', 'mustache'], (template, Mustache) => {
let data = {
dialogNavigationClass: config.dialogNavigationClass,

17
js/app/util.js
View File

@@ -991,12 +991,26 @@ define([
initPassiveEvents();
};
/**
*
* @param element
*/
let initPageScroll = (element) => {
$(element).on('click', '.page-scroll', function(){
// scroll to ancor element
$($(this).attr('data-anchor')).velocity('scroll', {
duration: 300,
easing: 'swing'
});
});
};
/**
* flatten XEditable array for select fields
* @param dataArray
* @returns {{}}
*/
let flattenXEditableSelectArray = (dataArray) => {
let flattenXEditableSelectArray = dataArray => {
let flatten = {};
for(let data of dataArray){
@@ -2926,6 +2940,7 @@ define([
getCurrentLocationData: getCurrentLocationData,
getCurrentUserInfo: getCurrentUserInfo,
getCurrentCharacterLog: getCurrentCharacterLog,
initPageScroll: initPageScroll,
flattenXEditableSelectArray: flattenXEditableSelectArray,
getCharacterDataBySystemId: getCharacterDataBySystemId,
getNearBySystemData: getNearBySystemData,

10
public/css/v1.4.1/pathfinder.css
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

1
public/img/logo.svg
View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="pf-logo-wrapper" xmlns="http://www.w3.org/2000/svg" version="1.2" width="0" height="0" shape-rendering="geometricPrecision">
<filter id="LogoFilterShadow" width="150%" height="150%">
<feOffset result="offOut" in="SourceAlpha" dx="-3" dy="3"/>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

11
public/js/v1.4.1/app/login.js
View File

@@ -449,16 +449,7 @@ define([
showVisibleElements();
// event listener for navigation links
$('.page-scroll').on('click', function(){
// get element to scroll
let anchorTag = $(this).attr('data-anchor');
// scroll to container
$(anchorTag).velocity('scroll', {
duration: 300,
easing: 'swing'
});
});
Util.initPageScroll('#' + config.navigationElementId);
};
/**

1
public/js/v1.4.1/app/page.js
View File

@@ -562,7 +562,6 @@ define([
Util.showNotify({title: 'Map tracking: ' + tracking, text: trackingText, type: trackingType}, false);
});
// init all tooltips
let tooltipElements = $('#' + config.pageHeaderId).find('[title]');
tooltipElements.tooltip({

3
public/js/v1.4.1/app/setup.js
View File

@@ -48,6 +48,9 @@ define([
let setPageObserver = () => {
let body = $('body');
// navigation (scroll) ----------------------------------------------------------------------------------------
Util.initPageScroll(body);
// collapse ---------------------------------------------------------------------------------------------------
body.find('[data-toggle="collapse"]').css({cursor: 'pointer'}).on('click', function(){
$(this).find('.pf-animate-rotate').toggleClass('right');

4
public/js/v1.4.1/app/ui/dialog/manual.js
View File

@@ -8,7 +8,7 @@ define([
'app/util',
'app/render',
'bootbox',
], function($, Init, Util, Render, bootbox){
], ($, Init, Util, Render, bootbox) => {
'use strict';
@@ -26,7 +26,7 @@ define([
*/
$.fn.showMapManual = function(){
requirejs(['text!templates/dialog/map_manual.html', 'mustache'], function(template, Mustache){
requirejs(['text!templates/dialog/map_manual.html', 'mustache'], (template, Mustache) => {
let data = {
dialogNavigationClass: config.dialogNavigationClass,

17
public/js/v1.4.1/app/util.js
View File

@@ -991,12 +991,26 @@ define([
initPassiveEvents();
};
/**
*
* @param element
*/
let initPageScroll = (element) => {
$(element).on('click', '.page-scroll', function(){
// scroll to ancor element
$($(this).attr('data-anchor')).velocity('scroll', {
duration: 300,
easing: 'swing'
});
});
};
/**
* flatten XEditable array for select fields
* @param dataArray
* @returns {{}}
*/
let flattenXEditableSelectArray = (dataArray) => {
let flattenXEditableSelectArray = dataArray => {
let flatten = {};
for(let data of dataArray){
@@ -2926,6 +2940,7 @@ define([
getCurrentLocationData: getCurrentLocationData,
getCurrentUserInfo: getCurrentUserInfo,
getCurrentCharacterLog: getCurrentCharacterLog,
initPageScroll: initPageScroll,
flattenXEditableSelectArray: flattenXEditableSelectArray,
getCharacterDataBySystemId: getCharacterDataBySystemId,
getNearBySystemData: getNearBySystemData,

6
public/templates/modules/footer.html
View File

@@ -1,15 +1,15 @@
<div id="{{id}}" class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<div class="navbar-header pull-left">
<p class="navbar-text txt-color txt-color-gray"><i class="far fa-copyright"></i>
{{ currentYear }} <a class="{{footerLicenceLinkClass}}" href="javascript:void(0)" target="_blank">Licence</a>
</p>
</div>
<div class="navbar-header pull-right">
<p class="navbar-text txt-color txt-color-gray">All <a href="http://www.eveonline.com/" target="_blank" rel="noopener">EVE ONLINE</a>
<p class="navbar-text txt-color txt-color-gray">All <a href="http://www.eveonline.com/" target="_blank" rel="noopener">EVE ONLINE</a>
related materials are property of
<a target="_blank" href="http://www.ccpgames.com" rel="noopener">CCP Games</a></p>
<a target="_blank" href="http://www.ccpgames.com" rel="noopener">CCP Games</a>
</p>
</div>
</div>
</div>

8
public/templates/ui/footer.html
View File

@@ -1,10 +1,10 @@
<footer class="navbar-default navbar-fixed-bottom">
<div class="container-fluid">
<a href="{{ 'login' | alias }}" class="btn btn-default navbar-btn btn-default">
<i class="fas fa-arrow-left"></i> back
<a href="{{ 'login' | alias }}" class="btn btn-fake navbar-btn">
<i class="fas fa-arrow-left"></i>&nbsp;back
</a>
<a href="#pf-setup" class="btn btn-default navbar-btn btn-default pull-right">
<i class="fas fa-arrow-up"></i> top
<a href="#pf-setup-server" class="btn btn-fake navbar-btn pull-right">
<i class="fas fa-arrow-up"></i>&nbsp;top
</a>
</div>
</footer>

21
public/templates/ui/notice.html
View File

@@ -7,20 +7,21 @@
<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 map filter options <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/641" rel="noopener">#641</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>New "compact" map layout <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/607" rel="noopener">#607</a></li>
<li>
<i class="fas fa-fw fa-angle-right"></i>UI improvements. New planet data <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/648" rel="noopener">#648</a>,
shattered wh data <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/647" rel="noopener">#647</a>,
"killbaord" module <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/650" rel="noopener">#650</a>,
full "Abyss" support <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/631" rel="noopener">#631</a>,
<i class="fas fa-fw fa-angle-right"></i>Signature module: New filter <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/376" rel="noopener">#376</a>,
keyboard navigation <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/266" rel="noopener">#266</a>,
UI changes <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/679" rel="noopener">#679</a>,
tooltips <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/390" rel="noopener">#390</a>,
layout <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/629" rel="noopener">#629</a>
</li>
<li><i class="fas fa-fw fa-angle-right"></i>"Rally point and "route search" improvements <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/664" rel="noopener">#664</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>Unique system URLs (e.g. in <em>Discord/Slack</em> messages) <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/682" rel="noopener">#682</a></li>
<li><i class="fas fa-fw fa-angle-right"></i>Improved "planet" information <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/684" rel="noopener">#684</a></li>
<li>
<i class="fas fa-fw fa-angle-right"></i>Performance improvements <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/459" rel="noopener">#459</a>,
<a target="_blank" href="//github.com/exodus4d/pathfinder/issues/636" rel="noopener">#636</a>
<i class="fas fa-fw fa-angle-right"></i>Performance improvements <a target="_blank" href="//github.com/exodus4d/pathfinder/issues/685" rel="noopener">#685</a>,
<a target="_blank" href="//github.com/exodus4d/pathfinder/issues/686" rel="noopener">#686</a>
</li>
<li><i class="fas fa-fw fa-angle-right"></i>Many more minor improvements/fixes and performance optimizations.</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>
<li><i class="fas fa-fw fa-angle-double-right"></i>Many more improvements/fixes and performance optimizations. Complete <a href="javascript:void(0)" class="pf-navbar-version-info">changelog</a></li>
</ul>
</div>
</div>

64
public/templates/view/setup.html
View File

@@ -1,12 +1,39 @@
{* splash page *}
<include href="templates/ui/splash.html"/>
<include href="img/logo.svg"/>
{* counter for DB warnings (all databases) *}
<set dbWarnings="0" />
<section id="pf-setup">
<nav id="pf-navbar" class="navbar navbar-default navbar-fixed-top pf-head">
<div class="container col-sm-12">
<div id="pf-head" class="navbar-header">
<span class="navbar-brand pf-head-menu">
<svg class="pf-head-menu-logo" width="24px" height="24px">
<use xlink:href="#pf-logo"/>
</svg>
&nbsp;&nbsp;Setup
</span>
</div>
<div class="navbar-collapse">
<ul class="nav navbar-nav navbar-right" role="tablist">
<li class="hide-before"><a class="page-scroll" data-anchor="#pf-setup-server" href="#"><i class="fas fa-fw fa-home"></i>&nbsp;Server</a></li>
<li class="hide-before"><a class="page-scroll" data-anchor="#pf-setup-environment" href="#"><i class="fas fa-fw fa-server"></i>&nbsp;Environment</a></li>
<li class="hide-before"><a class="page-scroll" data-anchor="#pf-setup-settings" href="#"><i class="fas fa-fw fa-sliders-h"></i>&nbsp;Settings</a></li>
<li class="hide-before"><a class="page-scroll" data-anchor="#pf-setup-database" href="#"><i class="fas fa-fw fa-database"></i>&nbsp;Database</a></li>
<li class="hide-before"><a class="page-scroll" data-anchor="#pf-setup-socket" href="#"><i class="fas fa-fw fa-exchange-alt"></i>&nbsp;Socket</a></li>
<li class="hide-before"><a class="page-scroll" data-anchor="#pf-setup-administration" href="#"><i class="fas fa-fw fa-wrench"></i>&nbsp;Administration</a></li>
</ul>
</div>
</div>
</nav>
<section id="pf-setup-server">
<div class="container">
<div class="row"></div>
<div class="row text-center">
<div class="col-md-6 col-md-offset-3">
<h2><span class="text-primary">Setup</span> and Bootstrapping</h2>
@@ -192,6 +219,12 @@
</div>
</div>
</section>
<section id="pf-setup-environment">
<div class="container">
<h4><i class="fas fa-fw fa-server"></i> Environment</h4>
<div class="row text-center">
@@ -271,6 +304,12 @@
</div>
</div>
</div>
</section>
<section id="pf-setup-settings">
<div class="container">
<h4><i class="fas fa-fw fa-sliders-h"></i> Settings</h4>
<div class="row text-center">
@@ -415,10 +454,15 @@
</div>
</div>
</div>
<h4 id="pf-setup-database"><i class="fas fa-fw fa-database"></i> Database</h4>
</div>
</section>
<section id="pf-setup-database">
<div class="container">
<h4><i class="fas fa-fw fa-database"></i> Database</h4>
<div class="row text-center">
@@ -872,6 +916,12 @@
</div>
</div>
</section>
<section id="pf-setup-socket">
<div class="container">
<h4><i class="fas fa-fw fa-exchange-alt"></i> Socket configuration <span class="txt-color txt-color-gray">[advanced]</span></h4>
<div class="row text-center">
@@ -925,7 +975,13 @@
</div>
<h4 id="pf-setup-administration"><i class="fas fa-fw fa-wrench"></i> Administration</h4>
</div>
</section>
<section id="pf-setup-administration">
<div class="container">
<h4><i class="fas fa-fw fa-wrench"></i> Administration</h4>
<div class="row text-center">
<div class="col-xs-12 col-md-6 pf-landing-pricing-panel">

10
sass/_variables.scss
View File

@@ -33,13 +33,14 @@ $pf-font-path: "../../fonts" !default;
@font-face {
font-family: 'Oxygen';
font-weight: 400;
font-style: normal;
font-display: swap;
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.woff2') format('woff2'),
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;
}
/* not used jet
@@ -56,13 +57,14 @@ $pf-font-path: "../../fonts" !default;
@font-face {
font-family: 'Oxygen Bold';
font-weight: 700;
font-style: normal;
font-display: swap;
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.woff2') format('woff2'),
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;
}

1
sass/bootstrap/_glyphicons.scss
View File

@@ -16,6 +16,7 @@
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
font-display: swap;
}
// Catchall baseclass

1
sass/layout/_fonts.scss
View File

@@ -7,6 +7,7 @@
url('#{$pf-font-path}/triglavian-regular.woff2') format('woff2'),
url('#{$pf-font-path}/triglavian-regular.woff') format('woff'),
url('#{$pf-font-path}/triglavian-regular.ttf') format('truetype');
font-display: swap;
}
.pf-triglivian {

2
sass/layout/_forms.scss
View File

@@ -119,7 +119,7 @@ fieldset[disabled]{
cursor: default;
opacity: 1 !important;
color: $gray-light !important;
background-color: $gray !important;
background-color: transparent !important;
}
// progress bar inside button

29
sass/layout/_landing.scss
View File

@@ -313,6 +313,10 @@
padding-top: 40px;
padding-bottom: 30px;
@media (max-width: $screen-sm-max) {
padding-top: 10px;
}
.row{
margin-bottom: 0;
}
@@ -680,6 +684,31 @@
}
}
// setup page -----------------------------------------------------------------
.pf-body[data-script='setup']{
.navbar-brand:hover{
color: #777; // overwrite default
}
section {
padding-bottom: 0; // overwrite default
border-bottom: 0; // overwrite default
&:first-of-type{
padding-top: 60px;
}
&:last-of-type{
padding-bottom: 60px;
}
.container{
& > .row{
margin-bottom: 0; // overwrite default
}
}
}
}
// TEST ---
/*

1
sass/library/fontawesome/_brands.scss vendored
View File

@@ -8,6 +8,7 @@
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
font-display: swap;
src: url('#{$fa-font-path}/fa-brands-400.eot');
src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),

1
sass/library/fontawesome/_regular.scss vendored
View File

@@ -8,6 +8,7 @@
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('#{$fa-font-path}/fa-regular-400.eot');
src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'),

1
sass/library/fontawesome/_solid.scss vendored
View File

@@ -8,6 +8,7 @@
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
font-display: swap;
src: url('#{$fa-font-path}/fa-solid-900.eot');
src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),