diff --git a/productMods/edit/formPrefix.jsp b/productMods/edit/formPrefix.jsp new file mode 100644 index 00000000..86ce1167 --- /dev/null +++ b/productMods/edit/formPrefix.jsp @@ -0,0 +1,117 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> +<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> + +<%@ page import="java.util.List" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> + +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jstl/functions" prefix="fn" %> + +<% +FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); +%> + +<% + VitroRequest vreq = new VitroRequest(request); + Portal portal = vreq.getPortal(); + + String contextRoot = vreq.getContextPath(); + + String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; + themeDir = contextRoot + '/' + themeDir; +%> + + + +<%=themeDir%> + + + +<%-- test for Wilma theme to help for smooth transition --%> + + + + + + + + + <% + String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; + if (useTinyMCE.equalsIgnoreCase("true")) { + String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200"; + String width = (width=request.getParameter("width")) != null && !(width.equals("")) ? width : "75%"; + String defaultButtons="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code"; + String buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons; + String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top"; + %> + + + <% } %> + + + <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; + if (useAutoComplete.equalsIgnoreCase("true")) { %> + " /> + <% } %> + + + + " media="screen"/> + + + " /> + + + + Edit + + +
+ + +
+
+ + + \ No newline at end of file diff --git a/productMods/edit/formSuffix.jsp b/productMods/edit/formSuffix.jsp new file mode 100644 index 00000000..bce8c444 --- /dev/null +++ b/productMods/edit/formSuffix.jsp @@ -0,0 +1,66 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> +<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> + +<%@ page import="java.util.List" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> + +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jstl/functions" prefix="fn" %> + +<% +FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); +%> + +<% + VitroRequest vreq = new VitroRequest(request); + Portal portal = vreq.getPortal(); + + String contextRoot = vreq.getContextPath(); + + String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; + themeDir = contextRoot + '/' + themeDir; +%> + + + +<%=themeDir%> + + + +<%-- test for Wilma theme to help for smooth transition --%> + + + + + +
+ +
+
+ + + +
+ + + + + + + + <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; + if (useAutoComplete.equalsIgnoreCase("true")) { %> + + <% } %> + + + + + + + + + \ No newline at end of file diff --git a/productMods/templates/page/basicPage.jsp b/productMods/templates/page/basicPage.jsp new file mode 100644 index 00000000..3ea38437 --- /dev/null +++ b/productMods/templates/page/basicPage.jsp @@ -0,0 +1,60 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> +<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> + +<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jstl/functions" prefix="fn" %> +<%@ page errorPage="/error.jsp"%> +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> + +<% +FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); +%> + +<% + VitroRequest vreq = new VitroRequest(request); + Portal portal = vreq.getPortal(); + + String contextRoot = vreq.getContextPath(); + + String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; + themeDir = contextRoot + '/' + themeDir; +%> + + + +<%=themeDir%> + + + +<%-- test for Wilma theme to help for smooth transition --%> + + + + + + + + + + +
+ + +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/themes/wilma/css/edit.css b/themes/wilma/css/edit.css new file mode 100644 index 00000000..c7984725 --- /dev/null +++ b/themes/wilma/css/edit.css @@ -0,0 +1,342 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/******************* styles copied from old global.css.jsp ********************************/ + +.buttonForm { + margin-top : 0; + margin-bottom : 0; + margin-right : 0; + margin-left : 0.5em; + padding-bottom : 0.5em; + color : #444444; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + line-height : 16px; + min-height : 100px; + display : inline; +} + +.editingForm { + margin-top : 0; + margin-bottom : 0; + margin-right : 0; + margin-left : 0; + padding-bottom : 1em; + color : #444444; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + line-height : 16px; + background-color : #eee; /* cals+vivo themes were: #dddddd; */ + min-height : 100px; + font-size : 0.9em; +} + +.editingForm table { + text-align : left; + border-width : 1px; + border-style : solid; + border-color : black; + border-collapse:separate; +} + +.editingForm td{ + padding: 2px 2px 2px 2px; + font-size : 1em; +} + +td.verticalfieldlabel { + font-size : 11px; + line-height : 13px; +} + +.editingForm .entryFormHead { + text-align : center; + padding : 0.2em; + background-color: #f8f8c8; + border-width : 1px; + border-style : solid; + border-color : black; +} + +.editingForm .entryFormHead h2{ + margin : 0.1em; + padding : 0em; + font-size: 1.4em; + color : black; +} + +.editingForm .entryFormHead h3{ + margin : 0.1em; + padding : 0em; + font-size : 1.2em; + font-weight: 600; /* cals theme was: 650 */ + color : red; +} + +.editingForm .entryFormHead .entryFormHeadInstructions { + margin : 0em; + padding : 0em; + font-size : 0.8em; +} + +.editingForm .form-item { + background-color: #FAFAD2; + border-color : #2E440C; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 10px; + border-width : 1px; +} + +.editingForm .form-button { + background-color: #ccf; + border-color : #ccf; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 1em; + border-width : 1px; + margin-top : 2px; + width : auto; + overflow : visible; +} + +tr.form-row-even { + background-color : #e9f0ff; + border-color : #eec; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 10px; + border-width : 1px; + margin-top : 2px; +} + +tr.form-row-odd { + background-color : #e9f9ff; + border-color : #eec; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 10px; + border-width : 1px; + margin-top : 2px; +} + +.form-editingRow { + background-color: #ff9; + border-color : #eec; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 10px; + border-width : 1px; + margin-top : 2px; +} + +/* DWR apparently no longer used +.form-subEditingRow { + background-color : #ffb; + border-color : #eec; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size: 10px; + border-width : 1px; + margin-top : 2px; +} */ + +table.form-background td { + padding-left : 1em; + padding-right : 1em; +} + +table.form-background td form { + padding : 0.2em; +} + +.form-background { + background-color : #C8D8F8; + border-color : #CCCCFF; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 10px; + border-width : 1px; + margin-top : 2px; +} + +.form-background.vclass { + background-color : #E05550; +} + +.form-background.property { + background-color : #A8F0A0; +} + + +.form-table-head { + background-color: #ccf; + border-color : #eec; + font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size : 10px; + border-width : 1px; + margin-top : 2px; +} + +.navlinkblock { + color : black; /*#4B0082;*/ + font-family : Verdana,Arial, Helvetica, sans-serif; + font-size : 10px; + font-weight : normal; + margin-top : 1px; + margin-bottom : 1px; + padding-top : 1px; + padding-bottom : 4px; +} + +td.editformcell { + font-size: 9px; +} + +td.editformcell select { + margin: 0; +} + +.header { + background-color: #B0C4DE; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : left; +} +.database_header { + background-color: #B0C4DE; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : left; +} + +.database_upperleftcorner { + background-color: #B0C4DE; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : left; +} + +.database_upperleftcenter { + background-color: #B0C4DE; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : center; +} + +.rownumheader { + background-color: #B0C4DE; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : center; +} + + +.headercenter { + background-color: #9370DB; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : center; +} + +.postheader { + background-color: #E6E6FA; + color : #777777; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : left; +} + +.database_postheader { + background-color: #E6E6FA; + color : #777777; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : left; +} + +.postheadercenter { + background-color: #E6E6FA; + color : #4682B4; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : center; +} + +.postheaderright { + background-color: #E6E6FA; + color : #4682B4; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : right; +} + +.verticalfieldlabel { + background-color: #DEDEDF; + color : black; + font-family : Verdana, Arial, Helvetica, sans-serif; + font-size : 8pt; + font-style : normal; + text-align : right; + vertical-align : top; +} + +.row, .rowvert { + background-color: #F0FFFF; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : left; +} + +.rowalternate { + background-color: #F8F8FF; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : left; +} + +.rowbold { + background-color: #FFFAFA; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + font-weight : bold; + text-align : left; +} + +.rownum { + background-color: #87CEFA; + color : black; + font-family : Arial, Helvetica, sans-serif; + font-size : 10pt; + font-style : normal; + text-align : center; +} + +span.entityRelationsSpan { + padding-top : 4px; + margin : 0 0 0 1em; + font-weight : bold; + font-size : 90%; + color : #2E440C; + text-align : center; +} + + +/* Temporary hack to remove stuff from forms in vivoweb only */ +.hideFromVivoWeb { + display: none; + height: 0; +} diff --git a/themes/wilma/css/entity.css b/themes/wilma/css/entity.css new file mode 100644 index 00000000..44393530 --- /dev/null +++ b/themes/wilma/css/entity.css @@ -0,0 +1,7 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/************************************************* + vivo-basic theme: individual profile page styles + +**************************************************/ + diff --git a/themes/wilma/css/formedit.css b/themes/wilma/css/formedit.css new file mode 100644 index 00000000..7ace681e --- /dev/null +++ b/themes/wilma/css/formedit.css @@ -0,0 +1,60 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/************************************************* + vivo-basic theme: editing form styles + + This document is included by formPrefix.jsp + +**************************************************/ + +form { + padding-bottom: 20px; +} + +.form p { + margin-bottom:0.5em; +} + +form textarea { + width: 60%; +} + +form a:link.cancel, form a:visited.cancel { + color: #f70; + border-color: #f70; +} + +form a:hover.cancel { + color: #fff; + background: #f70; +} + +form select option{ + padding-right: 5px; +} + +form dl { + margin-bottom: 20px; +} + +form dl dt, form dl dd { + padding-top: 15px; +} + +.validationError { + font-weight:bold; + color:red; +} + +.inlineForm input { + display:inline; +} + +.inlineForm label { + display:inline; +} + +p.submit { + clear: left; + margin-top: 2em; +} diff --git a/themes/wilma/css/individual.css b/themes/wilma/css/individual.css new file mode 100644 index 00000000..34f5839d --- /dev/null +++ b/themes/wilma/css/individual.css @@ -0,0 +1,657 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/************************************************* + vivo-basic theme: TEMPORARY individual styles +**************************************************/ + +/*@import url("thickbox.css");*/ + +#personWrap #vitroPropertyGroupname { +/* display: none;*/ +} + +#personWrap #content.person { + padding: 30px 0 20px 4px; +/* width: 69%;*/ + width: auto; +/* min-width: 600px;*/ +/* margin-right: 280px;*/ +/* padding-top: 10px;*/ +} + +#personWrap #contentwrap { +/* background: #fff url(../site_icons/grouping/bg_page_person.gif) no-repeat right top;*/ +} + +#personWrap { +/* background: url(../site_icons/grouping/bg_innerwrap_person.gif) repeat-y right top;*/ + padding-top: 20px; +/* margin-top: 25px;*/ + clear: both; +} + +#personWrap .entity { + padding-top: 0; +} + +/* ------ duplicate styles for department pages ----- */ + +#deptWrap div.admin { +/* display: none;*/ +} + +#deptWrap #content { +/* padding: 0 0 20px 4px;*/ + padding-top: 0; +/* width: 69%;*/ + width: auto; + min-width: 600px; + margin-right: 280px; +} + +#deptWrap { + background: url(../site_icons/grouping/bg_innerwrap_person.gif) repeat-y right top; + padding-top: 26px; + clear: both; +} + +#deptWrap #dashboard { + padding: 0 0 100px 0; + display: inline-block; /* fixes IE double top-padding bug, discussed at: http://exscale.se/archives/2007/06/13/ie-double-padding-bug/ */ + background: none; + text-align: left; + width: 255px; +} + +#deptWrap em.moniker { + color: #888888; +} + +#deptWrap div.description { +/* font-size: 1.2em;*/ +} + +#deptWrap div.description p, +#deptWrap div.description li { +/* font-size: 1em;*/ +} + +img.screenshot { + display: block; + margin: 4px 0; + border: 3px solid #C7C3BB; +} + +#deptWrap #dashboard a:link { +/* color: #55AABB;*/ +/* border-color: #55AABB;*/ +} + +#deptWrap ul.externalLinks { + padding-left: 21px; + padding-right: 20px; +} + +#deptWrap ul.externalLinks li { + display: block; + margin-bottom: 21px; + padding-left: 0; + border: 0; +} + +/* ------------------------------------------------- */ + +#personWrap #entity { + clear: left; + margin: 0; + padding-bottom: 10px; +} + +#personWrap #entity h2, +#personWrap #entity em.moniker { + float: none; +/* display: inline;*/ + display: block; +} + +#personWrap #entity h2 { +/* padding-right: 16px;*/ +/* line-height: 2.5em;*/ + line-height: 1.3em; + margin: 0; + padding-top: 10px; +} + +#personWrap em.moniker { + clear: none; + display: inline-block; + padding: 2px 0 0 0; +} + +#personWrap div#profileImage { + width: 87px; + float: left; +} + +#personWrap img.headshot, +#personWrap a.img img.headshot { + width: 75px; + float: left; + margin: 0 12px 3px 0; +/* border: 1px solid #333333;*/ + border: 1px solid #777; +} + +#personWrap #entity div.citation { + clear: left; + display: inline; + font-size: .8em; + line-height: 1.2em; + color: #888; +} + +#personWrap div#overview { + position: relative; + clear: left; + margin: 0; + padding-top: 6px; + font-size: 1.1em; +} + +#personWrap div#overview.loggedIn { +/* padding-right: 4em;*/ +} + +#personWrap ol, +#personWrap ul { + padding-left: 0; + margin-left: 0; +} + +#personWrap #content ol li, +#personWrap #content ul li { + padding-left: 0; +/* font-size: 1em;*/ +} + +#personWrap div.propsCategory h3 { + float: left; + display: inline; + height: 24px; + margin: 0 0 0 -1px; + padding: 0 0 0 12px; + font-size: 1.08em; + color: #fff; + background: url(../site_icons/grouping/h3_tab_left.gif) left top no-repeat; + border: 0; +} + +#personWrap div.propsCategory h3 strong { + float: left; + display: inline; + height: 19px; + line-height:19px; + padding: 5px 16px 0 0; + background: url(../site_icons/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; +/* border-left: 1px solid #d9d9d9;*/ + border-left: 1px solid #dedede; +/* border-bottom: 1px solid #d9d9d9;*/ + border-bottom: 1px solid #dedede; +/* margin-bottom: 30px;*/ + margin: 25px 0; +} + +#personWrap div.propsWrap { + clear: left; + margin: 0; + padding: 8px 16px; +/* background: url(../site_icons/grouping/bg_propsWrap.gif) right top no-repeat;*/ +/* border-top: 1px solid transparent;*/ +/* border-right: 1px solid transparent;*/ +/* background: #f7f7f7;*/ +} + +#personWrap div.propsItem { + position: relative; + background: none; + border: 0; + margin: 0; + padding: 14px 0; +} + +#personWrap div.propsCategory div.propsItem { /* being more specific here to leave borders off ungrouped (single) properties */ + + +/* border-top: 1px solid #fff;*/ +/* border-bottom: 1px solid #f0ede4;*/ + border-bottom: 1px solid #f2f2f2; +/* background: #faf8f3;*/ +} + +/* temporary patch - can't reliably apply class of first to some properties */ + +#personWrap div.propsCategory div.propsItem.first, +#personWrap div.propsCategory div.propsItem:first-child { + border-top: 0; +} + +#personWrap div.propsCategory div.propsItem.last, +#personWrap div.propsCategory div.propsItem:last-child { + border-bottom: 0; +} + +#personWrap div.propsCategory div.propsItem:first-child { /* temporary patch - can't apply class of first to initial property under affiliations group */ + border-top: 0; +} + +#personWrap div.propsCategory div.propsItem:last-child { + border-bottom: 0; +} + +#personWrap div.propsItem h4 { + margin-bottom: 1.25em; + margin-left: -16px; +} + +#personWrap ul.properties { +/* font-size: 1.2em;*/ + padding-left: 0; + color: #888; +} + +ul.properties h5.collate { + margin-top: 1em; +} + +#personWrap div.datatypeProperties { + font-size: 0.9em; +} + +#personWrap div.datatypeProperties p, /* resetting font sizes for html inside data props */ +#personWrap div.datatypeProperties ul { +/* font-size: 1em;*/ + line-height: 1.5em; +} + +#personWrap div.datatypeProperties ul { + margin: 0; + padding: 0 0 .5em 1.5em; +} + +#personWrap div.datatypeProperties ol { + list-style-type: decimal; + margin: 0; + padding: 0 0 .5em 2em; +} + +#personWrap div.datatypeProperties ul li { + list-style-type: disc; +} + +#personWrap div.datatypeProperties ul.datatypePropertyValue { + padding-left: 0; +} + +/* multi-item data properties should not have initial bullets */ +#personWrap div.datatypeProperties ul.datatypePropertyValue li { + list-style-type: none; +} + +#personWrap div.datatypeProperties ul.datatypePropertyValue ul li { + list-style-type: disc; +} + +#personWrap div.datatypeProperties ul.datatypePropertyValue ol li { + list-style-type: decimal; +} + + +#personWrap div.datatypeProperties ul ol, +#personWrap div.datatypeProperties ul ul { + margin-left: 1.5em; + list-style-position: inside; /* resetting from vivo.css */ +} + + +/* ----------------- Dashboard ---------------- */ + +#personWrap #dashboard { + padding: 32px 0 100px 0; + display: inline-block; /* fixes IE double top-padding bug, discussed at: http://exscale.se/archives/2007/06/13/ie-double-padding-bug/ */ + background: none; + text-align: left; + width: 256px; +} + +#personWrap #dashboard li { + list-style-type: none; +} + +#personWrap #dashboard a { +/* color: #B31B1B;*/ +} + +#personWrap #propGroupNav { + margin-bottom: 20px; + border: 2px solid #F0EEE4; + border-left: 0; + border-right: 0; +} + +#personWrap #propGroupNav li { + padding: 0 0 1px 0; +} + +#personWrap #propGroupNav h2 { + margin: 0; + padding: 0; + font-size: 1.08em; + text-align: left; + text-transform: uppercase; +/* background: #6d8e80;*/ +} + +#personWrap #dashboard #propGroupNav h2 a { + display: block; + padding: 5px 14px 5px 14px; + border: 0; + color: #fff; +/* background: #6d8e80;*/ + background: #baa280 url(../site_icons/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; +} + +#personWrap #dashboard #propGroupNav h2 a:hover { + color: #fff; + background: #b31b1b; + background-image: none; +} + +#personWrap #dashboard #propGroupNav h2 a#currentCat { + background: #b3a37c; +} + +#personWrap #dashboard strong.contactLink { + padding-left: 22px; + margin-left: 14px; + margin-bottom: 2em; + margin-top: 2em; + background: url(../site_icons/contactinfo.gif) left center no-repeat; + font-weight: bold; + display: block; +} + +#personWrap #dashboardExtras { + position: relative; + height: 1%; + margin: 10px 14px; +/* padding: 10px;*/ +/* border: 1px solid #CBCBCB;*/ +/* background: #e6e6e6;*/ +} + +#personWrap #dashboardExtras h3 { + display: inline; + font-size: 1em; + line-height: 1.5em; + margin: 0 0 .5em 0; +} + +#personWrap #dashboardExtras a img { +/* border: 1px solid #ccc;*/ +/* display: block;*/ +/* width: auto;*/ +/* margin: 4px 0 0 0;*/ +/* text-decoration: none;*/ +} + +#personWrap ul.profileLinks { + margin-left: 0; + margin-bottom: 0; +} + +#personWrap ul.profileLinks li { + padding-left: 0; + margin-bottom: 10px; + background: none; +} + +ul.keywords li { + font-size: 0.9em; +} + +#personWrap #links, +#personWrap #keywords { +/* position: relative;*/ + clear: both; + width: 100%; +} + +#personWrap #links { + margin-bottom: 1em; +} + +/* ----------------- Editing Controls ---------------- */ + +#personWrap #dashboard #dashboardExtras a.add, +#personWrap #dashboard #dashboardExtras a.edit, +#personWrap #dashboard #dashboardExtras a.delete { /* being overly specific because IE6 had difficulties */ + color: #209ae0; +} + +#personWrap #dashboardExtras a.add { + position: absolute; +/* top: 0;*/ + right: 8px; + margin: 0; + padding: 0; +} + +#personWrap #content a.delete { +/* display: none;*/ +} + +#personWrap #overview a.delete { +/* display: none;*/ +} + +#personWrap #overview a.edit { + padding-left: 5px; +/* position: absolute;*/ +/* top: 0;*/ +/* right: 16px;*/ +} + +#personWrap a.add, #personWrap a.edit, #personWrap a.delete { + color: #209ae0; + text-decoration: underline; +} + +#personWrap a.add:hover, #personWrap a.edit:hover, #personWrap a.delete:hover, +#personWrap a.add:active, #personWrap a.edit:active, #personWrap a.delete:active { + color: #FF8811; +} + +/*#personWrap div.propsCategory a.add, +#personWrap div.propsCategory a.edit { + margin: 0; + padding: 0; +} + +#personWrap div.propsCategory div.highlighted a.add, +#personWrap div.propsCategory div.highlighted a.edit { + right: 15px; +}*/ + +#personWrap div.dataItem a.delete { + display: none; +} + +#personWrap div.datatypeProperties a.delete { + display: inline; +} + +#personWrap #content .properties a.edit, +#personWrap #content .properties a.delete, +#personWrap #content .datatypeProperties a.edit, +#personWrap #content .datatypeProperties a.delete { + position: static; /* reset for edit links for property statements */ + padding-right: 2px; +} + +div.editBox.editMode { + border: 2px solid #b5d6e8; + background: #FFFEDB; +/* padding: 12px 10px;*/ + padding: 12px 10px; + margin-top: 3px; +} + + +#personWrap div.datatypeProperties div.editMode ol li, +#personWrap div.datatypeProperties div.editMode ul li { + list-style-type: none; +} + +div.editBox.editMode.editing { + background: #F4F8FE; +} + + +#personWrap div.editing ul.properties, +#personWrap div.editing div.datatypeProperties { + color: #888; +/* display: none;*/ +} + +div.button { + padding: 16px 0 0 0; +} + +div.editBox button { + color: #209ae0; + padding: 3px 6px 3px 6px; +} + +a.addNewButton { +/* color: #209ae0; + border: 1px solid #5394c3; + padding: 6px 16px; + line-height: 3em; + background: url(../site_icons/grouping/bg_links_addnew.gif) center center repeat-x;*/ +} + +a.addNewButton button { + color: #209AE0; +} + +#personWrap a.cancel { + color: red; + border-color: #E7B6B9; +} + +#personWrap .editForm input#submit { + color: #209AE0; +} + +#personWrap div.editBox .editForm { + margin: 10px 0; +} + +#personWrap table.mceEditor, +#personWrap div.editBox textarea { + margin: 5px 0; +} + +#personWrap p.propEntryHelpText { + font-weight: bold; + font-style: italic; + margin: 0; + padding: 5px 0; + line-height: 1.2em; + color: #439CBD; +} + +#personWrap #keywords div.editBox a.edit { + display: none; +} + +a.backToTop { + float: right; + margin-top: -22px; + font-size: .9em; + color: #aaa; + border-color: #ddd; +} + +a.backToTop:link, +a.backToTop:visited { +/* color: #118855; */ +} + +#personWrap div.propsCategory div.highlighted { +/* background: #faf8f3 url(../site_icons/grouping/bg_propsItem_highlighted.gif) left top repeat-y;*/ + border-top-color: #faf8f3; +/* border-top-color: #F0EDE4;*/ + border-bottom-color: #faf8f3; +/* border-top: 1px solid #F0EDE4;*/ + margin-left: -16px; + padding-left: 16px; + margin-right: -15px; + padding-right: 15px; +} + +/* ----------------- Colors ---------------- + +Light Blue (edit links): #209ae0 +Bright Orange (link hover): #FF8811 +Dark Green (links): #118855 +*/ + +/* fixes IE double top-padding bug, discussed at: http://exscale.se/archives/2007/06/13/ie-double-padding-bug/ + -- recent versions of Firefox and Safari don't ignore inline-block anymore */ + +* html #personWrap div.propsWrap { + display: inline-block; +} + +*:first-child+html #personWrap div.propsWrap { + display: inline-block; +} + +* html div.editBox button { + padding: 1px 3px 2px 3px; +} + +*:first-child+html div.editBox button { + padding: 1px 3px 2px 3px;} +} + +* html #personWrap #entity h2, +* html #personWrap #entity em.moniker { + height: 1%; /* fixes IE6 peekaboo bug */ +} + +* html #personWrap #dashboardExtras, +* html #personWrap div.propsCategory, +* html #personWrap div.propsItem { + height: 1%; /* fixes IE6 peekaboo and absolute position bug described at http://www.positioniseverything.net/abs_relbugs.html */ +} + +* html #personWrap div.admin { + height: 1%; +} +* html #personWrap #content div.propsItem { + border-color: #f0ede4; + border-top: 0; +} \ No newline at end of file diff --git a/themes/wilma/css/institution.css b/themes/wilma/css/institution.css new file mode 100644 index 00000000..f278e7b0 --- /dev/null +++ b/themes/wilma/css/institution.css @@ -0,0 +1,22 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/**************************************** + vivo-basic theme: institutional identity + + Original version + 2009-01-27 nac26 +*****************************************/ + +/********************************************************************************** + Add styles for institutional identity here. + Be sure to place all of your content in
found in themes/vivo-basic/templates/identity.ftl on line 5. + + See our online documentation for more info: + http://vivoweb.org/support/user-guide/theme-modifications +**********************************************************************************/ + + +/**************** +Institution +****************/ +div#institution { position: relative; } \ No newline at end of file diff --git a/themes/wilma/css/layout.css b/themes/wilma/css/layout.css index 1c70b18e..9abbeabd 100644 --- a/themes/wilma/css/layout.css +++ b/themes/wilma/css/layout.css @@ -41,7 +41,7 @@ html, body { } /* BRANDING ------> */ - h2.vivo-logo { +h2.vivo-logo { position:absolute; width:386px; height:59px; @@ -97,11 +97,10 @@ ul#header-nav a:hover, ul#header-nav a:active { /* <------ HEADER */ /*MAIN NAVIGATION------> */ - ul#main-nav { display:block; width:968px; - height:48px; + height:46px; border:1px solid #dce4e3; background-color:#f7f9f9; margin:0 auto; @@ -111,10 +110,11 @@ ul#main-nav { } #main-nav li { float:left; - line-height:40px; - background:url(../images/separator-main-nav.jpg) right -3px no-repeat; + line-height:46px; + background:url(../images/separator-main-nav.jpg) right -2px no-repeat; } #main-nav li a { + padding-left: 16px; padding-right: 16px; display:block; @@ -127,23 +127,24 @@ ul#main-nav { } #main-nav li a.selected { color:#002b44; - background:url(../images/selected-main-nav.jpg) left -3px no-repeat; + background:url(../images/selected-main-nav.jpg) left -1px no-repeat; margin-left:18px; } /* <------ MAIN NAVIGATION */ - #wrapper-content { - width:970px; + clear:both; + width:930px; margin:0 auto; background:#fff; min-height:450px; + padding:20px; } /* INTRO ------> */ #intro { float:left; - width:600px; + width:570px; padding-bottom:40px; } #intro h3 { @@ -258,8 +259,8 @@ p.forgot-password a { clear:both; float:left; margin-left:38px; - margin-top:20px; - padding-top:20px; + margin-top:0; + padding-top:15px; border-top:1px solid #e8ece9; } /* <------ LOG IN */ @@ -298,7 +299,7 @@ input.search-home-vivo { height:20px; font-size:14; color:#fff; - padding-top:15px; + padding-top:10px; padding-left:30px; } /* <------ SEARCH */ @@ -447,6 +448,7 @@ ul#class-group-list .count-individuals { height:400px; border:1px solid #dfe6e6; background:#f7f9f9; + padding-bottom:30px; } #highlights h2 { background:#5e6363; @@ -535,12 +537,14 @@ time.dtstart { background:url(../images/date-display.jpg) 0 0 no-repeat; color:#fff; text-align:center; - padding-top:12px; + padding-top:10px; font-size:20px; } time.dtstart span { display:block; font-size:11px; + color:#fff; + margin-top:-10px; } p.summary { padding-left:50px; @@ -551,7 +555,7 @@ p.summary { } p.summary time { display:block; - padding-top:5px; + padding-top:0; font-weight:normal; } /* <------ UPCOMING EVENTS */ @@ -593,7 +597,7 @@ p.publication-content span { } #footer-content p.copyright { float:left; - padding-top:50px; + padding-top:48px; padding-left: 30px; width:500px; } diff --git a/themes/wilma/css/reset.css b/themes/wilma/css/reset.css index 603c8757..cf95f759 100644 --- a/themes/wilma/css/reset.css +++ b/themes/wilma/css/reset.css @@ -7,7 +7,7 @@ The goal of a reset stylesheet is to reduce browser inconsistencies in things li */ -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { +/*html, body, div, span, applet, object, iframe, blockquote, h1, h2, h3, h4, h5, h6, p, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; @@ -15,12 +15,39 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq font-size: 100%; vertical-align: baseline; background: transparent; + color:#595b5b; + } body { - line-height: 1; + line-height: 1.3; +}*/ + +html, body, div, span, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, code, +del, dfn, em, img, q, dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + font-family: inherit; + vertical-align: baseline; + color:#595b5b; + font-weight:normal; } + +body { + line-height: 1.5em; +} + + ol, ul { list-style: none; + font-weight:normal; } blockquote, q { quotes: none; @@ -55,3 +82,7 @@ fieldset { legend { display: none; } + + + + diff --git a/themes/wilma/css/screen.css b/themes/wilma/css/screen.css new file mode 100644 index 00000000..fcb13449 --- /dev/null +++ b/themes/wilma/css/screen.css @@ -0,0 +1,836 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/**************************************** + vivo-basic theme: screen styles + + Original version + 2009-04-30 mw542 +*****************************************/ + +@import url("blueprint/reset.css"); +@import url("blueprint/forms.css"); +@import url("blueprint/typography.css"); +@import url("blueprint/liquid.css"); +@import url("blueprint/ie.css"); +@import url("institution.css"); +@import url("individual.css"); + +body { + position: relative; + background: #596673; +/* background: #737373;*/ + padding: 0 4em; +} + +#wrap { background: #fff; } + +#contentwrap { + padding: 24px 20px; + background: #D9D9D9; +} + +#content { + padding: 16px 12px; + background: #fff; + font-size: 108.33%; /* bumping up content text from 12px to 13px */ + min-height:350px; +} + +#footer { + color: #e5e5e5; + background: #3d454e; +/* background: #4e4e4e;*/ + padding: 16px 20px 40px 20px; + text-align: right; + clear: both; +} + +#research_instance { + background-color:red; + color:white; + font-size:1.25em; + font-weight:bold; + text-align:center; +} + +#research_instance a { + color:white; +} + +/**************** +Global classes +****************/ + +ul.clean { margin-left: 0; } +ul.clean li { list-style-type: none; } + + +/**************** +Identity +****************/ + +div#identity { position: relative; } + +#identity h1 { +/* position: absolute; + top: 33px; + left: 10px;*/ + padding-top: 20px; + margin-left: 20px; + margin-bottom: 20px; + width: 361px; + height: 55px; + text-indent: -9999px; + background: url(../site_icons/vivo-logo.jpg) bottom left no-repeat; + +} + +#identity h1 a { + width: 361px; + height: 55px; + display: block; + overflow: hidden; /* hide the extended outline in firefox */ +/* background: url(images/layout/transparent.gif) top left no-repeat;*/ + /* for some reason IE7 needs a background to make this link clickable */ +} + +#identity em { + position: absolute; + top: 32px; + left: 167px; + color: #212d35; + font-style: normal; + font-size: 1.17em; +} + +ul#otherMenu { + position: absolute; + margin: 0; + top: 3px; + right: 20px; +} + +ul#otherMenu li { + display: inline; + margin-left: 4px; +} + +ul#otherMenu li { + padding-right: 4px; + border-right: 1px solid #ccc; +} + +ul#otherMenu li.last { + padding-right: 0; + border-right: none; +} + + +/************************ +Navigation and Search +************************/ + +div#navAndSearch { + position: relative; + background: #212d34; +/* background: #7d8b99;*/ + border-top: 3px solid #3d454e; +/* border-top: 3px solid #4e4e4e;*/ + padding-left: 20px; +/* padding-right: 300px;*/ + padding-right: 22em; + padding-top: 8px; + padding-bottom: 8px; + height: 1%; +} + +div#secondaryTabMenu { display: none; } + +select#search-form-modifier, +#searchForm label { display: none; } + +div#searchBlock { + height: 100%; + text-align: right; + padding: 0 20px 0 20px !important; /* fix for IE6 */ + padding: 10px 20px; + position: absolute; + top: 0; + right: 0; + background: #3d454e; +/* background: #4e4e4e;*/ +} + +#searchForm { margin-top: 10px; } + +#navAndSearch ul { + margin: 0; + padding: 0; +} + +#navAndSearch li { + list-style-type: none; + margin: 1px; +} + +#navAndSearch li a { + display: block; + color: #fff; + text-decoration: none; +} + +#navAndSearch li a:hover { + color: #000; + background: #fff; +} + +#navAndSearch li a.activePrimaryTab, +#navAndSearch li a.activeTab { + color: #000; + background: #fff; + font-weight: bold; +} + +ul#primary, +ul#primary li, +ul#index, +ul#index li { + float:left; +} + +ul#primary li a, +ul#index li a { padding: 5px 12px; } + + +div#breadcrumbs { + color: #aaa; + clear: left; + background: #D9D9D9; + padding: 16px 20px 0 20px; + margin-bottom: -18px; + display: none; +} + +div#breadcrumbs a { color: #888; } + +div#breadcrumbs a:hover { color: #000; } + + +/************************ +Individual Pages +************************/ + +div#labelAndMoniker { margin-bottom: 1.5em; } + + +#labelAndMoniker div { + display: inline; +} + +#label h2, +#label h3 { + display: inline; + padding-right: 6px; +} + +em.moniker { + color: #9c9c9c; +} + +ul.externalLinks { margin: 0 0 1.5em 0; } + +ul.externalLinks li { + list-style-type: none; + display: inline; + padding-right: .5em; + padding-left: .8em; + border-left: 1px solid #ddd; +} + +ul.externalLinks li.primary, +ul.externalLinks li.first { + padding-left: 0; + border: 0; +} + +ul.externalLinks a { color: #84a655; } /* green links */ + +ul.externalLinks a:hover, +ul.externalLinks a:active, +a.externalLink:hover, +a.externalLink:active { + color: #000; +} + +a.externalLink { color: #84a655; } + +div.description { margin-bottom: 1.5em; } + +.propertyName, +.propsItem h4 { + font-size: 1em; + line-height: 1em; + color: #666; + background: #ebebeb; + border-right: 1px solid #fff; + margin-left: -12px; +/* margin-bottom: .75em;*/ + padding: 4px 12px; + float: left; + /* Fixes in IE6 the cut off text for data and object property names for individual display property groups. */ + *padding-left:24px !important; +} + +.propsItem, +.datatypeProperties, +.properties { + clear: left; +} + +.propsItem { padding: 1em 0; } + +.propsItem a { font-weight: bold; } + +.pageGroupBody { + margin-bottom: 1em; +} + +#acknowledgementText { + font-size: 90%; +} + + +/************************ +Search Results +************************/ + +.contentsBrowseGroup h2 { + margin-top: 2em; + padding-bottom: .25em; + border-bottom: 1px solid #eee; +} + +.contentsBrowseGroup h3 { + color: #666666; + font-size: 1em; + margin-bottom: 0; +} + +.contentsBrowseGroup ul { margin-left: 0; } + +.contentsBrowseGroup li { + list-style-type: none; + color: #9C9C9C; +} + +.searchTOC a { + font-weight: bold; + padding-left: 3px; +} + + +/************************ +Tabs +************************/ + +ul.tabEntities { + color: #9c9c9c; + margin: 1em 0; +} + +ul.tabEntities li { + margin-bottom: 1em; + list-style-type: none; +} + +ul.tabEntities a { font-weight: bold; } + +ul.tabEntities a.externalLink, +.individualList a.externalLink { + text-decoration: none; + font-weight: normal; +} + +.individualList ul.individualData { + display: inline; +} + +.individualList ul.individualData li { + display: inline; + border-right: solid 1px #a0a0a0; + padding-right: .3em; +padding-bottom:1.2em; + +} + +.individualList ul.individualData li.last { + border: none; +} + +div.blurb { color: #999; } + +div.blurb a { font-weight: normal; } + +/* Index and List pages */ +.siteMap ul, +.individualList ul { margin-left: 0; } + +.siteMap li { + list-style-type: none; + color: #9c9c9c; +} + +.individualList li { + list-style-type: none; + color: #9c9c9c; + margin-bottom: .5em; + } + +.siteMap li a, +.individualList li a { + font-weight: normal; + } + +.siteMap h2 { + margin-top: 10px; + font-weight:bold; + color:#2485AE; + } + +div.tab h2 { + margin: 0 -12px; + padding: 0 12px 2px 12px; + +} + +.tab h3 { + color: #999; + margin-top: 1em; + padding-bottom: 3px; +} + +.tab h3 a { color: #1b4f89; } + +.tab h3 a:hover { color: #000; } + +.tab th, .tab td, .tab caption { padding-left: 0; } + +.tabBody { padding: 2px 0; } + +.tabDesc { padding-top: 16px; } + +/************************ +Footer +************************/ + +#footer a { + color: #fff; + font-weight: bold; +} + +img.footerLogo { float: left; } + +ul.otherNav { margin: 0; } + +ul.otherNav li { + display: inline; + padding: 0 6px; + border-right: 1px solid #aaa; +} + +ul.otherNav li.last { + border: 0; + padding-right: 0; +} + + +/********************************************** +Admin Panels & Controls + +the odd combinations of positioning types +are necessary for cross-browser consistency +**********************************************/ + +/*** Admin Dashboard ***/ + +#adminDashboard { + margin-top: 1em; + display: inline-block; + width: 100%; +} + +/*#adminDashboard .pageBodyGroup { + margin-top: 2em; + margin-bottom: 2em; + clear: both; +}*/ + +#adminDashboard .pageBodyGroup { + float: left; + clear: right; + display: inline-block; + width: 45%; + margin-top: 2em; + margin-bottom: 1em; + padding: 0 1em; +} + +#adminDashboard .pageBodyGroup h4 { + margin-bottom: .25em; +} + +#adminDashboard .pageBodyGroup h3 { + background-color: #efefef; + color: #000; + padding: 5px; +} + +#adminDashboard .pageBodyGroup ul { + margin: 0 0 1.5em 0; +} + +#adminDashboard .pageBodyGroup li { + list-style-type: none; +} + +#adminDashboard #verbosePropertyForm { + margin-top: 3em; +} + +#adminDashboard .add-action-button { + margin-top: .75em; +} + +#logoutPanel { + float: right; + margin-right: 4.5em; +} + +#logoutPanel input.button { + margin-left: .9em; +} + +/*** end Admin Dashboard ***/ + +div.admin { + color: #fff; + background: #aaa; + padding: 6px; + height: 1%; /* IE likes this */ + width: 100%; /* and this */ +} + +div.panelContents { + color: #777; + background: #e5e3d5; +/* display: none;*/ + padding: 12px; +} + +div.top { + margin: 0 -12px; + padding: 0 24px 0 0; + position: relative; + top: -16px; + background: #e5e3d5; +} + +div.bottom { + margin: 0 -12px; + position: relative; + bottom: -16px; + padding: 6px 12px 8px 12px; +} + +.admin h3 { + font-size: 1em; + text-transform: uppercase; + font-weight: bold; + color: #ddd; + background: #aaa; + line-height: 2em; + margin: 0 !important; /* fix for IE6 */ + margin-right: -24px; + padding: 0 12px; + width: 100% !important; /* fix for IE6 */ + width: auto; +} + +.admin p { margin-bottom: .25em; } + +.admin a:link, +.admin a:visited { color: #fff; } + +.panelContents a:link, +.panelContents a:visited { color: #777; } + +.admin a:hover, +.admin a:active { color: #000; } + +#loginPanel ul { margin: 0; } + +#loginPanel li { + list-style-type: none; + margin-bottom: .5em; +} + + + + +/****************************************************************** +ENTITY LIST TOGGLES +(The little plus/minus toggles that show additional items) + +These controls are set up to use JavaScript but degrade to use +CSS :hover classes -- JavaScript can be found in controls.js + +IE6 does not support :hover so it will see everything +(hack is in ie.css) +******************************************************************/ + +span.entityMoreSpan { + display: block; + font-style: italic; + background: url(../site_icons/plus.gif) left center no-repeat; + padding-left: 14px; + margin: .5em 0; + line-height: 1em; + cursor: pointer; +} + +div.navlinkblock:hover span.entityMoreSpan, +div.navlinkblock-collapsed:hover span.entityMoreSpan, +span.entityMoreSpan:hover { + color: #8C65A1; +} + +div.navlinkblock:hover span.entityMoreSpan, +div.navlinkblock-expanded span.entityMoreSpan { + background: url(../site_icons/minus.gif) left center no-repeat; +} + + +div.navlinkblock:hover div.extraEntities, +div.navlinkblock-expanded div.extraEntities { + display: block; +} + +div.extraEntities { + display: none; +} + + +/******************************** +Frontend Edit Controls and Forms +********************************/ + +div.editingForm { background: none; } + +div.editingForm hr { display: none; } + +a.add { + float: left; + line-height: 1em; + width: 1em; + height: 1em; + padding: 4px; + background: #ebebeb url(../site_icons/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-color: #576772; +} + +ul.properties { margin: 0; } + +ul.properties li { + color: #9c9c9c; + list-style-type: none; +} + +div.datatypePropertyValue, +ul.properties li, +ul.datatypePropertyValue li { + position: relative; +} + + +span.editLinks, +em.nonEditable { + display: none; +} + +span.editLinks a, +em.nonEditable { font-size: 84.62%; } /* 13px down to 11px */ + +span.editLinks a { + color: #da8622; + font-weight: normal; +} + +span.editLinks a:hover { color: #000; } + +span.editLinks a.edit { padding-right: 4px; } + +.statementWrap:hover span.editLinks, +.statementWrap:hover em.nonEditable { + display: block; + width: 6em; + padding: 2px 0 4px 0; + position: absolute; + top: -2px; + left: -6em; + line-height: 1.5em; + background: #fff; + z-index: 10; + text-align: center; +} + + + +span.statementWrap:hover em.nonEditable { + padding-top: 5px; + width: 8em; + left: -8em; + font-style: normal; +} + +.verbosePropertyListing { + color: gray; + font-size: 0.75em; + margin-left: 1em; +} + +#dprop-vitro-links.editing li { + display: block; + border: 0; + padding: 0; + margin-bottom: .5em; +} + +/************************ +Backend forms +************************/ + +div.sparqlform label { + font-weight: normal; + display: inline; +} + +em.note { + font-size: 0.92em; + color: #777; +} + +h3.associate { + margin-bottom: 0; + text-align: left; +} + +/************************ +Upload Images +************************/ + +div.thumbnail img, +div#thumbnail img { + border:3px solid #d5d5d5; +} + +/************************ +Miscellaneous +************************/ + +.clear{ +clear:both; +} + +.hidden{ +display:none !important; +} + + +/************************ +style for those with javascript disable +************************/ + +#javascriptDisableWrapper, ie67DisableWrapper{ +margin-top:15px; +width:500px; +height:300px; +} + +#javascriptDisableContent, #ie67DisableContent{ +width:500px; +height:100px; +border:3px solid #bee6f8; +} +#ie67DisableContent{ +width:80%; +margin-bottom:200px; +} +#javascriptDisableContent img, #ie67DisableContent img{ +float:left; +margin-top:36px; +margin-left:30px; +} + +#javascriptDisableContent p, #ie67DisableContent p{ +font-size:1.1em; +color:#384c5d; +line-height:100px; +padding-left:65px; +} +#ie67DisableContent p{ +line-height:normal; +padding-top:36px; +} + + +/* styles for error alerts */ + +#errorAlert{ + color:#900; + padding:0px; + margin-bottom:5px; + height:30px; + +} + + +#errorAlert img{ + float:left; + margin:0; + padding:0; + + + +} + +#errorAlert p{ +padding-left:40px; +font-size:0.9em; + + +} + +/* styles for contact us page */ + +.contactUsReturnHome{ +margin-top:30px; +margin-bottom:250px; +} + + + + +/*--*/ +h2{ + font-weight:bold; +} +p{ + line-height:1.3em; + padding-bottom:10px; +} \ No newline at end of file diff --git a/themes/wilma/css/search.css b/themes/wilma/css/search.css new file mode 100644 index 00000000..ab3000ca --- /dev/null +++ b/themes/wilma/css/search.css @@ -0,0 +1,63 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/************************************************* + + vivo-basic theme: search results styles + +**************************************************/ + +/***** Search form *****/ + +.advancedSearchForm .form-button { + margin-top: 1em; +} + + +/***** Class and subclass refinement links *****/ + +.searchTOC { + margin-bottom: 1.5em; +} + + +/***** Search results *****/ + +.searchhits li { + margin-top: 1em; +} + +span.SearchTerm, h1 span.SearchTerm, a:link span.SearchTerm, a:visited span.SearchTerm { + font-weight: bold; + color: #7D7D7D; +} + + +/***** Paging links *****/ + +.searchpages { + margin-top: 2em; +} + +.searchpages a, .searchpages span { + margin-left: .5em; + margin-right: .5em; +} + +.searchpages a:link, .searchpages a:visited { + text-decoration: none; +} + +.searchpages a:hover, .searchpages a:active { + text-decoration: underline; +} + +.searchpages a.prev { + margin-right: 1em; + text-decoration: underline; +} + +.searchpages a.next { + margin-left: 1em; + text-decoration: underline; +} + diff --git a/themes/wilma/css/style.css b/themes/wilma/css/style.css index 826bb4ef..99999d6e 100644 --- a/themes/wilma/css/style.css +++ b/themes/wilma/css/style.css @@ -16,6 +16,9 @@ VIVO theme: screen styles @import url("reset.css"); @import url("pictos.css"); +@import url("screen.css"); /*don't move it*/ @import url("layout.css"); @import url("top-level.css"); +@import url("individual.css"); @import url("forms.css"); +@import url("formedit.css"); diff --git a/themes/wilma/css/uploadImages.css b/themes/wilma/css/uploadImages.css new file mode 100644 index 00000000..a7b0e665 --- /dev/null +++ b/themes/wilma/css/uploadImages.css @@ -0,0 +1,141 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/* styles for uploading a picture */ + +#photoUploadContainer{ + margin-left: 0px; + height:280px; + background:#fff; + padding:15px; +} + +#photoUploadDefaultImageContainer{ + + width:120px; + float:left; + + +} + +#photoUploadDefaultImageContainer img{ + + border:3px solid #CCC; + margin-bottom:10px; + +} + +#photoUploadForm{ + width:280px; + float:left; + padding-top:45px; + padding-left:15px; + +} + + + +#photoUploadForm form label{ + display:block; + padding-bottom:10px; + + +} + +#photoUploadForm label span{ + font-size:0.7em; + + +} + +#photoUploadForm form input{ + margin-bottom:10px; + + +} + + +/* styles for cropping a picture */ + +#photoCroppingContainer{ + margin-left: 0px; + height:450px; + background:#fff; + padding:15px 0 15px 15px; + margin-right:0; + +} + +#photoCroppingPreview{ + width:180px; + float:left; +} + + +.photoCroppingNote{ + margin-top:15px; + font-size:0.8em; +} + +#photoCropping{ + width:400px; + float:left; + padding-top:30px; + padding-left:15px; + margin-left:0; + margin-right:0; +} + + + +/* styles for deleting a picture */ + +#photoDeletingContainer{ + margin-left: 0px; + width:720px; + height:330px; + background:#fff; + border:1px solid grey; + padding:15px; + +} +/* styles for error alerts */ +#errorAlert{ + color:#900; + padding:0px; + margin-bottom:5px; + height:30px; + +} + + +#errorAlert img{ + float:left; + margin:0; + padding:0; + vertical-align:middle; +} + +#errorAlert p{ +padding-left:35px; +font-size:0.9em; +line-height:30px; +} +a.cancelUpload:link, a.cancelUpload:visited { +color:#FF7700; +} + +a.cancelUpload:hover { + color:#FFF; + background-color:#FF7700; +} + +a.cancelUpload:active { + color:#FF7700; +} +.or{ + display:inline; + vertical-align:middle; +} + + + diff --git a/themes/wilma/images/arrow-green.gif b/themes/wilma/images/arrow-green.gif new file mode 100644 index 00000000..b3a75c25 Binary files /dev/null and b/themes/wilma/images/arrow-green.gif differ diff --git a/themes/wilma/images/arrow-grey.gif b/themes/wilma/images/arrow-grey.gif new file mode 100644 index 00000000..f858de94 Binary files /dev/null and b/themes/wilma/images/arrow-grey.gif differ diff --git a/themes/wilma/images/individual--foaf-person.png b/themes/wilma/images/individual--foaf-person.png new file mode 100644 index 00000000..2cfbfbc3 Binary files /dev/null and b/themes/wilma/images/individual--foaf-person.png differ diff --git a/themes/wilma/images/individual-coauthor.jpg b/themes/wilma/images/individual-coauthor.jpg new file mode 100644 index 00000000..cfe80a1e Binary files /dev/null and b/themes/wilma/images/individual-coauthor.jpg differ diff --git a/themes/wilma/images/individuals/Bacall.jpg b/themes/wilma/images/individuals/Bacall.jpg new file mode 100644 index 00000000..1a1b4c27 Binary files /dev/null and b/themes/wilma/images/individuals/Bacall.jpg differ diff --git a/themes/wilma/images/individuals/Bogart.jpg b/themes/wilma/images/individuals/Bogart.jpg new file mode 100644 index 00000000..35c6d20e Binary files /dev/null and b/themes/wilma/images/individuals/Bogart.jpg differ diff --git a/themes/wilma/images/individuals/Gable.jpg b/themes/wilma/images/individuals/Gable.jpg new file mode 100644 index 00000000..e3cf7b61 Binary files /dev/null and b/themes/wilma/images/individuals/Gable.jpg differ diff --git a/themes/wilma/images/individuals/Grant.jpg b/themes/wilma/images/individuals/Grant.jpg new file mode 100644 index 00000000..f04c2189 Binary files /dev/null and b/themes/wilma/images/individuals/Grant.jpg differ diff --git a/themes/wilma/images/individuals/Leigh.jpg b/themes/wilma/images/individuals/Leigh.jpg new file mode 100644 index 00000000..1418aa34 Binary files /dev/null and b/themes/wilma/images/individuals/Leigh.jpg differ diff --git a/themes/wilma/images/individuals/Welles.jpg b/themes/wilma/images/individuals/Welles.jpg new file mode 100644 index 00000000..30de9b4a Binary files /dev/null and b/themes/wilma/images/individuals/Welles.jpg differ diff --git a/themes/wilma/images/jump-tp-property-group-menu.gif b/themes/wilma/images/jump-tp-property-group-menu.gif new file mode 100644 index 00000000..937f7bb7 Binary files /dev/null and b/themes/wilma/images/jump-tp-property-group-menu.gif differ diff --git a/themes/wilma/images/phone-icon.gif b/themes/wilma/images/phone-icon.gif new file mode 100644 index 00000000..ed99fa72 Binary files /dev/null and b/themes/wilma/images/phone-icon.gif differ diff --git a/themes/wilma/images/separator-property-group-nav.jpg b/themes/wilma/images/separator-property-group-nav.jpg new file mode 100644 index 00000000..8b1c0ea8 Binary files /dev/null and b/themes/wilma/images/separator-property-group-nav.jpg differ diff --git a/themes/wilma/images/sparkline.gif b/themes/wilma/images/sparkline.gif new file mode 100644 index 00000000..373cc447 Binary files /dev/null and b/themes/wilma/images/sparkline.gif differ diff --git a/themes/wilma/templates/edit/formPrefix.jsp b/themes/wilma/templates/edit/formPrefix.jsp new file mode 100644 index 00000000..429d1a62 --- /dev/null +++ b/themes/wilma/templates/edit/formPrefix.jsp @@ -0,0 +1,109 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> +<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> + +<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ page errorPage="/error.jsp"%> +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> + +<% +FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); +%> + +<% + VitroRequest vreq = new VitroRequest(request); + Portal portal = vreq.getPortal(); + + String contextRoot = vreq.getContextPath(); + + String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; + themeDir = contextRoot + '/' + themeDir; +%> + + + + + + + + + + + + + ${title} + + + + <%-- ${headScripts.add("/js/html5.js")} --%> + + <% + String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; + if (useTinyMCE.equalsIgnoreCase("true")) { + String height = (height=request.getParameter("height")) != null && !(height.equals("")) ? height : "200"; + String width = (width=request.getParameter("width")) != null && !(width.equals("")) ? width : "75%"; + String defaultButtons="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code"; + String buttons = (buttons=request.getParameter("buttons")) != null && !(buttons.equals("")) ? buttons : defaultButtons; + String tbLocation = (tbLocation=request.getParameter("toolbarLocation")) != null && !(tbLocation.equals("")) ? tbLocation : "top"; + %> + + + <% } %> + + <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; + if (useAutoComplete.equalsIgnoreCase("true")) { %> + " /> + <% } %> + + + " media="screen"/> + + + " /> + + +
+ ${ftl_menu} +
+ \ No newline at end of file diff --git a/themes/wilma/templates/edit/formSuffix.jsp b/themes/wilma/templates/edit/formSuffix.jsp new file mode 100644 index 00000000..b6f2a9d0 --- /dev/null +++ b/themes/wilma/templates/edit/formSuffix.jsp @@ -0,0 +1,55 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> +<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> + +<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ page errorPage="/error.jsp"%> +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> + +<% +FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request); +%> + +<% + VitroRequest vreq = new VitroRequest(request); + Portal portal = vreq.getPortal(); + + String contextRoot = vreq.getContextPath(); + + String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT; + themeDir = contextRoot + '/' + themeDir; +%> + + + + + + + + +
+ + ${ftl_footer} + + + + + + + +<% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; + if (useAutoComplete.equalsIgnoreCase("true")) { %> + +<% } %> + + + + + + + \ No newline at end of file diff --git a/themes/wilma/templates/googleAnalytics.ftl b/themes/wilma/templates/googleAnalytics.ftl new file mode 100644 index 00000000..9ed5e6bd --- /dev/null +++ b/themes/wilma/templates/googleAnalytics.ftl @@ -0,0 +1,20 @@ +<#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code. +Please see documentation at https://confluence.cornell.edu/display/ennsrd/Google+Analytics+for+UI. --> + +<#-- + + +--> \ No newline at end of file diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl index 092d44dc..d3b6a723 100644 --- a/themes/wilma/templates/page-home.ftl +++ b/themes/wilma/templates/page-home.ftl @@ -1,6 +1,74 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + + + + +${title} + +${stylesheets.tags} + +${headScripts.add("/js/html5.js")} +${headScripts.tags} + + +
+
+ + +<#import "lib-list.ftl" as l> + + +
+ +
@@ -67,7 +135,7 @@

Visual Graph

-
+
@@ -75,10 +143,10 @@

FEATURED PEOPLE

-
+

foaf:lastName, foaf:firstName core:preferredTitlecurrentPosition(s)

-
+

foaf:lastName, foaf:firstName core:preferredTitlecurrentPosition(s)

@@ -129,3 +197,53 @@

View All 4

+
+ +
+ + + + + +${scripts.add("/js/jquery.js")} +${scripts.tags} + + + + + + + + +<#include "googleAnalytics.ftl"> + + diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl index 05b15d1d..141e0b60 100644 --- a/themes/wilma/templates/page.ftl +++ b/themes/wilma/templates/page.ftl @@ -5,6 +5,7 @@ ${title} +${stylesheets.tags} ${headScripts.add("/js/html5.js")} ${headScripts.tags} @@ -68,9 +69,7 @@ ${headScripts.tags}
- ${body} -
@@ -81,7 +80,7 @@ ${headScripts.tags} <#else> ${copyright.text} - All Rights Reserved | Terms of Use | Powered by VIVO

+ All Rights Reserved | Terms of Use | Powered by VIVO

-
@@ -102,21 +100,23 @@ ${headScripts.tags} ${scripts.add("/js/jquery.js")} - +${scripts.tags} + - -${scripts.tags} + + +<#include "googleAnalytics.ftl"> diff --git a/themes/wilma/templates/page/basicPage.jsp b/themes/wilma/templates/page/basicPage.jsp new file mode 100644 index 00000000..a1048b55 --- /dev/null +++ b/themes/wilma/templates/page/basicPage.jsp @@ -0,0 +1,101 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> +<%-- This is a temporary file and will be removed once we have completed the transition to freemarker --%> + +<%@ page import="edu.cornell.mannlib.vitro.webapp.web.*" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ page errorPage="/error.jsp"%> +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%> +<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %> + +<% /*********************************************** + Display a single Page in the most basic fashion. + The html is generated followed by the banners and menu. + After that the result of the jsp in the attribute bodyJsp is inserted. + Finally comes the footer. + + request.attributes: + "bodyJsp" - jsp of the body of this page. + "title" - title of page + "css" - optional additional css for page + "scripts" - optional name of file containing