svn commit: r1298010 [1/8] - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/handler/ core/src/java/org/apache/solr/servlet/ webapp/web/ webapp/web/css/ webapp/web/css/styles/ webapp/web/js/ webapp/web/js/lib/ webapp/web/js/scripts/ webapp/web...

[er...@apache.org]

Author: erick
Date: Wed Mar  7 16:30:20 2012
New Revision: 1298010

URL: http://svn.apache.org/viewvc?rev=1298010&view=rev
Log:
Fixes for SOLR-3162 and SOLR-3181, continuing improvements to the new Solr admin UI.

Added:
    lucene/dev/trunk/solr/webapp/web/js/lib/ZeroClipboard.js
    lucene/dev/trunk/solr/webapp/web/js/lib/jquery.cookie.js
Removed:
    lucene/dev/trunk/solr/webapp/web/css/screen.css
    lucene/dev/trunk/solr/webapp/web/logging.json
Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
    lucene/dev/trunk/solr/webapp/web/admin.html
    lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css
    lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css
    lucene/dev/trunk/solr/webapp/web/css/styles/common.css
    lucene/dev/trunk/solr/webapp/web/css/styles/cores.css
    lucene/dev/trunk/solr/webapp/web/css/styles/dashboard.css
    lucene/dev/trunk/solr/webapp/web/css/styles/dataimport.css
    lucene/dev/trunk/solr/webapp/web/css/styles/index.css
    lucene/dev/trunk/solr/webapp/web/css/styles/java-properties.css
    lucene/dev/trunk/solr/webapp/web/css/styles/logging.css
    lucene/dev/trunk/solr/webapp/web/css/styles/menu.css
    lucene/dev/trunk/solr/webapp/web/css/styles/plugins.css
    lucene/dev/trunk/solr/webapp/web/css/styles/query.css
    lucene/dev/trunk/solr/webapp/web/css/styles/replication.css
    lucene/dev/trunk/solr/webapp/web/css/styles/schema-browser.css
    lucene/dev/trunk/solr/webapp/web/css/styles/threads.css
    lucene/dev/trunk/solr/webapp/web/js/lib/console.js
    lucene/dev/trunk/solr/webapp/web/js/lib/highlight.js
    lucene/dev/trunk/solr/webapp/web/js/main.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/app.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/cores.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/dataimport.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/file.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/index.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/java-properties.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/logging.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/ping.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/query.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/replication.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/schema-browser.js
    lucene/dev/trunk/solr/webapp/web/js/scripts/threads.js
    lucene/dev/trunk/solr/webapp/web/tpl/analysis.html
    lucene/dev/trunk/solr/webapp/web/tpl/cloud.html
    lucene/dev/trunk/solr/webapp/web/tpl/cores.html
    lucene/dev/trunk/solr/webapp/web/tpl/dashboard.html
    lucene/dev/trunk/solr/webapp/web/tpl/index.html
    lucene/dev/trunk/solr/webapp/web/tpl/plugins.html
    lucene/dev/trunk/solr/webapp/web/tpl/query.html
    lucene/dev/trunk/solr/webapp/web/tpl/replication.html
    lucene/dev/trunk/solr/webapp/web/tpl/schema-browser.html
    lucene/dev/trunk/solr/webapp/web/tpl/threads.html

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Wed Mar  7 16:30:20 2012
@@ -642,6 +642,7 @@ public class ReplicationHandler extends 
       addVal(slave, SnapPuller.REPLICATION_FAILED_AT, props, Date.class);
       addVal(slave, SnapPuller.PREVIOUS_CYCLE_TIME_TAKEN, props, Long.class);
 
+      slave.add("currentDate", new Date().toString());
       slave.add("isPollingDisabled", String.valueOf(isPollingDisabled()));
       boolean isReplicating = isReplicating();
       slave.add("isReplicating", String.valueOf(isReplicating));

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java Wed Mar  7 16:30:20 2012
@@ -17,11 +17,11 @@
 
 package org.apache.solr.servlet;
 
+import org.apache.lucene.util.BytesRef;
 import org.apache.noggit.CharArr;
 import org.apache.noggit.JSONWriter;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.core.CoreContainer;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.Stat;
@@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Date;
 import java.util.List;
@@ -72,11 +71,16 @@ public final class ZookeeperInfoServlet 
 
     String detailS = request.getParameter("detail");
     boolean detail = detailS != null && detailS.equals("true");
+
+    String dumpS = request.getParameter("dump");
+    boolean dump = dumpS != null && dumpS.equals("true");
+
     PrintWriter out = response.getWriter();
 
 
     ZKPrinter printer = new ZKPrinter(response, out, cores.getZkController(), addr);
     printer.detail = detail;
+    printer.dump = dump;
 
     try {
       printer.print(path);
@@ -103,6 +107,7 @@ public final class ZookeeperInfoServlet 
     boolean indent = true;
     boolean fullpath = FULLPATH_DEFAULT;
     boolean detail = false;
+    boolean dump = false;
 
     String addr; // the address passed to us
     String keeperAddr; // the address we're connected to
@@ -260,6 +265,7 @@ public final class ZookeeperInfoServlet 
 
       Stat stat = new Stat();
       try {
+        // Trickily, the call to zkClient.getData fills in the stat variable
         byte[] data = zkClient.getData(path, null, stat, true);
 
         if (stat.getEphemeralOwner() != 0) {
@@ -267,6 +273,11 @@ public final class ZookeeperInfoServlet 
           writeKeyValue(json, "version", stat.getVersion(), false);
         }
 
+        if (dump) {
+          json.writeValueSeparator();
+          printZnode(json, path);
+        }
+
         /*
         if (stat.getNumChildren() != 0)
         {
@@ -275,32 +286,12 @@ public final class ZookeeperInfoServlet 
         }
         */
 
-        //if (data != null)
-        if (stat.getDataLength() != 0) {
-          String str;
-          try {
-            str = new String(data, "UTF-8");
-            str = str.replaceAll("\\\"", "\\\\\"");
-
-            //writeKeyValue(json, "content", str, false );
-          } catch (UnsupportedEncodingException e) {
-            // not UTF8
-            StringBuilder sb = new StringBuilder("BIN(");
-            sb.append("len=" + data.length);
-            sb.append("hex=");
-            int limit = Math.min(data.length, maxData / 2);
-            for (int i = 0; i < limit; i++) {
-              byte b = data[i];
-              sb.append(StrUtils.HEX_DIGITS[(b >> 4) & 0xf]);
-              sb.append(StrUtils.HEX_DIGITS[b & 0xf]);
-            }
-            if (limit != data.length) {
-              sb.append("...");
-            }
-            sb.append(")");
-            str = sb.toString();
-            //?? writeKeyValue(json, "content", str, false );
-          }
+        //if (stat.getDataLength() != 0)
+        if (data != null) {
+          String str = new BytesRef(data).utf8ToString();
+          //?? writeKeyValue(json, "content", str, false );
+          // Does nothing now, but on the assumption this will be used later we'll leave it in. If it comes out
+          // the catches below need to be restructured.
         }
       } catch (IllegalArgumentException e) {
         // path doesn't exist (must have been removed)
@@ -375,6 +366,7 @@ public final class ZookeeperInfoServlet 
     boolean printZnode(JSONWriter json, String path) throws IOException {
       try {
         Stat stat = new Stat();
+        // Trickily, the call to zkClient.getData fills in the stat variable
         byte[] data = zkClient.getData(path, null, stat, true);
 
         json.writeString("znode");
@@ -400,28 +392,8 @@ public final class ZookeeperInfoServlet 
         writeKeyValue(json, "pzxid", stat.getPzxid(), false);
         json.endObject();
 
-        if (stat.getDataLength() != 0) {
-          String str;
-          try {
-            str = new String(data, "UTF-8");
-          } catch (UnsupportedEncodingException e) {
-            // The results are unspecified
-            // when the bytes are not properly encoded.
-
-            // not UTF8
-            StringBuilder sb = new StringBuilder(data.length * 2);
-            for (int i = 0; i < data.length; i++) {
-              byte b = data[i];
-              sb.append(StrUtils.HEX_DIGITS[(b >> 4) & 0xf]);
-              sb.append(StrUtils.HEX_DIGITS[b & 0xf]);
-              if ((i & 0x3f) == 0x3f) {
-                sb.append("\n");
-              }
-            }
-            str = sb.toString();
-          }
-          str = str.replaceAll("\\\"", "\\\\\"");
-          writeKeyValue(json, "data", str, false);
+        if (data != null) {
+          writeKeyValue(json, "data", new BytesRef(data).utf8ToString(), false);
         }
         json.endObject();
       } catch (KeeperException e) {

Modified: lucene/dev/trunk/solr/webapp/web/admin.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/admin.html?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/admin.html (original)
+++ lucene/dev/trunk/solr/webapp/web/admin.html Wed Mar  7 16:30:20 2012
@@ -19,104 +19,101 @@ limitations under the License.
 
 <head>
     
-    <title>solr-admin</title>
+  <title>Solr Admin</title>
     
-    <link rel="stylesheet" type="text/css" href="css/main.css">
-    <link rel="icon" type="image/ico" href="img/favicon.ico">
-    
-    <script type="text/javascript">
-    
-    var app_config = {};
-    
-    app_config.solr_path = '${contextPath}';
-    app_config.core_admin_path = '${adminPath}';
-    app_config.zookeeper_path = 'zookeeper';
-    app_config.schema_path = '/admin/file?file=schema.xml&contentType=text/xml;charset=utf-8';
-    app_config.config_path = '/admin/file?file=solrconfig.xml&contentType=text/xml;charset=utf-8';
+  <link rel="icon" type="image/ico" href="img/favicon.ico">
+
+  <link rel="stylesheet" type="text/css" href="css/styles/common.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/analysis.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/cloud.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/cores.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/dashboard.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/dataimport.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/index.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/java-properties.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/logging.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/menu.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/plugins.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/query.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/replication.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/schema-browser.css">
+  <link rel="stylesheet" type="text/css" href="css/styles/threads.css">
+    
+  <script type="text/javascript">
+    
+  var app_config = {};
+    
+  app_config.solr_path = '${contextPath}';
+  app_config.core_admin_path = '${adminPath}';
+  app_config.schema_path = '/admin/file?file=schema.xml&contentType=text/xml;charset=utf-8';
+  app_config.config_path = '/admin/file?file=solrconfig.xml&contentType=text/xml;charset=utf-8';
     
-    </script>
+  </script>
     
 </head>
 <body>
     
-    <div id="wrapper">
+  <div id="wrapper">
     
-        <div id="header">
+    <div id="header">
             
-            <a href="./" id="solr"><span>Apache SOLR</span></a>
+      <a href="./" id="solr"><span>Apache SOLR</span></a>
 
-            <div id="wip-notice">
-                <p>This interface is work in progress.</p>
-                <p>Please report any <a href="https://issues.apache.org/jira/browse/SOLR-2667">Bugs/Requests/Suggestions: <span>SOLR-2667</span></a></p>
-            </div>
+      <div id="wip-notice">
+        <p>This interface is work in progress.</p>
+        <p><a href="https://issues.apache.org/jira/browse/SOLR-3162">Please report any Bugs/Requests/Suggestions: <span>SOLR-3162</span></a></p>
+      </div>
 
-            <p id="environment">&nbsp;</p>
+      <p id="environment">&nbsp;</p>
 
-        </div>
+    </div>
 
-        <div id="main" class="clearfix">
+    <div id="main" class="clearfix">
         
-            <div id="content-wrapper">
-            <div id="content">
-                
-                &nbsp;
-                
-            </div>
-            </div>
+      <div id="content-wrapper">
+        <div id="content">
+                  
+          &nbsp;
+                  
+        </div>
+      </div>
             
-            <div id="menu-wrapper">
-            <div id="menu">
-                
-                <ul>
-
-                    <li id="index" class="global">
-                        <p><a href="#/">Dashboard</a></p>
-                    </li>
-
-                    <li id="logging" class="global">
-                        <p><a href="#/logging">Logging</a></p>
-                    </li>
-
-                    <li id="cloud" class="global optional">
-                        <p><a href="#/cloud">Cloud</a></p>
-                    </li>
-
-                    <li id="cores" class="global optional">
-                        <p><a href="#/cores">Core Admin</a></p>
-                    </li>
-
-                    <li id="java-properties" class="global">
-                        <p><a href="#/java-properties">Java Properties</a>
-                    </li>
-
-                    <li id="threads" class="global">
-                        <p><a href="#/threads">Thread Dump</a></p>
-                    </li>
-                    
-                </ul>
-                
-            </div>
-            </div>
+      <div id="menu-wrapper">
+        <div id="menu">
+                  
+          <ul>
+
+            <li id="index" class="global"><p><a href="#/">Dashboard</a></p></li>
+            <li id="logging" class="global"><p><a href="#/logging">Logging</a></p></li>
+            <li id="cloud" class="global optional"><p><a href="#/cloud">Cloud</a></p></li>
+            <li id="cores" class="global optional"><p><a href="#/cores">Core Admin</a></p></li>
+            <li id="java-properties" class="global"><p><a href="#/java-properties">Java Properties</a></li>
+            <li id="threads" class="global"><p><a href="#/threads">Thread Dump</a></p></li>
+                      
+          </ul>
+                  
+        </div>
+      </div>
             
-            <div id="meta">
+      <div id="meta">
                 
-                <ul>
+        <ul>
                     
-                    <li class="documentation"><a href="http://lucene.apache.org/solr/"><span>Documentation</span></a></li>
-                    <li class="issues"><a href="http://issues.apache.org/jira/browse/SOLR"><span>Issue Tracker</span></a></li>
-                    <li class="irc"><a href="http://webchat.freenode.net/?channels=#solr"><span>IRC Channel</span></a></li>
-                    <li class="mailinglist"><a href="http://wiki.apache.org/solr/UsingMailingLists"><span>Community forum</span></a></li>
-                    <li class="wiki-query-syntax"><a href="http://wiki.apache.org/solr/SolrQuerySyntax"><span>Solr Query Syntax</span></a></li>
+          <li class="documentation"><a href="http://lucene.apache.org/solr/"><span>Documentation</span></a></li>
+          <li class="issues"><a href="http://issues.apache.org/jira/browse/SOLR"><span>Issue Tracker</span></a></li>
+          <li class="irc"><a href="http://webchat.freenode.net/?channels=#solr"><span>IRC Channel</span></a></li>
+          <li class="mailinglist"><a href="http://wiki.apache.org/solr/UsingMailingLists"><span>Community forum</span></a></li>
+          <li class="wiki-query-syntax"><a href="http://wiki.apache.org/solr/SolrQuerySyntax"><span>Solr Query Syntax</span></a></li>
                     
-                </ul>
+        </ul>
                 
-            </div>
+      </div>
             
-        </div>
-    
     </div>
     
-    <script src="js/require.js" data-main="js/main"></script>
+  </div>
+    
+  <script src="js/require.js" data-main="js/main"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/analysis.css Wed Mar  7 16:30:20 2012
@@ -1,263 +1,269 @@
 #content #analysis-holder
 {
-    background-image: url( ../../img/div.gif );
-    background-position: 50% 0;
-    background-repeat: repeat-y;
+  background-image: url( ../../img/div.gif );
+  background-position: 50% 0;
+  background-repeat: repeat-y;
 }
 
 #content #analysis #field-analysis
 {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 #content #analysis #field-analysis .content
 {
-    padding-bottom: 0;
+  padding-bottom: 0;
 }
 
 #content #analysis .settings-holder
 {
-    clear: both;
-    padding-top: 15px;
+  clear: both;
+  padding-top: 15px;
 }
 
 #content #analysis .settings
 {
-    background-color: #fff;
-    border-top: 1px solid #fafafa;
-    border-bottom: 1px solid #fafafa;
-    padding-top: 10px;
-    padding-bottom: 10px;
+  background-color: #fff;
+  border-top: 1px solid #fafafa;
+  border-bottom: 1px solid #fafafa;
+  padding-top: 10px;
+  padding-bottom: 10px;
 }
 
 #content #analysis .settings select.loader
 {
-    background-position: 3px 50%;
-    padding-left: 21px;
+  background-position: 3px 50%;
+  padding-left: 21px;
 }
 
 #content #analysis .settings select optgroup
 {
-    font-style: normal;
-    padding: 5px;
+  font-style: normal;
+  padding: 5px;
 }
 
 #content #analysis .settings select option
 {
-    padding-left: 10px;
+  padding-left: 10px;
 }
 
 #content #analysis .settings div
 {
-    float: right;
-    width: 47%;
+  float: right;
+  width: 47%;
 }
 
 #content #analysis .settings button
 {
-    float: right;
+  float: right;
 }
 
 #content #analysis .settings button.loader
 {
-    background-position: 2px 50%;
-    padding-left: 21px;
+  background-position: 2px 50%;
+  padding-left: 21px;
 }
 
 #content #analysis .settings .verbose_output
 {
-    float: left;
-    width: auto;
+  float: left;
+  width: auto;
 }
 
 #content #analysis .settings .verbose_output a
 {
-    background-image: url( ../../img/ico/ui-check-box-uncheck.png );
-    background-position: 0 50%;
-    color: #999;
-    display: block;
-    padding-left: 21px;
+  background-image: url( ../../img/ico/ui-check-box-uncheck.png );
+  background-position: 0 50%;
+  color: #999;
+  display: block;
+  padding-left: 21px;
 }
 
 #content #analysis .settings .verbose_output.active a
 {
-    background-image: url( ../../img/ico/ui-check-box.png );
+  background-image: url( ../../img/ico/ui-check-box.png );
 }
 
 #content #analysis .index label,
 #content #analysis .query label
 {
-    display: block;
+  display: block;
 }
 
 #content #analysis .index textarea,
 #content #analysis .query textarea
 {
-    display: block;
-    width: 100%;
+  display: block;
+  width: 100%;
 }
 
 #content #analysis .index
 {
-    float: left;
-    margin-right: 0.5%;
-    min-width: 47%;
-    max-width: 99%;
+  float: left;
+  margin-right: 0.5%;
+  min-width: 47%;
+  max-width: 99%;
 }
 
 #content #analysis .query
 {
-    float: right;
-    margin-left: 0.5%;
-    min-width: 47%;
-    max-width: 99%;
+  float: right;
+  margin-left: 0.5%;
+  min-width: 47%;
+  max-width: 99%;
 }
 
 #content #analysis .analysis-error
 {
-    background-color: #f00;
-    background-image: url( ../../img/ico/construction.png );
-    background-position: 10px 50%;
-    color: #fff;
-    display: none;
-    font-weight: bold;
-    margin-bottom: 20px;
-    padding: 10px;
-    padding-left: 35px;
+  background-color: #f00;
+  background-image: url( ../../img/ico/construction.png );
+  background-position: 10px 50%;
+  color: #fff;
+  display: none;
+  font-weight: bold;
+  margin-bottom: 20px;
+  padding: 10px;
+  padding-left: 35px;
+}
+
+#content #analysis .analysis-error .head a
+{
+  color: #fff;
+  cursor: auto;
 }
 
 #content #analysis #analysis-result
 {
-    overflow: auto;
+  overflow: auto;
 }
 
 #content #analysis #analysis-result .index,
 #content #analysis #analysis-result .query
 {
-    background-color: #fff;
-    padding-top: 20px;
+  background-color: #fff;
+  padding-top: 20px;
 }
 
 #content #analysis #analysis-result table
 {
-    border-collapse: collapse;
+  border-collapse: collapse;
 }
 
 #content #analysis #analysis-result td
 {
-    vertical-align: top;
-    white-space: nowrap;
+  vertical-align: top;
+  white-space: nowrap;
 }
 
 #content #analysis #analysis-result td.part.analyzer div,
 #content #analysis #analysis-result td.part.spacer .holder,
 #content #analysis #analysis-result td td td
 {
-    padding-top: 1px;
-    padding-bottom: 1px;
+  padding-top: 1px;
+  padding-bottom: 1px;
 }
 
 #content #analysis #analysis-result td.legend,
 #content #analysis #analysis-result td.data tr.verbose_output
 {
-    display: none;
+  display: none;
 }
 
 #content #analysis #analysis-result.verbose_output td.legend
 {
-    display: table-cell;
+  display: table-cell;
 }
 
 #content #analysis #analysis-result.verbose_output td.data tr.verbose_output
 {
-    display: table-row;
+  display: table-row;
 }
 
 #content #analysis #analysis-result .match
 {
-    background-color: #e9eff7;
-    background-color: #f2f2ff;
+  background-color: #e9eff7;
+  background-color: #f2f2ff;
 }
 
 #content #analysis #analysis-result td.part
 {
-    padding-bottom: 10px;
+  padding-bottom: 10px;
 }
 
 #content #analysis #analysis-result td.part.analyzer div
 {
-    border-right: 1px solid #f0f0f0;
-    padding-right: 10px;
+  border-right: 1px solid #f0f0f0;
+  padding-right: 10px;
 }
 
 #content #analysis #analysis-result td.part.analyzer abbr
 {
-    color: #c0c0c0;
+  color: #c0c0c0;
 }
 
 #content #analysis #analysis-result td.part.legend .holder,
 #content #analysis #analysis-result td.part.data .holder
 {
-    padding-left: 10px;
-    padding-right: 10px;
-    border-right: 1px solid #c0c0c0;
+  padding-left: 10px;
+  padding-right: 10px;
+  border-right: 1px solid #c0c0c0;
 }
 
 #content #analysis #analysis-result td.part.legend td
 {
-    color: #c0c0c0;
+  color: #c0c0c0;
 }
 
 #content #analysis #analysis-result td.part.legend .holder
 {
-    border-right-color: #f0f0f0;
+  border-right-color: #f0f0f0;
 }
 
 #content #analysis #analysis-result td.part.data:last-child .holder
 {
-    padding-right: 0;
-    border-right: 0;
+  padding-right: 0;
+  border-right: 0;
 }
 
 #content #analysis #analysis-result td.details 
 {
-    padding-left: 10px;
-    padding-right: 10px;
-    border-left: 1px solid #f0f0f0;
-    border-right: 1px solid #f0f0f0;
+  padding-left: 10px;
+  padding-right: 10px;
+  border-left: 1px solid #f0f0f0;
+  border-right: 1px solid #f0f0f0;
 }
 
 #content #analysis #analysis-result td.details:first-child
 {
-    padding-left: 0;
-    border-left: 0;
+  padding-left: 0;
+  border-left: 0;
 }
 
 #content #analysis #analysis-result td.details:last-child
 {
-    padding-right: 0;
-    border-right: 0;
+  padding-right: 0;
+  border-right: 0;
 }
 
 #content #analysis #analysis-result td.details tr.empty td
 {
-    color: #f0f0f0;
+  color: #f0f0f0;
 }
 
 #content #analysis #analysis-result td.details tr.raw_bytes td
 {
-    letter-spacing: -1px;
+  letter-spacing: -1px;
 }
 
 #content #analysis #analysis-result .part table table td
 {
-    border-top: 1px solid #f0f0f0;
+  border-top: 1px solid #f0f0f0;
 }
 
 #content #analysis #analysis-result .part table table tr:first-child td
 {
-    border-top: 0;
+  border-top: 0;
 }
 
 #content #analysis #field-analysis h2 { background-image: url( ../../img/ico/receipt.png ); }
-#content #analysis .analysis-result h2 { background-image: url( ../../img/ico/receipt-invoice.png ); }
\ No newline at end of file
+#content #analysis .analysis-result h2 { background-image: url( ../../img/ico/receipt-invoice.png ); }

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css Wed Mar  7 16:30:20 2012
@@ -1,100 +1,208 @@
 #content #cloud .loader
 {
-    background-position: 0 50%;
-    padding-left: 21px;
+  background-position: 0 50%;
+  padding-left: 21px;
 }
 
 #content #cloud #error
 {
-    background-color: #f00;
-    background-image: url( ../../img/ico/construction.png );
-    background-position: 10px 50%;
-    color: #fff;
-    font-weight: bold;
-    margin-bottom: 20px;
-    padding: 10px;
-    padding-left: 35px;
+  background-color: #f00;
+  background-image: url( ../../img/ico/construction.png );
+  background-position: 10px 50%;
+  color: #fff;
+  font-weight: bold;
+  margin-bottom: 20px;
+  padding: 10px;
+  padding-left: 35px;
 }
 
 #content #cloud h2 { background-image: url( ../../img/ico/sitemap.png ); }
 
+#content #cloud
+{
+  position: relative;
+}
+
+#content #cloud a.debug
+{
+  background-color: #c0c0c0;
+  background-image: url( ../../img/ico/exclamation-button.png );
+  background-position: 5px 50%;
+  border-radius: 5px;
+  display: block;
+  padding: 2px 5px;
+  padding-left: 26px;
+  position: absolute;
+  left: 150px;
+  top: 3px;
+}
+
+#content #cloud a.debug:hover
+{
+  background-color: #fff;
+  color: #00f;
+}
+
+#content #cloud #debug
+{
+  background-color: #fff;
+  box-shadow: 5px 5px 10px #c0c0c0;
+  -moz-box-shadow: 5px 5px 10px #c0c0c0;
+  -webkit-box-shadow: 5px 5px 10px #c0c0c0;
+  display: none;
+  padding: 20px;
+  position: absolute;
+  left: 50px;
+  top: 50px;
+}
+
+#content #cloud #debug ul
+{
+  margin-bottom: 5px;
+}
+
+#content #cloud #debug ul a
+{
+  background-position: 4px 50%;
+  display: block;
+  padding: 2px 4px;
+  padding-left: 25px;
+}
+
+#content #cloud #debug ul a:hover,
+#content #cloud #debug ul a.hover
+{
+  background-color: #f0f0f0;
+}
+
+#content #cloud #debug .clipboard
+{
+  float: left;
+  position: relative;
+}
+
+#content #cloud #debug .clipboard a
+{
+  background-image: url( ../../img/ico/clipboard-paste.png );
+  z-index: 98;
+}
+
+#content #cloud #debug .clipboard a:hover,
+#content #cloud #debug .clipboard a.hover,
+#content #cloud #debug .clipboard.copied a
+{
+  background-image: url( ../../img/ico/clipboard-paste-document-text.png );
+}
+
+#content #cloud #debug .close
+{
+  float: right;
+}
+
+#content #cloud #debug .close a
+{
+  background-image: url( ../../img/ico/cross-0.png );
+  padding-left: 21px;
+}
+
+#content #cloud #debug .close a:hover
+{
+  background-image: url( ../../img/ico/cross-1.png );
+}
+
+#content #cloud #debug .debug
+{
+  border: 1px solid #f0f0f0;
+  max-height: 400px;
+  overflow: auto;
+  padding: 5px;
+  width: 500px;
+}
+
+#content #cloud #debug .debug .loader
+{
+  background-position: 5px 50%;
+  display: block;
+  padding: 10px 26px;
+}
+
 #content #cloud .content
 {
-    padding-left: 0;
-    padding-right: 0;
+  padding-left: 0;
+  padding-right: 0;
 }
 
 #content #cloud .content.show
 {
-    background-image: url( ../../img/div.gif );
-    background-repeat: repeat-y;
-    background-position: 31% 0;
+  background-image: url( ../../img/div.gif );
+  background-repeat: repeat-y;
+  background-position: 31% 0;
 }
 
 #content #cloud #tree
 {
-    float: left;
-    width: 30%;
+  float: left;
+  width: 30%;
 }
 
 #content #cloud .show #tree
 {
-    overflow: hidden;
+  overflow: hidden;
 }
 
 #content #cloud #file-content
 {
-    display: none;
-    float: right;
-    position: relative;
-    width: 68%;
-    min-height: 100px
+  display: none;
+  float: right;
+  position: relative;
+  width: 68%;
+  min-height: 100px
 }
 
 #content #cloud .show #file-content
 {
-    display: block;
+  display: block;
 }
 
 #content #cloud #file-content .close
 {
-    background-image: url( ../../img/ico/cross-0.png );
-    background-position: 50% 50%;
-    display: block;
-    height: 20px;
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: 20px;
+  background-image: url( ../../img/ico/cross-0.png );
+  background-position: 50% 50%;
+  display: block;
+  height: 20px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 20px;
 }
 
 #content #cloud #file-content .close:hover
 {
-    background-image: url( ../../img/ico/cross-1.png );
+  background-image: url( ../../img/ico/cross-1.png );
 }
 
 #content #cloud #file-content .close span
 {
-    display: none;
+  display: none;
 }
 
 #content #cloud #file-content #data
 {
-    border-top: 1px solid #c0c0c0;
-    margin-top: 10px;
-    padding-top: 10px;
+  border-top: 1px solid #c0c0c0;
+  margin-top: 10px;
+  padding-top: 10px;
 }
 
 #content #cloud #file-content #data pre
 {
-    display: block;
-    max-height: 600px;
-    overflow: auto;
+  display: block;
+  max-height: 600px;
+  overflow: auto;
 }
 
 #content #cloud #file-content #data em
 {
-    color: #c0c0c0;
+  color: #c0c0c0;
 }
 
 #content #cloud #file-content #prop
@@ -103,31 +211,31 @@
 
 #content #cloud #file-content li
 {
-    padding-top: 3px;
-    padding-bottom: 3px;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
 
 #content #cloud #file-content li.odd
 {
-    background-color: #F8F8F8;
+  background-color: #F8F8F8;
 }
 
 #content #cloud #file-content li dt
 {
-    float: left;
-    width: 19%;
+  float: left;
+  width: 19%;
 }
 
 #content #cloud #file-content li dd
 {
-    float: right;
-    width: 80%;
+  float: right;
+  width: 80%;
 }
 
 /* tree */
 
 #content #cloud .tree a.active
 {
-    background-color: #f0f0f0;
-    color: #00f;
+  background-color: #f0f0f0;
+  color: #00f;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/common.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/common.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/common.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/common.css Wed Mar  7 16:30:20 2012
@@ -1,52 +1,52 @@
 *
 {
-    background-repeat: no-repeat;
-    margin: 0;
-    padding: 0;
+  background-repeat: no-repeat;
+  margin: 0;
+  padding: 0;
 }
 
 body, h1, h2, h3, h4, h5, h6, a, button, input, select, option, textarea, th, td
 {
-    color: #333;
-    font: 12px/1.6em "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+  color: #333;
+  font: 12px/1.6em "Lucida Grande", "DejaVu Sans", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
 }
 
 body
 {
-    padding: 30px;
-    text-align: center;
+  padding: 30px;
+  text-align: center;
 }
 
 a, button
 {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 button, input, select, textarea
 {
-    border: 1px solid #c0c0c0;
-    padding: 2px;
+  border: 1px solid #c0c0c0;
+  padding: 2px;
 }
 
 a
 {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 pre
 {
-    color: #333;
-    text-align: left;
+  color: #333;
+  text-align: left;
 }
 
 abbr
 {
-    cursor: help;
+  cursor: help;
 }
 
 ul
 {
-    list-style: none;
+  list-style: none;
 }
 
 .clearfix:after { clear: both; content: "."; display: block; font-size: 0; height: 0; visibility: hidden; }
@@ -54,96 +54,121 @@ ul
 
 .loader
 {
-    background-image: url( ../../img/loader.gif ) !important;
+  background-image: url( ../../img/loader.gif ) !important;
 }
 
 .loader-light
 {
-    background-image: url( ../../img/loader-light.gif ) !important;
+  background-image: url( ../../img/loader-light.gif ) !important;
 }
 
 #wrapper
 {
-    margin: 0 auto;
-    margin-bottom: 30px;
-    text-align: left;
+  margin: 0 auto;
+  margin-bottom: 30px;
+  text-align: left;
 }
 
 #header
 {
-    padding-bottom: 10px;
-    position: relative;
+  padding-bottom: 10px;
+  position: relative;
 }
 
 #header #solr
 {
-    background-image: url( ../../img/solr.png );
-    display: block;
-    height: 78px;
-    width: 200px;
+  background-image: url( ../../img/solr.png );
+  display: block;
+  height: 78px;
+  width: 200px;
 }
 
 #header #solr span
 {
-    display: none;
+  display: none;
 }
 
 #header #wip-notice
 {
-    background-color: #eceffa;
-    background-image: url( ../../img/ico/information-button.png );
-    background-position: 8px 7px;
-    border: 1px solid #4465cb;
-    padding: 5px 10px;
-    padding-left: 31px;
-    left: 212px;
-    position: absolute;
-    top: 0;
+  background-color: #eceffa;
+  background-image: url( ../../img/ico/information-button.png );
+  background-position: 8px 7px;
+  border: 1px solid #4465cb;
+  padding: 5px 10px;
+  padding-left: 31px;
+  left: 212px;
+  position: absolute;
+  top: 0;
 }
 
 #header #wip-notice a
 {
-    display: block;
+  display: block;
 }
 
 #header #wip-notice span
 {
-    border-bottom: 1px solid #c0c0c0;
+  border-bottom: 1px solid #c0c0c0;
 }
 
 #main
 {
-    border: 1px solid #c0c0c0;
-    min-height: 600px;
-    min-width: 750px;
-    position: relative;
+  border: 1px solid #c0c0c0;
+  min-height: 600px;
+  min-width: 750px;
+  position: relative;
+}
+
+#main.error
+{
+  border: 0;
+  min-height: 0;
+  padding-top: 20px;
+}
+
+#main.error .message
+{
+  background-color: #f00;
+  background-image: url( ../../img/ico/construction.png );
+  background-position: 10px 50%;
+  color: #fff;
+  font-weight: bold;
+  margin-bottom: 20px;
+  padding: 10px;
+  padding-left: 35px;
+}
+
+#main.error .code
+{
+  border: 1px solid #c0c0c0;
+  padding: 5px;
 }
 
 #meta
 {
-    position: absolute;
-    bottom: -26px;
-    right: 0;
+  position: absolute;
+  bottom: -26px;
+  right: 0;
 }
 
 #meta li
 {
-    float: left;
+  float: left;
 }
 
 #meta li a
 {
-    background-position: 10px 50%;
-    display: block;
-    height: 25px;
-    line-height: 25px;
-    padding-left: 31px;
-    padding-right: 10px;
+  background-position: 10px 50%;
+  display: block;
+  height: 25px;
+  line-height: 25px;
+  padding-left: 31px;
+  padding-right: 10px;
 }
 
 #meta li a:hover
 {
-    background-color: #f0f0f0;
+  background-color: #f0f0f0;
 }
 
 #meta .documentation a { background-image: url( ../../img/ico/document-text.png ); }
@@ -154,112 +179,112 @@ ul
 
 #environment
 {
-    background-image: url( ../../img/ico/box.png );
-    background-position: 10px 50%;
-    border: 1px solid #c0c0c0;
-    display: none;
-    font-weight: bold;
-    padding: 5px 10px;
-    padding-left: 31px;
-    position: absolute;
-    top: 0;
-    right: 0;
+  background-image: url( ../../img/ico/box.png );
+  background-position: 10px 50%;
+  border: 1px solid #c0c0c0;
+  display: none;
+  font-weight: bold;
+  padding: 5px 10px;
+  padding-left: 31px;
+  position: absolute;
+  top: 0;
+  right: 0;
 }
 
 #environment.prod
 {
-    background-color: #c37f7f;
-    border-color: #b15757;
-    color: #fff;
+  background-color: #c37f7f;
+  border-color: #b15757;
+  color: #fff;
 }
 
 #environment.test
 {
-    background-color: #f5f5b2;
-    border-color: #e4e433;
+  background-color: #f5f5b2;
+  border-color: #e4e433;
 }
 
 #environment.dev
 {
-    background-color: #cce7cc;
-    border-color: #66b866;
+  background-color: #cce7cc;
+  border-color: #66b866;
 }
 
 
 #content-wrapper
 {
-    float: right;
-    width: 80%;
+  float: right;
+  width: 80%;
 }
 
 #content
 {
-    padding: 10px;
+  padding: 10px;
 }
 
 #content > .loader
 {
-    background-position: 0 50%;
-    padding-left: 21px;
+  background-position: 0 50%;
+  padding-left: 21px;
 }
 
 #content iframe
 {
-    border: 0;
-    display: block;
-    min-height: 400px;
-    width: 100%;
+  border: 0;
+  display: block;
+  min-height: 400px;
+  width: 100%;
 }
 
 #content > pre
 {
-    max-height: 600px;
-    overflow: auto;
+  max-height: 600px;
+  overflow: auto;
 }
 
 #content .block
 {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 #content .block h2
 {
-    background-color: #fafafa;
-    background-position: 5px 50%;
-    border-bottom: 1px solid #f0f0f0;
-    font-weight: bold;
-    padding: 5px;
-    padding-left: 26px;
+  background-color: #fafafa;
+  background-position: 5px 50%;
+  border-bottom: 1px solid #f0f0f0;
+  font-weight: bold;
+  padding: 5px;
+  padding-left: 26px;
 }
 
 #content .block.disabled,
 #content .block.disabled h2
 {
-    color: #c0c0c0;
+  color: #c0c0c0;
 }
 
 #content .block .message,
 #content .block .content
 {
-    padding: 5px;
+  padding: 5px;
 }
 
 #content .block .message
 {
-    display: none;
+  display: none;
 }
 
 /* syntax */
 
 pre.syntax
 {
-    overflow: auto;
+  overflow: auto;
 }
 
 pre.syntax code
 {
-    display: block;
-    color: #000;
+  display: block;
+  color: #000;
 }
 
 pre.syntax .comment,
@@ -267,8 +292,8 @@ pre.syntax .template_comment,
 pre.syntax .diff .header,
 pre.syntax .javadoc
 {
-    color: #998;
-    font-style: italic;
+  color: #998;
+  font-style: italic;
 }
 
 pre.syntax .keyword,
@@ -278,14 +303,14 @@ pre.syntax .javascript .title,
 pre.syntax .lisp .title,
 pre.syntax .subst
 {
-    color: #000;
-    font-weight: bold;
+  color: #000;
+  font-weight: bold;
 }
 
 pre.syntax .number,
 pre.syntax .hexcolor
 {
-    color: #40a070;
+  color: #40a070;
 }
 
 pre.syntax .string,
@@ -293,28 +318,28 @@ pre.syntax .tag .value,
 pre.syntax .phpdoc,
 pre.syntax .tex .formula
 {
-    color: #d14;
+  color: #d14;
 }
 
 pre.syntax .title,
 pre.syntax .id
 {
-    color: #900;
-    font-weight: bold;
+  color: #900;
+  font-weight: bold;
 }
 
 pre.syntax .javascript .title,
 pre.syntax .lisp .title,
 pre.syntax .subst
 {
-    font-weight: normal;
+  font-weight: normal;
 }
 
 pre.syntax .class .title,
 pre.syntax .tex .command
 {
-    color: #458;
-    font-weight: bold;
+  color: #458;
+  font-weight: bold;
 }
 
 pre.syntax .tag,
@@ -323,8 +348,8 @@ pre.syntax .html .keyword,
 pre.syntax .tag .title,
 pre.syntax .django .tag .keyword
 {
-    color: #000080;
-    font-weight: normal;
+  color: #000080;
+  font-weight: normal;
 }
 
 pre.syntax .attribute,
@@ -332,18 +357,18 @@ pre.syntax .variable,
 pre.syntax .instancevar,
 pre.syntax .lisp .body
 {
-    color: #008080;
+  color: #008080;
 }
 
 pre.syntax .regexp
 {
-    color: #009926;
+  color: #009926;
 }
 
 pre.syntax .class
 {
-    color: #458;
-    font-weight: bold;
+  color: #458;
+  font-weight: bold;
 }
 
 pre.syntax .symbol,
@@ -353,14 +378,14 @@ pre.syntax .ruby .symbol .keymethods,
 pre.syntax .lisp .keyword,
 pre.syntax .tex .special
 {
-    color: #990073;
+  color: #990073;
 }
 
 pre.syntax .builtin,
 pre.syntax .built_in,
 pre.syntax .lisp .title
 {
-    color: #0086b3;
+  color: #0086b3;
 }
 
 pre.syntax .preprocessor,
@@ -369,96 +394,96 @@ pre.syntax .doctype,
 pre.syntax .shebang,
 pre.syntax .cdata
 {
-    color: #999;
-    font-weight: bold;
+  color: #999;
+  font-weight: bold;
 }
 
 pre.syntax .deletion
 {
-    background: #fdd;
+  background: #fdd;
 }
 
 pre.syntax .addition
 {
-    background: #dfd;
+  background: #dfd;
 }
 
 pre.syntax .diff .change
 {
-    background: #0086b3;
+  background: #0086b3;
 }
 
 pre.syntax .chunk
 {
-    color: #aaa;
+  color: #aaa;
 }
 
 pre.syntax .tex .formula
 {
-    opacity: 0.5;
+  opacity: 0.5;
 }
 
 #content .tree li, 
 #content .tree ins
 {
-    background-color: transparent;
-    background-image: url( ../../img/tree.png );
-    background-repeat: no-repeat; 
+  background-color: transparent;
+  background-image: url( ../../img/tree.png );
+  background-repeat: no-repeat; 
 }
 
 #content .tree li
 {
-    background-position: -54px 0;
-    background-repeat: repeat-y;
-    line-height: 22px;
+  background-position: -54px 0;
+  background-repeat: repeat-y;
+  line-height: 22px;
 }
 
 #content .tree li.jstree-last
 {
-    background:transparent;
+  background:transparent;
 }
 
 #content .tree .jstree-open > ins
 {
-    background-position: -36px 0;
+  background-position: -36px 0;
 }
 
 #content .tree .jstree-closed > ins
 {
-    background-position: -18px 0;
+  background-position: -18px 0;
 }
 
 #content .tree .jstree-leaf > ins
 {
-    background-position: 0 0;
+  background-position: 0 0;
 }
 
 #content .tree .jstree-hovered
 {
-    background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px;
+  background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px;
 }
 
 #content .tree .jstree-clicked
 {
-    background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px;
+  background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px;
 }
 
 #content .tree a .jstree-icon
 {
-    background-image: url( ../../img/ico/folder.png );
+  background-image: url( ../../img/ico/folder.png );
 }
 
 #content .tree .jstree-leaf a .jstree-icon
 {
-    background-image: url( ../../img/ico/document-text.png );
+  background-image: url( ../../img/ico/document-text.png );
 }
 
 #content .tree .jstree-search
 {
-    font-style:italic;
+  font-style:italic;
 }
 
 #content .tree a.jstree-search
 {
-    color:aqua;
+  color:aqua;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/cores.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/cores.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/cores.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/cores.css Wed Mar  7 16:30:20 2012
@@ -4,224 +4,224 @@
 
 #content #cores #frame
 {
-    float: right;
-    width: 78%;
+  float: right;
+  width: 78%;
 }
 
 #content #cores #navigation
 {
-    background-image: url( ../../img/div.gif );
-    background-position: 100% 0;
-    background-repeat: repeat-y;
-    width: 20%;
+  background-image: url( ../../img/div.gif );
+  background-position: 100% 0;
+  background-repeat: repeat-y;
+  width: 20%;
 }
 
 #content #cores #list
 {
-    float: left;
-    padding-top: 15px;
-    width: 100%;
+  float: left;
+  padding-top: 15px;
+  width: 100%;
 }
 
 #content #cores #list a
 {
-    border-right: 1px solid #f0f0f0;
-    display: block;
-    margin-left: 1px;
-    padding: 3px 0;
+  border-right: 1px solid #f0f0f0;
+  display: block;
+  margin-left: 1px;
+  padding: 3px 0;
 }
 
 #content #cores #list a:hover
 {
-    background-color: #fafafa;
+  background-color: #fafafa;
 }
 
 #content #cores #list .current a
 {
-    background-color: #fff;
-    border-right-color: #fff;
-    border-top: 1px solid #f0f0f0;
-    border-bottom: 1px solid #f0f0f0;
-    font-weight: bold;
+  background-color: #fff;
+  border-right-color: #fff;
+  border-top: 1px solid #f0f0f0;
+  border-bottom: 1px solid #f0f0f0;
+  font-weight: bold;
 }
 
 #content #cores #frame .actions
 {
-    margin-bottom: 20px;
+  margin-bottom: 20px;
 }
 
 #content #cores .actions form .buttons
 {
-    padding-left: 40px;
+  padding-left: 40px;
 }
 
 #content #cores .actions form a
 {
-    display: block;
-    float: left;
-    height: 20px;
-    margin-right: 5px;
-    padding-left: 21px;
+  display: block;
+  float: left;
+  height: 20px;
+  margin-right: 5px;
+  padding-left: 21px;
 }
 
 #content #cores .actions form a span
 {
-    display: none;
+  display: none;
 }
 
 #content #cores .actions form a.submit
 {
-    background-image: url( ../../img/ico/tick.png );
-    background-position: 50% 50%;
+  background-image: url( ../../img/ico/tick.png );
+  background-position: 50% 50%;
 }
 
 #content #cores .actions form a.submit:hover
 {
-    background-color: #e6f3e6;
+  background-color: #e6f3e6;
 }
 
 #content #cores .actions form a.reset
 {
-    background-image: url( ../../img/ico/cross.png );
-    background-position: 50% 50%;
+  background-image: url( ../../img/ico/cross.png );
+  background-position: 50% 50%;
 }
 
 #content #cores .actions form a.reset:hover
 {
-    background-color: #f3e6e6;
+  background-color: #f3e6e6;
 }
 
 #content #cores .actions form p
 {
-    padding-bottom: 3px;
+  padding-bottom: 3px;
 }
 
 #content #cores .actions form label
 {
-    float: left;
-    width: 40px;
+  float: left;
+  width: 40px;
 }
 
 #content #cores .actions form input,
 #content #cores .actions form select
 {
-    width: 100px;
+  width: 100px;
 }
 
 #content #cores .actions form select option.disabled
 {
-    color: #c0c0c0;
+  color: #c0c0c0;
 }
 
 #content #cores .actions .button-holder
 {
-    float: left;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  float: left;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 #content #cores .actions .button-holder.active
 {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 #content #cores .actions .button-holder .button
 {
-    background-color: #f5f5f5;
-    border: 1px solid #c0c0c0;
-    position: relative;
-    z-index: 100;
+  background-color: #f5f5f5;
+  border: 1px solid #c0c0c0;
+  position: relative;
+  z-index: 100;
 }
 
 #content #cores .actions .button-holder.active .button
 {
-    background-color: #fff;
-    border-bottom-color: #fff;
-    padding-bottom: 5px;
+  background-color: #fff;
+  border-bottom-color: #fff;
+  padding-bottom: 5px;
 }
 
 #content #cores .actions .button-holder .button a
 {
-    background-position: 5px 50%;
-    display: block;
-    padding: 1px 5px;
-    padding-left: 24px;
+  background-position: 5px 50%;
+  display: block;
+  padding: 1px 5px;
+  padding-left: 24px;
 }
 
 #content #cores .actions .button-holder .button a.success
 {
-    background-image: url( ../../img/ico/tick.png );
+  background-image: url( ../../img/ico/tick.png );
 }
 
 #content #cores .actions .button-holder.active .button a
 {
-    cursor: auto;
+  cursor: auto;
 }
 
 #content #cores .actions .button-holder .button-content
 {
-    background-color: #fff;
-    border: 1px solid #c0c0c0;
-    box-shadow: 5px 5px 10px #c0c0c0;
-    -moz-box-shadow: 5px 5px 10px #c0c0c0;
-    -webkit-box-shadow: 5px 5px 10px #c0c0c0;
-    display: none;
-    margin-top: -1px;
-    padding: 5px;
-    padding-top: 15px;
-    position: absolute;
-    z-index: 99;
+  background-color: #fff;
+  border: 1px solid #c0c0c0;
+  box-shadow: 5px 5px 10px #c0c0c0;
+  -moz-box-shadow: 5px 5px 10px #c0c0c0;
+  -webkit-box-shadow: 5px 5px 10px #c0c0c0;
+  display: none;
+  margin-top: -1px;
+  padding: 5px;
+  padding-top: 15px;
+  position: absolute;
+  z-index: 99;
 }
 
 #content #cores .actions .button-holder.active .button-content
 {
-    display: block;
+  display: block;
 }
 
 #content #cores .actions .button .reload
 {
-    background-image: url( ../../img/ico/arrow-circle.png );
+  background-image: url( ../../img/ico/arrow-circle.png );
 }
 
 #content #cores .actions .button .rename
 {
-    background-image: url( ../../img/ico/ui-text-field-select.png );
+  background-image: url( ../../img/ico/ui-text-field-select.png );
 }
 
 #content #cores .actions .button .swap
 {
-    background-image: url( ../../img/ico/arrow-switch.png );
+  background-image: url( ../../img/ico/arrow-switch.png );
 }
 
 #content #cores .actions .button .unload
 {
-    background-image: url( ../../img/ico/cross.png );
+  background-image: url( ../../img/ico/cross.png );
 }
 
 #content #cores .actions .button .optimize
 {
-    background-image: url( ../../img/ico/hammer-screwdriver.png );
-    display: none;
+  background-image: url( ../../img/ico/hammer-screwdriver.png );
+  display: none;
 }
 
 #content #cores #navigation .add
 {
-    background-image: url( ../../img/ico/plus-button.png );
+  background-image: url( ../../img/ico/plus-button.png );
 }
 
 #content #cores #navigation .add label
 {
-    width: 85px;
+  width: 85px;
 }
 
 #content #cores #navigation .add input
 {
-    width: 155px;
+  width: 155px;
 }
 
 #content #cores #navigation .add .buttons
 {
-    padding-left: 85px;
+  padding-left: 85px;
 }
 
 #content #cores #data #core-data h2 { background-image: url( ../../img/ico/database.png ); }
@@ -229,44 +229,44 @@
 
 #content #cores #data #index-data
 {
-    margin-top: 10px;
+  margin-top: 10px;
 }
 
 #content #cores #data li
 {
-    padding-bottom: 3px;
-    padding-top: 3px;
+  padding-bottom: 3px;
+  padding-top: 3px;
 }
 
 #content #cores #data li.odd
 {
-    background-color: #f8f8f8;
+  background-color: #f8f8f8;
 }
 
 #content #cores #data li dt
 {
-    float: left;
-    width: 17%;
+  float: left;
+  width: 17%;
 }
 
 #content #cores #data li dd
 {
-    float: right;
-    width: 82%;
+  float: right;
+  width: 82%;
 }
 
 #content #cores #data li dd.ico
 {
-    background-image: url( ../../img/ico/slash.png );
-    height: 20px;
+  background-image: url( ../../img/ico/slash.png );
+  height: 20px;
 }
 
 #content #cores #data li dd.ico.ico-1
 {
-    background-image: url( ../../img/ico/tick.png );
+  background-image: url( ../../img/ico/tick.png );
 }
 
 #content #cores #data li dd.ico span
 {
-    display: none;
+  display: none;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/dashboard.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/dashboard.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/dashboard.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/dashboard.css Wed Mar  7 16:30:20 2012
@@ -1,108 +1,108 @@
 #content #dashboard .block
 {
-    background-image: none;
-    width: 49%;
+  background-image: none;
+  width: 49%;
 }
 
 #content #dashboard #statistics
 {
-    float: left;
+  float: left;
 }
 
 #content #dashboard #statistics dt,
 #content #dashboard #statistics dd
 {
-    display: block;
-    float: left;
+  display: block;
+  float: left;
 }
 
 #content #dashboard #statistics dt
 {
-    clear: left;
-    margin-right: 2%;
-    text-align: right;
-    width: 23%;
+  clear: left;
+  margin-right: 2%;
+  text-align: right;
+  width: 23%;
 }
 
 #content #dashboard #statistics dd
 {
-    width: 74%;
+  width: 74%;
 }
 
 #content #dashboard #statistics .index_optimized
 {
-    margin-top: 10px;
+  margin-top: 10px;
 }
 
 #content #dashboard #statistics .ico
 {
-    background-image: url( ../../img/ico/slash.png );
-    height: 20px;
+  background-image: url( ../../img/ico/slash.png );
+  height: 20px;
 }
 
 #content #dashboard #statistics .ico.ico-1
 {
-    background-image: url( ../../img/ico/tick.png );
+  background-image: url( ../../img/ico/tick.png );
 }
 
 #content #dashboard #statistics .ico span
 {
-    display: none;
+  display: none;
 }
 
 #content #dashboard #statistics .index_optimized.value a
 {
-    display: none;
+  display: none;
 }
 
 #content #dashboard #statistics .index_optimized.value.ico-0 a
 {
-    background-color: #f0f0f0;
-    background-image: url( ../../img/ico/hammer-screwdriver.png );
-    background-position: 5px 50%;
-    border: 1px solid #c0c0c0;
-    display: block;
-    float: left;
-    margin-left: 50px;
-    padding: 1px 5px;
-    padding-left: 26px;
+  background-color: #f0f0f0;
+  background-image: url( ../../img/ico/hammer-screwdriver.png );
+  background-position: 5px 50%;
+  border: 1px solid #c0c0c0;
+  display: block;
+  float: left;
+  margin-left: 50px;
+  padding: 1px 5px;
+  padding-left: 26px;
 }
 
 #content #dashboard #statistics .index_has-deletions
 {
-    display: none;
+  display: none;
 }
 
 #content #dashboard #statistics .index_has-deletions.value.ico-0
 {
-    background-image: url( ../../img/ico/tick-red.png );
+  background-image: url( ../../img/ico/tick-red.png );
 }
 
 #content #dashboard #replication
 {
-    float: left;
+  float: left;
 }
 
 #content #dashboard #replication .is-replicating
 {
-    background-position: 99% 50%;
-    display: block;
+  background-position: 99% 50%;
+  display: block;
 }
 
 #content #dashboard #replication #details table thead td span
 {
-    display: none;
+  display: none;
 }
 
 #content #dashboard #dataimport
 {
-    float: right;
+  float: right;
 }
 
 
 #content #dashboard #admin-extra
 {
-    float: right;
+  float: right;
 }
 
 #content #dashboard #system h2 { background-image: url( ../../img/ico/server.png ); }
@@ -111,4 +111,4 @@
 #content #dashboard #replication.is-master h2 { background-image: url( ../../img/ico/node-master.png ); }
 #content #dashboard #replication.is-slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
 #content #dashboard #dataimport h2 { background-image: url( ../../img/ico/document-import.png ); }
-#content #dashboard #admin-extra h2 { background-image: url( ../../img/ico/plus-button.png ); }
\ No newline at end of file
+#content #dashboard #admin-extra h2 { background-image: url( ../../img/ico/plus-button.png ); }

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/dataimport.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/dataimport.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/dataimport.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/dataimport.css Wed Mar  7 16:30:20 2012
@@ -1,232 +1,232 @@
 #content #dataimport
 {
-    background-image: url( ../../img/div.gif );
-    background-position: 21% 0;
-    background-repeat: repeat-y;
+  background-image: url( ../../img/div.gif );
+  background-position: 21% 0;
+  background-repeat: repeat-y;
 }
 
 #content #dataimport #frame
 {
-    float: right;
-    width: 78%;
+  float: right;
+  width: 78%;
 }
 
 #content #dataimport #form
 {
-    float: left;
-    width: 20%;
+  float: left;
+  width: 20%;
 }
 
 #content #dataimport.error #form form
 {
-    display: none !important;
+  display: none !important;
 }
 
 #content #dataimport #form label
 {
-    cursor: pointer;
-    display: block;
-    margin-top: 5px;
+  cursor: pointer;
+  display: block;
+  margin-top: 5px;
 }
 
 #content #dataimport #form input,
 #content #dataimport #form select,
 #content #dataimport #form textarea
 {
-    margin-bottom: 2px;
-    width: 100%;
+  margin-bottom: 2px;
+  width: 100%;
 }
 
 #content #dataimport #form #start
 {
-    float: left;
-    margin-right: 2%;
-    width: 49%;
+  float: left;
+  margin-right: 2%;
+  width: 49%;
 }
 
 #content #dataimport #form #rows
 {
-    width: 49%;
+  width: 49%;
 }
 
 #content #dataimport #form .checkbox input
 {
-    margin-bottom: 0;
-    width: auto;
+  margin-bottom: 0;
+  width: auto;
 }
 
 #content #dataimport #form fieldset,
 #content #dataimport #form .optional.expanded
 {
-    border: 1px solid #fff;
-    border-top: 1px solid #c0c0c0;
-    margin-bottom: 10px;
+  border: 1px solid #fff;
+  border-top: 1px solid #c0c0c0;
+  margin-bottom: 10px;
 }
 
 #content #dataimport #form fieldset legend,
 #content #dataimport #form .optional.expanded legend
 {
-    display: block;
-    margin-left: 10px;
-    padding: 0px 5px;
+  display: block;
+  margin-left: 10px;
+  padding: 0px 5px;
 }
 
 #content #dataimport #form fieldset legend label
 {
-    margin-top: 0;
+  margin-top: 0;
 }
 
 #content #dataimport #form .handler
 {
-    display: none;
+  display: none;
 }
 
 #content #dataimport #form .handler ul
 {
-    list-style: disc;
-    margin-left: 0.7em;
-    padding-left: 0.7em;
+  list-style: disc;
+  margin-left: 0.7em;
+  padding-left: 0.7em;
 }
 
 #content #dataimport #form .handler ul li a
 {
-    color: #c0c0c0;
-    display: block;
+  color: #c0c0c0;
+  display: block;
 }
 
 #content #dataimport #form .handler ul li.active a
 {
-    color: #333;
+  color: #333;
 }
 
 #content #dataimport #current_state
 {
-    display: none;
-    padding: 10px;
-    margin-bottom: 20px;
+  display: none;
+  padding: 10px;
+  margin-bottom: 20px;
 }
 
 #content #dataimport.error #current_state
 {
-    display: none !important;
+  display: none !important;
 }
 
 #content #dataimport #current_state .time,
 #content #dataimport #current_state .info
 {
-    display: block;
-    padding-left: 21px;
+  display: block;
+  padding-left: 21px;
 }
 
 #content #dataimport #current_state .time
 {
-    color: #c0c0c0;
-    font-size: 11px;
+  color: #c0c0c0;
+  font-size: 11px;
 }
 
 #content #dataimport #current_state .info
 {
-    background-position: 0 1px;
+  background-position: 0 1px;
 }
 
 #content #dataimport #current_state.indexing
 {
-    background-color: #f9f9f9;
+  background-color: #f9f9f9;
 }
 
 #content #dataimport #current_state.success
 {
-    background-color: #e6f3e6;
+  background-color: #e6f3e6;
 }
 
 #content #dataimport #current_state.success .info
 {
-    background-image: url( ../../img/ico/tick-circle.png );
+  background-image: url( ../../img/ico/tick-circle.png );
 }
 
 #content #dataimport #current_state.success .info strong
 {
-    color: #080;
+  color: #080;
 }
 
 #content #dataimport #current_state.failure
 {
-    background-color: #f3e6e6;
+  background-color: #f3e6e6;
 }
 
 #content #dataimport #current_state.failure .info
 {
-    background-image: url( ../../img/ico/slash.png );
+  background-image: url( ../../img/ico/slash.png );
 }
 
 #content #dataimport #current_state.failure .info strong
 {
-    color: #800;
+  color: #800;
 }
 
 #content #dataimport #config-error
 {
-    background-color: #f00;
-    background-image: url( ../../img/ico/construction.png );
-    background-position: 10px 50%;
-    color: #fff;
-    display: none;
-    font-weight: bold;
-    margin-bottom: 20px;
-    padding: 10px;
-    padding-left: 35px;
+  background-color: #f00;
+  background-image: url( ../../img/ico/construction.png );
+  background-position: 10px 50%;
+  color: #fff;
+  display: none;
+  font-weight: bold;
+  margin-bottom: 20px;
+  padding: 10px;
+  padding-left: 35px;
 }
 
 #content #dataimport #config h2
 {
-    border-color: #c0c0c0;
-    padding-left: 5px;
-    position: relative;
+  border-color: #c0c0c0;
+  padding-left: 5px;
+  position: relative;
 }
 
 #content #dataimport #config.hidden h2
 {
-    border-color: #fafafa;
+  border-color: #fafafa;
 }
 
 #content #dataimport #config h2 a.toggle
 {
-    background-image: url( ../../img/ico/toggle-small.png );
-    background-position: 0 50%;
-    padding-left: 21px;
+  background-image: url( ../../img/ico/toggle-small.png );
+  background-position: 0 50%;
+  padding-left: 21px;
 }
 
 #content #dataimport #config.hidden h2 a.toggle
 {
-    background-image: url( ../../img/ico/toggle-small-expand.png );
+  background-image: url( ../../img/ico/toggle-small-expand.png );
 }
 
 #content #dataimport #config h2 a.reload_config
 {
-    background-image: url( ../../img/ico/arrow-circle.png );
-    padding-left: 21px;
-    position: absolute;
-    right: 5px;
-    top: 5px;
+  background-image: url( ../../img/ico/arrow-circle.png );
+  padding-left: 21px;
+  position: absolute;
+  right: 5px;
+  top: 5px;
 }
 
 #content #dataimport #config h2 a.reload_config.success
 {
-    background-image: url( ../../img/ico/tick.png );
+  background-image: url( ../../img/ico/tick.png );
 }
 
 #content #dataimport #config h2 a.reload_config.error
 {
-    background-image: url( ../../img/ico/slash.png );
+  background-image: url( ../../img/ico/slash.png );
 }
 
 #content #dataimport #config.hidden .content
 {
-    display: none;
+  display: none;
 }
 
 #content #dataimport #dataimport_config .loader
 {
-    background-position: 0 50%;
-    padding-left: 21px;
+  background-position: 0 50%;
+  padding-left: 21px;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/index.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/index.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/index.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/index.css Wed Mar  7 16:30:20 2012
@@ -1,158 +1,195 @@
-#content #index .loader
+#content #index .bar-desc
 {
-    background-position: 0 50%;
-    padding-left: 21px;
+  color: #c0c0c0;
+  font-weight: normal;
+  margin-left: 10px;
+  white-space: pre;
 }
 
-#content #index #data
+#content #index .bar-holder
 {
-    float: left;
-    width: 74%;
+  box-shadow: 5px 5px 10px #c0c0c0;
+  -moz-box-shadow: 5px 5px 10px #c0c0c0;
+  -webkit-box-shadow: 5px 5px 10px #c0c0c0;
+  height: 35px;
 }
 
-#content #index #memory
+#content #index .bar-holder .bar
 {
-    float: right;
-    width: 24%;
+  height: 100%;
+  position: relative;
 }
 
-#content #index #data h2 { background-image: url( ../../img/ico/server.png ); }
-#content #index #memory h2 { background-image: url( ../../img/ico/battery.png ); }
+#content #index .bar-holder div .val
+{
+  border-right: 1px solid #f00;
+  display: block;
+  padding-right: 5px;
+  position: absolute;
+  right: 0;
+  top: 35px;
+  white-space: nowrap;
+}
 
-#content #index #data li
+#content #index .bar-holder .bar-max.bar
 {
-    display: none;
-    padding-top: 3px;
-    padding-bottom: 3px;
+  background-color: #f0f0f0;
 }
 
-#content #index #data li.odd
+#content #index .bar-holder .bar-max.val
 {
-    background-color: #f8f8f8;
+  border-color: #f0f0f0;
+  color: #d6d6d6;
 }
 
-#content #index #data li dt
+#content #index .bar-holder .bar-total.bar
 {
-    float: left;
-    width: 27%;
+  background-color: #c0c0c0;
 }
 
-#content #index #data li dd
+#content #index .bar-holder .bar-total.val
 {
-    float: right;
-    width: 72%
+  border-color: #c0c0c0;
+  color: #c0c0c0;
 }
 
-#content #index #data li dd.odd
+#content #index .bar-holder .bar-used.bar
 {
-    color: #999;
+  background-color: #969696;
 }
 
-#content #index #data dt span
+#content #index .bar-holder .bar-used.val
 {
-    background-position: 0 50%;
-    display: block;
-    padding-left: 21px;
+  border-color: #969696;
+  color: #969696;
 }
 
-#content #index #data .start_time dt span
+#content #index .bar-holder.bar-lvl-2 .bar-max.val { padding-top: 25px; }
+#content #index .bar-holder.bar-lvl-2 .bar-total.val { padding-top: 5px; }
+#content #index .bar-holder.bar-lvl-2 { margin-bottom: 45px; }
+
+#content #index .bar-holder.bar-lvl-3 .bar-max.val { padding-top: 45px; }
+#content #index .bar-holder.bar-lvl-3 .bar-total.val { padding-top: 25px; }
+#content #index .bar-holder.bar-lvl-3 .bar-used.val { padding-top: 5px; }
+#content #index .bar-holder.bar-lvl-3 { margin-bottom: 65px; }
+
+#content #index .loader
 {
-    background-image: url( ../../img/ico/clock-select.png );
+  background-position: 0 50%;
+  padding-left: 21px;
 }
 
-#content #index #data .host dt span
+#content #index .index-left
 {
-    background-image: url( ../../img/ico/globe.png );
+  float: left;
+  width: 55%;
 }
 
-#content #index #data .cwd dt span
+#content #index .index-right
 {
-    background-image: url( ../../img/ico/folder-export.png );
+  float: right;
+  width: 40%;
 }
 
-#content #index #data .jvm dt span
+#content #index .data li
 {
-    background-image: url( ../../img/ico/jar.png );
+  display: none;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
 
-#content #index #data .command_line_args dt span
+#content #index .data li.odd
 {
-    background-image: url( ../../img/ico/terminal.png );
+  color: #c0c0c0;
 }
 
-#content #index #data .lucene dt span
+#content #index .data li dt
 {
-    background-image: url( ../../img/lucene-ico.png );
+  float: left;
+  white-space: nowrap;
+  width: 20%;
 }
 
-#content #index #memory #memory-bar
+#content #index .data li dd
 {
-    background-color: #00f;
-    box-shadow: 5px 5px 10px #c0c0c0;
-    -moz-box-shadow: 5px 5px 10px #c0c0c0;
-    -webkit-box-shadow: 5px 5px 10px #c0c0c0;
-    margin-top: 20px;
-    width: 100px;
+  float: right;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  width: 80%
 }
 
-#content #index #memory .bar
+#content #index .data li dd.odd
 {
-    bottom: 0;
-    position: absolute;
-    width: 100%;
+  color: #999;
 }
 
-#content #index #memory div .value
+#content #index .data dt span
 {
-    border-top: 1px solid #f00;
-    display: block;
-    font-size: 10px;
-    line-height: 12px;
-    padding-left: 10px;
-    padding-right: 2px;
-    position: absolute;
-    margin-left: 100px;
-    white-space: nowrap;
+  background-position: 1px 50%;
+  display: block;
+  padding-left: 22px;
 }
 
-#content #index #memory div .value.upper
+#content #index #instance h2 { background-image: url( ../../img/ico/server.png ); }
+#content #index #instance .start_time dt span { background-image: url( ../../img/ico/clock-select.png ); }
+#content #index #instance .host dt span { background-image: url( ../../img/ico/globe.png ); }
+#content #index #instance .dir dt span { background-image: url( ../../img/ico/folder.png ); }
+
+#content #index #versions h2 { background-image: url( ../../img/ico/property.png ); }
+#content #index #versions .solr span { background-image: url( ../../img/solr-ico.png ); }
+#content #index #versions .lucene span { background-image: url( ../../img/lucene-ico.png ); }
+
+#content #index #jvm h2 { background-image: url( ../../img/ico/jar.png ); }
+#content #index #jvm .jvm_version dt span { background-image: url( ../../img/ico/jar.png ); }
+#content #index #jvm .processors dt span { background-image: url( ../../img/ico/processor.png ); }
+#content #index #jvm .command_line_args dt span { background-image: url( ../../img/ico/terminal.png ); }
+
+#content #index #system h2 { background-image: url( ../../img/ico/system-monitor.png ); }
+
+#content #index #system
 {
-    border-top-width: 0;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
+  position: relative;
 }
 
-#content #index #memory #memory-bar-max
+#content #index #system .reload
 {
-    background-color: #f0f0f0;
-    height: 200px;
-    position: relative;
+  background-image: url( ../../img/ico/arrow-circle.png );
+  background-position: 50% 50%;
+  display: block;
+  height: 30px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 30px;
 }
 
-#content #index #memory #memory-bar-max .value
+#content #index #system .reload.loader
 {
-    border-color: #f0f0f0;
-    color: #d6d6d6;
+  padding-left: 0;
 }
 
-#content #index #memory #memory-bar-total
+#content #index #system .reload span
 {
-    background-color: #c0c0c0;
+  display: none;
 }
 
-#content #index #memory #memory-bar-total .value
+#content #index #system .content p
 {
-    border-color: #c0c0c0;
-    color: #c0c0c0;
+  margin-top: 10px;
+  margin-bottom: 5px;
 }
 
-#content #index #memory #memory-bar-used
+#content #index #system .content .no-info
 {
-    background-color: #969696;
+  color: #c0c0c0;
+  display: none;
+  font-style: italic;
 }
 
-#content #index #memory #memory-bar-used .value
+#content #index #jvm-memory h2 { background-image: url( ../../img/ico/memory.png ); }
+
+#content #index #jvm-memory-bar
 {
-    border-color: #969696;
-    color: #969696;
+  margin-top: 20px;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/java-properties.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/java-properties.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/java-properties.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/java-properties.css Wed Mar  7 16:30:20 2012
@@ -1,33 +1,33 @@
 #content #java-properties .loader
 {
-    background-position: 0 50%;
-    padding-left: 21px;   
+  background-position: 0 50%;
+  padding-left: 21px;   
 }
 
 #content #java-properties li
 {
-    padding-top: 3px;
-    padding-bottom: 3px;
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
 
 #content #java-properties li.odd
 {
-    background-color: #f8f8f8;
+  background-color: #f8f8f8;
 }
 
 #content #java-properties li dt
 {
-    float: left;
-    width: 29%;
+  float: left;
+  width: 29%;
 }
 
 #content #java-properties li dd
 {
-    float: right;
-    width: 70%
+  float: right;
+  width: 70%
 }
 
 #content #java-properties li dd.odd
 {
-    color: #999;
+  color: #999;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/logging.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/logging.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/logging.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/logging.css Wed Mar  7 16:30:20 2012
@@ -1,150 +1,185 @@
 #content #logging .loader
 {
-    background-position: 0 50%;
-    padding-left: 21px;
+  background-position: 0 50%;
+  padding-left: 21px;
 }
 
-#content #logging .jstree
+#content #logging .jstree li
 {
-    position: relative;
+  position: relative;
 }
 
 #content #logging .jstree a
 {
-    cursor: auto;
+  color: #c0c0c0;
+  height: 17px;
+  line-height: 17px;
+  padding: 0;
+  width: 90%;
 }
 
-#content #logging .jstree .trigger span
+#content #logging .jstree a.set
 {
-    background-position: 100% 50%;
-    cursor: pointer;
-    padding-right: 21px;
+  color: #333;
 }
 
-#content #logging .jstree a.trigger:hover span
+#content #logging .jstree a.null
 {
-    background-image: url( ../../img/ico/pencil-small.png );
+  color: #f0f0f0;
 }
 
-#content #logging .jstree .inactive,
-#content #logging .jstree .inactive .effective_level
+#content #logging .jstree a:hover,
+#content #logging .jstree a.open
 {
-    color: #c0c0c0;
+  background-color: #f0f0f0;
 }
 
-#content #logging .jstree li
+#content #logging .jstree a:hover
+{
+  color: #008;
+}
+
+#content #logging .jstree a span.ns
+{
+  display: none;
+}
+
+#content #logging.ns .jstree a span.ns
+{
+  display: inline;
+}
+
+#content #logging .jstree a span.name
 {
-    position: relative;
+  background-position: 100% 50%;
+  cursor: pointer;
+  padding-right: 21px;
 }
 
-#content #logging .jstree .odd
+#content #logging .jstree a:hover span.name
 {
-    background-color: #f8f8f8;
+  background-image: url( ../../img/ico/pencil-small.png );
 }
 
-#content #logging .jstree .loglevel
+#content #logging .jstree .selector-holder
 {
-    position: absolute;
-    margin-top: 3px;
-    top: 0;
+  position: absolute;
+  top: -2px;
+  z-index: 700;
 }
 
-#content #logging .jstree li .loglevel { left: 340px; }
-#content #logging .jstree li li .loglevel { left: 322px; }
-#content #logging .jstree li li li .loglevel { left: 304px; }
-#content #logging .jstree li li li li .loglevel { left: 286px; }
-#content #logging .jstree li li li li li .loglevel { left: 268px; }
-#content #logging .jstree li li li li li li .loglevel { left: 250px; }
+#content #logging .jstree .selector-holder.open
+{
+  background-color: #fff;
+  margin-left: -19px;
+  z-index: 800;
+}
+
+#content #logging .jstree li .selector-holder { left: 440px; }
+#content #logging .jstree li li .selector-holder { left: 422px; }
+#content #logging .jstree li li li .selector-holder { left: 404px; }
+#content #logging .jstree li li li li .selector-holder { left: 386px; }
+#content #logging .jstree li li li li li .selector-holder { left: 368px; }
+#content #logging .jstree li li li li li li .selector-holder { left: 350px; }
+
+#content #logging .jstree .selector
+{
+  border: 1px solid #fff;
+  position: relative;
+}
+
+#content #logging .jstree .open .selector
+{
+  border-color: #f0f0f0;
+  box-shadow: 5px 5px 10px #c0c0c0;
+  -moz-box-shadow: 5px 5px 10px #c0c0c0;
+  -webkit-box-shadow: 5px 5px 10px #c0c0c0;
+}
+
+#content #logging .jstree .selector a
+{
+  display: block;
+  padding: 2px;
+  width: auto;
+}
 
-#content #logging .jstree .loglevel a
+#content #logging .jstree .selector .close
 {
-    display: block;
+  display: none;
 }
 
-#content #logging .jstree .loglevel .effective_level
+#content #logging .jstree .open .selector .close
 {
-    height: 22px;
-    line-height: 22px;
-    padding-left: 5px;
-    width: 150px;
+  background-image: url( ../../img/ico/cross-0.png );
+  background-position: 50% 50%;
+  display: block;
+  position: absolute;
+  right: -25px;
+  top: 0;
+  width: 20px;
 }
 
-#content #logging .jstree .loglevel.open .effective_level
+#content #logging .jstree .open .selector .close:hover
 {
-    background-color: #f0f0f0;
+  background-image: url( ../../img/ico/cross-1.png );
 }
 
-#content #logging .jstree .loglevel.open .effective_level
+#content #logging .jstree .open .selector .close span
 {
-    background-image: url( ../../img/ico/arrow-000-small.png );
-    background-position: 75px 50%;
+  display: none;
 }
 
-#content #logging .jstree .loglevel.open .effective_level span
+#content #logging .jstree .open .selector a.trigger
 {
-    background-image: none;
+  display: none;
 }
 
-#content #logging .jstree .loglevel ul
+#content #logging .jstree .selector ul
 {
-    background-color: #fff;
-    border: 1px solid #f0f0f0;
-    display: none;
-    position: absolute;
-    left: 100px;
-    top: 0;
+  display: none;
 }
 
-#content #logging .jstree .loglevel.open ul
+#content #logging .jstree .open .selector ul
 {
-    display: block;
+  display: block;
 }
 
-#content #logging .jstree .loglevel ul li
+#content #logging .jstree .selector ul li
 {
-    background-image: none;
-    line-height: auto;
-    margin-left: 0;
+  background: none;
+  margin-left: 0;
 }
 
-#content #logging .jstree .loglevel ul li a
+#content #logging .jstree .selector ul li a
 {
-    background-image: url( ../../img/ico/ui-radio-button-uncheck.png );
-    background-position: 2px 50%;
-    cursor: pointer;
-    display: block;
-    height: 22px;
-    line-height: 22px;
-    padding-left: 21px;
-    padding-right: 5px;
+  background-image: url( ../../img/ico/ui-radio-button-uncheck.png );
+  background-position: 2px 50%;
+  padding-left: 21px;
 }
 
-#content #logging .jstree .loglevel ul li.selected a
+#content #logging .jstree .selector ul li a.level
 {
-    background-image: url( ../../img/ico/ui-radio-button.png );
+  background-color: #f0f0f0;
 }
 
-#content #logging .jstree .loglevel ul li a:hover
+#content #logging .jstree .selector ul li a:hover
 {
-    background-color: #f8f8f8;
-    color: #008;
+  background-image: url( ../../img/ico/ui-radio-button.png );
 }
 
-#content #logging .jstree .loglevel ul li.unset
+#content #logging .jstree .selector li.unset
 {
-    border-top: 1px solid #f0f0f0;
+  border-top: 1px solid #f0f0f0;
 }
 
-#content #logging .jstree .loglevel ul li.unset a
+#content #logging .jstree .selector li.unset a
 {
-    background-image: url( ../../img/ico/cross-0.png );
-    background-position: 4px 50%;
-    padding-top: 3px;
-    padding-bottom: 3px;
+  background-image: url( ../../img/ico/cross-0.png );
+  background-position: 4px 50%;
 }
 
-#content #logging .jstree .loglevel ul li.unset a:hover
+#content #logging .jstree .selector li.unset a:hover
 {
-    background-image: url( ../../img/ico/cross-1.png );
-    color: #800;
+  background-image: url( ../../img/ico/cross-1.png );
+  color: #800;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/menu.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/menu.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/menu.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/menu.css Wed Mar  7 16:30:20 2012
@@ -1,219 +1,219 @@
 #menu-wrapper
 {
-    float: left;
-    width: 20%;
+  float: left;
+  width: 20%;
 }
 
 #menu p.loader
 {
-    background-position: 5px 50%;
-    color: #c0c0c0;
-    margin-top: 5px;
-    padding-left: 26px;
+  background-position: 5px 50%;
+  color: #c0c0c0;
+  margin-top: 5px;
+  padding-left: 26px;
 }
 
 #menu a
 {
-    display: block;
-    padding: 4px 2px;
+  display: block;
+  padding: 4px 2px;
 }
 
 #menu .active
 {
-    background-color: #fafafa;
+  background-color: #fafafa;
 }
 
 #menu p a
 {
-    background-position: 97% 50%;
-    background-image: url( ../../img/ico/status-offline.png );
-    padding-left: 5px;
-    padding-top: 5px;
-    padding-bottom: 5px;
+  background-position: 97% 50%;
+  background-image: url( ../../img/ico/status-offline.png );
+  padding-left: 5px;
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
 
 #menu p a:hover
 {
-    background-color: #f0f0f0;
+  background-color: #f0f0f0;
 }
 
 #menu .active p a
 {
-    background-color: #c0c0c0; /* #a5a5a6 */
-    font-weight: bold;
+  background-color: #c0c0c0; /* #a5a5a6 */
+  font-weight: bold;
 }
 
 #menu p a small
 {
-    color: #b5b5b5;
-    font-weight: normal;
+  color: #b5b5b5;
+  font-weight: normal;
 }
 
 #menu p a small span.txt
 {
-    display: none;
+  display: none;
 }
 
 #menu p a small:hover span.txt
 {
-    display: inline;
+  display: inline;
 }
 
 #menu .busy
 {
-    border-right-color: #f6f5d9;
+  border-right-color: #f6f5d9;
 }
 
 #menu .busy p a
 {
-    background-color: #f6f5d9;
-    background-image: url( ../../img/ico/status-away.png );
+  background-color: #f6f5d9;
+  background-image: url( ../../img/ico/status-away.png );
 }
 
 #menu .offline
 {
-    border-right-color: #eccfcf;
+  border-right-color: #eccfcf;
 }
 
 #menu .offline p a
 {
-    background-color: #eccfcf;
-    background-image: url( ../../img/ico/status-busy.png );
+  background-color: #eccfcf;
+  background-image: url( ../../img/ico/status-busy.png );
 }
 
 #menu .online
 {
-    border-right-color: #cfecd3;
+  border-right-color: #cfecd3;
 }
 
 #menu .online p a
 {
-    background-color: #cfecd3;
-    background-image: url( ../../img/ico/status.png );
+  background-color: #cfecd3;
+  background-image: url( ../../img/ico/status.png );
 }
 
 #menu .ping small
 {
-    color: #000
+  color: #000
 }
 
 #menu li
 {
-    border-bottom: 1px solid #c0c0c0;
+  border-bottom: 1px solid #c0c0c0;
 }
 
 #menu li p
 {
-    border-right: 1px solid #c0c0c0;
+  border-right: 1px solid #c0c0c0;
 }
 
 #menu li.optional
 {
-    display: none;
+  display: none;
 }
 
 #menu li.active:last-child
 {
-    border-bottom: 0;
+  border-bottom: 0;
 }
 
 #menu ul ul
 {
-    background-image: url( ../../img/div.gif );
-    background-position: 100% 0;
-    background-repeat: repeat-y;
-    display: none;
-    padding-top: 5px;
-    padding-bottom: 10px;
+  background-image: url( ../../img/div.gif );
+  background-position: 100% 0;
+  background-repeat: repeat-y;
+  display: none;
+  padding-top: 5px;
+  padding-bottom: 10px;
 }
 
 #menu ul .active ul
 {
-    display: block;
+  display: block;
 }
 
 #menu ul li.active:last-child ul
 {
-    border-bottom: 1px solid #f0f0f0;
+  border-bottom: 1px solid #f0f0f0;
 }
 
 #menu ul ul li
 {
-    border-bottom: 0;
-    /*border-right: 0;*/
-    border-right: 1px solid #f0f0f0;
+  border-bottom: 0;
+  /*border-right: 0;*/
+  border-right: 1px solid #f0f0f0;
 }
 
 #menu ul ul li a
 {
-    background-position: 7px 50%;
-    border-bottom: 1px solid #f0f0f0;
-    color: #bbb;
-    margin-left: 15px;
-    padding-left: 26px;
+  background-position: 7px 50%;
+  border-bottom: 1px solid #f0f0f0;
+  color: #bbb;
+  margin-left: 15px;
+  padding-left: 26px;
 }
 
 #menu ul ul li:last-child a
 {
-    border-bottom: 0;
+  border-bottom: 0;
 }
 
 #menu ul ul li a:hover
 {
-    background-color: #f0f0f0;
-    color: #333;
+  background-color: #f0f0f0;
+  color: #333;
 }
 
 #menu ul ul li.active
 {
-    background-color: #fff;
-    border-right-color: #fff;
+  background-color: #fff;
+  border-right-color: #fff;
 }
 
 #menu ul ul li.active a
 {
-    color: #333;
+  color: #333;
 }
 
 #menu ul ul li.active a:hover
 {
-    background-color: transparent;
+  background-color: transparent;
 }
 
 #menu .global p a
 {
-    background-position: 5px 50%;
-    padding-left: 26px;
+  background-position: 5px 50%;
+  padding-left: 26px;
 }
 
 #menu #index p a
 {
-    background-image: url( ../../img/ico/dashboard.png );
+  background-image: url( ../../img/ico/dashboard.png );
 }
 
 #menu #logging p a
 {
-    background-image: url( ../../img/ico/inbox-document-text.png );
+  background-image: url( ../../img/ico/inbox-document-text.png );
 }
 
 #menu #java-properties p a
 {
-    background-image: url( ../../img/ico/jar.png );
+  background-image: url( ../../img/ico/jar.png );
 }
 
 #menu #threads p a
 {
-    background-image: url( ../../img/ico/ui-accordion.png );
+  background-image: url( ../../img/ico/ui-accordion.png );
 }
 
 #menu #cores p a
 {
-    background-image: url( ../../img/ico/databases.png );
+  background-image: url( ../../img/ico/databases.png );
 }
 
 #menu #cloud p a
 {
-    background-image: url( ../../img/ico/network-cloud.png );
+  background-image: url( ../../img/ico/network-cloud.png );
 }
 
 #menu .query a { background-image: url( ../../img/ico/magnifier.png ); }
@@ -230,13 +230,13 @@
 
 #menu .ping.error
 {
-    background-color: #f7f7e9;
-    background-color: #ffcccc;
+  background-color: #f7f7e9;
+  background-color: #ffcccc;
 }
 
 #menu .ping.error a
 {
-    background-color: transparent;
-    background-image: url( ../../img/ico/system-monitor--exclamation.png );
-    cursor: help;
+  background-color: transparent;
+  background-image: url( ../../img/ico/system-monitor--exclamation.png );
+  cursor: help;
 }
\ No newline at end of file

Modified: lucene/dev/trunk/solr/webapp/web/css/styles/plugins.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/plugins.css?rev=1298010&r1=1298009&r2=1298010&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/plugins.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/plugins.css Wed Mar  7 16:30:20 2012
@@ -1,19 +1,19 @@
 #content #plugins #navigation
 {
-    background-image: url( ../../img/div.gif );
-    background-position: 100% 0;
-    background-repeat: repeat-y;
-    width: 20%;
+  background-image: url( ../../img/div.gif );
+  background-position: 100% 0;
+  background-repeat: repeat-y;
+  width: 20%;
 }
 
 #content #plugins #navigation a
 {
-    background-position: 0 50%;
-    border-right: 1px solid #f0f0f0;
-    display: block;
-    margin-left: 1px;
-    padding: 3px 0;
-    padding-left: 21px;
+  background-position: 0 50%;
+  border-right: 1px solid #f0f0f0;
+  display: block;
+  margin-left: 1px;
+  padding: 3px 0;
+  padding-left: 21px;
 }
 
 #content #plugins #navigation .cache a { background-image: url( ../../img/ico/disk-black.png ); }
@@ -25,104 +25,104 @@
 
 #content #plugins #navigation a:hover
 {
-    background-color: #fafafa;
+  background-color: #fafafa;
 }
 
 #content #plugins #navigation .current a
 {
-    background-color: #fff;
-    border-right-color: #fff;
-    border-top: 1px solid #f0f0f0;
-    border-bottom: 1px solid #f0f0f0;
-    font-weight: bold;
+  background-color: #fff;
+  border-right-color: #fff;
+  border-top: 1px solid #f0f0f0;
+  border-bottom: 1px solid #f0f0f0;
+  font-weight: bold;
 }
 
 #content #plugins #frame
 {
-    float: right;
-    width: 78%;
+  float: right;
+  width: 78%;
 }
 
 #content #plugins #frame .entry
 {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
 #content #plugins #frame .entry:last-child
 {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 
 #content #plugins #frame .entry a
 {
-    background-image: url( ../../img/ico/chevron-small-expand.png );
-    background-position: 0 50%;
-    display: block;
-    font-weight: bold;
-    padding-left: 21px;
+  background-image: url( ../../img/ico/chevron-small-expand.png );
+  background-position: 0 50%;
+  display: block;
+  font-weight: bold;
+  padding-left: 21px;
 }
 
 #content #plugins #frame .entry.expanded a
 {
-    background-image: url( ../../img/ico/chevron-small.png );
+  background-image: url( ../../img/ico/chevron-small.png );
 }
 
 #content #plugins #frame .entry.expanded ul
 {
-    display: block;
+  display: block;
 }
 
 #content #plugins #frame .entry ul
 {
-    display: none;
-    padding-top: 5px;
-    margin-left: 21px;
+  display: none;
+  padding-top: 5px;
+  margin-left: 21px;
 }
 
 #content #plugins #frame .entry li
 {
-    padding-top: 2px;
-    padding-bottom: 2px;
+  padding-top: 2px;
+  padding-bottom: 2px;
 }
 
 #content #plugins #frame .entry li.stats
 {
-    border-top: 1px solid #c0c0c0;
-    margin-top: 5px;
-    padding-top: 5px;
+  border-top: 1px solid #c0c0c0;
+  margin-top: 5px;
+  padding-top: 5px;
 }
 
 #content #plugins #frame .entry li.odd
 {
-    background-color: #f8f8f8;
+  background-color: #f8f8f8;
 }
 
 #content #plugins #frame .entry dt,
 #content #plugins #frame .entry .stats span
 {
-    float: left;
-    width: 11%;
+  float: left;
+  width: 11%;
 }
 
 #content #plugins #frame .entry dd,
 #content #plugins #frame .entry .stats ul
 {
-    float: right;
-    width: 88%;
+  float: right;
+  width: 88%;
 }
 
 #content #plugins #frame .entry .stats ul
 {
-    margin: 0;
-    padding: 0;
+  margin: 0;
+  padding: 0;
 }
 
 #content #plugins #frame .entry .stats dt
 {
-    width: 27%;
+  width: 27%;
 }
 
 #content #plugins #frame .entry .stats dd
 {
-    width: 72%;
+  width: 72%;
 }
\ No newline at end of file