Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/banner
In directory
james.mmbase.org:/tmp/cvs-serv19146/portlets-banner/src/webapp/editors/config/banner
Modified Files:
search_banner_posrel_attachments.xml
search_banner_posrel_flash_urls.xml
search_banner_posrel_urls.xml
search_banner_imagerel_images.xml
Log Message:
CMSC-1255 - Change the editwizards to make the fields read only for Assets.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/banner
See also: http://www.mmbase.org/jira/browse/CMSC-1255
Index: search_banner_posrel_attachments.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/banner/search_banner_posrel_attachments.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- search_banner_posrel_attachments.xml 7 Jan 2008 15:40:42 -0000
1.4
+++ search_banner_posrel_attachments.xml 13 Feb 2009 17:29:43 -0000
1.5
@@ -8,24 +8,24 @@
<title xml:lang="zh">éä»¶</title>
<item>
- <field name="title" dtrequired="true">
+ <field name="title" ftype="data" dtrequired="true">
<prompt xml:lang="en">Title</prompt>
<prompt xml:lang="nl">Titel</prompt>
<prompt xml:lang="zh">æ é¢</prompt>
</field>
- <field name="description" ftype="text" rows="3">
+ <field name="description" ftype="data" rows="3">
<prompt xml:lang="en">Description</prompt>
<prompt xml:lang="nl">Omschrijving</prompt>
<prompt xml:lang="zh">æè¿°</prompt>
</field>
- <field name="handle" ftype="file" dtmaxsize="16000000">
+ <field name="handle" ftype="filedata" dtmaxsize="16000000">
<prompt xml:lang="en">Flash bestand</prompt>
<prompt xml:lang="nl">Flash file</prompt>
<prompt xml:lang="zh">éä»¶</prompt>
</field>
</item>
- <command name="search" nodepath="attachments" age="-1"
fields="title,description">
+ <command name="assetsselector" nodepath="attachments" age="-1"
fields="title,description">
<prompt xml:lang="en">Search attachment</prompt>
<prompt xml:lang="nl">Zoek bijlage</prompt>
<prompt xml:lang="zh">æ¥æ¾éä»¶</prompt>
@@ -49,7 +49,7 @@
</search-filter>
</command>
- <command name="insert" objectnumber="new">
+ <command name="startwizard" inline="true"
wizardname="config/attachments/attachments" objectnumber="new">
<prompt xml:lang="en">New</prompt>
<prompt xml:lang="nl">Nieuw</prompt>
<prompt xml:lang="zh">æ°å»º</prompt>
@@ -58,7 +58,6 @@
<action type="create">
<relation destinationtype="attachments" role="posrel">
<field name="pos">{sum(//relati...@role='posrel' and
@lastitem='true']/obje...@type='attachments']/../fie...@name='pos'])+{$pos}}</field>
- <object type="attachments"></object>
</relation>
</action>
</list>
\ No newline at end of file
Index: search_banner_posrel_urls.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/banner/search_banner_posrel_urls.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- search_banner_posrel_urls.xml 15 Dec 2008 12:29:41 -0000 1.4
+++ search_banner_posrel_urls.xml 13 Feb 2009 17:29:43 -0000 1.5
@@ -6,15 +6,15 @@
<title xml:lang="zh">URL</title>
<item>
- <field name="name">
+ <field name="title" ftype="data">
<prompt xml:lang="en">Name</prompt>
<prompt xml:lang="nl">Naam</prompt>
<prompt xml:lang="zh">åç§°</prompt>
</field>
- <field name="url" dtpattern="\://|javascript\:">
- <prompt xml:lang="en">Url</prompt>
- <prompt xml:lang="nl">Url</prompt>
- <prompt xml:lang="zh">Url</prompt>
+ <field name="url" dtpattern="\://|javascript\:|mailto\:"
ftype="data">
+ <prompt xml:lang="en">URL</prompt>
+ <prompt xml:lang="nl">URL</prompt>
+ <prompt xml:lang="zh">URL</prompt>
</field>
<field dtrequired="false" ftype="text" name="description" rows="3">
<prompt xml:lang="en">Description</prompt>
@@ -23,20 +23,26 @@
</field>
</item>
- <command name="search" nodepath="urls" age="-1"
fields="name,url,description">
- <prompt xml:lang="en">Search url</prompt>
- <prompt xml:lang="nl">Zoek url</prompt>
- <prompt xml:lang="zh">æ¥æ¾url</prompt>
+ <command name="assetsselector" nodepath="urls" age="-1"
fields="title,url,description">
+ <prompt xml:lang="en">Search URL</prompt>
+ <prompt xml:lang="nl">Zoek URL</prompt>
+ <prompt xml:lang="zh">æ¥æ¾URL</prompt>
+ <search-filter>
+ <name xml:lang="en">Name / Description</name>
+ <name xml:lang="nl">Naam / Omschrijving</name>
+ <name xml:lang="zh">åç§° / æè¿°</name>
+ <search-fields>[title]|[description]</search-fields>
+ </search-filter>
<search-filter>
<name xml:lang="en">Name contains</name>
<name xml:lang="nl">Naam bevat</name>
<name xml:lang="zh">åç§°å
å«</name>
- <search-fields>[name]</search-fields>
+ <search-fields>[title]</search-fields>
</search-filter>
<search-filter>
- <name xml:lang="en">Url contains</name>
- <name xml:lang="nl">Url bevat</name>
- <name xml:lang="zh">Urlå
å«</name>
+ <name xml:lang="en">URL contains</name>
+ <name xml:lang="nl">URL bevat</name>
+ <name xml:lang="zh">åURLå
å«</name>
<search-fields>[url]</search-fields>
</search-filter>
<search-filter>
@@ -56,7 +62,6 @@
<action type="create">
<relation destinationtype="urls" role="posrel">
<field name="pos">{sum(//relati...@role='posrel' and
@lastitem='true']/obje...@type='urls']/../fie...@name='pos'])+{$pos}}</field>
- <object type="urls" />
</relation>
</action>
</list>
\ No newline at end of file
Index: search_banner_imagerel_images.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/banner/search_banner_imagerel_images.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- search_banner_imagerel_images.xml 15 Dec 2008 12:29:41 -0000 1.4
+++ search_banner_imagerel_images.xml 13 Feb 2009 17:29:43 -0000 1.5
@@ -6,27 +6,33 @@
<title xml:lang="zh">å¾ç</title>
<item displaytype="image">
- <field name="title" dtrequired="true">
+ <field name="title" ftype="data" dtrequired="true">
<prompt xml:lang="en">Title</prompt>
<prompt xml:lang="nl">Titel</prompt>
<prompt xml:lang="zh">æ é¢</prompt>
</field>
- <field name="description" ftype="text" rows="4">
+ <field name="description" ftype="data" rows="4">
<prompt xml:lang="en">Description</prompt>
<prompt xml:lang="nl">Omschrijving</prompt>
<prompt xml:lang="zh">æè¿°</prompt>
</field>
- <field name="handle" ftype="image">
+ <field name="handle" ftype="imagedata">
<prompt xml:lang="en">Image</prompt>
<prompt xml:lang="nl">Afbeelding</prompt>
<prompt xml:lang="zh">å¾ç</prompt>
</field>
</item>
- <command name="search" nodepath="images" age="-1"
fields="title,description">
+ <command name="assetsselector" nodepath="images" age="-1"
fields="title,description">
<prompt xml:lang="en">Search image</prompt>
<prompt xml:lang="nl">Zoek afbeelding</prompt>
- <prompt xml:lang="zh">æç´ å¾ç</prompt>
+ <prompt xml:lang="zh">æ¥æ¾å¾ç</prompt>
+ <search-filter>
+ <name xml:lang="en">Title / Description</name>
+ <name xml:lang="nl">Titel / Omschrijving</name>
+ <name xml:lang="zh">æ é¢å
å« / æè¿°å
å«</name>
+ <search-fields>[title]|[description]</search-fields>
+ </search-filter>
<search-filter>
<name xml:lang="en">Title contains</name>
<name xml:lang="nl">Titel bevat</name>
@@ -41,7 +47,7 @@
</search-filter>
</command>
- <command name="insert" objectnumber="new">
+ <command name="startwizard" inline="true" wizardname="config/images/images"
objectnumber="new">
<prompt xml:lang="en">New</prompt>
<prompt xml:lang="nl">Nieuw</prompt>
<prompt xml:lang="zh">æ°å»º</prompt>
@@ -50,7 +56,6 @@
<action type="create">
<relation role="imagerel">
<field name="order">{sum(//relati...@role='imagerel' and
@lastitem='true']/obje...@type='images']/../fie...@name='order'])+{$pos}}</field>
- <object type="images" />
</relation>
</action>
</list>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs