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

296 commits

Author SHA1 Message Date
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
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
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
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
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
bdc34
f0d55d6875 merge 5911 from nihvivo-rel-1.1-maint to trunk 2010-10-06 20:02:20 +00:00
bjl23
849680d4fa button renaming for NIHVIVO-1201 2010-10-06 17:53:24 +00:00
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
mb863
1af3b71b0b Added describe to reveal methods available to scripts. 2010-09-28 18:38:48 +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
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
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