aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2016-01-27 00:24:05 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2016-01-27 00:24:05 +0100
commit68030d12cfefa8982774cca9714b0c1eed7b9537 (patch)
tree236212dd522b8443206165efa3e9f8fee106c3e2
parent3494fddd7c13637c8fb25104002b59448f182e79 (diff)
downloadvolse-hubzilla-68030d12cfefa8982774cca9714b0c1eed7b9537.tar.gz
volse-hubzilla-68030d12cfefa8982774cca9714b0c1eed7b9537.tar.bz2
volse-hubzilla-68030d12cfefa8982774cca9714b0c1eed7b9537.zip
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.
-rw-r--r--include/enotify.php8
-rw-r--r--mod/new_channel.php1
-rw-r--r--mod/ping.php2
-rw-r--r--view/nl/hstrings.php4
-rw-r--r--view/theme/redbasic/schema/dark.css8
-rwxr-xr-xview/tpl/email_notify_html.tpl2
-rwxr-xr-xview/tpl/email_notify_text.tpl1
-rwxr-xr-xview/tpl/new_channel.tpl3
8 files changed, 19 insertions, 10 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 5bb53aa0e..c4c49c8ff 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -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);
$epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]a new connection request[/zrl] from %3$s.'),
$recip['channel_name'],
- $itemlink,
+ $siteurl . '/connections/ifpending',
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]');
$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.');
- $tsitelink = sprintf( $sitelink, $siteurl );
- $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
- $itemlink = $params['link'];
+ $tsitelink = sprintf( $sitelink, $siteurl . '/connections/ifpending');
+ $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/connections/ifpending">' . $sitename . '</a>');
+ $itemlink = $params['link'];
}
if ($params['type'] == NOTIFY_SUGGEST) {
diff --git a/mod/new_channel.php b/mod/new_channel.php
index 07b6cfc85..630984bf2 100644
--- a/mod/new_channel.php
+++ b/mod/new_channel.php
@@ -133,6 +133,7 @@ function new_channel_content(&$a) {
'$label_name' => t('Channel Name'),
'$help_name' => t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group" '),
'$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.'),
'$label_import' => t('Or <a href="import">import an existing channel</a> from another location'),
'$name' => $name,
diff --git a/mod/ping.php b/mod/ping.php
index 394dbf089..69d504da1 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -299,7 +299,7 @@ function ping_init(&$a) {
if($r) {
foreach($r as $rr) {
$result[] = array(
- 'notify_link' => $a->get_baseurl() . '/connedit/' . $rr['abook_id'],
+ 'notify_link' => $a->get_baseurl() . '/connections/ifpending',
'name' => $rr['xchan_name'],
'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'],
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index dca353ba7..ca021ad76 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -262,7 +262,7 @@ $a->strings["View Profile"] = "Profiel weergeven";
$a->strings["Activity/Posts"] = "Activiteit/berichten connectie";
$a->strings["Edit Connection"] = "Connectie bewerken";
$a->strings["Message"] = "Bericht";
-$a->strings["Ratings"] = "Waarderingen";
+$a->strings["Ratings"] = "Beoordelingen";
$a->strings["%s likes this."] = "%s vindt dit 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(
@@ -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["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["Rating: "] = "Waardering: ";
+$a->strings["Rating: "] = "Beoordeling: ";
$a->strings["Website: "] = "Website: ";
$a->strings["Description: "] = "Omschrijving: ";
$a->strings["Select a bookmark folder"] = "Kies een bladwijzermap";
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index f65e9aac9..b667dca5c 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -10,7 +10,13 @@
}
#profile-photo-wrapper {
- border:none;
+ border: none;
+}
+
+#profile-edit-default-desc {
+ background-color: #665029;
+ color: #FFF;
+ padding: 20px;
}
.photo {
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 61ede1ca2..5b4954c8e 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -18,7 +18,7 @@
<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-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>{{$site_admin}}</td></tr>
</tbody>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
index bdab4c273..56925c18b 100755
--- a/view/tpl/email_notify_text.tpl
+++ b/view/tpl/email_notify_text.tpl
@@ -5,6 +5,7 @@
{{$textversion}}
{{$tsitelink}}
+
{{$titemlink}}
{{$thanks}}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 46b32b8a9..156b5ec2f 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -22,8 +22,9 @@
<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
<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="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_hub}}</div>
<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
<div id="newchannel-nickname-end" class="newchannel-field-end"></div>