3.8.5 fixes

This commit is contained in:
root 2018-12-02 22:19:24 +00:00
parent 01f4628e43
commit a2c75a6547
8 changed files with 67 additions and 137 deletions

View File

@ -1,2 +1,4 @@
# ussrwin hubzilla themes # ussr.win hubzilla themes
- ussrbasic
- ussrbasicpub

View File

@ -1801,13 +1801,17 @@ dl.bb-dl > dd > li {
} }
.cover-photo-review { .cover-photo-review {
margin-bottom: 10px; margin-bottom: 10px;
} }
.hover-fx-hide { .hover-fx-hide {
opacity: 0; opacity: 0;
} }
.hover-fx-show:hover .hover-fx-hide { .hover-fx-show:hover .hover-fx-hide {
opacity: 1; opacity: 1;
}
.fa-minus-circle {
visibility: hidden;
} }

View File

@ -1,129 +0,0 @@
/**
* ussrbasic theme specific JavaScript
*/
$(document).ready(function() {
// CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {
$(window).resize(function() {
if($(window).width() < 992) {
$('main').css('width', $(window).width() + $('aside').outerWidth() );
} else {
$('main').css('width', '100%' );
}
});
}
$('#css3-calc').remove(); // Remove the test element
if($(window).width() >= 992) {
$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
offset_top: parseInt($('aside').css('padding-top')),
parent: 'main',
spacer: '.aside_spacer'
});
}
$('#expand-aside').on('click', toggleAside);
$('section').on('click', function() {
if($('main').hasClass('region_1-on')){
toggleAside();
}
});
var left_aside_height = $('#left_aside_wrapper').height();
$('#left_aside_wrapper').on('click', function() {
if(left_aside_height != $('#left_aside_wrapper').height()) {
$(document.body).trigger("sticky_kit:recalc");
left_aside_height = $('#left_aside_wrapper').height();
}
});
var right_aside_height = $('#right_aside_wrapper').height();
$('#right_aside_wrapper').on('click', function() {
if(right_aside_height != $('#right_aside_wrapper').height()) {
$(document.body).trigger("sticky_kit:recalc");
right_aside_height = $('#right_aside_wrapper').height();
}
});
$('.usermenu').click(function() {
if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
}
});
$('#menu-btn').click(function() {
if($('#navbar-collapse-1').hasClass('show')){
$('#navbar-collapse-1').removeClass('show');
}
});
$('.notifications-btn').click(function(e) {
e.preventDefault();
e.stopPropagation();
if($('#navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-2').removeClass('show');
}
});
$("input[data-role=cat-tagsinput]").tagsinput({
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');
if(notifyUpdateElem !== null) {
if(notifyUpdateElem.innerHTML !== "")
document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
else
document.title = doctitle;
}
}
setInterval(function () {checkNotify();}, 10 * 1000);
});
function makeFullScreen(full) {
if(typeof full=='undefined' || full == true) {
$('main').addClass('fullscreen');
$('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');
$('#inline-btn').show();
}
else {
$('main').removeClass('fullscreen');
$('header, nav, aside, #fullscreen-btn').show();
$('#inline-btn').hide();
$(document.body).trigger("sticky_kit:recalc");
}
}
function toggleAside() {
$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
if($('main').hasClass('region_1-on')){
$('html, body').css('overflow-x', '');
$('main').removeClass('region_1-on')
$('#overlay').remove();
$('#left_aside_wrapper').trigger("sticky_kit:detach");
}
else {
$('html, body').css('overflow-x', 'hidden');
$('main').addClass('region_1-on')
$('<div id="overlay"></div>').appendTo('section');
$('#left_aside_wrapper').stick_in_parent({
offset_top: $('nav').outerHeight(true) + 10,
parent: '#region_1',
spacer: '#left_aside_spacer'
});
}
}

View File

@ -0,0 +1,14 @@
[region=banner]
[widget=cover_photo][/widget]
[/region]
[region=aside]
[widget=fullprofile][/widget]
[widget=common_friends][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=categories][/widget]
[/region]
[region=right_aside]
[widget=notifications][/widget]
[widget=tagcloud_wall][var=limit]24[/var][/widget]
[widget=newmember][/widget]
[/region]

View File

@ -159,5 +159,5 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) {
// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasic') // if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasic')
set_pconfig(local_channel(), 'ussrbasic', 'schema', '---'); // set_pconfig(local_channel(), 'ussrbasic', 'schema', '---');

View File

@ -3,8 +3,8 @@
/** /**
* * Name: Ussrbasic * * Name: Ussrbasic
* * Description: ussr.win hubzilla standard theme * * Description: ussr.win hubzilla standard theme
* * Version: 2.1 * * Version: 2.23
* * MinVersion: 2.3.1 * * MinVersion: 3.8
* * MaxVersion: 6.0 * * MaxVersion: 6.0
* * Author: Fabrixxm * * Author: Fabrixxm
* * Maintainer: Mike Macgirvin * * Maintainer: Mike Macgirvin
@ -13,4 +13,6 @@
function ussrbasic_init(&$a) { function ussrbasic_init(&$a) {
App::$theme_info['extends'] = 'redbasic';
} }

View File

@ -105,6 +105,9 @@
<li class="nav-item"> <li class="nav-item">
<a href="siteinfo" class="nav-link{{if (substr($url,17,8)=="siteinfo")}} active{{/if}}" title="{{t('About this site')}}"><i class="fa fa-fw fa-info"></i></a> <a href="siteinfo" class="nav-link{{if (substr($url,17,8)=="siteinfo")}} active{{/if}}" title="{{t('About this site')}}"><i class="fa fa-fw fa-info"></i></a>
</li> </li>
<li class="nav-item">
<a href="lang" class="navbar-app nav-link {{if (substr($url,17,4)=="lang")}} active{{/if}}" title="{{t('Language')}}"><i class="fa fa-fw fa-language"></i></a>
</li>
<li class="nav-item d-lg-flex"> <li class="nav-item d-lg-flex">
{{if $nav.loginmenu.1.4}} {{if $nav.loginmenu.1.4}}
<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">

View File

@ -0,0 +1,34 @@
{{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}}
{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
{{include file="field_colorinput.tpl" field=$banner_colour}}
{{include file="field_colorinput.tpl" field=$bgcolour}}
{{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$item_colour}}
{{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
{{*include file="field_input.tpl" field=$comment_indent*}}
{{include file="field_colorinput.tpl" field=$font_colour}}
{{include file="field_colorinput.tpl" field=$link_colour}}
{{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$shadow}}
{{include file="field_input.tpl" field=$top_photo}}
{{include file="field_input.tpl" field=$reply_photo}}
<script>
$(function(){
$('#id_ussrbasic_nav_bg, #id_ussrbasic_nav_icon_colour, #id_ussrbasic_nav_active_icon_colour, #id_ussrbasic_banner_colour').colorpicker({format: 'rgba'});
$('#id_ussrbasic_link_colour,#id_ussrbasic_background_colour').colorpicker();
$('#id_ussrbasic_toolicon_colour,#id_ussrbasic_toolicon_activecolour,#id_ussrbasic_font_colour').colorpicker();
$('#id_ussrbasic_item_colour,#id_ussrbasic_comment_item_colour,#id_ussrbasic_comment_border_colour').colorpicker({format: 'rgba'});
});
</script>
{{/if}}
<div class="settings-submit-wrapper" >
<button type="submit" name="ussrbasic-settings-submit" class="btn btn-primary">{{$submit}}</button>
</div>