diff --git a/app/views/gardens/_overview.html.haml b/app/views/gardens/_overview.html.haml index b7b13181e..635874211 100644 --- a/app/views/gardens/_overview.html.haml +++ b/app/views/gardens/_overview.html.haml @@ -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 diff --git a/app/views/plantings/_badges.html.haml b/app/views/plantings/_badges.html.haml index 1b531dd8b..3c5493818 100644 --- a/app/views/plantings/_badges.html.haml +++ b/app/views/plantings/_badges.html.haml @@ -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)) diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml index df356baee..2ce49fd94 100644 --- a/app/views/plantings/_thumbnail.html.haml +++ b/app/views/plantings/_thumbnail.html.haml @@ -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