diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index a6ddffe02..da5b57cf8 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -983,7 +983,7 @@ def logHistory(request):
log = Logs.objects.filter(id=int(logid))
if log:
log = log[0]
- log_his = "%s.his" % log.filename
+ log_his = "%s.his" % log.logfile
if os.path.isfile(log_his):
f = open(log_his)
content = f.read()
diff --git a/webroot/AutoSa/static/css/bootstrap-dialog.css b/webroot/AutoSa/static/css/bootstrap-dialog.css
new file mode 100644
index 000000000..32a001d07
--- /dev/null
+++ b/webroot/AutoSa/static/css/bootstrap-dialog.css
@@ -0,0 +1,120 @@
+.bootstrap-dialog {
+
+}
+.bootstrap-dialog .modal-header {
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+.bootstrap-dialog .bootstrap-dialog-title {
+ color: #fff;
+ display: inline-block;
+}
+.bootstrap-dialog.type-default .bootstrap-dialog-title {
+ color: #333;
+}
+.bootstrap-dialog.size-normal .bootstrap-dialog-title {
+ font-size: 16px;
+}
+.bootstrap-dialog.size-large .bootstrap-dialog-title {
+ font-size: 24px;
+}
+.bootstrap-dialog .bootstrap-dialog-close-button {
+ float: right;
+ filter:alpha(opacity=90);
+ -moz-opacity:0.9;
+ -khtml-opacity: 0.9;
+ opacity: 0.9;
+}
+.bootstrap-dialog.size-normal .bootstrap-dialog-close-button {
+ font-size: 20px;
+}
+.bootstrap-dialog.size-large .bootstrap-dialog-close-button {
+ font-size: 30px;
+}
+.bootstrap-dialog .bootstrap-dialog-close-button:hover {
+ cursor: pointer;
+ filter: alpha(opacity=100);
+ -moz-opacity: 1;
+ -khtml-opacity: 1;
+ opacity: 1;
+}
+.bootstrap-dialog.size-normal .bootstrap-dialog-message {
+ font-size: 14px;
+}
+.bootstrap-dialog.size-large .bootstrap-dialog-message {
+ font-size: 18px;
+}
+.bootstrap-dialog.type-default .modal-header {
+ background-color: #fff;
+}
+.bootstrap-dialog.type-info .modal-header {
+ background-color: #5bc0de;
+}
+.bootstrap-dialog.type-primary .modal-header {
+ background-color: #428bca;
+}
+.bootstrap-dialog.type-success .modal-header {
+ background-color: #5cb85c;
+}
+.bootstrap-dialog.type-warning .modal-header {
+ background-color: #f0ad4e;
+}
+.bootstrap-dialog.type-danger .modal-header {
+ background-color: #d9534f;
+}
+.bootstrap-dialog .bootstrap-dialog-button-icon {
+ margin-right: 3px;
+}
+
+/**
+ * Icon animation
+ * Copied from font-awesome: http://fontawesome.io/
+ **/
+.icon-spin {
+ display: inline-block;
+ -moz-animation: spin 2s infinite linear;
+ -o-animation: spin 2s infinite linear;
+ -webkit-animation: spin 2s infinite linear;
+ animation: spin 2s infinite linear;
+}
+@-moz-keyframes spin {
+ 0% {
+ -moz-transform: rotate(0deg);
+}
+100% {
+ -moz-transform: rotate(359deg);
+}
+}
+@-webkit-keyframes spin {
+ 0% {
+ -webkit-transform: rotate(0deg);
+}
+100% {
+ -webkit-transform: rotate(359deg);
+}
+}
+@-o-keyframes spin {
+ 0% {
+ -o-transform: rotate(0deg);
+}
+100% {
+ -o-transform: rotate(359deg);
+}
+}
+@-ms-keyframes spin {
+ 0% {
+ -ms-transform: rotate(0deg);
+}
+100% {
+ -ms-transform: rotate(359deg);
+}
+}
+@keyframes spin {
+ 0% {
+ transform: rotate(0deg);
+}
+100% {
+ transform: rotate(359deg);
+}
+}
+/** End of icon animation **/
\ No newline at end of file
diff --git a/webroot/AutoSa/static/js/bootstrap-dialog.js b/webroot/AutoSa/static/js/bootstrap-dialog.js
new file mode 100644
index 000000000..2cbdcc4b7
--- /dev/null
+++ b/webroot/AutoSa/static/js/bootstrap-dialog.js
@@ -0,0 +1,1089 @@
+/* global define */
+
+/* ================================================
+ * Make use of Bootstrap's modal more monkey-friendly.
+ *
+ * For Bootstrap 3.
+ *
+ * javanoob@hotmail.com
+ *
+ * https://github.com/nakupanda/bootstrap3-dialog
+ *
+ * Licensed under The MIT License.
+ * ================================================ */
+(function(root, factory) {
+
+ "use strict";
+
+ // CommonJS module is defined
+ if (typeof module !== 'undefined' && module.exports) {
+ module.exports = factory(require('jquery')(root));
+ }
+ // AMD module is defined
+ else if (typeof define === "function" && define.amd) {
+ define("bootstrap-dialog", ["jquery"], function($) {
+ return factory($);
+ });
+ } else {
+ // planted over the root!
+ root.BootstrapDialog = factory(root.jQuery);
+ }
+
+}(this, function($) {
+
+ "use strict";
+
+ var BootstrapDialog = function(options) {
+ this.defaultOptions = $.extend(true, {
+ id: BootstrapDialog.newGuid(),
+ buttons: [],
+ data: {},
+ onshow: null,
+ onshown: null,
+ onhide: null,
+ onhidden: null
+ }, BootstrapDialog.defaultOptions);
+ this.indexedButtons = {};
+ this.registeredButtonHotkeys = {};
+ this.draggableData = {
+ isMouseDown: false,
+ mouseOffset: {}
+ };
+ this.realized = false;
+ this.opened = false;
+ this.initOptions(options);
+ this.holdThisInstance();
+ };
+
+ /**
+ * Some constants.
+ */
+ BootstrapDialog.NAMESPACE = 'bootstrap-dialog';
+
+ BootstrapDialog.TYPE_DEFAULT = 'type-default';
+ BootstrapDialog.TYPE_INFO = 'type-info';
+ BootstrapDialog.TYPE_PRIMARY = 'type-primary';
+ BootstrapDialog.TYPE_SUCCESS = 'type-success';
+ BootstrapDialog.TYPE_WARNING = 'type-warning';
+ BootstrapDialog.TYPE_DANGER = 'type-danger';
+
+ BootstrapDialog.DEFAULT_TEXTS = {};
+ BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_DEFAULT] = 'Information';
+ BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_INFO] = 'Information';
+ BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_PRIMARY] = 'Information';
+ BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_SUCCESS] = 'Success';
+ BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_WARNING] = 'Warning';
+ BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_DANGER] = 'Danger';
+ BootstrapDialog.DEFAULT_TEXTS['OK'] = 'OK';
+ BootstrapDialog.DEFAULT_TEXTS['CANCEL'] = 'Cancel';
+
+ BootstrapDialog.SIZE_NORMAL = 'size-normal';
+ BootstrapDialog.SIZE_WIDE = 'size-wide'; // size-wide is equal to modal-lg
+ BootstrapDialog.SIZE_LARGE = 'size-large';
+
+ BootstrapDialog.BUTTON_SIZES = {};
+ BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_NORMAL] = '';
+ BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_WIDE] = '';
+ BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_LARGE] = 'btn-lg';
+
+ BootstrapDialog.ICON_SPINNER = 'glyphicon glyphicon-asterisk';
+
+ BootstrapDialog.ZINDEX_BACKDROP = 1040;
+ BootstrapDialog.ZINDEX_MODAL = 1050;
+
+ /**
+ * Default options.
+ */
+ BootstrapDialog.defaultOptions = {
+ type: BootstrapDialog.TYPE_PRIMARY,
+ size: BootstrapDialog.SIZE_NORMAL,
+ cssClass: '',
+ title: null,
+ message: null,
+ nl2br: true,
+ closable: true,
+ closeByBackdrop: true,
+ closeByKeyboard: true,
+ spinicon: BootstrapDialog.ICON_SPINNER,
+ autodestroy: true,
+ draggable: false,
+ animate: true,
+ description: ''
+ };
+
+ /**
+ * Config default options.
+ */
+ BootstrapDialog.configDefaultOptions = function(options) {
+ BootstrapDialog.defaultOptions = $.extend(true, BootstrapDialog.defaultOptions, options);
+ };
+
+ /**
+ * Open / Close all created dialogs all at once.
+ */
+ BootstrapDialog.dialogs = {};
+ BootstrapDialog.openAll = function() {
+ $.each(BootstrapDialog.dialogs, function(id, dialogInstance) {
+ dialogInstance.open();
+ });
+ };
+ BootstrapDialog.closeAll = function() {
+ $.each(BootstrapDialog.dialogs, function(id, dialogInstance) {
+ dialogInstance.close();
+ });
+ };
+
+ /**
+ * Move focus to next visible dialog.
+ */
+ BootstrapDialog.moveFocus = function() {
+ var lastDialogInstance = null;
+ $.each(BootstrapDialog.dialogs, function(id, dialogInstance) {
+ lastDialogInstance = dialogInstance;
+ });
+ if (lastDialogInstance !== null && lastDialogInstance.isRealized()) {
+ lastDialogInstance.getModal().focus();
+ }
+ };
+
+ /**
+ * Show scrollbar if the last visible dialog needs one.
+ */
+ BootstrapDialog.showScrollbar = function() {
+ var lastDialogInstance = null;
+ $.each(BootstrapDialog.dialogs, function(id, dialogInstance) {
+ lastDialogInstance = dialogInstance;
+ });
+ if (lastDialogInstance !== null && lastDialogInstance.isRealized() && lastDialogInstance.isOpened()) {
+ var bsModal = lastDialogInstance.getModal().data('bs.modal');
+ bsModal.checkScrollbar();
+ $('body').addClass('modal-open');
+ bsModal.setScrollbar();
+ }
+ };
+
+ BootstrapDialog.prototype = {
+ constructor: BootstrapDialog,
+ initOptions: function(options) {
+ this.options = $.extend(true, this.defaultOptions, options);
+
+ return this;
+ },
+ holdThisInstance: function() {
+ BootstrapDialog.dialogs[this.getId()] = this;
+
+ return this;
+ },
+ initModalStuff: function() {
+ this.setModal(this.createModal())
+ .setModalDialog(this.createModalDialog())
+ .setModalContent(this.createModalContent())
+ .setModalHeader(this.createModalHeader())
+ .setModalBody(this.createModalBody())
+ .setModalFooter(this.createModalFooter());
+
+ this.getModal().append(this.getModalDialog());
+ this.getModalDialog().append(this.getModalContent());
+ this.getModalContent()
+ .append(this.getModalHeader())
+ .append(this.getModalBody())
+ .append(this.getModalFooter());
+
+ return this;
+ },
+ createModal: function() {
+ var $modal = $('
');
+ $modal.prop('id', this.getId()).attr('aria-labelledby', this.getId() + '_title');
+
+ return $modal;
+ },
+ getModal: function() {
+ return this.$modal;
+ },
+ setModal: function($modal) {
+ this.$modal = $modal;
+
+ return this;
+ },
+ createModalDialog: function() {
+ return $('');
+ },
+ getModalDialog: function() {
+ return this.$modalDialog;
+ },
+ setModalDialog: function($modalDialog) {
+ this.$modalDialog = $modalDialog;
+
+ return this;
+ },
+ createModalContent: function() {
+ return $('');
+ },
+ getModalContent: function() {
+ return this.$modalContent;
+ },
+ setModalContent: function($modalContent) {
+ this.$modalContent = $modalContent;
+
+ return this;
+ },
+ createModalHeader: function() {
+ return $('');
+ },
+ getModalHeader: function() {
+ return this.$modalHeader;
+ },
+ setModalHeader: function($modalHeader) {
+ this.$modalHeader = $modalHeader;
+
+ return this;
+ },
+ createModalBody: function() {
+ return $('');
+ },
+ getModalBody: function() {
+ return this.$modalBody;
+ },
+ setModalBody: function($modalBody) {
+ this.$modalBody = $modalBody;
+
+ return this;
+ },
+ createModalFooter: function() {
+ return $('');
+ },
+ getModalFooter: function() {
+ return this.$modalFooter;
+ },
+ setModalFooter: function($modalFooter) {
+ this.$modalFooter = $modalFooter;
+
+ return this;
+ },
+ createDynamicContent: function(rawContent) {
+ var content = null;
+ if (typeof rawContent === 'function') {
+ content = rawContent.call(rawContent, this);
+ } else {
+ content = rawContent;
+ }
+ if (typeof content === 'string') {
+ content = this.formatStringContent(content);
+ }
+
+ return content;
+ },
+ formatStringContent: function(content) {
+ if (this.options.nl2br) {
+ return content.replace(/\r\n/g, '
').replace(/[\r\n]/g, '
');
+ }
+
+ return content;
+ },
+ setData: function(key, value) {
+ this.options.data[key] = value;
+
+ return this;
+ },
+ getData: function(key) {
+ return this.options.data[key];
+ },
+ setId: function(id) {
+ this.options.id = id;
+
+ return this;
+ },
+ getId: function() {
+ return this.options.id;
+ },
+ getType: function() {
+ return this.options.type;
+ },
+ setType: function(type) {
+ this.options.type = type;
+ this.updateType();
+
+ return this;
+ },
+ updateType: function() {
+ if (this.isRealized()) {
+ var types = [BootstrapDialog.TYPE_DEFAULT,
+ BootstrapDialog.TYPE_INFO,
+ BootstrapDialog.TYPE_PRIMARY,
+ BootstrapDialog.TYPE_SUCCESS,
+ BootstrapDialog.TYPE_WARNING,
+ BootstrapDialog.TYPE_DANGER];
+
+ this.getModal().removeClass(types.join(' ')).addClass(this.getType());
+ }
+
+ return this;
+ },
+ getSize: function() {
+ return this.options.size;
+ },
+ setSize: function(size) {
+ this.options.size = size;
+ this.updateSize();
+
+ return this;
+ },
+ updateSize: function() {
+ if (this.isRealized()) {
+ var dialog = this;
+
+ // Dialog size
+ this.getModal().removeClass(BootstrapDialog.SIZE_NORMAL)
+ .removeClass(BootstrapDialog.SIZE_WIDE)
+ .removeClass(BootstrapDialog.SIZE_LARGE);
+ this.getModal().addClass(this.getSize());
+
+ // Wider dialog.
+ this.getModalDialog().removeClass('modal-lg');
+ if (this.getSize() === BootstrapDialog.SIZE_WIDE) {
+ this.getModalDialog().addClass('modal-lg');
+ }
+
+ // Button size
+ $.each(this.options.buttons, function(index, button) {
+ var $button = dialog.getButton(button.id);
+ var buttonSizes = ['btn-lg', 'btn-sm', 'btn-xs'];
+ var sizeClassSpecified = false;
+ if (typeof button['cssClass'] === 'string') {
+ var btnClasses = button['cssClass'].split(' ');
+ $.each(btnClasses, function(index, btnClass) {
+ if ($.inArray(btnClass, buttonSizes) !== -1) {
+ sizeClassSpecified = true;
+ }
+ });
+ }
+ if (!sizeClassSpecified) {
+ $button.removeClass(buttonSizes.join(' '));
+ $button.addClass(dialog.getButtonSize());
+ }
+ });
+ }
+
+ return this;
+ },
+ getCssClass: function() {
+ return this.options.cssClass;
+ },
+ setCssClass: function(cssClass) {
+ this.options.cssClass = cssClass;
+
+ return this;
+ },
+ getTitle: function() {
+ return this.options.title;
+ },
+ setTitle: function(title) {
+ this.options.title = title;
+ this.updateTitle();
+
+ return this;
+ },
+ updateTitle: function() {
+ if (this.isRealized()) {
+ var title = this.getTitle() !== null ? this.createDynamicContent(this.getTitle()) : this.getDefaultText();
+ this.getModalHeader().find('.' + this.getNamespace('title')).html('').append(title).prop('id', this.getId() + '_title');
+ }
+
+ return this;
+ },
+ getMessage: function() {
+ return this.options.message;
+ },
+ setMessage: function(message) {
+ this.options.message = message;
+ this.updateMessage();
+
+ return this;
+ },
+ updateMessage: function() {
+ if (this.isRealized()) {
+ var message = this.createDynamicContent(this.getMessage());
+ this.getModalBody().find('.' + this.getNamespace('message')).html('').append(message);
+ }
+
+ return this;
+ },
+ isClosable: function() {
+ return this.options.closable;
+ },
+ setClosable: function(closable) {
+ this.options.closable = closable;
+ this.updateClosable();
+
+ return this;
+ },
+ setCloseByBackdrop: function(closeByBackdrop) {
+ this.options.closeByBackdrop = closeByBackdrop;
+
+ return this;
+ },
+ canCloseByBackdrop: function() {
+ return this.options.closeByBackdrop;
+ },
+ setCloseByKeyboard: function(closeByKeyboard) {
+ this.options.closeByKeyboard = closeByKeyboard;
+
+ return this;
+ },
+ canCloseByKeyboard: function() {
+ return this.options.closeByKeyboard;
+ },
+ isAnimate: function() {
+ return this.options.animate;
+ },
+ setAnimate: function(animate) {
+ this.options.animate = animate;
+
+ return this;
+ },
+ updateAnimate: function() {
+ if (this.isRealized()) {
+ this.getModal().toggleClass('fade', this.isAnimate());
+ }
+
+ return this;
+ },
+ getSpinicon: function() {
+ return this.options.spinicon;
+ },
+ setSpinicon: function(spinicon) {
+ this.options.spinicon = spinicon;
+
+ return this;
+ },
+ addButton: function(button) {
+ this.options.buttons.push(button);
+
+ return this;
+ },
+ addButtons: function(buttons) {
+ var that = this;
+ $.each(buttons, function(index, button) {
+ that.addButton(button);
+ });
+
+ return this;
+ },
+ getButtons: function() {
+ return this.options.buttons;
+ },
+ setButtons: function(buttons) {
+ this.options.buttons = buttons;
+ this.updateButtons();
+
+ return this;
+ },
+ /**
+ * If there is id provided for a button option, it will be in dialog.indexedButtons list.
+ *
+ * In that case you can use dialog.getButton(id) to find the button.
+ *
+ * @param {type} id
+ * @returns {undefined}
+ */
+ getButton: function(id) {
+ if (typeof this.indexedButtons[id] !== 'undefined') {
+ return this.indexedButtons[id];
+ }
+
+ return null;
+ },
+ getButtonSize: function() {
+ if (typeof BootstrapDialog.BUTTON_SIZES[this.getSize()] !== 'undefined') {
+ return BootstrapDialog.BUTTON_SIZES[this.getSize()];
+ }
+
+ return '';
+ },
+ updateButtons: function() {
+ if (this.isRealized()) {
+ if (this.getButtons().length === 0) {
+ this.getModalFooter().hide();
+ } else {
+ this.getModalFooter().find('.' + this.getNamespace('footer')).html('').append(this.createFooterButtons());
+ }
+ }
+
+ return this;
+ },
+ isAutodestroy: function() {
+ return this.options.autodestroy;
+ },
+ setAutodestroy: function(autodestroy) {
+ this.options.autodestroy = autodestroy;
+ },
+ getDescription: function() {
+ return this.options.description;
+ },
+ setDescription: function(description) {
+ this.options.description = description;
+
+ return this;
+ },
+ getDefaultText: function() {
+ return BootstrapDialog.DEFAULT_TEXTS[this.getType()];
+ },
+ getNamespace: function(name) {
+ return BootstrapDialog.NAMESPACE + '-' + name;
+ },
+ createHeaderContent: function() {
+ var $container = $('');
+ $container.addClass(this.getNamespace('header'));
+
+ // title
+ $container.append(this.createTitleContent());
+
+ // Close button
+ $container.prepend(this.createCloseButton());
+
+ return $container;
+ },
+ createTitleContent: function() {
+ var $title = $('');
+ $title.addClass(this.getNamespace('title'));
+
+ return $title;
+ },
+ createCloseButton: function() {
+ var $container = $('');
+ $container.addClass(this.getNamespace('close-button'));
+ var $icon = $('');
+ $container.append($icon);
+ $container.on('click', {dialog: this}, function(event) {
+ event.data.dialog.close();
+ });
+
+ return $container;
+ },
+ createBodyContent: function() {
+ var $container = $('');
+ $container.addClass(this.getNamespace('body'));
+
+ // Message
+ $container.append(this.createMessageContent());
+
+ return $container;
+ },
+ createMessageContent: function() {
+ var $message = $('');
+ $message.addClass(this.getNamespace('message'));
+
+ return $message;
+ },
+ createFooterContent: function() {
+ var $container = $('');
+ $container.addClass(this.getNamespace('footer'));
+
+ return $container;
+ },
+ createFooterButtons: function() {
+ var that = this;
+ var $container = $('');
+ $container.addClass(this.getNamespace('footer-buttons'));
+ this.indexedButtons = {};
+ $.each(this.options.buttons, function(index, button) {
+ if (!button.id) {
+ button.id = BootstrapDialog.newGuid();
+ }
+ var $button = that.createButton(button);
+ that.indexedButtons[button.id] = $button;
+ $container.append($button);
+ });
+
+ return $container;
+ },
+ createButton: function(button) {
+ var $button = $('');
+ $button.prop('id', button.id);
+
+ // Icon
+ if (typeof button.icon !== 'undefined' && $.trim(button.icon) !== '') {
+ $button.append(this.createButtonIcon(button.icon));
+ }
+
+ // Label
+ if (typeof button.label !== 'undefined') {
+ $button.append(button.label);
+ }
+
+ // Css class
+ if (typeof button.cssClass !== 'undefined' && $.trim(button.cssClass) !== '') {
+ $button.addClass(button.cssClass);
+ } else {
+ $button.addClass('btn-default');
+ }
+
+ // Hotkey
+ if (typeof button.hotkey !== 'undefined') {
+ this.registeredButtonHotkeys[button.hotkey] = $button;
+ }
+
+ // Button on click
+ $button.on('click', {dialog: this, $button: $button, button: button}, function(event) {
+ var dialog = event.data.dialog;
+ var $button = event.data.$button;
+ var button = event.data.button;
+ if (typeof button.action === 'function') {
+ button.action.call($button, dialog);
+ }
+
+ if (button.autospin) {
+ $button.toggleSpin(true);
+ }
+ });
+
+ // Dynamically add extra functions to $button
+ this.enhanceButton($button);
+
+ return $button;
+ },
+ /**
+ * Dynamically add extra functions to $button
+ *
+ * Using '$this' to reference 'this' is just for better readability.
+ *
+ * @param {type} $button
+ * @returns {_L13.BootstrapDialog.prototype}
+ */
+ enhanceButton: function($button) {
+ $button.dialog = this;
+
+ // Enable / Disable
+ $button.toggleEnable = function(enable) {
+ var $this = this;
+ if (typeof enable !== 'undefined') {
+ $this.prop("disabled", !enable).toggleClass('disabled', !enable);
+ } else {
+ $this.prop("disabled", !$this.prop("disabled"));
+ }
+
+ return $this;
+ };
+ $button.enable = function() {
+ var $this = this;
+ $this.toggleEnable(true);
+
+ return $this;
+ };
+ $button.disable = function() {
+ var $this = this;
+ $this.toggleEnable(false);
+
+ return $this;
+ };
+
+ // Icon spinning, helpful for indicating ajax loading status.
+ $button.toggleSpin = function(spin) {
+ var $this = this;
+ var dialog = $this.dialog;
+ var $icon = $this.find('.' + dialog.getNamespace('button-icon'));
+ if (typeof spin === 'undefined') {
+ spin = !($button.find('.icon-spin').length > 0);
+ }
+ if (spin) {
+ $icon.hide();
+ $button.prepend(dialog.createButtonIcon(dialog.getSpinicon()).addClass('icon-spin'));
+ } else {
+ $icon.show();
+ $button.find('.icon-spin').remove();
+ }
+
+ return $this;
+ };
+ $button.spin = function() {
+ var $this = this;
+ $this.toggleSpin(true);
+
+ return $this;
+ };
+ $button.stopSpin = function() {
+ var $this = this;
+ $this.toggleSpin(false);
+
+ return $this;
+ };
+
+ return this;
+ },
+ createButtonIcon: function(icon) {
+ var $icon = $('');
+ $icon.addClass(this.getNamespace('button-icon')).addClass(icon);
+
+ return $icon;
+ },
+ /**
+ * Invoke this only after the dialog is realized.
+ *
+ * @param {type} enable
+ * @returns {undefined}
+ */
+ enableButtons: function(enable) {
+ $.each(this.indexedButtons, function(id, $button) {
+ $button.toggleEnable(enable);
+ });
+
+ return this;
+ },
+ /**
+ * Invoke this only after the dialog is realized.
+ *
+ * @returns {undefined}
+ */
+ updateClosable: function() {
+ if (this.isRealized()) {
+ // Close button
+ this.getModalHeader().find('.' + this.getNamespace('close-button')).toggle(this.isClosable());
+ }
+
+ return this;
+ },
+ /**
+ * Set handler for modal event 'show.bs.modal'.
+ * This is a setter!
+ */
+ onShow: function(onshow) {
+ this.options.onshow = onshow;
+
+ return this;
+ },
+ /**
+ * Set handler for modal event 'shown.bs.modal'.
+ * This is a setter!
+ */
+ onShown: function(onshown) {
+ this.options.onshown = onshown;
+
+ return this;
+ },
+ /**
+ * Set handler for modal event 'hide.bs.modal'.
+ * This is a setter!
+ */
+ onHide: function(onhide) {
+ this.options.onhide = onhide;
+
+ return this;
+ },
+ /**
+ * Set handler for modal event 'hidden.bs.modal'.
+ * This is a setter!
+ */
+ onHidden: function(onhidden) {
+ this.options.onhidden = onhidden;
+
+ return this;
+ },
+ isRealized: function() {
+ return this.realized;
+ },
+ setRealized: function(realized) {
+ this.realized = realized;
+
+ return this;
+ },
+ isOpened: function() {
+ return this.opened;
+ },
+ setOpened: function(opened) {
+ this.opened = opened;
+
+ return this;
+ },
+ handleModalEvents: function() {
+ this.getModal().on('show.bs.modal', {dialog: this}, function(event) {
+ var dialog = event.data.dialog;
+ if (dialog.isModalEvent(event) && typeof dialog.options.onshow === 'function') {
+ return dialog.options.onshow(dialog);
+ }
+ });
+ this.getModal().on('shown.bs.modal', {dialog: this}, function(event) {
+ var dialog = event.data.dialog;
+ dialog.isModalEvent(event) && typeof dialog.options.onshown === 'function' && dialog.options.onshown(dialog);
+ });
+ this.getModal().on('hide.bs.modal', {dialog: this}, function(event) {
+ var dialog = event.data.dialog;
+ if (dialog.isModalEvent(event) && typeof dialog.options.onhide === 'function') {
+ return dialog.options.onhide(dialog);
+ }
+ });
+ this.getModal().on('hidden.bs.modal', {dialog: this}, function(event) {
+ var dialog = event.data.dialog;
+ dialog.isModalEvent(event) && typeof dialog.options.onhidden === 'function' && dialog.options.onhidden(dialog);
+ dialog.isAutodestroy() && $(this).remove();
+ BootstrapDialog.moveFocus();
+ });
+
+ // Backdrop, I did't find a way to change bs3 backdrop option after the dialog is popped up, so here's a new wheel.
+ this.getModal().on('click', {dialog: this}, function(event) {
+ event.target === this && event.data.dialog.isClosable() && event.data.dialog.canCloseByBackdrop() && event.data.dialog.close();
+ });
+
+ // ESC key support
+ this.getModal().on('keyup', {dialog: this}, function(event) {
+ event.which === 27 && event.data.dialog.isClosable() && event.data.dialog.canCloseByKeyboard() && event.data.dialog.close();
+ });
+
+ // Button hotkey
+ this.getModal().on('keyup', {dialog: this}, function(event) {
+ var dialog = event.data.dialog;
+ if (typeof dialog.registeredButtonHotkeys[event.which] !== 'undefined') {
+ var $button = $(dialog.registeredButtonHotkeys[event.which]);
+ !$button.prop('disabled') && $button.focus().trigger('click');
+ }
+ });
+
+ return this;
+ },
+ isModalEvent: function(event) {
+ return typeof event.namespace !== 'undefined' && event.namespace === 'bs.modal';
+ },
+ makeModalDraggable: function() {
+ if (this.options.draggable) {
+ this.getModalHeader().addClass(this.getNamespace('draggable')).on('mousedown', {dialog: this}, function(event) {
+ var dialog = event.data.dialog;
+ dialog.draggableData.isMouseDown = true;
+ var dialogOffset = dialog.getModalDialog().offset();
+ dialog.draggableData.mouseOffset = {
+ top: event.clientY - dialogOffset.top,
+ left: event.clientX - dialogOffset.left
+ };
+ });
+ this.getModal().on('mouseup mouseleave', {dialog: this}, function(event) {
+ event.data.dialog.draggableData.isMouseDown = false;
+ });
+ $('body').on('mousemove', {dialog: this}, function(event) {
+ var dialog = event.data.dialog;
+ if (!dialog.draggableData.isMouseDown) {
+ return;
+ }
+ dialog.getModalDialog().offset({
+ top: event.clientY - dialog.draggableData.mouseOffset.top,
+ left: event.clientX - dialog.draggableData.mouseOffset.left
+ });
+ });
+ }
+
+ return this;
+ },
+ /**
+ * To make multiple opened dialogs look better.
+ */
+ updateZIndex: function() {
+ var dialogCount = 0;
+ $.each(BootstrapDialog.dialogs, function(dialogId, dialogInstance) {
+ dialogCount++;
+ });
+ var $modal = this.getModal();
+ var $backdrop = $modal.data('bs.modal').$backdrop;
+ $modal.css('z-index', BootstrapDialog.ZINDEX_MODAL + (dialogCount - 1) * 20);
+ $backdrop.css('z-index', BootstrapDialog.ZINDEX_BACKDROP + (dialogCount - 1) * 20);
+
+ return this;
+ },
+ realize: function() {
+ this.initModalStuff();
+ this.getModal().addClass(BootstrapDialog.NAMESPACE)
+ .addClass(this.getCssClass());
+ this.updateSize();
+ if (this.getDescription()) {
+ this.getModal().attr('aria-describedby', this.getDescription());
+ }
+ this.getModalFooter().append(this.createFooterContent());
+ this.getModalHeader().append(this.createHeaderContent());
+ this.getModalBody().append(this.createBodyContent());
+ this.getModal().modal({
+ backdrop: 'static',
+ keyboard: false,
+ show: false
+ });
+ this.makeModalDraggable();
+ this.handleModalEvents();
+ this.setRealized(true);
+ this.updateButtons();
+ this.updateType();
+ this.updateTitle();
+ this.updateMessage();
+ this.updateClosable();
+ this.updateAnimate();
+ this.updateSize();
+
+ return this;
+ },
+ open: function() {
+ !this.isRealized() && this.realize();
+ this.getModal().modal('show');
+ this.updateZIndex();
+ this.setOpened(true);
+
+ return this;
+ },
+ close: function() {
+ this.getModal().modal('hide');
+ if (this.isAutodestroy()) {
+ delete BootstrapDialog.dialogs[this.getId()];
+ }
+ this.setOpened(false);
+
+ // Show scrollbar if the last visible dialog needs one.
+ BootstrapDialog.showScrollbar();
+
+ return this;
+ }
+ };
+
+ /**
+ * RFC4122 version 4 compliant unique id creator.
+ *
+ * Added by https://github.com/tufanbarisyildirim/
+ *
+ * @returns {String}
+ */
+ BootstrapDialog.newGuid = function() {
+ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+ var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
+ return v.toString(16);
+ });
+ };
+
+ /* ================================================
+ * For lazy people
+ * ================================================ */
+
+ /**
+ * Shortcut function: show
+ *
+ * @param {type} options
+ * @returns the created dialog instance
+ */
+ BootstrapDialog.show = function(options) {
+ return new BootstrapDialog(options).open();
+ };
+
+ /**
+ * Alert window
+ *
+ * @returns the created dialog instance
+ */
+ BootstrapDialog.alert = function() {
+ var options = {};
+ var defaultOptions = {
+ type: BootstrapDialog.TYPE_PRIMARY,
+ title: null,
+ message: null,
+ closable: true,
+ buttonLabel: BootstrapDialog.DEFAULT_TEXTS.OK,
+ callback: null
+ };
+
+ if (typeof arguments[0] === 'object' && arguments[0].constructor === {}.constructor) {
+ options = $.extend(true, defaultOptions, arguments[0]);
+ } else {
+ options = $.extend(true, defaultOptions, {
+ message: arguments[0],
+ closable: false,
+ buttonLabel: BootstrapDialog.DEFAULT_TEXTS.OK,
+ callback: typeof arguments[1] !== 'undefined' ? arguments[1] : null
+ });
+ }
+
+ return new BootstrapDialog({
+ type: options.type,
+ title: options.title,
+ message: options.message,
+ closable: options.closable,
+ data: {
+ callback: options.callback
+ },
+ onhide: function(dialog) {
+ !dialog.getData('btnClicked') && dialog.isClosable() && typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(false);
+ },
+ buttons: [{
+ label: options.buttonLabel,
+ action: function(dialog) {
+ dialog.setData('btnClicked', true);
+ typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(true);
+ dialog.close();
+ }
+ }]
+ }).open();
+ };
+
+ /**
+ * Confirm window
+ *
+ * @param {type} message
+ * @param {type} callback
+ * @returns the created dialog instance
+ */
+ BootstrapDialog.confirm = function(message, callback) {
+ return new BootstrapDialog({
+ title: 'Confirmation',
+ message: message,
+ closable: false,
+ data: {
+ 'callback': callback
+ },
+ buttons: [{
+ label: BootstrapDialog.DEFAULT_TEXTS.CANCEL,
+ action: function(dialog) {
+ typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(false);
+ dialog.close();
+ }
+ }, {
+ label: BootstrapDialog.DEFAULT_TEXTS.OK,
+ cssClass: 'btn-primary',
+ action: function(dialog) {
+ typeof dialog.getData('callback') === 'function' && dialog.getData('callback')(true);
+ dialog.close();
+ }
+ }]
+ }).open();
+ };
+
+ /**
+ * Warning window
+ *
+ * @param {type} message
+ * @returns the created dialog instance
+ */
+ BootstrapDialog.warning = function(message, callback) {
+ return new BootstrapDialog({
+ type: BootstrapDialog.TYPE_WARNING,
+ message: message
+ }).open();
+ };
+
+ /**
+ * Danger window
+ *
+ * @param {type} message
+ * @returns the created dialog instance
+ */
+ BootstrapDialog.danger = function(message, callback) {
+ return new BootstrapDialog({
+ type: BootstrapDialog.TYPE_DANGER,
+ message: message
+ }).open();
+ };
+
+ /**
+ * Success window
+ *
+ * @param {type} message
+ * @returns the created dialog instance
+ */
+ BootstrapDialog.success = function(message, callback) {
+ return new BootstrapDialog({
+ type: BootstrapDialog.TYPE_SUCCESS,
+ message: message
+ }).open();
+ };
+
+ return BootstrapDialog;
+
+}));
diff --git a/webroot/AutoSa/templates/logView.html b/webroot/AutoSa/templates/logView.html
index 9f584b0c7..84c7e0a85 100644
--- a/webroot/AutoSa/templates/logView.html
+++ b/webroot/AutoSa/templates/logView.html
@@ -23,7 +23,7 @@
{{ log.user }} |
{{ log.host }} |
监控 |
- 命令统计 |
+ 命令统计 |
阻断 |
{{ log.start_time|stamp2str }} |
{{ log.end_time|stamp2str }} |
@@ -31,6 +31,15 @@
{% endfor %}
+