mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-30 04:01:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up where badges appear

Browse Source
This commit is contained in:
Brenda Wallace
2019-02-09 14:12:45 +13:00
parent fc95a3c4e1
commit 50751611fa
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/gardens/_overview.html.haml
View File

@@ -5,10 +5,8 @@
.panel-body
.row
.col-md-2.col-xs-12.garden-info
.row
.col-md-12.col-xs-6
= render 'gardens/photo', garden: garden
.col-md-12.col-xs-6= display_garden_description(garden)
%p= render 'gardens/photo', garden: garden
%p= display_garden_description(garden)
.col-md-10
- if garden.plantings.current.size.positive?
.row

2
app/views/plantings/_badges.html.haml
View File

@@ -8,7 +8,7 @@
- elsif planting.late?
.badge.badge-late= t('.late_finishing')
- else
.badge{'data-toggle': "tooltip", 'data-placement': "top", title: 'Days until planting is finished'}
.badge{'data-toggle': "tooltip", 'data-placement': "top", title: 'Predicted days until planting is finished'}
= finished_icon
= t('label.days_until_finished', number: days_from_now_to_finished(planting))

11
app/views/plantings/_thumbnail.html.haml
View File

@@ -1,11 +1,12 @@
.planting
= render 'plantings/badges', planting: planting
.planting-thumbnail
= render 'plantings/quick_actions', planting: planting
= link_to planting do
= image_tag(planting_image_path(planting),
class: 'img-responsive planting-thumbnail-photo',
alt: planting)
= render 'plantings/badges', planting: planting
.planting-thumbnail-image
= link_to planting do
= image_tag(planting_image_path(planting),
class: 'img-responsive planting-thumbnail-photo',
alt: planting)
= render 'plantings/progress', planting: planting, show_explanation: false
.planting-name= link_to planting.crop.name, planting