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

535 commits

Author SHA1 Message Date
ass92
40d3b98e90 NIHVIVO-1307 code change for uploading file on "Convert csv to rdf" tool. 2010-11-12 18:02:18 +00:00
rjy7
70e116c8bb NIHVIVO-1304 Refactoring of widget code based on Brian Caruso's code review. 2010-11-12 18:02:06 +00:00
rjy7
7ad822efce NIHVIVO-1304 Allow a widget assets template to be absent without generating an error. 2010-11-11 01:19:56 +00:00
rjy7
8dc645cfb6 NIHVIVO-1304 Initial implementation of Widget directive. Requires two templates, one for assets and one for markup; would like to combine into a single template with two macros instead. 2010-11-10 19:50:28 +00:00
mb863
3eed766716 NIHVIVO-1315: Created temporary freemarker template for individual with generic classes. Once I have the controller ready I will wire data from the controller to the body template. 2010-11-09 21:55:29 +00:00
mb863
a564987e3c NIHVIVO-1316: Created temporary freemarker template. Once I have the controller ready I will wire data from the controller to the body template. 2010-11-09 21:54:32 +00:00
rjy7
e940ebc379 NIHVIVO-1304 Make request and context accessible through the Environment object so directives can reference them. 2010-11-09 17:12:10 +00:00
mb863
7f62ea5087 NIHVIVO-556. Organized html header elements. 2010-11-08 18:08:40 +00:00
bdc34
0028509f63 Fixed problem that was causing error on individual profile page when logged in. 2010-11-05 21:49:15 +00:00
mb863
594ebeda22 NIHVIVO-556: Temporary fix for not showing log-in widget after users log-in. I forgot I can't in Textmate commit files from VITRO and VIVO at the same time. That's why I am commiting this file. 2010-11-05 19:29:27 +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
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
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
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
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
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