Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv32137/src/webapp/editors/config/newsletter
Modified Files:
search_article_insrel_term.xml
search_newsletter_posrel_term.xml search_term.xml
Added Files:
search_article_insrel_newsletter.xml search_newsletter.xml
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs improve terms
management
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-990
Index: search_article_insrel_term.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/search_article_insrel_term.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_article_insrel_term.xml 29 Apr 2008 01:37:04 -0000 1.1
+++ search_article_insrel_term.xml 17 Jul 2008 03:04:50 -0000 1.2
@@ -4,5 +4,6 @@
<title xml:lang="nl">Term</title>
<title xml:lang="en">Term</title>
<title xml:lang="zh">Term</title>
+ <list include="config/newsletter/search_newsletter.xml" />
<list include="config/newsletter/search_term.xml" />
</form-schema>
\ No newline at end of file
Index: search_newsletter_posrel_term.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/search_newsletter_posrel_term.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_newsletter_posrel_term.xml 29 Apr 2008 01:37:04 -0000 1.1
+++ search_newsletter_posrel_term.xml 17 Jul 2008 03:04:50 -0000 1.2
@@ -8,7 +8,7 @@
<item>
- <field name="name" dtrequired="true">
+ <field name="name" ftype="data">
<prompt xml:lang="en">Name</prompt>
<prompt xml:lang="nl">Name</prompt>
</field>
@@ -26,12 +26,6 @@
</search-filter>
</command>
- <command name="insert" objectnumber="new">
- <prompt xml:lang="en">New</prompt>
- <prompt xml:lang="nl">Nieuw</prompt>
-
- </command>
-
<action type="create">
<relation destinationtype="term" role="posrel">
<field name="pos">{sum(//[EMAIL PROTECTED]'posrel' and
@firstitem='true']/[EMAIL PROTECTED]'term']/../[EMAIL
PROTECTED]'pos'])-{$pos}}</field>
Index: search_term.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/search_term.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_term.xml 29 Apr 2008 05:37:19 -0000 1.1
+++ search_term.xml 17 Jul 2008 03:04:50 -0000 1.2
@@ -9,13 +9,9 @@
<prompt xml:lang="en">term</prompt>
<prompt xml:lang="nl">term</prompt>
</field>
- <field name="subject" ftype="data">
- <prompt xml:lang="en">newsletter</prompt>
- <prompt xml:lang="nl">newsletter</prompt>
- </field>
</item>
- <command name="search" nodepath="term" age="-1" fields="name,subject">
+ <command name="search" nodepath="term" age="-1" fields="name">
<prompt xml:lang="en">Search term</prompt>
<prompt xml:lang="nl">Zoek term</prompt>
<search-filter>
@@ -23,11 +19,6 @@
<name xml:lang="nl">Term Name bevat</name>
<search-fields>[name]</search-fields>
</search-filter>
- <search-filter>
- <name xml:lang="en">Newsletter Title contains</name>
- <name xml:lang="nl">Newsletter Title bevat</name>
- <search-fields>[subject]</search-fields>
- </search-filter>
</command>
<action type="create">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
