Commit graph

4249 commits

Author SHA1 Message Date
bjl23
0d93be55d4 merging avoidance of entity counts to trunk 2010-09-16 21:22:16 +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
d5664d93ec Some refactoring in FreemarkerHttpServlet 2010-09-16 15:50:37 +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
ac284cdae7 Reverting modifications to LoginFormBean class in r5832, r5834, because those changes did not take into consideration references from JSPs. 2010-09-14 21:17:58 +00:00
rjy7
b605b9ca89 Merge r5849 from nihvivo-rel-1.1-maint 2010-09-13 16:08:03 +00:00
jeb228
195c1fd931 NIHVIVO-736 Removed unused code from the LoginFormBean 2010-09-10 19:14:30 +00:00
rjy7
c923bf7ba7 Changed output of dump() method defined in BaseTemplateModel class 2010-09-10 15:01:57 +00:00
jeb228
57cbc5f1e0 NIHVIVO-736 Removed unused code and little-used code from the LoginFormBean 2010-09-10 14:48:33 +00:00
rjy7
3300b7cda7 NIHVIVO-650 Reworked Freemarker sparkline implementation for better controller/view separation 2010-09-10 14:24:00 +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
ca6d805771 NIHVIVO-564 Fixes for hash dump 2010-09-09 16:18: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
jeb228
e9fa47d7ed Cosmetic changes: reformat, organize imports, remove commented code. 2010-09-03 18:42:52 +00:00
jeb228
53ecff4f60 Cosmetic changes: reformat, organize imports, add generic type arguments. 2010-09-03 16:17:01 +00:00
jeb228
7d40f99158 VIVO-246 Add a filter to limit the lifetime of trivial sessions. 2010-09-02 20:14:37 +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
jeb228
ddd6de3c89 VIVO-241 In order to modify the image, the user must be logged in as editor OR may be self-editing. 2010-08-31 21:36:21 +00:00
jeb228
6765cecc54 When you begin fake self-editing, you're Admin account is logged out. 2010-08-31 21:25:31 +00:00
jeb228
83c1043c9f Clean up the logic and reformat the FakeSelfEditing code. No functional change. 2010-08-31 21:23:15 +00:00
rjy7
6660c14bd5 Fixed imports in freemarker SiteAdminController 2010-08-31 19:50:12 +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
79da8d30ed Remove icon definitions and error message markup from login controller and handle in templates instead. 2010-08-30 19:58:12 +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
2ef905d8a1 Undid debugging setting inadvertently committed in last revision. 2010-08-27 18:48:50 +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
jeb228
16c75b60ac NIHVIVO-1044 database.tld is based on open source code, so it must comply with the license even though we have modified it. 2010-08-26 16:16:25 +00:00
rjy7
1bbf1665b5 Direct links on index page to Freemarker IndividualListController instead of EntityListController 2010-08-25 18:23:30 +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
ca7cf6d861 Incorporate asserted vs inferred class distinction in method searching for custom views. Logic borrowed from MiscWebUtils.getCustomShortView() and extended to all custom view types. 2010-08-25 15:58:31 +00:00
rjy7
ff0aa17398 Updates to ViewFinder class to find custom templates 2010-08-25 14:45:02 +00:00
rjy7
49cbd0c171 Changed method name in BaseTemplateDirectiveModel 2010-08-24 18:17:41 +00:00
rjy7
1c21d921eb Increase template update delay in non-development build from default value of 5 seconds to 60 seconds. Those who are developing templates without restarting the server should set Environment.build = development in deploy.properties for delay of 0. 2010-08-23 20:07:14 +00:00
rjy7
07c3d735d6 NIHVIVO-803 Alternate implementation (commented out) of reordering in ReorderController 2010-08-23 18:12:12 +00:00
jeb228
393256b03d NIHVIVO-1096 Look for MIME-types that are specific to Internet Explorer, and translate them to recognized values. 2010-08-23 16:45:22 +00:00
rjy7
ff1e62c0a9 NIHVIVO-803 ReorderController doesn't need to set datatype explicitly, because it's done by the data property statement insertion method 2010-08-20 21:18:12 +00:00
rjy7
15aeaaa2ae NIHVIVO-803 Reimplementation of author reordering so application logic is moved server-side. Currently now in addAuthorsToInformationResource1.jsp and addAuthorsToInformationResource1.js. 2010-08-20 21:06:03 +00:00