From 2a32c0275aec5abf9643fa9a17a0c7c8a4fedc39 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 20 Dec 2012 10:37:36 +0530 Subject: [PATCH] fixed z-index and renamed all-app.js to all-app.min.js --- public/build.json | 6 +++--- public/css/legacy/dialog.css | 4 ++-- public/html/app.html | 2 +- public/js/legacy/globals.js | 3 --- public/js/legacy/widgets/dialog.js | 1 - public/js/wn/ui/dialog.js | 4 ---- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/public/build.json b/public/build.json index 6d0f50b2bd..f94af0d8c9 100644 --- a/public/build.json +++ b/public/build.json @@ -1,7 +1,7 @@ [ { - "public/js/report-legacy.js": [ + "public/js/report-legacy.min.js": [ "lib/public/js/legacy/widgets/tabbedpage.js", "lib/public/js/legacy/widgets/report_builder/report_builder.js", "lib/public/js/legacy/widgets/report_builder/datatable.js", @@ -48,14 +48,14 @@ }, { - "public/js/all-web.js": [ + "public/js/all-web.min.js": [ "lib/public/js/lib/bootstrap.min.js", "lib/public/js/lib/public/json2.js", ] }, { - "public/js/all-app.js": [ + "public/js/all-app.min.js": [ "lib/public/js/lib/jquery/jquery.ui.core.min.js", "lib/public/js/lib/jquery/jquery.ui.datepicker.min.js", "lib/public/js/lib/jquery/jquery.ui.autocomplete.min.js", diff --git a/public/css/legacy/dialog.css b/public/css/legacy/dialog.css index 85663ad3b4..080ba6ed78 100644 --- a/public/css/legacy/dialog.css +++ b/public/css/legacy/dialog.css @@ -4,7 +4,7 @@ div.dialog_wrapper { position: absolute; width: 440px; display: none; - z-index: 90; + z-index: 2; background-color: #FFF; box-shadow:1px 1px 8px #444; -moz-box-shadow: 1px 1px 8px #444; @@ -40,7 +40,7 @@ div#freeze { right: 0px; background-color: #aaa; opacity: 0.6; - z-index: 50; + z-index: 1; text-align: center; } diff --git a/public/html/app.html b/public/html/app.html index 24debcdc20..6e937f0967 100644 --- a/public/html/app.html +++ b/public/html/app.html @@ -18,7 +18,7 @@ } window.app = true; - + diff --git a/public/js/legacy/globals.js b/public/js/legacy/globals.js index 5a30516ace..2c2c4c4b73 100644 --- a/public/js/legacy/globals.js +++ b/public/js/legacy/globals.js @@ -31,9 +31,6 @@ var user_img = {}; var pscript = {}; var selector=null; -// ui -var top_index=91; - // Name Spaces // ============ diff --git a/public/js/legacy/widgets/dialog.js b/public/js/legacy/widgets/dialog.js index 9a3cb8d622..5f4b2eb4d1 100644 --- a/public/js/legacy/widgets/dialog.js +++ b/public/js/legacy/widgets/dialog.js @@ -25,7 +25,6 @@ // var cur_dialog; -var top_index=91; var Dialog = wn.ui.Dialog.extend({ init: function(w, h, title, content) { diff --git a/public/js/wn/ui/dialog.js b/public/js/wn/ui/dialog.js index e1e2c3585b..c055d7dd68 100644 --- a/public/js/wn/ui/dialog.js +++ b/public/js/wn/ui/dialog.js @@ -66,10 +66,6 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({ // place it at the center this.wrapper.style.left = (($(window).width() - cint(this.wrapper.style.width))/2) + 'px'; this.wrapper.style.top = ($(window).scrollTop() + 60) + 'px'; - - // place it on top - top_index++; - $y(this.wrapper,{zIndex:top_index}); }, show: function() { // already live, do nothing