felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvalc...@apache.org
Subject svn commit: r926960 - in /felix/trunk/webconsole-plugins/event/src/main/resources/res: events.html ui/events.css ui/events.js
Date Wed, 24 Mar 2010 07:34:38 GMT
Author: vvalchev
Date: Wed Mar 24 07:34:38 2010
New Revision: 926960

URL: http://svn.apache.org/viewvc?rev=926960&view=rev
Log:
Resolved FELIX-2232 /Event plugin has problems displaying events with properties/

Modified:
    felix/trunk/webconsole-plugins/event/src/main/resources/res/events.html
    felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.css
    felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.js

Modified: felix/trunk/webconsole-plugins/event/src/main/resources/res/events.html
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/event/src/main/resources/res/events.html?rev=926960&r1=926959&r2=926960&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/event/src/main/resources/res/events.html (original)
+++ felix/trunk/webconsole-plugins/event/src/main/resources/res/events.html Wed Mar 24 07:34:38
2010
@@ -35,3 +35,9 @@ var i18n = {
 </table>
 
 <div id="timeline" class="ui-helper-hidden">&nbsp;</div>
+<div id="timelineLegend" class="ui-helper-hidden">
+	<span class="event eventservice">Service Event</span>
+	<span class="event eventbundle">Bundle Event</span>
+	<span class="event eventconfig">Config Event</span>
+	<span class="event eventframework">Framework Event</span>
+</div>

Modified: felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.css
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.css?rev=926960&r1=926959&r2=926960&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.css (original)
+++ felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.css Wed Mar 24 07:34:38
2010
@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 #timeline          { width: 100%; overflow-x: scroll }
+#timelineLegend .event { display: inline-block; width: 12em; margin: .2em 0; text-align:
center }
 .event                 { overflow:visible; white-space:nowrap }
 .eventservice { background-color: #ADFF2F }
 .eventbundle   { background-color: #FFCACD }
 .eventconfig   { background-color: #FFD700 }
 .eventframework { background-color: #DCDCDC }
 
-.propName { padding: 0 4px 0 0 }
-.propVal   { padding: 0 0 0 4px }
\ No newline at end of file
+table.propTable, table.propTable tr, table.propTable td { border: none !important }
+td.propName { padding: 0 4px 0 0; text-align: right !important; text-decoration: underline
}
+td.propVal   { padding: 0 0 0 4px }
\ No newline at end of file

Modified: felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.js
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.js?rev=926960&r1=926959&r2=926960&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.js (original)
+++ felix/trunk/webconsole-plugins/event/src/main/resources/res/ui/events.js Wed Mar 24 07:34:38
2010
@@ -51,30 +51,30 @@ function entry( /* Object */ dataEntry )
     if ( dataEntry.info ) {
     	propE = text(dataEntry.info);
     } else {
-	    var propE = createElement('table', 'nicetable');
 	    var bodyE = createElement('tbody');
-	    propE.appendChild(bodyE);
-	
 	    for( var p in dataEntry.properties ) {
 	    	bodyE.appendChild(tr(null, null, [ 
-				td(null, 'propName', [text(p)]),
-				td(null, 'propVal', [text(dataEntry.properties[p])])
+				td('propName', null, [text(p)]),
+				td('propVal' , null, [text(dataEntry.properties[p])])
 			]));
 	    }
+	    propE = createElement('table', 'propTable', null, [ bodyE ]);
     }
 
 	$(tr( null, { id: 'entry' + dataEntry.id }, [
 		td( null, null, [ text( printDate(dataEntry.received) ) ] ),
 		td( null, null, [ text( dataEntry.topic ) ] ),
-		propE
+		td( null, null, [ propE ] )
 	])).appendTo(eventsBody);
 }
 
 var timeline = false;
+var timelineLegend = false;
 $(document).ready(function(){
 	eventsTable = $('#eventsTable');
 	eventsBody  = eventsTable.find('tbody');
 	timeline = $('#timeline');
+	timelineLegend = $('#timelineLegend');
 
 	$('#clear').click(function () {
 		$.post(pluginRoot, { 'action':'clear' }, renderData, 'json');
@@ -84,15 +84,16 @@ $(document).ready(function(){
 		if (timelineHidden) {
 			$(this).text(i18n.displayList);
 			timeline.removeClass('ui-helper-hidden');
+			timelineLegend.removeClass('ui-helper-hidden');
 			eventsTable.addClass('ui-helper-hidden');
 		} else {
 			$(this).text(i18n.displayTimeline);
 			timeline.addClass('ui-helper-hidden');
+			timelineLegend.addClass('ui-helper-hidden');
 			eventsTable.removeClass('ui-helper-hidden');
 		}
 	});
 	$('#reload').click(function() {
 		$.get(pluginRoot + '/data.json', null, renderData, 'json');
-		//renderData(eventData);
 	}).click();
 });



Mime
View raw message