aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-18 07:31:37 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-18 07:31:37 +0100
commitdd3f69eaf357d6a43e087b0b8ed8402738cc39a5 (patch)
treeb6b1aa5903915d75ab74ee4f65a7868d53d6b036 /view
parentc4a14c27cf4ddff2f6225edc841f8cd53bbc7f44 (diff)
parentfc54f54b989570e2767a53c3c72875255b0dc95f (diff)
downloadvolse-hubzilla-dd3f69eaf357d6a43e087b0b8ed8402738cc39a5.tar.gz
volse-hubzilla-dd3f69eaf357d6a43e087b0b8ed8402738cc39a5.tar.bz2
volse-hubzilla-dd3f69eaf357d6a43e087b0b8ed8402738cc39a5.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
-rwxr-xr-xview/tpl/email_notify_html.tpl2
-rwxr-xr-xview/tpl/oexchange_xrd.tpl12
2 files changed, 7 insertions, 7 deletions
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index a2159c885..61ede1ca2 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
<tbody>
- <tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/hz-white-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+ <tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src="{{$notify_icon}}"><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
index 74ef22874..e865e07d9 100755
--- a/view/tpl/oexchange_xrd.tpl
+++ b/view/tpl/oexchange_xrd.tpl
@@ -4,23 +4,23 @@
<Subject>{{$base}}</Subject>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/vendor">Zotlabs</Property>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/title">Hubzilla</Property>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/name">Hubzilla</Property>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Hubzilla</Property>
<Link
rel="icon"
- href="{{$base}}/images/friendika-16.png"
+ href="{{$base}}/images/hz-16.png"
type="image/png"
/>
<Link
rel="icon32"
- href="{{$base}}/images/friendika-32.png"
+ href="{{$base}}/images/hz-32.png"
type="image/png"
/>