litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more tweaks to wilma to correct issues with theme images (visualization, property groups, and editing) and markup conflicts for custom editing forms NIHVIVO-556

Browse source
This commit is contained in:
nac26 2010-10-26 17:17:37 +00:00
parent 41c8c202d9
commit 8ccfef4fcc
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java
View file

@ -443,7 +443,7 @@ public class PersonPublicationCountVisCodeGenerator {
+ "sparklineNumberTD.attr('class', 'sparkline_number');" + "sparklineNumberTD.attr('class', 'sparkline_number');"
+ "row.append(sparklineNumberTD);" + "row.append(sparklineNumberTD);"
+ "var sparklineTextTD = $('<td>');" + "var sparklineTextTD = $('<td>');"
+ "sparklineTextTD.attr('width', '350');" + "sparklineTextTD.attr('width', '450');"
+ "sparklineTextTD.attr('class', 'sparkline_text');" + "sparklineTextTD.attr('class', 'sparkline_text');"
+ "row.append(sparklineTextTD);" + "row.append(sparklineTextTD);"
+ "table.append(row);" + "table.append(row);"

12
themes/wilma/css/individual.css
View file

@ -50,7 +50,7 @@
} }
#deptWrap { #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; padding-top: 26px;
clear: both; clear: both;
} }
@ -182,7 +182,7 @@ img.screenshot {
padding: 0 0 0 12px; padding: 0 0 0 12px;
font-size: 1.08em; font-size: 1.08em;
color: #fff; 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; border: 0;
} }
@ -192,13 +192,13 @@ img.screenshot {
height: 19px; height: 19px;
line-height:19px; line-height:19px;
padding: 5px 16px 0 0; 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; color:#fff;
} }
#personWrap div.propsCategory { #personWrap div.propsCategory {
clear: left; 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 #d9d9d9;*/
border-left: 1px solid #dedede; border-left: 1px solid #dedede;
/* border-bottom: 1px solid #d9d9d9;*/ /* border-bottom: 1px solid #d9d9d9;*/
@ -363,12 +363,12 @@ ul.properties h5.collate {
border: 0; border: 0;
color: #fff; color: #fff;
/* background: #6d8e80;*/ /* 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 { #personWrap #dashboard #propGroupNav h2 a.inactive {
color: #b4bfba; 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 { #personWrap #dashboard #propGroupNav h2 a:hover {

4
themes/wilma/css/screen.css
View file

@ -634,13 +634,13 @@ a.add {
width: 1em; width: 1em;
height: 1em; height: 1em;
padding: 4px; 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; text-indent: -9999px;
overflow: hidden; overflow: hidden;
} }
a.add:hover { 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; background-color: #576772;
} }

BIN
themes/wilma/images/transition/individual/plus_transparent.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 B

BIN
themes/wilma/images/transition/individual/plus_transparent_hover.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 830 B

2
themes/wilma/templates/edit/formPrefix.jsp
View file

@ -105,5 +105,5 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<body class="formsEdit"> <body class="formsEdit">
<div id="wrapper"> <div id="wrapper">
${ftl_menu} ${ftl_menu}
<div id="wrapper-content"> <div id="content">
<!-- end of formPrefix.jsp --> <!-- end of formPrefix.jsp -->

2
themes/wilma/templates/page/basicPage.jsp
View file

@ -83,7 +83,7 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>${title}</title> <title>${title}</title>
<link rel="stylesheet" href="<%=themeDir%>/css/style.css" /> <link rel="stylesheet" href="<%=themeDir%>css/style.css" />
<!-- script for enabling new HTML5 semantic markup in IE browsers--> <!-- script for enabling new HTML5 semantic markup in IE browsers-->
<%-- ${headScripts.add("/js/html5.js")} --%> <%-- ${headScripts.add("/js/html5.js")} --%>