harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linking new connection notification to pending connections (see Channel 1) and improved email notifications about new connections. Could not find a way to do this also for the generic notifications. Added hub domain of channel address on the new channel page. A few people on my hub didn't understood. This example will make it more clear. Some minor bits.

Browse Source
This commit is contained in:
jeroenpraat 2016-01-27 00:24:05 +01:00
parent 3494fddd7c
commit 68030d12cf
8 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/enotify.php
View File

@ -273,14 +273,14 @@ function notification($params) {
$preamble = sprintf( t('%1$s, you\'ve received an new connection request from \'%2$s\' at %3$s'), $recip['channel_name'], $sender['xchan_name'], $sitename); $preamble = sprintf( t('%1$s, you\'ve received an new connection request from \'%2$s\' at %3$s'), $recip['channel_name'], $sender['xchan_name'], $sitename);
$epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]a new connection request[/zrl] from %3$s.'), $epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]a new connection request[/zrl] from %3$s.'),
$recip['channel_name'], $recip['channel_name'],
$itemlink, $siteurl . '/connections/ifpending',
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]'); '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]');
$body = sprintf( t('You may visit their profile at %s'),$sender['xchan_url']); $body = sprintf( t('You may visit their profile at %s'),$sender['xchan_url']);
$sitelink = t('Please visit %s to approve or reject the connection request.'); $sitelink = t('Please visit %s to approve or reject the connection request.');
$tsitelink = sprintf( $sitelink, $siteurl ); $tsitelink = sprintf( $sitelink, $siteurl . '/connections/ifpending');
$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>'); $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/connections/ifpending">' . $sitename . '</a>');
$itemlink = $params['link']; $itemlink = $params['link'];
} }
if ($params['type'] == NOTIFY_SUGGEST) { if ($params['type'] == NOTIFY_SUGGEST) {

1
mod/new_channel.php
View File

@ -133,6 +133,7 @@ function new_channel_content(&$a) {
'$label_name' => t('Channel Name'), '$label_name' => t('Channel Name'),
'$help_name' => t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group" '), '$help_name' => t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group" '),
'$label_nick' => t('Choose a short nickname'), '$label_nick' => t('Choose a short nickname'),
'$nick_hub' => '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl')),
'$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'), '$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'),
'$label_import' => t('Or <a href="import">import an existing channel</a> from another location'), '$label_import' => t('Or <a href="import">import an existing channel</a> from another location'),
'$name' => $name, '$name' => $name,

2
mod/ping.php
View File

@ -299,7 +299,7 @@ function ping_init(&$a) {
if($r) { if($r) {
foreach($r as $rr) { foreach($r as $rr) {
$result[] = array( $result[] = array(
'notify_link' => $a->get_baseurl() . '/connedit/' . $rr['abook_id'], 'notify_link' => $a->get_baseurl() . '/connections/ifpending',
'name' => $rr['xchan_name'], 'name' => $rr['xchan_name'],
'url' => $rr['xchan_url'], 'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'], 'photo' => $rr['xchan_photo_s'],

4
view/nl/hstrings.php
View File

@ -262,7 +262,7 @@ $a->strings["View Profile"] = "Profiel weergeven";
$a->strings["Activity/Posts"] = "Activiteit/berichten connectie"; $a->strings["Activity/Posts"] = "Activiteit/berichten connectie";
$a->strings["Edit Connection"] = "Connectie bewerken"; $a->strings["Edit Connection"] = "Connectie bewerken";
$a->strings["Message"] = "Bericht"; $a->strings["Message"] = "Bericht";
$a->strings["Ratings"] = "Waarderingen"; $a->strings["Ratings"] = "Beoordelingen";
$a->strings["%s likes this."] = "%s vindt dit leuk."; $a->strings["%s likes this."] = "%s vindt dit leuk.";
$a->strings["%s doesn't like this."] = "%s vindt dit niet leuk."; $a->strings["%s doesn't like this."] = "%s vindt dit niet leuk.";
$a->strings["<span %1\$s>%2\$d people</span> like this."] = array( $a->strings["<span %1\$s>%2\$d people</span> like this."] = array(
@ -1824,7 +1824,7 @@ $a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afs
$a->strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)"; $a->strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)";
$a->strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"; $a->strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)";
$a->strings["No ratings"] = "Geen beoordelingen"; $a->strings["No ratings"] = "Geen beoordelingen";
$a->strings["Rating: "] = "Waardering: "; $a->strings["Rating: "] = "Beoordeling: ";
$a->strings["Website: "] = "Website: "; $a->strings["Website: "] = "Website: ";
$a->strings["Description: "] = "Omschrijving: "; $a->strings["Description: "] = "Omschrijving: ";
$a->strings["Select a bookmark folder"] = "Kies een bladwijzermap"; $a->strings["Select a bookmark folder"] = "Kies een bladwijzermap";

8
view/theme/redbasic/schema/dark.css
View File

@ -10,7 +10,13 @@
} }
#profile-photo-wrapper { #profile-photo-wrapper {
border:none; border: none;
}
#profile-edit-default-desc {
background-color: #665029;
color: #FFF;
padding: 20px;
} }
.photo { .photo {

2
view/tpl/email_notify_html.tpl
View File

@ -18,7 +18,7 @@
<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr> <tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr> <tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
<tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr> <tr><td style="padding-top:11px;" colspan="2">{{$hsitelink}}</td></tr>
<tr><td style="padding-bottom:11px;" colspan="2">{{$hitemlink}}</td></tr> <tr><td style="padding:11px 0;" colspan="2">{{$hitemlink}}</td></tr>
<tr><td></td><td>{{$thanks}}</td></tr> <tr><td></td><td>{{$thanks}}</td></tr>
<tr><td></td><td>{{$site_admin}}</td></tr> <tr><td></td><td>{{$site_admin}}</td></tr>
</tbody> </tbody>

1
view/tpl/email_notify_text.tpl
View File

@ -5,6 +5,7 @@
{{$textversion}} {{$textversion}}
{{$tsitelink}} {{$tsitelink}}
{{$titemlink}} {{$titemlink}}
{{$thanks}} {{$thanks}}

1
view/tpl/new_channel.tpl
View File

@ -24,6 +24,7 @@
<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label> <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label>
<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" />
<div id="nick-spinner"></div> <div id="nick-spinner"></div>
<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div>
<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
<div id="newchannel-nickname-end" class="newchannel-field-end"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div>