diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp index 192da61d..2b152661 100644 --- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp @@ -8,6 +8,7 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 4b82f765..213dca84 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -29,8 +29,8 @@ " /> - " /> - " /> + " /> + " /> diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js index 9f0812ce..b617276a 100644 --- a/src/main/webapp/resources/js/base/base.js +++ b/src/main/webapp/resources/js/base/base.js @@ -107,7 +107,7 @@ var dialog = { else { var self = this; ajax.get({ - url:wctx.url("/resources/html/dialog.html"), + url:wctx.url("/webjars/html/dialog.html"), success:function(resp) { self.template = resp; self.create(conf); @@ -169,9 +169,9 @@ var dialog = { if (conf.timeout) setTimeout(function(){dialog.close(id);}, conf.timeout); } - + last.setZIndex(dlg, 10); - dlg.modal("show"); + dlg.draggable({handle: ".modal-header"}).modal("show"); $(".modal-backdrop").each(function() { // gives id to its backdrop let backdrop = $(this); if (!backdrop.prop("id"))