Add new fields for feed username/password

3 files changed, 23 insertions, 5 deletions

diff --git a/template/html/add_subscription.html b/template/html/add_subscription.html
index b65dabb..bff7975 100644
--- a/template/html/add_subscription.html
+++ b/template/html/add_subscription.html
@@ -36,7 +36,17 @@
             {{ end }}
         </select>
 
-        <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "Fetch original content" }}</label>
+        <fieldset>
+            <legend>{{ t "Advanced Options" }}</legend>
+
+            <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "Fetch original content" }}</label>
+
+            <label for="form-username">{{ t "Feed Username" }}</label>
+            <input type="text" name="username" id="form-username" value="{{ .form.Username }}">
+
+            <label for="form-password">{{ t "Feed Password" }}</label>
+            <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+        </fieldset>
 
         <div class="buttons">
             <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Find a subscription" }}</button>
diff --git a/template/html/choose_subscription.html b/template/html/choose_subscription.html
index a1a8e68..7668605 100644
--- a/template/html/choose_subscription.html
+++ b/template/html/choose_subscription.html
@@ -18,7 +18,12 @@
 
 <form action="{{ route "chooseSubscription" }}" method="POST">
     <input type="hidden" name="csrf" value="{{ .csrf }}">
-    <input type="hidden" name="category_id" value="{{ .categoryID }}">
+    <input type="hidden" name="category_id" value="{{ .form.CategoryID }}">
+    <input type="hidden" name="username" value="{{ .form.Username }}">
+    <input type="hidden" name="password" value="{{ .form.Password }}">
+    {{ if .form.Crawler }}
+        <input type="hidden" name="crawler" value="1">
+    {{ end }}
 
     <h3>{{ t "Choose a Subscription" }}</h3>
 
@@ -29,9 +34,6 @@
         </div>
     {{ end }}
 
-    <br>
-    <label><input type="checkbox" name="crawler" value="1" {{ if .form.Crawler }}checked{{ end }}> {{ t "Fetch original content" }}</label>
-
     <div class="buttons">
         <button type="submit" class="button button-primary" data-label-loading="{{ t "Loading..." }}">{{ t "Subscribe" }}</button>
     </div>
diff --git a/template/html/edit_feed.html b/template/html/edit_feed.html
index e5bb60a..704472b 100644
--- a/template/html/edit_feed.html
+++ b/template/html/edit_feed.html
@@ -45,6 +45,12 @@
         <label for="form-feed-url">{{ t "Feed URL" }}</label>
         <input type="url" name="feed_url" id="form-feed-url" placeholder="https://domain.tld/" value="{{ .form.FeedURL }}" required>
 
+        <label for="form-username">{{ t "Feed Username" }}</label>
+        <input type="text" name="username" id="form-username" value="{{ .form.Username }}">
+
+        <label for="form-password">{{ t "Feed Password" }}</label>
+        <input type="password" name="password" id="form-password" value="{{ .form.Password }}">
+
         <label for="form-scraper-rules">{{ t "Scraper Rules" }}</label>
         <input type="text" name="scraper_rules" id="form-scraper-rules" value="{{ .form.ScraperRules }}">