Merge branch 'develop' into dist/ubuntu/bionic/develop

This commit is contained in:
wpetit 2021-01-15 16:52:43 +01:00
commit fc90b2af93
4 changed files with 8 additions and 8 deletions

View File

@ -6,10 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{block "title" . -}}{{- end}}</title>
{{- block "head_style" . -}}
<link rel="stylesheet" href="{{ .BaseUrl }}/css/main.css" />
<link rel="stylesheet" href="{{ .BaseURL }}/css/main.css" />
{{end}}
{{- block "head_script" . -}}
<script type="text/javascript" src="{{ .BaseUrl }}/main.js"></script>
<script type="text/javascript" src="{{ .BaseURL }}/main.js"></script>
{{end}}
</head>
<body>

View File

@ -2,7 +2,7 @@
<div class="columns is-mobile">
<div class="column is-narrow">
<h1 class="is-size-3 title">
<a href="{{ .BaseUrl }}" rel="Inbox" class="has-text-grey-dark">
<a href="{{ .BaseURL }}" rel="Inbox" class="has-text-grey-dark">
{{if or .Messages .SMS}}
📳
{{else}}

View File

@ -2,7 +2,7 @@
{{define "header_buttons"}}
<button
data-controller="restful"
data-restful-endpoint="{{ .BaseUrl }}/sms"
data-restful-endpoint="{{ .BaseURL }}/sms"
data-restful-method="DELETE"
class="button is-danger">
🗑️ Clear
@ -26,7 +26,7 @@
{{range .Messages}}
<tr data-controller="inbox-entry"
data-action="click->outbox-entry#onClick"
data-inbox-entry-link="{{ .BaseUrl }}/sms/{{ .ID }}">
data-inbox-entry-link="{{ .BaseURL }}/sms/{{ .ID }}">
<td class="sms-from">
<span class="is-size-7">{{ .From }}</span>
</td>
@ -38,7 +38,7 @@
</td>
<td class="sms-actions">
<div class="buttons is-right">
<a href="{{ .BaseUrl }}/sms/{{ .ID }}" class="button is-small is-link">👁️ See</a>
<a href="{{ .BaseURL }}/sms/{{ .ID }}" class="button is-small is-link">👁️ See</a>
</div>
</td>
</tr>

View File

@ -2,9 +2,9 @@
{{define "header_buttons"}}
<button class="button is-danger"
data-controller="restful"
data-restful-endpoint="{{ .BaseUrl }}/{{ .SMS.ID }}"
data-restful-endpoint="{{ .BaseURL }}/{{ .SMS.ID }}"
data-restful-method="DELETE"
data-restful-redirect="{{ .BaseUrl }}">
data-restful-redirect="{{ .BaseURL }}">
🗑️ Delete
</button>
{{end}}