From 2393c47cc7bfe56b123a9f9e3c4f405f45c01f84 Mon Sep 17 00:00:00 2001
From: Rogier Neeleman <rogier@sciuro.org>
Date: Thu, 7 Apr 2016 21:58:50 +0200
Subject: [PATCH] Opmaak

---
 application/views/edit_lijst.php |  2 +-
 application/views/edit_score.php |  4 +++-
 application/views/footer.php     | 19 +++++++++++++++++--
 application/views/header.php     |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/application/views/edit_lijst.php b/application/views/edit_lijst.php
index ddbf2a8..74e1408 100644
--- a/application/views/edit_lijst.php
+++ b/application/views/edit_lijst.php
@@ -6,7 +6,7 @@
 				Met deze pagina kun je lijsten actief of inactief maken tbv. de beoordeling.
 				Tevens kunnen de ingevulde scores per ronde aangepast worden.
 			</p>
-			<table class="table table-hover" id="maintable">
+			<table class="table table-hover">
 				<thead>
 					<tr>
 						<th>Naam</th>
diff --git a/application/views/edit_score.php b/application/views/edit_score.php
index 75b1c3b..24a5908 100644
--- a/application/views/edit_score.php
+++ b/application/views/edit_score.php
@@ -11,6 +11,7 @@
 			<table class="table table-hover" id="maintable">
 				<thead>
 					<tr>
+						<th>#</th>
 						<th>Naam</th>
 						<?php foreach ($vragen as $vraag) { ?>
 						<th><?php echo $vraag['vraag']; ?></th>
@@ -21,7 +22,8 @@
 				<tbody>
 					<?php foreach ($subgroepen as $subgroep) {?>
 					<tr>
-						<td><?php echo '('.$subgroep['nummer'].') '.$subgroep['themanaam']; ?></td>
+						<td><?php echo $subgroep['nummer']; ?></td>
+						<td><?php echo $subgroep['themanaam']; ?></td>
 						<?php foreach ($vragen as $vraag) { ?>
 						<td>
 						
diff --git a/application/views/footer.php b/application/views/footer.php
index dc7e23d..fe32b2d 100644
--- a/application/views/footer.php
+++ b/application/views/footer.php
@@ -13,8 +13,9 @@
     <script src="<?php echo base_url('bootstrap/js/bootstrap.min.js'); ?>"></script>
 	
 	<?php if (isset($page) && $page == 'uitslag') { ?>
-		<link href="https://cdn.datatables.net/1.10.11/css/jquery.dataTables.min.css" rel="stylesheet">
-		<script type="text/javascript" src="//cdn.datatables.net/1.10.11/js/jquery.dataTables.min.js"></script>
+		<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/t/bs-3.3.6/dt-1.10.11,af-2.1.1,fc-3.2.1/datatables.min.css"/>
+		<script type="text/javascript" src="https://cdn.datatables.net/t/bs-3.3.6/dt-1.10.11,af-2.1.1,fc-3.2.1/datatables.min.js"></script>
+
 		<script type="text/javascript" charset="utf-8">
 			$(document).ready(function() {
 				$('#maintable').dataTable( {
@@ -29,6 +30,20 @@
 				} );
 			} );
 		</script>
+	<?php } elseif (isset($page) && $page == 'edit') { ?>
+		<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/t/bs-3.3.6/dt-1.10.11,af-2.1.1,fc-3.2.1/datatables.min.css"/>
+		<script type="text/javascript" src="https://cdn.datatables.net/t/bs-3.3.6/dt-1.10.11,af-2.1.1,fc-3.2.1/datatables.min.js"></script>
+		
+		<script type="text/javascript" charset="utf-8">
+			$(document).ready(function() {
+				$('#maintable').dataTable( {
+					"paging":   false,
+					"ordering": false,
+					"info":     false,
+					"searching": true,
+				} );
+			} );
+		</script>
 	<?php } ?>
 	
 	</body>
diff --git a/application/views/header.php b/application/views/header.php
index b8efcc6..0f50e31 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -29,7 +29,7 @@
 				<li role="presentation" <?php if ($page == 'beoordelen') {?> class="active" <?php } ?> ><a href="<?php echo base_url('beoordelen/');?>">Beoordelen</a></li>
 				<?php if ($this->session->admin == '1' OR $this->session->superadmin == '1') { ?>
 					<li role="presentation" <?php if ($page == 'uitslag') {?> class="active" <?php } ?> ><a href="<?php echo base_url('uitslag/');?>">Uitslag</a></li>
-					<li role="presentation" <?php if ($page == 'edit') {?> class="active" <?php } ?> ><a href="<?php echo base_url('edit/');?>">Aanpassen</a></li>
+					<li role="presentation" <?php if ($page == 'edit') {?> class="active" <?php } ?> ><a href="<?php echo base_url('edit/');?>">Bewerken</a></li>
 				<?php }; ?>
 				<li role="presentation" <?php if ($page == 'info') {?> class="active" <?php } ?> ><a href="<?php echo base_url('info/');?>">Informatie</a></li>
 				<?php if ($this->session->admin == '1' OR $this->session->superadmin == '1') { ?>