diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-04-20 10:23:11 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-04-20 10:23:11 +0200 |
| commit | 9275fd16c232ac6c55da345125c240013248e972 (patch) | |
| tree | b0cdc1eb3c423aa81ff609f4a3461cdc60fecb09 | |
| parent | fd87faa7a6949f7f44cd4dc6ca866bc072cf444b (diff) | |
| parent | 904ae058108412de5e068b02cd45d9b8b4e90e4b (diff) | |
| download | volse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.tar.gz volse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.tar.bz2 volse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.zip | |
resolve merge conflict
| -rw-r--r-- | Zotlabs/Module/Cdav.php | 1 | ||||
| -rw-r--r-- | view/tpl/cdav_calendar.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/connection_template.tpl | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index 85926db8c..cd5cbc61e 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -987,6 +987,7 @@ class Cdav extends Controller { '$location' => $location, '$more' => t('More'), '$less' => t('Less'), + '$update' => t('Update'), '$calendar_select_label' => t('Select calendar'), '$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')], '$delete' => t('Delete'), 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> |