Merge branch 'develop-o' into develop

This commit is contained in:
Zoey
2023-11-11 19:06:06 +01:00
4 changed files with 6 additions and 5 deletions

View File

@@ -9,7 +9,7 @@
<div class="col-sm-12 col-md-12">
<div class="form-group">
<label class="form-label"><%- i18n('streams', 'incoming-port') %> <span class="form-required">*</span></label>
<input name="incoming_port" type="number" class="form-control text-monospace" placeholder="eg: 8080" value="<%- incoming_port %>" required>
<input name="incoming_port" type="number" class="form-control text-monospace" placeholder="eg: 8080" min="1" max="65535" value="<%- incoming_port %>" required>
</div>
</div>
<div class="col-sm-8 col-md-8">
@@ -21,7 +21,7 @@
<div class="col-sm-4 col-md-4">
<div class="form-group">
<label class="form-label"><%- i18n('streams', 'forwarding-port') %> <span class="form-required">*</span></label>
<input name="forwarding_port" type="number" class="form-control text-monospace" placeholder="eg: 80" value="<%- forwarding_port %>" required>
<input name="forwarding_port" type="number" class="form-control text-monospace" placeholder="eg: 80" min="1" max="65535" value="<%- forwarding_port %>" required>
</div>
</div>
<div class="col-sm-6 col-md-6">

View File

@@ -8,7 +8,7 @@
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="form-group">
<div class="form-label"><%- description %></div>
<div class="form-label"><%- i18n('settings', 'default-site-description') %></div>
<div class="custom-controls-stacked">
<label class="custom-control custom-radio">
<input class="custom-control-input" name="value" value="congratulations" type="radio" required <%- value === 'congratulations' ? 'checked' : '' %>>

View File

@@ -1,7 +1,7 @@
<td>
<div><%- name %></div>
<div><%- i18n('settings', 'default-site') %></div>
<div class="small text-muted">
<%- description %>
<%- i18n('settings', 'default-site-description') %>
</div>
</td>
<td>

View File

@@ -286,6 +286,7 @@
"settings": {
"title": "Settings",
"default-site": "Default Site",
"default-site-description": "What to show when Nginx is hit with an unknown Host",
"default-site-congratulations": "Congratulations Page",
"default-site-404": "404 Page",
"default-site-444": "Drop connection - only allows certbot dns-challenge",