Updated modules with Gitlab
This commit is contained in:
parent
fba5988d8d
commit
571c6a9e3e
7
.gitmodules
vendored
7
.gitmodules
vendored
@ -1,6 +1,9 @@
|
|||||||
[submodule "includes/kohana"]
|
[submodule "includes/kohana"]
|
||||||
path = 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"]
|
[submodule "modules/lnapp"]
|
||||||
path = 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
|
||||||
|
@ -18,39 +18,6 @@ class Controller_Director_Welcome extends Controller_Welcome {
|
|||||||
* Show Directory Main Page
|
* Show Directory Main Page
|
||||||
*/
|
*/
|
||||||
public function action_index() {
|
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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
@ -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">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="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">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="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="P">Permanent Placement</button>
|
||||||
<button type="button" name="add" class="btn btn-sm btn-default" value="w">Waitlist</button>
|
<button type="button" name="add" class="btn btn-sm btn-default" value="w">Waitlist</button>
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
<td><?php
|
<td><?php
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case 'c':
|
|
||||||
case 'r':
|
case 'r':
|
||||||
echo ' ';
|
echo ' ';
|
||||||
break;
|
break;
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit db7f5f8d55fb2d467d7e70df5f7bd15b7a21efbc
|
Subproject commit 69c8052b53a2686e2a6893611a68cdcdde6c8659
|
@ -1 +1 @@
|
|||||||
Subproject commit 082e280fb657ad2377b070b2979cfd118766aa67
|
Subproject commit 932252b620b5dc4f7f714ae6974d228417830f8a
|
Reference in New Issue
Block a user