Disroot-themes
/
Hubzilla-themes
Archived
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjust theme to work with Hubzilla 3.8

This commit is contained in:
antil0pa 2018-11-29 12:40:33 +01:00
parent 064b940328
commit b4a7e68c88
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
beetroot/js/beetroot.js
View File

@ -25,18 +25,18 @@ $(document).ready(function() {
});
}
if($(window).width() >= 992) {
$('#right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
spacer: '#right_aside_spacer'
});
}
$('#notifications_wrapper.fs #notifications').stick_in_parent({
parent: '#notifications_wrapper'
});
/** if($(window).width() >= 992) {
* $('#right_aside_wrapper').stick_in_parent({
* offset_top: parseInt($('aside').css('padding-top')),
* parent: 'main',
* spacer: '#right_aside_spacer'
* });
* }
*
* $('#notifications_wrapper.fs #notifications').stick_in_parent({
* parent: '#notifications_wrapper'
* });
*/
$('#expand-aside').on('click', toggleAside);
$('section').on('click', function() {
@ -88,6 +88,11 @@ $(document).ready(function() {
tagClass: 'badge badge-pill badge-warning text-dark'
});
$('a.disabled').click(function(e) {
e.preventDefault();
e.stopPropagation();
});
var doctitle = document.title;
function checkNotify() {
var notifyUpdateElem = document.getElementById('notify-update');

1
beetroot/php/config.php
View File

@ -115,6 +115,7 @@ class BeetrootConfig {
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$advanced_theming' => ['redbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
));
return $o;

14
beetroot/php/default.php
View File

@ -10,12 +10,16 @@
<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>
<main>
<aside id="region_1"><div id="left_aside_spacer"><div id="left_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 class="content">
<div class="columns">
<aside id="region_1"><div id="left_aside_spacer"><div id="left_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>
<aside id="region_3" class="d-none d-md-table-cell"><div id="right_aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
<div id="pause"></div>
</section>
<aside id="region_3" class="d-none d-md-table-cell"><div id="right_aside_spacer"><div id="right_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>

4
beetroot/php/theme_init.php
View File

@ -1,14 +1,14 @@
<?php
head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
head_add_css('/library/bootstrap/css/bootstrap.min.css');
head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
head_add_css('/view/css/bootstrap-red.css');
head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
require_once('view/php/theme_init.php');
head_add_js('/library/bootstrap/js/bootstrap.bundle.min.js');
head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
head_add_js('/library/bootbox/bootbox.min.js');
head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
head_add_js('/library/datetimepicker/jquery.datetimepicker.js');

1
beetroot/tpl/theme_settings.tpl
View File

@ -1,6 +1,7 @@
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{include file="field_input.tpl" field=$converse_width}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_checkbox.tpl" field=$advanced_theming}}
{{if $expert}}
{{include file="field_colorinput.tpl" field=$nav_bg}}
{{include file="field_colorinput.tpl" field=$nav_icon_colour}}