svn commit: r1707042 [11/11] - in /ofbiz/trunk: ./ framework/base/lib/ specialpurpose/lucene/lib/ specialpurpose/lucene/src/org/ofbiz/content/search/ specialpurpose/lucene/src/org/ofbiz/content/test/ specialpurpose/runtime/ specialpurpose/runtime/index...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1707042 [11/11] - in /ofbiz/trunk: ./ framework/base/lib/ specialpurpose/lucene/lib/ specialpurpose/lucene/src/org/ofbiz/content/search/ specialpurpose/lucene/src/org/ofbiz/content/test/ specialpurpose/runtime/ specialpurpose/runtime/index...

shijh
Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/files.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/files.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/files.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/files.js Tue Oct  6 12:48:53 2015
@@ -103,6 +103,7 @@ sammy.get
                           data: {
                             title : file,
                             attr : {
+                              title : file,
                               href : '#/' + current_core + '/files?file=' + prefix + file
                             }
                           },
@@ -161,7 +162,7 @@ sammy.get
 
           var endpoint = file_endpoint + '?file=' + selected_file;
 
-          var content_type_map = { xml : 'text/xml', html : 'text/html', js : 'text/javascript' };
+          var content_type_map = { xml : 'text/xml', html : 'text/html', js : 'text/javascript', json : 'application/json', 'css' : 'text/css' };
           var file_ext = selected_file.match( /\.(\w+)$/  );
           endpoint += '&contentType=' + ( content_type_map[ file_ext[1] || '' ] || 'text/plain' ) + ';charset=utf-8';
 
@@ -209,6 +210,14 @@ sammy.get
                   {
                     highlight = 'javascript';
                   }
+                  else if( 0 === content_type.indexOf( 'text/css' ) )
+                  {
+                    highlight = 'css';
+                  }
+                  else if( 0 === content_type.indexOf( 'application/json' ) )
+                  {
+                    highlight = 'json';
+                  }
 
                   var code = $(
                     '<pre class="syntax' + ( highlight ? ' language-' + highlight : '' )+ '"><code>' +
@@ -228,6 +237,10 @@ sammy.get
                 },
                 error : function( xhr, text_status, error_thrown)
                 {
+                  /** OFBiz customization **/
+                  if (error_thrown == "Unauthorized" || error_thrown == "Forbidden") {
+                    context.redirect( 'control/checkLogin' );
+                  }
                   $( '.view-file .response', this )
                     .text( 'No such file exists.' );
                 },
@@ -253,4 +266,4 @@ sammy.get
   {
     context.redirect( '#/' + context.params.splat[0] + '/files?file=' + this.active_core.attr( context.params.splat[1] ) );    
   }
-);
\ No newline at end of file
+);

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/index.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/index.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/index.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/index.js Tue Oct  6 12:48:53 2015
@@ -257,7 +257,7 @@ sammy.get
               .show();
           }
 
-          var commandLineArgs = app.dashboard_values['jvm']['jmx']['commandLineArgs'];
+          var commandLineArgs = app.dashboard_values['jvm']['jmx']['commandLineArgs'].sort().reverse();
           if( 0 !== commandLineArgs.length )
           {
             var cmd_arg_element = $( '.command_line_args dt', this );

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/java-properties.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/java-properties.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/java-properties.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/java-properties.js Tue Oct  6 12:48:53 2015
@@ -103,4 +103,4 @@ sammy.get
       }
     );
   }
-);
\ No newline at end of file
+);

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/logging.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/logging.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/logging.js Tue Oct  6 12:48:53 2015
@@ -361,6 +361,7 @@ var load_logging_viewer = function()
           content += '<tr class="' + classes.join( ' ' ) + '">' + "\n";
             content += '<td class="span"><a><span>' + format_time( doc.time ) + '</span></a></td>' + "\n";
             content += '<td class="level span"><a><span>' + doc.level.esc() + '</span></span></a></td>' + "\n";
+            content += '<td class="span"><a><span>' + doc.core   + '</span></a></td>' + "\n";
             content += '<td class="span"><a><span>' + doc.logger + '</span></a></td>' + "\n";
             content += '<td class="message span"><a><span>' + doc.message.replace( /,/g, ',&#8203;' ).esc() + '</span></a></td>' + "\n";
           content += '</tr>' + "\n";
@@ -433,6 +434,7 @@ sammy.get
                   '<tr>' + "\n" +
                     '<th class="time">Time (<span>Local</span>)</th>' + "\n" +
                     '<th class="level">Level</th>' + "\n" +
+                    '<th class="core">Core</th>' + "\n" +
                     '<th class="logger">Logger</th>' + "\n" +
                     '<th class="message">Message</th>' + "\n" +
                   '</tr>' + "\n" +
@@ -573,4 +575,4 @@ sammy.get
       }
     );
   }
-);
\ No newline at end of file
+);

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/ping.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/ping.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/ping.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/ping.js Tue Oct  6 12:48:53 2015
@@ -69,4 +69,4 @@ $( '.ping a', app.core_menu )
             
       return false;
     }
-  );
\ No newline at end of file
+  );

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/plugins.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/plugins.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/plugins.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/plugins.js Tue Oct  6 12:48:53 2015
@@ -235,21 +235,21 @@ var render_plugin_data = function( plugi
           }
 
           content += '<li><dl class="clearfix">' + "\n";
-          content += '<dt>' + detail_key + ':</dt>' + "\n";
+          content += '<dt>' + detail_key.esc() + ':</dt>' + "\n";
           if($.isArray(detail_value)) {
             $.each(detail_value, function(index, value) {
-              content += '<dd>' + value + '</dd>' + "\n";
+              content += '<dd>' + value.esc() + '</dd>' + "\n";
             });
           }
           else {
-            content += '<dd>' + detail_value + '</dd>' + "\n";
+            content += '<dd>' + new String( detail_value ).esc() + '</dd>' + "\n";
           }
           content += '</dl></li>' + "\n";
         }
         else if( 'stats' === detail_key && details[detail_key] )
         {
           content += '<li class="stats clearfix">' + "\n";
-          content += '<span>' + detail_key + ':</span>' + "\n";
+          content += '<span>' + detail_key.esc() + ':</span>' + "\n";
           content += '<ul>' + "\n";
 
           for( var stats_key in details[detail_key] )
@@ -258,8 +258,8 @@ var render_plugin_data = function( plugi
             stats_value = stats_value.replace( /([\(@])/g, '$1&#8203;' );
 
             content += '<li><dl class="clearfix">' + "\n";
-            content += '<dt>' + stats_key + ':</dt>' + "\n";
-            content += '<dd>' + stats_value + '</dd>' + "\n";
+            content += '<dt>' + stats_key.esc() + ':</dt>' + "\n";
+            content += '<dd>' + stats_value.esc() + '</dd>' + "\n";
             content += '</dl></li>' + "\n";
           }
 
@@ -282,7 +282,7 @@ var render_plugin_data = function( plugi
   var entry_count = entries.length;
   for( var i = 0; i < entry_count; i++ )
   {
-    $( 'a[data-bean="' + entries[i] + '"]', frame_element )
+    $( 'a[data-bean="' + entries[i].esc() + '"]', frame_element )
       .parent().addClass( 'expanded' );
   }
 

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/query.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/query.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/query.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/query.js Tue Oct  6 12:48:53 2015
@@ -226,4 +226,4 @@ sammy.get
       }
     );
   }
-);
\ No newline at end of file
+);

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/replication.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/replication.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/replication.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/replication.js Tue Oct  6 12:48:53 2015
@@ -76,7 +76,7 @@ var replication_fetch_status = function(
       {
         $( '.refresh-status span', navigation_element )
           .removeClass( 'loader' );
-                
+
         var data = response.details;
         var is_slave = 'true' === data.isSlave;
 
@@ -447,6 +447,11 @@ var replication_fetch_status = function(
       },
       error : function( xhr, text_status, error_thrown )
       {
+        /** OFBiz customization **/
+        if (error_thrown == "Unauthorized" || error_thrown == "Forbidden") {
+          $(location).attr( 'href', 'control/checkLogin' );
+        }
+
         $( '#content' )
           .html( 'sorry, no replication-handler defined!' );
       },
@@ -509,14 +514,33 @@ sammy.get
               }
               else if( command )
               {
-                $.get
+                /** OFBiz customization **/
+                $.ajax
                 (
-                  core_basepath + '/replication?command=' + command + '&wt=json',
-                  function()
                   {
-                    replication_fetch_status();
-                  }
-                );
+                    url : core_basepath + '/replication?command=' + command + '&wt=json',
+                    dataType : 'json',
+                    success : function ()
+                    {
+                     replication_fetch_status();
+                    },
+                    error : function( xhr, text_status, error_thrown )
+                    {
+                        /** OFBiz customization **/
+                        if (error_thrown == "Unauthorized" || error_thrown == "Forbidden") {
+                          context.redirect( 'control/checkLogin' );
+                        }
+                     }
+                   }
+                 );
+//                $.get
+//                (
+//                  core_basepath + '/replication?command=' + command + '&wt=json',
+//                  function()
+//                  {
+//                    replication_fetch_status();
+//                  }
+//                );
               }
               return false;
             }

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/schema-browser.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/schema-browser.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/schema-browser.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/schema-browser.js Tue Oct  6 12:48:53 2015
@@ -273,7 +273,7 @@ sammy.bind
         'types' : []
       }
 
-      $( 'option[value="' + params.route_params.path + '"]', related_select_element )
+      $( 'option[value="' + params.route_params.path.esc() + '"]', related_select_element )
         .attr( 'selected', 'selected' );
 
       related_select_element
@@ -596,7 +596,7 @@ sammy.bind
                     {
                       fields.push
                       (
-                        '<option value="?field=' + field_name + '">' + field_name + '</option>'
+                        '<option value="?field=' + field_name.esc() + '">' + field_name.esc() + '</option>'
                       );
                     }
                     if( 0 !== fields.length )
@@ -612,7 +612,7 @@ sammy.bind
                     {
                       dynamic_fields.push
                       (
-                        '<option value="?dynamic-field=' + type_name + '">' + type_name + '</option>'
+                        '<option value="?dynamic-field=' + type_name.esc() + '">' + type_name.esc() + '</option>'
                       );
                     }
                     if( 0 !== dynamic_fields.length )
@@ -628,7 +628,7 @@ sammy.bind
                     {
                       types.push
                       (
-                        '<option value="?type=' + type_name + '">' + type_name + '</option>'
+                        '<option value="?type=' + type_name.esc() + '">' + type_name.esc() + '</option>'
                       );
                     }
                     if( 0 !== types.length )

Added: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/segments.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/segments.js?rev=1707042&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/segments.js (added)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/segments.js Tue Oct  6 12:48:53 2015
@@ -0,0 +1,206 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+
+var get_tooltip = function( segment_response ) {
+    var tooltip =
+        '<div>Segment <b>' + segment_response.name + '</b>:</div>' +
+        '<div class="label">#docs:</div><div>' + number_format(segment_response.size) +'</div>' +
+        '<div class="label">#dels:</div><div>' + number_format(segment_response.delCount) + '</div>' +
+        '<div class="label">size:</div><div>' + number_format(segment_response.sizeInBytes) + ' bytes </div>' +
+        '<div class="label">age:</div><div>' + segment_response.age + '</div>' +
+        '<div class="label">source:</div><div>' + segment_response.source + '</div>';
+    return tooltip;
+};
+
+var get_entry = function( segment_response, segment_bytes_max ) {
+    //calcualte dimensions of graph
+    var dims = calculate_dimensions(segment_response.sizeInBytes,
+            segment_bytes_max, segment_response.size, segment_response.delCount)
+    //create entry for segment with given dimensions
+    var entry = get_entry_item(segment_response.name, dims,
+            get_tooltip(segment_response), (segment_response.mergeCandidate)?true:false);
+
+    return entry;
+};
+
+var get_entry_item = function(name, dims, tooltip, isMergeCandidate) {
+    var entry = '<li>' + "\n" +
+    '  <dl class="clearfix" style="width: ' + dims['size'] + '%;">' + "\n" +
+    '    <dt><div>' + name + '</div></dt>' + "\n" +
+    '    <dd>';
+    entry += '<div class="live' + ((isMergeCandidate)?' merge-candidate':'') +
+     '" style="width: ' + dims['alive_doc_size'] + '%;">&nbsp;</div>';
+    entry += '<div class="toolitp">' + tooltip +'</div>';
+      
+    if (dims['deleted_doc_size'] > 0.001) {
+     entry += '<div class="deleted" style="width:' + dims['deleted_doc_size']  
+     + '%;margin-left:' + dims['alive_doc_size'] + '%;">&nbsp;</div>';
+    }
+    entry += '</dd></dl></li>';
+    return entry;
+};
+
+var get_footer = function(deletions_count, documents_count) {
+    return '<li><dl><dt></dt><dd>Deletions: ' +
+        (documents_count == 0 ? 0 : round_2(deletions_count/documents_count * 100)) +
+            '% </dd></dl></li>';
+};
+
+var calculate_dimensions = function(segment_size_in_bytes, segment_size_in_bytes_max, doc_count, delete_doc_count) {
+    var segment_size_in_bytes_log = Math.log(segment_size_in_bytes);
+    var segment_size_in_bytes_max_log = Math.log(segment_size_in_bytes_max);
+
+    var dims = {};
+    //Normalize to 100% size of bar
+    dims['size'] = Math.floor((segment_size_in_bytes_log / segment_size_in_bytes_max_log ) * 100);
+    //Deleted doc part size
+    dims['deleted_doc_size'] = Math.floor((delete_doc_count/(delete_doc_count + doc_count)) * dims['size']);
+    //Alive doc part size
+    dims['alive_doc_size'] = dims['size'] - dims['deleted_doc_size'];
+
+    return dims;
+};
+
+var calculate_max_size_on_disk = function(segment_entries) {
+    var max = 0;
+    $.each(segment_entries, function(idx, obj) {
+        if (obj.sizeInBytes > max) {
+            max = obj.sizeInBytes;
+        }
+    });
+    return max;
+};
+
+var round_2 = function(num) {
+    return Math.round(num*100)/100;
+};
+
+var number_format = function(x) {
+    return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " ");
+};
+
+var prepare_x_axis = function(segment_bytes_max) {
+    var factor = 1024*1024; //for MB
+    
+    var segment_bytes_max_log = Math.log(segment_bytes_max);
+    
+    var series_entry = '<li>' + "\n" +
+    '  <dl class="clearfix" style="width:100%;">' + "\n" +
+    '    <dt><div>Size</div></dt>' + "\n" +
+    '    <dd>' +
+    '        <div class="start">0</div>';
+    var step = 0;
+    for (var j = 0; j < 3; j+=1) {
+            step += segment_bytes_max_log/4;
+            var step_value = number_format(Math.floor((Math.pow(Math.E, step))/factor))
+            series_entry += '<div class="w5">' + ((step_value > 0.001)?step_value : '&nbsp;')  + '</div>'
+    }
+    series_entry += '<div class="end">' + number_format(Math.floor(segment_bytes_max/factor)) + ' MB </div>' +
+    '    </dd>' +
+    '  </dl>' +
+    '</li>';
+    return series_entry;
+};
+
+// #/:core/admin/segments
+sammy.get
+(
+  new RegExp( app.core_regex_base + '\\/(segments)$' ),
+  function( context )
+  {
+    var core_basepath = this.active_core.attr( 'data-basepath' );
+    var content_element = $( '#content' );
+        
+    $.get
+    (
+      'tpl/segments.html',
+      function( template )
+      {
+        content_element.html( template );
+            
+        var segments_element = $('#segments', content_element);
+        var segments_reload = $( '#segments a.reload' );
+        var url_element = $('#url', segments_element);
+        var result_element = $('#result', segments_element);
+        var response_element = $('#response', result_element);
+        var segments_holder_element = $('.segments-holder', result_element);
+
+        segments_reload
+            .die( 'click' )
+            .live
+            (
+            'click',
+            function( event )
+            {
+                $.ajax
+                (
+                  {
+                    url : core_basepath +  '/admin/segments?wt=json',
+                    dataType : 'json',
+                    context: this,
+                    beforeSend : function( arr, form, options )
+                    {
+                      loader.show( this );    
+                    },
+                    success : function( response, text_status, xhr )
+                    {
+                        var segments_response = response['segments'],
+                            segments_entries = [],
+                            segment_bytes_max = calculate_max_size_on_disk( segments_response );
+
+                        //scale
+                        segments_entries.push( prepare_x_axis( segment_bytes_max ) );
+                        
+                        var documents_count = 0, deletions_count = 0;
+                        
+                        //elements
+                        $.each( segments_response, function( key, segment_response ) {
+                            segments_entries.push( get_entry( segment_response, segment_bytes_max ) );
+                            
+                            documents_count += segment_response.size;
+                           deletions_count += segment_response.delCount;
+                        });
+    
+                        //footer
+                        segments_entries.push( get_footer( deletions_count, documents_count ) );
+                        
+                        $( 'ul', segments_holder_element ).html( segments_entries.join("\n" ) );
+                    },
+                    error : function( xhr, text_status, error_thrown )
+                    {
+                      $( this )
+                        .attr( 'title', '/admin/segments is not configured (' + xhr.status + ': ' + error_thrown + ')' );
+
+                      $( this ).parents( 'li' )
+                        .addClass( 'error' );
+                    },
+                    complete : function( xhr, text_status )
+                    {
+                      loader.hide( this );
+                    }
+                  }
+                );
+              return false;
+            }
+          );
+        //initially submit
+        segments_reload.click();
+      }
+    );
+  }
+);

Propchange: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/segments.js
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/threads.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/threads.js?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/threads.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/scripts/threads.js Tue Oct  6 12:48:53 2015
@@ -155,4 +155,4 @@ sammy.get
       }
     );
   }
-);
\ No newline at end of file
+);

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/analysis.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/analysis.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/analysis.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/analysis.html Tue Oct  6 12:48:53 2015
@@ -80,4 +80,4 @@ limitations under the License.
 
   </div>
 
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cloud.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cloud.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cloud.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cloud.html Tue Oct  6 12:48:53 2015
@@ -50,6 +50,28 @@ limitations under the License.
         </ul>
       </div>
 
+      <div style="width: 100%; text-align: center;">
+        <div id="cloudGraphPaging">
+         <button id="cloudGraphPagingPrev">&lt; Previous</button>
+         <input id="cloudGraphPagingStart" type="hidden" name="start" />
+         <span id="cloudGraphPagingStatus"></span>&nbsp;
+         Filter by:&nbsp;<select id="cloudGraphPagingFilterType">
+           <option value="status">Status</option>
+           <option value="name">Name</option>
+         </select>&nbsp;
+         <select id="cloudGraphPagingStatusFilter">
+           <option value=""> - Any - </option>
+           <option value="healthy">Healthy</option>
+           <option value="degraded">Degraded</option>
+           <option value="downed_shard">Downed Shard</option>
+           <option value="recovering">Replica in Recovery</option>
+         </select>        
+         <input id="cloudGraphPagingFilter" type="text" size="10" name="filter" />&nbsp;
+         Show <input id="cloudGraphPagingRows" type="text" size="2" name="rows" /> per page.
+         <button id="cloudGraphPagingNext">Next &gt;</button>
+        </div>
+      </div>
+
     </div>
 
   </div>
@@ -62,4 +84,4 @@ limitations under the License.
     <pre class="debug"></pre>
   </div>
 
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cores.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cores.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cores.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/cores.html Tue Oct  6 12:48:53 2015
@@ -223,4 +223,4 @@ limitations under the License.
   
   </div>
 
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dashboard.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dashboard.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dashboard.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dashboard.html Tue Oct  6 12:48:53 2015
@@ -33,8 +33,8 @@ limitations under the License.
           <dt class="index_last-modified">Last Modified:</dt>
             <dd class="index_last-modified value timeago"></dd>
 
-          <dt class="index_num-docs">Num Docs:</dt>
-            <dd class="index_num-docs value"></dd>
+          <dt class="index_num-doc">Num Docs:</dt>
+            <dd class="index_num-doc value"></dd>
 
           <dt class="index_max-doc">Max Doc:</dt>
             <dd class="index_max-doc value"></dd>
@@ -42,8 +42,8 @@ limitations under the License.
           <dt class="index_heap-usage-bytes">Heap Memory Usage:</dt>
             <dd class="index_heap-usage-bytes value"></dd>
 
-          <dt class="index_deleted-docs">Deleted Docs:</dt>
-            <dd class="index_deleted-docs value"></dd>
+          <dt class="index_deleted-doc">Deleted Docs:</dt>
+            <dd class="index_deleted-doc value"></dd>
 
           <dt class="index_version">Version:</dt>
             <dd class="index_version value"></dd>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dataimport.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dataimport.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dataimport.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/dataimport.html Tue Oct  6 12:48:53 2015
@@ -180,4 +180,4 @@ limitations under the License.
   
   </div>
 
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/documents.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/documents.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/documents.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/documents.html Tue Oct  6 12:48:53 2015
@@ -104,4 +104,4 @@
     </div>
 
   </div>
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/files.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/files.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/files.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/files.html Tue Oct  6 12:48:53 2015
@@ -41,4 +41,4 @@ limitations under the License.
 
   </div>
 
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/index.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/index.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/index.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/index.html Tue Oct  6 12:48:53 2015
@@ -247,4 +247,4 @@ limitations under the License.
 
   </div>
 
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/query.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/query.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/query.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/query.html Tue Oct  6 12:48:53 2015
@@ -358,4 +358,4 @@ limitations under the License.
 
   </div>
 
-</div>
\ No newline at end of file
+</div>

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/schema-browser.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/schema-browser.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/schema-browser.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/schema-browser.html Tue Oct  6 12:48:53 2015
@@ -189,4 +189,4 @@ limitations under the License.
 
   </div>
 
-</div>
\ No newline at end of file
+</div>

Added: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/segments.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/segments.html?rev=1707042&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/segments.html (added)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/segments.html Tue Oct  6 12:48:53 2015
@@ -0,0 +1,49 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<div id="segments">
+ <div class="clearfix">
+
+ <div class="block fieldlist" id="statistics">
+
+ <h2><span>Segments</span></h2>
+ <a class="reload"><span>reload</span></a>
+
+ <div class="message-container">
+         <div class="message"></div>
+       </div>
+
+       <div class="content">      
+
+  <div id="result">
+
+    <div id="response">
+
+      <div class="segments-holder">
+
+         <ul></ul>
+
+       </div>
+    
+    </div>
+    
+ </div>
+       </div>
+ </div>
+
+ </div>
+
+</div>

Propchange: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/segments.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/threads.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/threads.html?rev=1707042&r1=1707041&r2=1707042&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/threads.html (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/tpl/threads.html Tue Oct  6 12:48:53 2015
@@ -53,4 +53,4 @@ limitations under the License.
     </a>
   </div>
 
-</div>
\ No newline at end of file
+</div>