Changeset d8e3ff7 in Klonkt for src/views

Timestamp:

06/30/2026 01:38:13 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

5924bbf

Parents:

8b700ad

Message:

Revert "feat(circle): filter the Circle feed by member (clickable chips + Following "Show" link)"

This reverts commit 462a931950d40335f90f98364e56eb5eda17c6a2.

Location:

src/views/pages

Files:

• circle-feed.ejs (modified) (3 diffs)
• following.ejs (modified) (2 diffs)

src/views/pages/circle-feed.ejs

@@ -14 +14 @@
   </span>
   <h1><%= t('cfeed.title') %></h1>
-  <p class="cirkel-sub"><%= (typeof activeName !== 'undefined' && activeName) ? activeName : t('cfeed.sub') %></p>
-  <% var _everyoneActive = (typeof activeActor === 'undefined' || !activeActor); %>
+  <p class="cirkel-sub"><%= t('cfeed.sub') %></p>
   <% if (typeof sites !== 'undefined' && sites && sites.length) { %>
     <% if (sites.length <= 5) { %>
     <div class="cirkel-members">
-      <a class="cirkel-member cirkel-everyone <%= _everyoneActive ? 'is-active' : '' %>" href="/cirkel"><span class="cirkel-member-name"><%= t('cfeed.all') %></span></a>
       <% sites.forEach(function(s){ %>
-        <% if (s.actor_uri) { %><a class="cirkel-member <%= s.active ? 'is-active' : '' %>" href="/cirkel?actor=<%= encodeURIComponent(s.actor_uri) %>" title="<%= s.name %>"><% } else { %><span class="cirkel-member" title="<%= s.name %>"><% } %>
+        <% if (s.url) { %><a class="cirkel-member" href="<%= s.url %>" target="_blank" rel="noopener" title="<%= s.name %>"><% } else { %><span class="cirkel-member" title="<%= s.name %>"><% } %>
           <span class="cirkel-avatar"<% if (s.avatar) { %> style="background-image:url('<%= s.avatar %>');background-color:transparent"<% } %>><% if (!s.avatar) { %><%= (s.name || '?').charAt(0).toUpperCase() %><% } %></span>
           <span class="cirkel-member-name"><%= s.name %></span>
-        <% if (s.actor_uri) { %></a><% } else { %></span><% } %>
+        <% if (s.url) { %></a><% } else { %></span><% } %>
       <% }); %>
     </div>
@@ -40 +38 @@
           <h2 class="cirkel-modal-h"><%= t('cfeed.count', { n: sites.length }) %></h2>
           <ul class="cirkel-modal-list">
-            <li>
-              <a class="cirkel-modal-link <%= _everyoneActive ? 'is-active' : '' %>" href="/cirkel">
-                <span class="cirkel-member-name"><%= t('cfeed.all') %></span>
-              </a>
-            </li>
             <% sites.forEach(function(s){ %>
               <li>
-                <% if (s.actor_uri) { %><a class="cirkel-modal-link <%= s.active ? 'is-active' : '' %>" href="/cirkel?actor=<%= encodeURIComponent(s.actor_uri) %>"><% } else { %><span class="cirkel-modal-link"><% } %>
+                <% if (s.url) { %><a class="cirkel-modal-link" href="<%= s.url %>" target="_blank" rel="noopener"><% } else { %><span class="cirkel-modal-link"><% } %>
                   <span class="cirkel-avatar"<% if (s.avatar) { %> style="background-image:url('<%= s.avatar %>');background-color:transparent"<% } %>><% if (!s.avatar) { %><%= (s.name || '?').charAt(0).toUpperCase() %><% } %></span>
                   <span class="cirkel-member-name"><%= s.name %></span>
-                <% if (s.actor_uri) { %></a><% } else { %></span><% } %>
+                  <% if (s.url) { %><span class="cirkel-modal-go" aria-hidden="true">↗</span><% } %>
+                <% if (s.url) { %></a><% } else { %></span><% } %>
               </li>
             <% }); %>
@@ -104 +98 @@
   transition: border-color .15s, transform .15s; }
 .cirkel-member:hover { border-color: var(--accent); transform: translateY(-1px); }
-.cirkel-member.is-active { border-color: var(--accent); background: color-mix(in srgb, var(--accent) 16%, transparent); }
-.cirkel-everyone { padding: .28rem .9rem; }
-.cirkel-modal-link.is-active { background: color-mix(in srgb, var(--accent) 14%, transparent); }
 .cirkel-avatar { width: 30px; height: 30px; border-radius: 50%; flex-shrink: 0;
   background-size: cover; background-position: center; background-color: var(--accent);

src/views/pages/following.ejs

@@ -30 +30 @@
             <label><input type="checkbox" name="auto_boost" value="1" <%= f.auto_boost ? 'checked' : '' %> data-autosubmit> ✨ <%= t('tl.autoboost') %></label>
           </form>
-          <% if (f.auto_boost) { %><a class="tl-foll-show" href="/cirkel?actor=<%= encodeURIComponent(f.actor_uri) %>" title="<%= t('tl.show') %>"><%= t('tl.show') %></a><% } %>
           <form method="post" action="/news/unfollow"><input type="hidden" name="actor_uri" value="<%= f.actor_uri %>"><button type="submit" class="tl-unfollow"><%= t('tl.unfollow') %></button></form>
         </li>
@@ -67 +66 @@
   .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; }
   .tl-unfollow:hover { color: var(--ink, #000); }
-  .tl-foll-show { font-size: .8rem; text-decoration: none; white-space: nowrap; color: var(--accent, #888);
-    border: 1px solid color-mix(in srgb, var(--accent, #888) 35%, transparent); border-radius: 8px; padding: .25rem .6rem; }
-  .tl-foll-show:hover { background: color-mix(in srgb, var(--accent, #888) 12%, transparent); }
   .tl-empty { color: var(--ink-soft, #888); }
 </style>