Merge branch 'dubbele-authenticatie-IN-TEST' into develop
This commit is contained in:
Liesbeth ter Schure
@@ -0,0 +1,22 @@
|
||||
<div class="modal" tabindex="-1" role="dialog" id="authenticatorQR">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Scan Google authenticator</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<h3>Scan de google code</h3>
|
||||
<p style="text-align: center">
|
||||
<img data-bind="attr:{src: googleAuthenticatorUrl}" />
|
||||
</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="button" data-dismiss="modal">Ok</button>
|
||||
<button type="button" class="button" data-dismiss="modal">Sluiten</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,24 @@
|
||||
<dialog
|
||||
id="xxx"
|
||||
class="grippa-dialog medium">
|
||||
|
||||
<div class="grippa-dialog-header">
|
||||
<h3></h3>
|
||||
<button
|
||||
class="grippa-dialog-close"
|
||||
data-bind="click:close">
|
||||
</button>
|
||||
</div>
|
||||
<div class="grippa-dialog-body">
|
||||
|
||||
</div>
|
||||
<div class="grippa-dialog-footer">
|
||||
|
||||
<button
|
||||
class="btn btn-danger"
|
||||
data-bind="click:close">
|
||||
sluiten
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</dialog>
|
||||
@@ -0,0 +1,58 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<title>Blank Doc</title>
|
||||
|
||||
</head>
|
||||
|
||||
<body style='font-size: 12px; color: #353535; font-family: "Lucida Grande", "Lucida Sans", "Lucida Sans Unicode", sans-serif; line-height: 1.5;'>
|
||||
<table cellpadding="0" cellspacing="0" style="width:100%; background-color:#ebebeb">
|
||||
<tr>
|
||||
<td style="text-align:center">
|
||||
|
||||
<table id="main"
|
||||
style="width:600px;
|
||||
text-align:center;background-color:#ffffff;
|
||||
border: 1px solid #cfcece; padding:5px; margin-bottom:20px"
|
||||
cellpadding="0" cellspacing="15">
|
||||
<tr>
|
||||
<td style="background-color:#ffffff, text-align:center;width:570px">
|
||||
<img src="<?php echo base_url();?>/images/logos/frameworklogo.png"
|
||||
style="display: block;width:90px; float:right" />
|
||||
</td>
|
||||
</tr>
|
||||
<!-- <tr>
|
||||
<td style="width:570px; background-color: #6F0B3D; text-align:center">
|
||||
<h1 style="color:#ffffff">MonPas</h1>
|
||||
</tr> -->
|
||||
|
||||
<tr>
|
||||
<td style="text-align: left; padding-left: 20px; padding-right:20px">
|
||||
<h3><strong>Geachte <?=$fullname?> </strong></h3>
|
||||
<p>Hieronder vindt u de code om in te loggen op MonPas. </p>
|
||||
<p>Deze code verloopt na 10 minuten.</p>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr >
|
||||
<td>
|
||||
<h3 style="text-align:center; background-color:#6F0B3D;padding:35px; 10px; color:#ffffff; font-size:25px;letter-spacing: 20px;">
|
||||
<strong><?=$code?></strong>
|
||||
</h3>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="eFooter">© Framework-ED</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table><!-- wrapper -->
|
||||
</body>
|
||||
|
||||
|
||||
|
||||
</html>
|
||||
@@ -266,6 +266,29 @@
|
||||
<td>herhaal wachtwoord</td>
|
||||
<td><input style="width: 180px" type="password" data-bind="textInput: newwachtwoord2"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan=2 style="border-top:1px solid #dde4eb"><h4> wijzig twee-factor methode</h4></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Code via</td>
|
||||
<td><input type="radio"
|
||||
style="vertical-align:top"
|
||||
name='usertwofactor'
|
||||
value="EMAIL"
|
||||
data-bind="checked: twofactor" /> E-mail
|
||||
<br>
|
||||
<input type="radio"
|
||||
style="vertical-align:top"
|
||||
name='usertwofactor'
|
||||
value="GOOGLE"
|
||||
data-bind="checked: twofactor,
|
||||
click: fInitializeGoogle" /> Google authenticator
|
||||
<a href="openbaredocs/Googleauthenticator.pdf"
|
||||
target="_blank">
|
||||
<span class="fa fa-info"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
@@ -276,6 +299,7 @@
|
||||
</div>
|
||||
</div> <!-- einde modal -->
|
||||
|
||||
<?php $this->load->view( 'authenticatorQR_modal.php' ); ?>
|
||||
|
||||
<div class="modal fade" id="modSelectGlobOrg" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
@@ -477,12 +501,14 @@
|
||||
|
||||
</div>
|
||||
</div> <!-- class = row -->
|
||||
|
||||
</div>
|
||||
<div id="ajaxloader"></div>
|
||||
<div class="overlay" id="overlay"></div>
|
||||
<?php $this->load->view( 'monpas/modals/uploader_modal.php' ); ?>
|
||||
<?php $this->load->view( 'monpas/modals/downloader_modal.php' ); ?>
|
||||
|
||||
|
||||
<script type="text/javascript" src="<?= base_url() ?>js/services/froalaModule.js?v=<?= $this->version ?>"></script>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
<table class="lstable" style="width:100%">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th style="width:2%">A</th> -->
|
||||
<th style="width:14%"> voornaam</th>
|
||||
<th style="width:12%">tussenv.</th>
|
||||
<th style="width:34%">achternaam</th>
|
||||
@@ -174,6 +173,22 @@
|
||||
enable: ($parent.titel().status() ==1 || $parent.titel().status() == 3 )" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="vertical-align:top">Tweefactor code per
|
||||
<td><input type="radio"
|
||||
style="vertical-align:top"
|
||||
name='usertwofactor'
|
||||
value="EMAIL"
|
||||
data-bind="checked: twofactor" /> E-mail
|
||||
<br>
|
||||
<input type="radio"
|
||||
style="vertical-align:top"
|
||||
name='usertwofactor'
|
||||
value="GOOGLE"
|
||||
data-bind="checked: twofactor"
|
||||
disabled/> Google authenticator
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<p style="font-size:0.8em">* verplichte velden</p>
|
||||
<hr/>
|
||||
|
||||
@@ -7,12 +7,18 @@
|
||||
<title> Framework+ MonPas</title>
|
||||
<link rel="shortcut icon" href="<?=base_url()?>/favicon.ico?v=1" />
|
||||
<link rel="stylesheet" type="text/css" href="<?=base_url()?>/css/monpas/main.css" />
|
||||
|
||||
<!-- <link href="/css_lib/bootstrap-3.3.2-dist/css/bootstrap.css" rel="stylesheet"> -->
|
||||
<link href="/css_lib/font-awesome.css" rel="stylesheet">
|
||||
<link href="/css_lib/apprise.min.css" rel="stylesheet">
|
||||
|
||||
<script type="text/javascript" src="<?=base_url()?>js_lib/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="<?=base_url()?>js_lib/knockout.min.js"></script>
|
||||
<!-- <script type="text/javascript" src="/css_lib/bootstrap-3.3.2-dist/js/bootstrap.js"></script> -->
|
||||
<script type="text/javascript" src="<?=base_url()?>js_lib/hash.js"></script>
|
||||
|
||||
<script type="text/javascript" src="<?=base_url()?>js_lib/apprise.min.js"></script>
|
||||
<script type="text/javascript" src="<?=base_url()?>js/login.js?v=<?=$version?>"></script>
|
||||
<script type="text/javascript" src="<?=base_url()?>js/twoFactor.js?v=<?=$version?>"></script>
|
||||
|
||||
</head>
|
||||
<body style='font-family: lato, sans-serif, verdana;font-size: 16px;'>
|
||||
<div id="pagLogin" >
|
||||
@@ -27,7 +33,7 @@
|
||||
<div data-bind="visible: inloggen">
|
||||
<p style="text-align: center; margin-top:40px;"><img src="css/images/frameworklogo-2.png" /></p>
|
||||
<h3 style="text-align:center" data-bind="text: welkomtekst"></h3>
|
||||
<hr style="color:#879fb8; margin-bottom: 30px;" />
|
||||
<hr style="color:#879fb8; margin-bottom: 10px;" />
|
||||
<p> <span style="display: inline-block; width: 120px; text-align:right">gebruikersnaam</span>
|
||||
<input style="width: 255px; padding:4px;"
|
||||
data-bind="textInput: gnaam, hasFocus: focusop() == 1,enterkey:fZetFocus" />
|
||||
@@ -68,5 +74,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- pagLogin holder -->
|
||||
<?php $this->load->view('twofactor_dialog'); ?>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,53 @@
|
||||
<dialog
|
||||
id="twoFactorDialog"
|
||||
style="z-index: 2"
|
||||
class="grippa-dialog grippa-dialog-md">
|
||||
|
||||
<div class="grippa-dialog-header">
|
||||
<h4>Vul hier de 6-cijferige code in
|
||||
<button
|
||||
class="grippa-dialog-close"
|
||||
data-bind="click:fClose">
|
||||
</button>
|
||||
</h4>
|
||||
</div>
|
||||
<div class="grippa-dialog-body">
|
||||
<input class="form-control two-factor-input"
|
||||
placeholder="CODE"
|
||||
id="two-factor-code"
|
||||
data-bind="textInput:deCode,
|
||||
event:{input: fCheckCode},
|
||||
enable: deCode().length < 6" />
|
||||
<p></p>
|
||||
<p style="text-align:center" data-bind="html: infoTekst"></p>
|
||||
<p style="margin-top:20px;
|
||||
padding: 20px;
|
||||
color:#ffffff;
|
||||
text-align:center"
|
||||
data-bind="visible: optieTekst().length > '',
|
||||
text: optieTekst,
|
||||
enable: kanKlik(),
|
||||
click: fSendPerEmail,
|
||||
style:{backgroundColor: optieBG}">
|
||||
</p>
|
||||
<p style="margin-top:20px;
|
||||
padding:20px;
|
||||
background-color:#1C0B6F;
|
||||
color:#ffffff;
|
||||
text-align: center"
|
||||
data-bind="visible:codeNogmaals()>'',
|
||||
text: codeNogmaals,
|
||||
click: fSendPerEmail"
|
||||
|
||||
</p>
|
||||
</div>
|
||||
<!-- <div class="grippa-dialog-footer">
|
||||
<button
|
||||
type='button'
|
||||
style="float: right; margin-bottom:10px"
|
||||
data-bind="click:fClose">
|
||||
sluiten
|
||||
</button>
|
||||
</div> -->
|
||||
|
||||
</dialog>
|
||||
Reference in New Issue
Block a user