From 6155939bb01e2609593ea0c19517f28083b85dd1 Mon Sep 17 00:00:00 2001
From: CupCakeArmy <nicco.borgioli@gmail.com>
Date: Sun, 24 Apr 2016 18:54:56 +0200
Subject: [PATCH] New Modal System
---
admin/index.html | 2 --
admin/lib/cust/main.js | 26 +++++++++++++++++++-------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/admin/index.html b/admin/index.html
index d3ec198..af9ca39 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -59,8 +59,6 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
- <button type="button" class="btn btn-primary">Save changes</button>
</div>
</div>
</div>
diff --git a/admin/lib/cust/main.js b/admin/lib/cust/main.js
index 248b0d7..ee2fb09 100644
--- a/admin/lib/cust/main.js
+++ b/admin/lib/cust/main.js
@@ -25,23 +25,30 @@ var tools = {
modalFunc: {
init: 0,
},
+ modalClose: function() {
+ $('.modalCont').modal('hide');
+ },
modal: function(attr) {
attr = attr || {};
- if (attr.success !== undefined && typeof(attr.success) == 'function')
- tools.modalFunc.success = attr.success;
if (attr.cancel !== undefined && typeof(attr.cancel) == 'function')
tools.modalFunc.cancel = attr.cancel;
if (!tools.modalFunc.init) {
- $('.modalCont .modal-footer .btn-primary').click(function() {
- $('.modalCont').off('hide.bs.modal').modal('hide');
- tools.modalFunc.success();
- });
$('.modalCont').on('hide.bs.modal', tools.modalFunc.cancel);
tools.modalFunc.init = 1;
}
$('.modalCont .modal-title').html(attr.head);
$('.modalCont .modal-body').html(attr.body);
- $('.modalCont .modal-footer .btn-primary').html(attr.button);
+ $('.modalCont .modal-footer').html('<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>');
+ var modalBtnId = 0;
+ for (var curBtn in attr.button) {
+ if (attr.button[curBtn].type === undefined && attr.button[curBtn].type != '')
+ attr.button[curBtn].type = 'primary';
+ $('.modalCont .modal-footer').append('<button type="button" class="btn btn-primary modal-btn-' + modalBtnId + '">' + curBtn + '</button>');
+ if (attr.button[curBtn].callback !== undefined && typeof(attr.button[curBtn].callback) == 'function')
+ $('.modal-btn-' + modalBtnId).off('click').on('click', attr.button[curBtn].callback);
+ if (attr.button[curBtn].close === true)
+ $('.modal-btn-' + modalBtnId).on('click', tools.modalClose);
+ }
$('.modalCont').modal('show');
},
@@ -154,6 +161,11 @@ function loginFunc() {
tools.log('Wrong Credentials', 'w');
$('.loginPanel input').removeAttr('readonly');
});
+ amivcore.login($('#loginUsername').val(), $('#loginPassword').val(), function(ret) {
+ if (ret !== true)
+ tools.log('Wrong Credentials', 'w');
+ $('.loginPanel input').removeAttr('readonly');
+ });
}
// Binding the buttons
--
GitLab