litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1413 commits 9 branches 0 tags 258 MiB
Commit graph

414 commits

Author SHA1 Message Date
jeb228
a7a083c7b3 NIHVIVO-1230 NIHVIVO-1231 Example implementation of the Freemarker templates to show revision info. 2010-10-27 19:57:57 +00:00
rjy7
9941cb206e NIHVIVO-1230 Added a comment 2010-10-27 15:00:57 +00:00
rjy7
9b3ac410c2 NIHVIVO-1230 Added stub for version info in FreemarkerHttpServlet and templates 2010-10-27 14:51:50 +00:00
nac26
a1e27c5935 added login FreemarkerComponentGenerator for use in JSPs as we work on the transition to freemarker 2010-10-27 13:13:27 +00:00
rjy7
df3a3dd1c7 NIHVIVO-1234 Removed separation of body and root maps in Freemarker controllers. Combine everything into one map, which includes the name of the body template also, to be invoked from the page template. Simplifies the logic considerably, in both controllers and templates, and allows the template author to dump the name of the body template rather than having to inspect the controller code. 2010-10-27 01:27:52 +00:00
nac26
e5a69d30c5 changed div targeted for back to top so this will work for both vivo-basic and wilma (this is only temporary) 2010-10-26 17:12:44 +00:00
bkoniden
c5e3d2f9cd Merging r6206 from branched/iu-vis-dev-branches/vitro-post-1.1 . Adding temporal visualization code to trunk. 2010-10-26 16:47:44 +00:00
mb863
f4a5fadde9 Deleted unnecessary end p tag 2010-10-25 18:11:49 +00:00
rjy7
3a0feaeff2 NIHVIVO-1234 Initial version of HomePageController and templates 2010-10-22 21:39:14 +00:00
jeb228
0ff41b8ac8 NIHVIVO-736 Fix JSP syntax errors, introduced by previous changes. 2010-10-22 17:52:49 +00:00
jeb228
e841c8d546 NIHVIVO-762 removed md5.js and the "crypto" JavaScript package from Dojo. Not needed since we aren't doing client-side encryption of passwords. 2010-10-15 14:22:16 +00:00
jeb228
66559f58ab NIHVIVO-736 Modify JSPs to use the <vitro:confirmLoginStatus> custom JSP tag. 2010-10-14 19:10:21 +00:00
jeb228
18de61ca20 NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-13 20:46:41 +00:00
jeb228
02e32428bd NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-13 15:54:11 +00:00
jeb228
4dbf19c9c0 NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-13 14:17:50 +00:00
jeb228
172f7589c1 NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-08 19:10:44 +00:00
jeb228
c2fa36316f NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-07 20:52:57 +00:00
jeb228
bb07558b19 Merge 6053 from branch - Add license lines to entityListPages.jsp and LuceneIndexFactory.java 2010-10-07 13:58:41 +00:00
bdc34
b27045fe6c Fixing a lucene indexing bug when a URI of an individual is changed. NIHVIVO-1192 2010-10-06 21:52:15 +00:00
bdc34
06f13be16d Fixing problem with collation. NIHVIVO-1190 2010-10-06 21:52:12 +00:00
bdc34
c08c2fba9b Addding paged resutls to index pages. NIHVIVO-1145 2010-10-06 21:52:10 +00:00
bdc34
c3cb7b05a2 Fixing page index on lucene based tabs. NIHVIVO-1143 
Conflicts:

	webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java
	webapp/web/templates/entity/entityListForTabs.jsp
 2010-10-06 20:54:29 +00:00
mb863
c3ef4d3c43 2010-10-06 20:41:52 +00:00
mb863
45a4f8e690 added supersleight.js to jquery_plugins and added new pah to known_exceptions.txt 2010-10-06 20:30:20 +00:00
bdc34
f0d55d6875 merge 5911 from nihvivo-rel-1.1-maint to trunk 2010-10-06 20:02:20 +00:00
mb863
4549e8e610 2010-10-06 19:40:09 +00:00
bjl23
849680d4fa button renaming for NIHVIVO-1201 2010-10-06 17:53:24 +00:00
ass92
1186b19920 NIHVIVO 1196 : Text change for radio buttons. 2010-10-06 17:41:06 +00:00
jeb228
b07049a116 NIHVIVO-736 begin the transition from LoginFormBean to LoginStatusBean. 2010-10-06 16:06:25 +00:00
nac26
ae449f9f2c Merge r6025 from nihvivo-rel-1.1-maint branch. Moved footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. Updated include paths for all templates that include these 3 files. 2010-10-05 03:13:14 +00:00
rjy7
51e294d1af NIHVIVO-1187 Migrate handling of empty or invalid query from PagedSearchController to FreemarkerPagedSearchController 2010-10-01 20:53:13 +00:00
bjl23
183ce8eb33 merging rdf link tag addition into trunk 2010-10-01 18:37:25 +00:00
rjy7
5bc5c0b93c NIHVIVO-1176. Removed themeStylesheetDir from template model, and replaced with themeDir. Also modified stylesheet and script addFromTheme methods so the prepend only the theme directory; the specific stylesheet or css directory must be added to the path argument. 2010-10-01 14:55:03 +00:00
ass92
717cbc68ce NIHVIVO-438 code modification to include export option for ontologies. 2010-09-29 14:56:37 +00:00
mb863
1af3b71b0b Added describe to reveal methods available to scripts. 2010-09-28 18:38:48 +00:00
rjy7
22cec61b5e Merge r5942-5952 from nihvivo-rel-1.1.-maint: custom sorting and collation 2010-09-28 15:02:04 +00:00
rjy7
68e5ebefc2 NIHVIVO-650 Some reorganization of template model classes. Fix for link list display on individual profile page. 2010-09-22 18:06:57 +00:00
rjy7
7b58a73c67 NIHVIVO-650: Links and image display; fixed a bug in admin panel display. 2010-09-21 19:49:43 +00:00
rjy7
e2407f7b01 NIHVIVO-650 Removed url directive from template data model, and replaced with path to the images directory. 2010-09-21 16:13:06 +00:00
rjy7
72d43f05a5 NIHVIVO-650 Display image on new (Freemarker) individual profile page. Add <@url /> directive to generate img src value. 2010-09-21 16:05:36 +00:00
rjy7
676d22b3e5 NIHVIVO-1150 Refactor ImageUploadController authorization-related methods to a separate AuthorizationHelper class so they can be used by other pages too. 
Move message in classGroups template to separate template.
 2010-09-20 16:19:04 +00:00
rjy7
c0a8d603ed Move template names to enum in FreeMarkerHttpServlet and constants in subclasses. 2010-09-20 15:40:35 +00:00
rjy7
9f59c4aec8 Merge r5890 from nihvivo-rel-1.1-maint 2010-09-16 20:34:14 +00:00
bjl23
7e46f1ed02 merging picklist optimizations back into trunk 2010-09-16 19:28:34 +00:00
rjy7
8547665029 NIHVIVO-1149 Reintegrate dev-fmservlet branch after finishing restructuring of FreemarkerHttpServlet and subclasses. Two files had to be copied manually. 2010-09-15 21:32:32 +00:00
rjy7
61956f4cf5 NIHVIVO-650 Display label, moniker, and sparkline visualization on Freemarker version of individual profile page 2010-09-09 21:57:13 +00:00
rjy7
3269252aaa Initial work moving individual profile page to Freemarker. Includes temporary servlet mappings for new Freemarker page. Allow adding script tags to the page head element. 2010-09-08 20:37:28 +00:00
jeb228
140eaef670 NIHVIVO-736 Create a Login.java controller to replace login_process.jsp. 2010-09-03 20:58:14 +00:00
rjy7
fe6cde2220 NIHVIVO-1024 Fixed error in clearFields() method of customFormUtils from last commit: field val was not being cleared. When type selection changes, prevent emptying of acSelector field if a new type value has been entered manually. 2010-09-03 20:18:36 +00:00
rjy7
4342f28e80 NIHVIVO-1024 When returning from validation error in educational background form (and roles form in repair mode), hide org name validation error if org name field is hidden. 2010-09-03 19:32:34 +00:00