From a6b08fd1594916349c715c4483800da5b43e0d4d Mon Sep 17 00:00:00 2001
From: Ryan Barrett <git@ryanb.org>
Date: Mon, 15 Jan 2024 14:26:26 -0800
Subject: [PATCH] web: revise disclaimer message for sites that haven't opted
 in

---
 static/style.css         | 38 ++++++++++++++++++++++++++++++++++++--
 templates/user_base.html | 27 +++++++++++++++------------
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/static/style.css b/static/style.css
index 242c933..fcf79bf 100644
--- a/static/style.css
+++ b/static/style.css
@@ -253,6 +253,33 @@ pre .value, code .value, code.value {
   margin-bottom: 1em;
 }
 
+.promo {
+  text-align: left;
+}
+
+.promo form {
+  margin: 10px;  /* same as p */
+}
+
+.promo details {
+  display: inline-block;
+  margin-bottom: 10px;
+}
+
+.promo details[open] {
+  margin-left: 10px;
+  margin-bottom: 0;
+}
+
+.promo details[open] pre {
+  margin-top: 10px;
+  margin-bottom: 0;
+}
+
+.promo summary {
+  cursor: pointer;
+}
+
 #edit-profile em {
   font-style: normal;
 }
@@ -433,12 +460,19 @@ button[disabled]:hover {
   color: #337AB7;
 }
 
-.btn-default:hover {
+.btn-default:hover, .btn-default:hover:focus {
   background-color: #BDE;
   border-color: #337AB7;
   color: #337AB7;
 }
 
+.btn-default:focus {
+  /* same as without :focus */
+  background-color: #CEF;
+  border-color: #337AB7;
+  color: #337AB7;
+}
+
 .btn-default pre {
   background-color: transparent;
   border: none;
@@ -560,7 +594,7 @@ input[type="text"], input[type="url"] {
   font-size: 1em;
 }
 
-input[type="submit"] {
+input[type="submit"], summary.btn {
   font-size: .75em;
 }
 
diff --git a/templates/user_base.html b/templates/user_base.html
index eed975f..5d69ecd 100644
--- a/templates/user_base.html
+++ b/templates/user_base.html
@@ -7,21 +7,24 @@
 {% if user.LABEL == 'web' and not user.has_redirects %}
 <div class="row promo warning">
 
-<p>Want to use <code>{{ user.key.id() }}</code> in your bridged handle instead of <code>web.brid.gy</code>? <a href="/docs#web-enhanced">You can!</a></p>
+<p>Bridgy Fed is providing <a href="{{ user.web_url() }}">{{ user.handle_or_id() }}</a> a presence in the <a href="https://en.wikipedia.org/wiki/Fediverse">fediverse</a>. This account was generated automatically when someone first followed it. <a href="/docs#web-how-post">Learn more here</a>.</p>
+
+<p>Do you own <a href="{{ user.web_url() }}">{{ user.handle_or_id() }}</a>? You can <a href="/docs#opt-out">opt out</a> or <a href="/docs#fediverse-enhanced">upgrade your fediverse handle</a> from <code>@web.brid.gy</code> to <code>@{{ user.handle_or_id() }}</code>.</p>
 
 <form method="post" action="/web-site">
-  Already added the
-  <a href="/docs#fediverse-enhanced"><code>.well-known</code> redirects</a>?
-  <input type="hidden" name="url" value="{{ user.web_url() }}" />
-  <input type="submit" class="btn btn-default" value="Check now" />
+  <span style="vertical-align: top">
+    Got your <a href="/docs#fediverse-enhanced">redirects set up</a>?
+    <input type="hidden" name="url" value="{{ user.web_url() }}" />
+    <input type="submit" class="btn btn-default" value="Check now" />
+  </span>
+
+  {% if user.redirects_error %}
+  <details>
+    <summary class="btn btn-default">See results</summary>
+    <span class="small">{{ user.redirects_error|safe }}</span>
+  </details>
+  {% endif %}
 </form>
-
-{% if user.redirects_error and 'HTTP 404' not in user.redirects_error %}
-<details class="small">
-  {{ user.redirects_error|safe }}
-</details>
-{% endif %}
-
 </div>
 {% endif %} {# promos for web users #}