Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv3802/templates/editors/evenementen
Modified Files:
evenement.jsp evenementen.jsp
Log Message:
NMCMS-478
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-478
Index: evenement.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenement.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- evenement.jsp 5 May 2008 10:18:35 -0000 1.7
+++ evenement.jsp 6 May 2008 14:40:50 -0000 1.8
@@ -119,13 +119,16 @@
}
return false;
}
+
var cancelClick = false;
- function doDelete(prompt) {
+ function doDelete(thisObject,prompt) {
var conf;
if (prompt && prompt!="") {
conf = confirm(prompt);
} else conf=true;
cancelClick=true;
+
+ if (conf) showMessage(thisObject,'Verwijder selectie');
return conf;
}
@@ -139,6 +142,20 @@
}
}
+ var clickedButton = '';
+ function showMessage(obj,fAction){
+ string = 'theTarget = document.getElementById("message");';
+ eval(string);
+ if(theTarget != null){
+ theTarget.innerHTML = 'Een moment geduld a.u.b.';
+ }
+ clickedButton=obj;
+ clickedButton.disabled=true;
+
+ document.getElementById("formAction").value= fAction;
+ document.forms[0].submit();
+ }
+
</script>
</head>
<%
@@ -154,9 +171,12 @@
// the focus="name" works together with the onkeypress for the name field, to
make sure the form is only posted once on [ENTER]-key
%>
<html:form action="/editors/evenementen/EvenementAction" scope="session"
focus="name">
+
<html:hidden property="userId" value="<%= cloud.getUser().getIdentifier() %>"
/>
<html:hidden property="node" />
<html:hidden property="selectedEvent" />
+<input type="hidden" id="formAction" name="action" value="" />
+
<body style="overflow:auto;" onload="javascript:setSelected(<bean:write
name="EvenementForm" property="selectedEvent" />);javascript:resizeBlocks();"
onResize="javascript:resizeBlocks();">
<logic:equal name="EvenementForm" property="node" value="">
<h1>Nieuwe activiteit</h1>
@@ -167,6 +187,12 @@
<h1>Activiteit wijzigen</h1>
</logic:notEqual>
<table class="formcontent">
+<tr>
+ <td colspan="2" class="fieldname" style="color:red;font-weight:bold;"
id="message"></td>
+</tr>
+<tr>
+ <td colspan="2"> </td>
+</tr>
<tr><td class="fieldname" style="width:90px;">Naam</td>
<td><html:text property="name" style="width:349px;" tabindex="1"
onkeypress="return event.keyCode!=13" />
<span class="notvalid"><br><html:errors bundle="LEOCMS"
property="naam" /></span></td></tr>
@@ -199,9 +225,9 @@
-<html:text property="endYear" maxlength="4" style="<%= dateStyle %>"
tabindex="11"/>
<a href="javascript:popUpCalendar('end')" ><img
src='../../calendar/show-calendar-on-button.gif' width='24' height='24'
align='absmiddle' border='0' alt='Selecteer einddatum'></a>
<span class="notvalid"><html:errors bundle="LEOCMS"
property="eindtijd"/></span><br>
- <html:submit property="action" value="Voeg toe" style="<%=
buttonStyle %>"/>
- <html:submit property="action" value="Wijzig" style="<%= buttonStyle
%>"/>
- <html:submit property="action" value="Wis" style="<%= buttonStyle
%>"/>
+ <input type="button" name="action" value="Voeg toe"
style="<%= buttonStyle %>" onclick="javascript:showMessage(this,'Voeg
toe');"/>
+ <input type="button" name="action" value="Wijzig" style="<%=
buttonStyle %>" onclick="javascript:showMessage(this,'Wijzig');"/>
+ <input type="button" name="action" value="Wis" style="<%= buttonStyle
%>" onclick="javascript:showMessage(this,'Wis');"/>
</td></tr>
<tr><td class="fieldname" style="width:90px;height:20px">
<% boolean bShowPastDates = false;
@@ -282,13 +308,13 @@
</div>
<span class="notvalid"><html:errors bundle="LEOCMS" property="lijst"
/></span><br>
<input type="button" value="Alles (de)selecteren" style="<%= buttonStyle
%>" onclick="selectAllDates(document.forms[0].selectedDates);"/>
- <html:submit property="action" value="Activeer selectie" style="<%=
buttonStyle %>"/>
- <html:submit property="action" value="Annuleer selectie" style="<%=
buttonStyle %>"/>
+ <input type="button" name="action" value="Activeer selectie" style="<%=
buttonStyle %>" onclick="javascript:showMessage(this,'Activeer selectie');"/>
+ <input type="button" name="action" value="Annuleer selectie" style="<%=
buttonStyle %>" onclick="javascript:showMessage(this,'Annuleer selectie');"/>
<mm:present referid="multidayfound">
- <html:submit property="action" value="Periode -> data" style="<%=
buttonStyle %>"/>
+ <input type="button" name="action" value="Periode -> data" style="<%=
buttonStyle %>" onclick="javascript:showMessage(this,'Periode -> data');"/>
</mm:present>
<mm:present referid="childeventfound">
- <html:submit property="action" value="Verwijder selectie"
onclick="return doDelete('Weet u zeker dat u de geselecteerde data wilt
verwijderen?');" style="<%= buttonStyle %>" />
+ <input type="button" name="action" value="Verwijder selectie"
onclick="return doDelete(this,'Weet u zeker dat u de geselecteerde data wilt
verwijderen?');" style="<%= buttonStyle %>" />
</mm:present>
</td></tr>
<tr><td class="fieldname" style="width:90px;">Overige onderdelen</td>
@@ -308,9 +334,9 @@
<tr>
<td>
<span class="notvalid"><html:errors bundle="LEOCMS"
property="opslaan"/></span>
- <html:cancel value="Annuleren" style="<%= buttonStyle %>"/>
- <html:submit property="action" value="Opslaan & beëindigen"
style="<%= buttonStyle %>"/>
- <html:submit property="action" value="Opslaan" style="<%= buttonStyle
%>"/>
+ <html:cancel value="Annuleren" style="<%= buttonStyle %>" />
+ <input type="button" name="action" value="Opslaan & beëindigen"
style="<%= buttonStyle %>" onclick="javascript:showMessage(this,'Opslaan en
beeindingen');"/>
+ <input type="button" name="action" value="Opslaan" style="<%=
buttonStyle %>" onclick="javascript:showMessage(this,'Opslaan');"/>
</td>
</tr>
</table>
Index: evenementen.jsp
===================================================================
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- evenementen.jsp 6 May 2008 08:52:55 -0000 1.16
+++ evenementen.jsp 6 May 2008 14:40:50 -0000 1.17
@@ -458,7 +458,7 @@
<table class="formcontent">
<tr><td colspan="4" style="text-align:center;color:red;font-weight:bold;"
id="message"></td></tr>
<tr><td><% if((isAdmin||isChiefEditor)&&actionId.indexOf("print")==-1) { %>
- <a href="EvenementInitAction.eb"><img src="<mm:url page="<%=
editwizard_location %>"/>/media/new.gif" border='0' alt='Maak een nieuwe
activiteit' /></a>
+ <a href="EvenementInitAction.eb"><img src="<mm:url page="<%=
editwizard_location %>"/>/media/new.gif" border='0' alt='Maak een nieuwe
activiteit' onclick="javascript:showMessage(this,'Een moment geduld
a.u.b.');"/></a>
<% } %>
</td>
<td class="fieldname"
style="padding-left:5px;vertical-align:middle;"><nobr><%= soortId.toUpperCase()
%></nobr></td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs