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

- fixed some URL root issues for /subdir installations, closed #706

Browse Source
This commit is contained in:
Mark Friedrich
2018-11-17 22:24:17 +01:00
parent 68b47f0488
commit b51c734f37
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/controller/admin.php
View File

@@ -49,7 +49,7 @@ class Admin extends Controller{
$this->dispatch($f3, $params, $character);
}
$f3->set('tplAuthType', $f3->alias( 'sso', ['action' => 'requestAdminAuthorization']));
$f3->set('tplAuthType', $f3->get('BASE') . $f3->alias( 'sso', ['action' => 'requestAdminAuthorization']));
// page title
$f3->set('tplPageTitle', 'Admin | ' . Config::getPathfinderData('name'));

2
app/main/controller/appcontroller.php
View File

@@ -29,7 +29,7 @@ class AppController extends Controller {
if($return = parent::beforeroute($f3, $params)){
// href for SSO Auth
$f3->set('tplAuthType', $f3->alias( 'sso', ['action' => 'requestAuthorization'] ));
$f3->set('tplAuthType', $f3->get('BASE') . $f3->alias( 'sso', ['action' => 'requestAuthorization'] ));
// characters from cookies
$f3->set('cookieCharacters', $this->getCookieByName(self::COOKIE_PREFIX_CHARACTER, true));

2
app/requirements.ini
View File

@@ -30,7 +30,7 @@ ZMQ = 1.1.3
EVENT = 2.3.0
; exec() function required for run Shell scripts from PHP
EXEC = 1
EXEC = 1
; max execution time for requests (seconds)
MAX_EXECUTION_TIME = 10

2
public/templates/ui/admin_panel.html
View File

@@ -1,6 +1,6 @@
<div id="pf-landing-admin-panel" class="hidden-xs pf-landing-sticky-panel">
<h4 class="text-center">Admin</h4>
<ul class="fa-ul">
<li><i class="fas fa-li fa-sign-in-alt"></i><a href="{{ 'admin', ['*' => ''] | alias }}">SSO&nbsp;login</a></li>
<li><i class="fas fa-li fa-sign-in-alt"></i><a href="{{ @BASE }}{{ 'admin', ['*' => ''] | alias }}">SSO&nbsp;login</a></li>
</ul>
</div>

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

@@ -16,11 +16,11 @@
</div>
<div class="navbar-collapse">
<ul class="nav navbar-nav navbar-right" role="tablist">
<li class="pf-overlay-trigger {{ @tplPage == 'settings' ? 'active' : '' }}"><a href="/admin/settings"><i class="fas fa-fw fa-cogs"></i>&nbsp;Settings</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'members' ? 'active' : '' }}"><a href="/admin/members"><i class="fas fa-fw fa-users"></i>&nbsp;Members</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'maps' ? 'active' : '' }}"><a href="/admin/maps"><i class="fas fa-fw fa-sitemap"></i>&nbsp;Maps</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'settings' ? 'active' : '' }}"><a href="{{ @BASE }}{{ 'admin', ['*' => '/settings'] | alias }}"><i class="fas fa-fw fa-cogs"></i>&nbsp;Settings</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'members' ? 'active' : '' }}"><a href="{{ @BASE }}{{ 'admin', ['*' => '/members'] | alias }}"><i class="fas fa-fw fa-users"></i>&nbsp;Members</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'maps' ? 'active' : '' }}"><a href="{{ @BASE }}{{ 'admin', ['*' => '/maps'] | alias }}"><i class="fas fa-fw fa-sitemap"></i>&nbsp;Maps</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'activity' ? 'active' : '' }} disabled"><a href="javascript:void(0);"><i class="fas fa-fw fa-chart-line"></i>&nbsp;Activity</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'login' ? 'active' : '' }}"><a href="/admin/login"><i class="fas fa-fw fa-sign-in-alt"></i>&nbsp;SSO</a></li>
<li class="pf-overlay-trigger {{ @tplPage == 'login' ? 'active' : '' }}"><a href="{{ @BASE }}{{ 'admin', ['*' => '/login'] | alias }}"><i class="fas fa-fw fa-sign-in-alt"></i>&nbsp;SSO</a></li>
</ul>
</div>
</check>

2
public/templates/view/index.html
View File

@@ -22,7 +22,7 @@
<link rel="icon" type="image/png" href="{{ @BASE }}/{{ @FAVICON }}favicon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="{{ @BASE }}/{{ @FAVICON }}favicon-32x32.png" sizes="32x32">
<meta name="msapplication-TileColor" content="#2d89ef">
<meta name="msapplication-TileImage" content="{{ @BASE }}{{ @FAVICON }}mstile-144x144.png">
<meta name="msapplication-TileImage" content="{{ @BASE }}/{{ @FAVICON }}mstile-144x144.png">
<meta http-equiv="Cache-Control" content="max-age=86400">

4
public/templates/view/login.html
View File

@@ -78,7 +78,7 @@
<div class="col-xs-12 col-md-8 col-md-offset-2">
<div class="alert alert-warning" >
<span class="txt-color txt-color-warning">Setup mode active</span>
<small>Disable '/setup' route in routes.ini on production environment! <a href="{{ 'setup' | alias }}">Setup</a></small>
<small>Disable '/setup' route in routes.ini on production environment! <a href="{{ $BASE }}{{ 'setup' | alias }}">Setup</a></small>
</div>
</div>
</div>
@@ -106,7 +106,7 @@
<div class="row text-center pf-character-selection">
<repeat group="{{ @cookieCharacters }}" key="{{ @cookieName }}" value="{{ @characterData }}">
<div class="col-sm-{{ @getCharacterGrid( @cookieCharacters ) }}">
<div class="pf-dynamic-area" data-cookie="{{ @cookieName }}" data-href="{{ 'sso','action=login' | alias }}">
<div class="pf-dynamic-area" data-cookie="{{ @cookieName }}" data-href="{{ @BASE }}{{ 'sso','action=login' | alias }}">
{* character data is dynamically *}
</div>
</div>