svn commit: r1326355 - in /lucene/dev/trunk/solr/webapp/web: css/styles/logging.css js/scripts/logging.js

[st...@apache.org]

Author: steffkes
Date: Sun Apr 15 14:53:34 2012
New Revision: 1326355

URL: http://svn.apache.org/viewvc?rev=1326355&view=rev
Log:
SOLR-3356: Display Log-Framework- and slfj4-info on Logging-Tab

Modified:
    lucene/dev/trunk/solr/webapp/web/css/styles/logging.css
    lucene/dev/trunk/solr/webapp/web/js/scripts/logging.js

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=1326355&r1=1326354&r2=1326355&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/logging.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/logging.css Sun Apr 15 14:53:34 2012
@@ -4,6 +4,19 @@
   padding-left: 21px;
 }
 
+#content #logging .block h2
+{
+  background-image: url( ../../img/ico/document-text.png );
+  margin-bottom: 10px;
+}
+
+#content #logging .block h2 span span
+{
+  color: #c0c0c0;
+  font-weight: normal;
+  margin-left: 10px;
+}
+
 #content #logging .jstree > li
 {
   margin-left: 0;

Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/logging.js?rev=1326355&r1=1326354&r2=1326355&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/logging.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/logging.js Sun Apr 15 14:53:34 2012
@@ -116,10 +116,13 @@ var logging_handler = function( response
     return logger_content;
   };
 
-  var logger_content = logger_tree( null );
+  var logger_content = '<div class="block">' + "\n"
+                     + '<h2><span>' + response.framework.esc() + '<span>' + response.slfj4.esc() + '</span></span></h2>' + "\n"
+                     + '<ul class="tree jstree">' + logger_tree( null ) + '</ul>' + "\n"
+                     + '</div>';
 
   self
-    .html( '<ul class="tree jstree">' + logger_content + '</ul>' );
+    .html( logger_content );
 
   $( 'li:last-child', this )
     .addClass( 'jstree-last' );
@@ -136,9 +139,17 @@ var logging_handler = function( response
         {
           var selector = $( '.selector-holder', element.closest( 'li' ) );
 
-          $( 'a.trigger', selector )
+          var trigger = $( 'a.trigger', selector );
+
+          trigger
             .text( level.esc() );
 
+          if( element.hasClass( 'set' ) )
+          {
+            trigger.first()
+              .addClass( 'set' );
+          }
+
           $( 'ul a[data-level="' + level + '"]', selector ).first()
             .addClass( 'level' );
         }
@@ -217,8 +228,7 @@ sammy.get
   /^#\/~(logging)$/,
   function( context )
   {
-    var core_basepath = $( 'li[data-basepath]', app.menu_element ).attr( 'data-basepath' );
-    loglevel_path = core_basepath + '/admin/loglevel';
+    loglevel_path = app_config.solr_path + '/admin/loglevel';
     var content_element = $( '#content' );
         
     content_element