diff options
| author | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
|---|---|---|
| committer | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
| commit | a75c61d71efebf43713026200aa0f513bd7eef09 (patch) | |
| tree | 909048adeaa329813e2530d43626ed3bd711bc25 /view/php | |
| parent | 481ecee9e87342ca7a1217395085e95d1a3b61ea (diff) | |
| parent | 0d0f73fb67bbfcc53058cefded85ac36f951c7a7 (diff) | |
| download | volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.gz volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.bz2 volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'view/php')
| -rw-r--r-- | view/php/default.php | 14 | ||||
| -rw-r--r-- | view/php/full.php | 15 | ||||
| -rw-r--r-- | view/php/minimal.php | 39 | ||||
| -rw-r--r-- | view/php/none.php | 9 | ||||
| -rw-r--r-- | view/php/theme_init.php | 1 | ||||
| -rw-r--r-- | view/php/zen.php | 16 |
6 files changed, 69 insertions, 25 deletions
diff --git a/view/php/default.php b/view/php/default.php index 6f0735a11..10e150906 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -1,3 +1,15 @@ +<?php +/** + * * Name: default + * * Description: Hubzilla default 3-column layout + * * Version: 1 + * * Author: Mario Vavti + * * Maintainer: Mario Vavti + * * ContentRegion: aside, left_aside_wrapper + * * ContentRegion: content, region_2 + * * ContentRegion: right_aside, right_aside_wrapper + */ +?> <!DOCTYPE html > <html prefix="og: http://ogp.me/ns#"> <head> @@ -8,7 +20,7 @@ <body <?php if($page['direction']) echo 'dir="rtl"' ?> > <?php if(x($page,'banner')) echo $page['banner']; ?> <header><?php if(x($page,'header')) echo $page['header']; ?></header> - <nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <?php if(x($page,'nav')) echo $page['nav']; ?> <main> <div class="content"> <div class="columns"> diff --git a/view/php/full.php b/view/php/full.php index 1a9cd9a84..d855fb650 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -1,3 +1,13 @@ +<?php +/** + * * Name: full + * * Description: A single column full width layout with the hubzilla navbar + * * Version: 1 + * * Author: None + * * Maintainer: None + * * ContentRegion: content, region_1 + */ +?> <!DOCTYPE html > <html prefix="og: http://ogp.me/ns#"> <head> @@ -8,8 +18,9 @@ <body <?php if($page['direction']) echo 'dir="rtl"' ?> > <?php if(x($page,'banner')) echo $page['banner']; ?> <header><?php if(x($page,'header')) echo $page['header']; ?></header> - <nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> - <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> + <?php if(x($page,'nav')) echo $page['nav']; ?> + <section id="region_1"> + <?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> </section> </body> diff --git a/view/php/minimal.php b/view/php/minimal.php index 3572f3b5c..3fab0c5f9 100644 --- a/view/php/minimal.php +++ b/view/php/minimal.php @@ -1,14 +1,25 @@ -<!DOCTYPE html >
-<html prefix="og: http://ogp.me/ns#">
-<head>
- <title><?php if(x($page,'title')) echo $page['title'] ?></title>
- <script>var baseurl="<?php echo z_root() ?>";</script>
- <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
-</head>
-<body>
- <section 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>
-</body>
-</html>
-
+<?php +/** + * * Name: full + * * Description: A single column full width layout without a navbar + * * Version: 1 + * * Author: None + * * Maintainer: None + * * ContentRegion: content, region_1 + */ +?> +<!DOCTYPE html > +<html prefix="og: http://ogp.me/ns#"> +<head> + <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <script>var baseurl="<?php echo z_root() ?>";</script> + <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> +</head> +<body> + <section id="region_1"> + <?php if(x($page,'content')) echo $page['content']; ?> + <div id="page-footer"></div> + </section> +</body> +</html> + diff --git a/view/php/none.php b/view/php/none.php index 51d0e83dc..5e92310b7 100644 --- a/view/php/none.php +++ b/view/php/none.php @@ -1 +1,10 @@ +<?php +/** + * * Name: none + * * Description: A barebones empty single page template + * * Version: 1 + * * Author: None + * * Maintainer: None + */ +?> <?php if(x($page,'content')) echo $page['content']; ?> diff --git a/view/php/theme_init.php b/view/php/theme_init.php index bf34f210a..4aa695aeb 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -33,6 +33,7 @@ head_add_js('/library/colorbox/jquery.colorbox-min.js'); head_add_js('/library/jquery.AreYouSure/jquery.are-you-sure.js'); head_add_js('/library/tableofcontents/jquery.toc.js'); +head_add_js('/library/Sortable/Sortable.min.js'); head_add_js('/vendor/desandro/imagesloaded/imagesloaded.pkgd.min.js'); /** diff --git a/view/php/zen.php b/view/php/zen.php index a96cf722f..24aae951b 100644 --- a/view/php/zen.php +++ b/view/php/zen.php @@ -1,11 +1,11 @@ <!DOCTYPE html> <html prefix="og: http://ogp.me/ns#"> -<head> - <title><?php if(x($page,'title')) echo $page['title'] ?></title> - <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1"> - <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> -</head> -<body> - <?php if(x($page,'content')) echo $page['content']; ?> -</body> + <head> + <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1"> + <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> + </head> + <body> + <?php if(x($page,'content')) echo $page['content']; ?> + </body> </html> |