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

new "own" character status, improved login/register forms (autocomplete), increased map lifetime for "private" maps

Browse Source
This commit is contained in:
Exodus4D
2015-10-25 19:20:10 +01:00
parent 85946fa7d3
commit fc02f64a7b
12 changed files with 74 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/pathfinder.ini
View File

@@ -100,7 +100,7 @@ INVITE_LIMIT = 50
; ======================================================================================================
; Lifetime for map types (days)
[PATHFINDER.MAP.PRIVATE]
LIFETIME = 2
LIFETIME = 7
[PATHFINDER.MAP.CORPORATION]
LIFETIME = 99999

5
js/app/landingpage.js
View File

@@ -106,7 +106,7 @@ define([
// login error
if(data.error !== undefined){
$('.' + config.splashOverlayClass).hideSplashOverlay();
loginFormMessageContainer.showMessage({title: 'Login failed', text: ' Invalid username and password', type: 'error'});
loginFormMessageContainer.showMessage({title: 'Login failed', text: ' Invalid username or password', type: 'error'});
}else if(data.reroute !== undefined){
window.location = data.reroute;
@@ -147,6 +147,9 @@ define([
};
/**
* show "registration key" dialog (see "Invite" feature)
*/
var showRequestRegistrationKeyDialog = function(){
var data = {
id: config.signatureReaderDialogId,

15
js/app/ui/dialog/account_settings.js
View File

@@ -35,6 +35,12 @@ define([
icon: {
size: 'fa-2x'
}
},
// character status
settingsCharacterStatusOwn : { // "own" -> my characters
name: 'own',
class: 'pf-user-status-own'
}
};
@@ -388,12 +394,13 @@ define([
var gridClass = ((12 / characterCount) < 4)? 4 : 12 / characterCount ;
// add character status information for each character
var statusInfo = {};
statusInfo.class = config.settingsCharacterStatusOwn.class;
statusInfo.label = config.settingsCharacterStatusOwn.name;
var mainCharacter = 0;
for(var i = 0; i < characters.length; i++){
var statusInfo = {};
statusInfo.class = Util.getStatusInfoForCharacter(characters[i], 'class');
statusInfo.label = Util.getStatusInfoForCharacter(characters[i], 'name');
characters[i].status =statusInfo;
characters[i].status = statusInfo;
if(characters[i].isMain === 1){
mainCharacter = characters[i].id;

41
js/app/util.js
View File

@@ -1043,20 +1043,39 @@ define([
// character status can not be checked if there are no reference data
// e.g. during registration process (landing page)
if(Init.characterStatus){
// get info for current "main" character
var corporationId = getCurrentUserInfo('corporationId');
var allianceId = getCurrentUserInfo('allianceId');
// compare current user data with given user data
if(
characterData.corporation &&
characterData.corporation.id === corporationId
){
statusInfo = Init.characterStatus.corporation[option];
}else if(
characterData.alliance &&
characterData.alliance.id === allianceId
){
statusInfo = Init.characterStatus.alliance[option];
// get all user characters
var userData = getCurrentUserData();
if(userData){
// check if character is one of his own characters
var userCharactersData = userData.characters;
for(var i = 0; i < userCharactersData.length; i++){
if(userCharactersData[i].id === characterData.id){
statusInfo = Init.characterStatus.own[option];
break;
}
}
}
if(statusInfo === ''){
// compare current user data with given user data
if(
characterData.corporation &&
characterData.corporation.id === corporationId
){
statusInfo = Init.characterStatus.corporation[option];
}else if(
characterData.alliance &&
characterData.alliance.id === allianceId
){
statusInfo = Init.characterStatus.alliance[option];
}
}
}

2
public/css/pathfinder.css
View File

File diff suppressed because one or more lines are too long

19
public/templates/dialog/map_manual.html
View File

@@ -1,13 +1,13 @@
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-header pull-left">
<ul class="nav navbar-nav {{dialogNavigationClass}}">
<li class="{{dialogNavLiClass}} active"><a data-target="#pf-manual-map" href="#"><i class="fa fa-code-fork fa-lg fa-fw"></i>&nbsp;Map</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-system" href="#"><i class="fa fa-sun-o fa-lg fa-fw"></i>&nbsp;System</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-connection" href="#"><i class="fa fa-chain fa-lg fa-fw"></i>&nbsp;Connection</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-signature" href="#"><i class="fa fa-table fa-lg fa-fw"></i>&nbsp;Signature</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-share" href="#"><i class="fa fa-share-alt fa-lg fa-fw"></i>&nbsp;Share</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-chart" href="#"><i class="fa fa-bar-chart fa-lg fa-fw"></i>&nbsp;Chart</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-notification" href="#"><i class="fa fa-bullhorn fa-lg fa-fw"></i>&nbsp;Notification</a></li>
<li class="{{dialogNavLiClass}} active"><a data-target="#pf-manual-map" href="#"><i class="fa fa-code-fork fa-fw"></i>&nbsp;Map</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-system" href="#"><i class="fa fa-sun-o fa-fw"></i>&nbsp;System</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-connection" href="#"><i class="fa fa-chain fa-fw"></i>&nbsp;Connection</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-signature" href="#"><i class="fa fa-table fa-fw"></i>&nbsp;Signature</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-share" href="#"><i class="fa fa-share-alt fa-fw"></i>&nbsp;Share</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-chart" href="#"><i class="fa fa-bar-chart fa-fw"></i>&nbsp;Chart</a></li>
<li class="{{dialogNavLiClass}}"><a data-target="#pf-manual-notification" href="#"><i class="fa fa-bullhorn fa-fw"></i>&nbsp;Notification</a></li>
</ul>
</div>
</nav>
@@ -53,6 +53,11 @@
The <em>"Grid snapping"</em> option can be activated on the "Map Menu" <small>(<i class="fa fa-code-fork fa-fw"></i>)</small>. Systems will snap to a <samp>20x20px</samp> grid.
A grid overlay appears on the map.
</p>
<h4><i class="fa fa-magnet fa-fw"></i> Magnetizing</h4>
<p>
The <em>"Magnetizing"</em> option can be activated on the "Map Menu" <small>(<i class="fa fa-code-fork fa-fw"></i>)</small>.
If active, systems effect each other while <kbd>move</kbd>/<kbd>drag&amp;drop</kbd> and will rearrange themselves automatically on the map. This prevents system "overlapping"
</p>
<h4><i class="fa fa-history fa-fw"></i> Update counter</h4>
<div class="pf-map-overlay" style="position: initial; display: block; padding-top: 1px; float: left; margin: 0 10px 10px 0;">
<div class="{{pieChartClass}} {{mapCounterClass}}" data-percent="40">

12
public/templates/dialog/settings.html
View File

@@ -68,10 +68,10 @@
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label for="email" class="col-sm-3 control-label">Username</label>
<label for="name" class="col-sm-3 control-label">Username</label>
<div class="col-sm-6">
<div class="input-group" title="Choose your unique username" data-placement="right">
<input name="name" type="text" class="form-control" id="name" value="" placeholder="Your username" data-error="Username required" data-minlength="5" data-minlength-error="Min. of 5 characters" autocomplete="off" required>
<input name="name" type="text" class="form-control" id="name" value="" placeholder="Your username" data-error="Username required" data-minlength="5" data-minlength-error="Min. of 5 characters" autocomplete="nickname" required>
<span class="input-group-addon"><i class="fa fa-fw fa-user"></i></span>
</div>
<div class="help-block with-errors"></div>
@@ -104,7 +104,7 @@
<label for="email" class="col-sm-3 control-label">New Email</label>
<div class="col-sm-6">
<div class="input-group" title="Enter your email. It will be kept private!" data-placement="right">
<input name="email" type="email" class="form-control" id="email" value="" placeholder="your@email.com" data-error="Email required" autocomplete="off" {{#register}}required{{/register}} >
<input name="email" type="email" class="form-control" id="email" value="" placeholder="your@email.com" data-error="Email required" autocomplete="email" {{#register}}required{{/register}} >
<span class="input-group-addon"><i class="fa fa-fw fa-envelope"></i></span>
</div>
<div class="help-block with-errors"></div>
@@ -119,7 +119,7 @@
<label for="email_confirm" class="col-sm-3 control-label">Confirm Email</label>
<div class="col-sm-6">
<div class="input-group" title="Confirm your email" data-placement="right">
<input name="email_confirm" type="email" class="form-control" id="email_confirm" value="" placeholder="your@email.com" data-error="Email required" data-match="#email" data-match-error="Email fields do not match" autocomplete="off" {{#register}}required{{/register}}>
<input name="email_confirm" type="email" class="form-control" id="email_confirm" value="" placeholder="your@email.com" data-error="Email required" data-match="#email" data-match-error="Email fields do not match" autocomplete="email" {{#register}}required{{/register}}>
<span class="input-group-addon"><i class="fa fa-fw fa-envelope"></i></span>
</div>
<div class="help-block with-errors"></div>
@@ -152,7 +152,7 @@
<label for="password" class="col-sm-3 control-label">New Password</label>
<div class="col-sm-6">
<div class="input-group" title="Enter your password. Do not use your EVE password" data-placement="right">
<input name="password" type="password" class="form-control" id="password" placeholder="" data-minlength="6" data-minlength-error="Min. of 6 characters" {{#register}}required{{/register}}>
<input name="password" type="password" class="form-control" id="password" placeholder="" data-minlength="6" data-minlength-error="Min. of 6 characters" autocomplete="new-password" {{#register}}required{{/register}}>
<span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
</div>
<div class="help-block with-errors"></div>
@@ -167,7 +167,7 @@
<label for="password_confirm" class="col-sm-3 control-label">Confirm Password</label>
<div class="col-sm-6">
<div class="input-group" title="Confirm your password" data-placement="right">
<input name="password_confirm" type="password" class="form-control" id="password_confirm" placeholder="" data-minlength="6" data-minlength-error="Min. of 6 characters" data-match="#password" data-match-error="Password fields do not match" {{#register}}required{{/register}}>
<input name="password_confirm" type="password" class="form-control" id="password_confirm" placeholder="" data-minlength="6" data-minlength-error="Min. of 6 characters" data-match="#password" data-match-error="Password fields do not match" autocomplete="new-password" {{#register}}required{{/register}}>
<span class="input-group-addon"><i class="fa fa-fw fa-lock"></i></span>
</div>
<div class="help-block with-errors"></div>

8
public/templates/view/landingpage.html
View File

@@ -94,7 +94,7 @@
<div class="row">
<div class="col-sm-3 col-sm-offset-3">
<div class="form-group">
<input type="text" class="form-control" name="userName" id="userName" placeholder="Username" autocomplete="off" tabindex="1" data-error="Username required" required>
<input type="text" class="form-control" name="userName" id="userName" placeholder="Username" autocomplete="off" tabindex="1" data-error="Username required" autofocus required>
<div class="help-block with-errors text-left"></div>
</div>
</div>
@@ -131,10 +131,10 @@
<div class="row text-center">
<div class="col-sm-6 col-sm-offset-3">
<div class="col-sm-4 col-sm-offset-2" data-placement="left" title="{{@registrationStatusTitle}}">
<div class="col-xs-6 col-sm-4 col-sm-offset-2" data-placement="left" title="{{@registrationStatusTitle}}">
<button type="button" class="pf-register-button btn-block btn btn-primary {{@registrationStatusButton}}" tabindex="-1"><i class="fa fa-fw fa-user-plus"></i> Sign up</button>
</div>
<div class="col-sm-4">
<div class="col-xs-6 col-sm-4">
<button type="submit" class="pf-login-button btn-block btn btn-success" tabindex="3"><i class="fa fa-fw fa-sign-in"></i> Log in</button>
</div>
</div>
@@ -601,7 +601,7 @@
</div>
<div class="price-features">
<ul class="list-unstyled text-left">
<li><i class="fa fa-fw fa-history txt-color txt-color-orange"></i> Map lifetime <span class="badge">48</span> h</li>
<li><i class="fa fa-fw fa-history txt-color txt-color-orange"></i> Map lifetime <span class="badge">{{ @PATHFINDER.MAP.PRIVATE.LIFETIME }}</span> days</li>
<li><i class="fa fa-fw fa-check txt-color txt-color-green"></i> Create up to <span class="badge">3</span> private maps</li>
<li><i class="fa fa-fw fa-check txt-color txt-color-green"></i> Share maps with up to <span class="badge">10</span> users</li>
<li><i class="fa fa-fw fa-check txt-color txt-color-green"></i> System information module</li>

1
sass/_main-colorpallet.scss
View File

@@ -28,6 +28,7 @@
&.txt-color-white { color: $white !important; }
&.txt-color-magenta { color: $magenta !important; }
&.txt-color-tealLighter { color: $teal-lighter !important; }
&.txt-color-indigoDark { color: $indigo-dark !important; }
&.txt-color-indigoDarkest { color: $indigo-darkest !important; }

1
sass/layout/_forms.scss
View File

@@ -18,7 +18,6 @@ input, select{
@include box-shadow(0 0 0 50px $gray-dark inset !important);
-webkit-text-fill-color: $gray-lighter;
}
}
// fix for bootstrap-toggle plugin

1
sass/layout/_logo.scss
View File

@@ -9,7 +9,6 @@ $logo-stroke-width: 0px;
path{
will-change: fill, opacity, transform, translateZ, translateX, translateY;
cursor: pointer;
pointer-events: all;
@include transform( translate3d(0, 0, 0) );
}

10
sass/layout/_main.scss
View File

@@ -132,12 +132,6 @@ select:active, select:hover {
}
}
::-moz-placeholder { color: $gray-light; // Firefox
opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
:-ms-input-placeholder { color: $gray-light; } // Internet Explorer 10+
::-webkit-input-placeholder { color: $gray-light; } // Safari and Chrome
// global datatable styles ==========================================
.dataTable{
@@ -423,6 +417,10 @@ select:active, select:hover {
color: $blue;
}
.pf-user-status-own{
color: $indigo;
}
// WH effects ==================================================
.pf-system-effect{