[exams] small design changes

5 files changed, 133 insertions, 110 deletions

diff --git a/modules-available/exams/page.inc.php b/modules-available/exams/page.inc.php
index 692230b0..a6bd7e16 100644
--- a/modules-available/exams/page.inc.php
+++ b/modules-available/exams/page.inc.php
@@ -150,7 +150,7 @@ class Page_Exams extends Page
 			foreach ($this->exams as $exam) {
 				if ($exam['endtime'] < $now) {
 					$exam['rowClass'] = 'text-muted';
-					$exam['btnClass'] = 'btn-success';
+					$exam['btnClass'] = 'btn-default';
 					$exam['liesInPast'] = true;
 				} else {
 					$exam['btnClass'] = 'btn-danger';
diff --git a/modules-available/exams/style.css b/modules-available/exams/style.css
index 4a6cd7da..cadb8716 100644
--- a/modules-available/exams/style.css
+++ b/modules-available/exams/style.css
@@ -15,3 +15,7 @@
 .vis-item.disabled {
     background-color: rgba(189, 195, 199, 1.0) !important;
 }
+
+.table > tbody > tr > td {
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/modules-available/exams/templates/page-exams-vis.html b/modules-available/exams/templates/page-exams-vis.html
index e347900b..caf4aea2 100644
--- a/modules-available/exams/templates/page-exams-vis.html
+++ b/modules-available/exams/templates/page-exams-vis.html
@@ -1,6 +1,15 @@
-<h2>{{lang_headingGraphicalOverview}}</h2>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_headingGraphicalOverview}}
+	</div>
+	<div class="panel-body">
+		<div id="timeline" class="slx-space"></div>
+	</div>
+</div>
+
+
+
 
-<div id="timeline" class="slx-space"></div>
 
 <script type="application/javascript"><!--
 
diff --git a/modules-available/exams/templates/page-exams.html b/modules-available/exams/templates/page-exams.html
index 18dd1ab2..06e5905c 100644
--- a/modules-available/exams/templates/page-exams.html
+++ b/modules-available/exams/templates/page-exams.html
@@ -1,59 +1,64 @@
-<h2>{{lang_allExamPeriods}}</h2>
 
-<div class="slx-space">
-	<table class="table stupidtable">
-		<thead>
-			<tr>
-				<th data-sort="int">{{lang_id}}</th>
-				<th data-sort="string">{{lang_locations}}</th>
-				<th data-sort="int">{{lang_begin}}</th>
-				<th data-sort="int">{{lang_end}}</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-			{{#exams}}
-			<tr class="{{rowClass}}">
-				<td>{{examid}}</td>
-				<td>
-					{{locationnames}}
-					{{^locationnames}}
-					<i>{{lang_global}}</i>
-					{{/locationnames}}
-					{{#lecturename}}
-					<div>
-						<b>{{lang_autostart}}</b>: {{lecturename}}
-					</div>
-					{{/lecturename}}
-					<div class="small">
-						{{description}}
-						{{^description}}
-						<i>{{lang_noDescription}}</i>
-						{{/description}}
-					</div>
-				</td>
-				<td class="text-nowrap" data-sort-value={{starttime}}>{{starttime_s}}</td>
-				<td class="text-nowrap" data-sort-value={{endtime}}>{{endtime_s}}</td>
-				<td class="text-nowrap text-right">
-					<form method="POST" action="?do=exams&action=delete" {{^liesInPast}}onsubmit="return confirm('{{lang_deleteConfirmation}}');"{{/liesInPast}} >
-						{{^liesInPast}}
-						<a onclick="slxShow({{starttime}}, {{endtime}})" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-eye-open"></span></a>
-						{{/liesInPast}}
-						<a href="?do=exams&action=edit&examid={{examid}}" class="btn btn-default btn-sm" >{{lang_edit}}</a>
-						<input type="hidden" name="token" value="{{token}}">
-						<input type="hidden" name="examid" value="{{examid}}">
-						<button class="btn {{btnClass}} btn-sm">{{lang_delete}}</button>
-					</form>
-				</td>
-			</tr>
-			{{/exams}}
-		</tbody>
-	</table>
-</div>
-
-<div class="text-right" style="margin-bottom: 20px">
-	<div class="btn-group" role="group">
-		<a href="?do=exams&action=add" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> {{lang_addExam}}</a>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_allExamPeriods}}
 	</div>
-</div>
+	<div class="panel-body">
+		<div class="slx-space">
+			<table class="table stupidtable">
+				<thead>
+					<tr>
+						<th data-sort="int">{{lang_id}}</th>
+						<th data-sort="string">{{lang_locations}}</th>
+						<th data-sort="int">{{lang_begin}}</th>
+						<th data-sort="int">{{lang_end}}</th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
+					{{#exams}}
+					<tr class="{{rowClass}}">
+						<td>{{examid}}</td>
+						<td>
+							{{locationnames}}
+							{{^locationnames}}
+							<i>{{lang_global}}</i>
+							{{/locationnames}}
+							{{#lecturename}}
+							<div>
+								<b>{{lang_autostart}}</b>: {{lecturename}}
+							</div>
+							{{/lecturename}}
+							<div class="small">
+								{{description}}
+								{{^description}}
+								<i>{{lang_noDescription}}</i>
+								{{/description}}
+							</div>
+						</td>
+						<td class="text-nowrap" data-sort-value={{starttime}}>{{starttime_s}}</td>
+						<td class="text-nowrap" data-sort-value={{endtime}}>{{endtime_s}}</td>
+						<td class="text-nowrap text-right">
+							<form method="POST" action="?do=exams&action=delete" {{^liesInPast}}onsubmit="return confirm('{{lang_deleteConfirmation}}');"{{/liesInPast}} >
+								{{^liesInPast}}
+								<a onclick="slxShow({{starttime}}, {{endtime}})" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-eye-open"></span></a>
+								{{/liesInPast}}
+								<a href="?do=exams&action=edit&examid={{examid}}" class="btn btn-default btn-sm" >{{lang_edit}}</a>
+								<input type="hidden" name="token" value="{{token}}">
+								<input type="hidden" name="examid" value="{{examid}}">
+								<button class="btn {{btnClass}} btn-sm">{{lang_delete}}</button>
+							</form>
+						</td>
+					</tr>
+					{{/exams}}
+				</tbody>
+			</table>
+		</div>
 
+		<div class="text-right">
+			<div class="btn-group" role="group">
+				<a href="?do=exams&action=add" class="btn btn-success"><span class="glyphicon glyphicon-plus-sign"></span> {{lang_addExam}}</a>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/modules-available/exams/templates/page-upcoming-lectures.html b/modules-available/exams/templates/page-upcoming-lectures.html
index b8c47725..bea53ad0 100644
--- a/modules-available/exams/templates/page-upcoming-lectures.html
+++ b/modules-available/exams/templates/page-upcoming-lectures.html
@@ -1,52 +1,57 @@
-<h2>{{lang_headingAllExamLectures}}</h2>
-
-<div class="slx-space">
-	<table class="table stupidtable">
-		<thead>
-			<tr>
-				<th data-sort="string">{{lang_lectureName}}</th>
-				<th data-sort="int">{{lang_timeFrame}}</th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-			{{#pending_lectures}}
-			<tr class="{{class}}">
-				<td>
-					{{displayname}}
-					<div class="small">
-						<a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a>
-					</div>
-				</td>
-				<td data-sort-value={{starttime}} width="30%" class="text-nowrap">
-					{{starttime_s}} &ensp; {{endtime_s}}
-					<div class="small">
-						{{lang_duration}}: {{duration_s}}
-						{{^duration_s}}{{lang_moreThanOneDay}}{{/duration_s}}
-					</div>
-				</td>
-				<td width="20%">
-					<div class="pull-right text-nowrap">
-						<a class="btn btn-sm btn-default" role="button" onclick="slxShow({{starttime}}, {{endtime}})"><span class="glyphicon glyphicon-eye-open"></span></a>
-						<a href="?do=exams&amp;action=add&amp;lectureid={{lectureid}}" class="btn btn-sm btn-default" role="button">
-							<span class="glyphicon glyphicon-plus-sign"></span>
-							<span class="hidden-sm">{{lang_addExam}}</span>
-						</a>
-					</div>
-				</td>
-			</tr>
-			{{/pending_lectures}}
-		</tbody>
-		<tfoot>
-			{{#decollapse}}
-			<tr class="slx-decollapse">
-				<td colspan="3">
-					<span class="btn-group btn-group-justified">
-						<span class="btn btn-default btn-sm"><span class="glyphicon glyphicon-menu-down"></span></span>
-					</span>
-				</td>
-			</tr>
-			{{/decollapse}}
-		</tfoot>
-	</table>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_headingAllExamLectures}}
+	</div>
+	<div class="panel-body">
+		<div class="slx-space">
+			<table class="table stupidtable">
+				<thead>
+					<tr>
+						<th data-sort="string">{{lang_lectureName}}</th>
+						<th data-sort="int">{{lang_timeFrame}}</th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
+					{{#pending_lectures}}
+					<tr class="{{class}}">
+						<td>
+							{{displayname}}
+							<div class="small">
+								<a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a>
+							</div>
+						</td>
+						<td data-sort-value={{starttime}} width="30%" class="text-nowrap">
+							{{starttime_s}} &ensp; {{endtime_s}}
+							<div class="small">
+								{{lang_duration}}: {{duration_s}}
+								{{^duration_s}}{{lang_moreThanOneDay}}{{/duration_s}}
+							</div>
+						</td>
+						<td width="20%">
+							<div class="pull-right text-nowrap">
+								<a class="btn btn-sm btn-default" role="button" onclick="slxShow({{starttime}}, {{endtime}})"><span class="glyphicon glyphicon-eye-open"></span></a>
+								<a href="?do=exams&amp;action=add&amp;lectureid={{lectureid}}" class="btn btn-sm btn-success" role="button">
+									<span class="glyphicon glyphicon-plus-sign"></span>
+									<span class="hidden-sm">{{lang_addExam}}</span>
+								</a>
+							</div>
+						</td>
+					</tr>
+					{{/pending_lectures}}
+				</tbody>
+				<tfoot>
+					{{#decollapse}}
+					<tr class="slx-decollapse">
+						<td colspan="3">
+							<span class="btn-group btn-group-justified">
+								<span class="btn btn-default btn-sm"><span class="glyphicon glyphicon-menu-down"></span></span>
+							</span>
+						</td>
+					</tr>
+					{{/decollapse}}
+				</tfoot>
+			</table>
+		</div>
+	</div>
 </div>
\ No newline at end of file