Add new fields for feed username/password

5 files changed, 51 insertions, 15 deletions

diff --git a/template/common.go b/template/common.go
index 986e0a2..15b144c 100644
--- a/template/common.go
+++ b/template/common.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2018-05-21 12:40:10.613112 +0200 CEST m=+0.010961753
+// 2018-06-19 22:56:40.319198468 -0700 PDT m=+0.041010588
 
 package template
 
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 }}">
 
diff --git a/template/views.go b/template/views.go
index 27297bb..30c9dad 100644
--- a/template/views.go
+++ b/template/views.go
@@ -1,5 +1,5 @@
 // Code generated by go generate; DO NOT EDIT.
-// 2018-05-21 12:14:59.39668234 -0700 PDT m=+0.007850936
+// 2018-06-19 22:56:40.310658103 -0700 PDT m=+0.032470223
 
 package template
 
@@ -83,7 +83,17 @@ var templateViewsMap = map[string]string{
             {{ 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>
@@ -239,7 +249,12 @@ var templateViewsMap = map[string]string{
 
 <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>
 
@@ -250,9 +265,6 @@ var templateViewsMap = map[string]string{
         </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>
@@ -413,6 +425,12 @@ var templateViewsMap = map[string]string{
         <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 }}">
 
@@ -1250,15 +1268,15 @@ var templateViewsMap = map[string]string{
 
 var templateViewsMapChecksums = map[string]string{
 	"about":               "ad2fb778fc73c39b733b3f81b13e5c7d689b041fadd24ee2d4577f545aa788ad",
-	"add_subscription":    "053c920b0d7e109ea19dce6a448e304ce720db8633588ea04db16677f7209a7b",
+	"add_subscription":    "5067776ce452543fceed8b62defe5fbfed41e3d5bd79b5f2acf8c45ef4faac6d",
 	"bookmark_entries":    "8e5fea7559218a34289c2f0e54955fc0ef3b9e629205927841cbcc2276aefb2a",
 	"categories":          "ca1280cd157bb527d4fc907da67b05a8347378f6dce965b9389d4bcdf3600a11",
 	"category_entries":    "6ad52c8d0c28e21ea48be76228ea8432adde1dc190010753a48928477d52e065",
-	"choose_subscription": "a325f9c976ca2b2dc148e25c8fef0cf6ccab0e04e86e604e7812bb18dc4cdde1",
+	"choose_subscription": "c680e690255d53da1f4f11e9b997bc2a32ca659f1245076e5738243859e17876",
 	"create_category":     "2b82af5d2dcd67898dc5daa57a6461e6ff8121a6089b2a2a1be909f35e4a2275",
 	"create_user":         "233764778c915754141a20429ec8db9bf80ef2d7704867a2d7232c1e9df233ae",
 	"edit_category":       "cee720faadcec58289b707ad30af623d2ee66c1ce23a732965463250d7ff41c5",
-	"edit_feed":           "d2c1c8486d7faf4ee58151ccf3e3c690e53bd6872050d291c5db8452a83c3d53",
+	"edit_feed":           "66dd3ca6357645944a99f8b9c0455253e6d2bf5f36faf9aa322689b6299b0104",
 	"edit_user":           "321e0a60cf3bf7441bff970f4920e4c5b7c1883f80ab1d1674f8137954b25033",
 	"entry":               "bd611521ebb46714fce434fe7fa5d4e53e50da4c3ed02450ad3557f614f16e14",
 	"feed_entries":        "4dffdb55cfad29df20612efe7ed2dbed03d919c4556898543ab6450f610d3c99",