diff options
| author | Mario <mario@mariovavti.com> | 2023-05-25 08:53:03 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-25 08:53:03 +0000 |
| commit | 4c2dc2bf16083bc59ff95327053cbbb9e8447caa (patch) | |
| tree | 0ff5664b0c0592487fcb7763491a7a20d95f2aff | |
| parent | af5ae163f39c5cbb1f2cc07b62d654c1e0b71753 (diff) | |
| parent | e6eb2a847637fe4cc2f9d3e0f5c137f9b56b419d (diff) | |
| download | volse-hubzilla-4c2dc2bf16083bc59ff95327053cbbb9e8447caa.tar.gz volse-hubzilla-4c2dc2bf16083bc59ff95327053cbbb9e8447caa.tar.bz2 volse-hubzilla-4c2dc2bf16083bc59ff95327053cbbb9e8447caa.zip | |
Merge branch 'dev' into 'dev'
double columns templates
See merge request hubzilla/core!2035
| -rw-r--r-- | view/css/doubleleft.css | 31 | ||||
| -rw-r--r-- | view/css/doubleright.css | 31 | ||||
| -rw-r--r-- | view/php/doubleleft.php | 36 | ||||
| -rw-r--r-- | view/php/doubleright.php | 36 |
4 files changed, 134 insertions, 0 deletions
diff --git a/view/css/doubleleft.css b/view/css/doubleleft.css new file mode 100644 index 000000000..f26b66824 --- /dev/null +++ b/view/css/doubleleft.css @@ -0,0 +1,31 @@ +main { + position: relative; + min-height: 100vh; + display: flex; + flex-direction: column; +} + +.content { + display: flex; + flex: 1; +} + +.columns { + display: flex; + flex:1; + min-width: 0; +} + +#region_1 { + position: relative; + order: 1; + padding: 4.5rem 7px 0px 7px; +} + +#region_2 { + position: relative; + flex: 1; + order: 2; + padding: 4.5rem 7px 200px 7px; + min-width: 0; +} diff --git a/view/css/doubleright.css b/view/css/doubleright.css new file mode 100644 index 000000000..29a09c007 --- /dev/null +++ b/view/css/doubleright.css @@ -0,0 +1,31 @@ +main { + position: relative; + min-height: 100vh; + display: flex; + flex-direction: column; +} + +.content { + display: flex; + flex: 1; +} + +.columns { + display: flex; + flex:1; + min-width: 0; +} + +#region_1 { + position: relative; + flex: 1; + order: 1; + padding: 4.5rem 7px 200px 7px; + min-width: 0; +} + +#region_2 { + position: relative; + order: 2; + padding: 4.5rem 7px 0px 7px; +} diff --git a/view/php/doubleleft.php b/view/php/doubleleft.php new file mode 100644 index 000000000..26dcf6983 --- /dev/null +++ b/view/php/doubleleft.php @@ -0,0 +1,36 @@ +<?php +/** + * * Name: doubleleft + * * Description: Hubzilla 2-column layout with left adside wrapper based on default template by Mario Vavti + * * Version: 1 + * * Author: zlax + * * Maintainer: zlax + * * ContentRegion: aside, left_aside_wrapper + * * ContentRegion: content, region_2 + */ +?> +<!DOCTYPE html > +<html prefix="og: http://ogp.me/ns#" <?php if(x($page,'color_mode')) echo $page['color_mode'] ?>> +<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 <?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> + <?php if(x($page,'nav')) echo $page['nav']; ?> + <main> + <div class="content"> + <div class="columns"> + <aside id="region_1"><div class="aside_spacer_top_left"></div><div class="aside_spacer_left"><div id="left_aside_wrapper" class="aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside> + <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> + <div id="page-footer"></div> + <div id="pause"></div> + </section> + </div> + </div> + </main> + <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> +</body> +</html> diff --git a/view/php/doubleright.php b/view/php/doubleright.php new file mode 100644 index 000000000..2a470109a --- /dev/null +++ b/view/php/doubleright.php @@ -0,0 +1,36 @@ +<?php +/** + * * Name: default + * * Description: Hubzilla 2-column layout with left adside wrapper based on default template by Mario Vavti + * * Version: 1 + * * Author: zlax + * * Maintainer: zlax + * * ContentRegion: content, region_1 + * * ContentRegion: right_aside, right_aside_wrapper + */ +?> +<!DOCTYPE html > +<html prefix="og: http://ogp.me/ns#" <?php if(x($page,'color_mode')) echo $page['color_mode'] ?>> +<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 <?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> + <?php if(x($page,'nav')) echo $page['nav']; ?> + <main> + <div class="content"> + <div class="columns"> + <section id="region_1"><?php if(x($page,'content')) echo $page['content']; ?> + <div id="page-footer"></div> + <div id="pause"></div> + </section> + <aside id="region_2" class="d-none d-xl-block"><div class="aside_spacer_top_right"></div><div class="aside_spacer_right"><div id="right_aside_wrapper" class="aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside> + </div> + </div> + </main> + <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> +</body> +</html> |