diff --git a/app/main/controller/api/map.php b/app/main/controller/api/map.php index e8d5a42c..f9222d3d 100644 --- a/app/main/controller/api/map.php +++ b/app/main/controller/api/map.php @@ -213,11 +213,11 @@ class Map extends Controller\AccessController { // get SSO error messages that should be shown immediately ---------------------------------------------------- // -> e.g. errors while character switch from previous HTTP requests - if( $f3->exists(Controller\Ccp\Sso::SESSION_KEY_SSO_ERROR) ){ + if($f3->exists(Controller\Ccp\Sso::SESSION_KEY_SSO_ERROR, $message)){ $ssoError = (object) []; $ssoError->type = 'error'; $ssoError->title = 'Login failed'; - $ssoError->message = $f3->get(Controller\Ccp\Sso::SESSION_KEY_SSO_ERROR); + $ssoError->message = $message; $return->error[] = $ssoError; $f3->clear(Controller\Ccp\Sso::SESSION_KEY_SSO_ERROR); } diff --git a/public/templates/admin/settings.html b/public/templates/admin/settings.html index fd1c72ee..c3ef8a56 100644 --- a/public/templates/admin/settings.html +++ b/public/templates/admin/settings.html @@ -15,7 +15,7 @@

{{ @corpCount }}. {{@corpName}} - {{ @corporation->name }} + {{ @corporation->name }}

diff --git a/public/templates/dialog/credit.html b/public/templates/dialog/credit.html index 2af703a0..bb8a1b01 100644 --- a/public/templates/dialog/credit.html +++ b/public/templates/dialog/credit.html @@ -25,16 +25,16 @@
URL
-
pathfinder
+
pathfinder
Repository
-
GitHub
+
GitHub
Social
-
Google+
+
Google+
Media
-
YouTube
+
YouTube
Licence
(MIT) License
 
@@ -46,12 +46,12 @@
- +
- +
diff --git a/public/templates/modules/footer.html b/public/templates/modules/footer.html index 4190884d..4eac2ba6 100644 --- a/public/templates/modules/footer.html +++ b/public/templates/modules/footer.html @@ -7,7 +7,7 @@

-

All EVE ONLINE +

All EVE ONLINE related materials are property of CCP Games

diff --git a/public/templates/modules/sso.html b/public/templates/modules/sso.html index e012cea1..69ba472b 100644 --- a/public/templates/modules/sso.html +++ b/public/templates/modules/sso.html @@ -16,7 +16,7 @@

- What is this? + What is this?
diff --git a/public/templates/tooltip/character_info.html b/public/templates/tooltip/character_info.html index 2175eb33..c9ddac41 100644 --- a/public/templates/tooltip/character_info.html +++ b/public/templates/tooltip/character_info.html @@ -1,6 +1,6 @@
- +
@@ -15,7 +15,7 @@
 
- +
diff --git a/public/templates/ui/character_panel.html b/public/templates/ui/character_panel.html index beb91e45..639229e6 100644 --- a/public/templates/ui/character_panel.html +++ b/public/templates/ui/character_panel.html @@ -13,16 +13,16 @@
- {{ character.name }} + {{ character.name }}
{{#character.corporation}} - +
{{ name }}
{{/character.corporation}} {{#character.alliance}} - +
{{ name }}
{{/character.alliance}}
diff --git a/public/templates/ui/notice.html b/public/templates/ui/notice.html index 7575e3d6..05e037e9 100644 --- a/public/templates/ui/notice.html +++ b/public/templates/ui/notice.html @@ -7,9 +7,9 @@
    -
  • New module for Intel tracking (e.g. Citadel information) added #246
    • -
  • Added new "Abyss" systems #631
    • -
  • Added "system statics" an "signature strength" information to map #623
    • +
  • New module for Intel tracking (e.g. Citadel information) added #246
    • +
  • Added new "Abyss" systems #631
    • +
  • Added "system statics" an "signature strength" information to map #623
  • Many more minor improvements/fixes and performance optimizations.
  • Complete changelog
diff --git a/public/templates/ui/splash.html b/public/templates/ui/splash.html index cb226133..2afd57fe 100644 --- a/public/templates/ui/splash.html +++ b/public/templates/ui/splash.html @@ -3,7 +3,7 @@

PATHFINDER - System Mapping Tool

- pathfinder is an open source mapping tool for EVE ONLINE. + pathfinder is an open source mapping tool for EVE ONLINE.

diff --git a/public/templates/view/admin.html b/public/templates/view/admin.html index 67a8846b..4c5ea072 100644 --- a/public/templates/view/admin.html +++ b/public/templates/view/admin.html @@ -7,7 +7,7 @@
@@ -1008,9 +1008,9 @@
@@ -1021,7 +1021,7 @@