[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/option_lists/banner width.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/option_lists/banner In directory james.mmbase.org:/tmp/cvs-serv9264/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/option_lists/banner Modified Files: Tag: b1_5 width.xml Log Message: CMSC-1185 (i18n) See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/option_lists/banner See also: http://www.mmbase.org/jira/browse/CMSC-1185 Index: width.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-banner/src/webapp/editors/config/option_lists/banner/width.xml,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -b -r1.1 -r1.1.8.1 --- width.xml 7 Mar 2007 19:36:44 - 1.1 +++ width.xml 26 Dec 2008 08:50:12 - 1.1.8.1 @@ -1,7 +1,11 @@ ?xml version=1.0? !DOCTYPE optionlist PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; optionlist name=width - option id=-1auto/option + option id=-1 + prompt xml:lang=nlauto/prompt + prompt xml:lang=enauto/prompt + prompt xml:lang=zhèªå¨/prompt + /option option id=120120/option option id=234234/option option id=468468/option ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/workflow/src/webapp/editors/config/option_lists PublishState.xml WorkflowStatus.xml
Update of /var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/config/option_lists In directory james.mmbase.org:/tmp/cvs-serv9264/CMSContainer_Modules/workflow/src/webapp/editors/config/option_lists Modified Files: Tag: b1_5 PublishState.xml WorkflowStatus.xml Log Message: CMSC-1185 (i18n) See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/config/option_lists See also: http://www.mmbase.org/jira/browse/CMSC-1185 Index: PublishState.xml === RCS file: /var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/config/option_lists/PublishState.xml,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -b -r1.1 -r1.1.8.1 --- PublishState.xml12 Dec 2006 09:42:34 - 1.1 +++ PublishState.xml26 Dec 2008 08:50:12 - 1.1.8.1 @@ -1,7 +1,19 @@ ?xml version=1.0? !DOCTYPE optionlist PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; optionlist name=PublishState - option id=doneDone/option - option id=failFail/option - option id=initInit/option + option id=done + prompt xml:lang=nlDone/prompt + prompt xml:lang=enDone/prompt + prompt xml:lang=zhå®æ/prompt + /option + option id=fail + prompt xml:lang=nlFail/prompt + prompt xml:lang=enFail/prompt + prompt xml:lang=zh失败/prompt + /option + option id=init + prompt xml:lang=nlInit/prompt + prompt xml:lang=enInit/prompt + prompt xml:lang=zhæ°å»º/prompt + /option /optionlist \ No newline at end of file Index: WorkflowStatus.xml === RCS file: /var/cvs/contributions/CMSContainer_Modules/workflow/src/webapp/editors/config/option_lists/WorkflowStatus.xml,v retrieving revision 1.1 retrieving revision 1.1.8.1 diff -u -b -r1.1 -r1.1.8.1 --- WorkflowStatus.xml 12 Dec 2006 09:42:34 - 1.1 +++ WorkflowStatus.xml 26 Dec 2008 08:50:12 - 1.1.8.1 @@ -1,8 +1,24 @@ ?xml version=1.0? !DOCTYPE optionlist PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; optionlist name=WorkflowStatus - option id=draftKlad/option - option id=finishedVoltooid/option - option id=approvedGoedgekeurd/option - option id=publishedWacht op publicatie/option + option id=draft + prompt xml:lang=nlKlad/prompt + prompt xml:lang=enKlad/prompt + prompt xml:lang=zhè稿/prompt + /option + option id=finished + prompt xml:lang=nlVoltooid/prompt + prompt xml:lang=enVoltooid/prompt + prompt xml:lang=zhå®æ/prompt + /option + option id=approved + prompt xml:lang=nlGoedgekeurd/prompt + prompt xml:lang=enGoedgekeurd/prompt + prompt xml:lang=zhæ¹å/prompt + /option + option id=published + prompt xml:lang=nlWacht op publicatie/prompt + prompt xml:lang=enWacht op publicatie/prompt + prompt xml:lang=zhåºç/prompt + /option /optionlist \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists media.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists In directory james.mmbase.org:/tmp/cvs-serv9264/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists Modified Files: Tag: b1_5 media.xml Log Message: CMSC-1185 (i18n) See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists See also: http://www.mmbase.org/jira/browse/CMSC-1185 Index: media.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/option_lists/media.xml,v retrieving revision 1.1.8.1 retrieving revision 1.1.8.2 diff -u -b -r1.1.8.1 -r1.1.8.2 --- media.xml 15 Dec 2008 03:37:16 - 1.1.8.1 +++ media.xml 26 Dec 2008 08:50:12 - 1.1.8.2 @@ -24,31 +24,31 @@ option id=aural prompt xml:lang=nlAural/prompt prompt xml:lang=enAural/prompt - prompt xml:lang=zhAural/prompt + prompt xml:lang=zhä¼´é³/prompt /option option id=braille prompt xml:lang=nlBraille/prompt prompt xml:lang=enBraille/prompt - prompt xml:lang=zhBraille/prompt + prompt xml:lang=zhç¹åå°å·/prompt /option option id=embossed prompt xml:lang=nlEmbossed/prompt prompt xml:lang=enEmbossed/prompt - prompt xml:lang=zhEmbossed/prompt + prompt xml:lang=zhæµ®å¸/prompt /option option id=projection prompt xml:lang=nlProjection/prompt prompt xml:lang=enProjection/prompt - prompt xml:lang=zhProjection/prompt + prompt xml:lang=zhæå½±/prompt /option option id=tty prompt xml:lang=nlTty (teletypes, terminals etc)/prompt prompt xml:lang=enTty (teletypes, terminals etc)/prompt - prompt xml:lang=zhTty (teletypes, terminals etc)/prompt + prompt xml:lang=zhçµä¼ æåçµæ¥æº (çµä¼ æåæº, ç»ç«¯è®¾å¤ç)/prompt /option option id=Tv prompt xml:lang=nlTelevision/prompt prompt xml:lang=enTelevision/prompt - prompt xml:lang=zhTelevision/prompt + prompt xml:lang=zhçµè§/prompt /option /optionlist \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetSearchAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv9401/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetSearchAction.java
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,improve advanced custom search
windows for special assets
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: AssetSearchAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- AssetSearchAction.java 25 Dec 2008 05:40:55 - 1.9
+++ AssetSearchAction.java 26 Dec 2008 08:50:55 - 1.10
@@ -44,6 +44,7 @@
public static final String PERSONAL = personal;
public static final String MODE = mode;
+ public static final String STRICT = strict;
public static final String AUTHOR = author;
public static final String OBJECTID = objectid;
public static final String PARENTCHANNEL = parentchannel;
@@ -67,7 +68,9 @@
String deleteAssetRequest = request.getParameter(deleteAssetRequest);
String searchShow = request.getParameter(searchShow);
-
+ if (StringUtils.isNotEmpty(request.getParameter(STRICT))) {
+ request.setAttribute(STRICT, request.getParameter(STRICT));
+ }
if (StringUtils.isEmpty(searchShow)) {
searchShow = (String)request.getSession().getAttribute(searchShow);
if(StringUtils.isEmpty(searchShow)){
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository assetsearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv9401/webapp/editors/repository
Modified Files:
assetsearch.jsp
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,improve advanced custom search
windows for special assets
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: assetsearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- assetsearch.jsp 26 Dec 2008 07:09:44 - 1.11
+++ assetsearch.jsp 26 Dec 2008 08:50:55 - 1.12
@@ -52,7 +52,7 @@
mm:import id=assetsearchinitc:url
value='/editors/repository/AssetSearchInitAction.do'//mm:import
mm:cloud jspvar=cloud loginpage=../../editors/login.jsp
-
+c:if test=${empty strict}
div class=tabs
!-- active TAB --
div class=tab
@@ -69,7 +69,7 @@
/div
/div
/div
-
+/c:if
/div
div class=editor
br /
@@ -83,6 +83,10 @@
html:hidden property=searchShow value=${searchShow}/
html:hidden property=direction/
input type=hidden name=deleteAssetRequest/
+c:if test=${not empty strict}
+ input type=hidden name=assettypes
value=${strict}/
+ input type=hidden name=strict value=${strict}/
+ /c:if
mm:present referid=returnurlinput type=hidden
name=returnurl value=mm:write referid=returnurl///mm:present
mm:compare referid=mode value=advanced
a href=# onclick=selectTab('basic');input
type=button class=button value=fmt:message key=search.simple.search
///a
@@ -99,10 +103,15 @@
tr
td style=width:105pxfmt:message
key=searchform.assettype //td
td
+c:if test=${not empty strict}
+ ${strict}
+ /c:if
+ c:if test=${empty strict}
html:select property=assettypes
onchange=selectAssettype('${searchinit}');
html:option value=assetelementlt;fmt:message
key=searchform.assettypes.all /gt;/html:option
html:optionsCollection name=typesList value=value
label=label/
/html:select
+ /c:if
/td
/tr
tr
@@ -389,6 +398,10 @@
c:if test=${creationRelNumber != trashnumber (rights ==
'writer' || rights == 'chiefeditor' || rights == 'editor' || rights ==
'webmaster') fn:length(results) 1}
input type=checkbox value=moveToRecyclebin:mm:field
name=number / name=chk_mm:field name=number /
onClick=document.forms['linkForm'].elements.selectall.checked=false;/
/c:if
+ c:if test=${not empty strict}
+ a href=# onClick=top.opener.selectContent('mm:field
name=number /', '', ''); top.close();
+ img src=../gfx/icons/link.png title=fmt:message
key=searchform.icon.select.title / //a
+ /c:if
%@ include file=searchIconsBar.jspf %
/td
td style=white-space: nowrap; onMouseDown=objClick(this);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls search_article_posrel_urls.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls In directory james.mmbase.org:/tmp/cvs-serv9847/basicmodel/src/webapp/editors/config/urls Modified Files: search_article_posrel_urls.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows,add assetsselector in editwizard for Searching See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_article_posrel_urls.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/search_article_posrel_urls.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- search_article_posrel_urls.xml 15 Dec 2008 12:07:24 - 1.6 +++ search_article_posrel_urls.xml 26 Dec 2008 09:05:04 - 1.7 @@ -23,7 +23,7 @@ /field /item - command name=search nodepath=urls age=-1 fields=name,url,description + command name=assetsselector nodepath=urls age=-1 fields=name,url,description prompt xml:lang=enSearch url/prompt prompt xml:lang=nlZoek url/prompt prompt xml:lang=zhæ¥æ¾Url/prompt ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images search_contentelement_imagerel_images.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images In directory james.mmbase.org:/tmp/cvs-serv9847/basicmodel/src/webapp/editors/config/images Modified Files: search_contentelement_imagerel_images.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows,add assetsselector in editwizard for Searching See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_contentelement_imagerel_images.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images/search_contentelement_imagerel_images.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- search_contentelement_imagerel_images.xml 7 Oct 2008 09:57:26 - 1.6 +++ search_contentelement_imagerel_images.xml 26 Dec 2008 09:05:04 - 1.7 @@ -48,7 +48,7 @@ /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=enSearch image/prompt prompt xml:lang=nlZoek afbeelding/prompt prompt xml:lang=zhæ¥æ¾å¾ç/prompt ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript override.js
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
In directory
james.mmbase.org:/tmp/cvs-serv9847/edit-webapp/src/webapp/editors/editwizards_new/javascript
Modified Files:
override.js
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,add assetsselector in editwizard
for Searching
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: override.js
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript/override.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- override.js 15 Dec 2008 05:40:58 - 1.6
+++ override.js 26 Dec 2008 09:05:04 - 1.7
@@ -354,3 +354,20 @@
document.getElementById(fieldName).value='';
}
}
\ No newline at end of file
+
+function selectAssets(ele,type){
+Data[type] = ele.value;
+}
+
+var Data = {
+attachments: ,
+ images:,
+ urls:
+}
+
+function getAssets(type){
+//alert(Data[type]);
+ var
url='../../../../editors/repository/AssetSearchAction.do?assettypes='+type+'title='+Data[type]+'strict='+type;
+ window.open(url,
+ 'contentselector',
'width=730,height=550,status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,menubar=no');
+}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl wizard.xsl
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
In directory
james.mmbase.org:/tmp/cvs-serv9847/edit-webapp/src/webapp/editors/editwizards_new/xsl
Modified Files:
wizard.xsl
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,add assetsselector in editwizard
for Searching
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: wizard.xsl
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- wizard.xsl 15 Dec 2008 05:08:37 - 1.18
+++ wizard.xsl 26 Dec 2008 09:05:04 - 1.19
@@ -468,6 +468,44 @@
/tr
/table
/xsl:for-each
+ xsl:for-each select=comma...@name=apos;assetsselectorapos;]
+table class=searchcontent
+ tr
+xsl:if test=prompt
+ td class=searchpromptxsl:call-template name=prompt//td
+/xsl:if
+td
+ xsl:call-template name=listsearch-age/
+/td
+td
+ xsl:call-template name=listsearch-fields/
+/td
+td
+ input type=text
name=searchterm_{../comma...@name=apos;add-itemapos;]/@cmd}
value={search-filter[1]/default} class=search
onChange=selectAssets(this,'{...@nodepath}')/
+ !-- on change the current value is copied back to the option's
default, because of that, the user's search is stored between different types
of search-actions --
+/td
+td
+ a href=#
onclick=select_fid='{../@fid}';select_did='{../comma...@name=apos;add-itemapos;]/@value}';getAssets('{...@nodepath}')
class=button
+xsl:for-each select=@*
+ xsl:copy/
+/xsl:for-each
+xsl:attribute name=relationOriginNodexsl:value-of
select=../@number //xsl:attribute
+xsl:choose
+ xsl:when
test=../acti...@type=apos;addapos;]/relation/@role
+xsl:attribute name=relationRolexsl:value-of
select=../acti...@type=apos;addapos;]/relation/@role //xsl:attribute
+xsl:attribute name=relationCreateDirxsl:value-of
select=../acti...@type=apos;addapos;]/relation/@createdir //xsl:attribute
+ /xsl:when
+ xsl:otherwise
+xsl:attribute name=relationRolexsl:value-of
select=../acti...@type=apos;createapos;]/relation/@role //xsl:attribute
+xsl:attribute name=relationCreateDirxsl:value-of
select=../acti...@type=apos;createapos;]/relation/@createdir
//xsl:attribute
+ /xsl:otherwise
+/xsl:choose
+xsl:call-template name=prompt_search/
+ /a
+/td
+ /tr
+/table
+ /xsl:for-each
/xsl:if
/xsl:template
@@ -598,6 +636,10 @@
!-- Search is handled by the listsearch template --
/xsl:template
+ xsl:template match=comma...@name=apos;assetsselectorapos;]
mode=listnewbuttons
+ !-- Search is handled by the listsearch template --
+ /xsl:template
+
xsl:template match=comma...@name=apos;startwizardapos;]
mode=listnewbuttons
!-- create action and startwizard command are present. Open the object
into the start wizard --
!-- The prompts.xsl adds this as a tooltip --
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups insertinline_link.html
Update of
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
In directory james.mmbase.org:/tmp/cvs-serv10092/popups
Modified Files:
insertinline_link.html
Log Message:
CMSC-681 Asset Maintenance
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: insertinline_link.html
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/popups/insertinline_link.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- insertinline_link.html 4 Dec 2008 11:22:09 - 1.4
+++ insertinline_link.html 26 Dec 2008 09:08:20 - 1.5
@@ -34,22 +34,14 @@
var param = window.dialogArguments;
-
-
var target_select = document.getElementById(f_target);
var use_target = true;
if (param) {
if ( typeof param[f_usetarget] != undefined ) {
use_target = param[f_usetarget];
}
-if ( typeof param[f_href] != undefined ) {
document.getElementById(f_href).value = param[f_href];
- if(typeof param[f_linkName] != undefined){
-document.getElementById(f_linkName).value = param[f_linkName];
- }
- else{
document.getElementById(f_linkName).value = param[f_linkName];
- }
document.getElementById(f_title).value = param[f_title];
document.getElementById(f_destination).value = param[f_destination];
comboSelectValue(target_select, param[f_target]);
@@ -61,7 +53,6 @@
opt.selected = true;
}
}
- }
if (! use_target) {
document.getElementById(f_target_label).style.visibility = hidden;
document.getElementById(f_target).style.visibility = hidden;
@@ -92,7 +83,6 @@
el.focus();
return false;
}
-
else{
var el = document.getElementById(f_title);
if (!el.value) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance create-relations-asset-channel.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
In directory james.mmbase.org:/tmp/cvs-serv11135/webapp/editors/maintenance
Modified Files:
create-relations-asset-channel.jsp
Log Message:
CMSC-1206 Asset: enhance the create-relations-asset-channel.jsp script to
find a good channel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance
See also: http://www.mmbase.org/jira/browse/CMSC-1206
Index: create-relations-asset-channel.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/webapp/editors/maintenance/create-relations-asset-channel.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- create-relations-asset-channel.jsp 24 Dec 2008 12:08:15 - 1.2
+++ create-relations-asset-channel.jsp 26 Dec 2008 09:36:04 - 1.3
@@ -10,35 +10,51 @@
link href=../style.css type=text/css rel=stylesheet/
/head
body
- h2Create relations from assets to channels/h2
+ h2Create relations from assets to channels./h2
mm:cloud jspvar=cloud loginpage=../editors/login.jsp rank=administrator
mm:log jspvar=log
-Note:please insert a channel number which you want to create relation from
asset elements to.if you keep it blank, the root node will be used.
+Note:ul
+liif 'Relate to root channel' is choosed,the asset elements will be related
to the channel node which you fill in the input text.if it's empty ,the root
node will be used./li
+liif 'Self-determination' is choosed,The asset elements will be related to
the channel node which relates to a article and the article relates to the
asset/li
+
+/ul
br/br/
form method=post
input type=hidden name=action value=add/
- Parent channel Node Number:input type=text name=number/
+ select name=type
+ option value=rootRelate to root channel/option
+ option value=selfselectSelf-determination/option
+ /selectbr/br/
+ Parent channel Node Number:input type=text name=number/br/br/
input type=submit name=action value=Create/
/form
mm:import externid=action/
mm:import externid=number/
mm:present referid=action
+ c:if test=${param.type == 'root'}
mm:write referid=number jspvar=number vartype=Integer
% if(number 1) {
-new CreateRelationsForSecondaryContent(cloud,number).execute();
+new CreateRelationsForSecondaryContent(cloud).execute(number,null);
}
else {
if(RepositoryUtil.isChannel(String.valueOf(number))) {
- new CreateRelationsForSecondaryContent(cloud,number).execute();
+ new CreateRelationsForSecondaryContent(cloud).execute(number,null);
}
else {
out.println(The number should be a channel number!);
}
}
%
-
/mm:write
+ /c:if
+ c:if test=${param.type == 'selfselect'}
+ mm:write referid=number jspvar=number vartype=Integer
+ %
+ new
CreateRelationsForSecondaryContent(cloud).execute(number,selfselect);
+ %
+/mm:write
+ /c:if
/mm:present
/mm:log
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Undelivered Mail Returned to Sender
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Here's what is going to happen on Jan 1st
Please do not reply to this email. To contact Alaska Adventure Media, please visit us This email message was sent to c...@mmbase.org. If you do not wish to receive further communications from Alaska Adventure Media, click here to unsubscribe. If you've experience any difficulty in being removed from a Alaska Adventure Media email list, click here for personalized help. Copyright © 2008 Alaska Adventure Media, Inc. All rights reserved. 6921 Brayton Dr, Anchorage, AK 99507 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Re: your party invite
Please do not reply to this email. To contact Alaska Adventure Media, please visit us This email message was sent to c...@mmbase.org. If you do not wish to receive further communications from Alaska Adventure Media, click here to unsubscribe. If you've experience any difficulty in being removed from a Alaska Adventure Media email list, click here for personalized help. Copyright © 2008 Alaska Adventure Media, Inc. All rights reserved. 6921 Brayton Dr, Anchorage, AK 99507 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository contentsearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv14628/webapp/editors/repository
Modified Files:
contentsearch.jsp
Log Message:
CMSC-681 Asset Maintenance code refacted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: contentsearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- contentsearch.jsp 26 Dec 2008 07:09:44 - 1.7
+++ contentsearch.jsp 26 Dec 2008 11:20:45 - 1.8
@@ -89,6 +89,7 @@
html:hidden property=offset/
html:hidden property=order/
html:hidden property=direction/
+html:hidden property=index value=${param.index}/
input type=hidden name=deleteContentRequest/
mm:present referid=returnurlinput type=hidden
name=returnurl value=mm:write referid=returnurl///mm:present
mm:compare referid=mode value=advanced
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentSearchAction.java SearchForm.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv14628/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentSearchAction.java SearchForm.java
Log Message:
CMSC-681 Asset Maintenance code refacted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: ContentSearchAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ContentSearchAction.java22 Dec 2008 03:52:36 - 1.3
+++ ContentSearchAction.java26 Dec 2008 11:20:44 - 1.4
@@ -56,7 +56,11 @@
SearchForm searchForm = (SearchForm) form;
String deleteContentRequest =
request.getParameter(deleteContentRequest);
-
+ String index = searchForm.getIndex();
+ if(StringUtils.isEmpty(index)){
+ index = no;
+ }
+ request.setAttribute(index, index);
if (StringUtils.isNotEmpty(deleteContentRequest)) {
if (deleteContentRequest.startsWith(massDelete:)) {
massDeleteContent(deleteContentRequest.substring(11));
Index: SearchForm.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SearchForm.java 26 Nov 2007 11:43:40 - 1.5
+++ SearchForm.java 26 Dec 2008 11:20:44 - 1.6
@@ -20,6 +20,7 @@
private String mode = basic;
private String search = true;
private String parentchannelpath = ;
+ private String index = ;
public String getContenttypes() {
@@ -171,4 +172,14 @@
this.keywords = keywords;
}
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+
+ public String getIndex() {
+ return index;
+ }
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Undelivered Mail Returned to Sender
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Mail System Error - Returned Mail
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Here's what is going to happen on Jan 1st
Please do not reply to this email. To contact Alaska Adventure Media, please visit us This email message was sent to c...@mmbase.org. If you do not wish to receive further communications from Alaska Adventure Media, click here to unsubscribe. If you've experience any difficulty in being removed from a Alaska Adventure Media email list, click here for personalized help. Copyright © 2008 Alaska Adventure Media, Inc. All rights reserved. 6921 Brayton Dr, Anchorage, AK 99507 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] failure notice
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Re: Come to the playboy anniversary
Please do not reply to this email. To contact Alaska Adventure Media, please visit us This email message was sent to c...@mmbase.org. If you do not wish to receive further communications from Alaska Adventure Media, click here to unsubscribe. If you've experience any difficulty in being removed from a Alaska Adventure Media email list, click here for personalized help. Copyright © 2008 Alaska Adventure Media, Inc. All rights reserved. 6921 Brayton Dr, Anchorage, AK 99507 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] We offer some alternative therapies
If you are unable to see the message below, click here to view. PLEASE DO NOT REPLY - This is being sent from an unattended mailbox. Copyright © 2008 MaxGentleman, Inc. All rights reserved. 5 Trowbridge Drive, Bethel, CT 666581 You have received this message because you opted in to receives MaxGentleman pecial offers via email. You can unsubscribe here ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Mail delivery failed: returning message to sender
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] This time she will be satisfied!
If you are unable to see the message below, click here to view. PLEASE DO NOT REPLY - This is being sent from an unattended mailbox. Copyright Š 2008 MaxGentleman, Inc. All rights reserved. 5 Trowbridge Drive, Bethel, CT 988808 You have received this message because you opted in to receives MaxGentleman pecial offers via email. You can unsubscribe here ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Returned mail: User unknown
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] Undeliverable: Hi
___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
