Commit graph

260 commits

Author SHA1 Message Date
mb863
9338e2ca0e NIHVIVO-556: page-ftl and page-homepage.ftp don't use any more a wrapper div. Also, HTML5 footer element is styling the footer of those templates. div#footer-content was styling the footer before and it has been deleted. 2010-10-29 15:55:41 +00:00
rjy7
676baeb596 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:17 +00:00
mb863
8d0e24df42 NIH-VIVO556: Added styles to the theme 2010-10-28 19:26:14 +00:00
nac26
4386a22da0 NIHVIVO-556 removed temporary homeBody.jsp used to render the home page while the controllers were being worked out. Also including login block (login.ftl) on page-home.ftl now. First stab at making this widget like. Would like to remove login.ftl from theme and place in vitro core. 2010-10-28 16:45:05 +00:00
rjy7
96ff5c99b5 NIHVIVO-1234 Handle routing of a request for the home page to the HomePageController by forwarding from TabController 2010-10-28 15:09:20 +00:00
mb863
d431495481 NIHVIVO-556: Wilma clean up and housekeeping. 2010-10-27 22:11:52 +00:00
nac26
835bfff2db NIHVIVO-556 renamed top-level.css to menupage.css and updated some styles for current tabs related to alphaIndex and individual font size 2010-10-27 15:58:07 +00:00
rjy7
1e051cdac1 NIHVIVO-1230 Added stub for version info in FreemarkerHttpServlet and templates 2010-10-27 14:51:51 +00:00
nac26
e2d5dfbc24 NIHVIVO-556 removed duplicate import of individual.css and added rule to underline anchors 2010-10-27 14:27:35 +00:00
nac26
545f5ddc8a Couldn't get the login to work on the home page after refactoring in JSP/FTL mashup world, so disabling for now NIHVIVO-556 2010-10-27 13:48:40 +00:00
nac26
f7517ba34d Markup cleanup, style tweaks and some refactoring of the home page for Wilma. Turns out that all requests for tabs were being routed to the new HomePageController since it had "/index.jsp" set as its url-pattern under the servlet-mapping in web.xml. This isn't going to work as it made every tab render using page-home.ftl. Restored TabController servlet mapping in web.xml temporarily and will discuss potential solutions with Rebecca. NIHVIVO-556 NIHVIVO-1234 2010-10-27 13:21:55 +00:00
rjy7
10c352dbf9 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:54 +00:00
mb863
a78210e137 Updated hightlights section with dummy/real content 2010-10-27 00:28:27 +00:00
mb863
d342ae5b5b NIHVIVO-1234. Added <link> elements to the head. 2010-10-26 23:49:40 +00:00
mb863
9f967b2f90 Fixed picto font rendering. 2010-10-26 21:08:12 +00:00
mb863
1e0429119b Added dummy/real content to page-home.ftl. 2010-10-26 19:22:28 +00:00
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