harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix 2016-03-02 11:35:48 -08:00
commit 157bbb14b5
7 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/widgets.php
View File

@ -993,7 +993,7 @@ function widget_cover_photo($arr) {
if(array_key_exists('style', $arr) && isset($arr['style'])) if(array_key_exists('style', $arr) && isset($arr['style']))
$style = $arr['style']; $style = $arr['style'];
else else
$style = 'width:100%; padding-right: 10px; height: auto;'; $style = 'width:100%; height: auto;';
// ensure they can't sneak in an eval(js) function // ensure they can't sneak in an eval(js) function
@ -1003,7 +1003,7 @@ function widget_cover_photo($arr) {
$c = get_cover_photo($channel_id,'html'); $c = get_cover_photo($channel_id,'html');
if($c) { if($c) {
$o = '<div class="widget">' . (($style) ? str_replace('alt=',' style="' . $style . '" alt=',$c) : $c) . '</div>'; $o = '<div id="cover-photo">' . (($style) ? str_replace('alt=',' style="' . $style . '" alt=',$c) : $c) . '</div>';
} }
return $o; return $o;
} }

16
view/css/default.css
View File

@ -17,24 +17,12 @@ main {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
padding: 80px 7px 0px 7px; padding: 71px 7px 0px 7px;
} }
section { section {
width: 100%; width: 100%;
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
padding: 80px 7px 200px 7px; padding: 71px 7px 200px 7px;
}
@media screen and (max-width: 767px) {
section {
padding: 65px 7px 200px 7px;
}
aside#region_1 {
padding: 65px 7px 0px 7px;
}
} }

2
view/nl/register_open_eml.tpl
View File

@ -1,4 +1,4 @@
s met dit e-mailadres een account aangemaakt op {{$sitename}}. Er is met dit e-mailadres een account aangemaakt op {{$sitename}}.
De inloggegevens zijn als volgt: De inloggegevens zijn als volgt:
Hub: {{$siteurl}} Hub: {{$siteurl}}

3
view/pdl/mod_channel.pdl
View File

@ -1,3 +1,6 @@
[region=banner]
[widget=cover_photo][/widget]
[/region]
[region=aside] [region=aside]
[widget=fullprofile][/widget] [widget=fullprofile][/widget]
[widget=archive][var=wall]1[/var][/widget] [widget=archive][var=wall]1[/var][/widget]

1
view/php/default.php
View File

@ -6,6 +6,7 @@
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body>
<?php if(x($page,'banner')) echo $page['banner']; ?>
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main> <main>

1
view/theme/redbasic/css/style.css
View File

@ -174,6 +174,7 @@ header #banner {
z-index: 1040; z-index: 1040;
margin-top: 14px; margin-top: 14px;
text-align: center; text-align: center;
text-shadow: 1px 1px 2px rgba(0,0,0,.5);
font-size: 14px; font-size: 14px;
font-family: tahoma, "Lucida Sans", sans; font-family: tahoma, "Lucida Sans", sans;
color: $banner_colour; color: $banner_colour;

27
view/theme/redbasic/js/redbasic.js
View File

@ -2,6 +2,17 @@
* redbasic theme specific JavaScript * redbasic theme specific JavaScript
*/ */
$(document).ready(function() { $(document).ready(function() {
//Simple cover-photo implementation
if($('#cover-photo').length && $(window).width() > 767) {
$('.navbar-fixed-top').css('position', 'relative');
$('aside, section').css('padding-top', 0 + 'px');
$('main').css('opacity', 0);
}
else {
$('#cover-photo').remove();
}
// CSS3 calc() fallback (for unsupported browsers) // CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); $('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) { if( $('#css3-calc').width() == 10) {
@ -38,9 +49,7 @@ $(document).ready(function() {
$("input[data-role=cat-tagsinput]").tagsinput({ $("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'label label-primary' tagClass: 'label label-primary'
}); });
});
$(document).ready(function(){
var doctitle = document.title; var doctitle = document.title;
function checkNotify() { function checkNotify() {
var notifyUpdateElem = document.getElementById('notify-update'); var notifyUpdateElem = document.getElementById('notify-update');
@ -53,3 +62,17 @@ $(document).ready(function(){
} }
setInterval(function () {checkNotify();}, 10 * 1000); setInterval(function () {checkNotify();}, 10 * 1000);
}); });
//Simple cover-photo implementation
$(window).scroll(function () {
if($('#cover-photo').length && $(window).width() > 767 && $(window).scrollTop() >= $('#cover-photo').height()) {
$('aside, section').css('padding-top', 71 + 'px');
$(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
$('.navbar-fixed-top').css('position', 'fixed');
$('#cover-photo').remove();
}
if($('#cover-photo').length) {
$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
}
});