Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory
james.mmbase.org:/tmp/cvs-serv17284/cmsc/contentrepository/src/webapp/editors/resources
Modified Files:
urlcreate.jsp secondaryedit.jsp
Log Message:
CMSC-1281 Assets: Relate URLs to content element - New search screen
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1281
Index: urlcreate.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlcreate.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- urlcreate.jsp 19 Feb 2009 12:09:01 -0000 1.1
+++ urlcreate.jsp 20 Feb 2009 03:57:37 -0000 1.2
@@ -6,7 +6,19 @@
<cmscedit:head title="urls.create.title">
<script src="../repository/search.js" type="text/javascript"></script>
<script type="text/javascript">
- function create() {
+ function create(){
+ var titlefield = document.getElementById("title");
+ var urlfield = document.getElementById("url");
+ var re = new RegExp("\://|javascript\:|mailto\:");
+ if (titlefield.value.replace(/(^\s*)|(\s*$)/g,"") == "") {
+ alert("<fmt:message key="urls.create.error.title" />");
+ titlefield.focus();
+ return false;
+ } else if (!urlfield.value.replace(/(^\s*)|(\s*$)/g,"").match(re)) {
+ alert("<fmt:message key="urls.create.error.url" />");
+ urlfield.focus();
+ return false;
+ }
setTimeout('sayWait();',0);
}
@@ -41,18 +53,18 @@
<table border="0">
<tr>
<td style="width: 150px"><fmt:message
key="urls.create.titlefield" /></td>
- <td><html:text property="title" style="width: 350px"
value=""/></td>
+ <td><html:text property="title" styleId="title"
style="width: 350px" value=""/></td>
</tr>
<tr>
<td style="width: 150px"><fmt:message
key="urls.create.urlfield" /></td>
- <td><html:text property="url" style="width: 350px"
value=""/></td>
+ <td><html:text property="url" styleId="url" style="width:
350px" value=""/></td>
</tr>
<tr>
<td style="width: 150px"><fmt:message
key="urls.create.description" /></td>
- <td><html:text property="description" style="width:
350px; height:75px" value=""/></td>
+ <td><html:text property="description"
styleId="description" style="width: 350px; height:75px" value=""/></td>
</tr>
<tr>
- <td><html:submit property="createButton"
onclick="create();">
+ <td><html:submit property="createButton" onclick="return
create();">
<fmt:message key='urls.create.submit'
/></html:submit></td>
</tr>
</table>
Index: secondaryedit.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/secondaryedit.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- secondaryedit.jsp 19 Feb 2009 12:09:01 -0000 1.3
+++ secondaryedit.jsp 20 Feb 2009 03:57:37 -0000 1.4
@@ -7,13 +7,18 @@
<script>
function save() {
var form = document.forms["SecondaryEditForm"];
- if(form["title"].value.length > 0) {
- form["action"].value = "save";
- return true;
- }
- else {
+ var re = new RegExp("\://|javascript\:|mailto\:");
+ if (form["title"].value.replace(/(^\s*)|(\s*$)/g,"") == "") {
alert("<fmt:message
key="secondaryedit.error.title" />");
+ form["title"].focus();
return false;
+ } else if (form["url"] &&
!form["url"].value.replace(/(^\s*)|(\s*$)/g,"").match(re)) {
+ alert("<fmt:message key="secondaryedit.error.url" />");
+ form["url"].focus();
+ return false;
+ } else {
+ form["action"].value = "save";
+ return true;
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
