aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/widgets.php4
-rw-r--r--view/css/default.css16
-rw-r--r--view/nl/register_open_eml.tpl2
-rw-r--r--view/pdl/mod_channel.pdl3
-rw-r--r--view/php/default.php1
-rw-r--r--view/theme/redbasic/css/style.css1
-rw-r--r--view/theme/redbasic/js/redbasic.js27
7 files changed, 35 insertions, 19 deletions
diff --git a/include/widgets.php b/include/widgets.php
index aa0be87d6..3b8a5a7a3 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -993,7 +993,7 @@ function widget_cover_photo($arr) {
if(array_key_exists('style', $arr) && isset($arr['style']))
$style = $arr['style'];
else
- $style = 'width:100%; padding-right: 10px; height: auto;';
+ $style = 'width:100%; height: auto;';
// 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');
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;
}
diff --git a/view/css/default.css b/view/css/default.css
index bffecbb81..db0628cb3 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -17,24 +17,12 @@ main {
aside {
display: table-cell;
vertical-align: top;
- padding: 80px 7px 0px 7px;
+ padding: 71px 7px 0px 7px;
}
section {
width: 100%;
display: table-cell;
vertical-align: top;
- padding: 80px 7px 200px 7px;
-}
-
-@media screen and (max-width: 767px) {
-
- section {
- padding: 65px 7px 200px 7px;
- }
-
- aside#region_1 {
- padding: 65px 7px 0px 7px;
- }
-
+ padding: 71px 7px 200px 7px;
}
diff --git a/view/nl/register_open_eml.tpl b/view/nl/register_open_eml.tpl
index 4ee6756ef..6c15de192 100644
--- a/view/nl/register_open_eml.tpl
+++ b/view/nl/register_open_eml.tpl
@@ -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:
Hub: {{$siteurl}}
diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl
index 6cbc0c0e4..98dc71915 100644
--- a/view/pdl/mod_channel.pdl
+++ b/view/pdl/mod_channel.pdl
@@ -1,3 +1,6 @@
+[region=banner]
+[widget=cover_photo][/widget]
+[/region]
[region=aside]
[widget=fullprofile][/widget]
[widget=archive][var=wall]1[/var][/widget]
diff --git a/view/php/default.php b/view/php/default.php
index 6a9cc5517..cf6b25d90 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -6,6 +6,7 @@
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
+ <?php if(x($page,'banner')) echo $page['banner']; ?>
<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>
<main>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2cf311baa..f365bec1a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -174,6 +174,7 @@ header #banner {
z-index: 1040;
margin-top: 14px;
text-align: center;
+ text-shadow: 1px 1px 2px rgba(0,0,0,.5);
font-size: 14px;
font-family: tahoma, "Lucida Sans", sans;
color: $banner_colour;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 38dc4d209..d3f9c5f70 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -2,6 +2,17 @@
* redbasic theme specific JavaScript
*/
$(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)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {
@@ -38,9 +49,7 @@ $(document).ready(function() {
$("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'label label-primary'
});
-});
-$(document).ready(function(){
var doctitle = document.title;
function checkNotify() {
var notifyUpdateElem = document.getElementById('notify-update');
@@ -53,3 +62,17 @@ $(document).ready(function(){
}
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));
+ }
+});