From 571c6a9e3ebe1a434630e3bf6ad2bb0cdaeb4896 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 29 Sep 2015 15:48:44 +1000
Subject: [PATCH] Updated modules with Gitlab

---
 .gitmodules                                   |  7 ++--
 .../classes/Controller/Director/Welcome.php   | 33 -------------------
 application/views/child/director/add_edit.php |  2 +-
 .../views/child/director/add_roomrow.php      |  1 -
 modules/lnapp                                 |  2 +-
 modules/lnauth                                |  2 +-
 6 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f53f5f4..21d719d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "includes/kohana"]
 	path = includes/kohana
-	url = ssh://deon@l.dlcm.co:222/afs/local/git/lnkohana
+	url = git@dev.leenooks.net:deon/lnkohana.git
 [submodule "modules/lnapp"]
 	path = modules/lnapp
-	url = ssh://deon@l.dlcm.co:222/afs/local/git/lnapp
+	url = git@dev.leenooks.net:deon/lnapp.git
+[submodule "modules/lnauth"]
+	path = modules/lnauth
+	url = git@dev.leenooks.net:deon/lnauth.git
diff --git a/application/classes/Controller/Director/Welcome.php b/application/classes/Controller/Director/Welcome.php
index fc0bac5..2fa53e3 100644
--- a/application/classes/Controller/Director/Welcome.php
+++ b/application/classes/Controller/Director/Welcome.php
@@ -18,39 +18,6 @@ class Controller_Director_Welcome extends Controller_Welcome {
 	 * Show Directory Main Page
 	 */
 	public function action_index() {
-		$output = '';
-
-		$t = strtotime($this->request->query('date'));
-		if (! $t)
-			$t = time();
-
-		$so = Company::instance()->so();
-		$date = Site::DateStartOfWeek($t);
-		$days = 7;
-
-		$output .= '<form id="select_date">';
-		$output .= View::factory('room/availability')
-			->set('date',$date)
-			->set('days',$days)
-			->set('available_places',$so->available_places($date,$days))
-			->set('open_dates',$so->open_dates($date,$days))
-			->set('total_places',$so->total_places($date,$days))
-			->set('r',$so->rooms->find_all())
-			->set('uri',$this->request->uri());
-		$output .= '</form>';
-
-		Style::factory()
-			->type('file')
-			->data('media/theme/bootstrap/css/bootstrap.datepicker.css');
-
-		Script::factory()
-			->type('file')
-			->data('media/theme/bootstrap/js/bootstrap.datepicker.js');
-
-		Block::factory()
-			->title(sprintf('Availability for %s',Site::date($date)))
-			->title_icon('icon-cog')
-			->body($output);
 	}
 }
 ?>
diff --git a/application/views/child/director/add_edit.php b/application/views/child/director/add_edit.php
index aeeb436..35c8efc 100644
--- a/application/views/child/director/add_edit.php
+++ b/application/views/child/director/add_edit.php
@@ -49,7 +49,7 @@
 			<button type="button" name="add" class="btn btn-sm btn-default" value="a">Absent Notice</button>
 			<button type="button" name="add" class="btn btn-sm btn-default" value="A" disabled="disabled">Absent No Show</button>
 			<button type="button" name="add" class="btn btn-sm btn-default" value="c">Casual Request</button>
-			<button type="button" name="add" class="btn btn-sm btn-default" value="C" disabled="disabled">Casual Days</button>
+			<button type="button" name="add" class="btn btn-sm btn-default" value="C" disabled="disabled">Casual Confirm</button>
 			<button type="button" name="add" class="btn btn-sm btn-default" value="r" disabled="disabled">Reduce Days</button>
 			<button type="button" name="add" class="btn btn-sm btn-default" value="P">Permanent Placement</button>
 			<button type="button" name="add" class="btn btn-sm btn-default" value="w">Waitlist</button>
diff --git a/application/views/child/director/add_roomrow.php b/application/views/child/director/add_roomrow.php
index 9acc6b2..417e115 100644
--- a/application/views/child/director/add_roomrow.php
+++ b/application/views/child/director/add_roomrow.php
@@ -3,7 +3,6 @@
 
 	<td><?php
 		switch ($type) {
-			case 'c':
 			case 'r':
 				echo '&nbsp;';
 				break;
diff --git a/modules/lnapp b/modules/lnapp
index db7f5f8..69c8052 160000
--- a/modules/lnapp
+++ b/modules/lnapp
@@ -1 +1 @@
-Subproject commit db7f5f8d55fb2d467d7e70df5f7bd15b7a21efbc
+Subproject commit 69c8052b53a2686e2a6893611a68cdcdde6c8659
diff --git a/modules/lnauth b/modules/lnauth
index 082e280..932252b 160000
--- a/modules/lnauth
+++ b/modules/lnauth
@@ -1 +1 @@
-Subproject commit 082e280fb657ad2377b070b2979cfd118766aa67
+Subproject commit 932252b620b5dc4f7f714ae6974d228417830f8a