source: Klonkt/src/views/pages/connect.ejs@ 38d5e40

main
Last change on this file since 38d5e40 was fc664ce, checked in by Robin <roboburr@…>, 4 weeks ago

Je volglijst verhuist mee naar de migrate-pagina

Robin stuurde een schermafbeelding van het blok op Connect: "this is still very
ugly". Terecht. "Kies je gedownloade CSV-bestand:" stond naast zijn invoerveld,
"Of plak" werd naar rechts geduwd en "de lijst hier:" viel eronder, met een
textarea van vijf tekens breed ertussen.

De reden is simpel: er was geen enkele opmaak voor .tl-move. Geen display,
geen breedte, niets. De labels waren dus inline en de tekst brak om de velden
heen.

Niet ter plekke bijgepoetst maar verplaatst, want dit is een migratie-optie en
die horen sinds vanmiddag bij elkaar. Op /admin/migrate erft het blok de
kaartopmaak die de andere secties al hadden: labels op eigen regels, invoervelden
over de volle breedte.

Gemeten in de browser: label display block, textarea 408px in een kaart van
455px. Op Connect blijft niets achter.

Changed files:
src/views/pages/admin-migrate.ejs

  • de volglijst als echte sectie, met downloadknop, bestand, plakveld

src/views/pages/connect.ejs

  • het ongestileerde <details>-blok eruit

src/routes/posts.js

  • /news/following/import mag terugsturen naar een eigen pad

src/services/i18n.js

  • mig.follows_note in nl/en/de

remarks: de sectie hergebruikt de bestaande tl.move_*-teksten, dus er hoefde
niets opnieuw vertaald. Suite 1005 groen.

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

  • Property mode set to 100644
File size: 11.1 KB
Line 
1<div class="tl-wrap">
2 <%- include('../partials/fedi-tabs', { active: 'connect' }) %>
3 <h1 class="tl-title"><%= t('tl.connect') %></h1>
4 <% if (typeof success !== 'undefined' && success) { %><div class="alert alert-success"><%= success %></div><% } %>
5 <% if (typeof error !== 'undefined' && error) { %><div class="alert alert-error"><%= error %></div><% } %>
6
7 <%# FEP-633c §2 + §3.6: who guards this account, and how available each of
8 them is. Connect is the "who am I connected to" page, and a guardian is
9 the one connection a ward should never have to hunt for. Availability in
10 buddy-list language on the responsibility axis; the labels are UI, the
11 wire keeps the spec terms. Never public: this page is the owner's. %>
12 <% if (typeof myGuardians !== 'undefined' && myGuardians.length) { %>
13 <section class="conn-guardians">
14 <h2 class="conn-gtitle">&#128737; <%= t('msg.guardians_label') %></h2>
15 <ul class="conn-glist">
16 <% myGuardians.forEach(function(g){
17 var _st = g.availability === 'away' ? 'away' : (g.availability === 'dormant' ? 'dormant' : 'active');
18 var _lbl = _st === 'away' ? t('msg.g_away', { date: g.awayUntil ? formatDate(g.awayUntil) : '?' })
19 : (_st === 'dormant' ? t('msg.g_offline') : t('msg.g_available')); %>
20 <li class="conn-guardian">
21 <span class="conn-gdot conn-gdot--<%= _st %>" aria-hidden="true"></span>
22 <span class="conn-ghandle"><%= g.handle %></span>
23 <span class="conn-gstate"><%= _lbl %></span>
24 </li>
25 <% }); %>
26 </ul>
27 </section>
28 <% } %>
29
30 <% var _moved = (typeof movedTo !== 'undefined' && movedTo) ? movedTo : null; %>
31 <% if (_moved) { %>
32 <%# De uitgaande kant staat op slot (FEP-7628). Dat hoort te blijken voordat
33 je op een knop drukt, niet daarna uit een foutmelding. Lezen blijft wel
34 gewoon werken, dus de lijst hieronder staat er nog. %>
35 <div class="alert alert-error tl-moved">
36 <strong><%= t('tl.moved_title') %></strong>
37 <p><%= t('tl.moved_lead') %> <a href="<%= _moved %>"><%= _moved %></a></p>
38 <p class="form-hint"><%= t('tl.moved_hint') %></p>
39 </div>
40 <% } else { %>
41 <form method="post" action="/news/follow" class="tl-follow">
42 <input type="text" name="handle" placeholder="@naam@server.social of site.com" autocomplete="off" spellcheck="false" required>
43 <button type="submit" class="btn btn-primary"><%= t('tl.follow_btn') %></button>
44 <label class="tl-follow-ab" title="<%= t('tl.autoboost_hint') %>"><input type="checkbox" name="auto_boost" value="1"> &#10024; <%= t('tl.autoboost_follow') %></label>
45 </form>
46 <% } %>
47
48 <%# Je volglijst meenemen staat sinds 14-8 op /admin/migrate, bij de rest van
49 de verhuizing (Robin: alle migratie-opties op de migrate-pagina). Hier
50 stond hij bovendien zonder enige opmaak: labels als losse tekst naast hun
51 invoerveld. Op die pagina erft hij de kaartopmaak. %>
52
53 <%
54 var conns = connections || [];
55 var reachable = conns.filter(function (c) { return !c.unreachable; });
56 var unreachable = conns.filter(function (c) { return c.unreachable; });
57 // Display fields for one connection: name/handle (fallback: derive from actor_uri).
58 function connView(c) {
59 var host = '', user = '';
60 try { var u = new URL(c.actor_uri); host = u.hostname; user = (u.pathname.split('/').filter(Boolean).pop() || ''); } catch (e) {}
61 var handle = c.handle || (user ? ('@' + user + '@' + host) : c.actor_uri);
62 var display = c.name || handle;
63 return { handle: handle, display: display,
64 initial: String(display || '?').replace(/^@/, '').charAt(0).toUpperCase(),
65 profileUrl: c.url || c.actor_uri };
66 }
67 function arrow(dir) { return dir === 'mutual' ? '↔' : (dir === 'following' ? '→' : '←'); }
68 %>
69
70 <% if (reachable.length) { %>
71 <ul class="tl-foll-list">
72 <% reachable.forEach(function (c) { var v = connView(c); %>
73 <li class="tl-foll">
74 <span class="tl-foll-av"><% if (c.icon) { %><img src="<%= avatar(c.icon, 96) %>" alt=""><% } else { %><%= v.initial %><% } %></span>
75 <span class="tl-foll-meta">
76 <a href="<%= v.profileUrl %>" target="_blank" rel="nofollow noopener"><%= v.display %></a>
77 <span class="conn-sub">
78 <span class="conn-dir conn-dir--<%= c.direction %>"><%= arrow(c.direction) %> <%= t('tl.dir_' + c.direction) %></span>
79 <% if (c.follower && c.last_delivery_at) { %><span class="conn-deliv">&middot; <%= t('tl.last_delivery') %>: <%= formatDateTime(c.last_delivery_at) %></span><% } %>
80 </span>
81 </span>
82 <% if (c.following) { %>
83 <form method="post" action="/news/autoboost" class="tl-foll-ab" title="<%= t('tl.autoboost_hint') %>">
84 <input type="hidden" name="actor_uri" value="<%= c.actor_uri %>">
85 <label><input type="checkbox" name="auto_boost" value="1" <%= c.auto_boost ? 'checked' : '' %> data-autosubmit> &#10024; <%= t('tl.autoboost') %></label>
86 </form>
87 <form method="post" action="/news/unfollow"><input type="hidden" name="actor_uri" value="<%= c.actor_uri %>"><button type="submit" class="tl-unfollow"><%= t('tl.unfollow') %></button></form>
88 <% } %>
89 </li>
90 <% }); %>
91 </ul>
92 <% } else { %>
93 <p class="tl-empty"><%= t('tl.connect_empty') %></p>
94 <% } %>
95
96 <% if (unreachable.length) { %>
97 <details class="conn-unreach">
98 <summary>&#9888; <%= t('tl.unreachable') %> (<%= unreachable.length %>)</summary>
99 <p class="conn-unreach-lead"><%= t('tl.unreachable_lead') %></p>
100 <ul class="tl-foll-list">
101 <% unreachable.forEach(function (c) { var v = connView(c); %>
102 <li class="tl-foll is-stale">
103 <span class="tl-foll-av"><% if (c.icon) { %><img src="<%= avatar(c.icon, 96) %>" alt=""><% } else { %><%= v.initial %><% } %></span>
104 <span class="tl-foll-meta">
105 <a href="<%= v.profileUrl %>" target="_blank" rel="nofollow noopener"><%= v.display %></a>
106 <span class="conn-sub">
107 <span class="conn-dir conn-dir--<%= c.direction %>"><%= arrow(c.direction) %> <%= t('tl.dir_' + c.direction) %></span>
108 <% if (c.last_delivery_at) { %><span class="conn-deliv">&middot; <%= t('tl.last_delivery') %>: <%= formatDateTime(c.last_delivery_at) %></span><% } else { %><span class="conn-never">&middot; <%= t('tl.never_delivered') %></span><% } %>
109 <% if (c.last_error_at) { %><span class="conn-err">&middot; <%= t('tl.delivery_failed') %>: <%= formatDateTime(c.last_error_at) %></span><% } %>
110 </span>
111 </span>
112 <% if (c.follower_id) { %>
113 <form method="post" action="/followers/<%= c.follower_id %>/remove" onsubmit="return confirm('<%= t('tl.remove_confirm') %>')">
114 <button type="submit" class="tl-unfollow"><%= t('tl.remove_follower') %></button>
115 </form>
116 <% } %>
117 </li>
118 <% }); %>
119 </ul>
120 </details>
121 <% } %>
122</div>
123
124<style>
125 /* Guardians (FEP-633c 3.6): the buddy-list dot on the responsibility axis.
126 Green available, yellow declared away with an end, grey observed dormant
127 (one answer restores). Set apart from the follow list on purpose: these
128 are not people you chose to follow, they are the ones looking after you. */
129 .conn-guardians { margin: 0 0 1.25rem; padding: .8rem 1rem; border-radius: 12px;
130 border: 1px solid color-mix(in srgb, var(--ink, #000) 10%, transparent);
131 background: color-mix(in srgb, var(--ink, #000) 2.5%, transparent);
132 border-left: 3px solid #35a2ff; }
133 .conn-gtitle { margin: 0 0 .5rem; font-size: .95rem; }
134 .conn-glist { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: .35rem; }
135 .conn-guardian { display: flex; align-items: center; gap: .5rem; flex-wrap: wrap; }
136 .conn-gdot { width: 8px; height: 8px; border-radius: 50%; flex: 0 0 auto; }
137 .conn-gdot--active { background: #4caf7d; }
138 .conn-gdot--away { background: #e0a83a; }
139 .conn-gdot--dormant { background: #8a93a3; }
140 .conn-ghandle { font-weight: 600; }
141 .conn-gstate { color: var(--ink-soft, #888); font-size: .82rem; }
142 .tl-wrap { max-width: 640px; margin: 1rem auto; padding: 0 1rem; }
143 .tl-title { margin: 0 0 .75rem; }
144 .tl-empty { color: var(--ink-soft, #888); }
145 .tl-follow { display: flex; gap: .5rem; margin: 0 0 1.25rem; flex-wrap: wrap; align-items: center; }
146 .tl-follow input[type="text"] { flex: 1; min-width: 200px; height: 2.4rem; padding: 0 .9rem; border-radius: 999px; font: inherit;
147 border: 1px solid color-mix(in srgb, var(--ink, #000) 18%, transparent); background: color-mix(in srgb, var(--ink, #000) 4%, transparent); color: var(--ink, #000); }
148 .tl-follow-ab { font-size: .85rem; color: var(--ink-soft, #888); display: inline-flex; align-items: center; gap: .3rem; cursor: pointer; }
149 .tl-foll-list { list-style: none; padding: 0; margin: 0; display: flex; flex-direction: column; gap: .4rem; }
150 .tl-foll { display: flex; align-items: center; gap: .6rem; padding: .45rem .6rem; border-radius: 12px; background: color-mix(in srgb, var(--ink, #000) 4%, transparent); }
151 .tl-foll.is-stale { background: color-mix(in srgb, #c0392b 10%, transparent); }
152 .tl-foll-av { flex: 0 0 36px; width: 36px; height: 36px; border-radius: 50%; overflow: hidden; display: inline-flex; align-items: center; justify-content: center; font-weight: 700; background: color-mix(in srgb, var(--accent, #888) 20%, transparent); color: var(--accent, #555); }
153 .tl-foll-av img { width: 100%; height: 100%; object-fit: cover; background: #fff; }
154 .tl-foll-meta { flex: 1; min-width: 0; display: flex; flex-direction: column; line-height: 1.3; }
155 .tl-foll-meta a { color: var(--ink, inherit); text-decoration: none; font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
156 .tl-foll-meta a:hover { text-decoration: underline; }
157 .conn-sub { font-size: .78rem; color: var(--ink-soft, #888); display: inline-flex; flex-wrap: wrap; gap: .35rem; align-items: baseline; }
158 .conn-dir { font-weight: 600; }
159 .conn-dir--mutual { color: var(--accent, #06c); }
160 .conn-dir--following { color: color-mix(in srgb, var(--ink, #000) 62%, transparent); }
161 .conn-dir--follower { color: color-mix(in srgb, var(--ink, #000) 62%, transparent); }
162 .conn-never, .conn-err { color: #c0392b; }
163 .tl-foll-ab { margin: 0; font-size: .8rem; color: var(--ink-soft, #888); cursor: pointer; }
164 .tl-foll-ab label { display: inline-flex; align-items: center; gap: .25rem; cursor: pointer; }
165 .tl-unfollow { background: none; border: 1px solid color-mix(in srgb, var(--ink, #000) 18%, transparent); border-radius: 8px; padding: .25rem .6rem; font-size: .8rem; color: var(--ink-soft, #888); cursor: pointer; white-space: nowrap; }
166 .tl-unfollow:hover { color: var(--ink, #000); }
167 .conn-unreach { margin: 1.25rem 0 0; border-top: 1px solid color-mix(in srgb, var(--ink, #000) 10%, transparent); padding-top: .75rem; }
168 .conn-unreach summary { cursor: pointer; font-weight: 600; color: #c0392b; }
169 .conn-unreach-lead { font-size: .8rem; color: var(--ink-soft, #888); margin: .5rem 0 .75rem; }
170</style>
Note: See TracBrowser for help on using the repository browser.