From 43b90a7a22c562bffad398900c5effb057b35b98 Mon Sep 17 00:00:00 2001 From: Matthew Baumann Date: Thu, 28 Apr 2022 13:22:17 -0500 Subject: [PATCH] changes to views for clean up. #935 --- app/views/banners/edit.html.haml | 1 - app/views/banners/index.html.haml | 1 - app/views/grant_reviewers/index.html.haml | 34 +++++++++++------------ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/app/views/banners/edit.html.haml b/app/views/banners/edit.html.haml index ec79910d..fc69160f 100644 --- a/app/views/banners/edit.html.haml +++ b/app/views/banners/edit.html.haml @@ -1,6 +1,5 @@ - content_for(:page_title, "Edit - Banner: #{strip_tags(@banner.body.truncate_words(4))}") - %h1 Edit Banner diff --git a/app/views/banners/index.html.haml b/app/views/banners/index.html.haml index ed8153a1..5191f4b9 100644 --- a/app/views/banners/index.html.haml +++ b/app/views/banners/index.html.haml @@ -2,7 +2,6 @@ - if current_user.system_admin? %h3 - = yield(:page_title) = link_to 'Create New Banner', new_banner_path, class: 'button primary' diff --git a/app/views/grant_reviewers/index.html.haml b/app/views/grant_reviewers/index.html.haml index 7233ef59..3153407d 100644 --- a/app/views/grant_reviewers/index.html.haml +++ b/app/views/grant_reviewers/index.html.haml @@ -37,16 +37,6 @@ .grid-x .cell.small-5 - %h4 - Reviewers and Submissions - %p - To remove an assignment, drag the submission from the reviewer's box back to the unassigned submissions box on the right. - %p - Each reviewer may assess up to - = succeed '.' do - = link_to "#{@grant.max_submissions_per_reviewer} #{'submission'.pluralize(@grant.max_submissions_per_reviewer)}", edit_grant_path(@grant, anchor: 'reviewers'), title: 'Change this setting' - - .cell.small-5.small-offset-2 %h4 Unassigned Submissions %p @@ -58,14 +48,18 @@ %p Note: Draft submissions are not reviewable. - .grid-x - #assigned-reviewers.cell.small-5 - - if @grant_reviewers.none? - There are no reviewers. Use the form above to define reviewers by their email address. - - else - = render partial: 'reviewers', locals: { grant: @grant, grant_reviewers: @grant_reviewers } + .cell.small-5.small-offset-2 + %h4 + Reviewers and Submissions + %p + To remove an assignment, drag the submission from the reviewer's box back to the unassigned submissions box on the right. + %p + Each reviewer may assess up to + = succeed '.' do + = link_to "#{@grant.max_submissions_per_reviewer} #{'submission'.pluralize(@grant.max_submissions_per_reviewer)}", edit_grant_path(@grant, anchor: 'reviewers'), title: 'Change this setting' - .gridx.small-5.small-offset-2(data-sticky-container) + .grid-x + .gridx.small-5(data-sticky-container) #unassigned_submissions.sticky(data-sticky data-top-anchor="assigned-reviewers") .unassigned_submission_list - if @unassigned_submissions.none? @@ -73,6 +67,12 @@ - else = render partial: 'unassigned_submissions', locals: { grant: @grant, unassigned_submissions: @unassigned_submissions } + #assigned-reviewers.cell.small-5.small-offset-2 + - if @grant_reviewers.none? + There are no reviewers. Use the form above to define reviewers by their email address. + - else + = render partial: 'reviewers', locals: { grant: @grant, grant_reviewers: @grant_reviewers } + :javascript function downloadJSAtOnload() { $.ajaxSetup({