bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into lower-platform

Browse source
This commit is contained in:
Michael 2020-01-12 21:54:58 +00:00
parent eb011f47bb 9b7e099d9b
commit fba46111b1
12 changed files with 109 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Introduction.php
View file

@ -22,7 +22,7 @@ use Psr\Log\LoggerInterface;
* @property string hash
* @property string datetime
* @property bool blocked
* @property bool ignored
* @property bool ignore
*/
final class Introduction extends BaseModel
{
@ -116,7 +116,7 @@ final class Introduction extends BaseModel
*/
public function ignore()
{
$this->ignored = true;
$this->ignore = true;
return $this->intro->update($this);
}

35
view/js/main.js
View file

@ -33,6 +33,41 @@ function _resizeIframe(obj, desth) {
setTimeout(_resizeIframe, 100, obj, ch);
}
function initWidget(inflated, deflated) {
var elInf = document.getElementById(inflated);
var elDef = document.getElementById(deflated);
if (!elInf || !elDef) {
return;
}
if (localStorage.getItem(window.location.pathname + ":" + inflated) != "none") {
elInf.style.display = "block";
elDef.style.display = "none";
} else {
elInf.style.display = "none";
elDef.style.display = "block";
}
}
function openCloseWidget(inflated, deflated) {
var elInf = document.getElementById(inflated);
var elDef = document.getElementById(deflated);
if (!elInf || !elDef) {
return;
}
if (window.getComputedStyle(elInf).display === "none") {
elInf.style.display = "block";
elDef.style.display = "none";
localStorage.setItem(window.location.pathname + ":" + inflated, "block");
} else {
elInf.style.display = "none";
elDef.style.display = "block";
localStorage.setItem(window.location.pathname + ":" + inflated, "none");
}
}
function openClose(theID) {
var el = document.getElementById(theID);
if (el) {

12
view/templates/group_side.tpl
View file

@ -1,5 +1,10 @@
<div class="widget" id="group-sidebar">
<span id="group-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div class="widget" id="group-sidebar">
<span class="fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div id="sidebar-group-list">
<ul role="menu" id="sidebar-group-ul">
@ -38,5 +43,6 @@
{{if $ungrouped}}<div id="sidebar-ungrouped"><a class="{{if $ungrouped_selected}}group-selected{{/if}}" href="nogroup">{{$ungrouped}}</a></div>{{/if}}
</div>
<script>
initWidget('group-sidebar', 'group-sidebar-inflated');
</script>

9
view/templates/widget/filter.tpl
View file

@ -1,8 +1,8 @@
<span id="{{$type}}-sidebar-inflated" class="widget fakelink" style="display: block;" onclick="openClose('{{$type}}-sidebar'); openClose('{{$type}}-sidebar-inflated');">
<span id="{{$type}}-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div id="{{$type}}-sidebar" class="widget" style="display: none;">
<span class="fakelink" onclick="openClose('{{$type}}-sidebar'); openClose('{{$type}}-sidebar-inflated');">
<div id="{{$type}}-sidebar" class="widget">
<span class="fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div id="{{$type}}-desc">{{$desc nofilter}}</div>
@ -13,3 +13,6 @@
{{/foreach}}
</ul>
</div>
<script>
initWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');
</script>

10
view/templates/widget/posted_date.tpl
View file

@ -11,8 +11,13 @@ function showHideDates() {
}
</script>
<div id="datebrowse-sidebar" class="widget">
<span id="datebrowse-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div id="datebrowse-sidebar" class="widget">
<span class="fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<ul id="posted-date-selector" class="datebrowse-ul">
{{foreach $dates as $y => $arr}}
@ -41,3 +46,6 @@ function showHideDates() {
</ul>
{{/if}}
</div>
<script>
initWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');
</script>

9
view/templates/widget/saved_searches.tpl
View file

@ -1,8 +1,8 @@
<span id="saved-search-list-inflated" class="widget fakelink" style="display: block;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
<span id="saved-search-list-inflated" class="widget fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
<h3>{{$title}}</h3>
</span>
<div class="widget" id="saved-search-list" style="display: none;">
<span class="fakelink" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
<div class="widget" id="saved-search-list">
<span class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
<h3 id="search">{{$title}}</h3>
</span>
{{$searchbox nofilter}}
@ -17,3 +17,6 @@
</ul>
<div class="clear"></div>
</div>
<script>
initWidget('saved-search-list', 'saved-search-list-inflated');
</script>

11
view/templates/widget/tagcloud.tpl
View file

@ -1,6 +1,10 @@
<div class="tagblock widget">
<span id="tagblock-inflated" class="widget fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');">
<h3>{{$title}}</h3>
</span>
<div class="tagblock widget">
<span class="fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');">
<h3>{{$title}}</h3>
</span>
<div class="tag-cloud">
{{foreach $tags as $tag}}
@ -11,3 +15,6 @@
</div>
<div class="tagblock-widget-end clear"></div>
</div>
<script>
initWidget('tagblock', 'tagblock-inflated');
</script>

10
view/templates/widget/trending_tags.tpl
View file

@ -1,5 +1,10 @@
<div id="trending-tags-sidebar" class="widget">
<span id="trending-tags-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div id="trending-tags-sidebar" class="widget">
<span class="fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<ul>
{{section name=ol loop=$tags max=10}}
<li><a href="search?tag={{$tags[ol].term}}">#{{$tags[ol].term}}</a></li>
@ -16,3 +21,6 @@
</details>
{{/if}}
</div>
<script>
initWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');
</script>

9
view/templates/widget_forumlist.tpl
View file

@ -11,11 +11,11 @@ function showHideForumlist() {
}
}
</script>
<span id="forumlist-sidebar-inflated" class="widget fakelink" style="display: block;" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
<span id="forumlist-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div id="forumlist-sidebar" class="widget" style="display: none;">
<span class="fakelink" onclick="openClose('forumlist-sidebar'); openClose('forumlist-sidebar-inflated');">
<div id="forumlist-sidebar" class="widget">
<span class="fakelink" onclick="openCloseWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');">
<h3 id="forumlist">{{$title}}</h3>
</span>
<ul id="forumlist-sidbar-ul" role="menu">
@ -46,3 +46,6 @@ function showHideForumlist() {
{{/if}}
</ul>
</div>
<script>
initWidget('forumlist-sidebar', 'forumlist-sidebar-inflated');
</script>

3
view/theme/frio/css/style.css
View file

@ -2932,10 +2932,13 @@ details.profile-jot-net[open] summary:before {
.fakelink > h3:before {
padding-right: 10px;
}
.widget.fakelink > h3:before,
.settings-block.fakelink > h3:before {
font-family: ForkAwesome;
content: "\f0da"; /* Right Plain Pointer */
}
.widget > .fakelink > h3:before,
#sidebar-group-header > .fakelink > h3:before,
.settings-block > .fakelink > h3:before {
font-family: ForkAwesome;
content: "\f0d7"; /* Bottom Plain Pointer */

12
view/theme/frio/templates/group_side.tpl
View file

@ -1,6 +1,11 @@
<span id="group-sidebar-inflated" class="widget fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
<div class="widget" id="group-sidebar">
<div id="sidebar-group-header">
<h3>{{$title}}</h3>
<span class="fakelink" onclick="openCloseWidget('group-sidebar', 'group-sidebar-inflated');">
<h3>{{$title}}</h3>
</span>
{{if ! $newgroup}}
<a class="group-edit-tool pull-right widget-action faded-icon" id="sidebar-edit-group" href="{{$grouppage}}" data-toggle="tooltip" title="{{$editgroupstext}}">
<i class="fa fa-pencil" aria-hidden="true"></i>
@ -49,6 +54,7 @@
{{if $ungrouped}}<li class="{{if $ungrouped_selected}}selected{{/if}} sidebar-group-li" id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></li>{{/if}}
</ul>
</div>
</div>
<script>
initWidget('group-sidebar', 'group-sidebar-inflated');
</script>

9
view/theme/frio/templates/widget/saved_searches.tpl
View file

@ -1,9 +1,9 @@
{{if $saved}}
<span id="saved-search-list-inflated" class="widget fakelink" style="display: block;" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
<span id="saved-search-list-inflated" class="widget fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
<h3>{{$title}}</h3>
</span>
<div class="widget" id="saved-search-list" style="display: none;">
<span class="fakelink" onclick="openClose('saved-search-list'); openClose('saved-search-list-inflated');">
<div class="widget" id="saved-search-list">
<span class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
<h3 id="search">{{$title}}</h3>
</span>
<ul role="menu" id="saved-search-ul">
@ -18,4 +18,7 @@
</ul>
<div class="clearfix"></div>
</div>
<script>
initWidget('saved-search-list', 'saved-search-list-inflated');
</script>
{{/if}}