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

NIHVIVO-193 Minor tweaks.

Browse source
This commit is contained in:
rjy7 2010-04-01 04:52:08 +00:00
parent 3dbddc0134
commit 7d26f8d322
3 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,11 @@
/* $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$ */
/* Some of these styles should most likely apply to all forms. */
#content form { #content form {
width: 50%; width: 50%;
} }
#content form div { #content form div {
clear: left; clear: both;
} }
#content form h6 { #content form h6 {
@ -15,9 +13,9 @@
} }
#addNewLink { #addNewLink {
/* Right float isn't the right way to do this, because the correct right margin
depends on window size. Should be floated left instead. */
float: right; float: right;
/* This right margin works pretty well for both the add and edit version of the form.
Could customize for each of these versions later. */
margin-right: 15em; margin-right: 15em;
margin-top: .8em; margin-top: .8em;
width: 30%; width: 30%;
@ -33,7 +31,7 @@
} }
#existingOrNew { #existingOrNew {
font-style:italic; font-style: italic;
margin-left: 1em; margin-left: 1em;
} }
@ -69,11 +67,6 @@ select,
margin-bottom: 1em; margin-bottom: 1em;
} }
/* This div starts off hidden in case Javascript is disabled. Javascript will show it. */
#addNewLink {
display: none;
}
option { option {
padding: 0 2px; padding: 0 2px;
} }

3
productMods/edit/forms/css/personHasPositionHistory.css
View file

@ -1,2 +1,5 @@
/* $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$ */
#endYearHint {
margin-left: 1em;
}

11
productMods/edit/forms/personHasPositionHistory.jsp
View file

@ -300,14 +300,13 @@
request.setAttribute("customCss", customCss); request.setAttribute("customCss", customCss);
%> %>
<c:set var="yearHint" value="<span class='hint'>&nbsp;(YYYY)</span>" />
<c:set var="requiredHint" value="<span class='requiredHint'> *</span>" /> <c:set var="requiredHint" value="<span class='requiredHint'> *</span>" />
<jsp:include page="${preForm}" /> <jsp:include page="${preForm}" />
<h2>${title}</h2> <h2>${title}</h2>
<form action="<c:url value="/edit/processRdfForm2.jsp"/>" > <form class="${editType}" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<div id="addNewLink"> <div id="addNewLink">
If your organization is not listed, please <a href="#">add a new organization</a>. If your organization is not listed, please <a href="#">add a new organization</a>.
@ -317,8 +316,6 @@
<v:input type="select" label="Select Existing Organization" labelClass="required" id="organizationUri" /><span id="existingOrNew">or</span> <v:input type="select" label="Select Existing Organization" labelClass="required" id="organizationUri" /><span id="existingOrNew">or</span>
</div> </div>
<div id="new"> <div id="new">
<h6>Add a New Organization</h6> <h6>Add a New Organization</h6>
<v:input type="text" label="Organization Name" labelClass="required" id="newOrgName" /> <v:input type="text" label="Organization Name" labelClass="required" id="newOrgName" />
@ -329,11 +326,11 @@
<v:input type="text" label="Position Title ${requiredHint}" id="title" size="30" /> <v:input type="text" label="Position Title ${requiredHint}" id="title" size="30" />
<v:input type="select" label="Position Type ${requiredHint}" id="positionType" /> <v:input type="select" label="Position Type ${requiredHint}" id="positionType" />
<p class="inline year"><v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="4" /></p> <p class="inline year"><v:input type="text" label="Start Year ${requiredHint} <span class='hint'>(YYYY)</span>" id="startYear" size="4" /></p>
<p class="inline year"><v:input type="text" label="End Year ${yearHint}" id="endYear" size="4" /></p> <p class="inline year"><v:input type="text" label="End Year <span id='endYearHint' class='hint'>(YYYY)</span>" id="endYear" size="4" /></p>
</div> </div>
<!-- For Javascript --> <!-- Processing information for Javascript -->
<input type="hidden" name="editType" value="${editType}" /> <input type="hidden" name="editType" value="${editType}" />
<input type="hidden" name="entryType" value="position" /> <input type="hidden" name="entryType" value="position" />
<input type="hidden" name="newType" value="organization" /> <input type="hidden" name="newType" value="organization" />