Skip to content
Snippets Groups Projects
Commit 00eaf4a8 authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issue/9400' into 'develop'

parents 585f2dfd 11e30ddd
No related branches found
No related tags found
No related merge requests found
<template> <template>
<div class="ui three stackable cards"> <div
id="user-activity"
class="ui stackable cards"
>
<!-- EVENTS --> <!-- EVENTS -->
<div class="red card"> <div class="red card">
<div class="content"> <div class="content">
...@@ -215,3 +218,16 @@ export default { ...@@ -215,3 +218,16 @@ export default {
}; };
</script> </script>
<style scoped lang="less">
#user-activity {
flex-flow: column;
margin: 1em 0;
.card {
margin: .875em 0;
}
}
</style>
...@@ -49,17 +49,20 @@ ...@@ -49,17 +49,20 @@
<div class="meta"> <div class="meta">
<span <span
class="right floated" class="right floated"
>Projet {{ project.moderation ? "" : "non" }} modéré</span> >
<span>Niveau d'autorisation requis : Projet {{ project.moderation ? "" : "non" }} modéré
{{ project.access_level_pub_feature }}</span><br> </span>
<span>
Niveau d'autorisation requis : {{ project.access_level_pub_feature }}
</span><br>
<span> <span>
Mon niveau d'autorisation : Mon niveau d'autorisation :
<span v-if="USER_LEVEL_PROJECTS && project">{{ <span v-if="USER_LEVEL_PROJECTS && project">
USER_LEVEL_PROJECTS[project.slug] {{ USER_LEVEL_PROJECTS[project.slug] }}
}}</span> </span>
<span v-if="user && user.is_administrator">{{ <span v-if="user && user.is_administrator">
"+ Gestionnaire métier" {{ "+ Gestionnaire métier" }}
}}</span> </span>
</span> </span>
</div> </div>
<div class="meta"> <div class="meta">
...@@ -70,7 +73,8 @@ ...@@ -70,7 +73,8 @@
<i <i
class="calendar icon" class="calendar icon"
aria-hidden="true" aria-hidden="true"
/>&nbsp;{{ project.created_on }} />
&nbsp;{{ project.created_on }}
</span> </span>
<span data-tooltip="Membres"> <span data-tooltip="Membres">
{{ project.nb_contributors }}&nbsp; {{ project.nb_contributors }}&nbsp;
...@@ -198,3 +202,20 @@ export default { ...@@ -198,3 +202,20 @@ export default {
}; };
</script> </script>
<style lang="less" scoped>
.item {
div {
width: 100%;
.content {
.header {
font-size: 1.1em;
font-weight: 600;
}
}
}
}
</style>
...@@ -8,15 +8,12 @@ ...@@ -8,15 +8,12 @@
<div class="ui stackable grid"> <div class="ui stackable grid">
<div class="five wide column"> <div class="five wide column">
<UserProfile /> <UserProfile />
<UserActivity />
</div> </div>
<div class="eleven wide column"> <div class="eleven wide column">
<UserProjectsList /> <UserProjectsList />
</div> </div>
<div class="sixteen wide column">
<UserActivity />
</div>
</div> </div>
</div> </div>
</template> </template>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment