Commit graph

363 commits

Author SHA1 Message Date
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
rjy7
1ccde72b40 NIHVIVO-564 Going back to using toString() methods for template model dump since it already handles nested collections. Improvements to DumpDataModelDirective so it dumps out values as well as variable names. 2010-07-29 13:44:53 +00:00
rjy7
e6a65f5ad0 NIHVIVO-564 Dump directive 2010-07-28 17:48:03 +00:00
rjy7
f4b6f3e941 NIHVIVO-564 Change datatype of Script and Stylesheet collections from List to LinkedHashSet, to prevent duplication while retaining ordering. 2010-07-28 15:16:14 +00:00
rjy7
3317419fcf NIHVIVO-564 Enable adding stylesheets in dump ftls 2010-07-28 15:07:55 +00:00
rjy7
b9ac586c20 NIHVIVO-564 Work on dump directive 2010-07-27 22:00:13 +00:00
rjy7
83938a2c19 NIHVIVO-564 Work on dump directive 2010-07-27 21:49:40 +00:00
mb863
e7328ae668 merge r5446:5449 r5486 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-27 18:40:37 +00:00
bdc34
f4409580b4 Cleanup of webapp context root. Removing many unused jsp files and some unused controllers. NIHVIVO-1000 2010-07-27 15:31:19 +00:00
rjy7
ef3988022f NIHVIVO-825 Allow adding a list of scripts or stylesheets with a single call to add() or addFromTheme() 2010-07-27 15:16:07 +00:00
bdc34
2968a09613 merge to trunk. Fixing exceptions on submission of null value in dataproperty form. NIHVIVO-1021 2010-07-27 14:44:16 +00:00
nac26
cc0aab3814 merging from nihvivo-rel-1.1-maint branch: removing "new" from form headings in attempt to minimize user confusion NIHVIVO-1012 2010-07-26 21:12:40 +00:00
mb863
6978b85600 NIHVIVO-1015: Fixed: Cropping photo creating extra gap when reducing browser size 2010-07-26 19:33:23 +00:00
rjy7
6862104e24 Merge r5487 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-26 19:13:56 +00:00
rjy7
37c2990bba Merge r5484 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-26 18:40:28 +00:00
nac26
89f3bbfbd8 merge from nihvivo-rel-1.1-maint branch: removed unnecessary <br> 2010-07-24 21:52:47 +00:00
bdc34
ef3222d0d1 Merge to trunk. Removing debug statement. 2010-07-23 20:47:15 +00:00
bdc34
59801b8dcb Merge to trunk. Fixing error when deleting properties on front end NIHVIVO-953 2010-07-23 20:45:37 +00:00
mb863
0f7d3cbaca Merged manually some changes 2010-07-23 15:52:13 +00:00
ass92
1f4a99f770 Display statement correction. 2010-07-22 22:49:02 +00:00
nac26
4cd59ee32d merge from nihvivo-rel-1.1-maint branch: collation by subclass functional when property groups are enabled. Valid markup in either case NIHVIVO-846 2010-07-22 21:25:12 +00:00
bdc34
8413938501 Merge to trunk. Adding cancel button to default object property form. NIHVIVO-951 2010-07-22 20:48:12 +00:00
ass92
fb26b874de Filed download correction for merge individuals tool. 2010-07-22 20:30:09 +00:00