From 548bf884a4b34a4881f3188e54c592597f755dc9 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 1 Mar 2016 21:06:27 -0800 Subject: profile field admin page (functional only: still needs a lot of HTML/CSS cleanup) --- view/tpl/admin_aside.tpl | 1 + view/tpl/admin_profiles.tpl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 view/tpl/admin_profiles.tpl (limited to 'view') diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index ab190fc95..da762a094 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -21,6 +21,7 @@
  • {{$admin.plugins.1}}
  • {{$admin.themes.1}}
  • {{$admin.features.1}}
  • +
  • {{$admin.profs.1}}
  • {{$admin.dbsync.1}}
  • diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl new file mode 100644 index 000000000..70fcc303b --- /dev/null +++ b/view/tpl/admin_profiles.tpl @@ -0,0 +1,31 @@ +
    +

    {{$title}}

    + +
    + +{{include file="field_textarea.tpl" field=$basic}} +{{include file="field_textarea.tpl" field=$advanced}} + + + +
    + +
    {{$all_desc}}
    + +
    {{$all}}
    + +

    +
    {{$cust_field_desc}}
    + + + +{{if $cust_fields}} + +{{foreach $cust_fields as $field}} + +{{/foreach}} +
    {{$field.field_desc}}{{$field.field_name}}{{$edit}} {{$drop}}
    +{{/if}} + + +
    -- cgit v1.2.3 From 428b4dbad63d429c3b0d47b49ff5918dbda3c596 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 1 Mar 2016 22:47:07 -0800 Subject: sort out the with and howlong dependencies --- view/tpl/profile_advanced.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 034a6d43d..a724c41bb 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -72,7 +72,7 @@ {{if $profile.marital}}
    {{$profile.marital.0}}
    -
    {{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}
    +
    {{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}
    {{/if}} {{/if}} -- cgit v1.2.3 From c97cc1487cbcac2c4fbc4d9e931a82df109af2e6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Mar 2016 12:31:25 +0100 Subject: a simple cover-photo implementation for redbasic default template --- view/css/default.css | 17 +++-------------- view/pdl/mod_channel.pdl | 3 +++ view/php/default.php | 1 + view/theme/redbasic/css/style.css | 1 + view/theme/redbasic/js/redbasic.js | 23 +++++++++++++++++++++-- 5 files changed, 29 insertions(+), 16 deletions(-) (limited to 'view') diff --git a/view/css/default.css b/view/css/default.css index bffecbb81..f6857ec83 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -12,29 +12,18 @@ main { position: relative; width: 100%; height: 100%; + padding-top: 71px; } aside { display: table-cell; vertical-align: top; - padding: 80px 7px 0px 7px; + padding: 0px 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: 0px 7px 200px 7px; } 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 @@ +
    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..7c5df0834 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'); + $('main').css('padding-top', 0 + 'px'); + } + else { + $('#cover-photo').remove(); + + } + // CSS3 calc() fallback (for unsupported browsers) $('body').append(''); 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,13 @@ $(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()) { + $('main').css('padding-top', 71 + 'px'); + $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) + $('.navbar-fixed-top').css('position', 'fixed'); + $('#cover-photo').remove(); + } +}); -- cgit v1.2.3 From c5d08fd5fdcd504dac010d62c434d16a92879852 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Mar 2016 13:33:18 +0100 Subject: add a fade in effect to main while scrolling up cover photo --- view/theme/redbasic/js/redbasic.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 7c5df0834..809776220 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,6 +7,7 @@ $(document).ready(function() { if($('#cover-photo').length && $(window).width() > 767) { $('.navbar-fixed-top').css('position', 'relative'); $('main').css('padding-top', 0 + 'px'); + $('main').css('opacity', 0); } else { $('#cover-photo').remove(); @@ -71,4 +72,8 @@ $(window).scroll(function () { $('.navbar-fixed-top').css('position', 'fixed'); $('#cover-photo').remove(); } + + if($('#cover-photo').length) { + $('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1)); + } }); -- cgit v1.2.3 From d3f2d2a2dbba70403d197221500aeae80d541557 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 2 Mar 2016 14:30:33 +0100 Subject: small fix to simple cover-photo --- view/css/default.css | 5 ++--- view/theme/redbasic/js/redbasic.js | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/css/default.css b/view/css/default.css index f6857ec83..db0628cb3 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -12,18 +12,17 @@ main { position: relative; width: 100%; height: 100%; - padding-top: 71px; } aside { display: table-cell; vertical-align: top; - padding: 0px 7px 0px 7px; + padding: 71px 7px 0px 7px; } section { width: 100%; display: table-cell; vertical-align: top; - padding: 0px 7px 200px 7px; + padding: 71px 7px 200px 7px; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 809776220..d3f9c5f70 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -6,12 +6,11 @@ $(document).ready(function() { //Simple cover-photo implementation if($('#cover-photo').length && $(window).width() > 767) { $('.navbar-fixed-top').css('position', 'relative'); - $('main').css('padding-top', 0 + 'px'); + $('aside, section').css('padding-top', 0 + 'px'); $('main').css('opacity', 0); } else { $('#cover-photo').remove(); - } // CSS3 calc() fallback (for unsupported browsers) @@ -67,7 +66,7 @@ $(document).ready(function() { //Simple cover-photo implementation $(window).scroll(function () { if($('#cover-photo').length && $(window).width() > 767 && $(window).scrollTop() >= $('#cover-photo').height()) { - $('main').css('padding-top', 71 + 'px'); + $('aside, section').css('padding-top', 71 + 'px'); $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) $('.navbar-fixed-top').css('position', 'fixed'); $('#cover-photo').remove(); -- cgit v1.2.3 From aa62bad07b7505cecb4347c7c4425bbd7bbcfcc5 Mon Sep 17 00:00:00 2001 From: Jeroen van Riet Paap Date: Wed, 2 Mar 2016 15:33:18 +0100 Subject: little nl string fix --- view/nl/register_open_eml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') 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}} -- cgit v1.2.3 From 6f4c45a48912c9dfaaf7631c58849476878b4fe1 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 2 Mar 2016 15:36:14 -0800 Subject: UI cleanup for admin profile field management page --- view/tpl/admin_profiles.tpl | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'view') diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl index 70fcc303b..8962c21b3 100644 --- a/view/tpl/admin_profiles.tpl +++ b/view/tpl/admin_profiles.tpl @@ -1,5 +1,14 @@
    -

    {{$title}}

    +
     {{$new}}

    {{$title}}

    +
    +
    + +
    + +
    @@ -10,22 +19,20 @@
    -
    {{$all_desc}}
    -
    {{$all}}
    +{{if $cust_fields}}

    -
    {{$cust_field_desc}}
    - - +
    {{$cust_field_desc}}
    +
    -{{if $cust_fields}} - +
    {{foreach $cust_fields as $field}} - + {{/foreach}}
    {{$field.field_desc}}{{$field.field_name}}{{$edit}} {{$drop}}
    {{$field.field_name}}{{$field.field_desc}} {{$drop}}
    {{/if}} +
    -- cgit v1.2.3 From 59e04aed1b7ea68b51b8672768dffd21f5a4bd4d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 3 Mar 2016 12:07:58 +0100 Subject: move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template. --- view/css/widgets.css | 27 +++++++++++++++++++++ view/theme/redbasic/js/redbasic.js | 24 ------------------- view/tpl/cover_photo_widget.tpl | 49 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 24 deletions(-) create mode 100755 view/tpl/cover_photo_widget.tpl (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index a1801ac77..db90afad9 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -122,3 +122,30 @@ li:hover .group-edit-icon { #event-upload-choose { width: 100%; } + +/* cover photo */ + +#cover-photo { + position: relative; + width: 100%; + height: auto; +} + +#cover-photo-caption { + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + padding: 15px; + color: #fff; + font-weight: bold; + text-shadow: 1px 1px 3px rgba(0,0,0,.7); +} + +.cover-photo-title { + font-size: 30px; +} + +.cover-photo-subtitle { + font-size: 20px; +} diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index d3f9c5f70..a4e13b8eb 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -3,16 +3,6 @@ */ $(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(''); if( $('#css3-calc').width() == 10) { @@ -62,17 +52,3 @@ $(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)); - } -}); diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl new file mode 100755 index 000000000..68571d257 --- /dev/null +++ b/view/tpl/cover_photo_widget.tpl @@ -0,0 +1,49 @@ + + +
    + {{$photo_html}} +
    +
    + {{$title}} +
    +
    + {{$subtitle}} +
    +
    +
    -- cgit v1.2.3 From 8ca877bdd3fbfd6f3b5ef1764c38ce39b2244c95 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 3 Mar 2016 12:31:49 +0100 Subject: slide up cover on click --- view/tpl/cover_photo_widget.tpl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index 68571d257..d6d2517e7 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -34,9 +34,13 @@ } }); + + function slideUpCover() { + $('html, body').animate({scrollTop: $('#cover-photo').height() + 'px'}); + } -
    +
    {{$photo_html}}
    -- cgit v1.2.3 From d3491c9165855ac7c2f1e0243a6c796ab36f9109 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 3 Mar 2016 13:46:08 +0100 Subject: fix jot form --- view/tpl/jot.tpl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'view') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 631f55d83..dea75efa9 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,12 +1,12 @@ -{{$mimeselect}} -{{$layoutselect}} -{{if $id_select}} -
    - {{$id_seltext}} {{$id_select}} -
    -{{/if}} -
    -
    + + {{$mimeselect}} + {{$layoutselect}} + {{if $id_select}} +
    + {{$id_seltext}} {{$id_select}} +
    + {{/if}} +
    {{if $parent}} {{/if}} @@ -160,8 +160,8 @@
    -
    -
    +
    + -- cgit v1.2.3