litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1341 Change names of custom list view config files, xml elements, templates.

Browse source
This commit is contained in:
rjy7 2010-12-17 22:11:02 +00:00
parent 26d8ffd1cd
commit 0d0468b86d
6 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
View file

@ -75,7 +75,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
static protected String listViewConfigFileQueryString =
"PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#>" +
"SELECT ?property ?filename WHERE { \n" +
" ?property display:listViewConfigurationFile ?filename . \n" +
" ?property display:listViewConfigFile ?filename . \n" +
"} LIMIT 1";
static protected Query listViewConfigFileQuery;

4
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
View file

@ -278,7 +278,5 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
}
return list;
}
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
View file

@ -80,7 +80,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
private class PropertyListConfig {
private static final String DEFAULT_CONFIG_FILE = "objectPropertyList-default.xml";
private static final String DEFAULT_CONFIG_FILE = "listViewConfig-default.xml";
private static final String CONFIG_FILE_PATH = "/config/";
private static final String NODE_NAME_QUERY = "query";
private static final String NODE_NAME_TEMPLATE = "template";

8
webapp/web/config/objectPropertyList-default.xml → webapp/web/config/listViewConfig-default.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<view-config>
<list-view-config>
<query>
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
@ -14,9 +14,7 @@
<collation-target>object</collation-target>
<link-target>object</link-target>
<preprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DefaultObjectPropertyDataPreprocessor</preprocessor>
<template>shortView-default.ftl</template>
</view-config>
<template>propStatement-default.ftl</template>
</list-view-config>

1
webapp/web/templates/freemarker/body/individual/individual.ftl
View file

@ -12,7 +12,6 @@
<#include "individual-adminPanel.ftl">
</#if>
<#-- Manolo, please do not remove this line. Thanks! -->
<#assign propertyGroups = individual.propertyList>
<section id="individual-intro-person" class="vcard" role="region">

2
webapp/web/templates/freemarker/body/partials/individual/shortView-default.ftl → webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
View file

@ -1,5 +1,5 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Default object property statement short view template -->
<#-- Default object property statement template -->
<a href="${url(statement.object)}">${statement.name!}</a> ${statement.moniker!}