From 7141b320df6364ebf236a6231ffc428a5ed43718 Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 12:43:56 +0900 Subject: [PATCH 001/117] add from https://github.com/BOETZILLA/BLUEBASIC_Scheme --- LICENSE | 21 + Zotlabs/Module/Oembed.php | 36 ++ .../theme/plusfuture}/css/blockmode.css | 0 .../theme/plusfuture}/css/mod_page.css | 0 .../theme/plusfuture}/css/narrow_navbar.css | 0 .../theme/plusfuture}/css/sloppy_photos.css | 0 .../theme/plusfuture}/css/style.css | 0 view/theme/plusfuture/img/bluebasic_play.png | Bin 0 -> 3909 bytes ...k_diagonal_stripes_background_seamless.gif | Bin ...e_diagonal_stripes_background_seamless.gif | Bin .../theme/plusfuture}/img/screenshot.png | Bin .../theme/plusfuture}/js/plusfuture.js | 0 view/theme/plusfuture/pdl/mod_admin.pdl | 10 + view/theme/plusfuture/pdl/mod_articles.pdl | 5 + view/theme/plusfuture/pdl/mod_channel.pdl | 17 + view/theme/plusfuture/pdl/mod_cloud.pdl | 13 + view/theme/plusfuture/pdl/mod_connections.pdl | 18 + view/theme/plusfuture/pdl/mod_connedit.pdl | 10 + view/theme/plusfuture/pdl/mod_directory.pdl | 18 + view/theme/plusfuture/pdl/mod_display.pdl | 16 + view/theme/plusfuture/pdl/mod_events.pdl | 14 + view/theme/plusfuture/pdl/mod_gallery.pdl | 14 + view/theme/plusfuture/pdl/mod_group.pdl | 9 + view/theme/plusfuture/pdl/mod_network.pdl | 21 + view/theme/plusfuture/pdl/mod_pdledit.pdl | 9 + view/theme/plusfuture/pdl/mod_photos.pdl | 14 + view/theme/plusfuture/pdl/mod_profile.pdl | 16 + view/theme/plusfuture/pdl/mod_pubstream.pdl | 19 + view/theme/plusfuture/pdl/mod_ratings.pdl | 13 + view/theme/plusfuture/pdl/mod_settings.pdl | 11 + .../plusfuture/pdl/mod_viewconnections.pdl | 13 + view/theme/plusfuture/pdl/mod_wiki.pdl | 14 + .../theme/plusfuture}/php/config.php | 0 .../theme/plusfuture}/php/style.php | 0 .../theme/plusfuture}/php/theme.php | 0 .../theme/plusfuture}/php/theme_init.php | 0 .../plusfuture/php/widget_userlogomenu.php | 16 + .../theme/plusfuture}/schema/Focus-Boxy.css | 0 .../theme/plusfuture}/schema/Focus-Boxy.php | 0 .../theme/plusfuture}/schema/Focus-Light.css | 0 .../theme/plusfuture}/schema/Focus-Light.php | 0 view/theme/plusfuture/schema/bluebasic.css | 563 ++++++++++++++++++ view/theme/plusfuture/schema/bluebasic.php | 3 + .../theme/plusfuture}/schema/dark.css | 0 .../theme/plusfuture}/schema/dark.php | 0 ...ack_on_white_(unmaintained,deprecated).css | 0 ...ack_on_white_(unmaintained,deprecated).php | 0 ...een_on_black_(unmaintained,deprecated).css | 0 ...een_on_black_(unmaintained,deprecated).php | 0 ...ite_on_black_(unmaintained,deprecated).css | 0 ...ite_on_black_(unmaintained,deprecated).php | 0 view/theme/plusfuture/tpl/oembed_video.tpl | 4 + .../theme/plusfuture}/tpl/theme_settings.tpl | 0 view/theme/plusfuture/tpl/userlogomenu.tpl | 46 ++ 54 files changed, 963 insertions(+) create mode 100644 LICENSE create mode 100644 Zotlabs/Module/Oembed.php rename {plusfuture => view/theme/plusfuture}/css/blockmode.css (100%) rename {plusfuture => view/theme/plusfuture}/css/mod_page.css (100%) rename {plusfuture => view/theme/plusfuture}/css/narrow_navbar.css (100%) rename {plusfuture => view/theme/plusfuture}/css/sloppy_photos.css (100%) rename {plusfuture => view/theme/plusfuture}/css/style.css (100%) create mode 100644 view/theme/plusfuture/img/bluebasic_play.png rename {plusfuture => view/theme/plusfuture}/img/gray_and_black_diagonal_stripes_background_seamless.gif (100%) rename {plusfuture => view/theme/plusfuture}/img/gray_and_white_diagonal_stripes_background_seamless.gif (100%) rename {plusfuture => view/theme/plusfuture}/img/screenshot.png (100%) rename {plusfuture => view/theme/plusfuture}/js/plusfuture.js (100%) create mode 100644 view/theme/plusfuture/pdl/mod_admin.pdl create mode 100644 view/theme/plusfuture/pdl/mod_articles.pdl create mode 100644 view/theme/plusfuture/pdl/mod_channel.pdl create mode 100644 view/theme/plusfuture/pdl/mod_cloud.pdl create mode 100644 view/theme/plusfuture/pdl/mod_connections.pdl create mode 100644 view/theme/plusfuture/pdl/mod_connedit.pdl create mode 100644 view/theme/plusfuture/pdl/mod_directory.pdl create mode 100644 view/theme/plusfuture/pdl/mod_display.pdl create mode 100644 view/theme/plusfuture/pdl/mod_events.pdl create mode 100644 view/theme/plusfuture/pdl/mod_gallery.pdl create mode 100644 view/theme/plusfuture/pdl/mod_group.pdl create mode 100644 view/theme/plusfuture/pdl/mod_network.pdl create mode 100644 view/theme/plusfuture/pdl/mod_pdledit.pdl create mode 100644 view/theme/plusfuture/pdl/mod_photos.pdl create mode 100644 view/theme/plusfuture/pdl/mod_profile.pdl create mode 100644 view/theme/plusfuture/pdl/mod_pubstream.pdl create mode 100644 view/theme/plusfuture/pdl/mod_ratings.pdl create mode 100644 view/theme/plusfuture/pdl/mod_settings.pdl create mode 100644 view/theme/plusfuture/pdl/mod_viewconnections.pdl create mode 100644 view/theme/plusfuture/pdl/mod_wiki.pdl rename {plusfuture => view/theme/plusfuture}/php/config.php (100%) rename {plusfuture => view/theme/plusfuture}/php/style.php (100%) rename {plusfuture => view/theme/plusfuture}/php/theme.php (100%) rename {plusfuture => view/theme/plusfuture}/php/theme_init.php (100%) create mode 100644 view/theme/plusfuture/php/widget_userlogomenu.php rename {plusfuture => view/theme/plusfuture}/schema/Focus-Boxy.css (100%) rename {plusfuture => view/theme/plusfuture}/schema/Focus-Boxy.php (100%) rename {plusfuture => view/theme/plusfuture}/schema/Focus-Light.css (100%) rename {plusfuture => view/theme/plusfuture}/schema/Focus-Light.php (100%) create mode 100644 view/theme/plusfuture/schema/bluebasic.css create mode 100644 view/theme/plusfuture/schema/bluebasic.php rename {plusfuture => view/theme/plusfuture}/schema/dark.css (100%) rename {plusfuture => view/theme/plusfuture}/schema/dark.php (100%) rename {plusfuture => view/theme/plusfuture}/schema/simple_black_on_white_(unmaintained,deprecated).css (100%) rename {plusfuture => view/theme/plusfuture}/schema/simple_black_on_white_(unmaintained,deprecated).php (100%) rename {plusfuture => view/theme/plusfuture}/schema/simple_green_on_black_(unmaintained,deprecated).css (100%) rename {plusfuture => view/theme/plusfuture}/schema/simple_green_on_black_(unmaintained,deprecated).php (100%) rename {plusfuture => view/theme/plusfuture}/schema/simple_white_on_black_(unmaintained,deprecated).css (100%) rename {plusfuture => view/theme/plusfuture}/schema/simple_white_on_black_(unmaintained,deprecated).php (100%) create mode 100644 view/theme/plusfuture/tpl/oembed_video.tpl rename {plusfuture => view/theme/plusfuture}/tpl/theme_settings.tpl (100%) create mode 100644 view/theme/plusfuture/tpl/userlogomenu.tpl 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/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 100% rename from plusfuture/css/style.css rename to view/theme/plusfuture/css/style.css diff --git a/view/theme/plusfuture/img/bluebasic_play.png b/view/theme/plusfuture/img/bluebasic_play.png new file mode 100644 index 0000000000000000000000000000000000000000..7dad8d50888b855a0c9dd7cee46f4e8bb0da0117 GIT binary patch literal 3909 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 $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 100% rename from plusfuture/schema/Focus-Light.php rename to view/theme/plusfuture/schema/Focus-Light.php 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 @@ + + +
+ diff --git a/plusfuture/tpl/theme_settings.tpl b/view/theme/plusfuture/tpl/theme_settings.tpl similarity index 100% rename from plusfuture/tpl/theme_settings.tpl rename to view/theme/plusfuture/tpl/theme_settings.tpl diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl new file mode 100644 index 0000000..48a53bb --- /dev/null +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -0,0 +1,46 @@ + + + + +
+ + + +
+ From ea33ff77a0a544779389d4d42f19452a611a7e79 Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 13:12:16 +0900 Subject: [PATCH 002/117] =?UTF-8?q?=E4=B8=80=E7=AB=AF=E9=9A=8E=E5=B1=A4?= =?UTF-8?q?=E7=B6=AD=E6=8C=81=E3=81=A7=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/img/bluebasic_play.png | Bin 3909 -> 0 bytes view/theme/plusfuture/pdl/mod_admin.pdl | 10 - view/theme/plusfuture/pdl/mod_articles.pdl | 5 - view/theme/plusfuture/pdl/mod_channel.pdl | 17 - view/theme/plusfuture/pdl/mod_cloud.pdl | 13 - view/theme/plusfuture/pdl/mod_connections.pdl | 18 - view/theme/plusfuture/pdl/mod_connedit.pdl | 10 - view/theme/plusfuture/pdl/mod_directory.pdl | 18 - view/theme/plusfuture/pdl/mod_display.pdl | 16 - view/theme/plusfuture/pdl/mod_events.pdl | 14 - view/theme/plusfuture/pdl/mod_gallery.pdl | 14 - view/theme/plusfuture/pdl/mod_group.pdl | 9 - view/theme/plusfuture/pdl/mod_network.pdl | 21 - view/theme/plusfuture/pdl/mod_pdledit.pdl | 9 - view/theme/plusfuture/pdl/mod_photos.pdl | 14 - view/theme/plusfuture/pdl/mod_profile.pdl | 16 - view/theme/plusfuture/pdl/mod_pubstream.pdl | 19 - view/theme/plusfuture/pdl/mod_ratings.pdl | 13 - view/theme/plusfuture/pdl/mod_settings.pdl | 11 - .../plusfuture/pdl/mod_viewconnections.pdl | 13 - view/theme/plusfuture/pdl/mod_wiki.pdl | 14 - .../plusfuture/php/widget_userlogomenu.php | 16 - view/theme/plusfuture/schema/bluebasic.css | 563 ------------------ view/theme/plusfuture/schema/bluebasic.php | 3 - view/theme/plusfuture/tpl/oembed_video.tpl | 4 - view/theme/plusfuture/tpl/userlogomenu.tpl | 46 -- 26 files changed, 906 deletions(-) delete mode 100644 view/theme/plusfuture/img/bluebasic_play.png delete mode 100644 view/theme/plusfuture/pdl/mod_admin.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_articles.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_channel.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_cloud.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_connections.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_connedit.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_directory.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_display.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_events.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_gallery.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_group.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_network.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_pdledit.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_photos.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_profile.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_pubstream.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_ratings.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_settings.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_viewconnections.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_wiki.pdl delete mode 100644 view/theme/plusfuture/php/widget_userlogomenu.php delete mode 100644 view/theme/plusfuture/schema/bluebasic.css delete mode 100644 view/theme/plusfuture/schema/bluebasic.php delete mode 100644 view/theme/plusfuture/tpl/oembed_video.tpl delete mode 100644 view/theme/plusfuture/tpl/userlogomenu.tpl diff --git a/view/theme/plusfuture/img/bluebasic_play.png b/view/theme/plusfuture/img/bluebasic_play.png deleted file mode 100644 index 7dad8d50888b855a0c9dd7cee46f4e8bb0da0117..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3909 zcmV-L54!M)P)W*(00004XF*Lt006O% z3;baP000U)X+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3iJg{rR8-d%htIutdZEoQ z6e&aRy$v9}H>uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-*v7XcU@@cH=}000C~Nkl>A(L@ zbPx(sJ*Sc>a_^7l*?jN-N^3!?%NUCV3Zu`k`IiYgo_bP{>MaTdfO9b!S7G4gSGoJ= z3uL$NpsA%pkm?}`uEwM^O)A6~@I1%xD~Bk2@&UQgJphDND@Yp^w@h`#*3#b7OXseq z*>Y-}%>HKusos*!WblBtVjDWA3AgQJ@WkhIjcliN>MucB-!W;KYSJ3*0Ig`ww$j~O zB52DJ>_15E^ig^rc>=Fo7NqrKTJ9E%@Q(YueHQ3w$gC{R+%zl{??T2;Gqt2>aW|Jm=$HPJoT zhu;!{N|JWLeN(y7~VDO(*j?Ch>H@hO)lm>hYYXmSDo6Lyg#ac$Q; zMM=#wW$lgMxF%R!T&3y~tc3*N&obYR?&SBOtxG@-Fmd{TQn#4B(fzF~!lL%k%8*Q7 z=Hl+X9P8*ppZt=!p296#W(m>?I$k!=xcM2T_wM6(-xg*+97Ff_*4mr3Bn_}TnVL&5 zNk9aUIAXw7Eem#m3kUWw*;V4w*kQW+ivSe#W $site['$sitelocation'], - '$banner' => $channel['channel_name'], - '$channel' => $channel['channel_address'], - '$avatar' => $channel['xchan_photo_s'], - )); - - return $o; - - } diff --git a/view/theme/plusfuture/schema/bluebasic.css b/view/theme/plusfuture/schema/bluebasic.css deleted file mode 100644 index 65df0eb..0000000 --- a/view/theme/plusfuture/schema/bluebasic.css +++ /dev/null @@ -1,563 +0,0 @@ -/** - * 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 deleted file mode 100644 index 50cce95..0000000 --- a/view/theme/plusfuture/schema/bluebasic.php +++ /dev/null @@ -1,3 +0,0 @@ - - -
- diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl deleted file mode 100644 index 48a53bb..0000000 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ /dev/null @@ -1,46 +0,0 @@ - - - - -
- - - -
- From 8cfa343088e7ea7e09b9ac389e9d7bd05ecc0907 Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 13:21:14 +0900 Subject: [PATCH 003/117] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E5=86=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/img/bluebasic_play.png | Bin 0 -> 3909 bytes view/theme/plusfuture/pdl/mod_admin.pdl | 10 + view/theme/plusfuture/pdl/mod_articles.pdl | 5 + view/theme/plusfuture/pdl/mod_channel.pdl | 17 + view/theme/plusfuture/pdl/mod_cloud.pdl | 13 + view/theme/plusfuture/pdl/mod_connections.pdl | 18 + view/theme/plusfuture/pdl/mod_connedit.pdl | 10 + view/theme/plusfuture/pdl/mod_directory.pdl | 18 + view/theme/plusfuture/pdl/mod_display.pdl | 16 + view/theme/plusfuture/pdl/mod_events.pdl | 14 + view/theme/plusfuture/pdl/mod_gallery.pdl | 14 + view/theme/plusfuture/pdl/mod_group.pdl | 9 + view/theme/plusfuture/pdl/mod_network.pdl | 21 + view/theme/plusfuture/pdl/mod_pdledit.pdl | 9 + view/theme/plusfuture/pdl/mod_photos.pdl | 14 + view/theme/plusfuture/pdl/mod_profile.pdl | 16 + view/theme/plusfuture/pdl/mod_pubstream.pdl | 19 + view/theme/plusfuture/pdl/mod_ratings.pdl | 13 + view/theme/plusfuture/pdl/mod_settings.pdl | 11 + .../plusfuture/pdl/mod_viewconnections.pdl | 13 + view/theme/plusfuture/pdl/mod_wiki.pdl | 14 + .../plusfuture/php/widget_userlogomenu.php | 16 + view/theme/plusfuture/schema/bluebasic.css | 563 ++++++++++++++++++ view/theme/plusfuture/schema/bluebasic.php | 3 + view/theme/plusfuture/tpl/oembed_video.tpl | 4 + view/theme/plusfuture/tpl/userlogomenu.tpl | 46 ++ 26 files changed, 906 insertions(+) create mode 100644 view/theme/plusfuture/img/bluebasic_play.png create mode 100644 view/theme/plusfuture/pdl/mod_admin.pdl create mode 100644 view/theme/plusfuture/pdl/mod_articles.pdl create mode 100644 view/theme/plusfuture/pdl/mod_channel.pdl create mode 100644 view/theme/plusfuture/pdl/mod_cloud.pdl create mode 100644 view/theme/plusfuture/pdl/mod_connections.pdl create mode 100644 view/theme/plusfuture/pdl/mod_connedit.pdl create mode 100644 view/theme/plusfuture/pdl/mod_directory.pdl create mode 100644 view/theme/plusfuture/pdl/mod_display.pdl create mode 100644 view/theme/plusfuture/pdl/mod_events.pdl create mode 100644 view/theme/plusfuture/pdl/mod_gallery.pdl create mode 100644 view/theme/plusfuture/pdl/mod_group.pdl create mode 100644 view/theme/plusfuture/pdl/mod_network.pdl create mode 100644 view/theme/plusfuture/pdl/mod_pdledit.pdl create mode 100644 view/theme/plusfuture/pdl/mod_photos.pdl create mode 100644 view/theme/plusfuture/pdl/mod_profile.pdl create mode 100644 view/theme/plusfuture/pdl/mod_pubstream.pdl create mode 100644 view/theme/plusfuture/pdl/mod_ratings.pdl create mode 100644 view/theme/plusfuture/pdl/mod_settings.pdl create mode 100644 view/theme/plusfuture/pdl/mod_viewconnections.pdl create mode 100644 view/theme/plusfuture/pdl/mod_wiki.pdl create mode 100644 view/theme/plusfuture/php/widget_userlogomenu.php create mode 100644 view/theme/plusfuture/schema/bluebasic.css create mode 100644 view/theme/plusfuture/schema/bluebasic.php create mode 100644 view/theme/plusfuture/tpl/oembed_video.tpl create mode 100644 view/theme/plusfuture/tpl/userlogomenu.tpl diff --git a/view/theme/plusfuture/img/bluebasic_play.png b/view/theme/plusfuture/img/bluebasic_play.png new file mode 100644 index 0000000000000000000000000000000000000000..7dad8d50888b855a0c9dd7cee46f4e8bb0da0117 GIT binary patch literal 3909 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 $site['$sitelocation'], + '$banner' => $channel['channel_name'], + '$channel' => $channel['channel_address'], + '$avatar' => $channel['xchan_photo_s'], + )); + + return $o; + + } 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 @@ + + +
+ diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl new file mode 100644 index 0000000..48a53bb --- /dev/null +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -0,0 +1,46 @@ + + + + +
+ + + +
+ From 1223708d331e45299a1ab0d7620cb2a3feab2213 Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 14:50:20 +0900 Subject: [PATCH 004/117] =?UTF-8?q?=E5=B7=A6=E3=83=A1=E3=83=8B=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=90=E3=83=83=E3=82=AF=E6=B6=88=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/css/style.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 65230d4..1d0b252 100644 --- a/view/theme/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 */ @@ -1850,6 +1850,11 @@ dl.bb-dl > dd > li { border-radius: 15% !important; } +#user_menu{ + background-color: #0000; + filter: none; +} + a[title*="harukin@plus.haruk.in"]{ color: rgb(170, 2, 2); } From c5b9a6a21510d6da7d1a6aa4c2f8f016f32791d2 Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 16:40:09 +0900 Subject: [PATCH 005/117] --- view/theme/plusfuture/css/style.css | 13 +++++++++++++ view/theme/plusfuture/tpl/userlogomenu.tpl | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 1d0b252..e43403f 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -1855,6 +1855,19 @@ dl.bb-dl > dd > li { filter: none; } +#user_menu > ul > li{ + font-size: 1.2em; +} + +#user_menu > ul > li > a > i{ + font-size: 140%; + margin: 0 20px 0px -20px; +} + + + + + a[title*="harukin@plus.haruk.in"]{ color: rgb(170, 2, 2); } diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 48a53bb..bcbc958 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -17,7 +17,7 @@ From 6595fcb0300b38bc3089e240ecea8cb34d35b4c5 Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 21:41:44 +0900 Subject: [PATCH 011/117] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E9=96=8B=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/pdl/mod_network.pdl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_network.pdl b/view/theme/plusfuture/pdl/mod_network.pdl index 2094a04..9362f58 100644 --- a/view/theme/plusfuture/pdl/mod_network.pdl +++ b/view/theme/plusfuture/pdl/mod_network.pdl @@ -1,9 +1,5 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=activity_order][/widget] -[widget=activity_filter][/widget] -[widget=savedsearch][/widget] -[widget=common_friends][/widget] [/region] [region=content] @@ -14,6 +10,10 @@ $content [region=right_aside] [widget=archive][var=wall]1[/var][/widget] [widget=notifications][/widget] +[widget=activity_order][/widget] +[widget=activity_filter][/widget] +[widget=savedsearch][/widget] +[widget=common_friends][/widget] [block]wetter[/block] From da6dbce4eca474d496e4bc18496ac2197fe81c79 Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 22:08:48 +0900 Subject: [PATCH 012/117] --- view/theme/plusfuture/css/style.css | 9 +++++++-- view/theme/plusfuture/pdl/mod_network.pdl | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index b1ebcf0..af72724 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -1858,11 +1858,16 @@ dl.bb-dl > dd > li { #user_menu > ul > li{ font-size: 1.2em; position: relative; - left: -20px; - margin-bottom: 4px; + left: -50px; + transition: all 300ms 0s; +} +#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%; diff --git a/view/theme/plusfuture/pdl/mod_network.pdl b/view/theme/plusfuture/pdl/mod_network.pdl index 9362f58..f1fe489 100644 --- a/view/theme/plusfuture/pdl/mod_network.pdl +++ b/view/theme/plusfuture/pdl/mod_network.pdl @@ -3,13 +3,13 @@ [/region] [region=content] -[widget=affinity][/widget] $content [/region] [region=right_aside] [widget=archive][var=wall]1[/var][/widget] [widget=notifications][/widget] +[widget=affinity][/widget] [widget=activity_order][/widget] [widget=activity_filter][/widget] [widget=savedsearch][/widget] From bb1ed4ba2435884a499ae805ccd311fbfd7b1e3a Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 15 Nov 2018 23:07:14 +0900 Subject: [PATCH 013/117] --- view/theme/plusfuture/css/style.css | 2 +- view/theme/plusfuture/tpl/userlogomenu.tpl | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index af72724..2e67313 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -1858,7 +1858,7 @@ dl.bb-dl > dd > li { #user_menu > ul > li{ font-size: 1.2em; position: relative; - left: -50px; + left: -40px; transition: all 300ms 0s; } #user_menu > ul > li:hover{ diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index a3bccd2..4a4cb19 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -49,6 +49,24 @@

お知らせ

+ +
  • + +

    設定

    +     +
    • + +
  • + +

    ヘルプ

    +     +
    • + +
  • + +

    利用規約

    +     +
    • From af48f00ab2fde01b80980c40c5a04febcd34e64b Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:35:30 +0900 Subject: [PATCH 014/117] =?UTF-8?q?Activityfilter=E3=81=AE=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plusfuture/php/widget_userlogomenu.php | 208 ++++++++++++++++++ view/theme/plusfuture/tpl/userlogomenu.tpl | 28 +++ 2 files changed, 236 insertions(+) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index e69788f..835dd74 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -1,4 +1,5 @@ $g['gname'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], + 'sel' => $group_active, + 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) + ]; + } + $tabs[] = [ + 'id' => 'privacy_groups', + 'label' => t('Privacy Groups'), + 'icon' => 'users', + 'url' => '#', + 'sel' => (($filter_active == 'group') ? true : false), + 'title' => t('Show my privacy groups'), + 'sub' => $gsub + + ]; + } + } + + if(feature_enabled(local_channel(),'forums_tab')) { + $forums = get_forum_channels(local_channel()); + + if($forums) { + foreach($forums as $f) { + if(x($_GET,'pf') && x($_GET,'cid')) { + $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); + $filter_active = 'forums'; + } + $fsub[] = [ + 'label' => $f['xchan_name'], + 'img' => $f['xchan_photo_s'], + 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), + 'sel' => $forum_active, + 'title' => t('Show posts to this forum'), + 'lock' => (($f['private_forum']) ? 'lock' : '') + ]; + } + + $tabs[] = [ + 'id' => 'forums', + 'label' => t('Forums'), + 'icon' => 'comments-o', + 'url' => '#', + 'sel' => (($filter_active == 'forums') ? true : false), + 'title' => t('Show forums'), + 'sub' => $fsub + + ]; + } + } + + if(feature_enabled(local_channel(),'star_posts')) { + if(x($_GET,'star')) { + $starred_active = (($_GET['star'] == 1) ? 'active' : ''); + $filter_active = 'star'; + } + + $tabs[] = [ + 'label' => t('Starred Posts'), + 'icon' => 'star', + 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', + 'sel'=>$starred_active, + 'title' => t('Show posts that I have starred') + ]; + } + + if(feature_enabled(local_channel(),'personal_tab')) { + if(x($_GET,'conv')) { + $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); + $filter_active = 'personal'; + } + + $tabs[] = [ + 'label' => t('Personal Posts'), + 'icon' => 'user-circle', + 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', + 'sel' => $conv_active, + 'title' => t('Show posts that mention or involve me') + ]; + } + + if(feature_enabled(local_channel(),'filing')) { + $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", + intval(local_channel()), + intval(TERM_FILE) + ); + + if($terms) { + foreach($terms as $t) { + if(x($_GET,'file')) { + $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); + $filter_active = 'file'; + } + $tsub[] = [ + 'label' => $t['term'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], + 'sel' => $file_active, + 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), + ]; + } + + $tabs[] = [ + 'id' => 'saved_folders', + 'label' => t('Saved Folders'), + 'icon' => 'folder', + 'url' => '#', + 'sel' => (($filter_active == 'file') ? true : false), + 'title' => t('Show filed post categories'), + 'sub' => $tsub + + ]; + } + } + + if(x($_GET,'search')) { + $filter_active = 'search'; + $tabs[] = [ + 'label' => t('Search'), + 'icon' => 'search', + 'url' => z_root() . '/' . $cmd . '/?f=&search=' . $_GET['search'], + 'sel' => 'active disabled', + 'title' => t('Panel search') + ]; + } + + $name = []; + if(feature_enabled(local_channel(),'name_tab')) { + if(x($_GET,'cid') && ! x($_GET,'pf')) { + $filter_active = 'name'; + } + $name = [ + 'label' => x($_GET,'name') ? $_GET['name'] : t('Filter by name'), + 'icon' => 'filter', + 'url'=> z_root() . '/' . $cmd . '/', + 'sel'=> $filter_active == 'name' ? 'is-valid' : '', + 'title' => '' + ]; + } + + $reset = []; + if($filter_active) { + $reset = [ + 'label' => '', + 'icon' => 'remove', + 'url'=> z_root() . '/' . $cmd, + 'sel'=> '', + 'title' => t('Remove active filter') + ]; + } + + $arr = ['tabs' => $tabs]; + + call_hooks('activity_filter', $arr); + + $o = ''; + + if($arr['tabs']) { + $content = replace_macros(get_markup_template('common_pills.tpl'), [ + '$pills' => $arr['tabs'] + ]); + + $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ + '$title' => t('Stream Filters'), + '$reset' => $reset, + '$content' => $content, + '$name' => $name + ]); + } + + return $o; + + } + + } + \ No newline at end of file diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 4a4cb19..85558bf 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,6 +67,34 @@

    利用規約

    + +
  • +

    + {{$title}} + {{if $reset}} + + + + {{/if}} +

    + {{$content}} + {{if $name}} +
    +
    +
    + + +
    +
    + + {{/if}} +
    + +
    • From 639694e2e948c32d661a8b0fd24ac39f189293db Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:36:57 +0900 Subject: [PATCH 015/117] =?UTF-8?q?=E3=82=84=E3=81=A3=E3=81=B1=E3=82=82?= =?UTF-8?q?=E3=81=A9=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plusfuture/php/widget_userlogomenu.php | 208 ------------------ view/theme/plusfuture/tpl/userlogomenu.tpl | 28 --- 2 files changed, 236 deletions(-) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index 835dd74..e69788f 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -1,5 +1,4 @@ $g['gname'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], - 'sel' => $group_active, - 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) - ]; - } - $tabs[] = [ - 'id' => 'privacy_groups', - 'label' => t('Privacy Groups'), - 'icon' => 'users', - 'url' => '#', - 'sel' => (($filter_active == 'group') ? true : false), - 'title' => t('Show my privacy groups'), - 'sub' => $gsub - - ]; - } - } - - if(feature_enabled(local_channel(),'forums_tab')) { - $forums = get_forum_channels(local_channel()); - - if($forums) { - foreach($forums as $f) { - if(x($_GET,'pf') && x($_GET,'cid')) { - $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); - $filter_active = 'forums'; - } - $fsub[] = [ - 'label' => $f['xchan_name'], - 'img' => $f['xchan_photo_s'], - 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), - 'sel' => $forum_active, - 'title' => t('Show posts to this forum'), - 'lock' => (($f['private_forum']) ? 'lock' : '') - ]; - } - - $tabs[] = [ - 'id' => 'forums', - 'label' => t('Forums'), - 'icon' => 'comments-o', - 'url' => '#', - 'sel' => (($filter_active == 'forums') ? true : false), - 'title' => t('Show forums'), - 'sub' => $fsub - - ]; - } - } - - if(feature_enabled(local_channel(),'star_posts')) { - if(x($_GET,'star')) { - $starred_active = (($_GET['star'] == 1) ? 'active' : ''); - $filter_active = 'star'; - } - - $tabs[] = [ - 'label' => t('Starred Posts'), - 'icon' => 'star', - 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', - 'sel'=>$starred_active, - 'title' => t('Show posts that I have starred') - ]; - } - - if(feature_enabled(local_channel(),'personal_tab')) { - if(x($_GET,'conv')) { - $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); - $filter_active = 'personal'; - } - - $tabs[] = [ - 'label' => t('Personal Posts'), - 'icon' => 'user-circle', - 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', - 'sel' => $conv_active, - 'title' => t('Show posts that mention or involve me') - ]; - } - - if(feature_enabled(local_channel(),'filing')) { - $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", - intval(local_channel()), - intval(TERM_FILE) - ); - - if($terms) { - foreach($terms as $t) { - if(x($_GET,'file')) { - $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); - $filter_active = 'file'; - } - $tsub[] = [ - 'label' => $t['term'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], - 'sel' => $file_active, - 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), - ]; - } - - $tabs[] = [ - 'id' => 'saved_folders', - 'label' => t('Saved Folders'), - 'icon' => 'folder', - 'url' => '#', - 'sel' => (($filter_active == 'file') ? true : false), - 'title' => t('Show filed post categories'), - 'sub' => $tsub - - ]; - } - } - - if(x($_GET,'search')) { - $filter_active = 'search'; - $tabs[] = [ - 'label' => t('Search'), - 'icon' => 'search', - 'url' => z_root() . '/' . $cmd . '/?f=&search=' . $_GET['search'], - 'sel' => 'active disabled', - 'title' => t('Panel search') - ]; - } - - $name = []; - if(feature_enabled(local_channel(),'name_tab')) { - if(x($_GET,'cid') && ! x($_GET,'pf')) { - $filter_active = 'name'; - } - $name = [ - 'label' => x($_GET,'name') ? $_GET['name'] : t('Filter by name'), - 'icon' => 'filter', - 'url'=> z_root() . '/' . $cmd . '/', - 'sel'=> $filter_active == 'name' ? 'is-valid' : '', - 'title' => '' - ]; - } - - $reset = []; - if($filter_active) { - $reset = [ - 'label' => '', - 'icon' => 'remove', - 'url'=> z_root() . '/' . $cmd, - 'sel'=> '', - 'title' => t('Remove active filter') - ]; - } - - $arr = ['tabs' => $tabs]; - - call_hooks('activity_filter', $arr); - - $o = ''; - - if($arr['tabs']) { - $content = replace_macros(get_markup_template('common_pills.tpl'), [ - '$pills' => $arr['tabs'] - ]); - - $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ - '$title' => t('Stream Filters'), - '$reset' => $reset, - '$content' => $content, - '$name' => $name - ]); - } - - return $o; - - } - - } - \ No newline at end of file diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 85558bf..4a4cb19 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,34 +67,6 @@

    利用規約

    - -
  • -

    - {{$title}} - {{if $reset}} - - - - {{/if}} -

    - {{$content}} - {{if $name}} -
    -
    -
    - - -
    -
    - - {{/if}} -
    - -
    • From 54846d59ee3d14dae210e3962e5ba9724b273ca0 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:40:25 +0900 Subject: [PATCH 016/117] --- .../plusfuture/php/widget_userlogomenu.php | 197 ++++++++++++++++++ 1 file changed, 197 insertions(+) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index e69788f..2f59ce3 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -14,3 +14,200 @@ function widget_userlogomenu($args) { return $o; } + function widget($arr) { + + if(! local_channel()) + return ''; + + $cmd = \App::$cmd; + $filter_active = false; + + $tabs = []; + + + if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) { + $groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval(local_channel()) + ); + + if($groups) { + foreach($groups as $g) { + if(x($_GET,'gid')) { + $group_active = (($_GET['gid'] == $g['id']) ? 'active' : ''); + $filter_active = 'group'; + } + $gsub[] = [ + 'label' => $g['gname'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], + 'sel' => $group_active, + 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) + ]; + } + $tabs[] = [ + 'id' => 'privacy_groups', + 'label' => t('Privacy Groups'), + 'icon' => 'users', + 'url' => '#', + 'sel' => (($filter_active == 'group') ? true : false), + 'title' => t('Show my privacy groups'), + 'sub' => $gsub + + ]; + } + } + + if(feature_enabled(local_channel(),'forums_tab')) { + $forums = get_forum_channels(local_channel()); + + if($forums) { + foreach($forums as $f) { + if(x($_GET,'pf') && x($_GET,'cid')) { + $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); + $filter_active = 'forums'; + } + $fsub[] = [ + 'label' => $f['xchan_name'], + 'img' => $f['xchan_photo_s'], + 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), + 'sel' => $forum_active, + 'title' => t('Show posts to this forum'), + 'lock' => (($f['private_forum']) ? 'lock' : '') + ]; + } + + $tabs[] = [ + 'id' => 'forums', + 'label' => t('Forums'), + 'icon' => 'comments-o', + 'url' => '#', + 'sel' => (($filter_active == 'forums') ? true : false), + 'title' => t('Show forums'), + 'sub' => $fsub + + ]; + } + } + + if(feature_enabled(local_channel(),'star_posts')) { + if(x($_GET,'star')) { + $starred_active = (($_GET['star'] == 1) ? 'active' : ''); + $filter_active = 'star'; + } + + $tabs[] = [ + 'label' => t('Starred Posts'), + 'icon' => 'star', + 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', + 'sel'=>$starred_active, + 'title' => t('Show posts that I have starred') + ]; + } + + if(feature_enabled(local_channel(),'personal_tab')) { + if(x($_GET,'conv')) { + $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); + $filter_active = 'personal'; + } + + $tabs[] = [ + 'label' => t('Personal Posts'), + 'icon' => 'user-circle', + 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', + 'sel' => $conv_active, + 'title' => t('Show posts that mention or involve me') + ]; + } + + if(feature_enabled(local_channel(),'filing')) { + $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", + intval(local_channel()), + intval(TERM_FILE) + ); + + if($terms) { + foreach($terms as $t) { + if(x($_GET,'file')) { + $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); + $filter_active = 'file'; + } + $tsub[] = [ + 'label' => $t['term'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], + 'sel' => $file_active, + 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), + ]; + } + + $tabs[] = [ + 'id' => 'saved_folders', + 'label' => t('Saved Folders'), + 'icon' => 'folder', + 'url' => '#', + 'sel' => (($filter_active == 'file') ? true : false), + 'title' => t('Show filed post categories'), + 'sub' => $tsub + + ]; + } + } + + if(x($_GET,'search')) { + $filter_active = 'search'; + $tabs[] = [ + 'label' => t('Search'), + 'icon' => 'search', + 'url' => z_root() . '/' . $cmd . '/?f=&search=' . $_GET['search'], + 'sel' => 'active disabled', + 'title' => t('Panel search') + ]; + } + + $name = []; + if(feature_enabled(local_channel(),'name_tab')) { + if(x($_GET,'cid') && ! x($_GET,'pf')) { + $filter_active = 'name'; + } + $name = [ + 'label' => x($_GET,'name') ? $_GET['name'] : t('Filter by name'), + 'icon' => 'filter', + 'url'=> z_root() . '/' . $cmd . '/', + 'sel'=> $filter_active == 'name' ? 'is-valid' : '', + 'title' => '' + ]; + } + + $reset = []; + if($filter_active) { + $reset = [ + 'label' => '', + 'icon' => 'remove', + 'url'=> z_root() . '/' . $cmd, + 'sel'=> '', + 'title' => t('Remove active filter') + ]; + } + + $arr = ['tabs' => $tabs]; + + call_hooks('activity_filter', $arr); + + $o = ''; + + if($arr['tabs']) { + $content = replace_macros(get_markup_template('common_pills.tpl'), [ + '$pills' => $arr['tabs'] + ]); + + $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ + '$title' => t('Stream Filters'), + '$reset' => $reset, + '$content' => $content, + '$name' => $name + ]); + } + + return $o; + + } \ No newline at end of file From ab5fa081385fe96f37b6a76197eac3b6f6213b31 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:43:15 +0900 Subject: [PATCH 017/117] --- view/theme/plusfuture/tpl/userlogomenu.tpl | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 4a4cb19..8037110 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,6 +67,32 @@

    利用規約

    +
    +

    + {{$title}} + {{if $reset}} + + + + {{/if}} +

    + {{$content}} + {{if $name}} +
    +
    +
    + + +
    +
    + + {{/if}} +
    + From 3bc07f803920a01ab48b38649077404a816d2375 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:44:57 +0900 Subject: [PATCH 018/117] --- view/theme/plusfuture/php/widget_userlogomenu.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index 2f59ce3..431c98f 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -1,5 +1,8 @@ Date: Fri, 16 Nov 2018 17:57:20 +0900 Subject: [PATCH 019/117] --- .../plusfuture/php/widget_userlogomenu.php | 37 ++++++++++++------- view/theme/plusfuture/tpl/userlogomenu.tpl | 12 +++--- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index 431c98f..6c1ef2c 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -3,21 +3,10 @@ namespace Zotlabs\Widget; use Zotlabs\Lib\Apps; -function widget_userlogomenu($args) { - $channel = channelx_by_n(\App::$profile_uid); +class widget_userlogomenu { - $o = replace_macros(get_markup_template('userlogomenu.tpl'), array( - '$sitelocation' => $site['$sitelocation'], - '$banner' => $channel['channel_name'], - '$channel' => $channel['channel_address'], - '$avatar' => $channel['xchan_photo_s'], - )); - - return $o; - - } - function widget($arr) { + function widget($arr) { if(! local_channel()) return ''; @@ -213,4 +202,24 @@ function widget_userlogomenu($args) { return $o; - } \ No newline at end of file + } +function widget_userlogomenu($args) { + + $channel = channelx_by_n(\App::$profile_uid); + + $o = replace_macros(get_markup_template('userlogomenu.tpl'), array( + '$sitelocation' => $site['$sitelocation'], + '$banner' => $channel['channel_name'], + '$channel' => $channel['channel_address'], + '$avatar' => $channel['xchan_photo_s'], + )); + + return $o; + + } + + + + + +} diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 8037110..06c8df0 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,7 +67,12 @@

    利用規約

    -
    + + +
    + + +

    {{$title}} {{if $reset}} @@ -92,8 +97,3 @@ {{/if}}

    - - - - - From 1230d19fc3ef8bbc59d0b132d82cc26f8e166981 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:58:21 +0900 Subject: [PATCH 020/117] --- view/theme/plusfuture/tpl/userlogomenu.tpl | 26 ---------------------- 1 file changed, 26 deletions(-) diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 06c8df0..4a4cb19 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -71,29 +71,3 @@ - -
    -

    - {{$title}} - {{if $reset}} - - - - {{/if}} -

    - {{$content}} - {{if $name}} -
    -
    -
    - - -
    -
    - - {{/if}} -
    From 382d32473517365961d1ac5e11cfe9570ca861e9 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:59:15 +0900 Subject: [PATCH 021/117] --- .../plusfuture/php/widget_userlogomenu.php | 15 ----------- view/theme/plusfuture/tpl/userlogomenu.tpl | 26 +++++++++++++++++++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index 6c1ef2c..410aaa8 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -203,21 +203,6 @@ class widget_userlogomenu { return $o; } -function widget_userlogomenu($args) { - - $channel = channelx_by_n(\App::$profile_uid); - - $o = replace_macros(get_markup_template('userlogomenu.tpl'), array( - '$sitelocation' => $site['$sitelocation'], - '$banner' => $channel['channel_name'], - '$channel' => $channel['channel_address'], - '$avatar' => $channel['xchan_photo_s'], - )); - - return $o; - - } - diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 4a4cb19..06c8df0 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -71,3 +71,29 @@ + +
    +

    + {{$title}} + {{if $reset}} + + + + {{/if}} +

    + {{$content}} + {{if $name}} +
    +
    +
    + + +
    +
    + + {{/if}} +
    From 2be10182b9bc54702f63b69880d29de0390323d7 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 17:59:43 +0900 Subject: [PATCH 022/117] --- .../plusfuture/php/widget_userlogomenu.php | 212 +----------------- 1 file changed, 9 insertions(+), 203 deletions(-) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index 410aaa8..e69788f 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -1,210 +1,16 @@ $site['$sitelocation'], + '$banner' => $channel['channel_name'], + '$channel' => $channel['channel_address'], + '$avatar' => $channel['xchan_photo_s'], + )); - function widget($arr) { - - if(! local_channel()) - return ''; - - $cmd = \App::$cmd; - $filter_active = false; - - $tabs = []; - - - if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) { - $groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", - intval(local_channel()) - ); - - if($groups) { - foreach($groups as $g) { - if(x($_GET,'gid')) { - $group_active = (($_GET['gid'] == $g['id']) ? 'active' : ''); - $filter_active = 'group'; - } - $gsub[] = [ - 'label' => $g['gname'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], - 'sel' => $group_active, - 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) - ]; - } - $tabs[] = [ - 'id' => 'privacy_groups', - 'label' => t('Privacy Groups'), - 'icon' => 'users', - 'url' => '#', - 'sel' => (($filter_active == 'group') ? true : false), - 'title' => t('Show my privacy groups'), - 'sub' => $gsub - - ]; - } - } - - if(feature_enabled(local_channel(),'forums_tab')) { - $forums = get_forum_channels(local_channel()); - - if($forums) { - foreach($forums as $f) { - if(x($_GET,'pf') && x($_GET,'cid')) { - $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); - $filter_active = 'forums'; - } - $fsub[] = [ - 'label' => $f['xchan_name'], - 'img' => $f['xchan_photo_s'], - 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), - 'sel' => $forum_active, - 'title' => t('Show posts to this forum'), - 'lock' => (($f['private_forum']) ? 'lock' : '') - ]; - } - - $tabs[] = [ - 'id' => 'forums', - 'label' => t('Forums'), - 'icon' => 'comments-o', - 'url' => '#', - 'sel' => (($filter_active == 'forums') ? true : false), - 'title' => t('Show forums'), - 'sub' => $fsub - - ]; - } - } - - if(feature_enabled(local_channel(),'star_posts')) { - if(x($_GET,'star')) { - $starred_active = (($_GET['star'] == 1) ? 'active' : ''); - $filter_active = 'star'; - } - - $tabs[] = [ - 'label' => t('Starred Posts'), - 'icon' => 'star', - 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', - 'sel'=>$starred_active, - 'title' => t('Show posts that I have starred') - ]; - } - - if(feature_enabled(local_channel(),'personal_tab')) { - if(x($_GET,'conv')) { - $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); - $filter_active = 'personal'; - } - - $tabs[] = [ - 'label' => t('Personal Posts'), - 'icon' => 'user-circle', - 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', - 'sel' => $conv_active, - 'title' => t('Show posts that mention or involve me') - ]; - } - - if(feature_enabled(local_channel(),'filing')) { - $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", - intval(local_channel()), - intval(TERM_FILE) - ); - - if($terms) { - foreach($terms as $t) { - if(x($_GET,'file')) { - $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); - $filter_active = 'file'; - } - $tsub[] = [ - 'label' => $t['term'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], - 'sel' => $file_active, - 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), - ]; - } - - $tabs[] = [ - 'id' => 'saved_folders', - 'label' => t('Saved Folders'), - 'icon' => 'folder', - 'url' => '#', - 'sel' => (($filter_active == 'file') ? true : false), - 'title' => t('Show filed post categories'), - 'sub' => $tsub - - ]; - } - } - - if(x($_GET,'search')) { - $filter_active = 'search'; - $tabs[] = [ - 'label' => t('Search'), - 'icon' => 'search', - 'url' => z_root() . '/' . $cmd . '/?f=&search=' . $_GET['search'], - 'sel' => 'active disabled', - 'title' => t('Panel search') - ]; - } - - $name = []; - if(feature_enabled(local_channel(),'name_tab')) { - if(x($_GET,'cid') && ! x($_GET,'pf')) { - $filter_active = 'name'; - } - $name = [ - 'label' => x($_GET,'name') ? $_GET['name'] : t('Filter by name'), - 'icon' => 'filter', - 'url'=> z_root() . '/' . $cmd . '/', - 'sel'=> $filter_active == 'name' ? 'is-valid' : '', - 'title' => '' - ]; - } - - $reset = []; - if($filter_active) { - $reset = [ - 'label' => '', - 'icon' => 'remove', - 'url'=> z_root() . '/' . $cmd, - 'sel'=> '', - 'title' => t('Remove active filter') - ]; - } - - $arr = ['tabs' => $tabs]; - - call_hooks('activity_filter', $arr); - - $o = ''; - - if($arr['tabs']) { - $content = replace_macros(get_markup_template('common_pills.tpl'), [ - '$pills' => $arr['tabs'] - ]); - - $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ - '$title' => t('Stream Filters'), - '$reset' => $reset, - '$content' => $content, - '$name' => $name - ]); - } - - return $o; + return $o; } - - - - -} From bee29c373fb243fa08b695f6fb2bbee346d2c03a Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 18:03:19 +0900 Subject: [PATCH 023/117] --- .../plusfuture/php/widget_userlogomenu.php | 206 ++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index e69788f..02d8e9e 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -14,3 +14,209 @@ function widget_userlogomenu($args) { return $o; } + +namespace Zotlabs\Widget; + +use Zotlabs\Lib\Apps; + +class Activity_filter { + + function widget($arr) { + + if(! local_channel()) + return ''; + + $cmd = \App::$cmd; + $filter_active = false; + + $tabs = []; + + + if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) { + $groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + intval(local_channel()) + ); + + if($groups) { + foreach($groups as $g) { + if(x($_GET,'gid')) { + $group_active = (($_GET['gid'] == $g['id']) ? 'active' : ''); + $filter_active = 'group'; + } + $gsub[] = [ + 'label' => $g['gname'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], + 'sel' => $group_active, + 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) + ]; + } + $tabs[] = [ + 'id' => 'privacy_groups', + 'label' => t('Privacy Groups'), + 'icon' => 'users', + 'url' => '#', + 'sel' => (($filter_active == 'group') ? true : false), + 'title' => t('Show my privacy groups'), + 'sub' => $gsub + + ]; + } + } + + if(feature_enabled(local_channel(),'forums_tab')) { + $forums = get_forum_channels(local_channel()); + + if($forums) { + foreach($forums as $f) { + if(x($_GET,'pf') && x($_GET,'cid')) { + $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); + $filter_active = 'forums'; + } + $fsub[] = [ + 'label' => $f['xchan_name'], + 'img' => $f['xchan_photo_s'], + 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), + 'sel' => $forum_active, + 'title' => t('Show posts to this forum'), + 'lock' => (($f['private_forum']) ? 'lock' : '') + ]; + } + + $tabs[] = [ + 'id' => 'forums', + 'label' => t('Forums'), + 'icon' => 'comments-o', + 'url' => '#', + 'sel' => (($filter_active == 'forums') ? true : false), + 'title' => t('Show forums'), + 'sub' => $fsub + + ]; + } + } + + if(feature_enabled(local_channel(),'star_posts')) { + if(x($_GET,'star')) { + $starred_active = (($_GET['star'] == 1) ? 'active' : ''); + $filter_active = 'star'; + } + + $tabs[] = [ + 'label' => t('Starred Posts'), + 'icon' => 'star', + 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', + 'sel'=>$starred_active, + 'title' => t('Show posts that I have starred') + ]; + } + + if(feature_enabled(local_channel(),'personal_tab')) { + if(x($_GET,'conv')) { + $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); + $filter_active = 'personal'; + } + + $tabs[] = [ + 'label' => t('Personal Posts'), + 'icon' => 'user-circle', + 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', + 'sel' => $conv_active, + 'title' => t('Show posts that mention or involve me') + ]; + } + + if(feature_enabled(local_channel(),'filing')) { + $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", + intval(local_channel()), + intval(TERM_FILE) + ); + + if($terms) { + foreach($terms as $t) { + if(x($_GET,'file')) { + $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); + $filter_active = 'file'; + } + $tsub[] = [ + 'label' => $t['term'], + 'icon' => '', + 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], + 'sel' => $file_active, + 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), + ]; + } + + $tabs[] = [ + 'id' => 'saved_folders', + 'label' => t('Saved Folders'), + 'icon' => 'folder', + 'url' => '#', + 'sel' => (($filter_active == 'file') ? true : false), + 'title' => t('Show filed post categories'), + 'sub' => $tsub + + ]; + } + } + + if(x($_GET,'search')) { + $filter_active = 'search'; + $tabs[] = [ + 'label' => t('Search'), + 'icon' => 'search', + 'url' => z_root() . '/' . $cmd . '/?f=&search=' . $_GET['search'], + 'sel' => 'active disabled', + 'title' => t('Panel search') + ]; + } + + $name = []; + if(feature_enabled(local_channel(),'name_tab')) { + if(x($_GET,'cid') && ! x($_GET,'pf')) { + $filter_active = 'name'; + } + $name = [ + 'label' => x($_GET,'name') ? $_GET['name'] : t('Filter by name'), + 'icon' => 'filter', + 'url'=> z_root() . '/' . $cmd . '/', + 'sel'=> $filter_active == 'name' ? 'is-valid' : '', + 'title' => '' + ]; + } + + $reset = []; + if($filter_active) { + $reset = [ + 'label' => '', + 'icon' => 'remove', + 'url'=> z_root() . '/' . $cmd, + 'sel'=> '', + 'title' => t('Remove active filter') + ]; + } + + $arr = ['tabs' => $tabs]; + + call_hooks('activity_filter', $arr); + + $o = ''; + + if($arr['tabs']) { + $content = replace_macros(get_markup_template('common_pills.tpl'), [ + '$pills' => $arr['tabs'] + ]); + + $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ + '$title' => t('Stream Filters'), + '$reset' => $reset, + '$content' => $content, + '$name' => $name + ]); + } + + return $o; + + } + +} From 9d1616f45c92d17bea345f7ce32c471462f78d33 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 18:03:49 +0900 Subject: [PATCH 024/117] --- .../plusfuture/php/widget_userlogomenu.php | 206 ------------------ 1 file changed, 206 deletions(-) diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php index 02d8e9e..e69788f 100644 --- a/view/theme/plusfuture/php/widget_userlogomenu.php +++ b/view/theme/plusfuture/php/widget_userlogomenu.php @@ -14,209 +14,3 @@ function widget_userlogomenu($args) { return $o; } - -namespace Zotlabs\Widget; - -use Zotlabs\Lib\Apps; - -class Activity_filter { - - function widget($arr) { - - if(! local_channel()) - return ''; - - $cmd = \App::$cmd; - $filter_active = false; - - $tabs = []; - - - if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) { - $groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", - intval(local_channel()) - ); - - if($groups) { - foreach($groups as $g) { - if(x($_GET,'gid')) { - $group_active = (($_GET['gid'] == $g['id']) ? 'active' : ''); - $filter_active = 'group'; - } - $gsub[] = [ - 'label' => $g['gname'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&gid=' . $g['id'], - 'sel' => $group_active, - 'title' => sprintf(t('Show posts related to the %s privacy group'), $g['gname']) - ]; - } - $tabs[] = [ - 'id' => 'privacy_groups', - 'label' => t('Privacy Groups'), - 'icon' => 'users', - 'url' => '#', - 'sel' => (($filter_active == 'group') ? true : false), - 'title' => t('Show my privacy groups'), - 'sub' => $gsub - - ]; - } - } - - if(feature_enabled(local_channel(),'forums_tab')) { - $forums = get_forum_channels(local_channel()); - - if($forums) { - foreach($forums as $f) { - if(x($_GET,'pf') && x($_GET,'cid')) { - $forum_active = ((x($_GET,'pf') && $_GET['cid'] == $f['abook_id']) ? 'active' : ''); - $filter_active = 'forums'; - } - $fsub[] = [ - 'label' => $f['xchan_name'], - 'img' => $f['xchan_photo_s'], - 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']), - 'sel' => $forum_active, - 'title' => t('Show posts to this forum'), - 'lock' => (($f['private_forum']) ? 'lock' : '') - ]; - } - - $tabs[] = [ - 'id' => 'forums', - 'label' => t('Forums'), - 'icon' => 'comments-o', - 'url' => '#', - 'sel' => (($filter_active == 'forums') ? true : false), - 'title' => t('Show forums'), - 'sub' => $fsub - - ]; - } - } - - if(feature_enabled(local_channel(),'star_posts')) { - if(x($_GET,'star')) { - $starred_active = (($_GET['star'] == 1) ? 'active' : ''); - $filter_active = 'star'; - } - - $tabs[] = [ - 'label' => t('Starred Posts'), - 'icon' => 'star', - 'url'=>z_root() . '/' . $cmd . '/?f=&star=1', - 'sel'=>$starred_active, - 'title' => t('Show posts that I have starred') - ]; - } - - if(feature_enabled(local_channel(),'personal_tab')) { - if(x($_GET,'conv')) { - $conv_active = (($_GET['conv'] == 1) ? 'active' : ''); - $filter_active = 'personal'; - } - - $tabs[] = [ - 'label' => t('Personal Posts'), - 'icon' => 'user-circle', - 'url' => z_root() . '/' . $cmd . '/?f=&conv=1', - 'sel' => $conv_active, - 'title' => t('Show posts that mention or involve me') - ]; - } - - if(feature_enabled(local_channel(),'filing')) { - $terms = q("select distinct term from term where uid = %d and ttype = %d order by term asc", - intval(local_channel()), - intval(TERM_FILE) - ); - - if($terms) { - foreach($terms as $t) { - if(x($_GET,'file')) { - $file_active = (($_GET['file'] == $t['term']) ? 'active' : ''); - $filter_active = 'file'; - } - $tsub[] = [ - 'label' => $t['term'], - 'icon' => '', - 'url' => z_root() . '/' . $cmd . '/?f=&file=' . $t['term'], - 'sel' => $file_active, - 'title' => sprintf(t('Show posts that I have filed to %s'), $t['term']), - ]; - } - - $tabs[] = [ - 'id' => 'saved_folders', - 'label' => t('Saved Folders'), - 'icon' => 'folder', - 'url' => '#', - 'sel' => (($filter_active == 'file') ? true : false), - 'title' => t('Show filed post categories'), - 'sub' => $tsub - - ]; - } - } - - if(x($_GET,'search')) { - $filter_active = 'search'; - $tabs[] = [ - 'label' => t('Search'), - 'icon' => 'search', - 'url' => z_root() . '/' . $cmd . '/?f=&search=' . $_GET['search'], - 'sel' => 'active disabled', - 'title' => t('Panel search') - ]; - } - - $name = []; - if(feature_enabled(local_channel(),'name_tab')) { - if(x($_GET,'cid') && ! x($_GET,'pf')) { - $filter_active = 'name'; - } - $name = [ - 'label' => x($_GET,'name') ? $_GET['name'] : t('Filter by name'), - 'icon' => 'filter', - 'url'=> z_root() . '/' . $cmd . '/', - 'sel'=> $filter_active == 'name' ? 'is-valid' : '', - 'title' => '' - ]; - } - - $reset = []; - if($filter_active) { - $reset = [ - 'label' => '', - 'icon' => 'remove', - 'url'=> z_root() . '/' . $cmd, - 'sel'=> '', - 'title' => t('Remove active filter') - ]; - } - - $arr = ['tabs' => $tabs]; - - call_hooks('activity_filter', $arr); - - $o = ''; - - if($arr['tabs']) { - $content = replace_macros(get_markup_template('common_pills.tpl'), [ - '$pills' => $arr['tabs'] - ]); - - $o .= replace_macros(get_markup_template('activity_filter_widget.tpl'), [ - '$title' => t('Stream Filters'), - '$reset' => $reset, - '$content' => $content, - '$name' => $name - ]); - } - - return $o; - - } - -} From 6706c8d9a981661a056475716358bff27f1613fb Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 18:05:53 +0900 Subject: [PATCH 025/117] =?UTF-8?q?=E5=86=8D=E5=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/tpl/userlogomenu.tpl | 26 ---------------------- 1 file changed, 26 deletions(-) diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 06c8df0..4a4cb19 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -71,29 +71,3 @@ - -
    -

    - {{$title}} - {{if $reset}} - - - - {{/if}} -

    - {{$content}} - {{if $name}} -
    -
    -
    - - -
    -
    - - {{/if}} -
    From bdcf81264dcad1aaf8da7851ab812ca1e6b46090 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 18:34:43 +0900 Subject: [PATCH 026/117] --- view/theme/plusfuture/pdl/mod_admin.pdl | 10 ---------- view/theme/plusfuture/pdl/mod_articles.pdl | 5 ----- view/theme/plusfuture/pdl/mod_cloud.pdl | 13 ------------- view/theme/plusfuture/pdl/mod_directory.pdl | 2 +- view/theme/plusfuture/pdl/mod_events.pdl | 14 -------------- view/theme/plusfuture/pdl/mod_gallery.pdl | 14 -------------- view/theme/plusfuture/pdl/mod_group.pdl | 1 - view/theme/plusfuture/pdl/mod_pdledit.pdl | 9 --------- view/theme/plusfuture/pdl/mod_photos.pdl | 14 -------------- view/theme/plusfuture/pdl/mod_profile.pdl | 6 +++--- view/theme/plusfuture/pdl/mod_settings.pdl | 11 ----------- view/theme/plusfuture/pdl/mod_viewconnections.pdl | 13 ------------- 12 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 view/theme/plusfuture/pdl/mod_admin.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_articles.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_cloud.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_events.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_gallery.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_pdledit.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_photos.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_settings.pdl delete mode 100644 view/theme/plusfuture/pdl/mod_viewconnections.pdl diff --git a/view/theme/plusfuture/pdl/mod_admin.pdl b/view/theme/plusfuture/pdl/mod_admin.pdl deleted file mode 100644 index cf56aad..0000000 --- a/view/theme/plusfuture/pdl/mod_admin.pdl +++ /dev/null @@ -1,10 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[widget=admin][/widget] -[/region] -[region=right_aside] -[widget=settings_menu][/widget] -[widget=design_tools][/widget] -[widget=notifications][/widget] -[widget=newmember][/widget] -[/region] diff --git a/view/theme/plusfuture/pdl/mod_articles.pdl b/view/theme/plusfuture/pdl/mod_articles.pdl deleted file mode 100644 index 952ec81..0000000 --- a/view/theme/plusfuture/pdl/mod_articles.pdl +++ /dev/null @@ -1,5 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[widget=categories][var=articles]1[/var][/widget] -[widget=notifications][/widget] -[/region] diff --git a/view/theme/plusfuture/pdl/mod_cloud.pdl b/view/theme/plusfuture/pdl/mod_cloud.pdl deleted file mode 100644 index adbf04a..0000000 --- a/view/theme/plusfuture/pdl/mod_cloud.pdl +++ /dev/null @@ -1,13 +0,0 @@ -[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_directory.pdl b/view/theme/plusfuture/pdl/mod_directory.pdl index d3004e3..1e3f828 100644 --- a/view/theme/plusfuture/pdl/mod_directory.pdl +++ b/view/theme/plusfuture/pdl/mod_directory.pdl @@ -5,7 +5,6 @@ [widget=dirsort][/widget] [widget=dirsafe][/widget] [widget=dirtags][/widget] -[widget=notifications][/widget] [/region] [region=content] @@ -15,4 +14,5 @@ $content [region=right_aside] [widget=findpeople][/widget] [widget=suggestions][/widget] +[widget=notifications][/widget] [/region] diff --git a/view/theme/plusfuture/pdl/mod_events.pdl b/view/theme/plusfuture/pdl/mod_events.pdl deleted file mode 100644 index 50842a0..0000000 --- a/view/theme/plusfuture/pdl/mod_events.pdl +++ /dev/null @@ -1,14 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[widget=eventsmenu][/widget] -[widget=eventstools][/widget] -[widget=notifications][/widget] -[/region] - -[region=content] -$content -[/region] - -[region=right_aside] -[widget=tasklist][/widget] -[/region] diff --git a/view/theme/plusfuture/pdl/mod_gallery.pdl b/view/theme/plusfuture/pdl/mod_gallery.pdl deleted file mode 100644 index cb0c015..0000000 --- a/view/theme/plusfuture/pdl/mod_gallery.pdl +++ /dev/null @@ -1,14 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[widget=photo_albums][/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_group.pdl b/view/theme/plusfuture/pdl/mod_group.pdl index 42d5e32..8735916 100644 --- a/view/theme/plusfuture/pdl/mod_group.pdl +++ b/view/theme/plusfuture/pdl/mod_group.pdl @@ -1,6 +1,5 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=follow][/widget] [widget=collections][var=mode]groups[/var][/widget] [/region] [region=right_aside] diff --git a/view/theme/plusfuture/pdl/mod_pdledit.pdl b/view/theme/plusfuture/pdl/mod_pdledit.pdl deleted file mode 100644 index facbe88..0000000 --- a/view/theme/plusfuture/pdl/mod_pdledit.pdl +++ /dev/null @@ -1,9 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[/region] -[region=right_aside] -[widget=notifications][/widget] -[widget=newmember][/widget] -[/region] - - diff --git a/view/theme/plusfuture/pdl/mod_photos.pdl b/view/theme/plusfuture/pdl/mod_photos.pdl deleted file mode 100644 index cb0c015..0000000 --- a/view/theme/plusfuture/pdl/mod_photos.pdl +++ /dev/null @@ -1,14 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[widget=photo_albums][/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_profile.pdl b/view/theme/plusfuture/pdl/mod_profile.pdl index de12fc1..0598e1a 100644 --- a/view/theme/plusfuture/pdl/mod_profile.pdl +++ b/view/theme/plusfuture/pdl/mod_profile.pdl @@ -1,8 +1,5 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=photo_albums][/widget] -[widget=notifications][/widget] -[widget=contact-block][/widget] [/region] [region=content] @@ -11,6 +8,9 @@ $content [/region] [region=right_aside] +[widget=photo_albums][/widget] +[widget=notifications][/widget] +[widget=contact-block][/widget] [menu]other_channels[/menu] [menu]roll[/menu] [/region] diff --git a/view/theme/plusfuture/pdl/mod_settings.pdl b/view/theme/plusfuture/pdl/mod_settings.pdl deleted file mode 100644 index c5f2da3..0000000 --- a/view/theme/plusfuture/pdl/mod_settings.pdl +++ /dev/null @@ -1,11 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[widget=settings_menu][/widget] -[widget=design_tools][/widget] -[/region] - -[region=right_aside] -[widget=design_tools][/widget] -[widget=notifications][/widget] -[widget=newmember][/widget] -[/region] diff --git a/view/theme/plusfuture/pdl/mod_viewconnections.pdl b/view/theme/plusfuture/pdl/mod_viewconnections.pdl deleted file mode 100644 index adbf04a..0000000 --- a/view/theme/plusfuture/pdl/mod_viewconnections.pdl +++ /dev/null @@ -1,13 +0,0 @@ -[region=aside] -[widget=userlogomenu][/widget] -[widget=notifications][/widget] -[/region] - -[region=content] -[widget=zcard][/widget] -$content -[/region] - -[region=right_aside] -[widget=suggestions][/widget] -[/region] From b5ce40b7b4f8182977ec6150d490c0c23a70b4fb Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 18:37:34 +0900 Subject: [PATCH 027/117] --- view/theme/plusfuture/pdl/mod_connections.pdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/pdl/mod_connections.pdl b/view/theme/plusfuture/pdl/mod_connections.pdl index 4238f51..7f3cd95 100644 --- a/view/theme/plusfuture/pdl/mod_connections.pdl +++ b/view/theme/plusfuture/pdl/mod_connections.pdl @@ -4,7 +4,6 @@ [widget=userlogomenu][/widget] [widget=follow][/widget] [widget=collections][var=mode]groups[/var][/widget] -[widget=notifications][/widget] [/region] [region=content] @@ -15,4 +14,5 @@ $content [widget=findpeople][/widget] [widget=suggestions][/widget] +[widget=notifications][/widget] [/region] From 2728ce9b00472a5dbd34a68a8c28e699d5e06f6d Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 18:49:39 +0900 Subject: [PATCH 028/117] --- view/theme/plusfuture/pdl/mod_network.pdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/pdl/mod_network.pdl b/view/theme/plusfuture/pdl/mod_network.pdl index f1fe489..a11e2b5 100644 --- a/view/theme/plusfuture/pdl/mod_network.pdl +++ b/view/theme/plusfuture/pdl/mod_network.pdl @@ -7,8 +7,8 @@ $content [/region] [region=right_aside] -[widget=archive][var=wall]1[/var][/widget] [widget=notifications][/widget] +[widget=archive][var=wall]1[/var][/widget] [widget=affinity][/widget] [widget=activity_order][/widget] [widget=activity_filter][/widget] From 46cc844883b900d5e4efc74fa271141ab98e52ec Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 18:59:20 +0900 Subject: [PATCH 029/117] --- view/theme/plusfuture/pdl/mod_channel.pdl | 3 +-- view/theme/plusfuture/pdl/mod_network.pdl | 7 +------ view/theme/plusfuture/pdl/mod_pubstream.pdl | 9 ++------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_channel.pdl b/view/theme/plusfuture/pdl/mod_channel.pdl index 3e0a319..6cb6e25 100644 --- a/view/theme/plusfuture/pdl/mod_channel.pdl +++ b/view/theme/plusfuture/pdl/mod_channel.pdl @@ -10,8 +10,7 @@ $content [/region] [region=right_aside] +[widget=notifications][/widget] [widget=archive][var=wall]1[/var][/widget] [menu]other_channels[/menu] -[menu]roll[/menu] -[widget=notifications][/widget] [/region] diff --git a/view/theme/plusfuture/pdl/mod_network.pdl b/view/theme/plusfuture/pdl/mod_network.pdl index a11e2b5..a9df4ad 100644 --- a/view/theme/plusfuture/pdl/mod_network.pdl +++ b/view/theme/plusfuture/pdl/mod_network.pdl @@ -8,14 +8,9 @@ $content [region=right_aside] [widget=notifications][/widget] -[widget=archive][var=wall]1[/var][/widget] [widget=affinity][/widget] [widget=activity_order][/widget] [widget=activity_filter][/widget] -[widget=savedsearch][/widget] +[widget=archive][var=wall]1[/var][/widget] [widget=common_friends][/widget] -[block]wetter[/block] - - -[widget=forums][/widget] [/region] diff --git a/view/theme/plusfuture/pdl/mod_pubstream.pdl b/view/theme/plusfuture/pdl/mod_pubstream.pdl index b39b288..da195fe 100644 --- a/view/theme/plusfuture/pdl/mod_pubstream.pdl +++ b/view/theme/plusfuture/pdl/mod_pubstream.pdl @@ -1,11 +1,5 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget] -[widget=activity_order][/widget] -[widget=activity_filter][/widget] -[widget=savedsearch][/widget] -[widget=forums][/widget] -[widget=common_friends][/widget] [/region] [region=content] @@ -14,6 +8,7 @@ $content [/region] [region=right_aside] -[widget=archive][var=wall]1[/var][/widget] [widget=notifications][/widget] +[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget] +[widget=archive][var=wall]1[/var][/widget] [/region] From 1471866d7cff4b8bb06fa69c6732d5db5a5dc40f Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 19:04:06 +0900 Subject: [PATCH 030/117] --- view/theme/plusfuture/pdl/mod_display.pdl | 3 --- 1 file changed, 3 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_display.pdl b/view/theme/plusfuture/pdl/mod_display.pdl index 485b549..a953859 100644 --- a/view/theme/plusfuture/pdl/mod_display.pdl +++ b/view/theme/plusfuture/pdl/mod_display.pdl @@ -2,8 +2,6 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=forums][/widget] -[widget=common_friends][/widget] [/region] [region=content] @@ -11,6 +9,5 @@ $content [/region] [region=right_aside] -[widget=archive][var=wall]1[/var][/widget] [widget=notifications][/widget] [/region] From 53f3586643646f074fffe1adaeaf9429c48e0749 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 20:07:05 +0900 Subject: [PATCH 031/117] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=81=AE=E4=BD=8E?= =?UTF-8?q?=E8=A7=A3=E5=83=8F=E5=BA=A6=E8=A1=A8=E7=A4=BA=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 2e67313..c243980 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -204,6 +204,7 @@ nav { top: 3.35rem; left: 0px; width: 100%; + max-height: 80vh; background: $comment_item_colour; padding: 1rem; border-bottom: #ccc 1px solid; From ac46fefaa3b9315fd6b28e6c2e1baf3fef724086 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 20:43:55 +0900 Subject: [PATCH 032/117] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=83=9C=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E5=8B=95=E4=BD=9C=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/js/plusfuture.js | 69 ++++++++++++++++---------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 7fa32a0..63d765e 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -2,22 +2,22 @@ * 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', @@ -27,16 +27,16 @@ $(document).ready(function() { $('#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(); } }); 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 +45,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 +76,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 +84,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 +110,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(); @@ -126,4 +126,21 @@ function toggleAside() { spacer: '#left_aside_spacer' }); } + $('#notifications-btn-1'); + if ($('main').hasClass('region_3-on')) { + $('html, body').css('overflow-x', ''); + $('main').removeClass('region_3-on') + $('#overlay').remove(); + $('#right_aside_wrapper').trigger("sticky_kit:detach"); + } + else { + $('html, body').css('overflow-x', 'hidden'); + $('main').addClass('region_3-on') + $('
    ').appendTo('section'); + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + 10, + parent: '#region_3', + spacer: '#right_aside_spacer' + }); + } } From b9cf2f343399a39ca4b306299b37a741c8a93116 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 20:59:16 +0900 Subject: [PATCH 033/117] --- view/theme/plusfuture/js/plusfuture.js | 17 -- .../plusfuture/tpl/notifications_widget.tpl | 193 ++++++++++++++++++ 2 files changed, 193 insertions(+), 17 deletions(-) create mode 100644 view/theme/plusfuture/tpl/notifications_widget.tpl diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 63d765e..8ed8131 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -126,21 +126,4 @@ function toggleAside() { spacer: '#left_aside_spacer' }); } - $('#notifications-btn-1'); - if ($('main').hasClass('region_3-on')) { - $('html, body').css('overflow-x', ''); - $('main').removeClass('region_3-on') - $('#overlay').remove(); - $('#right_aside_wrapper').trigger("sticky_kit:detach"); - } - else { - $('html, body').css('overflow-x', 'hidden'); - $('main').addClass('region_3-on') - $('
    ').appendTo('section'); - $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) + 10, - parent: '#region_3', - spacer: '#right_aside_spacer' - }); - } } diff --git a/view/theme/plusfuture/tpl/notifications_widget.tpl b/view/theme/plusfuture/tpl/notifications_widget.tpl new file mode 100644 index 0000000..bd00bc8 --- /dev/null +++ b/view/theme/plusfuture/tpl/notifications_widget.tpl @@ -0,0 +1,193 @@ +{{if $notifications}} + + +
    +
    + {{$no_notifications}}... +
    + + + +
    +{{/if}} From 06a382af59551bf81c49def2f888a06d49db44c7 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 22:07:17 +0900 Subject: [PATCH 034/117] --- view/theme/plusfuture/js/plusfuture.js | 27 +++++++++++++++++++ .../plusfuture/tpl/notifications_widget.tpl | 19 +------------ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 8ed8131..7c3f304 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -33,6 +33,12 @@ $(document).ready(function () { } }); + $('section').on('click', function () { + if ($('main').hasClass('region_3-on')) { + toggleBside(); + } + }); + var left_aside_height = $('#left_aside_wrapper').height(); $('#left_aside_wrapper').on('click', function () { @@ -127,3 +133,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/tpl/notifications_widget.tpl b/view/theme/plusfuture/tpl/notifications_widget.tpl index bd00bc8..6843fe1 100644 --- a/view/theme/plusfuture/tpl/notifications_widget.tpl +++ b/view/theme/plusfuture/tpl/notifications_widget.tpl @@ -5,24 +5,7 @@ $(document).ready(function() { notifications_parent = $('#notifications_wrapper')[0].parentElement.id; $('.notifications-btn').click(function() { - - $('#notifications-btn-1'); - if ($('main').hasClass('region_3-on')) { - $('html, body').css('overflow-x', ''); - $('main').removeClass('region_3-on') - $('#overlay').remove(); - $('#right_aside_wrapper').trigger("sticky_kit:detach"); - } - else { - $('html, body').css('overflow-x', 'hidden'); - $('main').addClass('region_3-on') - $('
    ').appendTo('section'); - $('#right_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) + 10, - parent: '#region_3', - spacer: '#right_aside_spacer' - }); - } + toggleBside(); }); window.onpopstate = function(e) { From f57826ec91cd9f888c423ad664fd9f8e77b773b7 Mon Sep 17 00:00:00 2001 From: harukin Date: Fri, 16 Nov 2018 22:10:33 +0900 Subject: [PATCH 035/117] --- view/theme/plusfuture/js/plusfuture.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 7c3f304..a9afd20 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -138,14 +138,14 @@ function toggleBside() { if ($('main').hasClass('region_3-on')) { $('html, body').css('overflow-x', ''); $('main').removeClass('region_3-on') - $('region_3').addClass('d-none') + $('#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') + $('#region_3').removeClass('d-none') $('
    ').appendTo('section'); $('#right_aside_wrapper').stick_in_parent({ offset_top: $('nav').outerHeight(true) + 10, From 8d3d7f9cc9f39d9b6530a7f08c62ef571c856259 Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 17:26:02 +0900 Subject: [PATCH 036/117] --- view/theme/plusfuture/js/plusfuture.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index a9afd20..a164b0a 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -144,6 +144,10 @@ function toggleBside() { } else { $('html, body').css('overflow-x', 'hidden'); + $('main').css('left', '-576px'); + $('main').css('width', 'calc( 100% + 288px + 288px )'); + + $('main').addClass('region_3-on') $('#region_3').removeClass('d-none') $('
    ').appendTo('section'); From 1c8e82e9d9a93cc82f537f8285585236b239350c Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 17:28:25 +0900 Subject: [PATCH 037/117] --- view/theme/plusfuture/js/plusfuture.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index a164b0a..688089a 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -137,6 +137,8 @@ function toggleAside() { function toggleBside() { if ($('main').hasClass('region_3-on')) { $('html, body').css('overflow-x', ''); + $('main').css('left', '-288px'); + $('main').css('width', 'calc( 100% + 288px )'); $('main').removeClass('region_3-on') $('#region_3').addClass('d-none') $('#overlay').remove(); From f0d479e0ab8313a1a0a1aa0875c954af36fb74f1 Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 17:38:08 +0900 Subject: [PATCH 038/117] --- view/theme/plusfuture/js/plusfuture.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 688089a..fbdc584 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -137,8 +137,8 @@ function toggleAside() { function toggleBside() { if ($('main').hasClass('region_3-on')) { $('html, body').css('overflow-x', ''); - $('main').css('left', '-288px'); - $('main').css('width', 'calc( 100% + 288px )'); + $('main').css('left', ''); + $('main').css('width', ''); $('main').removeClass('region_3-on') $('#region_3').addClass('d-none') $('#overlay').remove(); @@ -148,8 +148,6 @@ function toggleBside() { $('html, body').css('overflow-x', 'hidden'); $('main').css('left', '-576px'); $('main').css('width', 'calc( 100% + 288px + 288px )'); - - $('main').addClass('region_3-on') $('#region_3').removeClass('d-none') $('
    ').appendTo('section'); From 8a86c132730243fa70430b47fa66001e2b1adb72 Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 21:18:43 +0900 Subject: [PATCH 039/117] --- view/theme/plusfuture/pdl/mod_directory.pdl | 10 +++++----- view/theme/plusfuture/pdl/mod_group.pdl | 3 +-- view/theme/plusfuture/pdl/mod_profile.pdl | 4 +++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_directory.pdl b/view/theme/plusfuture/pdl/mod_directory.pdl index 1e3f828..0b9738c 100644 --- a/view/theme/plusfuture/pdl/mod_directory.pdl +++ b/view/theme/plusfuture/pdl/mod_directory.pdl @@ -2,9 +2,6 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=dirsort][/widget] -[widget=dirsafe][/widget] -[widget=dirtags][/widget] [/region] [region=content] @@ -12,7 +9,10 @@ $content [/region] [region=right_aside] -[widget=findpeople][/widget] -[widget=suggestions][/widget] [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_group.pdl b/view/theme/plusfuture/pdl/mod_group.pdl index 8735916..13494a0 100644 --- a/view/theme/plusfuture/pdl/mod_group.pdl +++ b/view/theme/plusfuture/pdl/mod_group.pdl @@ -1,8 +1,7 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=collections][var=mode]groups[/var][/widget] [/region] [region=right_aside] [widget=notifications][/widget] -[widget=newmember][/widget] +[widget=collections][var=mode]groups[/var][/widget] [/region] diff --git a/view/theme/plusfuture/pdl/mod_profile.pdl b/view/theme/plusfuture/pdl/mod_profile.pdl index 0598e1a..47934b5 100644 --- a/view/theme/plusfuture/pdl/mod_profile.pdl +++ b/view/theme/plusfuture/pdl/mod_profile.pdl @@ -10,7 +10,9 @@ $content [region=right_aside] [widget=photo_albums][/widget] [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] -[menu]other_channels[/menu] [menu]roll[/menu] [/region] From 6564e78ed9ae0db8ea5dc03645304c095737d005 Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 21:25:28 +0900 Subject: [PATCH 040/117] --- view/theme/plusfuture/pdl/mod_channel.pdl | 4 +++- view/theme/plusfuture/pdl/mod_profile.pdl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_channel.pdl b/view/theme/plusfuture/pdl/mod_channel.pdl index 6cb6e25..675f43c 100644 --- a/view/theme/plusfuture/pdl/mod_channel.pdl +++ b/view/theme/plusfuture/pdl/mod_channel.pdl @@ -12,5 +12,7 @@ $content [region=right_aside] [widget=notifications][/widget] [widget=archive][var=wall]1[/var][/widget] -[menu]other_channels[/menu] +[widget=collections][var=mode]groups[/var][/widget] +[widget=collections][var=mode]forums[/var][/widget] +[widget=collections][var=mode]folder[/var][/widget] [/region] diff --git a/view/theme/plusfuture/pdl/mod_profile.pdl b/view/theme/plusfuture/pdl/mod_profile.pdl index 47934b5..ba9a7a9 100644 --- a/view/theme/plusfuture/pdl/mod_profile.pdl +++ b/view/theme/plusfuture/pdl/mod_profile.pdl @@ -8,11 +8,11 @@ $content [/region] [region=right_aside] -[widget=photo_albums][/widget] [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] From 8b6577deea4cae2d30f23188447b0b3339fd8599 Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 21:34:26 +0900 Subject: [PATCH 041/117] --- view/theme/plusfuture/pdl/mod_channel.pdl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_channel.pdl b/view/theme/plusfuture/pdl/mod_channel.pdl index 675f43c..3e07a09 100644 --- a/view/theme/plusfuture/pdl/mod_channel.pdl +++ b/view/theme/plusfuture/pdl/mod_channel.pdl @@ -12,7 +12,5 @@ $content [region=right_aside] [widget=notifications][/widget] [widget=archive][var=wall]1[/var][/widget] -[widget=collections][var=mode]groups[/var][/widget] -[widget=collections][var=mode]forums[/var][/widget] -[widget=collections][var=mode]folder[/var][/widget] +[widget=shortprofile][/widget] [/region] From 04bb726142aab092892b5a4cd006e9b1d27bd129 Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 21:36:04 +0900 Subject: [PATCH 042/117] --- view/theme/plusfuture/pdl/mod_channel.pdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/pdl/mod_channel.pdl b/view/theme/plusfuture/pdl/mod_channel.pdl index 3e07a09..0514a95 100644 --- a/view/theme/plusfuture/pdl/mod_channel.pdl +++ b/view/theme/plusfuture/pdl/mod_channel.pdl @@ -10,7 +10,7 @@ $content [/region] [region=right_aside] +[widget=shortprofile][/widget] [widget=notifications][/widget] [widget=archive][var=wall]1[/var][/widget] -[widget=shortprofile][/widget] [/region] From 4c7609802b6a1ba18b73189ec6eea3d0b150ac3c Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 22:47:00 +0900 Subject: [PATCH 043/117] --- view/theme/plusfuture/pdl/mod_admin.pdl | 7 +++++++ view/theme/plusfuture/pdl/mod_channel.pdl | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 view/theme/plusfuture/pdl/mod_admin.pdl 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 index 0514a95..3dc5530 100644 --- a/view/theme/plusfuture/pdl/mod_channel.pdl +++ b/view/theme/plusfuture/pdl/mod_channel.pdl @@ -5,12 +5,11 @@ [region=content] [widget=zcard][/widget] - $content [/region] [region=right_aside] -[widget=shortprofile][/widget] [widget=notifications][/widget] +[widget=shortprofile][/widget] [widget=archive][var=wall]1[/var][/widget] [/region] From 33466199345be2688f2a0f049b4a58fc7346f61a Mon Sep 17 00:00:00 2001 From: harukin Date: Sun, 18 Nov 2018 23:09:01 +0900 Subject: [PATCH 044/117] --- view/theme/plusfuture/pdl/mod_mail.pdl | 9 +++++++++ view/theme/plusfuture/pdl/mod_photos.pdl | 9 +++++++++ view/theme/plusfuture/pdl/mod_settings.pdl | 7 +++++++ 3 files changed, 25 insertions(+) create mode 100644 view/theme/plusfuture/pdl/mod_mail.pdl create mode 100644 view/theme/plusfuture/pdl/mod_photos.pdl create mode 100644 view/theme/plusfuture/pdl/mod_settings.pdl 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_photos.pdl b/view/theme/plusfuture/pdl/mod_photos.pdl new file mode 100644 index 0000000..38d7675 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_photos.pdl @@ -0,0 +1,9 @@ +[region=aside] +[widget=vcard][/widget] +[widget=photo_albums][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=photo_albums][/widget] +[widget=newmember][/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] From 01df08a132d839cfb7688459ab8cf7461a6fa8d1 Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 10:51:02 +0900 Subject: [PATCH 045/117] --- view/theme/plusfuture/css/style.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index c243980..c7f11d7 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2056,4 +2056,10 @@ 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: 10px; + content: ""; + display: block; } \ No newline at end of file From 8a09ae90b398b9b0d5fdbf413aa0d9e31ddf188b Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 10:57:09 +0900 Subject: [PATCH 046/117] --- view/theme/plusfuture/css/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index c7f11d7..27aff8e 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2059,7 +2059,11 @@ a[title*="pawoo.net"]::after{ } .shared_container::after{ - height: 10px; + height: 20px; content: ""; display: block; +} +.shared_container > div{ + margin-left: 20px; + margin-right: 20px; } \ No newline at end of file From 8df6b2e05aa806e4cb6660d0002abf2355369fce Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 11:17:54 +0900 Subject: [PATCH 047/117] --- view/theme/plusfuture/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 27aff8e..5dbf959 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2042,7 +2042,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; } From b540658a64a687e3f84fdcac3e07d4347bd8de3c Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 11:20:54 +0900 Subject: [PATCH 048/117] --- view/theme/plusfuture/pdl/mod_photos.pdl | 2 +- view/theme/plusfuture/pdl/mod_rpost.pdl | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 view/theme/plusfuture/pdl/mod_rpost.pdl diff --git a/view/theme/plusfuture/pdl/mod_photos.pdl b/view/theme/plusfuture/pdl/mod_photos.pdl index 38d7675..6a5705b 100644 --- a/view/theme/plusfuture/pdl/mod_photos.pdl +++ b/view/theme/plusfuture/pdl/mod_photos.pdl @@ -1,6 +1,6 @@ [region=aside] [widget=vcard][/widget] -[widget=photo_albums][/widget] +[widget=userlogomenu][/widget] [/region] [region=right_aside] [widget=notifications][/widget] diff --git a/view/theme/plusfuture/pdl/mod_rpost.pdl b/view/theme/plusfuture/pdl/mod_rpost.pdl new file mode 100644 index 0000000..38d7675 --- /dev/null +++ b/view/theme/plusfuture/pdl/mod_rpost.pdl @@ -0,0 +1,9 @@ +[region=aside] +[widget=vcard][/widget] +[widget=photo_albums][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=photo_albums][/widget] +[widget=newmember][/widget] +[/region] From 2fd2b61dccb1492c6685b6471b9b02bdfadea496 Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 11:23:07 +0900 Subject: [PATCH 049/117] --- view/theme/plusfuture/pdl/mod_rpost.pdl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_rpost.pdl b/view/theme/plusfuture/pdl/mod_rpost.pdl index 38d7675..7080d59 100644 --- a/view/theme/plusfuture/pdl/mod_rpost.pdl +++ b/view/theme/plusfuture/pdl/mod_rpost.pdl @@ -1,9 +1,6 @@ [region=aside] -[widget=vcard][/widget] -[widget=photo_albums][/widget] +[widget=userlogomenu][/widget] [/region] [region=right_aside] [widget=notifications][/widget] -[widget=photo_albums][/widget] -[widget=newmember][/widget] [/region] From f2d805135b9f50d175f4276f4b154a8e5ec8ebc4 Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 11:24:50 +0900 Subject: [PATCH 050/117] --- view/theme/plusfuture/pdl/mod_connedit.pdl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/plusfuture/pdl/mod_connedit.pdl b/view/theme/plusfuture/pdl/mod_connedit.pdl index 73875db..3e545e3 100644 --- a/view/theme/plusfuture/pdl/mod_connedit.pdl +++ b/view/theme/plusfuture/pdl/mod_connedit.pdl @@ -1,9 +1,9 @@ [region=aside] -[widget=userlogomenu][/widget] [widget=vcard][/widget] -[widget=collections][var=mode]abook[/var][/widget] +[widget=userlogomenu][/widget] [/region] [region=right_aside] +[widget=collections][var=mode]abook[/var][/widget] [widget=findpeople][/widget] [widget=suggestions][/widget] [widget=notifications][/widget] From 2197bed433c69a9c2643fe0a408b6d8fb5743ea3 Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 18:53:28 +0900 Subject: [PATCH 051/117] --- view/theme/plusfuture/css/style.css | 5 +++++ view/theme/plusfuture/js/plusfuture.js | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 5dbf959..9aa4190 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2066,4 +2066,9 @@ a[title*="pawoo.net"]::after{ .shared_container > div{ margin-left: 20px; margin-right: 20px; +} +.region_3-on{ + + left: -576px; + width: calc( 100% + 288px + 288px ); } \ No newline at end of file diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index fbdc584..a9afd20 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -137,8 +137,6 @@ function toggleAside() { function toggleBside() { if ($('main').hasClass('region_3-on')) { $('html, body').css('overflow-x', ''); - $('main').css('left', ''); - $('main').css('width', ''); $('main').removeClass('region_3-on') $('#region_3').addClass('d-none') $('#overlay').remove(); @@ -146,8 +144,6 @@ function toggleBside() { } else { $('html, body').css('overflow-x', 'hidden'); - $('main').css('left', '-576px'); - $('main').css('width', 'calc( 100% + 288px + 288px )'); $('main').addClass('region_3-on') $('#region_3').removeClass('d-none') $('
    ').appendTo('section'); From 1137f5461f838e8847a3d6690b3f1895d65c154b Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 19:14:57 +0900 Subject: [PATCH 052/117] --- view/theme/plusfuture/css/style.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 9aa4190..6b20282 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2071,4 +2071,12 @@ a[title*="pawoo.net"]::after{ left: -576px; width: calc( 100% + 288px + 288px ); -} \ No newline at end of file +} + +@media screen and (min-width: 993px) { + .region_3-on{ + + left: -288px; + width: calc( 100% + 288px + 288px ); + } + } \ No newline at end of file From 0c8a9b2f224d92112dc098a7e37adc0e16244cc0 Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 20:37:11 +0900 Subject: [PATCH 053/117] --- view/theme/plusfuture/pdl/mod_channel.pdl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/plusfuture/pdl/mod_channel.pdl b/view/theme/plusfuture/pdl/mod_channel.pdl index 3dc5530..5f6ff12 100644 --- a/view/theme/plusfuture/pdl/mod_channel.pdl +++ b/view/theme/plusfuture/pdl/mod_channel.pdl @@ -11,5 +11,6 @@ $content [region=right_aside] [widget=notifications][/widget] [widget=shortprofile][/widget] +[widget=categories][/widget] [widget=archive][var=wall]1[/var][/widget] [/region] From c8477e976c17a6fa47db2f842135ced0b00d083c Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 22:17:30 +0900 Subject: [PATCH 054/117] --- view/theme/plusfuture/css/style.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 6b20282..4b58002 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -40,7 +40,8 @@ aside #right_aside_wrapper { main { margin-left: auto; margin-right: auto; - max-width: $main_widthpx; + /*カスタマイズ*/ + /*max-width: $main_widthpx;*/ } #overlay { @@ -2077,6 +2078,6 @@ a[title*="pawoo.net"]::after{ .region_3-on{ left: -288px; - width: calc( 100% + 288px + 288px ); + width: calc( 100% + 288px); } } \ No newline at end of file From ac30c06d73fc961de75d96b3bc3564fa3c4f9560 Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 22:37:59 +0900 Subject: [PATCH 055/117] --- view/theme/plusfuture/pdl/mod_help.pdl | 7 +++++++ view/theme/plusfuture/pdl/mod_notifications.pdl | 8 ++++++++ 2 files changed, 15 insertions(+) create mode 100644 view/theme/plusfuture/pdl/mod_help.pdl create mode 100644 view/theme/plusfuture/pdl/mod_notifications.pdl 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_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 From 84e5ca599007a9abe2cd31844f838a4c9f6721be Mon Sep 17 00:00:00 2001 From: harukin Date: Mon, 19 Nov 2018 22:49:10 +0900 Subject: [PATCH 056/117] --- view/theme/plusfuture/pdl/mod_connections.pdl | 6 +++--- view/theme/plusfuture/pdl/mod_events.pdl | 8 ++++++++ view/theme/plusfuture/pdl/mod_manage.pdl | 6 ++++++ 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 view/theme/plusfuture/pdl/mod_events.pdl create mode 100644 view/theme/plusfuture/pdl/mod_manage.pdl diff --git a/view/theme/plusfuture/pdl/mod_connections.pdl b/view/theme/plusfuture/pdl/mod_connections.pdl index 7f3cd95..031b28b 100644 --- a/view/theme/plusfuture/pdl/mod_connections.pdl +++ b/view/theme/plusfuture/pdl/mod_connections.pdl @@ -2,8 +2,6 @@ [region=aside] [widget=userlogomenu][/widget] -[widget=follow][/widget] -[widget=collections][var=mode]groups[/var][/widget] [/region] [region=content] @@ -11,8 +9,10 @@ $content [/region] [region=right_aside] +[widget=notifications][/widget] +[widget=follow][/widget] +[widget=collections][var=mode]groups[/var][/widget] [widget=findpeople][/widget] [widget=suggestions][/widget] -[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_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] From a95d2151d82dffef90aad438a032209a12916b9f Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 17:40:24 +0900 Subject: [PATCH 057/117] --- view/theme/plusfuture/css/style.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/view/theme/plusfuture/css/style.css b/view/theme/plusfuture/css/style.css index 4b58002..e140995 100644 --- a/view/theme/plusfuture/css/style.css +++ b/view/theme/plusfuture/css/style.css @@ -2077,7 +2077,10 @@ a[title*="pawoo.net"]::after{ @media screen and (min-width: 993px) { .region_3-on{ - left: -288px; - width: calc( 100% + 288px); + left: 0px; + width: 100%; + } + #overlay{ + display: none; } } \ No newline at end of file From 7acdf426f5696c7e6723ef737584095d2537a4af Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 18:19:51 +0900 Subject: [PATCH 058/117] --- view/theme/plusfuture/js/plusfuture.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index a9afd20..5901a9d 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -35,7 +35,9 @@ $(document).ready(function () { $('section').on('click', function () { if ($('main').hasClass('region_3-on')) { - toggleBside(); + if ($(window).width() < 993) { + toggleBside(); + } } }); From 9ca60a7192a1610d595ef320a95a577eda9e53e7 Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 18:44:24 +0900 Subject: [PATCH 059/117] --- view/theme/plusfuture/js/plusfuture.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 5901a9d..f442830 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -35,7 +35,7 @@ $(document).ready(function () { $('section').on('click', function () { if ($('main').hasClass('region_3-on')) { - if ($(window).width() < 993) { + if ($(window).width() < 991) { toggleBside(); } } From e1fec86f352a089263aecd4e8eb238a9a426e119 Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 18:47:03 +0900 Subject: [PATCH 060/117] --- view/theme/plusfuture/js/plusfuture.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index f442830..d49cdf1 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -35,7 +35,7 @@ $(document).ready(function () { $('section').on('click', function () { if ($('main').hasClass('region_3-on')) { - if ($(window).width() < 991) { + if ($(window).width() < 1003) { toggleBside(); } } From 079b7af949e13d8a699a3cde118b9f72cdfa82c9 Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 18:49:52 +0900 Subject: [PATCH 061/117] --- view/theme/plusfuture/js/plusfuture.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index d49cdf1..bdf2149 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -35,7 +35,7 @@ $(document).ready(function () { $('section').on('click', function () { if ($('main').hasClass('region_3-on')) { - if ($(window).width() < 1003) { + if ($(window).width() < 982) { toggleBside(); } } From 00eb9d2fd74b61c14d8542aead59dec43bd2551c Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 21:57:03 +0900 Subject: [PATCH 062/117] --- view/theme/plusfuture/js/plusfuture.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index bdf2149..cbd2051 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -17,13 +17,13 @@ $(document).ready(function () { } $('#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); From 935215136d1b37a2b41349fa51a6a2d0a7931608 Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 22:00:48 +0900 Subject: [PATCH 063/117] --- view/theme/plusfuture/js/plusfuture.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index cbd2051..4b5ceee 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -17,13 +17,13 @@ $(document).ready(function () { } $('#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' + /*spacer: '.aside_spacer'*/ }); - }*/ + } $('#expand-aside').on('click', toggleAside); From 27316788780860ba0adc7a8646af0e95961d3aba Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 22:30:31 +0900 Subject: [PATCH 064/117] --- view/theme/plusfuture/js/plusfuture.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 4b5ceee..1e0f70f 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -17,14 +17,16 @@ $(document).ready(function () { } $('#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'*/ + spacer: '.aside_spacer' }); - } - + }*/ + $('#right_aside_wrapper').css('position', 'fixed'); + $('#right_aside_wrapper').css('top', '63px'); + $('#right_aside_wrapper').css('width', '274px'); $('#expand-aside').on('click', toggleAside); $('section').on('click', function () { From 342ed91768d02580f282e38681ff58aa4f03edfe Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 22:33:30 +0900 Subject: [PATCH 065/117] --- view/theme/plusfuture/js/plusfuture.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 1e0f70f..d405030 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -24,9 +24,9 @@ $(document).ready(function () { spacer: '.aside_spacer' }); }*/ - $('#right_aside_wrapper').css('position', 'fixed'); - $('#right_aside_wrapper').css('top', '63px'); - $('#right_aside_wrapper').css('width', '274px'); + $('#left_aside_wrapper,#right_aside_wrapper').css('position', 'fixed'); + $('#left_aside_wrapper,#right_aside_wrapper').css('top', '63px'); + $('#left_aside_wrapper,#right_aside_wrapper').css('width', '274px'); $('#expand-aside').on('click', toggleAside); $('section').on('click', function () { From 518c30604eeb86089acf0ca9f5be3e27c1ec3a8a Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 23:21:58 +0900 Subject: [PATCH 066/117] --- view/theme/plusfuture/js/plusfuture.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index d405030..6271f22 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -17,15 +17,14 @@ $(document).ready(function () { } $('#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' }); - }*/ + } $('#left_aside_wrapper,#right_aside_wrapper').css('position', 'fixed'); - $('#left_aside_wrapper,#right_aside_wrapper').css('top', '63px'); $('#left_aside_wrapper,#right_aside_wrapper').css('width', '274px'); $('#expand-aside').on('click', toggleAside); From 7f1dc768e27756caaeb6e7ea1f87a48ba4df497f Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 23:26:41 +0900 Subject: [PATCH 067/117] --- view/theme/plusfuture/js/plusfuture.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index 6271f22..d0325be 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -23,9 +23,8 @@ $(document).ready(function () { parent: 'main', spacer: '.aside_spacer' }); + $('#left_aside_wrapper,#right_aside_wrapper').css('width', '274px'); } - $('#left_aside_wrapper,#right_aside_wrapper').css('position', 'fixed'); - $('#left_aside_wrapper,#right_aside_wrapper').css('width', '274px'); $('#expand-aside').on('click', toggleAside); $('section').on('click', function () { From cae03de425de49a80c0715d30789c2193823537a Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 23:29:30 +0900 Subject: [PATCH 068/117] --- view/theme/plusfuture/js/plusfuture.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index d0325be..b5caa8c 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -23,7 +23,7 @@ $(document).ready(function () { parent: 'main', spacer: '.aside_spacer' }); - $('#left_aside_wrapper,#right_aside_wrapper').css('width', '274px'); + $('#right_aside_wrapper').css('width', '274px'); } $('#expand-aside').on('click', toggleAside); From a4c45323e1e5e763698eb71b198997500b30284e Mon Sep 17 00:00:00 2001 From: harukin Date: Tue, 20 Nov 2018 23:31:55 +0900 Subject: [PATCH 069/117] --- view/theme/plusfuture/js/plusfuture.js | 1 - 1 file changed, 1 deletion(-) diff --git a/view/theme/plusfuture/js/plusfuture.js b/view/theme/plusfuture/js/plusfuture.js index b5caa8c..9b09500 100644 --- a/view/theme/plusfuture/js/plusfuture.js +++ b/view/theme/plusfuture/js/plusfuture.js @@ -23,7 +23,6 @@ $(document).ready(function () { parent: 'main', spacer: '.aside_spacer' }); - $('#right_aside_wrapper').css('width', '274px'); } $('#expand-aside').on('click', toggleAside); From 92bd63c83399dc7cfb7891e080ba65f82ea77524 Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 21 Nov 2018 22:41:02 +0900 Subject: [PATCH 070/117] --- view/theme/plusfuture/pdl/mod_network.pdl | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/plusfuture/pdl/mod_network.pdl b/view/theme/plusfuture/pdl/mod_network.pdl index a9df4ad..b55299c 100644 --- a/view/theme/plusfuture/pdl/mod_network.pdl +++ b/view/theme/plusfuture/pdl/mod_network.pdl @@ -1,5 +1,6 @@ [region=aside] [widget=userlogomenu][/widget] +[block]noti[/block] [/region] [region=content] From 5467b1519796ff8f2d4530c6494d8f782fa29f5a Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 21 Nov 2018 23:28:46 +0900 Subject: [PATCH 071/117] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=86=E3=82=B9=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/theme/plusfuture/tpl/userlogomenu.tpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 4a4cb19..bff5cdc 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,6 +67,12 @@

    利用規約

    + From effe05450fa520a2a4db5406bcabcd9272e41d06 Mon Sep 17 00:00:00 2001 From: harukin Date: Wed, 21 Nov 2018 23:30:21 +0900 Subject: [PATCH 072/117] --- view/theme/plusfuture/tpl/userlogomenu.tpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index bff5cdc..407c21a 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,11 +67,10 @@

    利用規約

    - From 55f0b3a6413f8ed82f617dd8c8e45073dbd7c0da Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 22 Nov 2018 00:08:00 +0900 Subject: [PATCH 073/117] --- view/theme/plusfuture/tpl/userlogomenu.tpl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 407c21a..9bbcf77 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,11 +67,15 @@

    利用規約

    - + + From e69074d18f90e99efda2734a33e60341cabdba0d Mon Sep 17 00:00:00 2001 From: harukin Date: Thu, 22 Nov 2018 00:08:57 +0900 Subject: [PATCH 074/117] --- view/theme/plusfuture/tpl/userlogomenu.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl index 9bbcf77..24c0d85 100644 --- a/view/theme/plusfuture/tpl/userlogomenu.tpl +++ b/view/theme/plusfuture/tpl/userlogomenu.tpl @@ -67,7 +67,7 @@

    利用規約

    - +