Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dima Krasner
Sharkey
Commits
843dd5fb
Unverified
Commit
843dd5fb
authored
6 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
Improve user column
parent
c0585328
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
locales/ja-JP.yml
+6
-0
6 additions, 0 deletions
locales/ja-JP.yml
src/client/app/desktop/views/pages/deck/deck.user-column.vue
+100
-30
100 additions, 30 deletions
src/client/app/desktop/views/pages/deck/deck.user-column.vue
with
106 additions
and
30 deletions
locales/ja-JP.yml
+
6
−
0
View file @
843dd5fb
...
...
@@ -1109,6 +1109,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
edit
:
"
オプション"
desktop/views/pages/deck/deck.user-column.vue
:
posts
:
"
投稿"
following
:
"
フォロー"
followers
:
"
フォロワー"
images
:
"
画像"
activity
:
"
アクティビティ"
timeline
:
"
タイムライン"
pinned-notes
:
"
ピン留めされた投稿"
push-to-a-list
:
"
リストに追加"
...
...
This diff is collapsed.
Click to expand it.
src/client/app/desktop/views/pages/deck/deck.user-column.vue
+
100
−
30
View file @
843dd5fb
...
...
@@ -24,26 +24,55 @@
<div
class=
"description"
>
<misskey-flavored-markdown
v-if=
"user.description"
:text=
"user.description"
:i=
"$store.state.i"
/>
</div>
<div
class=
"counts"
>
<div>
<b>
{{
user
.
notesCount
|
number
}}
</b>
<span>
%i18n:@posts%
</span>
</div>
<div>
<b>
{{
user
.
followingCount
|
number
}}
</b>
<span>
%i18n:@following%
</span>
</div>
<div>
<b>
{{
user
.
followersCount
|
number
}}
</b>
<span>
%i18n:@followers%
</span>
</div>
</div>
</div>
<div
class=
"pinned"
v-if=
"user.pinnedNotes && user.pinnedNotes.length > 0"
>
<p>
%fa:thumbtack% %i18n:@pinned-notes%
</p>
<div
class=
"notes"
>
<p
class=
"caption"
@
click=
"toggleShowPinned"
>
%fa:thumbtack% %i18n:@pinned-notes%
</p>
<span
class=
"angle"
v-if=
"showPinned"
>
%fa:angle-up%
</span>
<span
class=
"angle"
v-else
>
%fa:angle-down%
</span>
<div
class=
"notes"
v-show=
"showPinned"
>
<x-note
v-for=
"n in user.pinnedNotes"
:key=
"n.id"
:note=
"n"
:mini=
"true"
/>
</div>
</div>
<div
class=
"images"
v-if=
"images.length > 0"
>
<router-link
v-for=
"image in images"
:style=
"`background-image: url($
{image.thumbnailUrl})`"
:key="`${image.id}:${image._note.id}`"
:to="image._note | notePage"
:title="`${image.name}\n${(new Date(image.createdAt)).toLocaleString()}`"
>
</router-link>
<p
class=
"caption"
@
click=
"toggleShowImages"
>
%fa:images R% %i18n:@images%
</p>
<span
class=
"angle"
v-if=
"showImages"
>
%fa:angle-up%
</span>
<span
class=
"angle"
v-else
>
%fa:angle-down%
</span>
<div
v-show=
"showImages"
>
<router-link
v-for=
"image in images"
:style=
"`background-image: url($
{image.thumbnailUrl})`"
:key="`${image.id}:${image._note.id}`"
:to="image._note | notePage"
:title="`${image.name}\n${(new Date(image.createdAt)).toLocaleString()}`"
>
</router-link>
</div>
</div>
<div
class=
"activity"
>
<div
ref=
"chart"
></div>
<p
class=
"caption"
@
click=
"toggleShowActivity"
>
%fa:chart-bar R% %i18n:@activity%
</p>
<span
class=
"angle"
v-if=
"showActivity"
>
%fa:angle-up%
</span>
<span
class=
"angle"
v-else
>
%fa:angle-down%
</span>
<div
v-show=
"showActivity"
>
<div
ref=
"chart"
></div>
</div>
</div>
<div
class=
"tl"
>
<x-notes
ref=
"timeline"
:more=
"existMore ? fetchMoreNotes : null"
/>
<p
class=
"caption"
>
%fa:comment-alt R% %i18n:@timeline%
</p>
<div>
<x-notes
ref=
"timeline"
:more=
"existMore ? fetchMoreNotes : null"
/>
</div>
</div>
</div>
</x-column>
...
...
@@ -84,7 +113,10 @@ export default Vue.extend({
existMore
:
false
,
moreFetching
:
false
,
withFiles
:
false
,
images
:
[]
images
:
[],
showPinned
:
true
,
showImages
:
true
,
showActivity
:
true
};
},
...
...
@@ -282,6 +314,18 @@ export default Vue.extend({
compact
:
false
,
items
:
menu
});
},
toggleShowPinned
()
{
this
.
showPinned
=
!
this
.
showPinned
;
},
toggleShowImages
()
{
this
.
showImages
=
!
this
.
showImages
;
},
toggleShowActivity
()
{
this
.
showActivity
=
!
this
.
showActivity
;
}
}
});
...
...
@@ -365,39 +409,65 @@ export default Vue.extend({
border-right solid 16px transparent
border-bottom solid 16px var(--face)
> .pinned
padding-bottom 16px
background var(--deckColumnBg)
> .counts
display grid
grid-template-columns 1fr 1fr 1fr
margin-top 8px
border-top solid 1px var(--faceDivider)
> div
padding 8px 8px 0 8px
text-align center
> b
display block
font-size 120%
> span
display block
font-size 90%
opacity 0.7
> p
> *
> p.caption
margin 0
padding 8px 16px
font-size 12px
color var(--text)
& + .angle
position absolute
top 0
right 8px
padding 6px
font-size 14px
color var(--text)
> .pinned
> .notes
background var(--face)
> .images
display grid
grid-template-columns 1fr 1fr 1fr
gap 8px
padding 16
px
margin-bottom
16px
background var(--face)
> div
display grid
grid-template-columns 1fr 1fr 1fr
gap 8
px
padding
16px
background var(--face)
> *
height 70px
background-position center center
background-size cover
background-clip content-box
border-radius 4px
> *
height 70px
background-position center center
background-size cover
background-clip content-box
border-radius 4px
> .activity
margin-bottom 16px
background var(--face)
> div
background var(--face)
> .tl
background var(--face)
> div
background var(--face)
</
style
>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment