[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter edit_newsletter.xml load_newsletter.xml

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
In directory 
james.mmbase.org:/tmp/cvs-serv30376/src/webapp/editors/config/newsletter

Modified Files:
      Tag: b1_5
        edit_newsletter.xml load_newsletter.xml 
Log Message:
CMSC-1156,Newsletter: remove the WAP version in the Newsletter; remove the Text 
when empty functionality, code and fields; fix the text-version view of 
newsletter,remove the Text when empty functionality


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1156


Index: edit_newsletter.xml
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -b -r1.20.2.2 -r1.20.2.3
--- edit_newsletter.xml 6 Nov 2008 16:56:37 -0000       1.20.2.2
+++ edit_newsletter.xml 17 Nov 2008 02:49:28 -0000      1.20.2.3
@@ -68,11 +68,6 @@
                <prompt xml:lang="zh">暂停截止</prompt>
                <optionlist select="boolean" />
        </field>
-       <field name="txtempty" dtmaxlength="1024" ftype="text" rows="3">
-               <prompt xml:lang="en">Text when empty</prompt>
-               <prompt xml:lang="nl">Tekst als leeg</prompt>
-               <prompt 
xml:lang="zh">内容为空时是否发送其他内容</prompt>
-       </field>
    <field name="schedule" ftype="calendar">
                <prompt xml:lang="en">Schedule</prompt>
                <prompt xml:lang="nl">Schedule</prompt>


Index: load_newsletter.xml
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- load_newsletter.xml 3 Nov 2008 06:08:09 -0000       1.15.2.1
+++ load_newsletter.xml 17 Nov 2008 02:49:28 -0000      1.15.2.2
@@ -20,7 +20,6 @@
        <field name="subject" />
        <field name="description" />
        <field name="externalurl"/>
-       <field name="txtempty" />
        <field name="schedule" />
    <field name="bounce_checking"/>
    <field name="max_bounces"/>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs