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

View File

@ -2,7 +2,7 @@
<div class="columns is-mobile"> <div class="columns is-mobile">
<div class="column is-narrow"> <div class="column is-narrow">
<h1 class="is-size-3 title"> <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}} {{if or .Messages .SMS}}
📳 📳
{{else}} {{else}}

View File

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

View File

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