From 97720d37207d9347e9f5b2e69c92c1c35ac699b0 Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 25 Oct 2010 18:43:26 +0000 Subject: [PATCH] Further development of Wilma theme, still include a lot of temporary files and directories. There are duplicated files, wrong file image location, still a work in progress. --- productMods/edit/formPrefix.jsp | 117 +++ productMods/edit/formSuffix.jsp | 66 ++ productMods/templates/page/basicPage.jsp | 60 ++ themes/wilma/css/edit.css | 342 +++++++ themes/wilma/css/entity.css | 7 + themes/wilma/css/formedit.css | 60 ++ themes/wilma/css/individual.css | 657 ++++++++++++++ themes/wilma/css/institution.css | 22 + themes/wilma/css/layout.css | 34 +- themes/wilma/css/reset.css | 35 +- themes/wilma/css/screen.css | 836 ++++++++++++++++++ themes/wilma/css/search.css | 63 ++ themes/wilma/css/style.css | 3 + themes/wilma/css/uploadImages.css | 141 +++ themes/wilma/images/arrow-green.gif | Bin 0 -> 183 bytes themes/wilma/images/arrow-grey.gif | Bin 0 -> 183 bytes .../wilma/images/individual--foaf-person.png | Bin 0 -> 25371 bytes themes/wilma/images/individual-coauthor.jpg | Bin 0 -> 1374 bytes themes/wilma/images/individuals/Bacall.jpg | Bin 0 -> 1368 bytes themes/wilma/images/individuals/Bogart.jpg | Bin 0 -> 1402 bytes themes/wilma/images/individuals/Gable.jpg | Bin 0 -> 1170 bytes themes/wilma/images/individuals/Grant.jpg | Bin 0 -> 1195 bytes themes/wilma/images/individuals/Leigh.jpg | Bin 0 -> 1220 bytes themes/wilma/images/individuals/Welles.jpg | Bin 0 -> 1184 bytes .../images/jump-tp-property-group-menu.gif | Bin 0 -> 234 bytes themes/wilma/images/phone-icon.gif | Bin 0 -> 737 bytes .../images/separator-property-group-nav.jpg | Bin 0 -> 48 bytes themes/wilma/images/sparkline.gif | Bin 0 -> 1976 bytes themes/wilma/templates/edit/formPrefix.jsp | 109 +++ themes/wilma/templates/edit/formSuffix.jsp | 55 ++ themes/wilma/templates/googleAnalytics.ftl | 20 + themes/wilma/templates/page-home.ftl | 126 ++- themes/wilma/templates/page.ftl | 22 +- themes/wilma/templates/page/basicPage.jsp | 101 +++ 34 files changed, 2844 insertions(+), 32 deletions(-) create mode 100644 productMods/edit/formPrefix.jsp create mode 100644 productMods/edit/formSuffix.jsp create mode 100644 productMods/templates/page/basicPage.jsp create mode 100644 themes/wilma/css/edit.css create mode 100644 themes/wilma/css/entity.css create mode 100644 themes/wilma/css/formedit.css create mode 100644 themes/wilma/css/individual.css create mode 100644 themes/wilma/css/institution.css create mode 100644 themes/wilma/css/screen.css create mode 100644 themes/wilma/css/search.css create mode 100644 themes/wilma/css/uploadImages.css create mode 100644 themes/wilma/images/arrow-green.gif create mode 100644 themes/wilma/images/arrow-grey.gif create mode 100644 themes/wilma/images/individual--foaf-person.png create mode 100644 themes/wilma/images/individual-coauthor.jpg create mode 100644 themes/wilma/images/individuals/Bacall.jpg create mode 100644 themes/wilma/images/individuals/Bogart.jpg create mode 100644 themes/wilma/images/individuals/Gable.jpg create mode 100644 themes/wilma/images/individuals/Grant.jpg create mode 100644 themes/wilma/images/individuals/Leigh.jpg create mode 100644 themes/wilma/images/individuals/Welles.jpg create mode 100644 themes/wilma/images/jump-tp-property-group-menu.gif create mode 100644 themes/wilma/images/phone-icon.gif create mode 100644 themes/wilma/images/separator-property-group-nav.jpg create mode 100644 themes/wilma/images/sparkline.gif create mode 100644 themes/wilma/templates/edit/formPrefix.jsp create mode 100644 themes/wilma/templates/edit/formSuffix.jsp create mode 100644 themes/wilma/templates/googleAnalytics.ftl create mode 100644 themes/wilma/templates/page/basicPage.jsp 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 0000000000000000000000000000000000000000..b3a75c25d736fd7c53e748390640fab935b540ee GIT binary patch literal 183 zcmV;o07(BwNk%w1VF&;V0K^^u@AcjD_~ysmhwt^=`1|q0+ke8^e7e?Zx71|B+=1}+ z-_GKf>GIF=_v7U6#pUnE^Z4cV`s~u=pXcz)?ey5l-iq<};lta0`1|n5-;4D4=EB>2 z$={5!(OUoi{{R30A^8LW0015UEC2ui00;mJ000Fvpf^aGXL?G}am2ZFaE6(H0e7<5 lTz5s848-l?iDYh@NkD*vcsR(C$8qQ+q^1YQa`J=#06TPfYpnnP literal 0 HcmV?d00001 diff --git a/themes/wilma/images/arrow-grey.gif b/themes/wilma/images/arrow-grey.gif new file mode 100644 index 0000000000000000000000000000000000000000..f858de94f99cb463b53ff6b52d6c4af2dbd7c06a GIT binary patch literal 183 zcmZ?wbhEHb6)65>VPs&CV$cBzgY0BrHCeDsVn$ll=_!F%Ia5De&1zsx-&ASxU3DhUk=#X| eF?nK)Z4Esc8Yd<#`*4D1$ufqcg_l|w7_0$EN@9Ef literal 0 HcmV?d00001 diff --git a/themes/wilma/images/individual--foaf-person.png b/themes/wilma/images/individual--foaf-person.png new file mode 100644 index 0000000000000000000000000000000000000000..2cfbfbc37a6d9a8ccd6ddd7397500862bca2a54f GIT binary patch literal 25371 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 KMNUMnLSTXk3A9ZB literal 0 HcmV?d00001 diff --git a/themes/wilma/images/individual-coauthor.jpg b/themes/wilma/images/individual-coauthor.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cfe80a1e65006dfb56b713043d35566177439c1f GIT binary patch literal 1374 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 literal 0 HcmV?d00001 diff --git a/themes/wilma/images/individuals/Bogart.jpg b/themes/wilma/images/individuals/Bogart.jpg new file mode 100644 index 0000000000000000000000000000000000000000..35c6d20e5b92007e4d35cb42b1e6fb4dbe9289b7 GIT binary patch literal 1402 zcma)$doB>V`OSqf=E5LmKB0Mjl*FfaLj2ToMmJ00{utzOEJkerJ42>_HIUxo#k}3giJa5{X11(I^yJ6TRMA z8fdhJ77mNm!eVhm+}{v!cmk1t$LZ>l$-25!3WY*7*#N>|FxoinO+?}*BR!Iy(Z=Ba z26ZPOX#iVb3qvG;AVDw*Qp-Uq00;!U{^bT}41|J_8W6N${tZL`!3ZP@0i!Yh7zhC) zNhn~dgZ_M{nJy;C{Qy}nEw|b}IQINe^Ed~6OVWRKs7C<~hStx+B;W=-^$ifq<7Gxg z(E-8X%)@3&q5(m|Tc1|eE1&mP5J#&&vuyCF`Oo+%LSU#cYlgzVf62JbB8&5-m#IQLx!r^%s_Ioz;?a9Ucvj;Mry3Z?yD&p(Io-r7n zhXmG5_$xoPFu2ZyWM0mU?8q;Fp26}zPQr@r$RaKVkWW80wIK^MPKG2Zc z82W~{$Dc(_h&qOHaq?dA4Oy1VJ5S7AP4F*;7z-|&-Ma{#d)G!oCTz`@=csrV(I}Yh zRb|p!KAD>wx5tvBAof!jjs_<4K+lZ}mWeErP)<{f5v{)p*=`Hu2wngde5 zP>0N`>>%WW!}5%~SoY zEG^%}%RDyQS%+}suwTrOkk&@?6K%OPBs%BVxld-5VUrkHlRR=-T5mtzIyOzOV+OV= z``Zh<#s%ri!>qt*y_~)&S=pNyW-4t=&{iyVq}?C$QhH;xxxPo}36p}bs=8FncNv*2 zJv_gBi>7ztIGs}R*1XTQ3Ph!rmxHWCe0pVir}4exDIdoBZ0#~n^b~1bKH0QQaJ((X HP5taIhj1){ literal 0 HcmV?d00001 diff --git a/themes/wilma/images/individuals/Gable.jpg b/themes/wilma/images/individuals/Gable.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e3cf7b61f2eea5ef1de96a5980ceb3147637bab9 GIT binary patch literal 1170 zcmex=iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%l$kC{=Bfk}{&S&;Gn5r!NF zMlb-n6AIYaS(#Wk7#U%F7%jlS$jr>l1oQz=O_{- z-1@UZz3TA zEuYF=XuRXt$_G(=@|_Z&K1+6KzMSQD&U!(3XQwLHen-WxtS-x%_dD;V(2s5Fafh{&y_yVf=FPnkPGu9nY-UG&hL75v6q zd1F+WZq1*xtZC{u*RQs_!?tc;^mVO?=;mV!^L<&;??}$<(>xb{(zVCPshWq`Do&+f-{S-f?n2`B)%y+F4QQO3zSTzExXpFKbA-S9vB)u=cRr z#AA-yKAUvD%P8H*ShQ|&<7fR4UPist4x4y|wj`Cww*s6~IP>1ETGYj=x%bH|?!?Eb z%LQ}K{rr0{d6mxYY5$&{njRnZr$kil_`?N)?>wE3+IO8gBN(A4d2rSe4d=}M(%lp5 z3$$uVn3q*IA7AkI=ysolCo6Y6?P=51ym$B1ekGl6 z_nL6*Z9XXz8Tsd5fUTOj!DHRWy+^k63LaX?oB2ug*)kR<4owa0$hB3Ne8TIK)_(@Z3vN53B`xkO z%PNR8R(~X0$Q55A!*}NH#0RVIZq~ghw&n8$l>^DPyOXsA-<8ksoOwOx?eS@+-yTXW z+qP;!L-wCjQ!ivamp!%jFhB{X_@tw+1>AEx_WY^c5nhzH&FgBi6f7~PS d1>e7xh)u1>-o1%2S7g0@>C}&s3-$kR0sy6i!yW(t literal 0 HcmV?d00001 diff --git a/themes/wilma/images/individuals/Grant.jpg b/themes/wilma/images/individuals/Grant.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f04c2189d16d17f616ecf632f33439862f9cf5f1 GIT binary patch literal 1195 zcmex=iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%l$kC{=Bfk}{&S&;Gn5rz^5 z24+SOf&*4Ib`B<}qNCT2kvRt7~OVKzfYCH6p( z#KOjj8=W?ZE;I^CYMR6$h-rx8|62?^Kns}!nFSf_8S39zuhzTtHv7)qD~Z!CYEAsl z5WPXk^gn}=+k&$@*B4t~Hm}fk3vvnl>YkqGk}2>*W2uR3g@3{488c_5%qxl9F*Eee zeubKuDo=XsnoRg?cfOyNzWrIB=#2ZxOI0V`D@bj1`1s&KXYTQ%l@{{M3w9;F-|+YO zZL^=NIp(SCcs428({D-8k-M78NoK2dEWgFy)@YS?HF4f{nOdFbFLN3Ds~&CI*>sz= zTHWo|vrC_zPSIvM&r<8L!ehbX%jsEfpYT2Q>gi6Es6MgS`sx(>DrEGTe$4+CCCjkx<9~*^h4T$2J;*=1buvSGTj4du_C`Mw>&oy@QTf!5g^z3Z zZa*G6E4q62j(2w(SeFTl>ewkR=05WCg@oF1#Z%EI{h97BdBvIk*ELJ3CQ{qGZt{|K z>`UXq9<`phw`3v9kII)W(wjeK6*VqzIrA!fIp2fH-!fK}uHUt@I=XG^=C>!8PP<_^ zk#mZ`#gRyR+l0aujz#TO?0|cJA^1iC0~@Z|%N+XSb8h zhHaBh+4Ow&n{dW4Pq`=Ng^lR0nD!4BjBOmw^?p$QVAX8>{rs*U{}~DmX0o4hvz|6Y$(82DV zXPz5O6Mn2xHciwasqK*kOBbuu-qeYewY=LJ*Wb=NzAx|L&y{cMf^OZs_UIW~bXuhz zYgNoGj>oHWqbdTzkGvF2n#lR5?r#>qVb3S|xCK8yWyUWKborg;{bG}m?HZ*=s%`#v zl!{hMM_(y^C9ar#YRdXmTb6yfU|7a~&b;`x>h^Q$`KC{@OI7#VDczmH8PO#lwAO$A zwC1#LlM;maR<@K)y6XK^Ws1ebC0{;0Q(;`~XR>~J+pQf7=_z~_S|NkZc DRhis| literal 0 HcmV?d00001 diff --git a/themes/wilma/images/individuals/Leigh.jpg b/themes/wilma/images/individuals/Leigh.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1418aa348fa70727de1fbb3c69fa8f22d7c302b9 GIT binary patch literal 1220 zcmex=iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%l$kC{=Bfk}{&S&;Gn5rzT= zMn*;kW=5bpp@4&(jggs!6)1`Z1Q-~ZnOK>C{$Pj5F#**HvN9+Nv9T)&8#)?^1SX1c z6i!qYZQSS-lvHG_E{I{q|62?^K+Bi}nFSf_8FqZCS2}p(wpHrOw|YMM7q`2H{%2S- zNv`ofLx|s^p9yS++rPYC_HeRs(H*aVJ1kA!{VRpiXJ{y;aHur@5G)9&3Q(k*>v zyO!~yNsDE(e`R$qeRd*i-mHac%nG~Pg7wR#^lnV5650~-^MQ%j-BbP>FJ-B5UJ;Ey z&#>cr+Z^kA>#}p#X8)65{(d*?#ccEHqnjtbY|rg!J8c*Bq*PF-CPUMQExUQgCbRzx zdw2hCK4SJmqg8doOLLJ=f@JhqKA*KIdBA#m+V7(Mu}@;x`K|t}Dm8oc)5n*TKL~z0pjLPF?aD8zw_H~qYy0

(+dwQRXuVX;zRu#3n^vF>;oh9>76bK7?ZUnj^JW~}P+ z;_zzP7pF0Ud+Xwfdj21Mf8Ba>OUL3&by`=)qiv7hZu7DXEedr#An&u%)o0qyr5ZE1 zj^Cd5BX;lJKI8MsIvt3axP|05~ zw2x1yX2lFncID5rpKf@6-cUB-{EU~;5dubvtcANIJ14O%HwpRWzHDX82UfNNQ!Wa1 zE}JSpHTc*LZqxNWD$51$Z7=>FR{Q91>Wi{zr6xm($MS~_om%VXG1ni7 z$t}Nc9y#%?zsa5M>f93nwW5p%gBSH}`7&v($*KoB(d~6-AK&(#R{bV%#!p_Ut^O$; zzQH0GrGL;se6_yXTghtnf;%&A8b)^KdK@=mTkv*I zzXt=$mtStXwp^N-z_$9)4sL%2pZkVuqR*P?@YnBrV#+&>J6d7m%qyRE{3<`Y#c16` zMycm>4TRoa{u*>|$zR|1LLb-GUf=(&{OiwG?@ANwqB2hZd|>S=eKs)D|7E=WVI9`_ fX(Cr2iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%l$kC{=Bfk}{&S&;Gn5rzT= z24+SEW}q`+fQ_Alm4TUskr5^UqXih47@3)wSeV(^AnF;Jm<3r_85D&K*&LOG*#i@e z8Yem_i*OVMHEmK6H5C&V#4zLkEe0N-eN2MPf(-TynKyO!?%luIrdvjXAw6%ZoygA@ zYUjRwm)^Dcr^K?|o)3>j$5=%>W`!ynu6!ilGiT!5zNg!7buZvM|NZJaU)61y&kfu% zbNc@I+1Z6ITDk6D;DXZ!)86Ik_xxuFs8HKJY5A+jMHwgTE3ALK&{%&vf5-I7-`wkN zoj#L(BI&Vk#2xF?c9xIh0~6enWcr3sw0ahUW$%L;689zCuv>3%*CHon!HgjO!EFSuHQr^z)czb6}zk-UuRg-ujey!j?S<`ujUpkrl4?kb<;f7EmD_euzZN;X8`_jsHd2IajWZA@J zzE@>0O1Y?1te$q;@p|Fi+U1qmzgFiQ3A$}n^!4i16^m=z8fD+5Rd3JFi!AuJ^hn#% zcTaQ=u5>t z5fl=7ck`@evBGg(%kcWehaK{#yotO1pJ8>mjG0-%*-G9yFZAbzUwsx}5O{>~DVN>E zZH=n8Id5OTF>~qZSktvvr(~;`Iaaz`N;55yV!ILUu;rcgOSZ&kJr@K|tUocgtzp~g zdwkFPHx}7$$@7^etdgZXX-zVdOa7^zMV$SvPj9KW4^f zzujT`n>Fjgg{NUtV|gINTyW9_6Y}`}|t8kE2WCd=$UpO8LCT>T>J5F`hQ<=M|s0 zH>`JD@M!&$4YC^A3sO_gKL6GIpy8vz_7!C}!X2C2rbWC<`H~=Py&_caAd{}Uy1eWj zwua5y_J0+fZK|gJ^~}7Mw0F|}VJ#DCrDiht^Zuxi?Q3w~`|Qk#gqXQ|F2t$->Atfe v^WL-h{dEq7(mCw67l>qqguneK#rI>X@0O=C*txjY{hsHXH=pZ;{r{T);icC= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..937f7bb7155c5ef5efeabe9ad13bc7c2368dbfe9 GIT binary patch literal 234 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 K2uz$I5CA*A3BH~H literal 0 HcmV?d00001 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