friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix Notice and formatting in frio

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

238
view/theme/frio/php/default.php
View File

@ -6,140 +6,152 @@
?> ?>
<!DOCTYPE html > <!DOCTYPE html >
<?php <?php
use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\PConfig;
require_once('view/theme/frio/php/frio_boot.php'); use Friendica\Core\System;
require_once 'view/theme/frio/php/frio_boot.php';
// $minimal = is_modal(); // $minimal = is_modal();
if (!isset($minimal)) { if (!isset($minimal)) {
$minimal = false; $minimal = false;
} }
?> ?>
<html> <html>
<head> <head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title> <title><?php if (x($page, 'title')) echo $page['title'] ?></title>
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>"> <meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script type="text/javascript">var baseurl="<?php echo System::baseUrl() ?>";</script> <script type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
<script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script> <script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
<?php $baseurl = System::baseUrl(); ?>
<?php $frio = "view/theme/frio"; ?>
<?php
// 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'];
}
?>
<?php
// Add the theme color meta
// It makes mobile Chrome UI match Frio's top bar color.
$uid = $a->profile_uid;
if (is_null($uid)) {
$uid = get_theme_uid();
}
$schema = PConfig::get($uid, 'frio', 'schema');
if (($schema) && ($schema != '---')) {
if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
$schemefile = 'view/theme/frio/schema/'.$schema.'.php';
require_once($schemefile);
}
} else {
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
}
if (!$nav_bg) {
$nav_bg = "#708fa0";
}
echo '<meta name="theme-color" content="'.$nav_bg.'" />';
?>
</head>
<?php <?php
if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login")) $baseurl = System::baseUrl();
{ $frio = "view/theme/frio";
echo"<body id=\"top\">"; // 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)
else //
{ /// @todo Think about to move js stuff in the footer
echo"<body id=\"top\">"; 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;
if (is_null($uid)) {
$uid = get_theme_uid();
}
$schema = PConfig::get($uid, 'frio', 'schema');
if (($schema) && ($schema != '---')) {
if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
$schemefile = 'view/theme/frio/schema/' . $schema . '.php';
require_once $schemefile;
}
} else {
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
}
if (!$nav_bg) {
$nav_bg = "#708fa0";
}
echo '
<meta name="theme-color" content="' . $nav_bg . '" />';
?> ?>
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a> </head>
<body id="top">
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<?php <?php
if(x($page,'nav') && (!$minimal)){ if (x($page, 'nav') && !$minimal) {
echo str_replace("~config.sitename~",Config::get('config','sitename'), echo str_replace(
str_replace("~system.banner~",Config::get('system','banner'), "~config.sitename~",
$page['nav'] Config::get('config', 'sitename'),
));}; str_replace(
"~system.banner~",
Config::get('system', 'banner'),
$page['nav']
)
);
};
// special minimal style for modal dialogs // special minimal style for modal dialogs
if($minimal) { 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> <div id="page-footer"></div>
</section> </section>
<?php }
// the style for all other pages
else {
?> <main>
<div class="container">
<div class="row">
<?php <?php
if(($_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) } else {
{ // the style for all other pages
echo" ?>
<aside class=\"col-lg-3 col-md-3 offcanvas-sm offcanvas-xs\"> <main>
"; if(x($page,'aside')) echo $page['aside']; echo" <div class="container">
"; if(x($page,'right_aside')) echo $page['right_aside']; echo" <div class="row">
<?php
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> </aside>
<div class=\"col-lg-7 col-md-7 col-sm-12 col-xs-12\" id=\"content\"> <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\">"; <section class="sectiontop ';
if(x($page,'content')) echo $page['content']; echo" echo $a->argv[0];
<div id=\"pause\"></div> <!-- The pause/resume Ajax indicator --> echo '-content-wrapper">';
if (x($page, 'content')) {
echo $page['content'];
}
echo '
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
</section> </section>
</div> </div>
"; ';
} } else {
else echo '
{ <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
echo" if (x($page, 'content')) {
<div class=\"col-lg-12 col-md-12 col-sm-12 col-xs-12\" id=\"content\" style=\"margin-top:50px;\" > echo $page['content'];
"; if(x($page,'content')) echo $page['content']; echo" }
echo '
</div> </div>
"; ';
} }
?> ?>
</div><!--row--> </div><!--row-->
</div><!-- container --> </div><!-- container -->
<div id="back-to-top" title="back to top">&#8679;</div> <div id="back-to-top" title="back to top">&#8679;</div>
</main> </main>
<footer> <footer>
<?php if(x($page,'footer')) echo $page['footer']; ?> <?php if (x($page, 'footer')) echo $page['footer']; ?>
<!-- Modal --> <!-- Modal -->
<div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"> <div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-full-screen"> <div class="modal-dialog modal-full-screen">
<div class="modal-content"> <div class="modal-content">
<div id="modal-header" class="modal-header"> <div id="modal-header" class="modal-header">
<button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button id="modal-cloase" type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times; &times;
</button> </button>
<h4 id="modal-title" class="modal-title"></h4> <h4 id="modal-title" class="modal-title"></h4>
</div>
<div id="modal-body" class="modal-body">
<!-- /# content goes here -->
</div>
</div>
</div>
</div> </div>
<div id="modal-body" class="modal-body">
<!-- /# content goes here -->
</div>
</div>
</div>
</div>
<!-- Dummy div to append other div's when needed (e.g. used for js function editpost() --> <!-- Dummy div to append other div's when needed (e.g. used for js function editpost() -->
<div id="cache-container"></div> <div id="cache-container"></div>
</footer> </footer>
<?php } ?> <!-- End of condition if $minal else the rest --> <?php } ?> <!-- End of condition if $minimal else the rest -->
</body> </body>