Use '@' prefix for all usernames
authorr <r@freesoftwareextremist.com>
Tue, 22 Sep 2020 15:42:16 +0000 (15:42 +0000)
committerr <r@freesoftwareextremist.com>
Tue, 22 Sep 2020 16:35:50 +0000 (16:35 +0000)
static/style.css
templates/nav.tmpl
templates/notification.tmpl
templates/status.tmpl
templates/user.tmpl
templates/userlist.tmpl

index d27b9e67de12e883ff9179aba1293175281aa3d1..db2ae1bbd313141e6730557a1fbc5c77dcc825ce 100644 (file)
        overflow: auto;
 }
 
-.notification-follow-uname {
-       margin-top: 8px;
-}
-
 .notification-time {
        margin-left: 8px;
 }
index cfac439accd633db7cd60bb6f1208d20370e74ef..d98410f5a64eb1ea31d1fdb9c038413776685326 100644 (file)
@@ -10,7 +10,7 @@
                <div>
                        <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span>  
                        <a class="nav-link" href="/user/{{.User.ID}}">
-                               <span class="status-uname"> {{.User.Acct}} </span>
+                               <span class="status-uname"> @{{.User.Acct}} </span>
                        </a>
                </div>
                <div>
index 2943847a14367fb1b881376fa7b73172aea2cf7f..55424dae30e105d43fc07dbc49687fba68e4183a 100644 (file)
@@ -22,7 +22,7 @@
        <div>
                <div class="status-profile-img-container">
                        <a class="img-link" href="/user/{{.Account.ID}}">
-                               <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="{{.Account.Acct}}" alt="profile-avatar" height="48" />
+                               <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="profile-avatar" height="48" />
                        </a>
                </div>
                <div class="notification-follow">
@@ -33,8 +33,8 @@
                                        - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
                                </span>
                        </div>
-                       <div class="notification-follow-uname">
-                               @{{.Account.Acct}}
+                       <div>
+                               <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a>
                        </div>
                </div>
        </div>
        {{else if eq .Type "reblog"}}
        <div class="retweet-info">
                <a class="img-link" href="/user/{{.Account.ID}}">
-                       <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="{{.Account.Acct}}" alt="avatar" height="48" />
+                       <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
+               </a>
+               <a href="/user/{{.Account.ID}}">
+                       <span class="status-uname"> @{{.Account.Acct}} </span>
                </a>
-               <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
                <span> retweeted your post </span>
                <span>
                        - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
        {{else if eq .Type "favourite"}}
        <div class="retweet-info">
                <a class="img-link" href="/user/{{.Account.ID}}">
-                       <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="{{.Account.Acct}}" alt="avatar" height="48" />
+                       <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
+               </a>
+               <a href="/user/{{.Account.ID}}">
+                       <span class="status-uname"> @{{.Account.Acct}} </span>
                </a>
-               <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
                <span> liked your post </span>
                <span>
                        - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> 
index 7d510e2b50bbf97bb9f7598fcce91ce0dcf794b8..1e3d5149c372a221b1ed11aacc588ff872555c99 100644 (file)
@@ -3,9 +3,12 @@
        {{if .Reblog}}
        <div class="retweet-info">
                <a class="img-link" href="/user/{{.Account.ID}}">
-                       <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="{{.Account.Acct}}" alt="avatar" height="24" />
+                       <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="24" />
                </a>
                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
+               <a href="/user/{{.Account.ID}}"> 
+                       <span class="status-uname"> @{{.Account.Acct}} </span> 
+               </a>
                retweeted
        </div>
        {{template "status" (WithContext .Reblog $.Ctx)}}
        <div class="status-container status-{{.ID}}" data-id="{{.ID}}">
                <div class="status-profile-img-container">
                        <a class="img-link" href="/user/{{.Account.ID}}">
-                               <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="{{.Account.Acct}}" alt="avatar" height="48" />
+                               <img class="status-profile-img" src="{{.Account.AvatarStatic}}" title="@{{.Account.Acct}}" alt="avatar" height="48" />
                        </a>
                </div>
                <div class="status"> 
                        <div class="status-name">
                                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> 
                                <a href="/user/{{.Account.ID}}">
-                                       <span class="status-uname"> {{.Account.Acct}} </span>
+                                       <span class="status-uname"> @{{.Account.Acct}} </span>
                                </a>
                                <div class="more-container">
                                        <div class="remote-link">
@@ -56,7 +59,7 @@
                                {{if .InReplyToID}}
                                <div class="status-reply-to">
                                        <a class="status-reply-to-link" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}"> 
-                                                in reply to {{if .IDNumbers}}#{{index .IDNumbers .InReplyToID}}{{end}} {{if .Pleroma.InReplyToAccountAcct}}{{.Pleroma.InReplyToAccountAcct}}{{else if not .IDNumbers}}{{.InReplyToID}}{{end}}
+                                                in reply to {{if .IDNumbers}}#{{index .IDNumbers .InReplyToID}}{{end}} {{if .Pleroma.InReplyToAccountAcct}}@{{.Pleroma.InReplyToAccountAcct}}{{else if not .IDNumbers}}{{.InReplyToID}}{{end}}
                                        </a>
                                </div>
                                {{if index .IDReplies .ID}} <span class="status-reply-info-divider"> - </span> {{end}}
index 4fe7fd1f33356d67e5c70113677a7f879f9c3446..4801021d10e8645df1dd6c0fb193b9e83ea448b1 100644 (file)
@@ -12,7 +12,7 @@
        <div class="user-profile-details-container">
                <div>
                        <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span>  
-                       <span class="status-uname"> {{.User.Acct}} </span>
+                       <span class="status-uname"> @{{.User.Acct}} </span>
                        <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile">
                                source
                        </a>
index 0a442022cbf61d645febf7009c1d220d4f86d895..52ef83ec958756f5e1d4d0e46974151d637dc47b 100644 (file)
@@ -4,13 +4,13 @@
        <div class="user-list-item">
                <div>
                        <a class="img-link" href="/user/{{.ID}}">
-                               <img class="status-profile-img" src="{{.AvatarStatic}}" title="{{.Acct}}" alt="avatar" height="48" />
+                               <img class="status-profile-img" src="{{.AvatarStatic}}" title="@{{.Acct}}" alt="avatar" height="48" />
                        </a>
                </div>
                <div>
                        <div class="status-dname"> {{EmojiFilter .DisplayName .Emojis}} </div>  
                        <a class="img-link" href="/user/{{.ID}}">
-                               <div class="status-uname"> {{.Acct}} </div>
+                               <div class="status-uname"> @{{.Acct}} </div>
                        </a>
                </div>
        </div>