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

385 commits

Author SHA1 Message Date
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
rjy7
09f16809fd NIHVIVO-1024 Implement educational training custom form as a single-step form. Merged two css files. 2010-09-02 19:54:03 +00:00
rjy7
3e06d2849e Moved Freemarker SiteAdminController 2010-08-31 19:37:23 +00:00
rjy7
f01c2f9c0f Removed test output from a template 2010-08-31 18:35:54 +00:00
rjy7
849ea3a201 Finalized Freemarker version of main site admin page. 2010-08-31 18:33:51 +00:00
rjy7
a79d4067a6 Reimplementing main site admin page in Freemarker: ontology editor panel 2010-08-31 17:12:53 +00:00
rjy7
c27155a696 Reimplementing main site admin page in Freemarker: site configuration panel 2010-08-30 22:43:28 +00:00
rjy7
fa247f1f79 Renamed Freemarker macro files. Implemented data input portion of main site admin page in Freemarker. 2010-08-30 22:06:17 +00:00
rjy7
2c6ddaab64 Rename Freemarker search result templates. Initial work on moving main site admin page to Freemarker: login form. 2010-08-30 19:39:49 +00:00
rjy7
dc331e515a Style tweaks on search results page 2010-08-27 19:24:00 +00:00
rjy7
5d53dd4b2b Add previous and next links to search result paging. Small style changes. 2010-08-27 18:47:56 +00:00
rjy7
589383f15b Handle search error message from Freemarker controller and template. 2010-08-27 16:52:26 +00:00
rjy7
73024a4d03 Reimplement search controller and search results display template in Freemarker. Error cases not handled yet. 2010-08-27 15:52:30 +00:00
rjy7
3dbbf13cd7 NIHVIVO-564 Dump directive displays a message rather than throwing an error if the variable is undefined in the data model. 2010-08-26 20:51:55 +00:00
rjy7
f71dc53a63 Modify IndividualTemplateModel.getProfileUrl() to return correct url for individuals with uris that are not in the default namespace. 2010-08-25 16:28:15 +00:00
rjy7
028f4c038f Upgrading to jQuery UI 1.8.4 2010-08-19 13:36:00 +00:00
rjy7
51123056d0 Upgrading to jQuery UI 1.8.4 2010-08-19 13:32:58 +00:00
rjy7
5c9b3cf8da NIHVIVO-564 Style modifications for dump output 2010-08-09 18:59:24 +00:00
rjy7
a0e94628eb NIHVIVO-564 Refined method list output by describe directive 2010-08-09 18:46:29 +00:00
rjy7
698d0877c3 NIHVIVO-564 Describe directive to display methods declared on a template model object that are accessible to the template. 2010-08-09 16:31:22 +00:00
jeb228
f8176ed041 NIHVIVO-762 do server-side validation as well as client-side. Do MD5 encoding on the server side and not on the client side. 2010-08-09 13:35:09 +00:00
rjy7
216d7a7905 NIHVIVO-564 Help directive for directive help output. 2010-08-05 19:54:24 +00:00
rjy7
91468db876 NIHVIVO-564 Rearchitected dump directives to use shared helper methods rather than having dumpAll template call dump directive. 2010-08-05 19:25:12 +00:00
rjy7
528414e4c7 Some renaming in dump directives 2010-08-05 15:25:03 +00:00
nac26
8bef6badf4 removed white background from #formLogin, cleaned up file. Still have question about "noOutterBox". Looks like a typo but can't find this or "noOuterBox" being used in any other file so left it for now 2010-08-03 13:11:37 +00:00
nac26
ac652f25d2 whoops...we were using login_process.jsp after all (during logout) restoring from rev 5505 via svn copy NIHVIVO-1000 2010-07-29 23:05:33 +00:00
rjy7
b90efc74fb NIHVIVO-564 Added infrastructure for dumping template model objects. 2010-07-29 17:39:56 +00:00
rjy7
5e8eb80732 NIHVIVO-564 Modifications to directive help output. Included changing template directive iface to an abstract class that provides a default help() method and some utilities. 2010-07-29 17:08:27 +00:00
rjy7
8ccac59d4a NIHVIVO-564 data model dump: add help for directives in the data model 2010-07-29 15:26:37 +00:00
rjy7
2a50ff7f85 NIHVIVO-564 Add name of containing template to dataModelDump output 2010-07-29 14:03:27 +00:00