Commit graph

594 commits

Author SHA1 Message Date
nac26
aaf4458cbf missed a couple files on that last commit due to copying directories from my local working copy... NIHVIVO-556 2010-10-26 17:27:42 +00:00
nac26
8ccfef4fcc more tweaks to wilma to correct issues with theme images (visualization, property groups, and editing) and markup conflicts for custom editing forms NIHVIVO-556 2010-10-26 17:17:37 +00:00
mb863
5b1a9ed4b9 Added back menu.ftl and footer.ftl to VIVO/themes/wilma/templates because VIVO/themes/wilma/templates/page/basic-Page.jsp needs these templates to function properly 2010-10-25 19:39:50 +00:00
mb863
97720d3720 Further development of Wilma theme, still include a lot of temporary files and directories. There are duplicated files, wrong file image location, still a work in progress. 2010-10-25 18:43:26 +00:00
rjy7
3dd0b5163f NIHVIVO-1234 Restored version of home page controller and templates that uses a pre-generated body string, like other pages, in order to support themes that use page.ftl instead of a page-home.ftl. 2010-10-25 18:20:32 +00:00
rjy7
33981afe1d NIHVIVO-1234 Initial version of HomePageController and templates 2010-10-22 21:39:17 +00:00
mb863
1d84201acb Added new utils.js files and folder under js for javascript code need it for the theme. 2010-10-06 20:32:00 +00:00
mb863
f7d4c653b5 Deleted vivo/themes/wilma/js and moved files to webapp/web/js 2010-10-06 18:18:08 +00:00
mb863
69d548436f NIHVIVO-555. Added comment to page.ftl and added new path files to the
license-insertion process file
2010-10-06 16:08:25 +00:00
mb863
7aca168460 NIHVIVO-555. Deleted comment 2010-10-06 15:56:12 +00:00
mb863
e164e2af8e NIHVIVO-555. Added a list of files and directories that are known exceptions to the license-insertion process. 2010-10-06 15:38:43 +00:00
mb863
a18bee2b6b Removed jsp's from new theme based on work in revision 6026 on VITRO trunk. 2010-10-06 14:22:07 +00:00
mb863
78a152ea12 NIHVIVO-555, NIHVIVO-559. Introducing new default VIVO theme. Work in progress. 2010-10-06 14:16:12 +00:00
nac26
7713dd2ca1 Merge r1452 from rel-1.1-maint branch. Added commented-out div for those looking to apply institutional branding. 2010-10-05 16:22:06 +00:00
nac26
5bb4b7794f Merge r1445 from rel-1.1-maint branch. Moving 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. 2010-10-04 23:39:05 +00:00
rjy7
1bd624d550 NIHVIVO-1187 Migrate handling of empty or invalid query from PagedSearchController to FreemarkerPagedSearchController 2010-10-01 20:53:14 +00:00
nac26
96c91a9195 Merge r1431,1436 from rel-1.1-maint branch (IE6 fix for coathorship visualization page) NIHVIVO-954 2010-10-01 20:01:46 +00:00
nac26
eba31a884a Merge r1430 from rel-1.1-maint branch (IE fix for search bar width) 2010-10-01 18:42:09 +00:00
rjy7
f54cbe5b92 NIHVIVO-650 Display image on new (Freemarker) individual profile page. Add <@url /> directive to generate img src value. 2010-09-21 16:05:38 +00:00
rjy7
f776d5de09 NIHVIVO-650 Display label, moniker, and sparkline visualization on Freemarker version of individual profile page 2010-09-09 21:56:39 +00:00
rjy7
5b25d92181 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:26 +00:00
rjy7
8ac8b75f5f Renamed Freemarker macro files. Implemented data input portion of main site admin page in Freemarker. 2010-08-30 22:06:18 +00:00
rjy7
e2dae6baf8 Styling of search term on search results page 2010-08-27 19:30:45 +00:00
rjy7
b58b2b4b34 Style tweaks on search results page 2010-08-27 19:24:01 +00:00
rjy7
1e70c2c821 Add previous and next links to search result paging. Small style changes. 2010-08-27 18:47:58 +00:00
cdtank
8372464464 1. Added updated flash vis from Asik.
2. Modified the front end for person level vis so that when the flash vis height decreases it does not leave a trail of whitepace below it. All the wrapping containers adjust properly now.
3. Made the person pub count use set instead of list. I had already made other viss do this.
2010-07-30 17:29:34 +00:00
cdtank
0e745f94c3 1. Added updated flash vis from Asik.
2. Refactored code.
2010-07-28 21:44:14 +00:00
mb863
dc2ac29d13 Fxx css colors for Main NAv 2010-07-27 19:31:35 +00:00
mb863
e12810ec1f NIHVIVO-1015: Fixed: Cropping photo creating extra gap when reducing browser size 2010-07-26 19:35:01 +00:00
mb863
c9d16820fe merge -c 1160 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-26 15:36:05 +00:00
mb863
be9082a691 Added css property min-height to #content, so the height of pages is consistent and provide more white space. 2010-07-26 13:15:39 +00:00
cdtank
94b6c47294 1. Made style changes to person level vis front end.
2. Updated co-author vis from Asik.
3. Made code changes so that graphml sent to the flash vis will always be ordered by node ids instead of letting flash vis handle it.
2010-07-23 21:13:13 +00:00
cdtank
2f2e790eba 1. Updated flash vis form Asik. 2010-07-22 22:10:57 +00:00
cdtank
d9793ffb9f 2010-07-22 22:09:32 +00:00
cdtank
53987ce8f3 1. Updated flash vis form Asik.
2. Modified the fix for GUESS compatibility with coauthorship graphml file
2010-07-22 21:38:45 +00:00
nac26
e1a09ae033 merge from rel-1.1-maint branch: collation by subclass functional when property groups are enabled. New style to handle h5.collate NIHVIVO-846 2010-07-22 21:27:37 +00:00
rjy7
9eebeba4f9 merge -r 905:908 -r 922 -c 946 -r 984:986 -r 1014:1029 from 1048 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 18:44:32 +00:00
nac26
7dedb2720e merge from rel-1.1-maint branch: verbose property display is back, empty groups are almost there NIHVIVO-845, NIHVIVO-848 2010-07-22 16:00:32 +00:00
nac26
1dafec9142 merge from rel-1.1-maint branch: style fix to ensure full-page visualization (flash) does not over-extend on right side of the page 2010-07-22 15:24:13 +00:00
cdtank
50dd3ba19f 1. Fixed the issue when the author's name was really really long, flash vis used to create a scrollbar just for the legend. We made use of ellipsis in case of really long names.
2. The same for the sidebar author names.
3. Removed unused code.
2010-07-21 21:04:55 +00:00
cdtank
4de05da6fa 1. Adding updated co-author vis from Asik. 2010-07-21 17:00:14 +00:00
cdtank
7440b856f1 1. Made changes to wordings per Katy's request.
2. Fixed the separator issue for list of coauthors csv file.
3. Made style fix for person level vis.
2010-07-21 16:17:23 +00:00
cdtank
32f9572442 1. style change so that when window of person level vis is reduced we try to nicely place the sidebar content. there is still a style bug remaianing but need to talk with Nick C before implementing the fix. 2010-07-21 14:48:08 +00:00
rjy7
e4a657a79c Merge r960 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-20 23:41:04 +00:00
rjy7
48f664525b Merging r886 r905 r914:918 r923 r933:937 r957 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-20 23:36:58 +00:00
cdtank
5bc9a7dfae 1. Updating co-author flash vis with file from Asik. 2010-07-19 23:04:25 +00:00
cdtank
6f94c047ef 1. Made changes to incorporate conditional wordings for side-bar in person level vis. 2010-07-19 19:14:49 +00:00
nac26
c491d316a3 Fix for editing/deleting data properties with property groups enabled NIHVIVO-398 2010-07-16 17:01:33 +00:00
nac26
84b458402e viva la property groups! NIHVIVO-398 2010-07-16 12:48:12 +00:00
nac26
bd8b6e8da4 removing page.ftl from vivo-basic theme to minimize confusion 2010-07-16 12:47:23 +00:00