Author: andre
Date: 2009-07-07 22:10:58 +0200 (Tue, 07 Jul 2009)
New Revision: 36638
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-edit.jspx
openimages/trunk/src/main/webapp/style/css/editors.css
openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js
Log:
editors
Modified: openimages/trunk/src/main/webapp/editors/edit.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/edit.jspx 2009-07-07 18:29:43 UTC
(rev 36637)
+++ openimages/trunk/src/main/webapp/editors/edit.jspx 2009-07-07 20:10:58 UTC
(rev 36638)
@@ -131,11 +131,11 @@
<mm:relatednodes>
<li id="node_${_node}">
- <mm:link page="inc/form-edit.jspx"
referids="translat...@nr">
+ <mm:link page="inc/form-edit.jspx"
referids="_n...@nr">
<a href="${_}#node_${_node}"
class="mmajaxeditor">
- <mm:field name="language" escape="uppercase"
/> -
- <mm:function name="gui" />
- </a>
+ <mm:field name="language"><mm:fieldinfo
type="guivalue" /></mm:field>
+ - <mm:function name="gui" />
+ </a>
</mm:link>
<mm:maydelete> -
Modified: openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
2009-07-07 18:29:43 UTC (rev 36637)
+++ openimages/trunk/src/main/webapp/editors/inc/form-create.jspx
2009-07-07 20:10:58 UTC (rev 36638)
@@ -13,7 +13,7 @@
<jsp:directive.include file="settings.jspx" />
- <mm:import externid="mmajaxeditor">no</mm:import>
+ <mm:import externid="mmajaxeditor" />
<mm:import externid="role">related</mm:import>
<mm:import externid="dir" />
<mm:import externid="submit$type" />
@@ -58,7 +58,7 @@
</mm:valid>
<mm:valid>
<p class="msg">
- The new <mm:nodeinfo nodetype="$type" type="guitype"
escape="lowercase" />
+ Your <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" />
@@ -104,6 +104,14 @@
</mm:node>
</c:if>
+ <c:if test="${!empty saved and empty mmajaxeditor}">
+ <p>
+ <mm:link page="/editors/edit.jspx" referids="new_n...@nr">
+ <a href="${_}">Edit new node</a>
+ </mm:link>
+ </p>
+ </c:if>
+
</mm:cloud>
</mm:content>
</jsp:root>
Modified: openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx 2009-07-07
18:29:43 UTC (rev 36637)
+++ openimages/trunk/src/main/webapp/editors/inc/form-edit.jspx 2009-07-07
20:10:58 UTC (rev 36638)
@@ -25,6 +25,16 @@
</div>
</mm:fieldlist>
</fieldset>
+ <mm:maywrite>
+ <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}" />
+ <div>
+ <input type="submit" name="submit${nr}" value="Save"
class="submit" />
+ </div>
+ </fieldset>
+ </mm:maywrite>
</mm:import>
<mm:import externid="submit$nr" />
@@ -40,22 +50,13 @@
</mm:valid>
</mm:present>
- <c:if test="${empty saved}">
-
+ <c:if test="${empty mmajaxeditor}">
<mm:write referid="buffer" escape="none" />
- <mm:maywrite>
- <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}" />
- <div>
- <input type="submit" name="submit${nr}" value="Save"
class="submit" />
- </div>
- </fieldset>
- </mm:maywrite>
-
</c:if>
-
+ <c:if test="${!empty mmajaxeditor and empty saved}">
+ <mm:write referid="buffer" escape="none" />
+ </c:if>
+
</mm:node>
</mm:form>
Modified: openimages/trunk/src/main/webapp/style/css/editors.css
===================================================================
--- openimages/trunk/src/main/webapp/style/css/editors.css 2009-07-07
18:29:43 UTC (rev 36637)
+++ openimages/trunk/src/main/webapp/style/css/editors.css 2009-07-07
20:10:58 UTC (rev 36638)
@@ -227,10 +227,10 @@
}
/* mmbase styles */
-#content div input.small, #content div textarea.small { width: 560px; }
-#content div input.big, #content div textarea.big { width: 560px; }
-#sidebar div input.small, #sidebar div textarea.small { width: 340px; }
-#sidebar div input.big, #sidebar div textarea.big { width: 340px; }
+#content div input.small, #content div textarea.small { width: 570px; }
+#content div input.big, #content div textarea.big { width: 570px; }
+#sidebar div input.small, #sidebar div textarea.small { width: 360px; }
+#sidebar div input.big, #sidebar div textarea.big { width: 360px; }
#content div.create th.node { text-align: right; }
#content div.create input.small,
#content div.create textarea.small,
@@ -383,13 +383,13 @@
#searchform .invalid { background-color: #fff; }
.displaynone { display: none; }
-div.mmajaxeditor
+form.mmajaxeditor
{
- border: 1px #030 solid;
- background: #efefef;
+ border: 2px #c8cfd9 solid;
+ background: #e6e9dd;
padding: 6px 6px 0 6px;
margin: 6px 0;
- width: 100%;
+ width: auto;
}
div.mmajaxeditor p
Modified: openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js
===================================================================
--- openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js 2009-07-07
18:29:43 UTC (rev 36637)
+++ openimages/trunk/src/main/webapp/style/js/mmajaxeditor.js 2009-07-07
20:10:58 UTC (rev 36638)
@@ -43,6 +43,7 @@
var form = this.loadElement(this.url, this.params);
if ($(el).find('form').length > 0) $(el).find('form').remove();
$(el).append(form);
+ $(el).find('form').addClass('mmajaxeditor');
this.bindFormEvents();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
