diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..dd762dd --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 BOETZILLA + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Zotlabs/Module/Oembed.php b/Zotlabs/Module/Oembed.php new file mode 100644 index 0000000..7f64603 --- /dev/null +++ b/Zotlabs/Module/Oembed.php @@ -0,0 +1,36 @@ + 1) { + if (argv(1) == 'b2h'){ + $url = array( "", trim(hex2bin($_REQUEST['url']))); + echo oembed_replacecb($url); + killme(); + } + + elseif (argv(1) == 'h2b'){ + $text = trim(hex2bin($_REQUEST['text'])); + echo oembed_html2bbcode($text); + killme(); + } + + else { + echo ""; + $src = base64url_decode(argv(1)); + $j = oembed_fetch_url($src); + echo $j['html']; + // logger('mod-oembed ' . $h, LOGGER_ALL); + echo ""; + } + } + killme(); + } + +} diff --git a/plusfuture/css/blockmode.css b/view/theme/plusfuture/css/blockmode.css similarity index 100% rename from plusfuture/css/blockmode.css rename to view/theme/plusfuture/css/blockmode.css diff --git a/plusfuture/css/mod_page.css b/view/theme/plusfuture/css/mod_page.css similarity index 100% rename from plusfuture/css/mod_page.css rename to view/theme/plusfuture/css/mod_page.css diff --git a/plusfuture/css/narrow_navbar.css b/view/theme/plusfuture/css/narrow_navbar.css similarity index 100% rename from plusfuture/css/narrow_navbar.css rename to view/theme/plusfuture/css/narrow_navbar.css diff --git a/view/theme/plusfuture/css/singlepost.css b/view/theme/plusfuture/css/singlepost.css new file mode 100644 index 0000000..e79854c --- /dev/null +++ b/view/theme/plusfuture/css/singlepost.css @@ -0,0 +1,5 @@ +.toplevel_item{ + width: 100%; + margin-left: unset; + margin-right: unset; +} \ No newline at end of file diff --git a/plusfuture/css/sloppy_photos.css b/view/theme/plusfuture/css/sloppy_photos.css similarity index 100% rename from plusfuture/css/sloppy_photos.css rename to view/theme/plusfuture/css/sloppy_photos.css diff --git a/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css similarity index 94% rename from plusfuture/css/style.css rename to view/theme/plusfuture/css/style.css index 65230d4..4d22d3a 100644 --- a/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2,7 +2,7 @@ * plusfuture * * Based on duepuntozero Friendica style - * Originally by Fabio Comuni + * Originally by harukin */ @@ -40,7 +40,8 @@ aside #right_aside_wrapper { main { margin-left: auto; margin-right: auto; - max-width: $main_widthpx; + /*カスタマイズ*/ + /*max-width: $main_widthpx;*/ } #overlay { @@ -204,6 +205,7 @@ nav { top: 3.35rem; left: 0px; width: 100%; + max-height: 80vh; background: $comment_item_colour; padding: 1rem; border-bottom: #ccc 1px solid; @@ -1807,7 +1809,7 @@ dl.bb-dl > dd > li { font-size: 1.2rem; } .toplevel_item , #notifications , #profile-jot-wrapper{ - box-shadow: 0px 0px 5px 2px rgba(75, 75, 75, 0.3); + box-shadow: 0px 0px 5px 1px rgba(75, 75, 75, 0.3); transition: all 300ms 0s; } .toplevel_item:hover , #notifications:hover , #profile-jot-wrapper:hover{ @@ -1850,6 +1852,41 @@ dl.bb-dl > dd > li { border-radius: 15% !important; } +#user_menu{ + background-color: #0000; + filter: none; +} + +#user_menu > ul > li{ + font-size: 1.2em; + position: relative; + left: -40px; + transition: all 300ms 0s; +} +#user_menu > ul > iframe{ + position: relative; + left: -15px; +} +#user_menu > ul > li:hover{ + background-color: #e1dede; +} +#user_menu > ul > li > a{ + display: flex; + margin-left: 40px; + margin-top: 7px; +} +#user_menu > ul > li > a > i{ + font-size: 130%; + margin: 0 20px 0px -20px; +} +#user_menu > ul > li > a > p{ + margin-bottom: 0.5rem; +} + + + + + a[title*="harukin@plus.haruk.in"]{ color: rgb(170, 2, 2); } @@ -2010,7 +2047,7 @@ a[title*="pawoo.net"]::after{ .shared_container{ border-radius: 2px; margin-top: 15px; - box-shadow: 2px 2px 5px 2px rgba(75, 75, 75, 0.5); + box-shadow: 2px 2px 6px 1px rgba(75, 75, 75, 0.5); margin-left: 10px; } @@ -2024,4 +2061,64 @@ a[title*="pawoo.net"]::after{ margin: 15px; left: -25px; filter: drop-shadow(1px 1px 1px rgba(75 ,75 ,75, 0.675)); +} + +.shared_container::after{ + height: 20px; + content: ""; + display: block; +} +.shared_container > div{ + margin-left: 20px; + margin-right: 20px; +} +.region_3-on{ + + left: -576px; + width: calc( 100% + 288px + 288px ); +} + +.toplevel_item{ + width: 100%; + max-width: $converse_widthpx; +} +@media screen and (min-width: 993px) { + .region_3-on{ + + left: 0px; + width: 100%; + } + .region_3-on .toplevel_item{ + width: 100%; + margin-left: unset; + margin-right: unset; + } + #overlay{ + display: none; + } + } + @media screen and (min-width: 800px){ + .toplevel_item{ + width: calc(50% - 16px); + margin: 8px; + margin-left: calc(calc(50% - $converse_widts ) / 2); + margin-right: calc(calc(50% - $converse_widts ) / 2); + } + } + @media screen and (min-width: $converse_widtd ){ + .toplevel_item{ + width: calc(50% - 16px); + margin: 8px; + margin-left: calc(calc(50% - $converse_widts ) / 2); + margin-right: calc(calc(50% - $converse_widts ) / 2); + } + } + .toplevel_item:nth-child(2n){ + float: left; +} +.toplevel_item:nth-child(2n+1){ + float: right; +} +.comment-edit-preview .toplevel_item{ + width: calc(100% - 16px); } \ No newline at end of file diff --git a/view/theme/plusfuture/img/bluebasic_play.png b/view/theme/plusfuture/img/bluebasic_play.png new file mode 100644 index 0000000..7dad8d5 Binary files /dev/null and b/view/theme/plusfuture/img/bluebasic_play.png differ diff --git a/plusfuture/img/gray_and_black_diagonal_stripes_background_seamless.gif b/view/theme/plusfuture/img/gray_and_black_diagonal_stripes_background_seamless.gif similarity index 100% rename from plusfuture/img/gray_and_black_diagonal_stripes_background_seamless.gif rename to view/theme/plusfuture/img/gray_and_black_diagonal_stripes_background_seamless.gif diff --git a/plusfuture/img/gray_and_white_diagonal_stripes_background_seamless.gif b/view/theme/plusfuture/img/gray_and_white_diagonal_stripes_background_seamless.gif similarity index 100% rename from plusfuture/img/gray_and_white_diagonal_stripes_background_seamless.gif rename to view/theme/plusfuture/img/gray_and_white_diagonal_stripes_background_seamless.gif diff --git a/plusfuture/img/screenshot.png b/view/theme/plusfuture/img/screenshot.png similarity index 100% rename from plusfuture/img/screenshot.png rename to view/theme/plusfuture/img/screenshot.png diff --git a/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js similarity index 56% rename from plusfuture/js/plusfuture.js rename to view/theme/plusfuture/js/plusfuture.js index 7fa32a0..9b09500 100644 --- a/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -2,41 +2,48 @@ * plusfuture theme specific JavaScript */ -$(document).ready(function() { +$(document).ready(function () { // CSS3 calc() fallback (for unsupported browsers) $('body').append(''); - if( $('#css3-calc').width() == 10) { - $(window).resize(function() { - if($(window).width() < 992) { - $('main').css('width', $(window).width() + $('aside').outerWidth() ); + if ($('#css3-calc').width() == 10) { + $(window).resize(function () { + if ($(window).width() < 992) { + $('main').css('width', $(window).width() + $('aside').outerWidth()); } else { - $('main').css('width', '100%' ); + $('main').css('width', '100%'); } }); } $('#css3-calc').remove(); // Remove the test element - if($(window).width() >= 992) { + 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')){ + $('section').on('click', function () { + if ($('main').hasClass('region_1-on')) { toggleAside(); } }); + $('section').on('click', function () { + if ($('main').hasClass('region_3-on')) { + if ($(window).width() < 982) { + toggleBside(); + } + } + }); + var left_aside_height = $('#left_aside_wrapper').height(); - $('#left_aside_wrapper').on('click', function() { - if(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(); } @@ -45,29 +52,29 @@ $(document).ready(function() { var right_aside_height = $('#right_aside_wrapper').height(); - $('#right_aside_wrapper').on('click', function() { - if(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')){ + $('.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')){ + $('#menu-btn').click(function () { + if ($('#navbar-collapse-1').hasClass('show')) { $('#navbar-collapse-1').removeClass('show'); } }); - $('.notifications-btn').click(function(e) { + $('.notifications-btn').click(function (e) { e.preventDefault(); e.stopPropagation(); - if($('#navbar-collapse-2').hasClass('show')){ + if ($('#navbar-collapse-2').hasClass('show')) { $('#navbar-collapse-2').removeClass('show'); } }); @@ -76,7 +83,7 @@ $(document).ready(function() { tagClass: 'badge badge-pill badge-warning text-dark' }); - $('a.disabled').click(function(e) { + $('a.disabled').click(function (e) { e.preventDefault(); e.stopPropagation(); }); @@ -84,20 +91,20 @@ $(document).ready(function() { var doctitle = document.title; function checkNotify() { var notifyUpdateElem = document.getElementById('notify-update'); - if(notifyUpdateElem !== null) { - if(notifyUpdateElem.innerHTML !== "") + if (notifyUpdateElem !== null) { + if (notifyUpdateElem.innerHTML !== "") document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle; else document.title = doctitle; } } - setInterval(function () {checkNotify();}, 10 * 1000); + setInterval(function () { checkNotify(); }, 10 * 1000); }); function makeFullScreen(full) { - if(typeof full=='undefined' || full == true) { + if (typeof full == 'undefined' || full == true) { $('main').addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important'); + $('header, nav, aside, #fullscreen-btn').attr('style', 'display:none !important'); $('#inline-btn').show(); } else { @@ -110,7 +117,7 @@ function makeFullScreen(full) { function toggleAside() { $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); - if($('main').hasClass('region_1-on')){ + if ($('main').hasClass('region_1-on')) { $('html, body').css('overflow-x', ''); $('main').removeClass('region_1-on') $('#overlay').remove(); @@ -127,3 +134,24 @@ function toggleAside() { }); } } + +function toggleBside() { + if ($('main').hasClass('region_3-on')) { + $('html, body').css('overflow-x', ''); + $('main').removeClass('region_3-on') + $('#region_3').addClass('d-none') + $('#overlay').remove(); + $('#right_aside_wrapper').trigger("sticky_kit:detach"); + } + else { + $('html, body').css('overflow-x', 'hidden'); + $('main').addClass('region_3-on') + $('#region_3').removeClass('d-none') + $('
').appendTo('section'); + $('#right_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + 10, + parent: '#region_3', + spacer: '#right_aside_spacer' + }); + } +} \ No newline at end of file diff --git a/view/theme/plusfuture/pdl/mod_admin.pdl b/view/theme/plusfuture/pdl/mod_admin.pdl new file mode 100644 index 0000000..0fba478 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_admin.pdl @@ -0,0 +1,7 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=admin][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_channel.pdl b/view/theme/plusfuture/pdl/mod_channel.pdl new file mode 100644 index 0000000..5f6ff12 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_channel.pdl @@ -0,0 +1,16 @@ +[region=aside] +[widget=userlogomenu][/widget] +[block]wetter[/block] +[/region] + +[region=content] +[widget=zcard][/widget] +$content +[/region] + +[region=right_aside] +[widget=notifications][/widget] +[widget=shortprofile][/widget] +[widget=categories][/widget] +[widget=archive][var=wall]1[/var][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_connections.pdl b/view/theme/plusfuture/pdl/mod_connections.pdl new file mode 100644 index 0000000..031b28b --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_connections.pdl @@ -0,0 +1,18 @@ +[region=nav]$nav[/region] + +[region=aside] +[widget=userlogomenu][/widget] +[/region] + +[region=content] +$content +[/region] + +[region=right_aside] +[widget=notifications][/widget] +[widget=follow][/widget] +[widget=collections][var=mode]groups[/var][/widget] +[widget=findpeople][/widget] + +[widget=suggestions][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_connedit.pdl b/view/theme/plusfuture/pdl/mod_connedit.pdl new file mode 100644 index 0000000..3e545e3 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_connedit.pdl @@ -0,0 +1,10 @@ +[region=aside] +[widget=vcard][/widget] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=collections][var=mode]abook[/var][/widget] +[widget=findpeople][/widget] +[widget=suggestions][/widget] +[widget=notifications][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_directory.pdl b/view/theme/plusfuture/pdl/mod_directory.pdl new file mode 100644 index 0000000..0b9738c --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_directory.pdl @@ -0,0 +1,18 @@ +[region=nav]$nav[/region] + +[region=aside] +[widget=userlogomenu][/widget] +[/region] + +[region=content] +$content +[/region] + +[region=right_aside] +[widget=notifications][/widget] +[widget=findpeople][/widget] +[widget=dirsort][/widget] +[widget=dirsafe][/widget] +[widget=dirtags][/widget] +[widget=suggestions][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_display.pdl b/view/theme/plusfuture/pdl/mod_display.pdl new file mode 100644 index 0000000..a953859 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_display.pdl @@ -0,0 +1,13 @@ +[region=nav]$nav[/region] + +[region=aside] +[widget=userlogomenu][/widget] +[/region] + +[region=content] +$content +[/region] + +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_events.pdl b/view/theme/plusfuture/pdl/mod_events.pdl new file mode 100644 index 0000000..c2c42ce --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_events.pdl @@ -0,0 +1,8 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=eventstools][/widget] +[widget=tasklist][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_group.pdl b/view/theme/plusfuture/pdl/mod_group.pdl new file mode 100644 index 0000000..13494a0 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_group.pdl @@ -0,0 +1,7 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=collections][var=mode]groups[/var][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_help.pdl b/view/theme/plusfuture/pdl/mod_help.pdl new file mode 100644 index 0000000..76132bf --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_help.pdl @@ -0,0 +1,7 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=helpindex][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_mail.pdl b/view/theme/plusfuture/pdl/mod_mail.pdl new file mode 100644 index 0000000..ddfb37c --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_mail.pdl @@ -0,0 +1,9 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=mailmenu][/widget] +[widget=conversations][/widget] +[widget=newmember][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_manage.pdl b/view/theme/plusfuture/pdl/mod_manage.pdl new file mode 100644 index 0000000..7080d59 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_manage.pdl @@ -0,0 +1,6 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_network.pdl b/view/theme/plusfuture/pdl/mod_network.pdl new file mode 100644 index 0000000..a9df4ad --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_network.pdl @@ -0,0 +1,16 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] + +[region=content] +$content +[/region] + +[region=right_aside] +[widget=notifications][/widget] +[widget=affinity][/widget] +[widget=activity_order][/widget] +[widget=activity_filter][/widget] +[widget=archive][var=wall]1[/var][/widget] +[widget=common_friends][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_notifications.pdl b/view/theme/plusfuture/pdl/mod_notifications.pdl new file mode 100644 index 0000000..537a482 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_notifications.pdl @@ -0,0 +1,8 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] + +[region=right_aside] +[widget=common_friends][/widget] +[widget=suggestions][/widget] +[/region] \ No newline at end of file diff --git a/view/theme/plusfuture/pdl/mod_photos.pdl b/view/theme/plusfuture/pdl/mod_photos.pdl new file mode 100644 index 0000000..6a5705b --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_photos.pdl @@ -0,0 +1,9 @@ +[region=aside] +[widget=vcard][/widget] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=photo_albums][/widget] +[widget=newmember][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_profile.pdl b/view/theme/plusfuture/pdl/mod_profile.pdl new file mode 100644 index 0000000..ba9a7a9 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_profile.pdl @@ -0,0 +1,18 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] + +[region=content] +[widget=zcard][/widget] +$content +[/region] + +[region=right_aside] +[widget=notifications][/widget] +[widget=collections][var=mode]groups[/var][/widget] +[widget=collections][var=mode]forums[/var][/widget] +[widget=collections][var=mode]folder[/var][/widget] +[widget=contact-block][/widget] +[widget=photo_albums][/widget] +[menu]roll[/menu] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_pubstream.pdl b/view/theme/plusfuture/pdl/mod_pubstream.pdl new file mode 100644 index 0000000..da195fe --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_pubstream.pdl @@ -0,0 +1,14 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] + +[region=content] +[widget=affinity][/widget] +$content +[/region] + +[region=right_aside] +[widget=notifications][/widget] +[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget] +[widget=archive][var=wall]1[/var][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_ratings.pdl b/view/theme/plusfuture/pdl/mod_ratings.pdl new file mode 100644 index 0000000..adbf04a --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_ratings.pdl @@ -0,0 +1,13 @@ +[region=aside] +[widget=userlogomenu][/widget] +[widget=notifications][/widget] +[/region] + +[region=content] +[widget=zcard][/widget] +$content +[/region] + +[region=right_aside] +[widget=suggestions][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_rpost.pdl b/view/theme/plusfuture/pdl/mod_rpost.pdl new file mode 100644 index 0000000..7080d59 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_rpost.pdl @@ -0,0 +1,6 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_settings.pdl b/view/theme/plusfuture/pdl/mod_settings.pdl new file mode 100644 index 0000000..e5bc1fc --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_settings.pdl @@ -0,0 +1,7 @@ +[region=aside] +[widget=userlogomenu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=settings_menu][/widget] +[/region] diff --git a/view/theme/plusfuture/pdl/mod_wiki.pdl b/view/theme/plusfuture/pdl/mod_wiki.pdl new file mode 100644 index 0000000..745a7a6 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_wiki.pdl @@ -0,0 +1,14 @@ +[region=aside] +[widget=userlogomenu][/widget] +[widget=wiki_pages][/widget] +[widget=notifications][/widget] +[/region] + +[region=content] +[widget=zcard][/widget] +$content +[/region] + +[region=right_aside] +[widget=shortprofile][var=scale]2[/var][/widget] +[/region] diff --git a/plusfuture/php/config.php b/view/theme/plusfuture/php/config.php similarity index 95% rename from plusfuture/php/config.php rename to view/theme/plusfuture/php/config.php index b3ab721..3415147 100644 --- a/plusfuture/php/config.php +++ b/view/theme/plusfuture/php/config.php @@ -38,6 +38,7 @@ class plusfutureConfig { $arr = array(); $arr['narrow_navbar'] = get_pconfig(local_channel(),'plusfuture', 'narrow_navbar' ); + $arr['singlepost'] = get_pconfig(local_channel(),'plusfuture', 'singlepost' ); $arr['nav_bg'] = get_pconfig(local_channel(),'plusfuture', 'nav_bg' ); $arr['nav_icon_colour'] = get_pconfig(local_channel(),'plusfuture', 'nav_icon_colour' ); $arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'plusfuture', 'nav_active_icon_colour' ); @@ -65,6 +66,7 @@ class plusfutureConfig { if (isset($_POST['plusfuture-settings-submit'])) { set_pconfig(local_channel(), 'plusfuture', 'narrow_navbar', $_POST['plusfuture_narrow_navbar']); + set_pconfig(local_channel(), 'plusfuture', 'singlepost', $_POST['plusfuture_singlepost']); set_pconfig(local_channel(), 'plusfuture', 'nav_bg', $_POST['plusfuture_nav_bg']); set_pconfig(local_channel(), 'plusfuture', 'nav_icon_colour', $_POST['plusfuture_nav_icon_colour']); set_pconfig(local_channel(), 'plusfuture', 'nav_active_icon_colour', $_POST['plusfuture_nav_active_icon_colour']); @@ -97,6 +99,7 @@ class plusfutureConfig { '$expert' => $expert, '$title' => t("Theme settings"), '$narrow_navbar' => array('plusfuture_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))), + '$singlepost' => array('plusfuture_singlepost',t('Singlepost'),$arr['singlepost'], '', array(t('No'),t('Yes'))), '$nav_bg' => array('plusfuture_nav_bg', t('Navigation bar background color'), $arr['nav_bg']), '$nav_icon_colour' => array('plusfuture_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']), '$nav_active_icon_colour' => array('plusfuture_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']), diff --git a/plusfuture/php/style.php b/view/theme/plusfuture/php/style.php similarity index 93% rename from plusfuture/php/style.php rename to view/theme/plusfuture/php/style.php index 7742e35..a049902 100644 --- a/plusfuture/php/style.php +++ b/view/theme/plusfuture/php/style.php @@ -14,6 +14,7 @@ if(! App::$install) { $nav_icon_colour = get_pconfig($uid, 'plusfuture', 'nav_icon_colour'); $nav_active_icon_colour = get_pconfig($uid, 'plusfuture', 'nav_active_icon_colour'); $banner_colour = get_pconfig($uid,'plusfuture','banner_colour'); + $singlepost = get_pconfig($uid,'plusfuture','singlepost'); $narrow_navbar = get_pconfig($uid,'plusfuture','narrow_navbar'); $link_colour = get_pconfig($uid, 'plusfuture', 'link_colour'); $schema = get_pconfig($uid,'plusfuture','schema'); @@ -97,11 +98,11 @@ if (! $font_size) if (! $font_colour) $font_colour = '#4d4d4d'; if (! $radius) - $radius = '0.25rem'; + $radius = '1px'; if (! $shadow) $shadow = '0'; if (! $converse_width) - $converse_width = '790'; + $converse_width = ''; if(! $top_photo) $top_photo = '3rem'; if(! $reply_photo) @@ -116,6 +117,9 @@ if(file_exists('view/theme/plusfuture/css/style.css')) { if($narrow_navbar && file_exists('view/theme/plusfuture/css/narrow_navbar.css')) { $x .= file_get_contents('view/theme/plusfuture/css/narrow_navbar.css'); } + if($singlepost && file_exists('view/theme/plusfuture/css/singlepost.css')) { + $x .= file_get_contents('view/theme/plusfuture/css/singlepost.css'); + } if($schemecss) { $x .= $schemecss; @@ -162,3 +166,10 @@ if(file_exists('view/theme/plusfuture/css/style.css')) { if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'plusfuture') set_pconfig(local_channel(), 'plusfuture', 'schema', '---'); + +echo ("アレ"); +$hoge = intval($converse_width); +$converse_widtd = ($hoge * 2); +echo($converse_width); +echo($converse_widtd); +echo($converse_widts); \ No newline at end of file diff --git a/plusfuture/php/theme.php b/view/theme/plusfuture/php/theme.php similarity index 100% rename from plusfuture/php/theme.php rename to view/theme/plusfuture/php/theme.php diff --git a/plusfuture/php/theme_init.php b/view/theme/plusfuture/php/theme_init.php similarity index 100% rename from plusfuture/php/theme_init.php rename to view/theme/plusfuture/php/theme_init.php diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php new file mode 100644 index 0000000..e69788f --- /dev/null +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -0,0 +1,16 @@ + $site['$sitelocation'], + '$banner' => $channel['channel_name'], + '$channel' => $channel['channel_address'], + '$avatar' => $channel['xchan_photo_s'], + )); + + return $o; + + } diff --git a/plusfuture/schema/Focus-Boxy.css b/view/theme/plusfuture/schema/Focus-Boxy.css similarity index 100% rename from plusfuture/schema/Focus-Boxy.css rename to view/theme/plusfuture/schema/Focus-Boxy.css diff --git a/plusfuture/schema/Focus-Boxy.php b/view/theme/plusfuture/schema/Focus-Boxy.php similarity index 100% rename from plusfuture/schema/Focus-Boxy.php rename to view/theme/plusfuture/schema/Focus-Boxy.php diff --git a/plusfuture/schema/Focus-Light.css b/view/theme/plusfuture/schema/Focus-Light.css similarity index 100% rename from plusfuture/schema/Focus-Light.css rename to view/theme/plusfuture/schema/Focus-Light.css diff --git a/plusfuture/schema/Focus-Light.php b/view/theme/plusfuture/schema/Focus-Light.php similarity index 88% rename from plusfuture/schema/Focus-Light.php rename to view/theme/plusfuture/schema/Focus-Light.php index 912d085..6dcad52 100644 --- a/plusfuture/schema/Focus-Light.php +++ b/view/theme/plusfuture/schema/Focus-Light.php @@ -6,7 +6,5 @@ $nav_icon_colour = "rgba(0, 0, 0, 0.5)"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "rgba(0, 0, 0, 0.7)"; - if (! $radius) - $radius = "4px"; if (! $banner_colour) $banner_colour = "rgba(0, 0, 0, 0.7)"; diff --git a/view/theme/plusfuture/schema/bluebasic.css b/view/theme/plusfuture/schema/bluebasic.css new file mode 100644 index 0000000..65df0eb --- /dev/null +++ b/view/theme/plusfuture/schema/bluebasic.css @@ -0,0 +1,563 @@ +/** + * Bluebasic + * Scheme for the Redbasic Theme for Hubzilla + * Based on the Suckerberg Theme by Sean Tiley + * Version 0.1 + * Maintained by BOET + + +/* generals */ + +main { + margin-left: auto; + margin-right: auto; + max-width: 1366px; + margin-top: 15px; +} + + +a { + color: $nav_bg !important; +} + +a:hover, +a:focus, +.fakelink:hover, +.fakelink:focus { + color: $nav_bg !important; +} + + +.wall-item-conv { + background-color: $comment_item_colour; +} + +.wall-item-title.h3 { + font-weight: 400; + word-wrap: break-word; + +} + +.side-link { + margin-bottom: 15px; +} + +.shared_header img { + border-radius: 0.25rem; + margin: 0px 10px 10px 0px !important; + +} + +.shared_container { + border: 1px solid lightblue; + margin: 15px 0px; + padding: 10px; + float: left; + width: 100%; +} + +.shared_header { + margin-bottom: 20px; + border-bottom: 1px solid lightblue; + padding-bottom: 20px; +} + +.generic-icons, +a .generic-icons { + font-size: 1rem; + margin-right: 0.5rem; + color: $font_colour; +} + +.generic-icons:hover, +a .generic-icons:hover { + color: $font_colour; +} + +.generic-icons-right { + font-size: 1rem; + margin-left: 0.5rem; + color: $font_colour; +} + +.drop-icons, +a .drop-icons { + font-size: 1rem; + color: $font_colour; + text-decoration: none; + cursor: pointer; +} + +.drop-icons:hover, +a .drop-icons:hover { + color: #FF0000; +} + +#menulist { + list-style-type: none; +} + +/* conversation */ + +.top-radius { + border-top-right-radius: $radius; + border-top-left-radius: $radius; +} + +.wall-event-item { + padding: 10px; + color: #fff; + background-color: #3A87AD; /* should reflect calendar color */ + border-top-left-radius: $radius; + border-top-right-radius: $radius; +} + +.wall-photo-item img { + max-width: 100% !important; + border-top-right-radius: $radius; + border-top-left-radius: $radius; +} +.wall-item-head-new { + border-top: 0.1rem solid #007bff; +} + +.wall-item-footer { + font-size: 0.75rem; + margin-top: 2em; +} + +.wall-item-content-wrapper { + background-color: #fff; + border-top-right-radius: $radius; + border-top-left-radius: $radius; +} + +.wall-item-content-wrapper.comment { + background-color: $comment_item_colour; + border-top-right-radius: 0px; + border-top-left-radius: 0px; +} + +.p-2 { + padding: 0.9rem !important; +} + +.wall-item-comment-wrapper { + padding: 7px 10px; + background-color: $item_colour; + border-radius: 0px; + border-bottom-right-radius: $radius; + border-bottom-left-radius: $radius; + border-top: 0px solid $comment_item_colour; +} + +.wall-item-comment-wrapper-wc { + border-top: 0px solid $comment_item_colour; +} + +.wall-item-photo { + width: $top_photo; + height: $top_photo; + border: none; + border-radius: $radius; + box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; +} + +.comment .wall-item-photo { + width: $reply_photo; + height: $reply_photo; +} + +.wall-item-content img { + max-width: 100%; + float: left; + clear: both; + margin: 10px 15px 10px 0px; +} + +.comment .wall-item-body { + padding-left: 00px !important; +} + +.wall-item-body a {padding-left: 2px; } + + +.comment-edit-text { + border: 1px solid #ccc; + border-radius: $radius; +} + +.divgrow-showmore { + display: block; + border: 1px dashed #ccc; + text-align: center; + padding: 7px; + margin: 13px 13px 0px 13px; + background: rgb(238,238,238); + + border-radius: 3px; +} + +.divgrow-showmore:hover { + border-top: 1px dashed #adadad; +} + +.directory-item .divgrow-showmore { + background-color: $comment_item_colour; +} + +/* widgets */ + +.widget { + background-color: rgba(254,254,254,.5); + border: 1px solid rgba(254,254,254,.5); + border-radius: 2px; + margin-bottom: 1rem; + padding: 0 0 0.7rem; +} + +.widget h3 { + margin-top: 0px; + border-bottom: 1px solid lightblue !important; + padding: 15px; + background-color: $nav_bg !important; + color: #fff; + font-size: 1.2rem; +} + + + +.menu-img-3 { + width: 3.3em; + height: 3.3em; + margin-right: 5px; + border-radius: $radius; + float: left; +} + +.menu-img-2 { + height: 2.2em; + width: 2.2em; + margin-right: 5px; + border-radius: $radius; + float: left; +} + +.menu-img-1 { + height: 1.28571429em; + width: 1.28571429em; + border-radius: $radius; +} + +#usermenu { + width: 3.75rem; + background-color: rgba(254,254,254,.5); +} + +#avatar { + width: 2.35rem; + height: 2.35rem; + border-radius: $radius; +} + +#nav-app-link { + padding: 0 !important; + line-height: 1.175; + white-space: nowrap; +} + +.page-title { + margin: 7px 0px; +} + +.generic-content-wrapper-styled { + background-color: #fff; + padding: 10px; + border-radius: $radius; +} + +.generic-content-wrapper { + border: 1px solid rgba(0, 0, 0, .2); + border-radius: $radius; + margin-bottom: 1.5rem; + box-shadow: 0px 0px 0px 0px rgba(0,0,0,0.2); +} + +.reshared-content { + margin: 0px; +} + +.section-title-wrapper { + padding: 7px 10px; + background-color: $item_colour; + border-top-left-radius: $radius; + border-top-right-radius: $radius; + border-bottom: 3px solid $comment_item_colour; +} + +.section-title-wrapper h2, +.section-subtitle-wrapper h3 { + margin-top: 0px; + margin-bottom: 0px; + white-space: nowrap; + +} + +.section-title-wrapper img {width: 2.3rem; height; 2.3rem;} + +#inline-btn { + display: none; +} + +/* bootstrap overrides */ + +.btn, +.form-control, +.nav-pills .nav-link, +.nav-tabs .nav-link { + border-radius: $radius; +} + +.rounded-top { + border-top-left-radius: $radius !important; + border-top-right-radius: $radius !important; +} + + +Element { +} +blockquote { + font-size: 1rem; + font-style: italic; + border: 1px dotted #ccc; + padding: 1em 1.5em; + margin: 10px 0px; +} + +.dropdown-menu { + color: $font_colour; + font-size: 0.9rem; + border-radius: $radius; +} + +.dropdown-item { + color: $font_colour; +} + +.dropdown-item:active, +.dropdown-item:focus, +.dropdown-item:hover, +.textcomplete-item:focus .dropdown-item, +.textcomplete-item:hover .dropdown-item, +.textcomplete-item.active .dropdown-item, +.textcomplete-item:active .dropdown-item { + color: $font_colour; + background-color: $item_colour; +} + +.dropdown-item.active { + color: #fff; + background-color: $nav_bg !important; +} + +.bg-dark, #menu_logo { + background-color: $nav_bg !important; + z-index: 1; +} + +#menu_logo { + + position: relative; + width: 100%; + clear: both; + float: left; + margin-bottom: 0px; + color: $banner_colour; + +} + +#hubzilla { + font-size:1.5rem; + float:right; + margin-top:-45px; + margin-right:20px; + color:$banner_colour; + font-weight:800; + border-bottom:1px #4267b2; +} + +#menu_logo .fa.fa-hubzilla { + font-size:5rem; + width:100%; + padding-top:10px; + padding-left:15px; + margin-bottom:10px; + float:left; + color: $banner_colour; +} + + +.bg-primary { + background-color: $nav_bg !important; +} + +.text-white a { + color: #fff !important; +} + +.nav-pills .nav-link.active, .nav-pills .show > .nav-link { + color: #000; + background-color: #d5e3ff; +} + +.navbar { + z-index:1030; +} + +.navbar-dark .navbar-nav .nav-link, +.usermenu i { + color: $nav_icon_colour !important; +} + +.navbar-dark .navbar-nav .nav-link:focus, +.navbar-dark .navbar-nav .nav-link:hover, +.usermenu:focus i, +.usermenu:hover i { + color: $nav_active_icon_colour; +} + +@media screen and (max-width: 992px) { + + aside#region_1 { + border-right: 1px solid $nav_bd; + } + + main { + left: -$aside_widthpx; + width: calc( 100% + $aside_widthpx ); + } + + main.region_1-on { + left: 0px; + } + + #nav-app-link-wrapper { + min-width: 0; + flex-basis: 25%; + } + + #navbar-collapse-2 .navbar-app i { + font-size: 1rem; + margin-right: 0.5rem; + } + +} + +/* Modified original CSS to match input in Redbasic */ + +.form-group.checkbox input { + display: none; +} + +.form-group.checkbox > div label { + display: block; overflow: hidden; cursor: pointer; + border: 1px solid #ccc; + border-radius: 12px; + margin:0px; + -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; + -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; + transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; +} + +.form-group.checkbox:hover label { + color: $link_colour; +} + +.form-group.checkbox:hover > div label { + border-color: $link_colour; +} + +img.zrl { + width: 100% !important; + height: auto; + float: initial; +} + +.logo { font-size: 5rem; + width: 105%; + color: #fff; + background-color: $nav_bg !important; + padding-top: 10px; + padding-left: 15px; + padding-bottom: 15px; + margin-bottom: 15px; + margin-left: -0.5rem; + margin-top: -0.5rem; + float: left; +} + + +.badge-warning { + color: #000; + background-color: #fff; + color: $font_colour !important; +} + +.badge-warning .text-dark { + color: $font_colour !important; +} + +.badge { + display: inline-block; + padding: .25em .4em; + padding-right: 0.4em; + padding-left: 0.4em; + font-weight: 400 !important; + line-height: 1 !important; + text-align: center !important; + white-space: nowrap !important; + vertical-align: baseline !important; + border-radius: 0 !important; + font-size: 0.75rem !important; + +} + +.contact-photo-wrapper img {width: 80px; height: 80px;} + +img[src*="feedburner"] { + + visibility: hidden; + display: none; +} + + +.oembed.video { + padding-top: 56.25% !important; +} + +iframe { + width: 100%; + position: relative; + height: 100%; + +} + + +.oembed.video a { + width: 100% !important; + margin: 0 !important; + height: 500px; +} + +.oembed.video iframe, .oembed.video html, .oembed.video body, .oembed.video img { + width: 100% !important; + height: 500px; + position: relative; + margin-top: 10px; + padding-top: 0px; + padding-bottom: 0px; +} + +audio { + width: 100%; +} diff --git a/view/theme/plusfuture/schema/bluebasic.php b/view/theme/plusfuture/schema/bluebasic.php new file mode 100644 index 0000000..50cce95 --- /dev/null +++ b/view/theme/plusfuture/schema/bluebasic.php @@ -0,0 +1,3 @@ + + var notifications_parent; + + $(document).ready(function() { + notifications_parent = $('#notifications_wrapper')[0].parentElement.id; + $('.notifications-btn').click(function() { + toggleBside(); + }); + + window.onpopstate = function(e) { + if(e.state !== null) + getData(e.state.b64mid, ''); + }; + }); + + {{if $module == 'display' || $module == 'hq' || $startpage == 'hq'}} + $(document).on('click', '.notification', function(e) { + var b64mid = $(this).data('b64mid'); + var notify_id = $(this).data('notify_id'); + var path = $(this)[0].pathname.substr(1,7); + var stateObj = { b64mid: b64mid }; + + if(b64mid === 'undefined' && notify_id === 'undefined') + return; + + {{if $module != 'hq' && $startpage == 'hq'}} + e.preventDefault(); + if(typeof notify_id !== 'undefined' && notify_id !== 'undefined') { + $.post( + "hq", + { + "notify_id" : notify_id + } + ); + } + window.location.href = 'hq/' + b64mid; + return; + {{else}} + {{if $module == 'display'}} + history.pushState(stateObj, '', 'display/' + b64mid); + {{/if}} + + {{if $module == 'hq'}} + history.pushState(stateObj, '', 'hq/' + b64mid); + {{/if}} + + {{if $module == 'hq'}} + if(b64mid !== 'undefined') { + {{else}} + if(path === 'display' && b64mid) { + {{/if}} + e.preventDefault(); + + if(! page_load) { + getData(b64mid, notify_id); + } + + if($('#notifications_wrapper').hasClass('fs')) + $('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); + } + {{/if}} + }); + {{/if}} + + {{foreach $notifications as $notification}} + {{if $notification.filter}} + $(document).on('click', '#tt-{{$notification.type}}-only', function(e) { + e.preventDefault(); + $('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle(); + $(this).toggleClass('active sticky-top'); + }); + $(document).on('click ', '#cn-{{$notification.type}}-input-clear', function(e) { + $('#cn-{{$notification.type}}-input').val(''); + $('#cn-{{$notification.type}}-only').removeClass('active sticky-top'); + $("#nav-{{$notification.type}}-menu .notification").removeClass('d-none'); + $('#cn-{{$notification.type}}-input-clear').addClass('d-none'); + }); + $(document).on('input', '#cn-{{$notification.type}}-input', function(e) { + var val = $('#cn-{{$notification.type}}-input').val().toString().toLowerCase(); + + if(val) { + $('#cn-{{$notification.type}}-only').addClass('active sticky-top'); + $('#cn-{{$notification.type}}-input-clear').removeClass('d-none'); + } + else { + $('#cn-{{$notification.type}}-only').removeClass('active sticky-top'); + $('#cn-{{$notification.type}}-input-clear').addClass('d-none'); + } + + $("#nav-{{$notification.type}}-menu .notification").each(function(i, el){ + var cn = $(el).data('contact_name').toString().toLowerCase(); + + if(cn.indexOf(val) === -1) + $(this).addClass('d-none'); + else + $(this).removeClass('d-none'); + }); + }); + {{/if}} + {{/foreach}} + + function getData(b64mid, notify_id) { + $('.thread-wrapper').remove(); + bParam_mid = b64mid; + mode = 'replace'; + page_load = true; + {{if $module == 'hq'}} + liveUpdate(notify_id); + {{/if}} + {{if $module == 'display'}} + liveUpdate(); + {{/if}} + } + + +
+
+ {{$no_notifications}}... +
+ + + +
+{{/if}} diff --git a/view/theme/plusfuture/tpl/oembed_video.tpl b/view/theme/plusfuture/tpl/oembed_video.tpl new file mode 100644 index 0000000..dd71d76 --- /dev/null +++ b/view/theme/plusfuture/tpl/oembed_video.tpl @@ -0,0 +1,4 @@ + + +
+ diff --git a/plusfuture/tpl/theme_settings.tpl b/view/theme/plusfuture/tpl/theme_settings.tpl similarity index 97% rename from plusfuture/tpl/theme_settings.tpl rename to view/theme/plusfuture/tpl/theme_settings.tpl index 0f4c27f..cf6a86e 100644 --- a/plusfuture/tpl/theme_settings.tpl +++ b/view/theme/plusfuture/tpl/theme_settings.tpl @@ -1,4 +1,5 @@ {{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{include file="field_checkbox.tpl" field=$singlepost}} {{include file="field_input.tpl" field=$converse_width}} {{include file="field_input.tpl" field=$font_size}} {{include file="field_checkbox.tpl" field=$advanced_theming}} diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl new file mode 100644 index 0000000..88d9bcb --- /dev/null +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -0,0 +1,82 @@ +
+ + + +
+