You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/12/19 18:48:57 UTC
svn commit: r1552377 [15/15] - in /lucene/dev/branches/lucene5339: ./
dev-tools/ dev-tools/idea/.idea/ dev-tools/idea/.idea/libraries/
dev-tools/idea/lucene/benchmark/src/ dev-tools/idea/lucene/demo/
dev-tools/idea/lucene/facet/ dev-tools/idea/solr/con...
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/common.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/common.css?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/common.css (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/common.css Thu Dec 19 17:48:47 2013
@@ -606,6 +606,12 @@ pre.syntax .tex .formula
background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px;
}
+#content .tree a.active
+{
+ background-color: #f0f0f0;
+ color: #00f;
+}
+
#content .tree a .jstree-icon
{
background-image: url( ../../img/ico/folder.png );
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/logging.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/logging.css?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/logging.css (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/logging.css Thu Dec 19 17:48:47 2013
@@ -41,12 +41,48 @@ limitations under the License.
position: relative;
}
+#content #logging #viewer time
+{
+ white-space: pre;
+}
+
+#content #logging #viewer #footer
+{
+ margin-top: 20px;
+}
+
#content #logging #viewer #state
{
background-position: 0 50%;
+ float: left;
color: #c0c0c0;
- margin-top: 20px;
padding-left: 21px;
+ width: 45%;
+}
+
+#content #logging #viewer #date-format
+{
+ float: right;
+}
+
+#content #logging #viewer #date-format a
+{
+ background-image: url( ../../img/ico/ui-check-box-uncheck.png );
+ background-position: 0 50%;
+ color: #c0c0c0;
+ display: block;
+ padding-left: 21px;
+}
+
+#content #logging #viewer #date-format a:hover
+{
+ color: #008;
+}
+
+#content #logging #viewer #date-format a.on
+{
+ background-image: url( ../../img/ico/ui-check-box.png );
+ color: #333;
}
#content #logging #viewer table
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/menu.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/menu.css?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/menu.css (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/css/styles/menu.css Thu Dec 19 17:48:47 2013
@@ -271,10 +271,9 @@ limitations under the License.
#core-menu .overview a { background-image: url( ../../img/ico/home.png ); }
#core-menu .query a { background-image: url( ../../img/ico/magnifier.png ); }
-#core-menu .schema a { background-image: url( ../../img/ico/table.png ); }
-#core-menu .config a { background-image: url( ../../img/ico/gear.png ); }
#core-menu .analysis a { background-image: url( ../../img/ico/funnel.png ); }
#core-menu .documents a { background-image: url( ../../img/ico/documents-stack.png ); }
+#core-menu .files a { background-image: url( ../../img/ico/folder.png ); }
#core-menu .schema-browser a { background-image: url( ../../img/ico/book-open-text.png ); }
#core-menu .replication a { background-image: url( ../../img/ico/node.png ); }
#core-menu .distribution a { background-image: url( ../../img/ico/node-select.png ); }
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/js/lib/jquery.ajaxfileupload.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/js/lib/jquery.ajaxfileupload.js?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/js/lib/jquery.ajaxfileupload.js (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/js/lib/jquery.ajaxfileupload.js Thu Dec 19 17:48:47 2013
@@ -149,6 +149,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOU
// with uninit() later, to allow updating that settings
if ($element.data('ajaxUploader-setup') === true) return;
+ /*
$element.change(function () {
// since a new image was selected, reset the marker
uploading_file = false;
@@ -159,6 +160,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOU
upload_file();
}
});
+ //*/
if (settings.submit_button == null) {
// do nothing
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/js/main.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/js/main.js?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/js/main.js (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/js/main.js Thu Dec 19 17:48:47 2013
@@ -40,7 +40,7 @@ require
'lib/order!scripts/documents',
'lib/order!scripts/dataimport',
'lib/order!scripts/dashboard',
- 'lib/order!scripts/file',
+ 'lib/order!scripts/files',
'lib/order!scripts/index',
'lib/order!scripts/java-properties',
'lib/order!scripts/logging',
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/js/require.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/js/require.js?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/js/require.js (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/js/require.js Thu Dec 19 17:48:47 2013
@@ -9388,7 +9388,8 @@ jQuery.extend({
return this;
},
- url : s.url
+ url : s.url,
+ data : s.data
};
// Callback for when everything is done
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/analysis.js?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/analysis.js Thu Dec 19 17:48:47 2013
@@ -355,32 +355,18 @@ sammy.get
if( 0 !== type_length )
{
var global_elements_count = 0;
- for( var i = 0; i < analysis_data[type].length; i += 2 )
+ if( 'string' === typeof analysis_data[type][1] )
{
- if( 'string' === typeof analysis_data[type][i+1] )
- {
- analysis_data[type][i+1] = [{ 'text': analysis_data[type][i+1] }]
- }
-
- var tmp = {};
- var cols = analysis_data[type][i+1].filter
- (
- function( obj )
- {
- var obj_position = obj.position || 0;
- if( !tmp[obj_position] )
- {
- tmp[obj_position] = true;
- return true;
- }
-
- return false;
- }
- );
+ analysis_data[type][1] = [{ 'text': analysis_data[type][1] }]
+ }
- global_elements_count = Math.max( global_elements_count, cols.length );
+ var c = analysis_data[type][1].length;
+ for( var i = 0; i < c; i++ )
+ {
+ global_elements_count = Math.max( analysis_data[type][1][i].position || 0, global_elements_count );
}
+
var content = '<div class="' + type + '">' + "\n";
content += '<table border="0" cellspacing="0" cellpadding="0">' + "\n";
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/app.js?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/app.js Thu Dec 19 17:48:47 2013
@@ -364,14 +364,13 @@ var solr_admin = function( app_config )
//Keep this in alphabetical order after the overview
'<li class="overview"><a href="#/' + core_name + '"><span>Overview</span></a></li>' + "\n" +
'<li class="analysis"><a href="#/' + core_name + '/analysis"><span>Analysis</span></a></li>' + "\n" +
- '<li class="config"><a href="#/' + core_name + '/config"><span>Config</span></a></li>' + "\n" +
'<li class="dataimport"><a href="#/' + core_name + '/dataimport"><span>Dataimport</span></a></li>' + "\n" +
'<li class="documents"><a href="#/' + core_name + '/documents"><span>Documents</span></a></li>' + "\n" +
+ '<li class="files"><a href="#/' + core_name + '/files"><span>Files</span></a></li>' + "\n" +
'<li class="ping"><a rel="' + that.config.solr_path + '/' + core_name + '/admin/ping"><span>Ping</span></a></li>' + "\n" +
'<li class="plugins"><a href="#/' + core_name + '/plugins"><span>Plugins / Stats</span></a></li>' + "\n" +
'<li class="query"><a href="#/' + core_name + '/query"><span>Query</span></a></li>' + "\n" +
'<li class="replication"><a href="#/' + core_name + '/replication"><span>Replication</span></a></li>' + "\n" +
- '<li class="schema"><a href="#/' + core_name + '/schema"><span>Schema</span></a></li>' + "\n" +
'<li class="schema-browser"><a href="#/' + core_name + '/schema-browser"><span>Schema Browser</span></a></li>'
)
.show();
Modified: lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/logging.js?rev=1552377&r1=1552376&r2=1552377&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/logging.js (original)
+++ lucene/dev/branches/lucene5339/solr/webapp/web/js/scripts/logging.js Thu Dec 19 17:48:47 2013
@@ -16,6 +16,7 @@
*/
var loglevel_path = app.config.solr_path + '/admin/info/logging';
+var cookie_logging_timezone = 'logging_timezone';
var frame_element = null;
var logging_handler = function( response, text_status, xhr )
@@ -253,10 +254,17 @@ var logging_handler = function( response
};
+var format_time_options = {};
+
var format_time = function( time )
{
time = time ? new Date( time ) : new Date();
- return '<abbr title="' + time.toLocaleString().esc() + '">' + time.toTimeString().split( ' ' ).shift().esc() + '</abbr>';
+ return '<time datetime="' + time.toISOString().esc() + '">' + format_time_content( time ) + '</abbr>';
+}
+
+var format_time_content = function( time )
+{
+ return time.toLocaleString( undefined, format_time_options ).esc();
}
var load_logging_viewer = function()
@@ -423,7 +431,7 @@ sammy.get
'<table border="0" cellpadding="0" cellspacing="0">' + "\n" +
'<thead>' + "\n" +
'<tr>' + "\n" +
- '<th class="time">Time</th>' + "\n" +
+ '<th class="time">Time (<span>Local</span>)</th>' + "\n" +
'<th class="level">Level</th>' + "\n" +
'<th class="logger">Logger</th>' + "\n" +
'<th class="message">Message</th>' + "\n" +
@@ -435,7 +443,10 @@ sammy.get
'</tr>' + "\n" +
'</thead>' + "\n" +
'</table>' + "\n" +
- '<div id="state" class="loader"> </div>' + "\n" +
+ '<div id="footer" class="clearfix">' + "\n" +
+ '<div id="state" class="loader"> </div>' + "\n" +
+ '<div id="date-format"><a>Show dates in UTC</a></div>' + "\n" +
+ '</div>' + "\n" +
'</div>'
);
@@ -475,6 +486,52 @@ sammy.get
return false;
}
);
+
+ var date_format = $( '#date-format a', frame_element );
+
+ date_format
+ .off( 'click' )
+ .on
+ (
+ 'click',
+ function( event )
+ {
+ var self = $( this );
+
+ if( !self.hasClass( 'on' ) )
+ {
+ self.addClass( 'on' );
+ $( 'table th.time span', frame_element ).text( 'UTC' );
+ format_time_options.timeZone = 'UTC';
+ $.cookie( cookie_logging_timezone, 'UTC' );
+ }
+ else
+ {
+ self.removeClass( 'on' );
+ $( 'table th.time span', frame_element ).text( 'Local' );
+ delete format_time_options.timeZone;
+ $.cookie( cookie_logging_timezone, null );
+ }
+
+ $( 'time', frame_element )
+ .each
+ (
+ function( index, element )
+ {
+ var self = $( element );
+ self.text( format_time_content( new Date( self.attr( 'datetime' ) ) ) );
+ }
+ )
+
+ return false;
+ }
+ );
+
+ if( 'UTC' === $.cookie( cookie_logging_timezone ) )
+ {
+ date_format
+ .trigger( 'click' );
+ }
}
);
}