Merge pull request #1248 from tulinkry/scopes-window

Scopes window

Author: tarzanek

src/org/opensolaris/opengrok/analysis/JFlexXref.java

@@ -345,19 +345,6 @@ public void write(Writer out) throws IOException {
         while (!stack.empty()) {
             yypop();
         }
-
-        writeScopesFooter();
-    }
-
-    /**
-     * Write a JavaScript function that display scopes panel if scopes are
-     * available
-     */
-    private void writeScopesFooter() throws IOException {
-        //TODO try to get rid of included js scripts generated from here (all js should ideally be in util)
-        if (scopesEnabled && scopes != null && scopes.size() > 0) {
-            out.append("<script type=\"text/javascript\">document.getElementById(\"scope\").style.display = \"block\";</script>");
-        }
     }
 
     /**

web/default/style.css

@@ -814,14 +814,17 @@ a.scope            { /* scope              */ color: dodgerblue; font-weight: bo
     display: none;
 }
 
-.intelli-window {
+.window {
     position: absolute;
-    width: 504px;
-    max-height: 400px;
-    overflow: auto;
-    z-index: 10;
     font-size: 12px;
     font-family: monospace;
+    overflow: auto;
+    z-index: 10;
+}
+
+.intelli-window {
+    width: 504px;
+    max-height: 400px;
 }
 
 .symbol-highlighted {
@@ -830,13 +833,13 @@ a.scope            { /* scope              */ color: dodgerblue; font-weight: bo
 }
 
 .messages-window {
-    position: absolute;
     width: 40%;
     max-height: 400px;
-    overflow: auto;
-    z-index: 10;
-    font-size: 12px;
-    font-family: monospace;
+}
+
+.scopes-window {
+    min-width: 150px;
+    max-height: 400px;
 }
 
 .important-note {
@@ -1069,16 +1072,6 @@ span.scope-signature {
     display: none;
 }
 
-div#scope {
-    display: none;
-    min-height: 1em;
-    text-align: left;
-    background-color: #dddddd;
-    padding: 0.5em 0.5em 0.5em 6.5ex;
-    font-family: monospace;
-    font-weight: bold;
-}
-
 /** --------------- fold arrows for main page ------------ */
 
 .fold-down:before {