Author: andre
Date: 2009-06-25 21:55:31 +0200 (Thu, 25 Jun 2009)
New Revision: 36430
Modified:
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
openimages/trunk/src/main/webapp/editors/inc/list.jspx
openimages/trunk/src/main/webapp/editors/inc/settings.jspx
openimages/trunk/src/main/webapp/editors/sr/searchrelate.js.jsp
Log:
rework of editors, time out in ajax editors, editing and creating nodes
Modified: openimages/trunk/src/main/webapp/editors/edit.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/edit.jspx 2009-06-25 19:43:23 UTC
(rev 36429)
+++ openimages/trunk/src/main/webapp/editors/edit.jspx 2009-06-25 19:55:31 UTC
(rev 36430)
@@ -127,8 +127,20 @@
<mm:relatednodes id="translation">
<li>
<mm:link page="inc/form-edit.jspx"
referids="translat...@nr">
- <a href="${_}#edit${translation}"
class="mmajaxeditor"><mm:field name="language" /> - <mm:field name="title"
/></a>
+ <a href="${_}#edit${translation}"
class="mmajaxeditor">
+ <mm:field name="language" escape="uppercase"
/> -
+ <mm:function name="gui" />
+ </a>
</mm:link>
+
+ <mm:maydelete>
+ <mm:link page="inc/form-delete.jspx"
referids="_n...@nr">
+ <a href="${_}#deletenode${_node}"
class="mmajaxeditor">delete</a>
+ </mm:link>
+ <div id="deletenode${_node}"
class="displaynone"> empty </div>
+ </mm:maydelete>
+
+
<div id="edit${translation}" class="displaynone">
</div>
</li>
</mm:relatednodes>
Modified: openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
2009-06-25 19:43:23 UTC (rev 36429)
+++ openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
2009-06-25 19:55:31 UTC (rev 36430)
@@ -8,7 +8,10 @@
<mm:content expires="0" type="text/html" escaper="none">
<mm:import externid="nr" />
+ <mm:import externid="type" />
+
<jsp:directive.include file="settings.jspx" />
+
<mm:import externid="mmajaxeditor">no</mm:import>
<mm:import externid="role">related</mm:import>
<mm:import externid="dir" />
Modified: openimages/trunk/src/main/webapp/editors/inc/form-delete.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-delete.jspx
2009-06-25 19:43:23 UTC (rev 36429)
+++ openimages/trunk/src/main/webapp/editors/inc/form-delete.jspx
2009-06-25 19:55:31 UTC (rev 36430)
@@ -43,9 +43,10 @@
<p class="msg">Niet genoeg priveleges.</p>
</mm:maydelete>
<mm:maydelete>
- <mm:nodeinfo type="guinodemanager" id="type" write="false" />
+ <mm:import id="guitype"><mm:nodeinfo type="guinodemanager"
id="type" /></mm:import>
<p>
- Weet je zeker dat je deze ${type} node [nr. ${node}] wilt
verwijderen?
+ Weet je zeker dat je <mm:write referid="guitype"
escape="lowercase" />
+ '<mm:function name="gui" />' (${node}) wilt verwijderen?
</p>
<input name="delete" type="submit" value="OK" />
</mm:maydelete>
@@ -65,4 +66,4 @@
</mm:content>
</mm:cloud>
-</jsp:root>
\ No newline at end of file
+</jsp:root>
Modified: openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx 2009-06-25
19:43:23 UTC (rev 36429)
+++ openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx 2009-06-25
19:55:31 UTC (rev 36430)
@@ -5,75 +5,71 @@
version="2.0">
<mm:cloud loginpage="form-login.jspx" rank="basic user">
-<mm:content expires="0" type="text/html" escaper="none">
-
-<mm:context>
-
+<mm:content escaper="none">
+
<mm:import externid="nr" required="true" />
<jsp:directive.include file="settings.jspx" />
<mm:import externid="mmajaxeditor" />
- <mm:node number="$nr">
- <mm:import id="this_type"><mm:nodeinfo type="type" /></mm:import>
- <mm:form id="formedit_$nr">
-
- <fieldset>
- <mm:import id="buffer">
+ <mm:form>
+ <mm:node number="$nr">
+ <mm:import id="buffer">
+ <fieldset>
<mm:fieldlist fields="$editfields">
<div>
- <mm:import id="label"
reset="true">mm_formedit_${nr}_<mm:fieldinfo type="name" /></mm:import>
- <label for="$label"><mm:fieldinfo type="guiname" /></label>
+ <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>
</mm:fieldlist>
- </mm:import>
-
- <mm:import externid="action" />
- <mm:present referid="action">
- <mm:valid>
- <mm:import id="saved">
- <div class="msg">Je wijzigingen aan <mm:nodeinfo type="guitype"
escape="lowercase" /> '<mm:function name="gui" />' zijn bewaard.</div>
- </mm:import>
- <mm:commit />
- </mm:valid>
- <mm:valid inverse="true">
- <div class="err">Er zat een fout in je formulier.</div>
- <mm:cancel />
- </mm:valid>
- </mm:present>
-
- ${saved}
-
- <c:choose>
- <c:when test="${!empty saved and mmajaxeditor eq 'yes'}">
+ </fieldset>
+ </mm:import>
+
+ <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>
+ <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>
+ <mm:cancel />
+ </mm:valid>
+ </mm:present>
+
+ <c:choose>
+ <c:when test="${!empty saved and mmajaxeditor eq 'yes'}">
+ <mm:haspage page="/editors/inc/node.jspx">
+ <mm:include page="/editors/inc/node.jspx" referids="nr" />
+ </mm:haspage>
+ </c:when>
+ <c:otherwise>
+ <c:if test="${mmajaxeditor eq 'yes'}">
<mm:haspage page="/editors/inc/node.jspx">
- <mm:include page="/editors/inc/node.jspx" referids="nr" />
+ <mm:link page="/editors/inc/node.jspx" referids="nr">
+ <a class="mmajaxeditor_close" title="cancel"
href="${_}#edit${nr}">cancel</a>
+ </mm:link>
</mm:haspage>
- </c:when>
- <c:otherwise>
- <input name="nr" type="hidden" value="${nr}" />
- <input name="type" type="hidden" value="${this_type}" />
- <input name="action" type="hidden" value="ok" />
+ </c:if>
+ <mm:write referid="buffer" />
+ <fieldset>
+ <input name="nr" type="hidden" value="${nr}" />
+ <mm:nodeinfo type="type"><input name="type" type="hidden"
value="${_}" /></mm:nodeinfo>
<input name="mmajaxeditor" type="hidden" value="${mmajaxeditor}" />
- <c:if test="${mmajaxeditor eq 'yes'}">
- <mm:haspage page="/editors/inc/node.jspx">
- <mm:link page="/editors/inc/node.jspx" referids="nr">
- <a class="mmajaxeditor_close" title="cancel"
href="${_}#edit${nr}">cancel</a>
- </mm:link>
- </mm:haspage>
- </c:if>
- <mm:write referid="buffer" />
<div>
- <input type="submit" name="save" value="Save" />
+ <input type="submit" name="submit${nr}" value="Save" />
</div>
- </c:otherwise>
- </c:choose>
-
- </fieldset>
- </mm:form>
- </mm:node>
-</mm:context>
+ </fieldset>
+ </c:otherwise>
+ </c:choose>
+
+ </mm:node>
+ </mm:form>
</mm:content>
</mm:cloud>
</jsp:root>
Modified: openimages/trunk/src/main/webapp/editors/inc/list.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/list.jspx 2009-06-25
19:43:23 UTC (rev 36429)
+++ openimages/trunk/src/main/webapp/editors/inc/list.jspx 2009-06-25
19:55:31 UTC (rev 36430)
@@ -110,19 +110,18 @@
</td>
</mm:fieldlist>
<td class="right">
+
<mm:maydelete>
-
<mm:link page="inc/form-delete.jspx" referids="_n...@nr">
<a href="${_}#deletenode${_node}" class="mmajaxeditor">delete</a>
</mm:link>
<div id="deletenode${_node}" class="displaynone"> empty </div>
-
-
</mm:maydelete>
+
</td>
</tr>
</mm:listnodes>
</tbody>
</table>
</mm:listnodescontainer>
-</jsp:root>
\ No newline at end of file
+</jsp:root>
Modified: openimages/trunk/src/main/webapp/editors/inc/settings.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/settings.jspx 2009-06-25
19:43:23 UTC (rev 36429)
+++ openimages/trunk/src/main/webapp/editors/inc/settings.jspx 2009-06-25
19:55:31 UTC (rev 36430)
@@ -1,4 +1,4 @@
-<jsp:root
+<jsp:root
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
version="2.0">
@@ -7,12 +7,16 @@
<mm:import id="editor">/editors/edit.jspx</mm:import>
<mm:notpresent referid="type">
+ <mm:present referid="nr">
+ <mm:hasnode number="$nr">
+ <mm:node number="$nr">
+ <mm:import id="type" reset="true"><mm:nodeinfo type="type"
/></mm:import>
+ </mm:node>
+ </mm:hasnode>
+ </mm:present>
<mm:notpresent referid="type">
- <mm:present referid="nr">
- <mm:node number="$nr"><mm:import id="type" reset="true"><mm:nodeinfo
type="type" /></mm:import></mm:node>
- </mm:present>
+ <mm:import externid="type" reset="true">mediafragments</mm:import>
</mm:notpresent>
- <mm:import externid="type" reset="true">mediafragments</mm:import>
</mm:notpresent>
<!-- fields: 1st (default) ones are from mediafragments -->
Modified: openimages/trunk/src/main/webapp/editors/sr/searchrelate.js.jsp
===================================================================
--- openimages/trunk/src/main/webapp/editors/sr/searchrelate.js.jsp
2009-06-25 19:43:23 UTC (rev 36429)
+++ openimages/trunk/src/main/webapp/editors/sr/searchrelate.js.jsp
2009-06-25 19:55:31 UTC (rev 36430)
@@ -98,6 +98,6 @@
$('tr.relation').hide();
//$('div.mm_relate_repository div.submitbutton').hide();
bindAllthese();
- console.log("Editor: ${editor}");
+ //console.log("Editor: ${editor}");
});
-</mm:content>
\ No newline at end of file
+</mm:content>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
