data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
Holger Knublauch
f5063165 1 parent a68ec6db

EPIM log progress

Expand all
Inline Side-by-side
Showing 7 changed files with 141 additions and 39 deletions
......@@ -196,6 +196,44 @@ app:defaultRange
spin:private "true"^^xsd:boolean ;
spin:returnType rdfs:Resource .
app:globalRange
rdf:type spin:Function ;
rdfs:comment "Gets the global range (rdfs:range) of a property. If none is provided, it will walk up super-properties."^^xsd:string ;
rdfs:label "global range"^^xsd:string ;
rdfs:subClassOf app:Functions ;
spin:body
[ rdf:type sp:Select ;
sp:resultVariables ([ sp:varName "range"^^xsd:string
]) ;
sp:where ([ rdf:type sp:TriplePath ;
sp:object
[ sp:varName "p"^^xsd:string
] ;
sp:path [ rdf:type sp:ModPath ;
sp:modMax -2 ;
sp:modMin 0 ;
sp:subPath rdfs:subPropertyOf
] ;
sp:subject
[ sp:varName "property"^^xsd:string
]
] [ sp:object
[ sp:varName "range"^^xsd:string
] ;
sp:predicate rdfs:range ;
sp:subject
[ sp:varName "p"^^xsd:string
]
])
] ;
spin:constraint
[ rdf:type spl:Argument ;
rdfs:comment "The property to get the range of."^^xsd:string ;
spl:predicate arg:property ;
spl:valueType rdf:Property
] ;
spin:returnType rdfs:Class .
app:googleMapsAPIKey
rdf:type spin:Function ;
rdfs:comment "Gets the currently registered Google Maps API key."^^xsd:string ;
......@@ -744,7 +782,7 @@ app:localRange
sp:where ([ rdf:type sp:Bind ;
sp:expression
[ rdf:type app:resourceType ;
arg:subject
arg:resource
[ sp:varName "subject"^^xsd:string
]
] ;
......@@ -763,11 +801,6 @@ app:localRange
arg:property
[ sp:varName "predicate"^^xsd:string
]
] ;
sp:arg3 [ rdf:type app:defaultRange ;
arg:property
[ sp:varName "predicate"^^xsd:string
]
]
] ;
sp:variable
......@@ -821,7 +854,7 @@ app:localRange
app:localRangeAtClass
rdf:type spin:Function ;
rdfs:comment "Checks (in that order) for declared owl:allValuesFrom restrictions in superclasses, rdfs:range at the property and then spl:valueType in SPIN constraints (spl:Argument and spl:Attribute)."^^xsd:string ;
rdfs:comment "Checks (in that order) for declared owl:allValuesFrom restrictions in superclasses, rdfs:range at the property and then spl:valueType in SPIN constraints (spl:Argument and spl:Attribute). It falls back to app:defaultRange if nothing else is found."^^xsd:string ;
rdfs:label "local range at class"^^xsd:string ;
rdfs:subClassOf app:Functions ;
spin:body
......@@ -835,10 +868,10 @@ app:localRangeAtClass
sp:arg4 [ sp:varName "property"^^xsd:string
]
] ;
sp:arg2 [ rdf:type spl:object ;
sp:arg1 [ sp:varName "property"^^xsd:string
] ;
sp:arg2 rdfs:range
sp:arg2 [ rdf:type app:globalRange ;
arg:property
[ sp:varName "property"^^xsd:string
]
] ;
sp:arg3 [ rdf:type spif:walkObjects ;
sp:arg1 [ sp:varName "class"^^xsd:string
......@@ -847,6 +880,11 @@ app:localRangeAtClass
sp:arg3 app:splValueTypeFunctor ;
sp:arg4 [ sp:varName "property"^^xsd:string
]
] ;
sp:arg4 [ rdf:type app:defaultRange ;
arg:property
[ sp:varName "property"^^xsd:string
]
]
]) ;
sp:where ()
......
This diff is collapsed. Click to expand it.
@CHARSET "UTF-8";
body {
font-family: sans-serif;
font-family: Arial, Helvetica, sans-serif;
}
.appAddRowButton {
......@@ -18,8 +18,8 @@ body {
.appAutoComplete {
}
.appBaseFont, .appObjectWidget {
font-size: 14px;
.appBaseFont, .appObjectWidget, .appLabeledObjectsLabelTD {
font-size: 12px;
}
.appErrorIndicator {
......@@ -47,7 +47,6 @@ body {
}
.appLabeledObjectsLabelTD {
font-size: 14px;
font-weight: bold;
padding-bottom: 0px;
padding-left: 0px;
......@@ -100,7 +99,6 @@ body {
padding-top: 5px;
}
.appEditorHiddenField {
}
......@@ -120,8 +118,14 @@ body {
}
.appFormFooter {
padding: 4px;
margin-top: 8px;
border-top-width: 1px;
border-top-style: solid;
border-top-color: #b0b0b0;
background-color: #f0f0f0;
padding-top: 2px;
padding-left: 4px;
padding-right: 4px;
padding-bottom: 4px;
}
.appFormHeaderLink {
......@@ -145,8 +149,10 @@ a:active.appFormHeaderLink {
}
.appHeader {
background-color: darkGray;
background-color: #303030;
color: white;
font-size: 15px;
font-weight: bold;
padding-left: 4px;
padding-top: 2px;
padding-bottom: 2px;
......@@ -242,14 +248,15 @@ td.appPropertyWidgetObjectTD {
font-size: 11px;
}
.ui-layout-north {
.ui-layout-content {
padding: 0 !important;
}
.ui-layout-west {
.ui-layout-north, .ui-layout-south, .ui-layout-west, .ui-layout-east, .ui-layout-center {
border: 0px !important;
padding: 0 !important;
}
.ui-layout-center {
padding: 0 !important;
.jstree {
font-size: 12px !important;
}
\ No newline at end of file
......
......@@ -174,8 +174,26 @@ function appLoad(id, args) {
var p = jQuery.param(c);
url = p + "&" + base;
}
url += '&_snippet=true';
appInsertLoadingIndicator(e);
e.load(uispinServlet, url);
// TODO: Error handling may not work yet
e.load(uispinServlet, url, function() {
appLoadPostProcess(e, 'north');
appLoadPostProcess(e, 'east');
appLoadPostProcess(e, 'south');
appLoadPostProcess(e, 'west');
appLoadPostProcess(e, 'center');
});
}
// Private function to make sure that the scrollbars are
// updated if a ui:loadable has been loaded into a layout pane
function appLoadPostProcess(e, pane) {
// TODO: Test if this also works for panes that don't have a ui-layout-content
if(e.hasClass('ui-layout-' + pane)) {
e.parent().layout().initContent(pane);
}
}
......@@ -221,6 +239,13 @@ function appLoadForm(formId, mode, resourceURI, resourceTypeURI, queryGraphURI)
* @param onSelect the value for onSelect of the generated grid
*/
function appLoadSearchResultsGrid(formId, targetId, onSelect) {
// TODO: jQuery's serialize method has problems with attributes such as
// _base="<http://example.org/>" - it will convert those to something
// like _base=<http://example.org></http:>. There may be other problems
// with special characters etc, but the specific bug above can be
// worked around by not having URIs end with '/'.
var params = $('#' + formId).serialize();
var escaped = '&params=' + escape(params);
if(onSelect) {
......
......@@ -53,13 +53,24 @@
{= ?onSelect }
},
</ui:if>
autoWidth: true,
height: '100%',
rowNum: 10,
rowList:[5,10,20],
pager: '#{= ?pagerId }',
viewrecords: true,
sortorder: "asc",
height: "100%",
width: "100%"
}).jqGrid('navGrid', '#{= ?pagerId }', { add:false, edit:false, del:false});
shrinkToFit: false,
sortorder: 'asc',
viewrecords: true
//width: '100%'
}).jqGrid('navGrid', '#{= ?pagerId }', {
add:false,
del:false,
edit:false,
search: false
});
$("#{= ?tableId }").parent().resize(function() {
alert('Resized');
});
</script>
</ui:group>
\ No newline at end of file
......
This diff is collapsed. Click to expand it.
......@@ -26,34 +26,40 @@ log:LogBrowser
rdfs:subClassOf ui:Element ;
ui:prototype
[ rdf:type html:Div ;
html:style "width:900px"^^xsd:string ;
html:id "logBrowserMainPanel"^^xsd:string ;
html:style "width:880px; height: 500px; border-width: 1px; border-style: solid; border-color: black;"^^xsd:string ;
ui:child
[ rdf:type app:VSplitLayout ;
arg:height "500px"^^xsd:string ;
arg:topHeight "30%"^^xsd:string ;
[ rdf:type html:Div ;
html:class "ui-layout-north"^^xsd:string ;
html:id "logBrowserNorthPanel"^^xsd:string ;
html:style "height: 120px"^^xsd:string ;
ui:child
[ rdf:type ui:setContext ;
ui:child
[ rdf:type app:HSplitLayout ;
arg:height "200px"^^xsd:string ;
ui:child
[ rdf:type html:Div ;
html:class "ui-layout-west"^^xsd:string ;
ui:child
[ rdf:type app:Header ;
arg:label "Event Type"^^xsd:string ;
ui:childIndex 0
] ;
ui:child
[ rdf:type html:Div ;
html:class "ui-layout-content"^^xsd:string ;
ui:child
[ rdf:type app:Tree ;
arg:dataProvider log:LogEventClassTreeDataProvider ;
arg:id "classTree"^^xsd:string ;
arg:onSelect "appLoadWithResource('form', 'resourceType', resource)"^^xsd:string ;
ui:childIndex 0
] ;
ui:childIndex 1
] ;
ui:childIndex 0
] ;
ui:child
[ rdf:type ui:loadable ;
html:class "ui-layout-center"^^xsd:string ;
ui:child
[ rdf:type app:SearchForm ;
arg:formId "searchForm"^^xsd:string ;
......@@ -71,16 +77,18 @@ log:LogBrowser
ui:childIndex 1 ;
ui:loadId "form"^^xsd:string
] ;
ui:childIndex 0
] ;
ui:childIndex 0 ;
ui:queryGraph
[ rdf:type ui:graphWithImports ;
sp:arg1 <http://www.reportinghub.no/system/schema/logging>
]
] ;
ui:childIndex 0
] ;
ui:child
[ rdf:type html:Div ;
html:class "ui-layout-center"^^xsd:string ;
html:style "height: 300px"^^xsd:string ;
ui:child
[ rdf:type app:Header ;
arg:label "Matching Events"^^xsd:string ;
......@@ -88,12 +96,25 @@ log:LogBrowser
] ;
ui:child
[ rdf:type html:Div ;
html:class "ui-layout-content"^^xsd:string ;
html:id "results"^^xsd:string ;
ui:childIndex 1
] ;
ui:childIndex 1
] ;
ui:childIndex 0
ui:child
[ rdf:type html:Script ;
ui:child
[ rdf:type ui:TextNode ;
ui:childIndex 0 ;
ui:text """$('#logBrowserMainPanel').layout({
applyDefaultStyles: true
});
$('#logBrowserNorthPanel').layout({
applyDefaultStyles: true
});"""^^xsd:string
] ;
ui:childIndex 2
]
] .
......