diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.html b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.html
index 6772a65c5e..122526fde7 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.html
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminServerEnvironmentSettingsPage.html
@@ -3,15 +3,16 @@
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
- <h3 class="section">Server/Request environment</h3>
- <div style="overflow:auto;height:390px;">
- <ul>
- <li wicket:id="requestAttributes">
- <span wicket:id="name">[name]</span>:
- <span wicket:id="value">[value]</span>
- </li>
- </ul>
+ <h5 class="peer-title">Server/Request environment</h5>
+ <div>
+ <div style="overflow: auto; height: 360px;">
+ <ul>
+ <li wicket:id="requestAttributes"><span wicket:id="name">[name]</span>:
+ <span wicket:id="value">[value]</span>
+ </li>
+ </ul>
+ </div>
</div>
-</wicket:extend>
+ </wicket:extend>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/peer/pages/PeerRequestSubmissionPage.html b/src/main/java/se/su/dsv/scipro/peer/pages/PeerRequestSubmissionPage.html
index f631ee2539..77ceb00a1d 100644
--- a/src/main/java/se/su/dsv/scipro/peer/pages/PeerRequestSubmissionPage.html
+++ b/src/main/java/se/su/dsv/scipro/peer/pages/PeerRequestSubmissionPage.html
@@ -1,86 +1,102 @@
<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+<html
+ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
-<wicket:extend>
- <div class="span-22">
- <div wicket:id="feedbackPanel"></div>
- <form wicket:id="requestForm" class="wizard-form">
- <div class="span-22 last">
- <div class="span-11 colborder">
- <div>
- <fieldset>
- <legend>Step 1 - Read instructions</legend>
- <p>The instructions are located in the box to the right</p>
- </fieldset>
- <fieldset>
- <legend wicket:id="fileUploadLabel">[Step 2 - Attach a file]</legend>
- <input wicket:id="fileUpload" type="file" />
- </fieldset>
- <fieldset>
- <legend>Step 3 - Write review guideline/comment (optional)</legend>
- <textarea wicket:id="comment"></textarea>
- </fieldset>
- </div>
- </div>
- <div class="span-8 last info-box rounded-box">
- <ul>
- <li><p>Providing a review template is of great help for the reviewer, browse available templates and try to find an appropriate one!</p></li>
- <li><p>If you cannot find an suitable review template, make sure to use the review guideline/comment to point out what you'd like feedback on.</p></li>
- <li><p>If a review template covers too much, make sure to point out questions that you don't feel like they apply</p></li>
- <li><p>If you're missing relevant questions in the review template, make sure to mention them in the comment.</p></li>
- <li><p>If you have several files you'd like to attach, compress them to an archived file (ie. zip-file).</p></li>
- <li><p><strong>Remember that the more guidelines (review template, questions you'd like answered etc.) you provide the reviewer, the greater the chance of a useful review!</strong></p></li>
- </ul>
+ <wicket:extend>
+ <div class="span-22">
+ <div wicket:id="feedbackPanel"></div>
+ <form wicket:id="requestForm" class="wizard-form">
+ <div class="span-22">
+ <div>
+ <h5 class="peer-title">Step 1 - Read instructions</h5>
+ <ul>
+ <li>Providing a review template is of great help for the
+ reviewer, browse available templates and try to find an
+ appropriate one!</li>
+ <li>If you cannot find an suitable review template, make
+ sure to use the review guideline/comment to point out what you'd
+ like feedback on.</li>
+ <li>If a review template covers too much, make sure to point
+ out questions that you don't feel like they apply</li>
+ <li>If you're missing relevant questions in the review
+ template, make sure to mention them in the comment.</li>
+ <li>If you have several files you'd like to attach, compress
+ them to an archived file (ie. zip-file).</li>
+ <li>Remember that the more guidelines (review template,
+ questions you'd like answered etc.) you provide the reviewer,
+ the greater the chance of a useful review!</li>
+ </ul>
+ </div>
+ <div class="span-22 forcedPaddingBottom">
+ <div class="span-11 first">
+ <h5 class="peer-title" wicket:id="fileUploadLabel">[Step 2 -
+ Attach a file]</h5>
+ <input wicket:id="fileUpload" type="file" style="margin-top:2em;"/>
+ </div>
+ <div class="span-11 last">
+ <h5 class="peer-title">Step 3 - Write review
+ guideline/comment (optional)</h5>
+ <textarea wicket:id="comment"></textarea>
+ </div>
+ </div>
</div>
- </div>
- <div class="span-22 last">
- <fieldset>
- <legend>Step 4 - Select a suitable review template (optional)</legend>
- <div wicket:id="listContainer">
- <table class="rounded-table">
- <tr>
- <th>Select</th>
- <th>Name</th>
- <th>Description</th>
- <th>Questions</th>
- <th>Preview</th>
- </tr>
- <tr>
- <td colspan="5"><i><span wicket:id="noTemplatesFoundMsg"></span></i></td>
- </tr>
- <tr wicket:id="templateList">
- <td><a wicket:id="selectTemplateLink" href="#">Select</a></td>
- <td><span wicket:id="templateName"></span></td>
- <td><div class="span-8"><span wicket:id="templateDescription"></span></div></td>
- <td><span wicket:id="templateNumQuestions"></span></td>
- <td><a href="#" wicket:id="previewTemplateLink">Preview</a></td>
- </tr>
- <tr><td wicket:id="pager" colspan="5"></td></tr>
- </table>
- </div>
- <div wicket:id="selectedTemplateContainer">
- <strong>Selected template: </strong>
- <span wicket:id="selectedTemplate"></span>
- <a href="#" wicket:id="unSelectTemplateLink">
- <img class="icon-12" src="images/icons/delete_16x16.png" alt="Unselect template"/> Unselect
- </a>
- </div>
- </fieldset>
-
- <fieldset>
- <legend>Step 5 - Submit your request</legend>
- <div wicket:id="feedbackPanel">
- <!-- The feedback panel -->
- </div>
- <div>
- <button wicket:id="sendRequestButton" class="button">Submit your request for review
- <img src="css/blueprint/plugins/buttons/icons/tick.png" alt=""/>
+ <div class="span-22">
+ <h5 class="peer-title">Step 4 - Select a suitable review
+ template (optional)</h5>
+ <div wicket:id="listContainer">
+ <table class="rounded-table">
+ <tr>
+ <th>Select</th>
+ <th>Name</th>
+ <th>Description</th>
+ <th>Questions</th>
+ <th>Preview</th>
+ </tr>
+ <tr>
+ <td colspan="5"><i><span
+ wicket:id="noTemplatesFoundMsg"></span>
+ </i>
+ </td>
+ </tr>
+ <tr wicket:id="templateList">
+ <td><a wicket:id="selectTemplateLink" href="#">Select</a>
+ </td>
+ <td><span wicket:id="templateName"></span>
+ </td>
+ <td><div class="span-8">
+ <span wicket:id="templateDescription"></span>
+ </div>
+ </td>
+ <td><span wicket:id="templateNumQuestions"></span>
+ </td>
+ <td><a href="#" wicket:id="previewTemplateLink"><img src="images/icons/document-preview_16x16.png" class="icon-16" alt="Preview template"/></a>
+ </td>
+ </tr>
+ <tr>
+ <td wicket:id="pager" colspan="5"></td>
+ </tr>
+ </table>
+ </div>
+ <div wicket:id="selectedTemplateContainer" class="forcedPaddingBottom">
+ <strong>Selected template: </strong> <span
+ wicket:id="selectedTemplate"></span> <a href="#"
+ wicket:id="unSelectTemplateLink"> <img class="icon-12"
+ src="images/icons/delete_16x16.png" alt="Unselect template" />
+ Unselect </a>
+ </div>
+ <h5 class="peer-title">Step 5 - Submit your request</h5>
+ <div wicket:id="feedbackPanel">
+ <!-- The feedback panel -->
+ </div>
+ <div>
+ <button wicket:id="sendRequestButton" class="button">
+ Submit your request for review <img
+ src="css/blueprint/plugins/buttons/icons/tick.png" alt="" />
</button>
- </div>
- </fieldset>
- </div>
- </form>
- </div>
-</wicket:extend>
+ </div>
+ </div>
+ </form>
+ </div>
+ </wicket:extend>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.html b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.html
index 404fb4e62d..c103d699bd 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.html
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoRequestsPanel.html
@@ -6,7 +6,7 @@
<body>
<wicket:panel>
<div class="append-bottom">
- <h6>Requests with completed reviews</h6>
+ <h6>Completed reviews</h6>
<i wicket:id="noReceivedReviewsCompletedMessage"></i>
<ul class="no-list-style small">
<li wicket:id="receivedReviewsCompleted">
@@ -20,7 +20,7 @@
</div>
<div class="append-bottom">
- <h6>Requests with reviews in progress</h6>
+ <h6>In progress</h6>
<i wicket:id="noReceivedReviewsInProgressMessage"></i>
<ul class="no-list-style small">
<li wicket:id="receivedReviewsInProgress">
@@ -34,7 +34,7 @@
</div>
<div class="append-bottom">
- <h6>Requests waiting to be accepted</h6>
+ <h6>Awaiting review</h6>
<div wicket:id="peerInfoRequestsFeedback"></div>
<i wicket:id="noAwaitingAcceptMsg"></i>
<ul class="no-list-style small">
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoReviewsPanel.html b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoReviewsPanel.html
index 4626e86bad..aaa71585ed 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoReviewsPanel.html
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerInfoReviewsPanel.html
@@ -6,7 +6,7 @@
<body>
<wicket:panel>
<div class="append-bottom">
- <h6>Reviews completed</h6>
+ <h6>Completed</h6>
<i wicket:id="noAcceptedReviewsCompletedMessage"></i>
<ul class="no-list-style small">
<li wicket:id="acceptedReviewsCompleted">
@@ -19,7 +19,7 @@
</div>
<div class="append-bottom">
- <h6>Reviews in progress</h6>
+ <h6>In progress</h6>
<i wicket:id="noAcceptedInProgressMessage"></i>
<ul class="no-list-style small">
<li wicket:id="acceptedInProgress">
@@ -32,7 +32,7 @@
</div>
<div>
- <h6>Reviews aborted: <span wicket:id="abortedReviews"></span></h6>
+ <h6>Aborted: <span wicket:id="abortedReviews"></span></h6>
</div>
</wicket:panel>
</body>
diff --git a/src/main/webapp/css/scipro.css b/src/main/webapp/css/scipro.css
index 1d5fe781cd..24e7986c9b 100644
--- a/src/main/webapp/css/scipro.css
+++ b/src/main/webapp/css/scipro.css
@@ -63,6 +63,7 @@ img.department-logotype {
#main-content {
min-height: 500px;
background: url('../images/background.png') repeat-y;
+ padding-bottom: 1.5em;
}
#main-content h1,
@@ -236,6 +237,10 @@ ul.no-list-style li {
margin-left: -1.5em;
}
+.rounded-table,
+.rounded-table-top{
+ padding-top: 0.5em;
+}
.rounded-table th,
.rounded-table-top th {
background: #ccc;
@@ -831,7 +836,6 @@ td.active {
text-align:right;
white-space: nowrap;
}
-
.question-rounded-box {
font-size: 0.9em;
padding:1.5em;
@@ -930,7 +934,9 @@ h5.peer-box-subtitle {
.shortened-table-header {
cursor: help;
}
-
+.forcedPaddingBottom{
+ padding-bottom: 1.5em;
+}
table.seminar-table {
font-size: 0.9em;
}