From 6ba48c85cc748d2f1366814654d9ad2e6689be8c Mon Sep 17 00:00:00 2001 From: hkernbach Date: Tue, 15 Dec 2015 10:02:35 +0100 Subject: [PATCH] web ui frame view --- .../_admin/aardvark/APP/frontend/html/body.html.part | 4 ++-- .../_admin/aardvark/APP/frontend/js/arango/arango.js | 10 +++++----- .../_admin/aardvark/APP/frontend/scss/_general.scss | 9 +++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part b/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part index 80ebe37247..0a9f9d1bdc 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part +++ b/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part @@ -35,7 +35,7 @@
-
-
+
+
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js index e027f2cd51..0023be5029 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js @@ -240,19 +240,19 @@ docFrameView.colid = ids[0]; docFrameView.docid = ids[1]; - docFrameView.el = '.arangoFrame .Inner'; + docFrameView.el = '.arangoFrame .innerDiv'; docFrameView.render(); docFrameView.setType(type); //remove header $('.arangoFrame .headerBar').remove(); //append close button - $('.arangoFrame .Outer').prepend(''); + $('.arangoFrame .outerDiv').prepend(''); //add close events - $('.arangoFrame .Outer').click(function() { + $('.arangoFrame .outerDiv').click(function() { self.closeDocEditor(); }); - $('.arangoFrame .Inner').click(function(e) { + $('.arangoFrame .innerDiv').click(function(e) { e.stopPropagation(); }); $('.fa-times').click(function() { @@ -278,7 +278,7 @@ }, closeDocEditor: function () { - $('.arangoFrame .Outer .fa-times').remove(); + $('.arangoFrame .outerDiv .fa-times').remove(); $('.arangoFrame').hide(); }, diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss index 7ec07f52b5..b1753d0a6c 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss +++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss @@ -18,21 +18,22 @@ } .arangoFrame { - background-color: rgba(0, 0, 0, .5); + bottom: 0; display: none; left: 0; - position: absolute; + position: fixed; right: 0; top: 0; z-index: 77777; - .Outer { + .outerDiv { + min-height: 100%; padding: 40px; z-index: 88888; } - .Inner { + .innerDiv { z-index: 99999; }