Holger Knublauch

Log search progress

......@@ -540,7 +540,7 @@ app:ClassTreeDataProvider
[ sp:varName "label"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression "lib/app/images/owlClass.gif" ;
sp:expression "appIconClass" ;
sp:variable
[ sp:varName "icon"^^xsd:string
]
......@@ -581,7 +581,7 @@ app:ClassTreeDataProvider
[ sp:varName "leaf"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression "lib/app/images/owlClass.gif" ;
sp:expression "appIconClass" ;
sp:variable
[ sp:varName "icon"^^xsd:string
]
......@@ -1058,6 +1058,179 @@ app:DateEditor
]
] .
app:DateRangeFacet
rdf:type app:ObjectFacetClass ;
rdfs:label "Date range facet"^^xsd:string ;
rdfs:subClassOf app:ObjectFacet ;
app:objectWidgetWeight
[ rdf:type app:WeightedExpression ;
app:expression
[ rdf:type sp:and ;
sp:arg1 [ rdf:type sp:bound ;
sp:arg1 [ sp:varName "range"^^xsd:string
]
] ;
sp:arg2 [ rdf:type sp:or ;
sp:arg1 [ rdf:type sp:eq ;
sp:arg1 [ sp:varName "range"^^xsd:string
] ;
sp:arg2 xsd:date
] ;
sp:arg2 [ rdf:type sp:eq ;
sp:arg1 [ sp:varName "range"^^xsd:string
] ;
sp:arg2 xsd:dateTime
]
]
] ;
app:weight 5
] ;
ui:prototype
[ rdf:type html:Span ;
ui:child
[ rdf:type html:Input ;
html:id [ rdf:type fn:concat ;
sp:arg1 "dateEditor"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
] ;
sp:arg3 "Min"^^xsd:string
] ;
html:size "10"^^xsd:string ;
html:type "text"^^xsd:string ;
html:value
[ sp:varName "object"^^xsd:string
] ;
ui:childIndex 0
] ;
ui:child
[ rdf:type html:Span ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 0 ;
ui:text " - "^^xsd:string
] ;
ui:childIndex 1
] ;
ui:child
[ rdf:type html:Input ;
html:id [ rdf:type fn:concat ;
sp:arg1 "dateEditor"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
] ;
sp:arg3 "Max"^^xsd:string
] ;
html:size "10"^^xsd:string ;
html:type "text"^^xsd:string ;
html:value
[ sp:varName "object"^^xsd:string
] ;
ui:childIndex 2
] ;
ui:child
[ rdf:type html:Input ;
html:id [ rdf:type fn:concat ;
sp:arg1 "min"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
html:name
[ rdf:type fn:concat ;
sp:arg1 "min"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
html:type "hidden"^^xsd:string ;
ui:childIndex 3
] ;
ui:child
[ rdf:type html:Input ;
html:id [ rdf:type fn:concat ;
sp:arg1 "max"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
html:name
[ rdf:type fn:concat ;
sp:arg1 "max"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
html:type "hidden"^^xsd:string ;
ui:childIndex 4
] ;
ui:child
[ rdf:type html:Input ;
html:id [ rdf:type fn:concat ;
sp:arg1 "datatype"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
html:name
[ rdf:type fn:concat ;
sp:arg1 "datatype"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
html:type "hidden"^^xsd:string ;
html:value xsd:date ;
ui:childIndex 5
] ;
ui:child
[ rdf:type html:Script ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 0 ;
ui:text "appInitDatePicker('"^^xsd:string
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 1 ;
ui:text [ sp:varName "uid"^^xsd:string
]
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 2 ;
ui:text "Min', 'min"^^xsd:string
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 3 ;
ui:text [ sp:varName "uid"^^xsd:string
]
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 4 ;
ui:text """');
appInitDatePicker('"""^^xsd:string
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 5 ;
ui:text [ sp:varName "uid"^^xsd:string
]
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 6 ;
ui:text "Max', 'max"^^xsd:string
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 7 ;
ui:text [ sp:varName "uid"^^xsd:string
]
] ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 8 ;
ui:text "');"^^xsd:string
] ;
ui:childIndex 6
]
] .
app:EditForm
rdf:type app:FormClass ;
rdfs:comment "A form that can be used to create a new or edit an existing resource. It has an option to switch to view mode, as well as Save Changes and Cancel buttons."^^xsd:string ;
......@@ -2073,7 +2246,7 @@ app:NumericRangeFacet
[ rdf:type html:Input ;
html:name
[ rdf:type fn:concat ;
sp:arg1 "min" ;
sp:arg1 "min"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
......@@ -2094,7 +2267,7 @@ app:NumericRangeFacet
[ rdf:type html:Input ;
html:name
[ rdf:type fn:concat ;
sp:arg1 "max" ;
sp:arg1 "max"^^xsd:string ;
sp:arg2 [ sp:varName "uid"^^xsd:string
]
] ;
......@@ -2473,9 +2646,6 @@ app:ObjectFacet
[ rdf:type app:bestObjectFacetClass ;
arg:predicate
[ sp:varName "predicate"^^xsd:string
] ;
arg:subject
[ sp:varName "subject"^^xsd:string
]
] ;
ui:child
......@@ -2485,9 +2655,6 @@ app:ObjectFacet
arg:predicate
[ sp:varName "predicate"^^xsd:string
] ;
arg:subject
[ sp:varName "subject"^^xsd:string
] ;
arg:uid [ sp:varName "uid"^^xsd:string
] ;
ui:childIndex 0 ;
......@@ -2528,10 +2695,7 @@ app:ObjectFacet
[ rdf:type ui:TextNode ;
ui:childIndex 3 ;
ui:text [ rdf:type ui:label ;
sp:arg1 [ rdf:type app:resourceType ;
arg:subject
[ sp:varName "subject"^^xsd:string
]
sp:arg1 [ rdf:type app:resourceType
]
]
] ;
......@@ -2543,12 +2707,12 @@ app:ObjectFacet
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 5 ;
ui:text [ rdf:type app:localRange ;
arg:predicate
[ sp:varName "predicate"^^xsd:string
ui:text [ rdf:type app:localRangeAtClass ;
arg:class
[ rdf:type app:resourceType
] ;
arg:subject
[ sp:varName "subject"^^xsd:string
arg:property
[ sp:varName "predicate"^^xsd:string
]
]
] ;
......@@ -3758,9 +3922,11 @@ app:SearchForm
html:name "type"^^xsd:string ;
html:type "hidden"^^xsd:string ;
html:value
[ rdf:type ui:encodeNode ;
sp:arg1 [ sp:varName "resourceType"^^xsd:string
]
[ rdf:type fn:concat ;
sp:arg1 "<"^^xsd:string ;
sp:arg2 [ sp:varName "resourceType"^^xsd:string
] ;
sp:arg3 ">"^^xsd:string
] ;
ui:childIndex 1
] ;
......@@ -5750,33 +5916,30 @@ app:bestObjectEditorClass
app:bestObjectFacetClass
rdf:type spin:Function ;
rdfs:comment "Find the best suitable NodeFacet for a given predicate, subject, subjectType combination. May return nothing, e.g. for blank nodes."^^xsd:string ;
rdfs:label "best node facet class"^^xsd:string ;
rdfs:comment "Find the best suitable ObjectFacet for a given predicate and resourceType combination. May return nothing, e.g. for blank nodes."^^xsd:string ;
rdfs:label "best object facet class"^^xsd:string ;
rdfs:subClassOf app:Functions ;
spin:body
[ rdf:type sp:Select ;
sp:resultVariables ([ sp:expression
[ rdf:type app:bestObjectWidgetClass ;
arg:node
arg:object
[ sp:varName "none"^^xsd:string
] ;
arg:predicate
[ sp:varName "predicate"^^xsd:string
] ;
arg:range
[ rdf:type app:localRange ;
arg:predicate
[ sp:varName "predicate"^^xsd:string
[ rdf:type app:localRangeAtClass ;
arg:class
[ rdf:type app:resourceType
] ;
arg:subject
[ sp:varName "subject"^^xsd:string
arg:property
[ sp:varName "predicate"^^xsd:string
]
] ;
arg:resourceType
[ rdf:type app:resourceType ;
arg:subject
[ sp:varName "subject"^^xsd:string
]
[ rdf:type app:resourceType
] ;
arg:type app:ObjectFacetClass
] ;
......@@ -5790,13 +5953,6 @@ app:bestObjectFacetClass
spl:predicate arg:predicate ;
spl:valueType rdf:Property
] ;
spin:constraint
[ rdf:type spl:Argument ;
rdfs:comment "The subject."^^xsd:string ;
spl:optional "true"^^xsd:boolean ;
spl:predicate arg:subject ;
spl:valueType rdfs:Resource
] ;
spin:returnType app:ObjectEditorClass .
app:bestObjectViewerClass
......@@ -5882,8 +6038,8 @@ app:bestObjectViewerClass
app:bestObjectWidgetClass
rdf:type spin:Function ;
rdfs:comment "Walks through all NodeWidget classes of a given type (?type) that declare a nodeWidgetWeight and returns the NodeWidget class that has the highest weight for a given node (?node), predicate (?predicate), subject type (?subjectType) and local range (?range). All arguments are optional, but not all will be empty. If the subjectType and predicate are known, then also the ?range will be bound."^^xsd:string ;
rdfs:label "best node widget class"^^xsd:string ;
rdfs:comment "Walks through all ObjectWidget classes of a given type (?type) that declare an objectWidgetWeight and returns the ObjectWidget class that has the highest weight for a given node (?node), predicate (?predicate), resource type (?resourceType) and local range (?range). All arguments are optional, but not all will be empty. If the resourceType and predicate are known, then also the ?range will be bound."^^xsd:string ;
rdfs:label "best object widget class"^^xsd:string ;
rdfs:subClassOf app:Functions ;
spin:body
[ rdf:type sp:Select ;
......
......@@ -163,6 +163,16 @@ a:active.appFormHeaderLink {
border-style: solid;
}
.appIconConcept {
background-image: url(images/appIcons.png) !important;
background-position: 0 0 !important;
}
.appIconClass {
background-image: url(images/appIcons.png) !important;
background-position: -16px 0px !important;
}
div.appTop {text-align:right}
div.appTop div {display:inline; white-space:nowrap}
div.appTop div.appLeft {float:left}
......
......@@ -117,10 +117,14 @@ function appInitAutoComplete(id, hiddenId, link) {
/**
* Turns an input element with a given widget id into a jQuery datepicker.
* @param id the uid of the widget
* @param altId (optional) the id of the hidden widget
*/
function appInitDatePicker(id) {
function appInitDatePicker(id, altId) {
if(!altId) {
altId = 'new-' + id;
}
$('#dateEditor' + id).datepicker({
altField: '#new-' + id,
altField: '#' + altId,
altFormat: 'yy-mm-dd',
dateFormat: 'yy-mm-dd',
});
......
......@@ -77,7 +77,10 @@ log:LogBrowser
ui:childIndex 0
] ;
ui:childIndex 0 ;
ui:queryGraph <http://www.reportinghub.no/system/schema/logging>
ui:queryGraph
[ rdf:type ui:graphWithImports ;
sp:arg1 <http://www.reportinghub.no/system/schema/logging>
]
] ;
ui:child
[ rdf:type html:Div ;
......@@ -151,7 +154,7 @@ log:LogEventClassTreeDataProvider
[ sp:varName "label"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression "lib/app/images/owlClass.gif" ;
sp:expression "appIconClass" ;
sp:variable
[ sp:varName "icon"^^xsd:string
]
......@@ -192,7 +195,7 @@ log:LogEventClassTreeDataProvider
[ sp:varName "leaf"^^xsd:string
]
] [ rdf:type sp:Bind ;
sp:expression "lib/app/images/owlClass.gif" ;
sp:expression "appIconClass" ;
sp:variable
[ sp:varName "icon"^^xsd:string
]
......