Merge : GWM
This commit is contained in:
parent
bedb4aa236
commit
70ad55f089
@ -1,9 +1,7 @@
|
||||
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
|
||||
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
|
||||
<script src="<?php echo base_url() ?>public/assets/js/jquery.CongelarFilaColumna.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script>
|
||||
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css"
|
||||
rel="stylesheet">
|
||||
<!-- <script src="<?php echo base_url() ?>public/assets/js/jquery.CongelarFilaColumna.js"></script> -->
|
||||
|
||||
|
||||
|
||||
<?php
|
||||
@ -202,11 +200,11 @@ $currentday = date('d');
|
||||
$attributes = array('id' => 'atten');
|
||||
echo form_open('attendance', $attributes); ?>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-3">
|
||||
<?php $today = date('M-Y');
|
||||
$data = array('type' => 'text', 'name' => 'month', 'id' => 'month', 'value' => $datefordropdown, 'class' => 'form-control select2');
|
||||
echo form_input($data);
|
||||
?>
|
||||
<?php $today = date('M-Y'); ?>
|
||||
<input type="text" name="month" id="month" value="<?php echo $datefordropdown; ?>" class="form-control" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1">
|
||||
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<input type="submit" value="Change Month" class="btn btn-success"
|
||||
@ -488,7 +486,7 @@ $currentday = date('d');
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
|
||||
<!-- <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script> -->
|
||||
<script type="text/javascript">
|
||||
$("#month").datepicker({
|
||||
minViewMode: 1,
|
||||
|
||||
@ -64,6 +64,9 @@
|
||||
<script src="<?php echo base_url(); ?>public/new_assets/libs/select2/js/select2.min.js"></script>
|
||||
|
||||
<!-- <script src="<?php echo base_url(); ?>public/new_assets/js/validation.js" type="text/javascript"></script> -->
|
||||
|
||||
|
||||
<script src="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
|
||||
|
||||
|
||||
<script>
|
||||
|
||||
@ -62,6 +62,8 @@
|
||||
<!-- Scroll the table left to right -->
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
|
||||
|
||||
<link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
|
||||
|
||||
<style>
|
||||
::-webkit-scrollbar {
|
||||
width: 5px;
|
||||
|
||||
@ -64,19 +64,15 @@
|
||||
<a href="index.html" class="logo logo-dark text-center">
|
||||
<span class="logo-lg">
|
||||
<img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt=""
|
||||
height="60">
|
||||
</span>
|
||||
</a>
|
||||
<a href="index.html" class="logo logo-dark text-center">
|
||||
<span class="logo-lg">
|
||||
<img src="<?php echo base_url(); ?> " alt="" height="22">
|
||||
height="100">
|
||||
</span>
|
||||
</a>
|
||||
|
||||
|
||||
<a href="index.html" class="logo logo-light text-center">
|
||||
<span class="logo-lg">
|
||||
<img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt=""
|
||||
height="60">
|
||||
height="100">
|
||||
</span>
|
||||
</a>
|
||||
<a href="index.html" class="logo logo-light text-center">
|
||||
@ -88,8 +84,8 @@
|
||||
</div>
|
||||
|
||||
<!-- title-->
|
||||
<h4 class="mt-0">Sign In</h4>
|
||||
<br>
|
||||
<!-- <h4 class="mt-0">Sign In</h4> -->
|
||||
|
||||
|
||||
<!-- form -->
|
||||
<form action="<?php echo base_url(); ?>loginMe" method="post">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user