Fix for regex patterns. Minor UI changes.

mercure-imaging · Jun 5, 2024 · 60d9849 · 60d9849
1 parent fb922ca
commit 60d9849
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/webinterface/templates/targets/dicom-edit.html b/webinterface/templates/targets/dicom-edit.html
@@ -18,14 +18,14 @@
     <div class="control">
         <input name="aet_target" class="input" required='true' autocomplete='off' type="text"
             placeholder="Calling AET" value="{{targets[edittarget]['aet_target']}}"
-            pattern="[A-Za-z0-9_-]+">
+            pattern="[0-9a-zA-Z_\-]+">
     </div>
 </div>
 <div class="field">
     <label class="label">AET Source</label>
     <div class="control">
         <input name="aet_source" class="input" required='true' autocomplete='off' type="text"
             placeholder="Outgoing AET" value="{{targets[edittarget]['aet_source']}}"
-            pattern="[A-Za-z0-9_-]+">
+            pattern="[0-9a-zA-Z_\-]+">
     </div>
 </div>
diff --git a/webinterface/templates/targets/dicom-tls-edit.html b/webinterface/templates/targets/dicom-tls-edit.html
@@ -21,15 +21,15 @@
     <div class="control">
         <input name="aet_target" class="input" required='true' autocomplete='off' type="text"
             placeholder="Calling AET" value="{{targets[edittarget]['aet_target']}}"
-            pattern="[A-Za-z0-9_-]+">
+            pattern="[0-9a-zA-Z_\-]+">
     </div>
 </div>
 <div class="field">
     <label class="label">AET Source</label>
     <div class="control">
         <input name="aet_source" class="input" required='true' autocomplete='off' type="text"
             placeholder="Outgoing AET" value="{{targets[edittarget]['aet_source']}}"
-            pattern="[A-Za-z0-9_-]+">
+            pattern="[0-9a-zA-Z_\-]+">
     </div>
 </div>
 <div class="field">

diff --git a/webinterface/templates/targets/rsync-edit.html b/webinterface/templates/targets/rsync-edit.html
@@ -30,12 +30,13 @@
         </div>
     </div>
 
-    <div class="field">
-        <div class="control">
+    <div class="field" style="margin-top: 14px;">
+        <label class="label">Options</label>
+        <div class="control" style="margin-top: 11px;">
                 <input id="run_on_complete" type="checkbox" name="run_on_complete"
                     class="switch is-rounded is-dark" value="True" {% if
                         targets[edittarget].run_on_complete==True %}checked="checked" {% endif%} />
-                        <label for="run_on_complete">Execute command on complete</label>
+                        <label for="run_on_complete">Execute Shell Command After Transfer</label>
 
             <!-- <input name="on_complete" class="input" required='false' autocomplete='off' type="text"
                 placeholder="On Complete" value="{% if targets[edittarget].run_on_complete %}{{targets[edittarget].run_on_complete}}{%endif%}" /> -->

diff --git a/webinterface/templates/targets/s3-edit.html b/webinterface/templates/targets/s3-edit.html
@@ -9,23 +9,23 @@
             size="15">
     </div>
 </div>
-<div class="field" style="margin-top: 30px;">
+<div class="field">
     <label class="label">Region</label>
     <div class="control">
         <input name="region" class="input" required='true' autocomplete='off' type="text"
             placeholder="S3 region" value="{{targets[edittarget]['region']}}"
             size="15">
     </div>
 </div>
-<div class="field" style="margin-top: 30px;">
+<div class="field">
     <label class="label">Prefix</label>
     <div class="control">
         <input name="prefix" class="input" required='true' autocomplete='off' type="text"
             placeholder="Prefix" value="{{targets[edittarget]['prefix']}}"
             size="15">
     </div>
 </div>
-<div class="field" style="margin-top: 30px;">
+<div class="field">
     <label class="label">Access Key ID</label>
     <div class="control">
         <input name="access_key_id" class="input" required='true' autocomplete='off' type="text"
@@ -34,7 +34,7 @@
             size="15">
     </div>
 </div>
-<div class="field" style="margin-top: 30px;">
+<div class="field">
     <label class="label">Secret Access Key</label>
     <div class="control">
         <input name="secret_access_key" class="input" required='true' autocomplete="new-password" type="password"