Author: andre
Date: 2009-06-26 17:47:25 +0200 (Fri, 26 Jun 2009)
New Revision: 36443
Modified:
openimages/trunk/src/main/webapp/editors/create.jspx
openimages/trunk/src/main/webapp/editors/edit.jspx
openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
openimages/trunk/src/main/webapp/editors/inc/form-delete.jspx
openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx
Log:
better message reports
Modified: openimages/trunk/src/main/webapp/editors/create.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/create.jspx 2009-06-26
15:47:12 UTC (rev 36442)
+++ openimages/trunk/src/main/webapp/editors/create.jspx 2009-06-26
15:47:25 UTC (rev 36443)
@@ -21,16 +21,12 @@
<div id="wrap">
<div id="content">
<h2>New <mm:nodeinfo nodetype="$type" type="guitype" escape="lowercase"
/></h2>
+
+ <div id="mmajaxeditor-msg"> <!-- target for mmajaxeditor --> </div>
<mm:present referid="msg">
<div class="msg">${msg}</div>
</mm:present>
- <mm:present referid="nr">
- <div class="msg">
- nr: ${nr}
- </div>
- </mm:present>
-
<jsp:include page="inc/form-create.jspx" />
</div><!-- /#content -->
Modified: openimages/trunk/src/main/webapp/editors/edit.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/edit.jspx 2009-06-26 15:47:12 UTC
(rev 36442)
+++ openimages/trunk/src/main/webapp/editors/edit.jspx 2009-06-26 15:47:25 UTC
(rev 36443)
@@ -38,7 +38,11 @@
<jsp:include page="inc/navigation.jspx" />
<div id="wrap">
<div id="content">
- <mm:present referid="msg"><div
class="msg">${msg}</div></mm:present>
+
+ <div id="mmajaxeditor-msg"> <!-- target for mmajaxeditor --> </div>
+ <mm:present referid="msg">
+ <p class="msg">${msg}</p>
+ </mm:present>
<mm:notpresent referid="nr">
<jsp:include page="inc/list.jspx" />
@@ -120,7 +124,7 @@
<mm:param name="type">${type}_translations</mm:param>
<mm:param name="role">langrel</mm:param>
<mm:param name="dir">destination</mm:param>
- <a class="mmajaxeditor"
href="${_}#create_translation">Nieuwe vertaling</a>
+ <a class="mmajaxeditor"
href="${_}#create_translation">New translation</a>
</mm:link>
</li>
<mm:relatednodescontainer type="${type}_translations"
role="langrel" searchdirs="destination">
@@ -133,7 +137,7 @@
</a>
</mm:link>
- <mm:maydelete>
+ <mm:maydelete> -
<mm:link page="inc/form-delete.jspx"
referids="_n...@nr">
<a href="${_}#deletenode${_node}"
class="mmajaxeditor">delete</a>
</mm:link>
Modified: openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
2009-06-26 15:47:12 UTC (rev 36442)
+++ openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
2009-06-26 15:47:25 UTC (rev 36443)
@@ -4,8 +4,8 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
version="2.0">
+<mm:content expires="0">
<mm:cloud loginpage="form-login.jspx" rank="basic user">
-<mm:content expires="0" type="text/html" escaper="none">
<mm:import externid="nr" />
<mm:import externid="type" />
@@ -15,86 +15,95 @@
<mm:import externid="mmajaxeditor">no</mm:import>
<mm:import externid="role">related</mm:import>
<mm:import externid="dir" />
-
- <mm:form commitonclose="false" id="formcreate_$type">
- <fieldset>
- <mm:import id="buffer">
- <mm:createnode type="$type" id="new_node" commitonclose="false">
- <mm:fieldlist fields="$editfields" varStatus="field">
+ <mm:import externid="submit$type" />
+
+ <mm:form>
+ <mm:import id="buffer">
+ <mm:createnode type="$type" id="new_node" commitonclose="false">
+ <fieldset>
+ <mm:fieldlist type="${empty editfields ? 'edit' : ''}"
fields="${editfields}" varStatus="field">
<c:if test="${field.current.state eq 2}">
- <div class="formrow">
- <label
for="mm_formcreate_${type}_${field.current.name}"><mm:fieldinfo type="guiname"
/></label>
+ <div>
+ <mm:fieldinfo type="forid">
+ <label for="${_}"><mm:fieldinfo type="guiname" /></label>
+ </mm:fieldinfo>
<mm:maywrite><mm:fieldinfo type="input" /><mm:fieldinfo
type="errors" /></mm:maywrite>
- <mm:maywrite inverse="true"><mm:fieldinfo type="guivalue"
escape="none" /></mm:maywrite>
</div>
</c:if>
</mm:fieldlist>
- </mm:createnode>
- </mm:import>
+ </fieldset>
+ <fieldset>
+ <input name="type" type="hidden" value="${type}" />
+ <input name="nr" type="hidden" value="${nr}" />
+ <input name="role" type="hidden" value="${role}" />
+ <input name="dir" type="hidden" value="${dir}" />
+ <input name="mmajaxeditor" type="hidden" value="${mmajaxeditor}" />
+ <div>
+ <input type="submit" name="submit${type}" value="Save" />
+ </div>
+ </fieldset>
+ </mm:createnode>
+ </mm:import>
- <mm:import externid="action" />
- <mm:present referid="action">
- <mm:valid>
- <div class="msg">
- De nieuwe <mm:nodeinfo nodetype="$type" type="guitype"
escape="lowercase" /> is bewaard.
- <c:if test="${!empty nr and !empty role and !empty dir}">
- <mm:node number="$nr" id="rel_node" />
- <c:choose>
- <c:when test="${dir eq 'destination'}">
- <mm:createrelation source="rel_node" destination="new_node"
role="$role">
- <c:if test="${role eq 'posrel'}"><mm:setfield
name="pos">1</mm:setfield></c:if>
- </mm:createrelation>
- </c:when>
- <c:otherwise>
- <mm:createrelation source="new_node" destination="rel_node"
role="$role">
- <c:if test="${role eq 'posrel'}"><mm:setfield
name="pos">1</mm:setfield></c:if>
- </mm:createrelation>
- </c:otherwise>
- </c:choose>
- En gerelateerd aan ${nr}.
- </c:if>
- </div>
- <mm:commit />
- <c:set var="saved" value="true" />
- </mm:valid>
- <mm:valid inverse="true">
- <div class="err">Er zat een fout in je formulier.</div>
- <mm:cancel />
- </mm:valid>
- </mm:present>
- <mm:notpresent referid="action">
+ <mm:notpresent referid="submit$type">
+ <mm:write referid="buffer" escape="none" />
+ <mm:cancel />
+ </mm:notpresent>
+
+ <mm:present referid="submit$type">
+ <mm:valid inverse="true">
+ <p class="err">The form contains an error.</p>
+ <mm:write referid="buffer" escape="none" />
+ </mm:valid>
+ <mm:valid>
+ <p class="msg">
+ The new <mm:nodeinfo nodetype="$type" type="guitype"
escape="lowercase" />
+ '<strong><mm:node referid="new_node"><mm:function name="gui"
/></mm:node></strong>' is saved
+ <c:if test="${!empty nr and !empty role and !empty dir}">
+ <mm:node number="$nr" id="rel_node" />
+ <c:choose>
+ <c:when test="${dir eq 'destination'}">
+ <mm:createrelation source="rel_node" destination="new_node"
role="$role">
+ <c:if test="${role eq 'posrel'}"><mm:setfield
name="pos">1</mm:setfield></c:if>
+ </mm:createrelation>
+ </c:when>
+ <c:otherwise>
+ <mm:createrelation source="new_node" destination="rel_node"
role="$role">
+ <c:if test="${role eq 'posrel'}"><mm:setfield
name="pos">1</mm:setfield></c:if>
+ </mm:createrelation>
+ </c:otherwise>
+ </c:choose>
+ and related to <mm:node number="$nr"><mm:function name="gui"
/></mm:node>
+ </c:if>.
+ </p>
+ <mm:commit />
+
+ <c:set var="saved" value="true" />
+ </mm:valid>
+ <mm:valid inverse="true">
<mm:cancel />
- </mm:notpresent>
-
- <!-- node saved? ${saved} -->
+ </mm:valid>
+ </mm:present>
+
+ <c:if test="${!empty saved}">
<c:choose>
- <c:when test="${!empty saved and mmajaxeditor eq 'yes'}">
+ <c:when test="${mmajaxeditor eq 'yes'}">
+ yes
<div id="edit${new_node}" class="${type}">
<mm:haspage page="/editors/inc/node.jspx">
<mm:include page="/editors/inc/node.jspx"
referids="new_n...@nr,type?" />
</mm:haspage>
</div>
</c:when>
- <c:when test="${!empty saved and mmajaxeditor eq 'no'}">
- <mm:redirect page="$editor" referids="new_n...@nr,type?" />
- </c:when>
<c:otherwise>
- <input name="type" type="hidden" value="${type}" />
- <input name="nr" type="hidden" value="${nr}" />
- <input name="role" type="hidden" value="${role}" />
- <input name="dir" type="hidden" value="${dir}" />
- <input name="mmajaxeditor" type="hidden" value="${mmajaxeditor}" />
- <input name="action" type="hidden" value="ok" />
- <mm:write referid="buffer" />
- <div class="formrow">
- <input type="submit" name="save" value="Save" />
- </div>
+ <mm:link page="${editor}" referids="new_n...@nr">
+ <a href="${_}">edit</a>
+ </mm:link>
</c:otherwise>
</c:choose>
+ </c:if>
- </fieldset>
</mm:form>
-
-</mm:content>
</mm:cloud>
+</mm:content>
</jsp:root>
Modified: openimages/trunk/src/main/webapp/editors/inc/form-delete.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-delete.jspx
2009-06-26 15:47:12 UTC (rev 36442)
+++ openimages/trunk/src/main/webapp/editors/inc/form-delete.jspx
2009-06-26 15:47:25 UTC (rev 36443)
@@ -1,11 +1,12 @@
<jsp:root
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
version="2.0">
<mm:cloud loginpage="form-login.jspx" rank="basic user">
-<mm:content expires="0" type="text/html" escaper="none">
+<mm:content>
<mm:import externid="nr" required="true" />
<mm:import externid="delete">yetnotok</mm:import>
@@ -22,31 +23,36 @@
<mm:node number="$node">
<c:choose>
<c:when test="${delete eq 'Cancel'}">
- <p class="msg"> Canceled deletion. </p>
+ <p class="msg">Canceled deletion.</p>
</c:when>
<c:when test="${delete eq 'OK'}">
<mm:maydelete inverse="true">
- <p class="msg">Niet genoeg priveleges.</p>
+ <p class="msg">Not enough priveleges.</p>
</mm:maydelete>
<mm:maydelete>
<mm:import externid="type" />
+ <p class="msg">
+ The ${fn:toLowerCase(type)}
+ <mm:node number="$node">
+ '<mm:hasfield name="title"><mm:field name="title"
escape="inline" /></mm:hasfield><mm:hasfield name="title"
inverse="true"><mm:function name="gui" escape="tagstripper" /></mm:hasfield>'
+ </mm:node>
+ (${node}) is removed.
+ </p>
<mm:deletenode number="$node" deleterelations="true" />
- <p class="msg">
- ${type} [nr. ${node}] is verwijderd.
- </p>
</mm:maydelete>
</c:when>
<c:otherwise>
<mm:form id="formdelete_$nr">
<fieldset>
<mm:maydelete inverse="true">
- <p class="msg">Niet genoeg priveleges.</p>
+ <p class="msg">Not enough priveleges.</p>
</mm:maydelete>
<mm:maydelete>
<mm:import id="guitype"><mm:nodeinfo type="guinodemanager"
id="type" /></mm:import>
<p>
- Weet je zeker dat je <mm:write referid="guitype"
escape="lowercase" />
- '<mm:function name="gui" />' (${node}) wilt verwijderen?
+ Are you sure you want to delete <mm:write
referid="guitype" escape="lowercase" />
+ '<mm:hasfield name="title"><mm:field name="title"
escape="inline" /></mm:hasfield><mm:hasfield name="title"
inverse="true"><mm:function name="gui" escape="tagstripper" /></mm:hasfield>'
+ (${node})?
</p>
<input name="delete" type="submit" value="OK" />
</mm:maydelete>
Modified: openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx 2009-06-26
15:47:12 UTC (rev 36442)
+++ openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx 2009-06-26
15:47:25 UTC (rev 36443)
@@ -5,7 +5,7 @@
version="2.0">
<mm:cloud loginpage="form-login.jspx" rank="basic user">
-<mm:content escaper="none">
+<mm:content expires="0">
<mm:import externid="nr" required="true" />
<jsp:directive.include file="settings.jspx" />
@@ -30,14 +30,12 @@
<mm:import externid="submit$nr" />
<mm:present referid="submit$nr">
<mm:valid>
- <div class="msg">
- Je wijzigingen aan <mm:nodeinfo type="guitype" escape="lowercase"
/> '<mm:function name="gui" />' zijn bewaard.
- </div>
+ <p class="msg">Your edits to <mm:nodeinfo type="guitype"
escape="lowercase" /> '<mm:function name="gui" />' are saved.</p>
<mm:commit />
<mm:import id="saved">OK</mm:import>
</mm:valid>
<mm:valid inverse="true">
- <div class="err">Er zat een fout in je formulier.</div>
+ <p class="err">The form contains an error.</p>
<mm:cancel />
</mm:valid>
</mm:present>
@@ -56,7 +54,7 @@
</mm:link>
</mm:haspage>
</c:if>
- <mm:write referid="buffer" />
+ <mm:write referid="buffer" escape="none" />
<fieldset>
<input name="nr" type="hidden" value="${nr}" />
<mm:nodeinfo type="type"><input name="type" type="hidden"
value="${_}" /></mm:nodeinfo>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
