grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'Axighi-master' into front_end_prettying

Browse source
This commit is contained in:
Dessalines 2020-07-29 00:24:49 -04:00
commit ff7e0c72f9
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -16,3 +16,5 @@ ui/src/translations
# ide config # ide config
.idea/ .idea/
target

2
ui/src/components/community.tsx vendored
View file

@ -177,7 +177,7 @@ export class Community extends Component<any, State> {
get documentTitle(): string { get documentTitle(): string {
if (this.state.community.name) { if (this.state.community.name) {
return `/c/${this.state.community.name} - ${this.state.site.name}`; return `!${this.state.community.name} - ${this.state.site.name}`;
} else { } else {
return 'Lemmy'; return 'Lemmy';
} }

10
ui/src/components/inbox.tsx vendored
View file

@ -112,7 +112,7 @@ export class Inbox extends Component<any, InboxState> {
get documentTitle(): string { get documentTitle(): string {
if (this.state.site.name) { if (this.state.site.name) {
return `/u/${UserService.Instance.user.name} ${i18n.t('inbox')} - ${ return `@${UserService.Instance.user.name} ${i18n.t('inbox')} - ${
this.state.site.name this.state.site.name
}`; }`;
} else { } else {
@ -206,7 +206,7 @@ export class Inbox extends Component<any, InboxState> {
return ( return (
<div class="btn-group btn-group-toggle flex-wrap mb-2"> <div class="btn-group btn-group-toggle flex-wrap mb-2">
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.All && 'active'} ${this.state.messageType == MessageType.All && 'active'}
`} `}
> >
@ -219,7 +219,7 @@ export class Inbox extends Component<any, InboxState> {
{i18n.t('all')} {i18n.t('all')}
</label> </label>
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Replies && 'active'} ${this.state.messageType == MessageType.Replies && 'active'}
`} `}
> >
@ -232,7 +232,7 @@ export class Inbox extends Component<any, InboxState> {
{i18n.t('replies')} {i18n.t('replies')}
</label> </label>
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Mentions && 'active'} ${this.state.messageType == MessageType.Mentions && 'active'}
`} `}
> >
@ -245,7 +245,7 @@ export class Inbox extends Component<any, InboxState> {
{i18n.t('mentions')} {i18n.t('mentions')}
</label> </label>
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.messageType == MessageType.Messages && 'active'} ${this.state.messageType == MessageType.Messages && 'active'}
`} `}
> >

16
ui/src/components/user.tsx vendored
View file

@ -213,7 +213,7 @@ export class User extends Component<any, UserState> {
get documentTitle(): string { get documentTitle(): string {
if (this.state.siteRes.site.name) { if (this.state.siteRes.site.name) {
return `/u/${this.state.username} - ${this.state.siteRes.site.name}`; return `@${this.state.username} - ${this.state.siteRes.site.name}`;
} else { } else {
return 'Lemmy'; return 'Lemmy';
} }
@ -234,7 +234,7 @@ export class User extends Component<any, UserState> {
class="rounded-circle mr-2" class="rounded-circle mr-2"
/> />
)} )}
<span>/u/{this.state.username}</span> <span>@{this.state.username}</span>
</h5> </h5>
{this.state.loading ? ( {this.state.loading ? (
<h5> <h5>
@ -276,7 +276,7 @@ export class User extends Component<any, UserState> {
return ( return (
<div class="btn-group btn-group-toggle flex-wrap mb-2"> <div class="btn-group btn-group-toggle flex-wrap mb-2">
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Overview && 'active'} ${this.state.view == UserDetailsView.Overview && 'active'}
`} `}
> >
@ -289,7 +289,7 @@ export class User extends Component<any, UserState> {
{i18n.t('overview')} {i18n.t('overview')}
</label> </label>
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Comments && 'active'} ${this.state.view == UserDetailsView.Comments && 'active'}
`} `}
> >
@ -302,7 +302,7 @@ export class User extends Component<any, UserState> {
{i18n.t('comments')} {i18n.t('comments')}
</label> </label>
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Posts && 'active'} ${this.state.view == UserDetailsView.Posts && 'active'}
`} `}
> >
@ -315,7 +315,7 @@ export class User extends Component<any, UserState> {
{i18n.t('posts')} {i18n.t('posts')}
</label> </label>
<label <label
className={`btn btn-outline-secondary pointer className={`btn btn-outline-secondary pointer
${this.state.view == UserDetailsView.Saved && 'active'} ${this.state.view == UserDetailsView.Saved && 'active'}
`} `}
> >
@ -398,7 +398,7 @@ export class User extends Component<any, UserState> {
</tr> </tr>
*/} */}
<tr> <tr>
{/* {/*
<td> <td>
{i18n.t('number_of_points', { count: user.post_score })} {i18n.t('number_of_points', { count: user.post_score })}
</td> </td>
@ -406,7 +406,7 @@ export class User extends Component<any, UserState> {
<td> <td>
{i18n.t('number_of_posts', { count: user.number_of_posts })} {i18n.t('number_of_posts', { count: user.number_of_posts })}
</td> </td>
{/* {/*
</tr> </tr>
<tr> <tr>
<td> <td>