ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #752 from Human-Connection/402-userprofile-shouted-tab-2

Browse Source 
402 userprofile shouted tab 2
This commit is contained in:
Wolfgang Huß 2019-06-05 12:57:21 +02:00 committed by GitHub
commit 7ebd1ec009
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webapp/locales/de.json
View File

@ -160,6 +160,11 @@
} }
}, },
"common": { "common": {
"your": {
"post": "Dein Beitrag ::: Deine Beiträge",
"comment": "Dein Kommentar ::: Deine Kommentare",
"shouted": "Deine Empfehlung ::: Deine Empfehlungen"
},
"post": "Beitrag ::: Beiträge", "post": "Beitrag ::: Beiträge",
"comment": "Kommentar ::: Kommentare", "comment": "Kommentar ::: Kommentare",
"letsTalk": "Miteinander reden", "letsTalk": "Miteinander reden",

5
webapp/locales/en.json
View File

@ -160,6 +160,11 @@
} }
}, },
"common": { "common": {
"your": {
"post": "Your Post ::: Your Posts",
"comment": "Your Comment ::: Your Comments",
"shout": "Your Shout ::: Your Shouts"
},
"post": "Post ::: Posts", "post": "Post ::: Posts",
"comment": "Comment ::: Comments", "comment": "Comment ::: Comments",
"letsTalk": "Let`s Talk", "letsTalk": "Let`s Talk",

57
webapp/pages/profile/_id/_slug.vue
View File

@ -137,7 +137,15 @@
<ds-flex-item class="profile-top-navigation"> <ds-flex-item class="profile-top-navigation">
<ds-card class="ds-tab-nav"> <ds-card class="ds-tab-nav">
<ds-flex> <ds-flex>
<ds-flex-item class="ds-tab-nav-item ds-tab-nav-item-active"> <ds-flex-item
v-tooltip="{
content: $t('common.your.post', null, user.contributionsCount),
placement: 'right',
delay: { show: 500 },
}"
class="ds-tab-nav-item pointer ds-tab-nav-item-active"
@click="tabActivity('posts', $event)"
>
<ds-space margin="small"> <ds-space margin="small">
<!-- TODO: find better solution for rendering errors --> <!-- TODO: find better solution for rendering errors -->
<no-ssr> <no-ssr>
@ -147,28 +155,43 @@
</no-ssr> </no-ssr>
</ds-space> </ds-space>
</ds-flex-item> </ds-flex-item>
<!--<ds-flex-item class="ds-tab-nav-item"> <ds-flex-item
<ds-space margin="small">--> v-tooltip="{
<!-- TODO: find better solution for rendering errors --> content: $t('common.your.comment', null, user.commentsCount),
<!-- placement: 'right',
delay: { show: 500 },
}"
class="ds-tab-nav-item pointer"
@click="tabActivity('commented', $event)"
>
<ds-space margin="small">
<!-- TODO: find better solution for rendering errors -->
<no-ssr> <no-ssr>
<ds-number :label="$t('profile.commented')"> <ds-number :label="$t('profile.commented')">
<hc-count-to slot="count" :end-val="user.commentsCount"/> <hc-count-to slot="count" :end-val="user.commentsCount" />
</ds-number> </ds-number>
</no-ssr> </no-ssr>
</ds-space> </ds-space>
</ds-flex-item> </ds-flex-item>
-->
<!--<ds-flex-item class="ds-tab-nav-item"> <ds-flex-item
<ds-space margin="small">--> v-tooltip="{
<!-- TODO: find better solution for rendering errors --> content: $t('common.your.shouted', null, user.shoutedCount),
<!--<no-ssr> placement: 'right',
delay: { show: 500 },
}"
class="ds-tab-nav-item pointer"
>
<ds-space margin="small">
<!-- TODO: find better solution for rendering errors -->
<no-ssr>
<ds-number :label="$t('profile.shouted')"> <ds-number :label="$t('profile.shouted')">
<hc-count-to slot="count" :end-val="user.shoutedCount"/> <hc-count-to slot="count" :end-val="user.shoutedCount" />
</ds-number> </ds-number>
</no-ssr> </no-ssr>
</ds-space> </ds-space>
</ds-flex-item>--> </ds-flex-item>
</ds-flex> </ds-flex>
</ds-card> </ds-card>
</ds-flex-item> </ds-flex-item>
@ -343,6 +366,14 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.pointer {
cursor: pointer;
}
.ds-tab-nav .ds-card-content .ds-tab-nav-item:hover {
border-bottom: 3px solid #c9c6ce;
}
.profile-avatar.ds-avatar { .profile-avatar.ds-avatar {
display: block; display: block;
margin: auto; margin: auto;