harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Mario Vavti
2019-04-20 10:23:11 +02:00
parent fd87faa7a6 904ae05810
commit 9275fd16c2
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Cdav.php
View File

@@ -987,6 +987,7 @@ class Cdav extends Controller {
'$location' => $location, '$location' => $location,
'$more' => t('More'), '$more' => t('More'),
'$less' => t('Less'), '$less' => t('Less'),
'$update' => t('Update'),
'$calendar_select_label' => t('Select calendar'), '$calendar_select_label' => t('Select calendar'),
'$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')], '$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')],
'$delete' => t('Delete'), '$delete' => t('Delete'),

2
view/tpl/cdav_calendar.tpl
View File

@@ -114,7 +114,7 @@ $(document).ready(function() {
$('#id_dtend').val(dtend.toUTCString()); $('#id_dtend').val(dtend.toUTCString());
$('#id_description').val(event.extendedProps.description); $('#id_description').val(event.extendedProps.description);
$('#id_location').val(event.extendedProps.location); $('#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'); $('#dbtn-acl').addClass('d-none');
event_id = event.extendedProps.item ? event.extendedProps.item.id : 0; event_id = event.extendedProps.item ? event.extendedProps.item.id : 0;

2
view/tpl/connection_template.tpl
View File

@@ -43,7 +43,7 @@
{{/if}} {{/if}}
{{if $contact.network}} {{if $contact.network}}
<div class="contact-info-element"> <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> </div>
{{/if}} {{/if}}
</div> </div>