From 198f467084bfc10376c11e94e7a96d6261c1a3c3 Mon Sep 17 00:00:00 2001 From: Hidde Leistra <hleistra@gmail.com> Date: Thu, 30 May 2019 16:30:28 +0200 Subject: [PATCH] Move feedback options in exam view inside panel-block --- client/views/Exam.jsx | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/client/views/Exam.jsx b/client/views/Exam.jsx index e14ba449..b7f7f0ad 100644 --- a/client/views/Exam.jsx +++ b/client/views/Exam.jsx @@ -347,19 +347,24 @@ class Exams extends React.Component { props.saveProblemName(e.target.value) }} /> </div> - <br /> - {!this.state.editActive && <label className='label'>Feedback options</label>} </React.Fragment> )} </div> </div> - {this.isProblemWidget(selectedWidgetId) && (this.state.editActive - ? <EditPanel problemID={props.problem.id} feedback={this.state.feedbackToEdit} - goBack={this.backToFeedback} updateCallback={this.updateFeedback} /> - : <FeedbackPanel examID={this.props.examID} problem={props.problem} - editFeedback={this.editFeedback} showTooltips={this.state.showTooltips} - grading={false} - />)} + {this.isProblemWidget(selectedWidgetId) && + <React.Fragment> + <div className='panel-block'> + {!this.state.editActive && <label className='label'>Feedback options</label>} + </div> + {this.state.editActive + ? <EditPanel problemID={props.problem.id} feedback={this.state.feedbackToEdit} + goBack={this.backToFeedback} updateCallback={this.updateFeedback} /> + : <FeedbackPanel examID={this.props.examID} problem={props.problem} + editFeedback={this.editFeedback} showTooltips={this.state.showTooltips} + grading={false} + />} + </React.Fragment> + } <div className='panel-block'> <button disabled={props.disabledDelete} -- GitLab