aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-04-20 10:23:11 +0200
committerMario Vavti <mario@mariovavti.com>2019-04-20 10:23:11 +0200
commit9275fd16c232ac6c55da345125c240013248e972 (patch)
treeb0cdc1eb3c423aa81ff609f4a3461cdc60fecb09 /view/tpl
parentfd87faa7a6949f7f44cd4dc6ca866bc072cf444b (diff)
parent904ae058108412de5e068b02cd45d9b8b4e90e4b (diff)
downloadvolse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.tar.gz
volse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.tar.bz2
volse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.zip
resolve merge conflict
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/cdav_calendar.tpl2
-rwxr-xr-xview/tpl/connection_template.tpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index f33ccda26..8df288808 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -114,7 +114,7 @@ $(document).ready(function() {
$('#id_dtend').val(dtend.toUTCString());
$('#id_description').val(event.extendedProps.description);
$('#id_location').val(event.extendedProps.location);
- $('#event_submit').val('update_event').html('Update');
+ $('#event_submit').val('update_event').html('{{$update}}');
$('#dbtn-acl').addClass('d-none');
event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 4543a69d0..a40406d5d 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -43,7 +43,7 @@
{{/if}}
{{if $contact.network}}
<div class="contact-info-element">
- <span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
+ <span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}" rel="nofollow noopener">{{$contact.recent_label}}</a>
</div>
{{/if}}
</div>