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

Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Browse source
This commit is contained in:
hudajkhan 2013-10-08 12:35:04 -04:00
commit 75e09ad3d4
4 changed files with 292 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/build.xml
View file

@ -265,6 +265,8 @@
================================= --> ================================= -->
<target name="clean" description="--> Delete all artifacts."> <target name="clean" description="--> Delete all artifacts.">
<delete dir="${build.dir}" /> <delete dir="${build.dir}" />
<!-- delete the rdf files, removing any unused languages, for example. -->
<delete dir="${vitro.home}/rdf" />
</target> </target>
<!-- ================================= <!-- =================================

572
webapp/languages/example/i18n/all_es.properties
View file

File diff suppressed because it is too large Load diff

8
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
View file

@ -202,12 +202,10 @@ public class RequestModelsPrep implements Filter {
OntModelSpec.OWL_MEM, dataset.getDefaultModel()); OntModelSpec.OWL_MEM, dataset.getDefaultModel());
ModelAccess.on(vreq).setOntModel(ModelID.BASE_ABOX, baseABoxModel); ModelAccess.on(vreq).setOntModel(ModelID.BASE_ABOX, baseABoxModel);
ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_ABOX, unionABoxModel); ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_ABOX, inferenceABoxModel);
ModelAccess.on(vreq) ModelAccess.on(vreq).setOntModel(ModelID.UNION_ABOX, unionABoxModel);
.setOntModel(ModelID.UNION_ABOX, inferenceABoxModel);
ModelAccess.on(vreq).setOntModel(ModelID.BASE_FULL, baseFullModel); ModelAccess.on(vreq).setOntModel(ModelID.BASE_FULL, baseFullModel);
ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_FULL, ModelAccess.on(vreq).setOntModel(ModelID.INFERRED_FULL, inferenceFullModel);
inferenceFullModel);
ModelAccess.on(vreq).setOntModel(ModelID.UNION_FULL, unionFullModel); ModelAccess.on(vreq).setOntModel(ModelID.UNION_FULL, unionFullModel);
} }

3
webapp/web/css/vitro.css
View file

@ -374,7 +374,8 @@ a.filter-search {
line-height: 35px; line-height: 35px;
} }
#home-stats h4 { #home-stats h4 {
width: 102px; display: inline;
padding: 3px 10px;
} }
#stats { #stats {
margin: 0 auto; margin: 0 auto;