Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:pensare/dbois

Browse Source 
# Conflicts:
#	application/views/pages/login/login_view.php
#	public/js/lib/modules/login/loginModule.js
#	public/js/lib/modules/specials/notifyModule.js
This commit is contained in:
theo
2017-12-20 15:00:54 +01:00
parent 87a94eb27b 5b05ea68d8
commit c050960fb5
22 changed files with 719 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/pages/login/login_view.php
+9 -5
View File
@@ -35,25 +35,28 @@
<body class="animsition page-login-v3 layout-full">
<?php $this->load->view('specials/notify_modal'); ?>
<!-- Page -->
<?php $this->load->view('specials/notifyme_modal'); ?>
<div class="page vertical-align text-center" data-animsition-in="fade-in" data-animsition-out="fade-out">
<div class="page-content vertical-align-middle animation-slide-top animation-duration-1">
<div class="panel">
<div class="panel" id="login-form">
<div class="panel-body">
<div class="brand">
<img class="brand-img" src="css/images/logo_dbo.png" alt="...">
<h2 class="brand-text font-size-18">projectbeheer</h2>
</div>
<form method="post" action="#" id="login-form">
<div>
<div class="form-group form-material floating" data-plugin="formMaterial">
<input type="text" class="form-control" name="username" />
<input type="text" class="form-control" name="email"
data-bind="textInput:username" />
<label class="floating-label">gebruikersnaam</label>
</div>
<div class="form-group form-material floating" data-plugin="formMaterial">
<input type="password" class="form-control" name="password" />
<input type="password" class="form-control" name="password"
data-bind="textInput:password" />
<label class="floating-label">wachtwoord</label>
</div>
<button type="button" class="btn btn-primary btn-block btn-lg mt-40" data-bind="click:login">Log in</button>
</form>
</div>
</div>
</div>
@@ -103,6 +106,7 @@
<script src="js/vendor/Plugin/switchery.js"></script>
<script src="js/vendor/Plugin/jquery-placeholder.js"></script>
<script src="js/vendor/Plugin/material.js"></script>
<script src="js/vendor/Knockout.min.js"></script>
<script src="js/lib/modules/login/loginModule.js"></script>
<script src="js/lib/modules/specials/notifyModule.js"></script>