rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-06 01:08:21 +01:00
Code Issues Releases Activity

[feature] display 'draft' badge on drafts

Browse Source
This commit is contained in:
Sylvain 2016-06-01 10:47:00 +02:00
parent 31356a02f5
commit 306e0322c5
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/templates/dashboard/projects.html.erb
View File

@ -12,7 +12,9 @@
<div class="wrapper" ng-if="user.all_projects.length == 0" translate>{{ 'you_dont_have_any_projects' }}</div> <div class="wrapper" ng-if="user.all_projects.length == 0" translate>{{ 'you_dont_have_any_projects' }}</div>
<div class="widget panel b-a m m-t-lg" ng-repeat="project in user.all_projects"> <div class="widget panel b-a m m-t-lg" ng-repeat="project in user.all_projects">
<div class="panel-heading b-b clearfix"> <div class="panel-heading b-b clearfix">
<h4 class="text-u-c font-sbold pull-left">{{project.name}}</h4> <span class="m-l-sm label label-success text-white">{{project.author_id == currentUser.id ? 'author' : 'collaborator' | translate}}</span> <h4 class="text-u-c font-sbold pull-left">{{project.name}}</h4>
<span class="m-l-sm label label-success text-white">{{project.author_id == currentUser.id ? 'author' : 'collaborator' | translate}}</span>
<span class="badge" ng-if="project.state == 'draft'" translate>{{ 'rough_draft' }}</span>
<div class="pull-right"> <div class="pull-right">
<a class="btn btn-warning bg-white b-2x rounded upper text-sm text-black" ui-sref="app.public.projects_show({id:project.slug})" role="button" translate>{{ 'consult' }}</a> <a class="btn btn-warning bg-white b-2x rounded upper text-sm text-black" ui-sref="app.public.projects_show({id:project.slug})" role="button" translate>{{ 'consult' }}</a>
</div> </div>

4
app/assets/templates/projects/index.html.erb
View File

@ -98,6 +98,10 @@
<h1 class="card-title">{{project.name}}</h1> <h1 class="card-title">{{project.name}}</h1>
</div> </div>
<div class="text-center">
<span class="badge" ng-if="project.state == 'draft'" translate>{{ 'rough_draft' }}</span>
</div>
<div class="card-overlay"> <div class="card-overlay">
<div class="btn-group"> <div class="btn-group">
<div class="btn btn-default" ng-click="showProject(project)"> <div class="btn btn-default" ng-click="showProject(project)">

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

@ -103,6 +103,7 @@
<div class="text-center"> <div class="text-center">
<span class="m-l-sm label label-success text-white">{{project.author_id == user.id ? 'author' : 'collaborator' | translate}}</span> <span class="m-l-sm label label-success text-white">{{project.author_id == user.id ? 'author' : 'collaborator' | translate}}</span>
<span class="badge" ng-if="project.state == 'draft'" translate>{{ 'rough_draft' }}</span>
</div> </div>
<div class="card-overlay"> <div class="card-overlay">

2
app/views/api/members/show.json.jbuilder
View File

@ -65,7 +65,7 @@ end
json.last_sign_in_at @member.last_sign_in_at.iso8601 if @member.last_sign_in_at json.last_sign_in_at @member.last_sign_in_at.iso8601 if @member.last_sign_in_at
json.all_projects @member.all_projects do |project| json.all_projects @member.all_projects do |project|
if requested_current || project.state == 'published' if requested_current || project.state == 'published'
json.extract! project, :id, :name, :description, :author_id, :licence_id, :slug json.extract! project, :id, :name, :description, :author_id, :licence_id, :slug, :state
json.url project_url(project, format: :json) json.url project_url(project, format: :json)
json.project_image project.project_image.attachment.large.url if project.project_image json.project_image project.project_image.attachment.large.url if project.project_image
json.machine_ids project.machine_ids json.machine_ids project.machine_ids

2
app/views/api/projects/index.json.jbuilder
View File

@ -1,5 +1,5 @@
json.projects @projects do |project| json.projects @projects do |project|
json.extract! project, :id, :name, :description, :author_id, :licence_id, :slug json.extract! project, :id, :name, :description, :author_id, :licence_id, :slug, :state
json.url project_url(project, format: :json) json.url project_url(project, format: :json)
json.project_image project.project_image.attachment.medium.url if project.project_image json.project_image project.project_image.attachment.medium.url if project.project_image
json.author_id project.author_id json.author_id project.author_id