rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-20 14:54:15 +01:00
Code Issues Releases Activity

[bug] project gain collaborator i18n key FR

Browse Source 
[UI] project display in profile
This commit is contained in:
Sylvain 2016-05-18 10:54:50 +02:00
parent a3e0954f93
commit 1869dd0bcf
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/assets/templates/shared/publicProfile.html.erb
View File

@ -84,13 +84,41 @@
<div class="widget panel b-a m ">
<div class="panel-heading b-b">
<h1 class="red text-u-c" translate>{{ 'projects' }}</h1>
<ul class="list-unstyled" ng-if="user.all_projects.length > 0">
<li ng-repeat="p in user.all_projects" class="m-t-sm">
<a class="text-u-c" ui-sref="app.public.projects_show({id:p.slug})" role="button">{{p.name}} <span class="m-l-sm label label-success text-white">{{p.author_id == currentUser.id ? 'author' : 'collaborator' | translate}}</span></a>
</li>
<h1 class="red text-u-c m-b" translate>{{ 'projects' }}</h1>
<div ng-if="user.all_projects.length > 0" class="row m-t">
<a class="col-xs-12 col-sm-6 col-md-6 col-lg-6" ng-repeat="project in user.all_projects" ui-sref="app.public.projects_show({id:project.slug})" style="display: block;">
<div class="card card-project">
</ul>
<div class="card-header">
<div class="card-header-bg" style="background-image: url({{project.project_image}});">
<img src="data:image/png;base64," data-src="holder.js/100%x100%/text:&#xf03e;/font:FontAwesome/icon" bs-holder ng-if="!project.project_image">
</div>
</div>
<div class="card-block">
<h1 class="card-title">{{project.name}}</h1>
</div>
<div class="text-center m-t">
<span class="m-l-sm label label-success text-white">{{project.author_id == user.id ? 'author' : 'collaborator' | translate}}</span>
</div>
<div class="card-overlay">
<div class="btn-group">
<div class="btn btn-default" ng-click="showProject(project)">
{{ 'consult' | translate }}
</div>
<div class="btn btn-default" ui-sref="app.logged.projects_edit({id:project.id})" ng-if="isAuthorized('admin')">
<i class="fa fa-edit"></i>
</div>
</div>
</div>
</div>
</a>
</div>
<div ng-if="user.all_projects.length == 0" translate>{{ 'no_projects' }}</div>
</div>
</div>

2
app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
View File

@ -1,5 +1,5 @@
json.title notification.notification_type
json.description t('.USER_became_collaborator_of_your_project',
USER: notification.attached_object.user.profile.full_name) +
"<a href='/#!/projects/#{notification.attached_object.project.id}'><strong><em>#{notification.attached_object.project.name}</em></strong></a>."
"<a href='/#!/projects/#{notification.attached_object.project.id}'><strong><em> #{notification.attached_object.project.name}</em></strong></a>."
json.url notification_url(notification, format: :json)

2
config/locales/fr.yml
View File

@ -208,7 +208,7 @@ fr:
notify_partner_subscribed_plan:
subscription_partner_PLAN_has_been_subscribed_by_USER_html: "L'abonnement partenaire <strong><em>%{PLAN}</em></strong> a été souscrit par <strong><em>%{USER}</strong></em>."
notify_project_author_when_collaborator_valid:
USER_became_collaborator_of_your_project_PROJECT: "Le membre %{USER} est devenu un collaborateur de votre projet :"
USER_became_collaborator_of_your_project: "Le membre %{USER} est devenu un collaborateur de votre projet :"
notify_project_collaborator_to_valid:
you_are_invited_to_collaborate_on_the_project: "Vous êtes invité à collaborer sur le projet suivant :"
notify_user_auth_migration: