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

# 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:
2017-12-20 15:00:54 +01:00
22 changed files with 719 additions and 37 deletions
@@ -0,0 +1,27 @@
<div class="modal modal-3d-flip-vertical" tabindex="-1" role="dialog" id="notify-me" data-bind="css:modalClass">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" data-bind="text:title"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p data-bind="text:message"></p>
</div>
<div class="modal-footer">
<!-- ko if : notify() -->
<button type="button" class="btn btn-primary"
data-bind="text:yesText; click:closeYes"></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"
data-bind="text:noText; click:closeNo"></button>
<!-- /ko -->
<!-- ko if : ! notify() -->
<button type="button" class="btn btn-primary" data-dismiss="modal"
data-bind="click:closeOk">OK</button>
<!-- /ko -->
</div>
</div>
</div>
</div>