Progress on log viewer and other admin features

@@ -6498,7 +6498,7 @@ app:keyPropertiesFunctor
 
 app:keyPropertyVarName
       rdf:type spin:Function ;
-      rdfs:comment "Creates a SPARQL variable name from a property. The algorithm simply takes the qname and then replaces the : with 'VAR_'. Note that SPARQL variable names should not begin with '_' and therefore the default namespace would be mapped to a blank node otherwise."^^xsd:string ;
+      rdfs:comment "Creates a SPARQL variable name from a property. The algorithm simply takes the qname and then replaces the ':' with '_'."^^xsd:string ;
       rdfs:label "key property var name"^^xsd:string ;
       rdfs:subClassOf app:Functions ;
       spin:body
@@ -6510,7 +6510,7 @@ app:keyPropertyVarName
                                                         ]
                                               ] ;
                                       sp:arg2 ":" ;
-                                      sp:arg3 "VAR_"
+                                      sp:arg3 "_"
                                     ] ;
                             sp:varName "result"^^xsd:string
                           ]) ;

@@ -2,34 +2,32 @@
 		let:keyProperties="{= app:getKeyProperties(?type) }"
 		let:pagerId="{= ui:uniqueId() }"
 		let:tableId="{= ui:uniqueId() }">
-	<table id="{= ?tableId }" style="width: 100%"/>
+	<table id="{= ?tableId }"/>
 	<div id="{= ?pagerId }" />
 	<script>
 		$("#{= ?tableId }").jqGrid({
 			<swon:NameValuePair arg:name="url" arg:value="{= fn:concat('getSearchResults?', ?params) }" />,
             <swon:NameValuePair arg:name="datatype" arg:value="json" />,
             colNames:[
-                'Resource'
-                <ui:if ui:condition="{= bound(?keyProperties) }">,
+                <ui:if ui:condition="{= bound(?keyProperties) }">
              		<ui:forEach ui:resultSet="{# 
              				SELECT ?colName
              				WHERE {
              					GRAPH ui:graph {
              						?keyProperties (rdf:rest*)/rdf:first ?keyProperty .
-             						BIND (spif:titleCase(ui:label(?keyProperty) AS ?colName)) .
+             						BIND (spif:titleCase(ui:label(?keyProperty)) AS ?colName) .
              					}
              				}
              			}" ui:separator=",">
             			'{= ?colName }'
             		</ui:forEach>
             	</ui:if>
+            	<ui:else>
+            		'Resource'
+            	</ui:else>
             ],
             colModel:[
-                {
-                	name : 'result',
-                	width: 200
-                }
-                <ui:if ui:condition="{= bound(?keyProperties) }">,
+                <ui:if ui:condition="{= bound(?keyProperties) }">
 	         		<ui:forEach ui:resultSet="{# 
 		     				SELECT ?varName
 		     				WHERE {
@@ -44,6 +42,11 @@
 	            		}
 	    			</ui:forEach>
 	    		</ui:if>
+	    		<ui:else>
+	                {
+	                	name : 'label'
+	                }
+	    		</ui:else>
             ],
             rowNum: 10,
             rowList:[5,10,20],
@@ -51,7 +54,7 @@
             viewrecords: true,
             sortorder: "desc",
             height: "100%",
-            width: "500"
+            width: "100%"
         }).jqGrid('navGrid', '#{= ?pagerId }', { add:false, edit:false, del:false});
 	</script>
 </ui:group>
\ No newline at end of file

+# baseURI: http://www.reportinghub.no/examples/system/exampleLogEvents
+# imports: http://www.reportinghub.no/system/schema/logging
+
+@prefix :        <http://www.reportinghub.no/examples/system/exampleLogEvents#> .
+@prefix dcterms:  <http://purl.org/dc/terms/> .
+@prefix log:     <http://www.reportinghub.no/system/schema/logging#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix report:  <http://www.reportinghub.no/system/schema/reporting#> .
+@prefix sioc:    <http://rdfs.org/sioc/ns#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/examples/system/exampleLogEvents>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/system/schema/logging> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+log:FactPagesUpdateEvent_1
+      rdf:type log:FactPagesUpdateEvent ;
+      rdfs:label "Fact pages update event 1"^^xsd:string ;
+      dcterms:created "2011-11-11T00:00:00"^^xsd:dateTime ;
+      sioc:id "1"^^xsd:string ;
+      log:initiatedBy "system"^^xsd:string ;
+      log:onBehalfOf "system"^^xsd:string ;
+      log:outcome "success"^^xsd:string .
+
+log:PasswordChangeEvent_1
+      rdf:type log:PasswordChangeEvent ;
+      rdfs:label "Password change event 1"^^xsd:string ;
+      dcterms:created "2011-11-11T00:00:01"^^xsd:dateTime ;
+      sioc:id "2"^^xsd:string ;
+      log:initiatedBy "JohnDoe"^^xsd:string ;
+      log:onBehalfOf "Aldi"^^xsd:string ;
+      log:outcome "success"^^xsd:string .
+
+log:ReportDownloadEvent_1
+      rdf:type log:ReportDownloadEvent ;
+      rdfs:label "Report download event 1"^^xsd:string ;
+      dcterms:created "2011-11-13T00:00:00"^^xsd:dateTime ;
+      sioc:id "3"^^xsd:string ;
+      log:dateFrom "2011-07-21"^^xsd:date ;
+      log:dateTo "2011-07-21"^^xsd:date ;
+      log:initiatedBy "JohnDoe"^^xsd:string ;
+      log:onBehalfOf "Aldi"^^xsd:string ;
+      log:outcome "success"^^xsd:string ;
+      log:ownerId "123"^^xsd:string ;
+      log:reportType report:DDR ;
+      report:format report:HTMLFormat ;
+      report:wellBoreId "1024"^^xsd:string .
+
+log:ReportUploadEvent_1
+      rdf:type log:ReportUploadEvent ;
+      rdfs:label "Report upload event 1"^^xsd:string ;
+      dcterms:created "2011-11-14T00:00:00"^^xsd:dateTime ;
+      sioc:id "4"^^xsd:string ;
+      log:initiatedBy "JohnDoe"^^xsd:string ;
+      log:onBehalfOf "Aldi"^^xsd:string ;
+      log:outcome "success"^^xsd:string ;
+      log:reportType report:DDR ;
+      log:wellBoreName "XY-2"^^xsd:string ;
+      report:format report:HTMLFormat .
+
+log:ReportValidationEvent_1
+      rdf:type log:ReportValidationEvent ;
+      rdfs:label "Report validation event 1"^^xsd:string ;
+      dcterms:created "2011-11-14T00:00:00"^^xsd:dateTime ;
+      sioc:id "5"^^xsd:string ;
+      log:initiatedBy "JohnDoe"^^xsd:string ;
+      log:onBehalfOf "Aldi"^^xsd:string ;
+      log:outcome "user-error"^^xsd:string ;
+      log:reportType report:DDR .

@@ -36,17 +36,17 @@ log:LogEvent
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
                 owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty <http://rdfs.org/sioc/ns#id>
+                owl:onProperty rdfs:comment
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom xsd:string ;
+                owl:cardinality "1"^^xsd:nonNegativeInteger ;
                 owl:onProperty <http://rdfs.org/sioc/ns#id>
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty rdfs:comment
+                owl:allValuesFrom xsd:string ;
+                owl:onProperty <http://rdfs.org/sioc/ns#id>
               ] .
 
 log:PasswordChangeEvent
@@ -66,12 +66,12 @@ log:ReportDownloadEvent
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
                 owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId>
+                owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
                 owl:cardinality "1"^^xsd:nonNegativeInteger ;
-                owl:onProperty <http://www.reportinghub.no/system/schema/reporting#format>
+                owl:onProperty <http://www.reportinghub.no/system/schema/reporting#wellBoreId>
               ] .
 
 log:ReportEvent
@@ -110,14 +110,14 @@ log:initiatedBy
       rdf:type owl:DatatypeProperty ;
       rdfs:comment "The name of the user logged in."^^xsd:string ;
       rdfs:domain log:LogEvent ;
-      rdfs:label "initiated by"^^xsd:string ;
+      rdfs:label "user"^^xsd:string ;
       rdfs:range xsd:string .
 
 log:onBehalfOf
       rdf:type owl:DatatypeProperty ;
       rdfs:comment "The name of the company that the user has been logged in for."^^xsd:string ;
       rdfs:domain log:LogEvent ;
-      rdfs:label "on behalf of"^^xsd:string ;
+      rdfs:label "company"^^xsd:string ;
       rdfs:range xsd:string .
 
 log:outcome
@@ -163,6 +163,9 @@ log:xml
       rdfs:label "xml"^^xsd:string ;
       rdfs:range xsd:string .
 
+<http://www.reportinghub.no/system/schema/reporting#format>
+      rdfs:range <http://www.reportinghub.no/system/schema/reporting#Format> .
+
 <http://www.reportinghub.no/system/schema/reporting#uploadedDocument>
       rdf:type owl:ObjectProperty ;
       rdfs:domain log:ReportUploadEvent ;