diff --git a/light9/collector/web/index.html b/light9/collector/web/index.html --- a/light9/collector/web/index.html +++ b/light9/collector/web/index.html @@ -7,6 +7,7 @@ + @@ -25,6 +26,10 @@ display: block; break-inside: avoid-column; } + h3 { + margin-top: 2px; + margin-bottom: 0; + } td.nonzero { background: #310202; color: #e25757; @@ -35,7 +40,7 @@ font-weight: bold; } -

{{label}}

+

@@ -58,11 +63,9 @@ properties: { graph: {type: Object, notify: true}, uri: {type: String, notify: true}, - label: {type: String, notify: true}, attrs: {type: Array, notify: true}, }, observers: [ - "setLabel(graph, uri)", "initUpdates(updates)", ], initUpdates: function(updates) { @@ -75,12 +78,6 @@ } }.bind(this)); }, - setLabel: function(graph, uri) { - this.label = uri.replace(/.*\//, ''); - graph.runHandler(function() { - this.label = graph.stringValue(uri, graph.Uri('rdfs:label')); - }.bind(this), 'setLabel'); - } }); }); diff --git a/light9/web/resource-display.html b/light9/web/resource-display.html --- a/light9/web/resource-display.html +++ b/light9/web/resource-display.html @@ -38,8 +38,8 @@ Polymer({ is: "resource-display", properties: { - graph: { type: Object, notify: true }, - uri: { type: String, notify: true }, + graph: { type: Object }, + uri: { type: String }, label: { type: String }, rename: { type: Boolean }, renameTo: { type: String, notify: true }, @@ -48,14 +48,18 @@ this.graph.runHandler(this.setLabel.bind(this), `label ${this.uri}`); }, setLabel: function() { + if (!this.uri) { + this.label = ""; + return; + } try { - this.label = this.graph.stringValue(this.uri, - this.graph.Uri('rdfs:label')); + this.label = this.graph.stringValue(this.uri, + this.graph.Uri('rdfs:label')); } catch(e) { this.label = null; } if (!this.label) { - this.label = this.uri || ""; + this.label = this.uri.replace(/.*\//, ''); } }, onRename: function() {
output attr