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

Missed identity.ftl for vivo-basic in r1815 and updated css for custom forms to avoid descendent selectors that make assumptions about markup defined in the theme

Browse source
This commit is contained in:
nac26 2010-12-08 17:23:52 +00:00
parent cd58425e1d
commit 83bc276517
3 changed files with 55 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
productMods/edit/forms/css/customForm.css
View file

@ -1,14 +1,14 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
#content form div { form.customForm div {
clear: left; clear: left;
} }
#content form h6 { form.customForm h6 {
font-size: 110%; font-size: 110%;
} }
#content form div.addNewLink { form.customForm div.addNewLink {
float: left; float: left;
clear: none; clear: none;
margin-left: 5em; margin-left: 5em;
@ -19,12 +19,12 @@
display: none; /* Hide if Javascript disabled. Javascript will show. */ display: none; /* Hide if Javascript disabled. Javascript will show. */
} }
#content form .existing span.requiredHint, form.customForm .existing span.requiredHint,
#content form .new span.requiredHint { form.customForm .new span.requiredHint {
display: none; /* Hide if Javascript disabled. Javascript will show. */ display: none; /* Hide if Javascript disabled. Javascript will show. */
} }
#content form .existing { form.customForm .existing {
float: left; float: left;
clear: none; clear: none;
} }
@ -41,19 +41,19 @@
} }
/* #content form p.inline span,*/
#content form p.inline input, form.customForm p.inline input,
#content form p.inline label { form.customForm p.inline label {
float: left; float: left;
clear: left; clear: left;
} }
#content form p.inline.year input { form.customForm p.inline.year input {
margin-top: -1.75em; margin-top: -1.75em;
} }
/* /*
#content form p.inline.year span.hint { #form.customForm p.inline.year span.hint {
margin-right: 38.5em; margin-right: 38.5em;
margin-top: -2.4em; margin-top: -2.4em;
} }
@ -61,7 +61,7 @@
input, input,
select, select,
#content form p { form.customForm p {
margin-bottom: 1em; margin-bottom: 1em;
} }
@ -69,38 +69,38 @@ option {
padding: 0 2px; padding: 0 2px;
} }
#content form .hint { form.customForm .hint {
color: #9c9c9c; color: #9c9c9c;
font-weight: normal; font-weight: normal;
} }
#content form .requiredHint { form.customForm .requiredHint {
color: #f00; color: #f00;
font-weight: normal; font-weight: normal;
} }
#content form #requiredLegend { form.customForm #requiredLegend {
font-style: italic; font-style: italic;
} }
#content form p.validationError { form.customForm p.validationError {
clear: both; clear: both;
margin-bottom: 1.25em; margin-bottom: 1.25em;
} }
#content form a.close { form.customForm a.close {
float: right; float: right;
margin-right: 1em; margin-right: 1em;
font-size: 90%; font-size: 90%;
} }
#content form a.close:link, form.customForm a.close:link,
#content form a.close:visited { form.customForm a.close:visited {
border-color: #FF7700; border-color: #FF7700;
color: #FF7700; color: #FF7700;
} }
#content form textarea { form.customForm textarea {
width: 30%; width: 30%;
} }

4
productMods/edit/forms/css/customFormWithAutocomplete.css
View file

@ -11,7 +11,7 @@
display: none; display: none;
} }
#content form p.inline label { form.customForm p.inline label {
display: inline; display: inline;
clear: none; clear: none;
float: none; float: none;
@ -22,7 +22,7 @@
margin-left: .5em; margin-left: .5em;
} }
#content form h4 { form.customForm h4 {
margin-top: 1em; margin-top: 1em;
margin-bottom: .75em; margin-bottom: .75em;
} }

33
themes/vivo-basic/templates/identity.ftl Normal file
View file

@ -0,0 +1,33 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "lib-list.ftl" as l>
<div id="wrap" class="container">
<div id="header">
<#-- uncomment this div to place your institutional branding/identity at the top of every page
<div id="institution">
</div>
-->
<div id="identity">
<h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
<ul id="otherMenu">
<@l.firstLastList>
<#if user.loggedIn>
<li>
Logged in as <strong>${user.loginName}</strong> (<a href="${urls.logout}">Log out</a>)
</li>
<#if user.hasSiteAdminAccess>
<li><a href="${urls.siteAdmin}">Site Admin</a></li>
</#if>
<#else>
<li><a title="log in to manage this site" href="${urls.login}">Log in</a></li>
</#if>
<#include "subMenuLinks.ftl">
</@l.firstLastList>
</ul>
</div>