From 46b60f9d24ee6a8de2c46ee40e6cdfc5abed3cb4 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Wed, 16 Dec 2020 15:08:37 +0000
Subject: [PATCH] Improve updateconfig docs further

---
 app/blueprints/admin/admin.py              |  4 +++-
 app/templates/packages/release_wizard.html |  9 +++++----
 app/templates/packages/update_config.html  | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/blueprints/admin/admin.py b/app/blueprints/admin/admin.py
index a0b3c1d5..29a84028 100644
--- a/app/blueprints/admin/admin.py
+++ b/app/blueprints/admin/admin.py
@@ -176,6 +176,7 @@ def admin_page():
 			return redirect(url_for("admin.admin_page"))
 
 		elif action == "addupdateconfig":
+			added = 0
 			for pkg in Package.query.filter(Package.repo != None, Package.releases.any(), Package.update_config == None).all():
 				pkg.update_config = PackageUpdateConfig()
 
@@ -184,10 +185,11 @@ def admin_page():
 					pkg.update_config.last_commit = release.commit_hash
 
 				db.session.add(pkg.update_config)
+				added += 1
 
 			db.session.commit()
 
-			flash("Added update configs to packages", "success")
+			flash("Added {} update configs".format(added), "success")
 			return redirect(url_for("admin.admin_page"))
 
 		elif action == "runupdateconfig":
diff --git a/app/templates/packages/release_wizard.html b/app/templates/packages/release_wizard.html
index 82b5b214..fba321d0 100644
--- a/app/templates/packages/release_wizard.html
+++ b/app/templates/packages/release_wizard.html
@@ -14,8 +14,8 @@
 
 	{% if package.repo %}
 		<p>
-			{{ _("When you push a commit or tag to your Git repository, ContentDB can create a new release automatically.") }}
-			{{ _("ContentDB will check your Git repository at 2am UTC every day, but you can use webhooks or the API for faster updates.") }}
+			{{ _("When you push a change to your Git repository, ContentDB can create a new release automatically or send you a reminder.") }}
+			{{ _("ContentDB will check your Git repository every day, but you can use webhooks or the API for faster updates.") }}
 		</p>
 
 		<p>
@@ -23,8 +23,9 @@
 		</p>
 
 		<p class="mt-5">
-			<a class="btn btn-primary" href="{{ package.getUpdateConfigURL() }}">Set up automatic releases</a>
-			<a class="btn btn-secondary ml-2" href="{{ package.getCreateReleaseURL() }}">Create releases manually</a>
+			<a class="btn btn-primary" href="{{ package.getUpdateConfigURL() }}">Automatically</a>
+			<a class="btn btn-secondary ml-2" href="{{ package.getUpdateConfigURL() }}">Manually, enable reminders</a>
+			<a class="btn btn-secondary ml-2" href="{{ package.getCreateReleaseURL() }}">Manually, no reminders</a>
 			<a class="btn btn-secondary ml-2" href="{{ package.getDetailsURL() }}">Later</a>
 		</p>
 	{% else %}
diff --git a/app/templates/packages/update_config.html b/app/templates/packages/update_config.html
index e35ace3a..6df97294 100644
--- a/app/templates/packages/update_config.html
+++ b/app/templates/packages/update_config.html
@@ -1,18 +1,18 @@
 {% extends "base.html" %}
 
 {% block title %}
-	{{ _("Configure Automatic Releases") }} - {{ package.title }}
+	{{ _("Configure Git Update Detection") }} - {{ package.title }}
 {% endblock %}
 
 {% block content %}
-	<h1>{{ _("Configure Automatic Releases") }}</h1>
+	<h1>{{ _("Configure Git Update Detection") }}</h1>
 
 	<p>
-		{{ _("When you push a change to your Git repository, ContentDB can create a new release automatically.") }}
+		{{ _("When you push a change to your Git repository, ContentDB can create a new release automatically or send you a reminder.") }}
 	</p>
 
 	<p>
-		{{ _("ContentDB will poll your Git repository at 2am UTC every day, if your package is approved.") }}
+		{{ _("ContentDB will poll your Git repository every day, if your package is approved.") }}
 		{{ _("You should consider using webhooks or the API for faster releases.") }}
 	</p>
 
@@ -33,10 +33,13 @@
 		{{ render_field(form.trigger, class_="mt-5") }}
 
 		<p class="text-warning mb-4">
-			<span class="fas fa-exclamation-triangle mr-2"></span>
+			<small>
+				<span class="fas fa-exclamation-triangle mr-2"></span>
 
-			{{ _("The new tag trigger isn't supported yet.") }}
-			{{ _("In the meantime, you can use webhooks to create releases on tag events.") }}
+				{{ _("The new tag trigger isn't supported yet.") }}
+				{{ _("If you choose it, it won't trigger until it is supported.") }}
+				{{ _("In the meantime, you can use webhooks to create releases on tag events.") }}
+			</small>
 		</p>