[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF struts-newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv1031/portlets-newsletter/src/webapp/WEB-INF Modified Files: struts-newsletter.xml Log Message: CMSC-899(Clean the former form) See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-899 Index: struts-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- struts-newsletter.xml 12 Aug 2008 11:00:44 - 1.21 +++ struts-newsletter.xml 18 Sep 2008 06:38:18 - 1.22 @@ -190,7 +190,7 @@ /action action path=/editors/newsletter/NewsletterStatistic type=com.finalist.newsletter.forms.NewsletterStatisticAction - name=recordSearchForm + name=recordSearchForm scope=request input=/editors/newsletter/ShowNewsletters.do validate=true parameter=search forward name=result path=/editors/newsletter/showNewsletters.jsp redirect=false / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util AbstractNode.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv4602
Modified Files:
AbstractNode.java
Log Message:
check with instance of seemed a good idea, but I encountered some problems with
it any way. Rolled that back.
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: AbstractNode.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractNode.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- AbstractNode.java 16 Sep 2008 16:43:32 - 1.24
+++ AbstractNode.java 18 Sep 2008 09:47:48 - 1.25
@@ -31,7 +31,7 @@
* here, to minimalize the implementation effort of fully implemented Nodes.
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractNode.java,v 1.24 2008/09/16 16:43:32 michiel Exp $
+ * @version $Id: AbstractNode.java,v 1.25 2008/09/18 09:47:48 michiel Exp $
* @see org.mmbase.bridge.Node
* @since MMBase-1.8
*/
@@ -740,13 +740,11 @@
public FieldValue getFunctionValue(String functionName, List?
parameters) {
Function function = getFunction(functionName);
-Parameters params;
-if (parameters instanceof Parameters) {
-params = (Parameters) parameters;
-} else {
-params = function.createParameters();
+Parameters params = function.createParameters();
+// Always create a new parameters object, which makes it possible to
use a Parameters object
+// not created with createParameters too.
+
params.setAll(parameters);
-}
return createFunctionValue(function.getFunctionValue(params));
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/functions NodeFunction.java
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv4703
Modified Files:
NodeFunction.java
Log Message:
generics
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions
Index: NodeFunction.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/NodeFunction.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- NodeFunction.java 11 Jul 2008 14:49:36 - 1.32
+++ NodeFunction.java 18 Sep 2008 09:48:29 - 1.33
@@ -23,7 +23,7 @@
* the Parameter array of the constructor.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeFunction.java,v 1.32 2008/07/11 14:49:36 michiel Exp $
+ * @version $Id: NodeFunction.java,v 1.33 2008/09/18 09:48:29 michiel Exp $
* @see org.mmbase.module.core.MMObjectBuilder#executeFunction
* @see org.mmbase.bridge.Node#getFunctionValue
* @see org.mmbase.util.functions.BeanFunction
@@ -56,7 +56,7 @@
log.warn(Tried to execute node-function on null!);
return null;
}
-List? args = new ArrayList();
+ListString args = new ArrayListString();
String functionName = getFunctionNameAndFillArgs(function, args);
if (log.isDebugEnabled()) {
log.debug(Executing + functionName + + args + on +
node.getNumber());
@@ -65,14 +65,14 @@
return node.getFunctionValue(functionName, args);
}
-public static String getFunctionNameAndFillArgs(String function,
java.util.List args) {
+public static String getFunctionNameAndFillArgs(String function,
java.util.ListString args) {
String functionName = function;
int pos1 = function.indexOf('(');
if (pos1 != -1) {
int pos2 = function.lastIndexOf(')');
if (pos2 != -1) {
functionName = function.substring(0, pos1);
-java.util.List args2 =
org.mmbase.util.StringSplitter.splitFunctions(function.subSequence(pos1 + 1,
pos2));
+java.util.ListString args2 =
org.mmbase.util.StringSplitter.splitFunctions(function.subSequence(pos1 + 1,
pos2));
args.addAll(args2);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge Node.java
Update of /var/cvs/src/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv4813
Modified Files:
Node.java
Log Message:
generics
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge
Index: Node.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/Node.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- Node.java 16 Sep 2008 16:43:32 - 1.77
+++ Node.java 18 Sep 2008 09:49:18 - 1.78
@@ -21,7 +21,7 @@
*
* @author Rob Vermeulen
* @author Pierre van Rooden
- * @version $Id: Node.java,v 1.77 2008/09/16 16:43:32 michiel Exp $
+ * @version $Id: Node.java,v 1.78 2008/09/18 09:49:18 michiel Exp $
*/
public interface Node extends ComparableNode {
@@ -242,7 +242,7 @@
* // not yet working
* @since MMBase-1.8
*/
-public void setListValue(String fieldName, List value);
+public void setListValue(String fieldName, List? value);
/**
* Whether the value for the specified field is codenull/code. This
avoids acquiring the
@@ -441,7 +441,7 @@
* not yet working
* @since MMBase-1.8
*/
-public List getListValue(String fieldName);
+public List? getListValue(String fieldName);
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/bridge/util NodeWrapper.java
Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv4861
Modified Files:
NodeWrapper.java
Log Message:
generics
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util
Index: NodeWrapper.java
===
RCS file: /var/cvs/src/org/mmbase/bridge/util/NodeWrapper.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NodeWrapper.java3 Feb 2008 17:33:56 - 1.20
+++ NodeWrapper.java18 Sep 2008 09:49:35 - 1.21
@@ -22,7 +22,7 @@
* implementation on a existing codeNode/code instance.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeWrapper.java,v 1.20 2008/02/03 17:33:56 nklasens Exp $
+ * @version $Id: NodeWrapper.java,v 1.21 2008/09/18 09:49:35 michiel Exp $
* @since MMBase-1.8
*/
@@ -54,7 +54,7 @@
public void setLongValue(String fieldName, long value) {
node.setLongValue(fieldName, value); }
public void setStringValue(String fieldName, String value) {
node.setStringValue(fieldName, value); }
public void setDateValue(String fieldName, Date value) {
node.setDateValue(fieldName, value); }
-public void setListValue(String fieldName, List value) {
node.setListValue(fieldName, value); }
+public void setListValue(String fieldName, List? value) {
node.setListValue(fieldName, value); }
public boolean isNull(String fieldName) { return node.isNull(fieldName); }
public longgetSize(String fieldName) { return node.getSize(fieldName);
}
public Object getValue(String fieldName) { return
node.getValue(fieldName); }
@@ -70,7 +70,7 @@
public java.io.InputStream getInputStreamValue(String fieldName) { return
node.getInputStreamValue(fieldName); }
public String getStringValue(String fieldName) { return
node.getStringValue(fieldName); }
public Date getDateValue(String fieldName) { return
node.getDateValue(fieldName); }
-public List getListValue(String fieldName) { return
node.getListValue(fieldName); }
+public List? getListValue(String fieldName) { return
node.getListValue(fieldName); }
public FieldValue getFieldValue(String fieldName) throws NotFoundException
{
return node.getFieldValue(fieldName);
}
@@ -123,7 +123,7 @@
public CollectionFunction? getFunctions() { return
node.getFunctions(); }
public Function getFunction(String functionName) { return
node.getFunction(functionName); }
public Parameters createParameters(String functionName) { return
node.createParameters(functionName); }
-public FieldValue getFunctionValue(String functionName, List parameters) {
return node.getFunctionValue(functionName, parameters);}
+public FieldValue getFunctionValue(String functionName, List?
parameters) { return node.getFunctionValue(functionName, parameters);}
@Override
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] html/WEB-INF web.xml
Update of /var/cvs/html/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv5057 Modified Files: web.xml Log Message: documented 'addfilename' parameters See also: http://cvs.mmbase.org/viewcvs/html/WEB-INF Index: web.xml === RCS file: /var/cvs/html/WEB-INF/web.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -b -r1.36 -r1.37 --- web.xml 28 Jun 2007 18:35:39 - 1.36 +++ web.xml 18 Sep 2008 09:58:24 - 1.37 @@ -5,7 +5,7 @@ Web-app 2.4 gives the possibility to use EL (Expression Language) - $Id: web.xml,v 1.36 2007/06/28 18:35:39 michiel Exp $ + $Id: web.xml,v 1.37 2008/09/18 09:58:24 michiel Exp $ -- web-app xmlns=http://java.sun.com/xml/ns/j2ee; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; @@ -117,6 +117,21 @@ /context-param + !-- + Whether URL's generated to images must include a filename. + Possible values are: 'yes' (from filename field, or from title), 'no', or '' (only if the 'filename' field is present, and filled). + -- + context-param +param-namemmbase.servlet.images.addfilename/param-name +param-valueyes/param-value + /context-param + !-- some for attachments -- + context-param +param-namemmbase.servlet.attachments.addfilename/param-name +param-valueyes/param-value + /context-param + + filter filter-nameFrameworkFilter/filter-name filter-classorg.mmbase.framework.FrameworkFilter/filter-class ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/webinf web.xml
Update of /var/cvs/contributions/didactor2/src/core/webinf In directory james.mmbase.org:/tmp/cvs-serv5117 Modified Files: web.xml Log Message: See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/webinf Index: web.xml === RCS file: /var/cvs/contributions/didactor2/src/core/webinf/web.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- web.xml 5 Sep 2008 15:59:08 - 1.21 +++ web.xml 18 Sep 2008 09:59:28 - 1.22 @@ -19,6 +19,16 @@ param-valuefalse/param-value /context-param + context-param +param-namemmbase.servlet.images.addfilename/param-name +param-valueyes/param-value + /context-param + !-- some for attachments -- + context-param +param-namemmbase.servlet.attachments.addfilename/param-name +param-valueyes/param-value + /context-param + filter filter-nameDidactor Filter/filter-name display-nameDidactor/display-name ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv5520
Modified Files:
AbstractServletBuilder.java
Log Message:
url function should not again add file name
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- AbstractServletBuilder.java 7 Sep 2008 10:03:55 - 1.55
+++ AbstractServletBuilder.java 18 Sep 2008 10:24:35 - 1.56
@@ -30,7 +30,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.55 2008/09/07 10:03:55
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.56 2008/09/18 10:24:35
michiel Exp $
* @since MMBase-1.6
*/
public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -515,13 +515,13 @@
servlet.append(session= + session + +);
}
-if (! addFileName) {
-return servlet.append(argument).toString();
-} else {
-servlet.append(argument).append('/');
+servlet.append(argument);
+if (addFileName) {
+servlet.append('/');
getFileName(mmnode, servlet);
-return servlet.toString();
}
+return servlet.toString();
+
}
public String getFunctionValue(Parameters a) {
@@ -531,16 +531,7 @@
addFunction(new NodeFunctionString(url, new Parameter[] {
Parameter.REQUEST, Parameter.CLOUD }) {
public String getFunctionValue(Node node, Parameters a) {
-String sp = node.getFunctionValue(servletpath,
a).toString();
-MMObjectNode mmnode = node.getNumber() 0 ?
-AbstractServletBuilder.this.getNode(node.getNumber()) :
-new MMObjectNode(AbstractServletBuilder.this, new
org.mmbase.bridge.util.NodeMap(node));
-if(addFileName(mmnode, sp)) {
-StringBuilder buf = new StringBuilder(sp);
-buf.append('/');
-sp = getFileName(mmnode, buf).toString();
-}
-return sp;
+return node.getFunctionValue(servletpath, a).toString();
}
});
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/util/functions Parameters.java
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv5803
Modified Files:
Parameters.java
Log Message:
added also setAll(Parameters)
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions
Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Parameters.java 20 Aug 2008 21:57:11 - 1.44
+++ Parameters.java 18 Sep 2008 10:40:46 - 1.45
@@ -24,7 +24,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: Parameters.java,v 1.44 2008/08/20 21:57:11 michiel Exp $
+ * @version $Id: Parameters.java,v 1.45 2008/09/18 10:40:46 michiel Exp $
* @see Parameter
* @see #Parameters(Parameter[])
*/
@@ -464,6 +464,16 @@
return this;
}
+/**
+ * @since MMBase-1.9
+ */
+public Parameters setAll(Parameters params) {
+for (Parameter param : params.getDefinition()) {
+set(param, params.get(param));
+}
+return this;
+}
+
public Parameters subList(int fromIndex, int toIndex) {
return new Parameters(this, fromIndex, toIndex);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] src/org/mmbase/module/builders AbstractServletBuilder.java
Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv5870
Modified Files:
AbstractServletBuilder.java
Log Message:
'url' function (~ servletpath, but with less arguments) was not quite correct
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
Index: AbstractServletBuilder.java
===
RCS file: /var/cvs/src/org/mmbase/module/builders/AbstractServletBuilder.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- AbstractServletBuilder.java 18 Sep 2008 10:24:35 - 1.56
+++ AbstractServletBuilder.java 18 Sep 2008 10:41:24 - 1.57
@@ -30,7 +30,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: AbstractServletBuilder.java,v 1.56 2008/09/18 10:24:35
michiel Exp $
+ * @version $Id: AbstractServletBuilder.java,v 1.57 2008/09/18 10:41:24
michiel Exp $
* @since MMBase-1.6
*/
public abstract class AbstractServletBuilder extends MMObjectBuilder {
@@ -477,7 +477,7 @@
return servlet;
}
-public String getFunctionValue(Node node, Parameters
a) {
+@Override public String getFunctionValue(Node node,
Parameters a) {
// verify if the object is stored externally (in
which case
// its url has been filled in)
// if so, return the url of the external source
@@ -524,14 +524,17 @@
}
-public String getFunctionValue(Parameters a) {
+@Override public String getFunctionValue(Parameters a)
{
return getServletPath(a).toString();
}
});
addFunction(new NodeFunctionString(url, new Parameter[] {
Parameter.REQUEST, Parameter.CLOUD }) {
-public String getFunctionValue(Node node, Parameters a) {
-return node.getFunctionValue(servletpath, a).toString();
+@Override public String getFunctionValue(Node node, Parameters
a) {
+Function spFunction = node.getFunction(servletpath);
+Parameters p = spFunction.createParameters();
+p.setAll(a);
+return node.getFunctionValue(servletpath, p).toString();
}
});
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/didactor2/src/core/java/nl/didactor/component MMBaseComponent.java
Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/component
In directory james.mmbase.org:/tmp/cvs-serv6086
Modified Files:
MMBaseComponent.java
Log Message:
lowered a log
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/component
Index: MMBaseComponent.java
===
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/component/MMBaseComponent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MMBaseComponent.java21 Aug 2008 09:42:34 - 1.5
+++ MMBaseComponent.java18 Sep 2008 10:54:32 - 1.6
@@ -13,7 +13,7 @@
/**
* The didactor component wrapping an mmbase component.
* @author Michiel Meeuwissen
- * @version $Id: MMBaseComponent.java,v 1.5 2008/08/21 09:42:34 michiel Exp $
+ * @version $Id: MMBaseComponent.java,v 1.6 2008/09/18 10:54:32 michiel Exp $
*/
public class MMBaseComponent extends nl.didactor.component.Component {
@@ -94,7 +94,9 @@
}
}
}
-log.info(Found + scopes);
+if (log.isDebugEnabled()) {
+log.debug(Found + scopes);
+}
return scopes;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/resources portlets-tagcloud.properties portlets-tagcloud_nl.properties
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/resources In directory james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/resources Modified Files: portlets-tagcloud.properties portlets-tagcloud_nl.properties Log Message: CMSC-1066 Worked on with implementing the tag cloud module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/resources See also: http://www.mmbase.org/jira/browse/CMSC-1066 Index: portlets-tagcloud.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/resources/portlets-tagcloud.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- portlets-tagcloud.properties15 Sep 2008 13:15:32 - 1.1 +++ portlets-tagcloud.properties18 Sep 2008 11:21:21 - 1.2 @@ -4,10 +4,14 @@ taglist.count=Count tagcloud.delete.confirm=Are you sure you want to delete this tag? tagcloud.delete=Delete +tagcloud.merge.confirm=Are you sure you want to merge these tags? The elements linked to the second selected tags will be linked to the first tag. +tagcloud.merge=Merge tagdetail.title=Tag Detail tagdetail.tag=Tag tagdetail.description=Description +tagdetail.save=Save +tagdetail.back=Back tagdetail.linked.to=Linked to tagdetail.content.title=Title tagdetail.content.type=Type Index: portlets-tagcloud_nl.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/resources/portlets-tagcloud_nl.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- portlets-tagcloud_nl.properties 15 Sep 2008 13:15:32 - 1.1 +++ portlets-tagcloud_nl.properties 18 Sep 2008 11:21:21 - 1.2 @@ -4,10 +4,14 @@ taglist.count=Aantal tagcloud.delete.confirm=Weet u zeker dat u deze tag wilt verwijderen? tagcloud.delete=Verwijder +tagcloud.merge.confirm=Weet u zeker dat u deze tags wilt samenvoegen? De elementen aan de als tweede geselecteerd tag zullen aan de eerste tag gekoppeld worden. +tagcloud.merge=Samenvoegen tagdetail.title=Tag detail tagdetail.tag=Tag tagdetail.description=Beschrijving +tagdetail.save=Opslaan +tagdetail.back=Terug tagdetail.linked.to=Gelinked aan tagdetail.content.title=Titel tagdetail.content.type=Type ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud Tag.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud
In directory
james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud
Modified Files:
Tag.java
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud
See also: http://www.mmbase.org/jira/browse/CMSC-1066
Index: Tag.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/Tag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Tag.java15 Sep 2008 13:15:32 - 1.2
+++ Tag.java18 Sep 2008 11:21:21 - 1.3
@@ -2,15 +2,23 @@
public class Tag {
+ private int number;
private String name;
private String description;
private int count;
+
public Tag(String name, String description, int count) {
super();
this.name = name;
this.description = description;
this.count = count;
}
+ public void setNumber(int number) {
+ this.number = number;
+ }
+ public int getNumber() {
+ return number;
+ }
public int getCount() {
return count;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/editors/gfx/icons merge_selected.png merge.png
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/editors/gfx/icons In directory james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/src/webapp/editors/gfx/icons Added Files: merge_selected.png merge.png Log Message: CMSC-1066 Worked on with implementing the tag cloud module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/editors/gfx/icons See also: http://www.mmbase.org/jira/browse/CMSC-1066 merge_selected.png is new merge.png is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet TagRelatedPortlet.java TagCloudPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
In directory
james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
Modified Files:
TagRelatedPortlet.java TagCloudPortlet.java
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-1066
Index: TagRelatedPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/portlet/TagRelatedPortlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TagRelatedPortlet.java 15 Sep 2008 09:40:19 - 1.1
+++ TagRelatedPortlet.java 18 Sep 2008 11:21:21 - 1.2
@@ -12,7 +12,14 @@
import javax.portlet.PortletPreferences;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.servlet.http.HttpServletRequest;
+import org.apache.pluto.core.impl.PortletRequestImpl;
+import org.apache.struts.taglib.TagUtils;
+
+import com.finalist.cmsc.beans.om.NavigationItem;
+import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.Portlet;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.RelatedContentPortlet;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
@@ -35,20 +42,72 @@
ListTag tags = TagCloudUtil.getRelatedTags(Integer
.parseInt(elementId));
req.setAttribute(tags, tags);
+ } else {
+ String channelId = getIdFromScreen(req, window,
contentchannel);
+ if (channelId != null) {
+ ListTag tags = TagCloudUtil
+ .getChannelRelatedTags(new
Integer(channelId));
+ req.setAttribute(tags, tags);
+ } else {
+ String tag = getIdFromScreen(req, window,
tag);
+ if (tag == null) {
+ tag = getTagFromRequestParameters(req,
window);
+ }
+ ListTag tags =
TagCloudUtil.getTagRelatedTags(tag);
+ req.setAttribute(tags, tags);
+ }
}
super.doView(req, res);
}
+ private HttpServletRequest getServletRequest(RenderRequest req) {
+ return (HttpServletRequest) ((PortletRequestImpl)
req).getRequest();
+ }
+
+ private String getTagFromRequestParameters(RenderRequest req, String
window) {
+ String requestURL =
getServletRequest(req).getRequestURL().toString();
+ String paramName = /_rp_ + window + _tag/1_;
+ int startIndex = requestURL.indexOf(paramName);
+ if (startIndex != -1) {
+ String elementId = requestURL.substring(startIndex
+ + paramName.length());
+ int endIndex = elementId.indexOf(/);
+ if (endIndex != -1) {
+ elementId = elementId.substring(0, endIndex);
+ }
+ return elementId;
+ }
+
+ return null;
+ }
+
+ private String getIdFromScreen(RenderRequest req, String window, String
var) {
+ Integer pageId = getCurrentPageId(req);
+ NavigationItem item = SiteManagement.getNavigationItem(pageId);
+ if (item instanceof Page) {
+ Page page = (Page) item;
+ int portletId = page.getPortlet(window);
+ Portlet portlet = SiteManagement.getPortlet(portletId);
+ if (portlet != null) {
+ return portlet.getParameterValue(var);
+ }
+ }
+ return null;
+ }
+
@Override
- protected void doEditDefaults(RenderRequest req, RenderResponse res)
throws IOException, PortletException {
+ protected void doEditDefaults(RenderRequest req, RenderResponse res)
+ throws IOException, PortletException {
Integer pageid = getCurrentPageId(req);
String pagepath = SiteManagement.getPath(pageid, true);
if (pagepath != null) {
-SetString positions =
SiteManagement.getPagePositions(pageid.toString());
+ SetString positions =
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/editors/modules/tagcloud list.jsp detail.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/editors/modules/tagcloud
In directory
james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/src/webapp/editors/modules/tagcloud
Modified Files:
list.jsp detail.jsp
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/editors/modules/tagcloud
See also: http://www.mmbase.org/jira/browse/CMSC-1066
Index: list.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/webapp/editors/modules/tagcloud/list.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- list.jsp15 Sep 2008 13:15:32 - 1.1
+++ list.jsp18 Sep 2008 11:21:21 - 1.2
@@ -3,14 +3,20 @@
mm:cloud jspvar=cloud loginpage=login.jsp
c:if test=${param.action == 'delete'}
- mm:listnodes type=tag constraints=name = '${param.tag}'
- c:set var=numbermm:field name=number//c:set
- /mm:listnodes
- c:if test=${!empty number}
- mm:deletenode number=${number}
deleterelations=true/
+ mm:deletenode number=${param.number} deleterelations=true/
/c:if
+ c:if test=${param.action == 'save'}
+ mm:node number=${param.number}
+ mm:setfield name=name${param.name}/mm:setfield
+ mm:setfield
name=description${param.description}/mm:setfield
+ /mm:node
+ /c:if
+ c:if test=${param.action == 'merge'}
+ mm:listnodes type=insrel constraints=dnumber =
${param.target2}
+ mm:setfield
name=dnumber${param.target1}/mm:setfield
+ /mm:listnodes
+ mm:deletenode number=${param.target2}
deleterelations=true/
/c:if
-
html:html xhtml=true
cmscedit:head title=tagcloud.title
@@ -26,6 +32,36 @@
document.location=href;
}
+
+ var oldOrderBy = '${param.orderby}';
+ var oldDirection = '${param.direction}';
+ function orderBy(order) {
+
document.location='list.jsp?orderby='+order+((oldOrderBy == order
oldDirection != 'down')?'direction=down':'');
+ }
+
+ var mergeTarget1;
+ function merge(target) {
+ if(mergeTarget1 == undefined) {
+ mergeTarget1 = target;
+
document.getElementById('img_'+target).src =
'../../gfx/icons/merge_selected.png';
+ }
+ else if(mergeTarget1 == target) {
+
document.getElementById('img_'+mergeTarget1).src = '../../gfx/icons/merge.png';
+ mergeTarget1 = undefined;
+ }
+ else if(confirm('fmt:message
key=tagdetail.merge.confirm /')) {
+
document.getElementById('merge_orderBy').value = oldOrderBy;
+
document.getElementById('merge_direction').value = oldDirection;
+
document.getElementById('merge_target1').value = mergeTarget1;
+
document.getElementById('merge_target2').value = target;
+
document.getElementById('merge_form').submit();
+ }
+ else {
+
document.getElementById('img_'+mergeTarget1).src = '../../gfx/icons/merge.png';
+ mergeTarget1 = undefined;
+ }
+ }
+
/script
/cmscedit:head
body
@@ -47,27 +83,37 @@
thead
tr
th/th
- thfmt:message key=taglist.tag//th
- thfmt:message key=taglist.description//th
- thfmt:message key=taglist.count//th
+ tha href=javascript:orderBy('name')fmt:message
key=taglist.tag//a/th
+ tha href=javascript:orderBy('description')fmt:message
key=taglist.description//a/th
+ tha href=javascript:orderBy('count')fmt:message
key=taglist.count//a/th
/tr
/thead
tbody class=hover
+ form id=merge_form
+ input type=hidden name=action value=merge/
+ input type=hidden id=merge_orderBy name=orderby/
+ input
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/taglib GetTagsTag.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/taglib
In directory
james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/taglib
Modified Files:
GetTagsTag.java
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/taglib
See also: http://www.mmbase.org/jira/browse/CMSC-1066
Index: GetTagsTag.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/java/com/finalist/portlets/tagcloud/taglib/GetTagsTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- GetTagsTag.java 15 Sep 2008 09:40:19 - 1.1
+++ GetTagsTag.java 18 Sep 2008 11:21:21 - 1.2
@@ -14,11 +14,12 @@
private String var;
private Integer max;
private String orderby = TagCloudUtil.ORDERBY_COUNT;
+ private String direction;
public void doTag() throws JspException, IOException {
super.doTag();
- ListTag tags = TagCloudUtil.getTags(max, orderby);
+ ListTag tags = TagCloudUtil.getTags(max, orderby, direction);
getJspContext().setAttribute(var, tags);
}
@@ -37,5 +38,8 @@
this.var = var;
}
+ public void setDirection(String direction) {
+ this.direction = direction;
+ }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-tagcloud/src/tld cmsc-tagcloud.tld
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/tld In directory james.mmbase.org:/tmp/cvs-serv6598/portlets-tagcloud/src/tld Modified Files: cmsc-tagcloud.tld Log Message: CMSC-1066 Worked on with implementing the tag cloud module See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/tld See also: http://www.mmbase.org/jira/browse/CMSC-1066 Index: cmsc-tagcloud.tld === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-tagcloud/src/tld/cmsc-tagcloud.tld,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- cmsc-tagcloud.tld 15 Sep 2008 09:40:19 - 1.1 +++ cmsc-tagcloud.tld 18 Sep 2008 11:21:21 - 1.2 @@ -29,7 +29,13 @@ descriptionorder can be count (default) or name, even if ordered on name, tags with the most results are still returned/description nameorderby/name requiredfalse/required - rtexprvaluefalse/rtexprvalue + rtexprvaluetrue/rtexprvalue + /attribute + attribute + descriptionthe direction to sort in either 'up'(default) or 'down'/description + namedirection/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue /attribute /tag tag ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules modulesmenu.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules
In directory
james.mmbase.org:/tmp/cvs-serv6764/cmsc/edit-webapp/src/webapp/editors/modules
Modified Files:
modulesmenu.jsp
Log Message:
CMSC-1066 Worked on with implementing the tag cloud module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules
See also: http://www.mmbase.org/jira/browse/CMSC-1066
Index: modulesmenu.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- modulesmenu.jsp 15 Sep 2008 13:16:32 - 1.24
+++ modulesmenu.jsp 18 Sep 2008 11:22:29 - 1.25
@@ -74,7 +74,7 @@
/mm:haspage
mm:haspage page=/editors/modules/tagcloud
li style=background-image:
url('../gfx/icons/tagcloud.png');
- a href=mm:url
page=/editors/modules/tagcloud/list.jsp/ target=rightpane
+ a href=mm:url
page=/editors/modules/tagcloud/list.jsp?orderby=countdirection=down/
target=rightpane
fmt:message key=modules.tagcloud /
/a
/li
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen Evenement.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen
In directory james.mmbase.org:/tmp/cvs-serv7362/src/nl/leocms/evenementen
Modified Files:
Evenement.java
Log Message:
NMCMS-551 - Optimize and fix heavy database operations.
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-551
Index: Evenement.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/Evenement.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Evenement.java 29 Apr 2008 13:22:46 - 1.13
+++ Evenement.java 18 Sep 2008 12:04:02 - 1.14
@@ -34,7 +34,7 @@
* Evenement
*
* @author Henk Hangyi
- * @version $Revision: 1.13 $, $Date: 2008/04/29 13:22:46 $
+ * @version $Revision: 1.14 $, $Date: 2008/09/18 12:04:02 $
*
*/
@@ -460,7 +460,7 @@
public NodeList getSortedList(Cloud cloud, String sParentEvent) {
// insert the parent into the list of childs
- NodeList nl = cloud.getList(sParentEvent,
evenement1,partrel,evenement, evenement.number, null,
evenement.begindatum, UP, null, true);
+ NodeList nl = cloud.getList(sParentEvent,
evenement1,partrel,evenement, evenement.number, null,
evenement.begindatum, UP, destination, true);
if (nl.size() != 0) {
DoubleDateNode ddnParent = new
DoubleDateNode(cloud.getNode(sParentEvent));
NodeList parentList = cloud.getList(sParentEvent, evenement,
evenement.number, null, null, null, null, false);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen/stats ExcelWriter.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen/stats
In directory james.mmbase.org:/tmp/cvs-serv7362/src/nl/leocms/evenementen/stats
Modified Files:
ExcelWriter.java
Log Message:
NMCMS-551 - Optimize and fix heavy database operations.
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen/stats
See also: http://www.mmbase.org/jira/browse/NMCMS-551
Index: ExcelWriter.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/stats/ExcelWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ExcelWriter.java21 Nov 2007 12:49:11 - 1.8
+++ ExcelWriter.java18 Sep 2008 12:04:02 - 1.9
@@ -76,11 +76,12 @@
WritableWorkbook workbook = Workbook.createWorkbook(new
File(NatMMConfig.getTempDir() + fileName));
NodeList nl = ev.getSortedList(cloud, sParentEvent);
- NodeList nls =
cloud.getList(sParentEvent,evenement,partrel,evenement1,posrel,inschrijvingen,evenement1.number,evenement1.begindatum,null,evenement1.begindatum,UP,null,true);
- boolean bOneDateWithoutSubscriptions = (nl.size()!= nls.size());
+// ** Don't use very database intensive code that is not needed,
if-statement will always be executed.
+// NodeList nls =
cloud.getList(sParentEvent,evenement,partrel,evenement1,posrel,inschrijvingen,evenement1.number,evenement1.begindatum,null,evenement1.begindatum,UP,null,true);
+// boolean bOneDateWithoutSubscriptions = (nl.size()!= nls.size());
int j = 0;
- if(bOneDateWithoutSubscriptions) {
- String sThisEvenementNumber =
(String)nl.getNode(0).getStringValue(evenement1.number);
+// if(bOneDateWithoutSubscriptions) {
+// String sThisEvenementNumber =
(String)nl.getNode(0).getStringValue(evenement1.number);
HtmlCleaner hc = new HtmlCleaner();
String sSheetTitle =
HtmlCleaner.stripText(nParentNode.getStringValue(titel));
if (sSheetTitle.length()28) {
@@ -88,7 +89,7 @@
}
createEventDatesSheet(cloud,hc,nParentNode,workbook,j,sSheetTitle,
null);
j++;
- }
+// } ** //End of database intensive code.
for (int i = 0; i nl.size(); i++){
Node event =
cloud.getNode(nl.getNode(i).getStringValue(evenement.number));
if(event.getRelatedNodes(inschrijvingen).size()!=0) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen/util not_confirmed_subscriptions.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen/util
In directory
james.mmbase.org:/tmp/cvs-serv7362/templates/editors/evenementen/util
Modified Files:
not_confirmed_subscriptions.jsp
Log Message:
NMCMS-551 - Optimize and fix heavy database operations.
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen/util
See also: http://www.mmbase.org/jira/browse/NMCMS-551
Index: not_confirmed_subscriptions.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/util/not_confirmed_subscriptions.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- not_confirmed_subscriptions.jsp 5 Mar 2006 21:43:59 - 1.1
+++ not_confirmed_subscriptions.jsp 18 Sep 2008 12:04:02 - 1.2
@@ -20,7 +20,7 @@
mm:compare referid=i value=-1 inverse=true
mm:node number=$i jspvar=thisSubscription
%
- RelationList relations =
thisSubscription.getRelations(related,inschrijvings_status);
+ RelationList relations =
thisSubscription.getRelations(related,cloud.getNodeManager(inschrijvings_status),
destination);
if(!relations.isEmpty()) {
Relation thisRelation = relations.getRelation(0);
thisRelation.delete();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen subscribe.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv10033/templates/editors/evenementen
Modified Files:
subscribe.jsp
Log Message:
NMCMS-547
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-547
Index: subscribe.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/subscribe.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- subscribe.jsp 28 Apr 2008 15:40:18 - 1.27
+++ subscribe.jsp 18 Sep 2008 14:43:38 - 1.28
@@ -684,7 +684,6 @@
/td
td colspan=5
nobr
- html:submit property=action value=%=
SubscribeForm.ADDRESS_ACTION % style=%= extButtonStyle %
onclick=deleteCookie('ew')/
html:submit property=action value=%=
SubscribeForm.SUBSCRIBE_ACTION % style=%= buttonStyle % onclick=%=
((!isGroupExcursion ? checkMaxPerGroup(): ) + ;deleteCookie('ew')) % /
html:submit property=action value=%=
SubscribeForm.CHANGE_ACTION % style=%= buttonStyle % onclick=%=
((!isGroupExcursion ? checkMaxPerGroup(): ) + ;deleteCookie('ew'))% /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv10099/templates/editors/evenementen
Modified Files:
evenementen.jsp
Log Message:
NMCMS-586
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-586
Index: evenementen.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- evenementen.jsp 21 Aug 2008 15:13:57 - 1.19
+++ evenementen.jsp 18 Sep 2008 14:48:34 - 1.20
@@ -634,13 +634,13 @@
!--1--td style=padding-top:3px;input type=text name=titel
tabindex=1 value=%= titelId % style=width:130px; onkeypress=return
event.keyCode!=13/td
!--2--td style=padding-top:3px;input type=text
name=natuurgebieden tabindex=2 value=%= natuurgebiedenId %
style=width:130px;/td
!--3--td colspan=4input type=hidden name=_hiddenDate
- input type=text name=beginDy maxlength=2 tabindex=6 value=%=
beginDyId % style=width:40px;text-align:right;
- -input type=text name=beginMnth maxlength=2 tabindex=7
value=%= beginMnthId % style=width:40px;text-align:right;
- -input type=text name=beginYr maxlength=4 tabindex=8
value=%= beginYrId % style=width:40px;text-align:right;
+ input type=text name=beginDy maxlength=2 tabindex=3 value=%=
beginDyId % style=width:40px;text-align:right;
+ -input type=text name=beginMnth maxlength=2 tabindex=4
value=%= beginMnthId % style=width:40px;text-align:right;
+ -input type=text name=beginYr maxlength=4 tabindex=5
value=%= beginYrId % style=width:40px;text-align:right;
a href=javascript:popUpCalendar('begin') img
src='../../calendar/show-calendar-on-button.gif' width='24' height='24'
align='absmiddle' border='0' alt='Selecteer begindatum'/a
- input type=text name=endDy maxlength=2 tabindex=9 value=%=
endDyId % style=width:40px;text-align:right;
--input type=text name=endMnth maxlength=2 tabindex=10
value=%= endMnthId % style=width:40px;text-align:right;
--input type=text name=endYr maxlength=4 tabindex=11
value=%= endYrId % style=width:40px;text-align:right;
+ input type=text name=endDy maxlength=2 tabindex=6 value=%=
endDyId % style=width:40px;text-align:right;
+-input type=text name=endMnth maxlength=2 tabindex=7
value=%= endMnthId % style=width:40px;text-align:right;
+-input type=text name=endYr maxlength=4 tabindex=8 value=%=
endYrId % style=width:40px;text-align:right;
a href=javascript:popUpCalendar('end') img
src='../../calendar/show-calendar-on-button.gif' width='24' height='24'
align='absmiddle' border='0' alt='Selecteer einddatum'/a/td
/tr
@@ -657,11 +657,11 @@
tr
td/td
!-- Aanmelder --
- td style=padding-top:3px;input type=text name=aanmelder_naam
tabindex=3 value=%= aanmelderNaamId % style=width:130px;/td
+ td style=padding-top:3px;input type=text name=aanmelder_naam
tabindex=9 value=%= aanmelderNaamId % style=width:130px;/td
!-- Postcode aanmelder --
- td style=padding-top:3px;input type=text
name=aanmelder_postcode tabindex=4 value=%= aanmelderPostcodeId %
style=width:100px; MAXLENGTH=6/td
+ td style=padding-top:3px;input type=text
name=aanmelder_postcode tabindex=10 value=%= aanmelderPostcodeId %
style=width:100px; MAXLENGTH=6/td
!-- Aanmeldingsnummer --
- td colspan=4style=padding-top:3px;input type=text
name=aanmelder_nummer tabindex=5 value=%= aanmelderNummerId %
style=width:100px;/td
+ td colspan=4style=padding-top:3px;input type=text
name=aanmelder_nummer tabindex=11 value=%= aanmelderNummerId %
style=width:100px;/td
% if(soortId.equals(activiteiten))
out.print(scriptdisableExtraSearch();/script); %
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources attachmentsearch.jsp attachmentupload.jsp delete.jsp imagesearch.jsp imageupload.jsp urlsearch.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources In directory james.mmbase.org:/tmp/cvs-serv28516/resources Modified Files: attachmentsearch.jsp attachmentupload.jsp delete.jsp imagesearch.jsp imageupload.jsp urlsearch.jsp Log Message: CMSC-899,Check and improve all lists according to guideline See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources See also: http://www.mmbase.org/jira/browse/CMSC-899 Index: attachmentsearch.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- attachmentsearch.jsp17 Sep 2008 06:04:33 - 1.8 +++ attachmentsearch.jsp19 Sep 2008 02:25:02 - 1.9 @@ -1,8 +1,8 @@ -[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8% -[EMAIL PROTECTED] file=globals.jsp % -[EMAIL PROTECTED] import=java.util.Iterator, - com.finalist.cmsc.mmbase.PropertiesUtil% -mm:content type=text/html encoding=UTF-8 expires=0 +[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8 +%[EMAIL PROTECTED] file=globals.jsp +%[EMAIL PROTECTED] import=java.util.Iterator, + com.finalist.cmsc.mmbase.PropertiesUtil +%mm:content type=text/html encoding=UTF-8 expires=0 !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; html:html xhtml=true cmscedit:head title=attachments.title Index: attachmentupload.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- attachmentupload.jsp8 Jul 2008 14:41:47 - 1.9 +++ attachmentupload.jsp19 Sep 2008 02:25:02 - 1.10 @@ -1,7 +1,7 @@ -[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8% -[EMAIL PROTECTED] file=globals.jsp % -[EMAIL PROTECTED] import=com.finalist.util.http.BulkUploadUtil% -mm:content type=text/html encoding=UTF-8 expires=0 +[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8 +%[EMAIL PROTECTED] file=globals.jsp +%[EMAIL PROTECTED] import=com.finalist.util.http.BulkUploadUtil +%mm:content type=text/html encoding=UTF-8 expires=0 !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; html:html xhtml=true cmscedit:head title=attachments.upload.title @@ -136,6 +136,13 @@ /c:otherwise /c:choose img src=../gfx/icons/page_edit.png title=fmt:message key=images.upload.edit/ alt=fmt:message key=images.upload.edit///a + + a href=mm:url page=DeleteSecondaryContentAction.do + mm:param name=objectnumbermm:field name=number //mm:param + mm:param name=object_type value=attachmentsupload / + /mm:url +img src=../gfx/icons/delete.png alt=fmt:message key=attachmentsearch.icon.delete / title=fmt:message key=attachmentsearch.icon.delete ///a + a href=javascript:showInfo(mm:field name=number /) img src=../gfx/icons/info.png title=fmt:message key=images.upload.info/ alt=fmt:message key=images.upload.info///a /td Index: delete.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/delete.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- delete.jsp 5 Sep 2007 09:45:22 - 1.1 +++ delete.jsp 19 Sep 2008 02:25:02 - 1.2 @@ -1,6 +1,6 @@ -[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8% -[EMAIL PROTECTED] file=globals.jsp % -mm:content type=text/html encoding=UTF-8 expires=0 +[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8 +%[EMAIL PROTECTED] file=globals.jsp +%mm:content type=text/html encoding=UTF-8 expires=0 !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; html:html xhtml=true cmscedit:head title=Delete @@ -10,20 +10,24 @@ /cmscedit:head mm:import externid=objectnumber required=true/ +mm:import externid=object_type jspvar=object_type required=true/ mm:cloud jspvar=cloud rank=basic user loginpage=../login.jsp body - mm:node referid=objectnumber mm:nodeinfo type=type jspvar=nodeType write=false / cmscedit:sideblock
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin globals.jsp index.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin In directory james.mmbase.org:/tmp/cvs-serv28516/recyclebin Modified Files: globals.jsp index.jsp Log Message: CMSC-899,Check and improve all lists according to guideline See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin See also: http://www.mmbase.org/jira/browse/CMSC-899 Index: globals.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/globals.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- globals.jsp 21 May 2007 18:06:15 - 1.2 +++ globals.jsp 19 Sep 2008 02:25:02 - 1.3 @@ -1,2 +1,2 @@ -[EMAIL PROTECTED] file=../globals.jsp % -fmt:setBundle basename=cmsc-repository scope=request / \ No newline at end of file +[EMAIL PROTECTED] file=../globals.jsp +%fmt:setBundle basename=cmsc-repository scope=request / \ No newline at end of file Index: index.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- index.jsp 17 Sep 2008 06:04:33 - 1.12 +++ index.jsp 19 Sep 2008 02:25:02 - 1.13 @@ -1,7 +1,7 @@ -[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8% -[EMAIL PROTECTED] file=globals.jsp % -[EMAIL PROTECTED] import=com.finalist.cmsc.repository.* % -mm:content type=text/html encoding=UTF-8 expires=0 +[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8 +%[EMAIL PROTECTED] file=globals.jsp +%[EMAIL PROTECTED] import=com.finalist.cmsc.repository.* +%mm:content type=text/html encoding=UTF-8 expires=0 !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; html:html xhtml=true cmscedit:head title=recyclebin.title ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community globals.jsp preferenceadd.jsp preferencesearch.jsp
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community In directory james.mmbase.org:/tmp/cvs-serv28721 Modified Files: globals.jsp preferenceadd.jsp preferencesearch.jsp Log Message: CMSC-899,Check and improve all lists according to guideline See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community See also: http://www.mmbase.org/jira/browse/CMSC-899 Index: globals.jsp === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/globals.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- globals.jsp 8 Sep 2008 08:31:25 - 1.4 +++ globals.jsp 19 Sep 2008 02:30:12 - 1.5 @@ -1,5 +1,5 @@ [EMAIL PROTECTED] file=../globals.jsp %%@ taglib uri=http://finalist.com/cmsc; prefix=cmsc %%@ taglib prefix=edit tagdir=/WEB-INF/tags/edit -%[EMAIL PROTECTED] uri=http://java.sun.com/jsp/jstl/fmt; prefix=fmt% -fmt:setBundle basename=cmsc-community scope=request / \ No newline at end of file +%[EMAIL PROTECTED] uri=http://java.sun.com/jsp/jstl/fmt; prefix=fmt +%fmt:setBundle basename=cmsc-community scope=request / \ No newline at end of file Index: preferenceadd.jsp === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/preferenceadd.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- preferenceadd.jsp 31 Jul 2008 10:52:13 - 1.3 +++ preferenceadd.jsp 19 Sep 2008 02:30:12 - 1.4 @@ -1,9 +1,8 @@ [EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8 -%[EMAIL PROTECTED] file=globals.jsp % - -[EMAIL PROTECTED] import=java.util.Iterator, - com.finalist.cmsc.mmbase.PropertiesUtil% -mm:content type=text/html encoding=UTF-8 expires=0 +%[EMAIL PROTECTED] file=globals.jsp +%[EMAIL PROTECTED] import=java.util.Iterator, + com.finalist.cmsc.mmbase.PropertiesUtil +%mm:content type=text/html encoding=UTF-8 expires=0 !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; html:html xhtml=true cmscedit:head title=community.preference.title Index: preferencesearch.jsp === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/preferencesearch.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- preferencesearch.jsp8 Sep 2008 07:34:06 - 1.15 +++ preferencesearch.jsp19 Sep 2008 02:30:12 - 1.16 @@ -1,8 +1,8 @@ [EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8 %[EMAIL PROTECTED] file=globals.jsp %[EMAIL PROTECTED] import=java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil -%%@ taglib prefix=edit tagdir=/WEB-INF/tags/edit % -mm:content type=text/html encoding=UTF-8 expires=0 +%%@ taglib prefix=edit tagdir=/WEB-INF/tags/edit +%mm:content type=text/html encoding=UTF-8 expires=0 !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd; html:html xhtml=true cmscedit:head title=community.preference.title ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
