mirror of
https://github.com/friendica/friendica
synced 2025-03-03 19:48:26 +00:00
Merge branch 'develop' into replace-hooks-with-eventdispatcher
This commit is contained in:
commit
674ad96b69
5 changed files with 44 additions and 18 deletions
|
@ -13,14 +13,20 @@
|
|||
?>
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="<?php echo Friendica\DI::l10n()->getCurrentLang(); ?>">
|
||||
<head>
|
||||
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
|
||||
<title><?php if(!empty($page['title'])) {
|
||||
echo $page['title'];
|
||||
} ?></title>
|
||||
<script>var baseurl="<?php echo Friendica\DI::baseUrl() ?>";</script>
|
||||
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
|
||||
<?php if(!empty($page['htmlhead'])) {
|
||||
echo $page['htmlhead'];
|
||||
} ?>
|
||||
</head>
|
||||
<body class="minimal">
|
||||
<section><?php if(!empty($page['content'])) echo $page['content']; ?>
|
||||
<section><?php if(!empty($page['content'])) {
|
||||
echo $page['content'];
|
||||
} ?>
|
||||
<div id="page-footer">
|
||||
<?php echo $page['footer'] ?? ''; ?>
|
||||
</div>
|
||||
|
|
|
@ -30,7 +30,7 @@ $view_mode_class = (DI::mode()->isMobile() || DI::mode()->isMobile()) ? 'mob
|
|||
$is_singleuser = DI::config()->get('system', 'singleuser');
|
||||
$is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
|
||||
?>
|
||||
<html>
|
||||
<html lang="<?php echo DI::l10n()->getCurrentLang(); ?>">
|
||||
<head>
|
||||
<title><?php if (!empty($page['title'])) {
|
||||
echo $page['title'];
|
||||
|
|
|
@ -10,7 +10,7 @@ use Friendica\DI;
|
|||
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="<?php echo DI::l10n()->getCurrentLang(); ?>">
|
||||
<head>
|
||||
<title><?php if(!empty($page['title'])) {
|
||||
echo $page['title'];
|
||||
|
|
|
@ -14,7 +14,7 @@ $frio = 'view/theme/frio';
|
|||
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="<?php echo DI::l10n()->getCurrentLang(); ?>">
|
||||
<head>
|
||||
<title><?php if(!empty($page['title'])) {
|
||||
echo $page['title'];
|
||||
|
|
|
@ -7,40 +7,58 @@
|
|||
*/
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="<?php echo Friendica\DI::l10n()->getCurrentLang(); ?>">
|
||||
<head>
|
||||
<title><?php if(!empty($page['title'])) echo $page['title'] ?></title>
|
||||
<title><?php if(!empty($page['title'])) {
|
||||
echo $page['title'];
|
||||
} ?></title>
|
||||
<script>var baseurl="<?php echo Friendica\DI::baseUrl() ?>";</script>
|
||||
<script type="text/javascript">
|
||||
function ScrollToBottom(){
|
||||
window.scrollTo(0,document.body.scrollHeight);
|
||||
}
|
||||
</script>
|
||||
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?>
|
||||
<?php if(!empty($page['htmlhead'])) {
|
||||
echo $page['htmlhead'];
|
||||
} ?>
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<?php if(!empty($page['header'])) echo $page['header']; ?>
|
||||
<?php if(!empty($page['header'])) {
|
||||
echo $page['header'];
|
||||
} ?>
|
||||
</header>
|
||||
|
||||
<?php if(!empty($page['nav'])) echo $page['nav']; ?>
|
||||
<?php if(!empty($page['nav'])) {
|
||||
echo $page['nav'];
|
||||
} ?>
|
||||
|
||||
<aside><?php if(!empty($page['aside'])) echo $page['aside']; ?></aside>
|
||||
<aside><?php if(!empty($page['aside'])) {
|
||||
echo $page['aside'];
|
||||
} ?></aside>
|
||||
|
||||
<section>
|
||||
<?php if(!empty($page['content'])) echo $page['content']; ?>
|
||||
<?php if(!empty($page['content'])) {
|
||||
echo $page['content'];
|
||||
} ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
|
||||
<right_aside><?php if(!empty($page['right_aside'])) echo $page['right_aside']; ?></right_aside>
|
||||
<right_aside><?php if(!empty($page['right_aside'])) {
|
||||
echo $page['right_aside'];
|
||||
} ?></right_aside>
|
||||
|
||||
<footer id="footer">
|
||||
<?php if(!empty($page['footer'])) echo $page['footer']; ?>
|
||||
<?php if(!empty($page['footer'])) {
|
||||
echo $page['footer'];
|
||||
} ?>
|
||||
</footer>
|
||||
|
||||
<tools id="tools">
|
||||
<?php if (!empty($page['tools'])) echo $page['tools']; ?>
|
||||
<?php if (!empty($page['tools'])) {
|
||||
echo $page['tools'];
|
||||
} ?>
|
||||
<div id="scrollup" >
|
||||
<a class="item-scrollup" href="javascript:scrollTo(0,100000)"><img src="view/theme/smoothly/images/down.png" alt="to bottom" title="to bottom" /></a>
|
||||
<a class="item-scrollup" href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/up.png" alt="to top" title="to top" /></a>
|
||||
|
@ -48,6 +66,8 @@
|
|||
</div>
|
||||
</tools>
|
||||
|
||||
<?php if (!empty($page['bottom'])) echo $page['bottom']; ?>
|
||||
<?php if (!empty($page['bottom'])) {
|
||||
echo $page['bottom'];
|
||||
} ?>
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Add table
Reference in a new issue