aboutsummaryrefslogtreecommitdiffstats
path: root/view
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 /view
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.
Diffstat (limited to 'view')
-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
5 files changed, 13 insertions, 5 deletions
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>