diff --git a/webapp/ontologies/app/menuload/displayTBOX.n3 b/webapp/ontologies/app/menuload/displayTBOX.n3 index 4ff6b9423..61b26b0e5 100644 --- a/webapp/ontologies/app/menuload/displayTBOX.n3 +++ b/webapp/ontologies/app/menuload/displayTBOX.n3 @@ -1,43 +1,36 @@ +# $This file is distributed under the terms of the license in /doc/license.txt$ + @prefix rdfs: . @prefix xsd: . @prefix owl: . @prefix rdf: . + +#########Classes######### +###Basic +owl:Class + a owl:Class . + owl:Ontology a owl:Class . - -rdfs:range - a owl:ObjectProperty . - + owl:AnnotationProperty - a owl:Class . - - - a owl:DatatypeProperty . - - - a owl:DatatypeProperty . - - - a owl:ObjectProperty . - -rdfs:label - a owl:DatatypeProperty . - - - a owl:ObjectProperty . - + a owl:Class . + owl:DatatypeProperty a owl:Class . -rdfs:comment - a owl:DatatypeProperty . +owl:ObjectProperty + a owl:Class . + +###Display Model + + a owl:Class ; + + "individual-menu.ftl"^^xsd:string . - - a owl:ObjectProperty . - - - a owl:DatatypeProperty . + + a owl:Class . a owl:Class . @@ -45,73 +38,86 @@ rdfs:comment a owl:Class . - - a owl:ObjectProperty . - a owl:Class . + + + a owl:Class . + + + a owl:Class . + + + a owl:Class . + + + +########Data Properties######### -owl:Class - a owl:Class . +###Basic - - a owl:ObjectProperty . - - +rdfs:comment + a owl:DatatypeProperty . + +rdfs:label a owl:DatatypeProperty . - -owl:ObjectProperty - a owl:Class . - - - a owl:Class . - -rdfs:domain - a owl:ObjectProperty . owl:versionInfo a owl:DatatypeProperty . + +###Vitro model + + + a owl:DatatypeProperty . + + a owl:DatatypeProperty . + + + a owl:DatatypeProperty . + +###Display model a owl:DatatypeProperty . + + a owl:DatatypeProperty . + + + a owl:DatatypeProperty . + + + a owl:DatatypeProperty . + + + a owl:DatatypeProperty ; + + "1"^^xsd:int . a owl:DatatypeProperty . - - - a owl:Class . - - - a owl:DatatypeProperty . - - owl:Ontology - a owl:Class . + + + a owl:DatatypeProperty . + + + + +######### Object Properties######### +###Basic +rdfs:range + a owl:ObjectProperty . +rdfs:domain + a owl:ObjectProperty . +owl:topObjectProperty + a owl:ObjectProperty . + +###Vitro properties without which individual templates throw errors as are required a owl:ObjectProperty ; rdfs:range ; rdfs:subPropertyOf , owl:topObjectProperty . - - - a owl:DatatypeProperty . - -owl:AnnotationProperty - a owl:Class . - -rdfs:range - a owl:ObjectProperty . - - - a owl:DatatypeProperty . - - - a owl:Thing ; - rdfs:label "testname"@en-US ; - - "1"^^xsd:int ; - - "2011-05-25T17:34:16"^^xsd:dateTime . - + a owl:ObjectProperty ; rdfs:label "Primary Link"@en-US ; @@ -126,127 +132,7 @@ rdfs:range "false"^^xsd:boolean ; - "true"^^xsd:boolean . - - - a owl:Thing ; - rdfs:label "testname"@en-US ; - - "1"^^xsd:int ; - - "2011-05-26T13:23:49"^^xsd:dateTime . - - - a owl:ObjectProperty . - -rdfs:label - a owl:DatatypeProperty . - - - a owl:ObjectProperty . - - - a owl:DatatypeProperty . - - - a owl:ObjectProperty . - - - a owl:Thing ; - rdfs:label "testname"@en-US ; - - "1"^^xsd:int ; - - "2011-05-26T10:30:02"^^xsd:dateTime . - - - a owl:ObjectProperty . - -owl:DatatypeProperty - a owl:Class . - -rdfs:comment - a owl:DatatypeProperty . - - - a owl:DatatypeProperty . - - - a owl:ObjectProperty . - - - a owl:Class . - - - a owl:Class . - - - a owl:DatatypeProperty ; - - "1"^^xsd:int . - - - a owl:ObjectProperty . - - - a owl:ObjectProperty . - - - a owl:Class . - - - a owl:Class . - - - a owl:Thing ; - rdfs:label "testname"@en-US ; - - "1"^^xsd:int ; - - "2011-05-26T13:53:52"^^xsd:dateTime . - - - a owl:Class . - - - a owl:ObjectProperty . - -owl:Class - a owl:Class . - - - a owl:ObjectProperty . - - - a owl:DatatypeProperty . - -owl:ObjectProperty - a owl:Class . - - - a owl:Class ; - - "individual-menu.ftl"^^xsd:string . - - - a owl:Class . - -rdfs:domain - a owl:ObjectProperty . - -owl:versionInfo - a owl:DatatypeProperty . - - - a owl:DatatypeProperty . - - - a owl:Thing ; - rdfs:label "testname"@en-US ; - - "1"^^xsd:int ; - - "2011-05-26T13:34:02"^^xsd:dateTime . + "true"^^xsd:boolean . a owl:ObjectProperty ; @@ -263,32 +149,25 @@ owl:versionInfo "false"^^xsd:boolean ; "true"^^xsd:boolean . + +###Display model + + a owl:ObjectProperty . + + + a owl:ObjectProperty . - - a owl:Class . - - - a owl:DatatypeProperty . - - - a owl:Class . - - - a owl:DatatypeProperty . - - - a owl:Thing ; - rdfs:label "testname"@en-US ; - - "1"^^xsd:int ; - - "2011-05-26T11:29:19"^^xsd:dateTime . - - - a owl:Thing ; - rdfs:label "testname"@en-US ; - - "1"^^xsd:int ; - - "2011-05-25T17:36:03"^^xsd:dateTime . - \ No newline at end of file + + a owl:ObjectProperty . + + + a owl:ObjectProperty . + + + a owl:ObjectProperty . + + + a owl:ObjectProperty . + + + a owl:ObjectProperty . diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java index b59494a77..3ffef8f4f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java @@ -352,14 +352,7 @@ public class MenuManagementEdit extends VitroHttpServlet { dataGetterModel = getIndividualsForClassesDataGetter(vreq, dataGetterResource, addModel, displayModel, pageResource); } - addModel.add(dataGetterModel); - //Also add special template to page - addModel.add(addModel.createStatement(pageResource, - DisplayVocabulary.REQUIRES_BODY_TEMPLATE, - addModel.createTypedLiteral(DisplayVocabulary.INTERNAL_CLASS_TEMPLATE))); - - } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java index 751c7e3b3..3abf37d65 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java @@ -83,6 +83,7 @@ public class MenuManagementController extends FreemarkerHttpServlet { //Certain parameters are always passed private void initializeData(Map data, VitroRequest vreq) { //Form url submission + data.put("title", getCommand(vreq) + " Menu Item"); data.put("formUrls", vreq.getContextPath() + SUBMIT_FORM); data.put("cancelUrl", vreq.getContextPath() + CANCEL_FORM); data.put("internalClassUri", ""); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java index 3c7577dd3..6fc82eb84 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java @@ -120,7 +120,7 @@ public class DisplayVocabulary { //URL for menu management public static final String PROCESS_MENU_MANAGEMENT_URL = "/processEditDisplayModel"; public static final String REORDER_MENU_URL = PROCESS_MENU_MANAGEMENT_URL + "?cmd=Reorder&" + SWITCH_TO_DISPLAY_MODEL + "=true"; - public static final String INTERNAL_CLASS_TEMPLATE = "menupage--individualsforclasses.ftl"; + /* URIs for some individuals in the dispaly ontology */ public static final String HOME_MENU_ITEM = DISPLAY_NS + "HomeMenuItem"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java index 7ce0ca4f3..1be5483ea 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java @@ -31,7 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateMo */ public class IndividualsForClassesDataGetter implements PageDataGetter{ private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class); - + protected static String restrictClassesTemplateName = "restricted"; public Map getData(ServletContext context, VitroRequest vreq, String pageUri, Map page ){ HashMap data = new HashMap(); //This is the old technique of getting class intersections @@ -116,7 +116,7 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{ restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray); //In case just want uris - data.put("restrictClasses", StringUtils.join(restrictClassesArray, ",")); + data.put(getRestrictClassesTemplateName(), StringUtils.join(restrictClassesArray, ",")); data.put("restrictVClasses", restrictVClasses); //not sure if this is useful data.put("restrictVClassGroup", restrictClassesGroup); @@ -204,4 +204,10 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{ return 1; } } + + //Get template parameter + private static String getRestrictClassesTemplateName() { + return restrictClassesTemplateName; + + } } \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java index 279651318..f5c98610d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java @@ -41,9 +41,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext; public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{ private static final Log log = LogFactory.getLog(InternalClassesDataGetter.class); + @Override public Map getData(ServletContext context, VitroRequest vreq, String pageUri, Map page ){ - HashMap data = new HashMap(); + //Set restricted classes template + super.restrictClassesTemplateName = "internalClass"; + HashMap data = new HashMap(); //This is the old technique of getting class intersections Map classIntersectionsMap = vreq.getWebappDaoFactory().getPageDao().getClassesAndCheckInternal(pageUri);