Commit graph

4249 commits

Author SHA1 Message Date
bdc34
97ef829204 Adding VitroURL in its own file. 2010-11-04 16:08:25 +00:00
jeb228
d9ea7672df NIHVIVO-1207 Create unit tests for Authenticate. The UserDaoStub and WebappDaoFactoryStub are created here instead of their usual location, because I plan to factor them out. 2010-11-04 14:51:40 +00:00
jeb228
631870cad2 NIHVIVO-1207 enhance stub classes for unit tests. 2010-11-04 14:50:38 +00:00
jeb228
78df1b181f NIHVIVO-1207 improve code formatting in Authenticate. 2010-11-04 14:45:19 +00:00
jeb228
8b2e38abca NIHVIVO-1207 improve log messages in Authenticate. 2010-11-04 14:42:58 +00:00
mb863
d22657b1c8 Converted tab to spaces 2010-11-04 13:50:14 +00:00
mb863
125dcc3014 NIHVIVO-1073. Viz image placeholder wasn't rendering properly. Changed image path. 2010-11-03 21:20:15 +00:00
mb863
b3d84103a1 NIHVIVO-1074: Added semantic markup to menupage--classgroup-people.ftl (work in progress). Clean up css for menupage.css too. 2010-11-03 20:56:58 +00:00
rjy7
45ac6e2eac Revert changes from revisions 6300, 6301, 6303. Didn't fix the login issue, and not a good solution anyway. 2010-11-03 20:22:59 +00:00
rjy7
ef9a5061d3 Comment. 2010-11-03 16:28:37 +00:00
rjy7
8cfe11d615 Added "templateType" to page and body template models so we know whether we're in a page or body template during processing. Changed a method name. 2010-11-03 14:52:31 +00:00
rjy7
74da549755 Comment 2010-11-03 02:59:26 +00:00
rjy7
28d3e0d50a NIHVIVO-1296 Enable login directly from home page rather than redirecting to dedicated login page. 2010-11-03 02:58:31 +00:00
rjy7
a7a5c821fb Combine addition of scripts and stylesheets into a single macro in the login widget 2010-11-03 02:26:48 +00:00
mb863
b1567facdc NIHVIVO-634: Deleted unnecessary <section> tag, and added proper code indentation. 2010-11-02 21:15:32 +00:00
mb863
57292e651d NIHVIVO-634: Created menupage.ftl (work in progress). 2010-11-02 20:53:45 +00:00
bjl23
2b9891ad6f NIHVIVO-1300 always serialize N3 as Turtle 2010-11-02 15:20:21 +00:00
mb863
32cd9c4d14 NIHVIVO-556: Added latest HTML5 JavaScript shiv for IE to recognize and style HTML5 elements. 2010-11-01 18:32:00 +00:00
jeb228
cb7fdf17ca NIHVIVO-1277 When referencing a file, assume that the FileByteStream resource contains the alias URL. 2010-10-29 20:28:08 +00:00
jeb228
a79b203a15 NIHVIVO-1277 When uploading a file, store the alias URL on the FileByteStream resource. 2010-10-29 20:27:42 +00:00
jeb228
fcf0eb527f NIHVIVO-1277 Create an updater that tries to insure that all FileByteStream resources have alias URLs. 2010-10-29 20:27:07 +00:00
jeb228
a5bff5bd00 NIHVIVO-1277 Define a property to store the Alias URL on a FileByteStream resource. 2010-10-29 20:25:48 +00:00
rjy7
c0d24139dc A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects. 2010-10-29 19:12:40 +00:00
rjy7
c178c8d922 NIHVIVO-1297 Undid the effects of revision 6246. This was a mistake, since including the body template from the page template rather than pregenerating the body string doesn't allow the addition of stylesheet tags to the page head. 2010-10-29 16:44:29 +00:00
rjy7
0bbe23a7fa NIHVIVO-1293 Corrected typo in variable name to show classgroup limitation on search results. Also added search.css from vivo-basic, as a temporary measure to format search results. 2010-10-28 20:16:15 +00:00
nac26
377a225b73 NIHVIVO-556 no longer necessary to call login.ftl from a jsp 2010-10-28 16:46:18 +00:00
rjy7
fababdd9d2 NIHVIVO-1234 Handle routing of a request for the home page to the HomePageController by forwarding from TabController 2010-10-28 15:09:17 +00:00
jeb228
ce99295729 Change the name of the loginName template variable to "username" so it doesn't conflict with the variable already in use in the footer. 2010-10-27 20:21:42 +00:00
jeb228
21bbd9e881 Fix ambiguous method call. 2010-10-27 20:06:00 +00:00
jeb228
a7a083c7b3 NIHVIVO-1230 NIHVIVO-1231 Example implementation of the Freemarker templates to show revision info. 2010-10-27 19:57:57 +00:00
jeb228
b8fefaee00 NIHVIVO-1229 break out a method for getBean(ServletContext) 2010-10-27 19:47:35 +00:00
rjy7
eed6e5a9d9 NIHVIVO-1287 Moved changes from PagedSearchController to FreemarkerPagedSearchController, since this is the active search controller in vivo and vitro 2010-10-27 18:57:13 +00:00
jeb228
2d5ef9d187 Use generics on ArrayList. 2010-10-27 17:01:27 +00:00
jeb228
2181d4178b Generify: User implements Comparable<User> 2010-10-27 17:01:00 +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
jeb228
236fe53ebe NIHVIVO-1229 Set up the RevisionInfo when the application is initialized. 2010-10-25 21:32:08 +00:00
jeb228
b438f7d36d NIHVIVO-1229 Create the RevisionInfoBean, with setup listener and unit tests. 2010-10-25 21:30:34 +00:00
jeb228
bc86f50c5b NIHVIVO-1229 Move the revision info file into WEB-INF/resources 2010-10-25 21:29:25 +00:00
mb863
f4a5fadde9 Deleted unnecessary end p tag 2010-10-25 18:11:49 +00:00
rjy7
7fab757f65 Add missing license tag. 2010-10-22 22:29:56 +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
a490d44617 NIHVIVO-1229 Fix the way revisionInfo works in productBuild. 2010-10-22 16:49:15 +00:00
jeb228
fe5a4f12cd NIHVIVO-1229 Add revisionInfo steps to the build files. Tweak the response parser in the utility. 2010-10-22 15:13:06 +00:00
rjy7
8263bd9cf1 NHVIVO-1218 Correct blank page on image upload error by removing overrides to getTemplateName() and getMap() in ExceptionResponseValues. 2010-10-22 15:10:08 +00:00