Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade
This commit is contained in:
@@ -1,25 +1,33 @@
|
||||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
class Welcome extends CI_Controller {
|
||||
|
||||
/**
|
||||
* Index Page for this controller.
|
||||
*
|
||||
* Maps to the following URL
|
||||
* http://example.com/index.php/welcome
|
||||
* - or -
|
||||
* http://example.com/index.php/welcome/index
|
||||
* - or -
|
||||
* Since this controller is set as the default controller in
|
||||
* config/routes.php, it's displayed at http://example.com/
|
||||
*
|
||||
* So any other public methods not prefixed with an underscore will
|
||||
* map to /index.php/welcome/<method_name>
|
||||
* @see https://codeigniter.com/user_guide/general/urls.html
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$this->load->view('home/home');
|
||||
}
|
||||
/**
|
||||
* Index Page for this controller.
|
||||
*
|
||||
* Maps to the following URL
|
||||
* http://example.com/index.php/welcome
|
||||
* - or -
|
||||
* http://example.com/index.php/welcome/index
|
||||
* - or -
|
||||
* Since this controller is set as the default controller in
|
||||
* config/routes.php, it's displayed at http://example.com/
|
||||
*
|
||||
* So any other public methods not prefixed with an underscore will
|
||||
* map to /index.php/welcome/<method_name>
|
||||
* @see https://codeigniter.com/user_guide/general/urls.html
|
||||
*/
|
||||
public function index() {
|
||||
$this->load->view('home/home');
|
||||
// redirect("auth/index");
|
||||
}
|
||||
|
||||
public function viewLogin() {
|
||||
echo "Ameye";
|
||||
redirect("auth/index");
|
||||
exit();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
<li><a href="#pricing" class="smoothscroll">PLANS</a></li>
|
||||
<li><a href="#download" class="smoothscroll">DOWNLOAD</a></li>
|
||||
<li><a href="#contact" class="smoothscroll">CONTACT</a></li>
|
||||
<li style="background-color: #ccffcc;"><a href="/auth" class="smoothscroll">ACCOUNT</a></li>
|
||||
<li style="background-color: #FC6443;" onclick="viewLogin(); return;"><a href="/auth" >ACCOUNT</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -402,5 +402,23 @@
|
||||
<script src="/assets/js/typed.min.js"></script>
|
||||
<script src="/assets/js/theme.js"></script>
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
function viewLogin() {
|
||||
|
||||
$.ajax({
|
||||
url: "/welcome/viewLogin?proc=PROCESS&welcome=welcome"
|
||||
}).done(function (data) {
|
||||
// alert(100);
|
||||
});
|
||||
return true;
|
||||
}
|
||||
// -->
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -4,43 +4,36 @@
|
||||
<h4 class="card-title">Add Video</h4>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form class="form">
|
||||
<div class="form-body">
|
||||
<div class="form-group">
|
||||
<label for="feedback1" class="sr-only">Note Title</label>
|
||||
<input type="text" id="feedback1" class="form-control" placeholder="Name" name="name">
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label for="feedback3" class="sr-only">Suggestion</label>
|
||||
<textarea id="feedback3" rows="6" class="form-control" name="message" placeholder="Suggestion"></textarea>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h4 class="card-title">Use Button To Select Files</h4>
|
||||
</div>
|
||||
<div class="card-content">
|
||||
<div class="card-body">
|
||||
|
||||
<button id="select-files" class="btn btn-primary mb-1"><i class="icon-file2"></i> Click me to select
|
||||
files</button>
|
||||
<form action="#" class="dropzone dropzone-area" id="dpz-btn-select-files">
|
||||
<div class="dz-message">Drop Files Here To Upload</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- form class="form" -->
|
||||
<div class="form-body">
|
||||
<div class="form-group">
|
||||
<label for="feedback1" class="sr-only">Note Title</label>
|
||||
<input type="text" id="feedback1" class="form-control" placeholder="Name" name="name">
|
||||
</div>
|
||||
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-primary mr-1">Submit</button>
|
||||
<button type="reset" class="btn btn-outline-warning">Cancel</button>
|
||||
<div class="form-group">
|
||||
|
||||
|
||||
|
||||
<form action="#" class="dropzone dropzone-area" id="dpz-btn-select-files">
|
||||
<div class="dz-message">Drop Files Here To Upload</div>
|
||||
</form>
|
||||
<button id="select-files" class="btn btn-primary mb-1"><i class="icon-file2"></i> Select Files</button>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="feedback3" class="sr-only">Suggestion</label>
|
||||
<textarea id="feedback3" rows="4" class="form-control" name="message" placeholder="Description"></textarea>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-primary mr-1">Submit</button>
|
||||
<button type="reset" class="btn btn-outline-warning">Cancel</button>
|
||||
</div>
|
||||
<!-- /form -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?
|
||||
print_r($page_card);
|
||||
//print_r($page_card);
|
||||
?>
|
||||
|
||||
<!-- BEGIN: Content-->
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/ui/prism.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/file-uploaders/dropzone.min.css">
|
||||
<!-- END: Vendor CSS-->
|
||||
|
||||
<!-- BEGIN: Theme CSS-->
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/css/bootstrap.css">
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/css/bootstrap-extended.css">
|
||||
@@ -46,6 +47,8 @@
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/css/pages/dashboard-analytics.css">
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/css/pages/card-analytics.css">
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/css/plugins/tour/tour.css">
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/css/plugins/file-uploaders/dropzone.css">
|
||||
|
||||
<!-- END: Page CSS-->
|
||||
|
||||
<!-- BEGIN: Vendor CSS-->
|
||||
@@ -57,6 +60,10 @@
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/ui/prism.min.css">
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/vendors/css/file-uploaders/dropzone.min.css">
|
||||
<!-- END: Vendor CSS-->
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- BEGIN: Custom CSS-->
|
||||
<link rel="stylesheet" type="text/css" href="/assets2/css/style.css">
|
||||
<!-- END: Custom CSS-->
|
||||
|
||||
Reference in New Issue
Block a user