Commit graph

1832 commits

Author SHA1 Message Date
Stephen V. Williams
27a1c1a542 add reverse links to on the details pages for dept-subjArea and subjArea-dept 2013-08-21 20:47:21 -06:00
Stephen V. Williams
76238887b1 added departments to concept page based on researcher selecting concept as research area
* 4 new files for handling the new linkage (individual--skos-concept.ftl, individual-affiliated-departments.ftl, individual-affiliated-dept-details.ftl, vivoConceptDataGetters.n3)
 * added invdividual--skos-concept.ftl to the skos:Concept definition in vivo-core-1.5-annotations.rdf
 * added i18n entries for the new ftl pages
2013-08-21 16:48:01 -06:00
j2blake
37c35468ca VIVO-248 Move more RDF files into the home directory
Files for initializing the display, displayTbox and displayDisplay models. Also restructure the RDFFilesLoader.
2013-08-21 11:27:41 -04:00
j2blake
71ce2beffc VIVO-248 Move more RDF files into the home directory
Files for initializing the TBOX, ABOX, ApplicationMetadata and UserAccounts models.
2013-08-20 17:14:09 -04:00
j2blake
ca951c6bf3 VIVO-248 Move filegraph RDF files into the home directory 2013-08-20 15:26:09 -04:00
tworrall
55a4d1dc35 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-19 14:52:19 -04:00
tworrall
e5df3b70ba another minor correction to the text 2013-08-19 14:52:03 -04:00
hudajkhan
6ea7d9ef37 adding licence to classes, removing sparql feed related classes 2013-08-13 12:23:49 -04:00
hudajkhan
ad0ae3c09a updates for semantic services, temporarily commenting out concept semantic type which is still in progress 2013-08-12 13:09:04 -04:00
hudajkhan
a728d53c22 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-12 11:22:34 -04:00
j2blake
1c9f9f5f1a VIVO-246 Re-implement the FreemarkerConfiguration
The Configuration must contain mutable information like the theme directory and the TemplateLoader. It must also be request-specific so it can have the correct Locale for language support. But we should only have one instance, so there is only one TemplateCache (alternatively, one TemplateCache per theme).

Previously, this was addressed by intercepting the Template processing and adding the request-based info to the Environment. However, this interception code needed to appear each time a Template was processed. This was sometimes overlooked, and at best introduced a bunch of duplicated code.

Instead, I extended the freemarker Configuration class to include a ThreadLocal that holds request-specific information.
2013-08-08 13:23:40 -04:00
hudajkhan
0f64658c5e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-08 12:25:31 -04:00
hudajkhan
2ea474b6ef External vocabulary service and integration of Agrovoc with work beginning for applying concept semantic type to UMLS concepts. 2013-08-07 16:08:11 -04:00
tworrall
6950aab59c fixed a typo 2013-08-07 15:02:42 -04:00
tworrall
be11fc589f VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before 2013-08-05 14:57:59 -04:00
tworrall
f2ce218a87 VIVO-105: English and Spanish versions of the about page 2013-07-22 16:19:40 -04:00
j2blake
113f7ba94b Remove reference to N3EditFormController, which was removed in 0e26d45a31 2013-07-17 15:47:58 -04:00
j2blake
1d16f165dc VIVO-213 smoke test to check JVM temp directory
If it isn't set, if it isn't a directory, if we can't access it, if we can't create a temp file, complain.
2013-07-17 13:01:33 -04:00
Brian Caruso
b155bd7aa3 Merge branch 'develop' of github.com:vivo-project/VIVO into develop 2013-07-16 14:41:06 -04:00
Brian Caruso
b7c80189f0 Adding SearchService to web.xml VIVO-98 2013-07-16 14:40:12 -04:00
tworrall
a067f193a3 fixed div element reference 2013-07-16 10:04:33 -04:00
tworrall
57c694abee add links to wiki pages for two runtime properties; fixed an incorrect href attribute 2013-07-09 09:38:30 -04:00
tworrall
7bbc249047 some home page map cleanup, standardization 2013-07-03 14:00:56 -04:00
Jim Blake
cb757d82da Merge pull request #5 from vivo-project/feature/search-download
Added a new field email to IndividualSearchResults and a modification of...
2013-06-28 12:16:01 -07:00
tworrall
c3bdcb6676 minor change, renamed a variable 2013-06-28 10:15:32 -04:00
tworrall
04b3bb864f removing some unused image files 2013-06-25 15:53:04 -04:00
tworrall
93e2b107bf fixed an i18n string 2013-06-25 13:56:17 -04:00
tworrall
d9de65e4c8 only show the view active grants link on academic department pages if the department has any active grants 2013-06-25 11:07:16 -04:00
tworrall
883cbea941 VIVO-105 along with additions to the upgrade doc 2013-06-24 15:48:19 -04:00
j2blake
c5acf46316 VIVO-125 Create more "Google Spanish" labels
Add more labels by changing the filter in the label_stripper/label_inserter scripts. Improve the structure of the scripts to use an external filter.
2013-06-21 14:58:28 -04:00
tworrall
7a9d46e130 significant changes for VIVO-131. See Jira comment for more details 2013-06-20 16:02:10 -04:00
tworrall
42e88d91b8 fixed variable reference 2013-06-19 16:48:33 -04:00
tworrall
dd30f287b0 modified some image based tooltips to support i18n 2013-06-14 16:10:15 -04:00
tworrall
8c4103006b home page map changes: the map now distinguishes countries from regions and counts are rolled up -- states or provinces into countries, countries into regions. Note: to see the roll up may require data curation to ensure the relations exist among the geographic regions. 2013-06-14 10:51:26 -04:00
tworrall
3942b2923c fix for vivo-127 2013-06-12 16:05:16 -04:00
j2blake
b8308baefc VIVO-125 Continue to develop the googleSpanish text.
Bring all_es.properties up to par with all.properties, in both Vitro and VIVO/Wilma
Add labels for class groups, property groups, menu pages.
2013-06-11 16:34:20 -04:00
tworrall
66992942b6 i18n updates to javascript files and related templates 2013-06-11 12:23:32 -04:00
tworrall
2c49931672 internationalization changes for java script files 2013-06-07 11:59:14 -04:00
j2blake
041c091268 VIVO-82 Merge the filters that set up VitroRequest models
VitroRequestPrep and WebappDaoFactorySDBPrep merge to RequestModelsPrep. WebappDaoFactorySparqlPrep goes away.
2013-06-06 17:29:07 -04:00
tworrall
1dde11c581 VIVO-123 - handle malformed data more gracefully on manage pubs page 2013-06-06 15:44:16 -04:00
Stephen V. Williams
1bae4ff677 changed order to have name first in csv and added the xmlResults from vitro with VIVO specific items 2013-05-31 12:21:02 -06:00
tworrall
fe1b52ab49 more template updates for i18n 2013-05-31 11:56:18 -04:00
Stephen V. Williams
06ca894546 Added a new field email to IndividualSearchResults and a modification of the csv-results for VIVO that includes email and preferred title where available 2013-05-31 09:09:33 -06:00
j2blake
e937d9d0a0 VIVO-84 Remove Spanish text from the display model. OOPS 2013-05-23 10:08:38 -04:00
brianjlowe
188761c52e work on VIVO-60 application ontology controls for property/class combinations 2013-05-22 16:48:52 -04:00
j2blake
463203a862 VIVO-82 Split WebappDaoSetup into ContentModelSetup and ModelMaker setup. 2013-05-16 16:43:13 -04:00
j2blake
bd9efdaf2f VIVO-87 First attempt at a caching filter. 2013-05-14 16:38:34 -04:00
tworrall
107b13d7c0 when navigating from the map to the list of researchers, expand the list if there are more than 5 2013-05-14 16:18:36 -04:00
tworrall
27b6c51ce0 added time indicator wheel to faculty section on home page 2013-05-14 12:51:50 -04:00
tworrall
a618253d0c more i18n template changes 2013-05-14 12:23:24 -04:00