diff options
-rw-r--r-- | templates/nav.tmpl | 4 | ||||
-rw-r--r-- | templates/notification.tmpl | 14 | ||||
-rw-r--r-- | templates/requestlist.tmpl | 4 | ||||
-rw-r--r-- | templates/status.tmpl | 12 | ||||
-rw-r--r-- | templates/user.tmpl | 8 | ||||
-rw-r--r-- | templates/userlistitem.tmpl | 4 |
6 files changed, 23 insertions, 23 deletions
diff --git a/templates/nav.tmpl b/templates/nav.tmpl index db88aa0..4413823 100644 --- a/templates/nav.tmpl +++ b/templates/nav.tmpl @@ -8,9 +8,9 @@ </div> <div class="user-info-details-container"> <div class="user-info-details-name"> - <bdi class="status-dname"> {{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}} </bdi> + <bdi class="status-dname">{{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}}</bdi> <a class="nav-link" href="/user/{{.User.ID}}" accesskey="0" title="User profile (0)"> - <span class="status-uname"> @{{.User.Acct}} </span> + <span class="status-uname">@{{.User.Acct}}</span> </a> </div> <div class="user-info-details-nav"> diff --git a/templates/notification.tmpl b/templates/notification.tmpl index f62726b..f1336d3 100644 --- a/templates/notification.tmpl +++ b/templates/notification.tmpl @@ -28,13 +28,13 @@ </div> <div class="notification-follow"> <div class="notification-info-text"> - <bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} </bdi> + <bdi class="status-dname">{{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}}</bdi> <span class="notification-text"> followed you - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> </span> </div> <div> - <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a> + <a href="/user/{{.Account.ID}}"> <span class="status-uname">@{{.Account.Acct}}</span> </a> </div> </div> </div> @@ -48,13 +48,13 @@ </div> <div class="notification-follow"> <div class="notification-info-text"> - <bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} </bdi> + <bdi class="status-dname">{{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}}</bdi> <span class="notification-text"> wants to follow you - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> </span> </div> <div> - <a href="/user/{{.Account.ID}}"> <span class="status-uname"> @{{.Account.Acct}} </span> </a> + <a href="/user/{{.Account.ID}}"><span class="status-uname">@{{.Account.Acct}}</span></a> </div> <form class="d-inline" action="/accept/{{.Account.ID}}" method="post" target="_self"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> @@ -79,7 +79,7 @@ <img class="status-profile-img" src="{{.Account.Avatar}}" title="@{{.Account.Acct}}" alt="avatar" height="48" /> </a> <a href="/user/{{.Account.ID}}"> - <span class="status-uname"> @{{.Account.Acct}} </span> + <span class="status-uname">@{{.Account.Acct}}</span> </a> <span class="notification-text"> retweeted your post - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> @@ -93,7 +93,7 @@ <img class="status-profile-img" src="{{.Account.Avatar}}" title="@{{.Account.Acct}}" alt="avatar" height="48" /> </a> <a href="/user/{{.Account.ID}}"> - <span class="status-uname"> @{{.Account.Acct}} </span> + <span class="status-uname">@{{.Account.Acct}}</span> </a> <span class="notification-text"> liked your post - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> @@ -107,7 +107,7 @@ <img class="status-profile-img" src="{{.Account.Avatar}}" title="@{{.Account.Acct}}" alt="avatar" height="48" /> </a> <a href="/user/{{.Account.ID}}"> - <span class="status-uname"> @{{.Account.Acct}} </span> + <span class="status-uname">@{{.Account.Acct}}</span> </a> <span class="notification-text"> {{.Type}} - <time datetime="{{FormatTimeRFC3339 .CreatedAt}}" title="{{FormatTimeRFC822 .CreatedAt}}">{{TimeSince .CreatedAt}}</time> diff --git a/templates/requestlist.tmpl b/templates/requestlist.tmpl index 1a51e31..f0b2dee 100644 --- a/templates/requestlist.tmpl +++ b/templates/requestlist.tmpl @@ -9,9 +9,9 @@ </div> <div class="user-list-name"> <div> - <div class="status-dname"> {{EmojiFilter (HTML .DisplayName) .Emojis | Raw}} </div> + <div class="status-dname">{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}</div> <a class="img-link" href="/user/{{.ID}}"> - <div class="status-uname"> @{{.Acct}} </div> + <div class="status-uname">{{.Acct}}</div> </a> </div> <form class="d-inline" action="/accept/{{.ID}}" method="post" target="_self"> diff --git a/templates/status.tmpl b/templates/status.tmpl index 5ada84e..0b09dfb 100644 --- a/templates/status.tmpl +++ b/templates/status.tmpl @@ -5,9 +5,9 @@ <a class="img-link" href="/user/{{.Account.ID}}"> <img class="status-profile-img" src="{{.Account.Avatar}}" title="@{{.Account.Acct}}" alt="avatar" height="24" /> </a> - <bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} </bdi> + <bdi class="status-dname">{{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}}</bdi> <a href="/user/{{.Account.ID}}"> - <span class="status-uname"> @{{.Account.Acct}} </span> + <span class="status-uname">@{{.Account.Acct}}</span> </a> retweeted </div> @@ -23,9 +23,9 @@ </div> <div class="status"> <div class="status-name"> - <bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} </bdi> + <bdi class="status-dname">{{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}}</bdi> <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"> @@ -92,8 +92,8 @@ </div> {{if (or .Content .SpoilerText)}} <div class="status-content"> - {{if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}<br/>{{end}} - {{StatusContentFilter .Content .Emojis .Mentions | Raw}} + {{- if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}<br/>{{end -}} + {{- StatusContentFilter .Content .Emojis .Mentions | Raw -}} </div> {{end}} {{if .MediaAttachments}} diff --git a/templates/user.tmpl b/templates/user.tmpl index 3146964..3adc1a0 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -10,8 +10,8 @@ </div> <div class="user-profile-details-container"> <div> - <bdi class="status-dname"> {{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}} </bdi> - <span class="status-uname"> @{{.User.Acct}} </span> + <bdi class="status-dname">{{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}}</bdi> + <span class="status-uname">@{{.User.Acct}}</span> <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile"> source </a> @@ -119,12 +119,12 @@ </div> </div> <div class="user-profile-decription"> - {{EmojiFilter .User.Note .User.Emojis | Raw}} + {{- EmojiFilter .User.Note .User.Emojis | Raw -}} </div> {{if .User.Fields}} <div class="user-fields"> {{range .User.Fields}} - <div>{{EmojiFilter .Name $.Data.User.Emojis | Raw}} - {{EmojiFilter .Value $.Data.User.Emojis | Raw}}</div> + <div>{{- EmojiFilter .Name $.Data.User.Emojis | Raw}} - {{EmojiFilter .Value $.Data.User.Emojis | Raw -}}</div> {{end}} </div> {{end}} diff --git a/templates/userlistitem.tmpl b/templates/userlistitem.tmpl index 50b9d0c..ed53b2e 100644 --- a/templates/userlistitem.tmpl +++ b/templates/userlistitem.tmpl @@ -6,9 +6,9 @@ </a> </div> <div class="user-list-name"> - <div class="status-dname"> {{EmojiFilter (HTML .DisplayName) .Emojis | Raw}} </div> + <div class="status-dname">{{EmojiFilter (HTML .DisplayName) .Emojis | Raw}}</div> <a class="img-link" href="/user/{{.ID}}"> - <div class="status-uname"> @{{.Acct}} </div> + <div class="status-uname">@{{.Acct}}</div> </a> </div> </div> |