From a817d4c6bbfdc087cadc415dc6948649df30806e Mon Sep 17 00:00:00 2001 From: manolobevia Date: Wed, 20 Jul 2011 17:41:49 +0000 Subject: [PATCH] NIHVIVO-2890: Made css files (ie6.css and ie7.css) for resolving browser layout issues theme agnostic. --- webapp/web/css/vitroIE6.css | 215 ++++++++++++++++++ webapp/web/css/vitroIE7.css | 153 +++++++++++++ .../freemarker/page/partials/headScripts.ftl | 10 +- webapp/web/themes/vitro/css/ie6.css | 177 +------------- webapp/web/themes/vitro/css/ie7.css | 102 +-------- 5 files changed, 383 insertions(+), 274 deletions(-) create mode 100644 webapp/web/css/vitroIE6.css create mode 100644 webapp/web/css/vitroIE7.css diff --git a/webapp/web/css/vitroIE6.css b/webapp/web/css/vitroIE6.css new file mode 100644 index 000000000..2d08d1ff8 --- /dev/null +++ b/webapp/web/css/vitroIE6.css @@ -0,0 +1,215 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/* Fix browser issues in IE6 browsers */ + +/* Fix for homepage in IE6 browsers */ +body { + background-position: center, 0; + background-repeat: no-repeat; +} +#intro h2 { + margin-left: 24px; +} +#intro p { + margin-left: 24px; +} +#search-home h3 { + margin-left: 0; +} +#search-field { + background-image: url("../images/search-interior-pages.gif"); + height: 32px; + width: 330px; +} +#search-field input.search { + padding-left: 14px; +} +#login { + margin-right: 0; +} +ul#browse-classgroups { + margin-left: 20px; +} +#browse-classes { + width: 620px; +} +ul#classes-in-classgroup.vis { + width: 40%; +} +#login-form p.submit { + margin-left: 15px; +} +ul#browse-classgroups a.selected { + background-position-x: 0; + background-position-y: 12px; +} +/* Fix for menupages */ +ul#vgraph-classes { + float: left; + width: 265px; + margin-left: 15px; +} +#browse-by { + padding-bottom: 20px; +} +ul#browse-classes { + width: 290px; + margin-left: 0; + padding-left: 10px; + margin-left: 15px; +} +#individuals-in-class { + width: 450px; +} +article.foaf-person { + width: 400px; + margin-left:10px; + margin-right: 10px; + padding: 0; + margin-bottom: 10px; +} +#profile-photo-display { + width: 620px; +} +#browse-classes { + width: 590px; +} +ul#classgroup-list.vis { + width: 38%; +} +.pagination li { + display: block; + float: left; +} +.pagination h3 { + float: left; +} +.pagination ul { + display: block; + float: left; +} +/* Fix for site admin: the wonders of the IE float model... +fix to maintain sanity in rendering sections of site admin targets IE7 and below */ +#adminDashboard .pageBodyGroup { + *float: none !important; + *display: inline !important; + *vertical-align: top !important; +} +/* Fix for individual pages */ +#individual-intro.person { + width: 100%; +} +.sparkline_text, +.collaboratorship-link-container { + width: 148px; +} +#individual-intro.person #individual-info { + width: 72%; +} +/* Fix for dropdown user menu */ +ul.dropdown { + z-index: 9999; +} +/* Fix for menupages */ +nav#alpha-browse-container { + width: 542px; +} +ul#alpha-browse-individuals { + width: 540px; +} +ul#alpha-browse-individuals a { + height: 30px; + margin-left: 0; + padding-left: 6px; + width: 8px; +} +#individuals-in-class { + width: 545px; +} +#individual-intro.person .individual-overview { + clear: left; +} +#find-by { + width: 445px; +} +/* Fix for photo upload */ +#photoUploadForm input.submit, +#photoUploadForm input.submit:visited, +#cropImage input.submit, +#cropImage input.submit:visited { + padding: 5px 5px 7px; + margin-left: -8px; +} +#photoUploadForm span.or, +#cropImage span.or { + display: block; + float: left; + padding-top: 10px; +} +/* Fix position for input type submit buttons */ +input.submit, +input.submit:visited, +input#submit, +input#submit:visited { + display: block; + float: left; + clear: both; + margin-left: 0; +} +/* Fix position for "Required fields" text */ +form.customForm #requiredLegend { + clear: both; +} +/* Fix for verbose mode */ +#verbose-mode { + float: left; + clear: left; + margin-top: -14px; +} +.verbose-toggle { + top: 12px; +} +#admin .uri-link { + padding-top: 5px; +} +/* Fix account management pages */ +table#account th { + position: relative; +} +.account-alpha-browse { + position: absolute; + float: none; + top: 7px; + right: 0; +} +#filter-roles { + clear: both; +} +#search-accounts { + width: 400px; +} +#search-accounts input[type="text"] { + float: left; +} +#search-accounts input[type="submit"] { + float: right; + margin-top: 0; +} +#add-account { + width: 400px; + margin-bottom: 20px; +} +#add-account span { + float: left; +} +#add-account input.add-account { + margin-top: 0; + margin-left: 5px; + float: right; +} +p.requiredHint { + clear: left; +} +add-account span.requiredHint { + float: none; + } \ No newline at end of file diff --git a/webapp/web/css/vitroIE7.css b/webapp/web/css/vitroIE7.css new file mode 100644 index 000000000..7f709257e --- /dev/null +++ b/webapp/web/css/vitroIE7.css @@ -0,0 +1,153 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/* Fix browser issues in IE7 browsers */ + +/* Fix for homepage */ +#search-field input.search { + padding-left: 14px; +} +#login-form p.submit { + margin-left: 20px; +} +/* Fix for site admin */ +/* the wonders of the IE float model...fix to maintain sanity in rendering sections of site admin */ +/* targets IE7 and below */ +#adminDashboard .pageBodyGroup { + *float: none !important; + *display: inline !important; + *vertical-align: top !important; +} +/* Fix for dropdown user menu */ +ul.dropdown { + z-index: 9999; +} +/* Fix for photo upload */ +#photoUploadForm input.submit, +#photoUploadForm input.submit:visited, +#cropImage input.submit, +#cropImage input.submit:visited { + padding: 5px 5px 7px; + margin-left: -8px; +} +#photoUploadForm span.or, +#cropImage span.or { + display: block; + float: left; + padding-top: 10px; +} +/* Fix position for input type submit buttons */ +input.submit, +input.submit:visited, +input#submit, +input#submit:visited { + display: block; + float: left; + margin-left: 0; +} +/* Fix for individual pages */ +#individual-intro.person { + width: 100%; +} +.sparkline_text, +.collaboratorship-link-container { + width: 148px; +} +#individual-intro.person #individual-info { + width: 72%; +} +#individual-intro .individual-overview { + clear: left; +} +/* Miscellaneous */ +input#submit, input#submit:visited { + margin-left: 0; +} +/* Fix for menupages */ +.pagination li { + display: block; + float: left; +} +.pagination h3 { + float: left; +} +.pagination ul { + display: block; + float: left; +} +#find-by { + width: 445px; +} +/* Fix for Visualization: Co-author and Co-investigator network pages */ +#sparkline-container { + clear: both; + float: none; + margin-left: 0; + width: 100%; +} +.easy-deselect-label a.temporal-vis-url { + margin-top: -15px; +} +#grant-count-sparkline-include { + width: 48%; +} +#coinvestigator-count-sparkline-include { + width: 48%; + clear: left; +} +#publication-count-sparkline-include { + width: 48%; +} +#coauthor-count-sparkline-include { + width: 48%; + clear: left; +} +/* Fix for verbose mode */ +#verbose-mode { + float: left; + clear: left; + margin-top: -14px; +} +.verbose-toggle { + top: 12px; +} +#admin .uri-link { + padding-top: 5px; +} +/* Fix account management pages */ +table#account th { + position: relative; +} +.account-alpha-browse { + position: absolute; + float: none; + top: 7px; + right: 0; +} +#filter-roles { + clear: both; +} +#search-accounts { + width: 400px; +} +#search-accounts input[type="text"] { + float: left; +} +#search-accounts input[type="submit"] { + float: right; + margin-top: 0; +} +#add-account { + width: 500px; + margin-bottom: 20px; +} +#add-account span { + float: left; +} +#add-account input.add-account { + float: left; + margin-top: 0; + margin-left: 5px; +} +p.requiredHint { + clear: left; +} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/page/partials/headScripts.ftl b/webapp/web/templates/freemarker/page/partials/headScripts.ftl index 4d2357fb0..f7c8a6488 100644 --- a/webapp/web/templates/freemarker/page/partials/headScripts.ftl +++ b/webapp/web/templates/freemarker/page/partials/headScripts.ftl @@ -14,4 +14,12 @@ ${headScripts.list} \ No newline at end of file + + + + + diff --git a/webapp/web/themes/vitro/css/ie6.css b/webapp/web/themes/vitro/css/ie6.css index 54e1d750b..9134a0e96 100644 --- a/webapp/web/themes/vitro/css/ie6.css +++ b/webapp/web/themes/vitro/css/ie6.css @@ -1,176 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -/* Fix for homepage in IE6 browsers */ -#intro h2 { - margin-left: 24px; -} -#intro p { - margin-left: 24px; -} -#search-home h3 { - margin-left: 0; -} -#search-field { - background-image: url("../images/search-interior-pages.gif"); - height: 32px; - width: 330px; -} -#search-field input.search { - padding-left: 14px; -} -#search-home-field input.search { - padding-left: 14px; -} -#login { - margin-right: 0; -} -ul#browse-classgroups { - margin-left: 20px; -} -#browse-classes { - width: 620px; -} -ul#classes-in-classgroup.vis { - width: 40%; -} -#login-form p.submit { - margin-left: 15px; -} -ul#browse-classgroups a.selected { - background-position-x: 0; - background-position-y: 12px; -} -/* Fix for menupages */ -ul#vgraph-classes { - float: left; - width: 265px; - margin-left: 15px; -} -#browse-by { - padding-bottom: 20px; -} -ul#browse-classes { - width: 290px; - margin-left: 0; - padding-left: 10px; - margin-left: 15px; -} -#individuals-in-class { - width: 450px; -} -article.foaf-person { - width: 400px; - margin-left:10px; - margin-right: 10px; - padding: 0; - margin-bottom: 10px; -} -#profile-photo-display { - width: 620px; -} -#browse-classes { - width: 590px; -} -ul#classgroup-list.vis { - width: 38%; -} -.pagination li { - display: block; - float: left; -} -.pagination h3 { - float: left; -} -.pagination ul { - display: block; - float: left; -} -/* Fix for site admin: the wonders of the IE float model... -fix to maintain sanity in rendering sections of site admin targets IE7 and below */ -#adminDashboard .pageBodyGroup { - *float: none !important; - *display: inline !important; - *vertical-align: top !important; -} -/* Fix for individual pages */ -#individual-intro.person { - width: 100%; -} -.sparkline_text, -.collaboratorship-link-container { - width: 148px; -} -#individual-intro.person #individual-info { - width: 72%; -} -/* Fix for menupages */ -ul#alpha-browse-individuals { - width: 545px; -} -ul#alpha-browse-individuals a { - height: 30px; - margin-left: 0; - padding-left: 6px; - width: 8px; -} -#individuals-in-class { - width: 550px; -} -#individual-intro.person .individual-overview { - clear: left; -} -#find-by { - width: 445px; -} -/* Fix for photo upload */ -#photoUploadForm input.submit, -#photoUploadForm input.submit:visited, -#cropImage input.submit, -#cropImage input.submit:visited { - padding: 5px 5px 7px; - margin-left: -8px; -} -#photoUploadForm span.or, -#cropImage span.or { - display: block; - float: left; - padding-top: 10px; -} -/* Fix position for input type submit buttons */ -input.submit, -input.submit:visited, -input#submit, -input#submit:visited { - display: block; - float: left; - clear: both; - margin-left: 0; -} -/* Fix position for "Required fields" text */ -form.customForm #requiredLegend { - clear: both; -} -/* Fix for Visualization: Co-author and Co-investigator network pages */ -#ego_profile, -.sub_headings, -#sparkline-container, -.toggle_visualization{ - position: relative; -} -.easy-deselect-label a.temporal-vis-url { - margin-top: -15px; -} -#grant-count-sparkline-include { - width: 48%; -} -#coinvestigator-count-sparkline-include { - width: 48%; - clear: left; -} -#publication-count-sparkline-include { - width: 48%; -} -#coauthor-count-sparkline-include { - width: 48%; - clear: left; -} \ No newline at end of file +/* If VITRO theme developers decide to use VITRO theme + as the base for their new theme, please use this file + for adding fixes for IE6 browsers */ diff --git a/webapp/web/themes/vitro/css/ie7.css b/webapp/web/themes/vitro/css/ie7.css index 72e4b2bbc..d7b7e0c3d 100644 --- a/webapp/web/themes/vitro/css/ie7.css +++ b/webapp/web/themes/vitro/css/ie7.css @@ -1,101 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -/* Fix for homepage */ -#search-field input.search { - padding-left: 14px; -} -#search-home-field input.search { - padding-left: 14px; -} -#login-form p.submit { - margin-left: 20px; -} -/* Fix for site admin */ -/* the wonders of the IE float model...fix to maintain sanity in rendering sections of site admin */ -/* targets IE7 and below */ -#adminDashboard .pageBodyGroup { - *float: none !important; - *display: inline !important; - *vertical-align: top !important; -} -/* Fix for photo upload */ -#photoUploadForm input.submit, -#photoUploadForm input.submit:visited, -#cropImage input.submit, -#cropImage input.submit:visited { - padding: 5px 5px 7px; - margin-left: -8px; -} -#photoUploadForm span.or, -#cropImage span.or { - display: block; - float: left; - padding-top: 10px; -} -/* Fix position for input type submit buttons */ -input.submit, -input.submit:visited, -input#submit, -input#submit:visited { - display: block; - float: left; - margin-left: 0; -} -/* Fix for individual pages */ -#individual-intro.person { - width: 100%; -} -.sparkline_text, -.collaboratorship-link-container { - width: 148px; -} -#individual-intro.person #individual-info { - width: 72%; -} -#individual-intro .individual-overview { - clear: left; -} -/* Miscellaneous */ -input#submit, input#submit:visited { - margin-left: 0; -} -/* Fix for menupages */ -.pagination li { - display: block; - float: left; -} -.pagination h3 { - float: left; -} -.pagination ul { - display: block; - float: left; -} -/* Fix for menu pages */ -#find-by { - width: 445px; -} -/* Fix for Visualization: Co-author and Co-investigator network pages */ -#sparkline-container { - clear: both; - float: none; - margin-left: 0; - width: 100%; -} -.easy-deselect-label a.temporal-vis-url { - margin-top: -15px; -} -#grant-count-sparkline-include { - width: 48%; -} -#coinvestigator-count-sparkline-include { - width: 48%; - clear: left; -} -#publication-count-sparkline-include { - width: 48%; -} -#coauthor-count-sparkline-include { - width: 48%; - clear: left; -} \ No newline at end of file +/* If VITRO theme developers decide to use VITRO theme + as the base for their new theme, please use this file + for adding fixes for IE7 browsers *