bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Fix Notice and formatting in frio

Browse source
This commit is contained in:
Hypolite Petovan 2017-12-17 10:00:40 -05:00
parent 2cfcf433a3
commit 190a765731
1 changed files with 125 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,12 @@
?>
<!DOCTYPE html >
<?php
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
require_once('view/theme/frio/php/frio_boot.php');
require_once 'view/theme/frio/php/frio_boot.php';
// $minimal = is_modal();
if (!isset($minimal)) {
@ -20,20 +22,18 @@
<head>
<title><?php if (x($page, 'title')) echo $page['title'] ?></title>
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<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(); ?>
<?php $frio = "view/theme/frio"; ?>
<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();
$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)
//
/// @todo Think about to move js stuff in the footer
if(!$minimal) {
if(x($page,'htmlhead')) echo $page['htmlhead'];
if (!$minimal && x($page, 'htmlhead')) {
echo $page['htmlhead'];
}
?>
<?php
// Add the theme color meta
// It makes mobile Chrome UI match Frio's top bar color.
$uid = $a->profile_uid;
@ -44,7 +44,7 @@
if (($schema) && ($schema != '---')) {
if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
$schemefile = 'view/theme/frio/schema/' . $schema . '.php';
require_once($schemefile);
require_once $schemefile;
}
} else {
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
@ -52,64 +52,76 @@
if (!$nav_bg) {
$nav_bg = "#708fa0";
}
echo '<meta name="theme-color" content="'.$nav_bg.'" />';
echo '
<meta name="theme-color" content="' . $nav_bg . '" />';
?>
</head>
<?php
if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login"))
{
echo"<body id=\"top\">";
}
else
{
echo"<body id=\"top\">";
}
?>
<body id="top">
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<?php
if(x($page,'nav') && (!$minimal)){
echo str_replace("~config.sitename~",Config::get('config','sitename'),
str_replace("~system.banner~",Config::get('system','banner'),
if (x($page, 'nav') && !$minimal) {
echo str_replace(
"~config.sitename~",
Config::get('config', 'sitename'),
str_replace(
"~system.banner~",
Config::get('system', 'banner'),
$page['nav']
));};
)
);
};
// special minimal style for modal dialogs
if ($minimal) {
?>
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;">
<?php if (x($page, 'content')) echo $page['content']; ?>
<div id="page-footer"></div>
</section>
<?php }
<?php
} else {
// the style for all other pages
else {
?> <main>
?>
<main>
<div class="container">
<div class="row">
<?php
if(($_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/"))
{
echo"
<aside class=\"col-lg-3 col-md-3 offcanvas-sm offcanvas-xs\">
"; if(x($page,'aside')) echo $page['aside']; echo"
"; if(x($page,'right_aside')) echo $page['right_aside']; echo"
if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) {
echo '
<aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
if (x($page, 'aside')) {
echo $page['aside'];
}
if (x($page, 'right_aside')) {
echo $page['right_aside'];
}
echo '
</aside>
<div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\">
<section class=\"sectiontop "; echo $a->argv[0]; echo "-content-wrapper\">";
if(x($page,'content')) echo $page['content']; echo"
<div id=\"pause\"></div> <!-- The pause/resume Ajax indicator -->
<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
<section class="sectiontop ';
echo $a->argv[0];
echo '-content-wrapper">';
if (x($page, 'content')) {
echo $page['content'];
}
echo '
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
</section>
</div>
";
';
} else {
echo '
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
if (x($page, 'content')) {
echo $page['content'];
}
else
{
echo"
<div class=\"col-lg-12 col-md-12 col-sm-12 col-xs-12\" id=\"content\" style=\"margin-top:50px;\" >
"; if(x($page,'content')) echo $page['content']; echo"
echo '
</div>
";
';
}
?>
</div><!--row-->
@ -141,5 +153,5 @@ else
<div id="cache-container"></div>
</footer>
<?php } ?> <!-- End of condition if $minal else the rest -->
<?php } ?> <!-- End of condition if $minimal else the rest -->
</body>