Merge branch 'develop' into replace-hooks-with-eventdispatcher

This commit is contained in:
Art4 2025-02-14 07:30:35 +00:00
commit 674ad96b69
5 changed files with 44 additions and 18 deletions

View file

@ -13,14 +13,20 @@
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="<?php echo Friendica\DI::l10n()->getCurrentLang(); ?>">
<head> <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>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> </head>
<body class="minimal"> <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"> <div id="page-footer">
<?php echo $page['footer'] ?? ''; ?> <?php echo $page['footer'] ?? ''; ?>
</div> </div>

View file

@ -30,7 +30,7 @@ $view_mode_class = (DI::mode()->isMobile() || DI::mode()->isMobile()) ? 'mob
$is_singleuser = DI::config()->get('system', 'singleuser'); $is_singleuser = DI::config()->get('system', 'singleuser');
$is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
?> ?>
<html> <html lang="<?php echo DI::l10n()->getCurrentLang(); ?>">
<head> <head>
<title><?php if (!empty($page['title'])) { <title><?php if (!empty($page['title'])) {
echo $page['title']; echo $page['title'];

View file

@ -10,7 +10,7 @@ use Friendica\DI;
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="<?php echo DI::l10n()->getCurrentLang(); ?>">
<head> <head>
<title><?php if(!empty($page['title'])) { <title><?php if(!empty($page['title'])) {
echo $page['title']; echo $page['title'];

View file

@ -14,7 +14,7 @@ $frio = 'view/theme/frio';
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="<?php echo DI::l10n()->getCurrentLang(); ?>">
<head> <head>
<title><?php if(!empty($page['title'])) { <title><?php if(!empty($page['title'])) {
echo $page['title']; echo $page['title'];

View file

@ -7,40 +7,58 @@
*/ */
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="<?php echo Friendica\DI::l10n()->getCurrentLang(); ?>">
<head> <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>var baseurl="<?php echo Friendica\DI::baseUrl() ?>";</script>
<script type="text/javascript"> <script type="text/javascript">
function ScrollToBottom(){ function ScrollToBottom(){
window.scrollTo(0,document.body.scrollHeight); window.scrollTo(0,document.body.scrollHeight);
} }
</script> </script>
<?php if(!empty($page['htmlhead'])) echo $page['htmlhead'] ?> <?php if(!empty($page['htmlhead'])) {
echo $page['htmlhead'];
} ?>
</head> </head>
<body> <body>
<header> <header>
<?php if(!empty($page['header'])) echo $page['header']; ?> <?php if(!empty($page['header'])) {
echo $page['header'];
} ?>
</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> <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="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </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"> <footer id="footer">
<?php if(!empty($page['footer'])) echo $page['footer']; ?> <?php if(!empty($page['footer'])) {
echo $page['footer'];
} ?>
</footer> </footer>
<tools id="tools"> <tools id="tools">
<?php if (!empty($page['tools'])) echo $page['tools']; ?> <?php if (!empty($page['tools'])) {
echo $page['tools'];
} ?>
<div id="scrollup" > <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,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> <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> </div>
</tools> </tools>
<?php if (!empty($page['bottom'])) echo $page['bottom']; ?> <?php if (!empty($page['bottom'])) {
echo $page['bottom'];
} ?>
</body> </body>
</html> </html>