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

NIHVIVO-1372 In search of the elusive page title holy grail. Set title on defaultAddMissingIndividual and addMissingWithMonikerAndLink to "Edit"

Browse source
This commit is contained in:
nac26 2011-01-04 00:47:17 +00:00
parent af735a8729
commit c5e740efa2
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/edit/forms/addMissingWithMonikerAndLink.jsp
View file

@ -210,11 +210,13 @@
String submitButtonLabel=""; // don't put local variables into the request String submitButtonLabel=""; // don't put local variables into the request
/* title is used by pre and post form fragments */ /* title is used by pre and post form fragments */
//set title to Edit to maintain functionality from 1.1.1 and avoid updates to Selenium tests
request.setAttribute("title", "Edit");
if (objectUri != null) { if (objectUri != null) {
request.setAttribute("title", "Edit \""+propDomainPublic+"\" entry for " + subject.getName()); request.setAttribute("formTitle", "Edit \""+propDomainPublic+"\" entry for " + subject.getName());
submitButtonLabel = "Save changes"; submitButtonLabel = "Save changes";
} else { } else {
request.setAttribute("title","Create \""+propDomainPublic+"\" entry for " + subject.getName()); request.setAttribute("formTitle","Create \""+propDomainPublic+"\" entry for " + subject.getName());
submitButtonLabel = "Create \""+propDomainPublic+"\" entry"; submitButtonLabel = "Create \""+propDomainPublic+"\" entry";
} }
@ -258,7 +260,7 @@ $(document).ready(function() {
}) })
</script> </script>
<h2>${title}</h2> <h2>${formTitle}</h2>
<form action="<c:url value="/edit/processRdfForm2.jsp"/>" > <form action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<v:input type="text" label="name (required)" id="name" size="30"/> <v:input type="text" label="name (required)" id="name" size="30"/>
<hr/> <hr/>

8
webapp/web/edit/forms/defaultAddMissingIndividualForm.jsp
View file

@ -231,11 +231,13 @@
String submitButtonLabel=""; String submitButtonLabel="";
/* title is used by pre and post form fragments */ /* title is used by pre and post form fragments */
//set title to Edit to maintain functionality from 1.1.1 and avoid updates to Selenium tests
request.setAttribute("title", "Edit");
if (objectUri != null) { if (objectUri != null) {
request.setAttribute("title", "Edit \""+propDomainPublic+"\" entry for " + subject.getName()); request.setAttribute("formTitle", "Edit \""+propDomainPublic+"\" entry for " + subject.getName());
submitButtonLabel = "Save changes"; submitButtonLabel = "Save changes";
} else { } else {
request.setAttribute("title","Create \""+propDomainPublic+"\" entry for " + subject.getName()); request.setAttribute("formTitle","Create \""+propDomainPublic+"\" entry for " + subject.getName());
submitButtonLabel = "Create \""+propDomainPublic+"\" entry"; submitButtonLabel = "Create \""+propDomainPublic+"\" entry";
} }
@ -246,7 +248,7 @@
<jsp:param name="useAutoComplete" value="false"/> <jsp:param name="useAutoComplete" value="false"/>
</jsp:include> </jsp:include>
<h2>${title}</h2> <h2>${formTitle}</h2>
<form action="<c:url value="/edit/processRdfForm2.jsp"/>" ><br/> <form action="<c:url value="/edit/processRdfForm2.jsp"/>" ><br/>
<v:input type="text" label="name (required)" id="name" size="30"/><br/> <v:input type="text" label="name (required)" id="name" size="30"/><br/>
<v:input type="submit" id="submit" value="<%=submitButtonLabel%>" cancel="true"/> <v:input type="submit" id="submit" value="<%=submitButtonLabel%>" cancel="true"/>