From 512983a0ffa6dcb6d95ae2525e9d7662035906e2 Mon Sep 17 00:00:00 2001
From: m15o <m15o@pm.me>
Date: Sat, 21 May 2022 14:22:20 +0200
Subject: [PATCH] fix widget

---
 assets/style.css                     |  4 ++++
 web/handler/html.go                  | 17 ++++++++---------
 web/handler/html/current_status.html |  2 +-
 web/handler/html/index.html          |  1 -
 web/handler/html/user.html           | 14 +++++++-------
 web/handler/tpl.go                   |  2 +-
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/assets/style.css b/assets/style.css
index 3a60d19..55155c9 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -12,6 +12,10 @@ body {
     max-width: 500px;
 }
 
+.profile-picture {
+    max-width: 100px;
+}
+
 .flash {
     background-color: lightgreen;
     padding: 0.5em 1em;
diff --git a/web/handler/html.go b/web/handler/html.go
index 1dbb168..0f76af4 100644
--- a/web/handler/html.go
+++ b/web/handler/html.go
@@ -112,7 +112,7 @@ var TplMap = map[string]string{
             </table>
         </form>
         <p>Past this code into your HTML file:</p>
-        <textarea style="width: 100%; max-width: 500px; height: 75px;"><script src="https://status.cafe/current-status.js?name={{ .name }}"></script></textarea>
+        <textarea style="width: 100%; max-width: 500px; height: 75px;"><div id="statuscafe"><div id="statuscafe-username"></div><div id="statuscafe-content"></div></div><script src="https://status.cafe/current-status.js?name={{ .name }}" defer></script></textarea>
         <p>Past this code into your CSS file:</p>
         <textarea style="width: 100%; max-width: 500px; height: 175px;">#statuscafe {
     padding: .5em;
@@ -186,7 +186,6 @@ var TplMap = map[string]string{
     </section>
     <section>
         <h2>Status stream</h2>
-        <p class="flash">The <a href="https://forum.status.cafe">forum</a> has opened! <a href="/forum-key">Generate your key</a> to <a href="https://forum.status.cafe/register">register</a>. Best viewed with a hot beverage.</p>
         {{ range .statuses }}
         <article class="status">
             {{ template "status" . }}
@@ -367,26 +366,26 @@ var TplMap = map[string]string{
     <section>
         <h2>{{ .user }}</h2>
         {{ if .picture }}
-        <img src="{{ .picture }}" width="100" class="profile-picture"/>
+        <img src="{{ .picture }}" class="profile-picture"/>
         {{ end }}
         <p><a href="/users/{{ .user }}.atom">Subscribe via Atom</a></p>
         <dl>
-            <dt>Homepage</dt>
-            <dd>
+            <dt class="homepage">Homepage</dt>
+            <dd class="homepage">
                 {{ if .homepage }}
                 <a href="{{ .homepage }}" target="_blank">{{ .homepage }}</a></dd>
                 {{ else }}
                 Not defined
                 {{ end }}
-            <dt>Email</dt>
-            <dd>
+            <dt class="email">Email</dt>
+            <dd class="email">
                 {{ if .email }}
                 <a href="mailto:{{ .email }}" target="_blank">{{ .email }}</a></dd>
                 {{ else }}
                 Not defined
                 {{ end }}
-            <dt>About</dt>
-            <dd>
+            <dt class="about">About</dt>
+            <dd class="about">
                 {{ if .about }}
                 {{ .about }}
                 {{ else }}
diff --git a/web/handler/html/current_status.html b/web/handler/html/current_status.html
index 489c2fc..2f25809 100644
--- a/web/handler/html/current_status.html
+++ b/web/handler/html/current_status.html
@@ -38,7 +38,7 @@
             </table>
         </form>
         <p>Past this code into your HTML file:</p>
-        <textarea style="width: 100%; max-width: 500px; height: 75px;"><script src="https://status.cafe/current-status.js?name={{ .name }}"></script></textarea>
+        <textarea style="width: 100%; max-width: 500px; height: 75px;"><div id="statuscafe"><div id="statuscafe-username"></div><div id="statuscafe-content"></div></div><script src="https://status.cafe/current-status.js?name={{ .name }}" defer></script></textarea>
         <p>Past this code into your CSS file:</p>
         <textarea style="width: 100%; max-width: 500px; height: 175px;">#statuscafe {
     padding: .5em;
diff --git a/web/handler/html/index.html b/web/handler/html/index.html
index 4faaa33..b275c5c 100644
--- a/web/handler/html/index.html
+++ b/web/handler/html/index.html
@@ -29,7 +29,6 @@
     </section>
     <section>
         <h2>Status stream</h2>
-        <p class="flash">The <a href="https://forum.status.cafe">forum</a> has opened! <a href="/forum-key">Generate your key</a> to <a href="https://forum.status.cafe/register">register</a>. Best viewed with a hot beverage.</p>
         {{ range .statuses }}
         <article class="status">
             {{ template "status" . }}
diff --git a/web/handler/html/user.html b/web/handler/html/user.html
index af49a6f..a5eb5c1 100644
--- a/web/handler/html/user.html
+++ b/web/handler/html/user.html
@@ -9,26 +9,26 @@
     <section>
         <h2>{{ .user }}</h2>
         {{ if .picture }}
-        <img src="{{ .picture }}" width="100" class="profile-picture"/>
+        <img src="{{ .picture }}" class="profile-picture"/>
         {{ end }}
         <p><a href="/users/{{ .user }}.atom">Subscribe via Atom</a></p>
         <dl>
-            <dt>Homepage</dt>
-            <dd>
+            <dt class="homepage">Homepage</dt>
+            <dd class="homepage">
                 {{ if .homepage }}
                 <a href="{{ .homepage }}" target="_blank">{{ .homepage }}</a></dd>
                 {{ else }}
                 Not defined
                 {{ end }}
-            <dt>Email</dt>
-            <dd>
+            <dt class="email">Email</dt>
+            <dd class="email">
                 {{ if .email }}
                 <a href="mailto:{{ .email }}" target="_blank">{{ .email }}</a></dd>
                 {{ else }}
                 Not defined
                 {{ end }}
-            <dt>About</dt>
-            <dd>
+            <dt class="about">About</dt>
+            <dd class="about">
                 {{ if .about }}
                 {{ .about }}
                 {{ else }}
diff --git a/web/handler/tpl.go b/web/handler/tpl.go
index 82de0a4..6315e33 100644
--- a/web/handler/tpl.go
+++ b/web/handler/tpl.go
@@ -16,7 +16,7 @@ func (h *Handler) initTpl() {
 	for name, content := range TplMap {
 		views[name] = template.Must(template.New("main").Funcs(template.FuncMap{
 			"faces": func() []string {
-				return []string{"🙂", "😎", "😛", "🥰", "😂", "❤️", "👽", "😱", "🤔", "😶", "😯", "🤒", "😡", "🥺", "🥳", "🤖", "💀", "😴", "😭", "🤐", "💾", "👀", "☕", "🍺", "📖", "🔥", "❄️", "✨", "💡", "🎶", "✈️", "🚄", "🍿", "📰", "✏️", "🍱", "⛵", "🎁", "🌧️", "🌙", "🎨", "📺", "🍕", "✅", "🐶", "🐱"}
+				return []string{"🙂", "😎", "😛", "🥰", "😂", "❤️", "👽", "😱", "😭", "🤔", "😶", "😯", "🤒", "😡", "🥺", "🥳", "🤖", "💀", "😴", "😭", "🤐", "💾", "👀", "☕", "🍺", "📖", "🔥", "❄️", "✨", "💡", "🎶", "✈️", "🚄", "🍿", "📰", "✏️", "🍱", "⛵", "🎁", "🌧️", "🌙", "🎨", "📺", "🍕", "✅", "🐶", "🐱", "🌱"}
 			}}).Parse(commonTemplates + content))
 	}
 }