Commit graph

6172 commits

Author SHA1 Message Date
brianjlowe
7760fdf6af work on VIVO-60 application ontology for property/class combinations 2013-05-22 16:28:11 -04:00
brianjlowe
d65d4109fa Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-22 15:03:54 -04:00
j2blake
4928940849 VIVO-82 Use ModelAccess to store and get WebappDaoFactory references. 2013-05-21 17:46:20 -04:00
j2blake
c086a595e1 VIVO-82 Tweak the uses of ModelAccess to keep backward compatibility.
Even if it appears to the untrained eye that the models are being misused.
2013-05-21 17:46:19 -04:00
brianjlowe
067deb48d5 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-21 16:19:07 -04:00
tworrall
749e667e6a some i18n cleanup 2013-05-21 10:56:25 -04:00
tworrall
8e26a768b5 some i18n cleanup 2013-05-21 10:55:24 -04:00
brianjlowe
6464dc9eeb Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-21 10:23:12 -04:00
tworrall
639f0450ac template updates for internationalization, including updated all.properties 2013-05-20 15:36:37 -04:00
j2blake
dbcc75dc20 Fix so widgets can invoke I18N method. 2013-05-20 13:31:25 -04:00
brianjlowe
707d40e25c Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-20 10:03:35 -04:00
j2blake
9a7a385b87 VIVO-82 Use ModelAccess to access the DisplayTBox and the DisplayDisplay 2013-05-17 17:58:14 -04:00
j2blake
864c93432f VIVO-82 Use ModelAccess to get the OntModelSelectors
Since the OntModelSelectors are facades over the OntModels stored in ModelAccess, remove any attempts to set the OntModelSelectors.
2013-05-17 17:25:13 -04:00
j2blake
1d8da55fdb VIVO-82 Use ModelAccess to get or set the InferenceOntModel
a.k.a the Inferred Full model
2013-05-17 15:05:24 -04:00
brianjlowe
eebb205723 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-17 15:03:57 -04:00
brianjlowe
0b2896acc2 application ontology work 2013-05-17 15:03:36 -04:00
j2blake
cba000c58b VIVO-82 Use ModelAccess to get or set the BaseOntModel
a.k.a the Base Full model, or AssertionsModel
2013-05-17 14:15:25 -04:00
j2blake
9b7f6c92e6 VIVO-82 Use ModelAccess to get or set the BaseOntModel
a.k.a the Base Full model, or AssertionsModel
2013-05-17 13:19:46 -04:00
j2blake
6a4c7ba6fc VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model) 2013-05-17 12:37:49 -04:00
j2blake
4e4384bd3e VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model) 2013-05-17 12:28:48 -04:00
j2blake
0a15a6df7d VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model) 2013-05-17 11:41:47 -04:00
j2blake
1c95d4e4a9 VIVO-82 Use ModelAccess to get or set the UserAccounts model 2013-05-16 18:11:13 -04:00
j2blake
4764751905 VIVO-82 Use ModelAccess to get or set the Display Model 2013-05-16 18:05:50 -04:00
j2blake
416e98f5ab VIVO-82 Split WebappDaoSetup into ContentModelSetup and ModelMaker setup. 2013-05-16 16:42:57 -04:00
j2blake
0e34b459e5 VIVO-82 Refactoring WebappDaoSetup to clarify the model setup. 2013-05-16 14:04:04 -04:00
Stephen V. Williams
32395cbac2 Fixed controller for CSV output, added button and coorsponding js and png 2013-05-15 14:53:31 -06:00
Stephen V. Williams
96bed7ce03 first pass at creating a csv download option. TODO icons on page, debug failing load 2013-05-14 14:40:17 -06:00
j2blake
6123f41d95 VIVO-87 First attempt at a caching filter.
Appears to work with Firefox cache and Chrome cache, except for language-dependent stuff.

Is that because it isn't configured correctly, or is it because Firefox and Chrome aren't attempting to keep more than one version of a page in their caches? Even if they do see a "Vary: Accept-Language" header?
2013-05-14 16:37:29 -04:00
brianjlowe
ddf101d6ae adding license tag to ApplicationConfigurationOntologyUtils.java 2013-05-14 16:14:32 -04:00
brianjlowe
b5b39638a1 initial work on VIVO-60
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
2013-05-14 16:04:40 -04:00
brianjlowe
1ab53d0b02 initial work on VIVO-60 application ontology support for property/range combinations 2013-05-14 15:54:03 -04:00
tworrall
41850cecb4 more template updates for i18n 2013-05-14 13:49:19 -04:00
tworrall
63445aa249 the startupStatus-displayRaw template does not have access to the i18n freemarker variable, so backing those changes out 2013-05-14 11:32:50 -04:00
tworrall
62f2074dc9 updated the adjustFontSize function to include more checks 2013-05-14 11:04:04 -04:00
tworrall
c150b58c17 removed values that have yet to be translated 2013-05-13 12:21:25 -04:00
tworrall
fa68e0c057 template changes for internationalization -- replaced displayed text with calls to properties file containing actual strings 2013-05-13 12:17:39 -04:00
j2blake
6d7f8e05c8 VIVO-84 Use language filtering on the display model
This doesn't answer the questions:
1) How do we edit new pages or existing pages?
2) What is the generalized procedure for adding another language?
2013-05-09 12:24:01 -04:00
j2blake
1b890a3767 NIHVIVO-3993 Get rid of NavigationController
Written for release 1.1, but never was used.
2013-05-07 16:11:44 -04:00
j2blake
c7b104ca40 Cleanup: remove unused imports and unneeded casts. 2013-05-07 13:27:44 -04:00
tworrall
bb2ceaeea3 display a time indicator while the delete is being processed 2013-05-07 11:00:01 -04:00
j2blake
a314892277 Language file not found should be debug, not info. 2013-05-06 10:21:19 -04:00
tworrall
90441e3969 modified index page to prevent a fourth column that displays outside the standard margins 2013-05-03 16:23:14 -04:00
tworrall
257f0c4c08 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-02 12:32:31 -04:00
tworrall
afbf429165 additional home page redesign changes 2013-05-02 12:31:54 -04:00
Jim Blake
25236f70e7 Merge pull request #3 from VIVO-IFest/I18n
I18n - example cases and work from the Implementation Fest 2013
2013-05-01 14:47:01 -07:00
tworrall
1ca0904911 changes for the home page redesign 2013-04-30 14:47:31 -04:00
j2blake
8f1f084c5b Proof of concept - User accounts 2013-04-26 23:58:50 -04:00
j2blake
bf2ed5c339 Proof of concept - Image upload 2013-04-26 23:50:17 -04:00
j2blake
c59076a19a Improve the look of the language selection flags 2013-04-26 23:44:17 -04:00
j2blake
96336cfbfd Improve debug statements 2013-04-23 17:28:46 -04:00