Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse source
This commit is contained in:
redmatrix 2016-01-26 15:39:25 -08:00
commit 9c71b74d37
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);
$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) {

1
mod/new_channel.php
View file

@ -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,

2
mod/ping.php
View file

@ -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'],

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["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";

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

@ -10,7 +10,13 @@
}
#profile-photo-wrapper {
border:none;
border: none;
}
#profile-edit-default-desc {
background-color: #665029;
color: #FFF;
padding: 20px;
}
.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="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>

1
view/tpl/email_notify_text.tpl
View file

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

3
view/tpl/new_channel.tpl
View file

@ -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>