From 8ccfef4fcc25ebaccd64374a1c1eeef005e862d4 Mon Sep 17 00:00:00 2001 From: nac26 Date: Tue, 26 Oct 2010 17:17:37 +0000 Subject: [PATCH] more tweaks to wilma to correct issues with theme images (visualization, property groups, and editing) and markup conflicts for custom editing forms NIHVIVO-556 --- .../PersonPublicationCountVisCodeGenerator.java | 2 +- themes/wilma/css/individual.css | 12 ++++++------ themes/wilma/css/screen.css | 4 ++-- .../transition/individual/plus_transparent.gif | Bin 0 -> 54 bytes .../individual/plus_transparent_hover.gif | Bin 0 -> 830 bytes themes/wilma/templates/edit/formPrefix.jsp | 2 +- themes/wilma/templates/page/basicPage.jsp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 themes/wilma/images/transition/individual/plus_transparent.gif create mode 100644 themes/wilma/images/transition/individual/plus_transparent_hover.gif diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java index 605e4b46..a0e523ba 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java @@ -443,7 +443,7 @@ public class PersonPublicationCountVisCodeGenerator { + "sparklineNumberTD.attr('class', 'sparkline_number');" + "row.append(sparklineNumberTD);" + "var sparklineTextTD = $('');" - + "sparklineTextTD.attr('width', '350');" + + "sparklineTextTD.attr('width', '450');" + "sparklineTextTD.attr('class', 'sparkline_text');" + "row.append(sparklineTextTD);" + "table.append(row);" diff --git a/themes/wilma/css/individual.css b/themes/wilma/css/individual.css index 34f5839d..f1be41ae 100644 --- a/themes/wilma/css/individual.css +++ b/themes/wilma/css/individual.css @@ -50,7 +50,7 @@ } #deptWrap { - background: url(../site_icons/grouping/bg_innerwrap_person.gif) repeat-y right top; + background: url(../images/transition/individual/grouping/bg_innerwrap_person.gif) repeat-y right top; padding-top: 26px; clear: both; } @@ -182,7 +182,7 @@ img.screenshot { padding: 0 0 0 12px; font-size: 1.08em; color: #fff; - background: url(../site_icons/grouping/h3_tab_left.gif) left top no-repeat; + background: url(../images/transition/individual/grouping/h3_tab_left.gif) left top no-repeat; border: 0; } @@ -192,13 +192,13 @@ img.screenshot { height: 19px; line-height:19px; padding: 5px 16px 0 0; - background: url(../site_icons/grouping/h3_tab_right.gif) right top no-repeat; + background: url(../images/transition/individual/grouping/h3_tab_right.gif) right top no-repeat; color:#fff; } #personWrap div.propsCategory { clear: left; - background: #fff url(../site_icons/grouping/bg_propsCategory.gif) right top no-repeat; + background: #fff url(../images/transition/individual/grouping/bg_propsCategory.gif) right top no-repeat; /* border-left: 1px solid #d9d9d9;*/ border-left: 1px solid #dedede; /* border-bottom: 1px solid #d9d9d9;*/ @@ -363,12 +363,12 @@ ul.properties h5.collate { border: 0; color: #fff; /* background: #6d8e80;*/ - background: #baa280 url(../site_icons/grouping/bg_propGroupNav-active.gif) top right repeat-y; + background: #baa280 url(../images/transition/individual/grouping/bg_propGroupNav-active.gif) top right repeat-y; } #personWrap #dashboard #propGroupNav h2 a.inactive { color: #b4bfba; - background: #baa280 url(../site_icons/grouping/bg_propGroupNav-inactive.gif) top right repeat-y; + background: #baa280 url(../images/transition/individual/grouping/bg_propGroupNav-inactive.gif) top right repeat-y; } #personWrap #dashboard #propGroupNav h2 a:hover { diff --git a/themes/wilma/css/screen.css b/themes/wilma/css/screen.css index fcb13449..65a6b54e 100644 --- a/themes/wilma/css/screen.css +++ b/themes/wilma/css/screen.css @@ -634,13 +634,13 @@ a.add { width: 1em; height: 1em; padding: 4px; - background: #ebebeb url(../site_icons/plus_transparent.gif) center center no-repeat; + background: #ebebeb url(../images/transition/individual/plus_transparent.gif) center center no-repeat; text-indent: -9999px; overflow: hidden; } a.add:hover { - background-image: url(../site_icons/plus_transparent_hover.gif); + background-image: url(../images/transition/individual/plus_transparent_hover.gif); background-color: #576772; } diff --git a/themes/wilma/images/transition/individual/plus_transparent.gif b/themes/wilma/images/transition/individual/plus_transparent.gif new file mode 100644 index 0000000000000000000000000000000000000000..dbc20ba3bd2601d7ce2a62714cca907f195bfe66 GIT binary patch literal 54 zcmZ?wbhEHbkEf3dY Gum%7TYzt2S literal 0 HcmV?d00001 diff --git a/themes/wilma/images/transition/individual/plus_transparent_hover.gif b/themes/wilma/images/transition/individual/plus_transparent_hover.gif new file mode 100644 index 0000000000000000000000000000000000000000..6137130edab2f763c34f5fff71138d4f5fee9981 GIT binary patch literal 830 zcmZ?wbhEHb
${ftl_menu} -
+
\ No newline at end of file diff --git a/themes/wilma/templates/page/basicPage.jsp b/themes/wilma/templates/page/basicPage.jsp index a1048b55..d419369d 100644 --- a/themes/wilma/templates/page/basicPage.jsp +++ b/themes/wilma/templates/page/basicPage.jsp @@ -83,7 +83,7 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); ${title} - + <%-- ${headScripts.add("/js/html5.js")} --%>