bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Hypolite Petovan 2019-06-23 17:40:52 -04:00
commit b9ab613777
164 changed files with 30233 additions and 26266 deletions
Download patch file Download diff file Expand all files Collapse all files

5
view/theme/duepuntozero/deriv/darkzero.css
View file

@ -50,9 +50,10 @@ nav #banner #logo-text a { color: #ffffff; }
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
.nav-selected.nav-link { color: #ffffff!important; border-bottom: 0px}
.nav-commlink, .nav-login-link {background-color: #b7bab3;}
.nav-commlink, .nav-login-link, .nav-logout-link {background-color: #b7bab3;}
.nav-commlink:link, .nav-commlink:visited,
.nav-login-link:link, .nav-login-link:visited{
.nav-login-link:link, .nav-login-link:visited,
.nav-logout-link:link, .nav-logout-link:visited {
color: #ffffff;
}

2
view/theme/duepuntozero/deriv/easterbunny.css
View file

@ -33,7 +33,7 @@ aside { background-image: url('imgeasterbunny/border.jpg'); }
div.wall-item-content-wrapper.shiny { background-image: url('imgeasterbunny/shiny.png'); }
.nav-commlink, .nav-login-link {
.nav-commlink, .nav-login-link, .nav-logout-link {
background-color: #aed3b2;
}

5
view/theme/duepuntozero/deriv/greenzero.css
View file

@ -4,9 +4,10 @@ a:link, a:visited { color: #549f4f; text-decoration: none; }
a:hover {text-decoration: underline; }
.nav-selected.nav-link { color: #549f4f!important; border-bottom: 0px}
.nav-commlink, .nav-login-link {background-color: #aed3b2;}
.nav-commlink, .nav-login-link, .nav-logout-link {background-color: #aed3b2;}
.nav-commlink:link, .nav-commlink:visited,
.nav-login-link:link, .nav-login-link:visited{
.nav-login-link:link, .nav-login-link:visited,
.nav-logout-link:link, .nav-logout-link:visited{
color: #ffffff;
}

2
view/theme/duepuntozero/deriv/purplezero.css
View file

@ -10,7 +10,7 @@ section { background-image: url('imgpurplezero/border.jpg'); }
div.wall-item-content-wrapper.shiny { background-image: url('imgpurplezero/shiny.png'); }
.nav-commlink, .nav-login-link {
.nav-commlink, .nav-login-link, .nav-logout-link {
background-color: #aed3b2;
}

6
view/theme/duepuntozero/style.css
View file

@ -159,7 +159,7 @@ nav #banner #logo-text a {
nav #banner #logo-text a:hover { text-decoration: none; }
.nav-commlink, .nav-login-link {
.nav-commlink, .nav-login-link, .nav-logout-link {
display: block;
height: 15px;
margin-top: 67px;
@ -680,10 +680,6 @@ input#dfrn-url {
clear: both;
}
#viewcontacts {
margin-top: 15px;
}
#profile-edit-default-desc {
color: #FF0000;
border: 1px solid #FF8888;

19
view/theme/duepuntozero/templates/profile_vcard.tpl
View file

@ -36,21 +36,20 @@
{{include file="diaspora_vcard.tpl"}}
<div id="profile-vcard-break"></div>
<div id="profile-vcard-break"></div>
<div id="profile-extra-links">
<ul>
{{if $connect}}
{{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage}}
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
{{if $subscribe_feed}}
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
{{if $subscribe_feed_link}}
<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>

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

@ -2317,7 +2317,7 @@ ul.dropdown-menu li:hover {
.manage-content-wrapper, .notes-content-wrapper,
.message-content-wrapper, .apps-content-wrapper,
#adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
.viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
.dfrn_request-content-wrapper,
.friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
.profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper,
.fsuggest-content-wrapper {
@ -3547,7 +3547,7 @@ section .profile-match-wrapper {
right: 10px;
}
.generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
.generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
border-radius: 0;
padding: 10px;
}

5
view/theme/frio/js/hovercard.js
View file

@ -55,7 +55,7 @@ $(document).ready(function(){
var hctrigger = 'manual';
};
// Timeoute until the hover-card does appear
// Timeout until the hover-card does appear
setTimeout(function(){
if(targetElement.is(":hover") && parseInt(targetElement.attr('data-awaiting-hover-card'),10) == timeNow) {
if($('.hovercard').length == 0) { // no card if there already is one open
@ -81,6 +81,9 @@ $(document).ready(function(){
template: '<div class="popover hovercard" data-card-created="' + timeNow + '"><div class="arrow"></div><div class="popover-content hovercard-content"></div></div>',
content: data,
container: "body",
sanitizeFn: function (content) {
return DOMPurify.sanitize(content)
},
}).popover('show');
}
});

3
view/theme/frio/js/mod_events.js
View file

@ -82,6 +82,9 @@ $(document).ready(function() {
trigger: "hover",
placement: "auto",
template: '<div class="popover hovercard event-card"><div class="arrow"></div><div class="popover-content hovercard-content"></div></div>',
sanitizeFn: function (content) {
return DOMPurify.sanitize(content)
},
});
}

15
view/theme/frio/js/modal.js
View file

@ -93,6 +93,21 @@ $(document).ready(function(){
input.val(img);
});
// Generic delegated event to open an anchor URL in a modal.
// Used in the hovercard.
document.getElementsByTagName('body')[0].addEventListener('click', function(e) {
var target = e.target;
while (target) {
if (target.matches && target.matches('a.add-to-modal')) {
addToModal(target.href);
e.preventDefault();
return false;
}
target = target.parentNode || null;
}
});
});
// Overwrite Dialog.show from main js to load the filebrowser into a bs modal.

5
view/theme/frio/js/theme.js
View file

@ -106,7 +106,10 @@ $(document).ready(function(){
delay: {
show: 500,
hide: 100
}
},
sanitizeFn: function (content) {
return DOMPurify.sanitize(content)
},
});
// initialize the bootstrap-select

5
view/theme/frio/templates/contact_edit.tpl
View file

@ -58,11 +58,6 @@
{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
</ul>
<ul>
<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
</ul>
</div> {{* End of contact-edit-status-wrapper *}}
<div id="contact-edit-links-end"></div>

1
view/theme/frio/templates/head.tpl
View file

@ -65,6 +65,7 @@
<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js"></script>
<script type="text/javascript" src="view/js/acl.js"></script>
<script type="text/javascript" src="view/asset/base64/base64.min.js"></script>
<script type="text/javascript" src="view/asset/dompurify/dist/purify.min.js"></script>
<script type="text/javascript" src="view/js/main.js"></script>
<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>

20
view/theme/frio/templates/profile/contacts.tpl Normal file
View file

@ -0,0 +1,20 @@
<div class="generic-page-wrapper">
{{include file="section_title.tpl"}}
<ul class="nav nav-tabs">
<li role="presentation"{{if !$type || $type == 'all'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts">{{$all_label}}</a></li>
<li role="presentation"{{if $type == 'followers'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/followers">{{$followers_label}}</a></li>
<li role="presentation"{{if $type == 'following'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/following">{{$following_label}}</a></li>
<li role="presentation"{{if $type == 'mutuals'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/mutuals">{{$mutuals_label}}</a></li>
</ul>
<ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
{{foreach $contacts as $contact}}
<li>{{include file="contact_template.tpl"}}</li>
{{/foreach}}
</ul>
<div class="clear"></div>
<div id="view-contact-end"></div>
{{$paginate nofilter}}
</div>

18
view/theme/frio/templates/profile_vcard.tpl
View file

@ -46,23 +46,24 @@
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
</div>
{{if $follow_link || $unfollow_link || $wallmessage_link}}
<div id="profile-extra-links">
{{if $connect}}
{{if $follow_link || $unfollow_link}}
<div id="dfrn-request-link-button">
{{if $remoteconnect}}
<a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
<span class=""><i class="fa fa-user-plus"></i></span>
<span class="">{{$connect}}</span>
{{if $unfollow_link}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
<span class=""><i class="fa fa-user-times"></i></span>
<span class="">{{$unfollow}}</span>
</a>
{{else}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="dfrn_request/{{$profile.nickname}}">
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
<span class=""><i class="fa fa-user-plus"></i></span>
<span class="">{{$connect}}</span>
<span class="">{{$follow}}</span>
</a>
{{/if}}
</div>
{{/if}}
{{if $wallmessage}}
{{if $wallmessage_link}}
<div id="wallmessage-link-botton">
<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
<span class=""><i class="fa fa-envelope"></i></span>
@ -71,6 +72,7 @@
</div>
{{/if}}
</div>
{{/if}}
<div class="clear"></div>

2
view/theme/frio/templates/saved_searches_aside.tpl
View file

@ -6,7 +6,7 @@
<ul role="menu" id="saved-search-ul">
{{foreach $saved as $search}}
<li role="menuitem" class="saved-search-li clear">
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}">
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network?remove=1&amp;search={{$search.encodedterm}}">
<i class="fa fa-trash" aria-hidden="true"></i>
</a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>

25
view/theme/frio/templates/widget/vcard.tpl
View file

@ -34,5 +34,30 @@
{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
</div>
<div id="profile-extra-links">
<div id="dfrn-request-link-button">
{{if $follow_link}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}"">
<span class=""><i class="fa fa-user-plus"></i></span>
<span class="">{{$follow}}</span>
</a>
{{/if}}
{{if $unfollow_link}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
<span class=""><i class="fa fa-user-times"></i></span>
<span class="">{{$unfollow}}</span>
</a>
{{/if}}
</div>
{{if $wallmessage_link}}
<div id="wallmessage-link-botton">
<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
<span class=""><i class="fa fa-envelope"></i></span>
<span class="">{{$wallmessage}}</span>
</button>
</div>
{{/if}}
</div>
</div>
</div>

2
view/theme/frio/theme.php
View file

@ -255,8 +255,6 @@ function frio_remote_nav($a, &$nav)
}
if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
// user menu
$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];

19
view/theme/quattro/templates/profile_vcard.tpl
View file

@ -69,21 +69,20 @@
{{/if}}
{{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links">
<ul>
{{if $connect}}
{{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage}}
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
{{if $subscribe_feed}}
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
{{if $subscribe_feed_link}}
<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>

2
view/theme/quattro/templates/saved_searches_aside.tpl
View file

@ -5,7 +5,7 @@
{{foreach $saved as $search}}
<li class="tool {{if $search.selected}}selected{{/if}}">
<a href="search?search={{$search.encodedterm}}" class="label" >{{$search.term}}</a>
<a href="network/?f=&remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
<a href="network?remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
</li>
{{/foreach}}
</ul>

4
view/theme/smoothly/style.css
View file

@ -2834,10 +2834,6 @@ margin-left: 0px;
clear: both;
}
#viewcontacts {
margin-top: 15px;
}
.contact-entry-wrapper .contact-entry-photo-wrapper {
float: left;
margin-right: 10px;

1
view/theme/vier/style.css
View file

@ -763,6 +763,7 @@ nav #nav-directory-link,
nav #nav-apps-link,
nav #nav-apps-link,
nav #nav-login-link,
nav #nav-logout-link,
nav #nav-messages-linkmenu,
nav #nav-notifications-linkmenu,
nav #nav-site-linkmenu,

5
view/theme/vier/templates/contact_edit.tpl
View file

@ -45,11 +45,6 @@
{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
</ul>
<ul>
<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
</ul>
</div> {{* End of contact-edit-status-wrapper *}}
{{* Some information about the contact from the profile *}}

5
view/theme/vier/templates/nav.tpl
View file

@ -102,6 +102,11 @@
<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
</li>
{{/if}}
{{if $nav.logout}}
<li role="menuitem" id="nav-logout-link" class="nav-menu">
<a class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a>
</li>
{{/if}}
{{if $nav.search}}
<li role="search" id="nav-search-box">

19
view/theme/vier/templates/profile_vcard.tpl
View file

@ -61,21 +61,20 @@
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links">
<ul>
{{if $connect}}
{{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage}}
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
{{if $subscribe_feed}}
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
{{if $subscribe_feed_link}}
<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>

2
view/theme/vier/theme.php
View file

@ -230,7 +230,7 @@ function vier_community_info()
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = [
'url' => 'network?f=&cid=' . $contact['id'],
'url' => 'network?cid=' . $contact['id'],
'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'],
'cid' => $contact['id'],