mirror of
https://gitea.phreedom.club/localhost_frssoft/bloat.git
synced 2025-05-10 22:08:45 +00:00
merge with upstream
This commit is contained in:
commit
4379eab5bf
25 changed files with 465 additions and 186 deletions
|
@ -1,6 +1,6 @@
|
|||
{{with .Data}}
|
||||
{{template "header.tmpl" (WithContext .CommonData $.Ctx)}}
|
||||
<div class="page-title"> Mute {{.User.Acct}} </div>
|
||||
<div class="page-title"> Mute {{EmojiFilter (HTML .User.DisplayName) .User.Emojis | Raw}} @{{.User.Acct}} </div>
|
||||
|
||||
<form action="/mute/{{.User.ID}}" method="POST">
|
||||
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||
|
|
|
@ -8,9 +8,12 @@
|
|||
</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>
|
||||
<a class="profile-edit-link" href="/profile" title="edit profile" target="_top">
|
||||
edit
|
||||
</a>
|
||||
</div>
|
||||
<div class="user-info-details-nav">
|
||||
|
|
|
@ -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>
|
||||
|
@ -134,7 +134,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>
|
||||
|
|
58
templates/profile.tmpl
Normal file
58
templates/profile.tmpl
Normal file
|
@ -0,0 +1,58 @@
|
|||
{{with .Data}}
|
||||
{{template "header.tmpl" (WithContext .CommonData $.Ctx)}}
|
||||
<div class="page-title"> Edit Profile </div>
|
||||
|
||||
<form class="profile-form" action="/profile" method="POST" enctype="multipart/form-data">
|
||||
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||
<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
|
||||
<div class="profile-form-field">
|
||||
<div class="block-label">
|
||||
<label for="avatar">Avatar</label> -
|
||||
<input class="btn-link" type="submit" formaction="/profile/delavatar" formmethod="POST" value="delete">
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{.User.Avatar}}" target="_blank">
|
||||
<img class="profile-avatar" src="{{.User.Avatar}}" alt="profile-avatar" height="96">
|
||||
</a>
|
||||
</div>
|
||||
<div><input id="avatar" name="avatar" type="file"></div>
|
||||
</div>
|
||||
<div class="profile-form-field">
|
||||
<div class="block-label">
|
||||
<label for="banner">Banner</label> -
|
||||
<input class="btn-link" type="submit" formaction="/profile/delbanner" formmethod="POST" value="delete">
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{.User.Header}}" target="_blank">
|
||||
<img class="profile-banner" src="{{.User.Header}}" alt="profile-banner" height="120">
|
||||
</a>
|
||||
</div>
|
||||
<input id="banner" name="banner" type="file">
|
||||
</div>
|
||||
<div class="profile-form-field">
|
||||
<div class="block-label"><label for="name">Name</label></div>
|
||||
<div><input id="name" name="name" type="text" value="{{.User.DisplayName}}"></div>
|
||||
</div>
|
||||
<div class="profile-form-field">
|
||||
<div class="block-label"><label for="bio">Bio</label></div>
|
||||
<textarea id="bio" name="bio" cols="80" rows="8">{{.User.Source.Note}}</textarea>
|
||||
</div>
|
||||
<div class="profile-form-field">
|
||||
<div class="block-label"><label>Metadata</label></div>
|
||||
{{range $i, $f := .User.Source.Fields}}
|
||||
<div class="profile-field">
|
||||
<input id="field-name-{{$i}}" name="field-name-{{$i}}" type="text" value="{{$f.Name}}" placeholder="name">
|
||||
<input id="field-value-{{$i}}" name="field-value-{{$i}}" type="text" value="{{$f.Value}}" placeholder="value">
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="profile-form-field">
|
||||
<input id="locked" name="locked" type="checkbox" value="true" {{if .User.Locked}}checked{{end}}>
|
||||
<label for="locked">Require manual approval of follow requests</label>
|
||||
</div>
|
||||
<button type="submit"> Save </button>
|
||||
<button type="reset"> Reset </button>
|
||||
</form>
|
||||
|
||||
{{template "footer.tmpl"}}
|
||||
{{end}}
|
|
@ -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">
|
||||
|
|
|
@ -4,14 +4,15 @@
|
|||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
|
||||
<link rel="icon" type="image/png" href="/static/favicon.png">
|
||||
<link rel="stylesheet" href="/static/style.css">
|
||||
<title>{{.Title}}</title>
|
||||
</head>
|
||||
<frameset cols="424px,*">
|
||||
<frameset rows="316px,*">
|
||||
<frame name="nav" src="/nav">
|
||||
<frame name="notification" src="/notifications">
|
||||
<frame name="nav" src="/nav" {{if $.Ctx.DarkMode}}class="dark"{{end}}>
|
||||
<frame name="notification" src="/notifications" {{if $.Ctx.DarkMode}}class="dark"{{end}}>
|
||||
</frameset>
|
||||
<frame name="main" src="/timeline/home">
|
||||
<frame name="main" src="/timeline/home" {{if $.Ctx.DarkMode}}class="dark"{{end}}>
|
||||
</frameset>
|
||||
</html>
|
||||
{{end}}
|
||||
|
|
|
@ -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>
|
||||
|
@ -25,7 +25,7 @@
|
|||
<div class="status-name">
|
||||
<bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} {{if .Account.Bot}}🤖{{end}}</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">
|
||||
|
@ -98,9 +98,14 @@
|
|||
</div>
|
||||
{{if (or .Content .SpoilerText)}}
|
||||
<div class="status-content">
|
||||
<<<<<<< HEAD
|
||||
{{if .Sensitive}}[NSFW]<br/>{{end}}
|
||||
{{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 -}}
|
||||
>>>>>>> upstream/master
|
||||
</div>
|
||||
{{end}}
|
||||
{{$st_id := .ID}}
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
<div class="page-title"> User </div>
|
||||
|
||||
<div class="user-info-container">
|
||||
<div>
|
||||
<div class="user-profile-img-container">
|
||||
<a class="img-link" href="{{.User.Avatar}}" target="_blank">
|
||||
<img class="user-profile-img" src="{{.User.Avatar}}" alt="profile-avatar" height="96" />
|
||||
|
@ -11,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>
|
||||
|
@ -128,18 +127,17 @@
|
|||
<summary>About user</summary>
|
||||
<div class="user-profile-decription">
|
||||
[User created: {{.User.CreatedAt}}]<br>
|
||||
{{EmojiFilter .User.Note .User.Emojis | Raw}}
|
||||
{{- EmojiFilter .User.Note .User.Emojis | Raw -}}
|
||||
</div>
|
||||
</details>
|
||||
{{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 (HTML .Name) $.Data.User.Emojis | Raw}} - {{EmojiFilter .Value $.Data.User.Emojis | Raw -}}</div>
|
||||
{{end}}
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{if eq .Type ""}}
|
||||
<div class="page-title"> Statuses </div>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue