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

Merge r1010 r1018:1023 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-22 15:43:18 +00:00
parent 1dafec9142
commit cb15494b95
5 changed files with 48 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
productMods/edit/forms/addGrantRoleToPerson.jsp
View file

@ -248,6 +248,7 @@ PREFIX core: <${vivoCore}>
List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(),
JavaScript.CUSTOM_FORM_UTILS.path(),
"/js/browserUtils.js",
"/edit/forms/js/customFormWithAdvanceTypeSelection.js"
));
request.setAttribute("customJs", customJs);
@ -279,8 +280,10 @@ PREFIX core: <${vivoCore}>
<h2>${formHeading}</h2>
<%@ include file="unsupportedBrowserMessage.jsp" %>
<%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
<form id="addGrantRoleToPerson" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<form id="addGrantRoleToPerson" class="noIE67" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<p><v:input type="text" id="relatedIndLabel" name="grantLabel" label="Name ${requiredHint}" cssClass="acSelector" size="50" /></p>
@ -299,6 +302,7 @@ PREFIX core: <${vivoCore}>
<p id="requiredLegend" class="requiredHint">* required fields</p>
</form>
<c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />

5
productMods/edit/forms/addPublicationToPerson.jsp
View file

@ -210,6 +210,7 @@ SPARQL queries for existing values. --%>
editConfig.setEntityToReturnTo("?pubUri");
List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(),
JavaScript.CUSTOM_FORM_UTILS.path(),
"/js/browserUtils.js",
"/edit/forms/js/customFormWithAdvanceTypeSelection.js"
));
request.setAttribute("customJs", customJs);
@ -228,8 +229,10 @@ SPARQL queries for existing values. --%>
<h2>Create a new publication entry for <%= subjectName %></h2>
<%@ include file="unsupportedBrowserMessage.jsp" %
<%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
<form id="addPublicationForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<form id="addPublicationForm" class="noIE67" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<p class="inline"><v:input type="select" label="Publication Type ${requiredHint}" name="pubType" id="typeSelector" /></p>

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

@ -9,6 +9,10 @@
display: none;
}
#ie67DisableWrapper {
display: none;
}
#content form p.inline label {
display: inline;
clear: none;

20
productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
View file

@ -5,11 +5,29 @@ var customForm = {
/* *** Initial page setup *** */
onLoad: function() {
if (this.disableFormInUnsupportedBrowsers()) {
return;
}
this.mixIn();
this.initObjects();
this.initPage();
},
disableFormInUnsupportedBrowsers: function() {
this.disableWrapper = $('#ie67DisableWrapper');
// Check for unsupported browsers only if the element exists on the page
if (this.disableWrapper.length) {
if (vitro.browserUtils.isIELessThan8()) {
this.disableWrapper.show();
$('form.noIE67').hide();
return true;
}
}
return false;
},
mixIn: function() {
// Mix in the custom form utility methods
$.extend(this, vitro.customFormUtils);
@ -74,6 +92,8 @@ var customForm = {
} else {
this.formSteps = 2;
}
// RY This should probably be done from initFormFullView, since there
// are not two form steps in this case.
if( this.editMode == 'repair')
this.formSteps = 2;

15
productMods/edit/forms/unsupportedBrowserMessage.jsp Normal file
View file

@ -0,0 +1,15 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%>
<c:set var="portal" value="${requestScope.portalBean}"/>
<c:set var="contextPath"><c:out value="${pageContext.request.contextPath}" /></c:set>
<c:set var="themeDir" value="${contextPath}/${portal.themeDir}"/>
<div id="ie67DisableWrapper">
<div id="ie67DisableContent">
<img src="${themeDir}siteIcons/iconAlertBig.png" alt="Alert Icon"/>
<p>This form is not supported for use in Internet Explorer 6 or 7. Please upgrade to Internet Explorer 8, or
switch to another browser, such as FireFox.</p>
</div>
</div>