From 2e6163aeb62c06dd09349be963570360f4c29ce8 Mon Sep 17 00:00:00 2001 From: cdtank Date: Wed, 5 Jan 2011 00:51:40 +0000 Subject: [PATCH] 1. Cleaned up coauth & copi person level pages. 2. Modified styles per recommendation from IU Designer Elisha. 3. Made changes to content for different sparkline content providers. --- .../personlevel/coauthor_style.css | 84 -------- .../personlevel/coinvestigator_style.css | 103 ---------- .../css/visualization/personlevel/page.css | 191 ++++++++++++------ .../css/visualization/visualization.css | 10 +- .../individual/individual--foaf-person.ftl | 1 - .../individual-sparklineVisualization.ftl | 12 +- .../coAuthorshipSparklineContent.ftl | 11 +- .../copi/coInvestigationSparklineContent.ftl | 11 +- .../grant/personGrantSparklineContent.ftl | 11 +- .../personlevel/coAuthorPersonLevel.ftl | 101 ++++----- .../personlevel/coPIPersonLevel.ftl | 105 +++++----- .../personPublicationSparklineContent.ftl | 6 +- 12 files changed, 269 insertions(+), 377 deletions(-) delete mode 100644 productMods/css/visualization/personlevel/coauthor_style.css delete mode 100644 productMods/css/visualization/personlevel/coinvestigator_style.css diff --git a/productMods/css/visualization/personlevel/coauthor_style.css b/productMods/css/visualization/personlevel/coauthor_style.css deleted file mode 100644 index 33e5cf12..00000000 --- a/productMods/css/visualization/personlevel/coauthor_style.css +++ /dev/null @@ -1,84 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ -.spacer{ - font-size:0; line-height:0; clear:both;} - - -/* ----------------- body start --------------------------- */ -#body{ - max-width:900px; - min-width:800px; - margin:0 auto; - position:relative; - background: white; -} -#bodyPannel{ - background: #FFFFFF; -/* width:765px; - float:left;*/ - /*padding-top: 0; - padding-right: 28px; - padding-bottom: 0;*/ - padding-left: 16px; - height: 840px; -} - -#dataPanel { - margin-top: 50px; - width: 25%; - background-color: #f7f9f9; -/* height: 80%; */ - padding-left: 10px; - padding-bottom: 30px; -} - -#dataPanel div { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} -#dataPanel .italicize { - font-style: italic; -} -#dataPanel .bold { - font-weight: bold; - color:#13968c; - font-size: 14px; -} -#dataPanel .author_stats .numbers { - text-align: right; - width: 40px; - float:left; -} - -/* container override from liquid.css */ -.container { - width: inherit; -} - -#incomplete-data{ - width: 75%; - margin : auto; - line-height: 150%; - color: #595b5b; - margin-left: 0px; -} - -.fileDownloadPlaceHolder{ - padding-top: 20px; - height: 20px; -} - -#profileTitle{ - - padding: 10px; - padding-left: 5%; - background-color: #2A2A2A; - color: white; - width: 50%; - margin-left: -10px; - margin-top: -10px; -} - -#table_heading{ -/* margin-bottom:20px; */ - width: 80%; -} diff --git a/productMods/css/visualization/personlevel/coinvestigator_style.css b/productMods/css/visualization/personlevel/coinvestigator_style.css deleted file mode 100644 index daacfe85..00000000 --- a/productMods/css/visualization/personlevel/coinvestigator_style.css +++ /dev/null @@ -1,103 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -spacer{ - font-size:0; line-height:0; clear:both;} - - -/* ----------------- body start --------------------------- */ -#body{ - max-width:900px; - min-width:800px; - margin:0 auto; - position:relative; - background: white; -} -#bodyPannel{ - background: #FFFFFF; -/* width:765px; - float:left;*/ - /*padding-top: 0; - padding-right: 28px; - padding-bottom: 0;*/ - padding-left: 16px; - height: 840px; -} - -#dataPanel { - margin-top: 50px; - width: 25%; - background-color: #f7f9f9; -/* height: 80%; */ - padding-left: 10px; - padding-bottom: 30px; -} - -#dataPanel div { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} -#dataPanel .italicize { - font-style: italic; -} -#dataPanel .bold { - font-weight: bold; - color:#13968c; - font-size: 14px; -} -#dataPanel .investigator_stats .numbers { - text-align: right; - width: 40px; - float:left; -} - -/* container override from liquid.css */ -.container { - width: inherit; -} - -#incomplete-data{ - width: 75%; - margin : auto; - line-height: 150%; - color: #595b5b; - margin-left: 0px; -} - -.fileDownloadPlaceHolder{ - padding-top: 20px; - height: 20px; -} - -#profileTitle{ - - padding: 10px; - padding-left: 5%; - background-color: #2A2A2A; - color: white; - width: 50%; - margin-left: -10px; - margin-top: -10px; -} - -#table_heading{ -/* margin-bottom:20px; */ - width: 80%; -} - -.investigator_name { - color: #13968c; - font-weight: bold; -} - -.neutral_investigator_name { - color: black; - font-weight: bold; -} - -.investigator_moniker { - color: #9C9C9C; -} - -#coinvestigations_table th { - vertical-align: top; -} diff --git a/productMods/css/visualization/personlevel/page.css b/productMods/css/visualization/personlevel/page.css index de1c0a8f..d73d18b1 100644 --- a/productMods/css/visualization/personlevel/page.css +++ b/productMods/css/visualization/personlevel/page.css @@ -8,33 +8,7 @@ a.no_href_styles { border: 0; } -/*.vis_stats {*/ - /*width: 760px;*/ -/* margin: 0; - padding-left:10px; - padding-top:10px; - background: #fff; - margin-left: 35%; - clear: right; -} -*/ -/*.vis-tables {*/ -/* width: 33%; */ -/* padding: 10px; - margin: 10px; - background-color: #FFF; - border: 1px solid #ddebf1; - float:left; - font-size: 0.8em; -} -*/ - .vis_stats { - /*width: 760px;*/ -/* margin: 0; - margin-left: 35%; - padding-left:10px;*/ - padding-top:10px; background: #fff; clear: right; width:67%; @@ -42,15 +16,13 @@ a.no_href_styles { } .vis-tables { -/* width: 33%; */ padding: 10px; - margin: 10px; background-color: #FFF; border: 1px solid #ddebf1; float:left; font-size: 0.8em; width: 44%; - margin-left: 0px; + margin: 0 10px 10px 0; } @@ -70,24 +42,11 @@ p.datatable { cursor: pointer; } -/* - -.datatable table thead th { - color: #4C4C4C; - background-color: white; +#sparkline-container { + margin-left: 33%; + width: 67%; } -.datatable table caption { - color: #16234c; - margin: 0; - padding: 0; - font-size: 14px; - background-color: white; -} - -*/ - - #profileImage img{ width: 90px; height: auto; @@ -106,16 +65,19 @@ p.datatable { vertical-align: bottom; } +.investigator_name, .author_name { color: #13968c; font-weight: bold; } +.neutral_investigator_name, .neutral_author_name { color: #13968c; font-weight: bold; } +.investigator_moniker, .author_moniker { color: #9C9C9C; } @@ -123,25 +85,25 @@ p.datatable { .sub_headings { color: #121b3c; padding-top: 10px; - margin-bottom: 0.3em; float:left; margin-right: 10px; } -.toggle_visualization{ - -/* - margin-bottom: 0.3em; - clear:left; +.toggle_visualization { + max-width: 180px; float:right; - width: 150px; -*/ - text-align: left; - margin-left: 84%; - margin-top: -8%; - max-width: 250px; - width: 22%; - height: 50px; +} + +#grant-count-sparkline-include, +#publication-count-sparkline-include { + float: left; + width: 50%; +} + +#coinvestigator-count-sparkline-include, +#coauthor-count-sparkline-include { + float: right; + width: 50%; } .sub_headings a { @@ -156,9 +118,9 @@ table.sparkline_wrapper_table td, th { #ego_profile { height: 1%; /* this was the key to killing the IE6 bug (no upper photo and sparklines jump on hover). Solution? Give the parent layout */ background: #fff; - padding-left:10px; - padding-top:10px; min-height: 100px; + float: left; + max-width: 50%; } #ego_label { @@ -195,6 +157,11 @@ table.sparkline_wrapper_table td, th { width: 50%; } +#visPanel { + float: right; + width: 600px; +} + .vis-tables table caption{ width: 100%; padding-bottom: 10px; @@ -230,4 +197,104 @@ table.sparkline_wrapper_table td, th { moniker{ margin-top: 0px; -} \ No newline at end of file +} + +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +.spacer{ + font-size:0; line-height:0; clear:both;} + + +/* ----------------- body start --------------------------- */ +#body{ + max-width:900px; + min-width:800px; + margin:0 auto; + position:relative; + background: white; +} +#bodyPannel{ + background: #FFFFFF; +/* width:765px; + float:left;*/ + /*padding-top: 0; + padding-right: 28px; + padding-bottom: 0; + padding-left: 16px;*/ + height: 840px; +} + +#dataPanel { +/* margin-top: 50px; + width: 25%; + background-color: #f7f9f9; + height: 80%; + padding-left: 10px; + padding-bottom: 30px;*/ + + border-color: #DFE6E6; + border: 1px solid; + background: #F7F9F9; + width:250px; + height:615px; + margin-top: 15px; +} + +#dataPanel div { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} +#dataPanel .italicize { + font-style: italic; +} +#dataPanel .bold { + font-weight: bold; + color:#13968c; + font-size: 14px; +} + +#dataPanel .investigator_stats .numbers, +#dataPanel .author_stats .numbers { + text-align: right; + width: 40px; + float:left; +} + + +#data-panel-content h4 { + padding-bottom: 0; +} + +#data-panel-content { + margin-left: 15px; + margin-top: 15px; +} + +/* container override from liquid.css */ +.container { + width: inherit; +} + +#incomplete-data { + line-height: 150%; + margin-right: 15px; +} + +.graphml-file-link { + padding-top: 20px; + height: 20px; + font-size: 0.9em; +} + +#profileTitle { + background-color: #2A2A2A; + color: white; + font-weight: bold; + line-height: 1em !important; + padding: 10px; + width: 54px; +} + +#table_heading{ +/* margin-bottom:20px; */ + width: 80%; +} diff --git a/productMods/css/visualization/visualization.css b/productMods/css/visualization/visualization.css index 905dc030..1cc8499f 100644 --- a/productMods/css/visualization/visualization.css +++ b/productMods/css/visualization/visualization.css @@ -6,7 +6,7 @@ span.incomplete-data-holder, #incomplete-data { - padding: 3px; + padding: 5px; font-size: 0.8em; color: #444; border: dotted 1px #eee; @@ -47,6 +47,14 @@ span.incomplete-data-holder, padding-bottom: 0px !important; } +.collaboratorship-link h3 a { + color: #2485AE; + font-size: 1em !important; + text-decoration: none; + +} + + #coauthorship_link_container, #coinvestigator_link_container { margin-top: 10px; diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 7e39e11a..aac4736e 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -156,7 +156,6 @@ ${headScripts.add("/js/jquery_plugins/getUrlParam.js", "/js/jquery_plugins/jquery.form.js", "/js/tiny_mce/tiny_mce.js", "/js/controls.js", - "http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D", "/js/toggle.js")} ${scripts.add("/js/imageUpload/imageUploadUtils.js")} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl index 2e030dad..96432bcb 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl @@ -14,16 +14,18 @@