diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.html b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.html index 62050c9116..a3dbfe1e51 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.html +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.html @@ -6,14 +6,10 @@ <div class="col-lg-8"> <h4>Opposition report</h4> - <div class="row mb-4"> - <div class="col-lg-8"> - <div class="help-box"> - Use the assessment criteria in this report and write your views as an opponent in the text - fields under each criterion. However, you do not make a point assessment but are free to - write as much as you wish on each criterion. - </div> - </div> + <div class="help-box mb-3"> + Use the assessment criteria in this report and write your views as an opponent in the text + fields under each criterion. However, you do not make a point assessment but are free to + write as much as you wish on each criterion. </div> <div class="mb-3"> @@ -32,14 +28,14 @@ </wicket:enclosure> <div wicket:id="fillOutReport"> - <strong>Thesis summary</strong> - + <label wicket:for="thesisSummary"> + Thesis summary + </label> <p> Give a short summary of the evaluated work. </p> - <label> - <textarea class="form-control mb-4" rows="8" wicket:id="thesisSummary"></textarea> - </label> + <textarea class="form-control mb-4" rows="8" wicket:id="thesisSummary"></textarea> + </div> </div> </div> diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html index d849423176..947d270792 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html @@ -11,7 +11,7 @@ <div wicket:id="container"> <div wicket:id="opponents"> <div class="row"> - <div class="col-lg-7 mb-3"> + <div class="col-lg-7"> <span wicket:id="user"></span><a href="#" wicket:id="remove"><span class="fa fa-times"></span></a><br> <div wicket:id="report"></div> </div> diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.html b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.html index a7bdd8a3f3..5327a3cac0 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.html +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.html @@ -7,13 +7,13 @@ <div wicket:id="wmc"> <wicket:enclosure child="newReport"> <wicket:container wicket:id="newReport"/> + <div class="alert alert-info mt-1 mb-1" wicket:id="improvements_requested"> + The supervisor has requested improvements to your opposition report. + Click the link below to see detailed comments from the supervisor and to make the requested changes. + </div> <span wicket:id="oppositionReportLabel"></span> <span wicket:id="noOppositionReportYet"></span> <a href="#" wicket:id="oppositionReportLink">Fill out opposition report</a> - <div class="alert alert-info mt-1" wicket:id="improvements_requested"> - The supervisor has requested improvements to your opposition report. - Click the link above to see detailed comments from the supervisor and to make the requested changes. - </div> - <span wicket:id="downloadPdfPanel"></span><br /> + <div wicket:id="downloadPdfPanel"></div> <wicket:enclosure child="downloadAttachment"> Report attachment: <span wicket:id="downloadAttachment"></span> </wicket:enclosure> diff --git a/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.html b/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.html index c18fd20db6..6877da1204 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.html +++ b/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.html @@ -5,30 +5,26 @@ </head> <body> <wicket:border> - <div class="row"> - <div class="col-lg-8"> - <div wicket:id="save"></div> - <form wicket:id="form"> - <div wicket:id="feedbackPanel"></div> - <wicket:body/> - <div wicket:id="criteria"> - <strong><span wicket:id="title"></span></strong> + <div wicket:id="save"></div> + <form wicket:id="form"> + <div wicket:id="feedbackPanel"></div> + <wicket:body/> + <div wicket:id="criteria"> + <strong><span wicket:id="title"></span></strong> - <p><span wicket:id="description" class="gradingCriteria"></span></p> - <textarea class="form-control mb-4" rows="8" cols="5" wicket:id="feedback"></textarea> - </div> - <div> - <strong><wicket:message key="attachment" /></strong> - <span wicket:id="viewAttachment"></span> - <a wicket:id="deleteAttachment"><span class="fa fa-times"></span></a> - <input type="file" wicket:id="uploadAttachment" class="mb-3"/> - </div> - <button type="button" class="btn btn-success btn-sm mb-3" wicket:id="submit"> - Submit - </button> - </form> + <p><span wicket:id="description" class="gradingCriteria"></span></p> + <textarea class="form-control mb-4" rows="8" cols="5" wicket:id="feedback"></textarea> </div> - </div> + <div> + <strong><wicket:message key="attachment" /></strong> + <span wicket:id="viewAttachment"></span> + <a wicket:id="deleteAttachment"><span class="fa fa-times"></span></a> + <input type="file" wicket:id="uploadAttachment" class="mb-3"/> + </div> + <button type="button" class="btn btn-success btn-sm mb-3" wicket:id="submit"> + Submit + </button> + </form> </wicket:border> </body> </html> \ No newline at end of file