strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4885 from rabuzarus/20180421_-_fix_frio_in_directory

Browse source 
frio - fix default template if friendica is installed into a subdirectory
This commit is contained in:
Hypolite Petovan 2018-04-21 10:10:32 -04:00 committed by GitHub
commit afced187bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
view/theme/frio/php/default.php
View file

@ -26,8 +26,9 @@ if (!isset($minimal)) {
<script type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
<script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
<?php
$baseurl = System::baseUrl();
$basepath = $a->path ? "/" . $a->path . "/" : "/";
$frio = "view/theme/frio";
// Because we use minimal for modals the header and the included js stuff should be only loaded
// if the page is an standard page (so we don't have it twice for modals)
//
@ -35,6 +36,7 @@ if (!isset($minimal)) {
if (!$minimal && x($page, 'htmlhead')) {
echo $page['htmlhead'];
}
// Add the theme color meta
// It makes mobile Chrome UI match Frio's top bar color.
$uid = $a->profile_uid;
@ -60,6 +62,7 @@ if (!isset($minimal)) {
$is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
?>
</head>
<body id="top" class="mod-<?php echo $a->module." ".$is_singleuser_class;?>">
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<?php
@ -90,7 +93,7 @@ if (!isset($minimal)) {
<div class="container">
<div class="row">
<?php
if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) {
if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
echo '
<aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';