diff --git a/webapp/web/WEB-INF/ontologies/app/menu.n3 b/webapp/web/WEB-INF/ontologies/app/menu.n3 index 673b967da..d1cacc266 100644 --- a/webapp/web/WEB-INF/ontologies/app/menu.n3 +++ b/webapp/web/WEB-INF/ontologies/app/menu.n3 @@ -50,12 +50,20 @@ display:pageListData display:query """ PREFIX display: PREFIX rdfs: - SELECT ?pageUri ?title ?urlMapping ?template ?menuItem + SELECT ?listedPageUri ?listedPageTitle ?listedPageUrlMapping ?listedPageTemplate ?listedPageMenuItem WHERE { - ?pageUri a display:Page . - OPTIONAL{ ?pageUri display:urlMapping ?urlMapping. } - OPTIONAL{ ?pageUri display:title ?title. } - OPTIONAL {?pageUri display:requiresBodyTemplate ?template .} - OPTIONAL {?menuItem display:toPage ?pageUri .} - } """ . - \ No newline at end of file + ?listedPageUri a display:Page . + OPTIONAL{ ?listedPageUri display:urlMapping ?listedPageUrlMapping. } + OPTIONAL{ ?listedPageUri display:title ?listedPageTitle. } + OPTIONAL {?listedPageUri display:requiresBodyTemplate ?listedPageTemplate .} + OPTIONAL {?listedPageMenuItem display:toPage ?listedPageUri .} + } """ . +###Page Management and Data Getters +#Data getter type labels + rdfs:label "Class Group Page" . + rdfs:label "Browse Page" . + rdfs:label "Class Group Page - Selected Classes" . + rdfs:label "Sparql Query Results" . + + + \ No newline at end of file diff --git a/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3 b/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3 index 656e1aad7..0caf9988f 100644 --- a/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3 +++ b/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3 @@ -203,5 +203,3 @@ rdf:type a owl:ObjectProperty . - - diff --git a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl index 35be30050..a980003d8 100644 --- a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl +++ b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl @@ -24,20 +24,20 @@ <#list pages as pagex> - <#if pagex.pageUri?has_content> - ${(pagex.title)!'-untitled-'} + <#if pagex.listedPageUri?has_content> + ${(pagex.listedPageTitle)!'-untitled-'}   - Edit + Edit <#else> No URI defined for page. - ${pagex.urlMapping} - ${(pagex.template)!''} + ${pagex.listedPageUrlMapping} + ${(pagex.listedPageTemplate)!''} - <#if pagex.menuItem?has_content> + <#if pagex.listedPageMenuItem?has_content>