web UIs: fix dismissable alerts

alerts can now be shown again after the user dismissal

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>

internal/httpd/webclient.go

@@ -1231,7 +1231,7 @@ func (s *httpdServer) handleClientEditFile(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	s.renderEditFilePage(w, r, name, b.String(), util.Contains(user.Filters.WebClient, sdk.WebClientWriteDisabled))
+	s.renderEditFilePage(w, r, name, b.String(), !user.CanAddFilesFromWeb(path.Dir(name)))
 }
 
 func (s *httpdServer) handleClientAddShareGet(w http.ResponseWriter, r *http.Request) {

templates/webadmin/admins.html

@@ -28,12 +28,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 {{define "page_body"}}
 
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">

templates/webadmin/connections.html

@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">

templates/webadmin/defender.html

@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">View and manage auto blocklist</h6>

templates/webadmin/eventactions.html

@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">View and manage event actions</h6>

templates/webadmin/eventrules.html

@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div id="successMsg" class="card mb-4 border-left-success" style="display: none;">
     <div id="successTxt" class="card-body"></div>
 </div>

templates/webadmin/events.html

@@ -28,12 +28,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">Search logs</h6>

templates/webadmin/folders.html

@@ -27,12 +27,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div id="successMsg" class="card mb-4 border-left-success" style="display: none;">
     <div id="successTxt" class="card-body"></div>

templates/webadmin/groups.html

@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">

templates/webadmin/iplists.html

@@ -27,12 +27,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">View and manage IP Lists</h6>

templates/webadmin/mfa.html

@@ -31,12 +31,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successTOTPMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successTOTPTxt" class="card-body"></div>
         </div>
-        <div id="errorTOTPMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorTOTPMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorTOTPTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorTOTPMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorTOTPMsg(){
+                $('#errorTOTPMsg').hide();
+            }
+        </script>
         <div>
             <p>Status: {{if .TOTPConfig.Enabled }}"Enabled". Current configuration: "{{.TOTPConfig.ConfigName}}"{{else}}"Disabled"{{end}}</p>
         </div>
@@ -93,12 +98,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successRecCodesMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successRecCodesTxt" class="card-body"></div>
         </div>
-        <div id="errorRecCodesMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorRecCodesMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorRecCodesTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorRecCodesMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorRecCodesMsg(){
+                $('#errorRecCodesMsg').hide();
+            }
+        </script>
         <div>
             <p>Recovery codes are a set of one time use codes that can be used in place of the TOTP to login to the web UI. You can use them if you lose access to your phone to login to your account and disable or regenerate TOTP configuration.</p>
             <p>To keep your account secure, don't share or distribute your recovery codes. We recommend saving them with a secure password manager.</p>

templates/webadmin/roles.html

@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">

templates/webadmin/users.html

@@ -28,12 +28,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 {{define "page_body"}}
 
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div id="successMsg" class="card mb-4 border-left-success" style="display: none;">
     <div id="successTxt" class="card-body"></div>

templates/webclient/editfile.html

@@ -42,12 +42,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header">
         <h6 class="d-flex justify-content-between align-items-center">

templates/webclient/mfa.html

@@ -31,12 +31,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successTOTPMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successTOTPTxt" class="card-body"></div>
         </div>
-        <div id="errorTOTPMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorTOTPMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorTOTPTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorTOTPMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorTOTPMsg(){
+                $('#errorTOTPMsg').hide();
+            }
+        </script>
         <div>
             <p>Status: {{if .TOTPConfig.Enabled }}"Enabled". Current configuration: "{{.TOTPConfig.ConfigName}}"{{else}}"Disabled"{{end}}</p>
         </div>
@@ -118,12 +123,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successRecCodesMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successRecCodesTxt" class="card-body"></div>
         </div>
-        <div id="errorRecCodesMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorRecCodesMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorRecCodesTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorRecCodesMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorRecCodesMsg(){
+                $('#errorRecCodesMsg').hide();
+            }
+        </script>
         <div>
             <p>Recovery codes are a set of one time use codes that can be used in place of the TOTP to login to the web UI. You can use them if you lose access to your phone to login to your account and disable or regenerate TOTP configuration.</p>
             <p>To keep your account secure, don't share or distribute your recovery codes. We recommend saving them with a secure password manager.</p>

templates/webclient/sharefiles.html

@@ -46,12 +46,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
             </button>
         </div>
         {{end}}
-        <div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorMsg(){
+                $('#errorMsg').hide();
+            }
+        </script>
         <div id="tableContainer" class="table-responsive">
             <table class="table table-hover nowrap" id="dataTable" width="100%" cellspacing="0">
                 <thead>

templates/webclient/shares.html

@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">