[MMBASE SCM] r37627 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository: resources src/java/com/finalist/cmsc/repository/forms
Author: billyxie Date: 2009-08-10 08:08:16 +0200 (Mon, 10 Aug 2009) New Revision: 37627 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java Log: CMSC-1477 - 4 Based on the FD, implement the main function in simple editor overview page: edit, preview, workfolw, sorting, pageing Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-10 04:19:12 UTC (rev 37626) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-10 06:08:16 UTC (rev 37627) @@ -520,4 +520,6 @@ simple.editor.list.date.field = date simple.editor.list.channel.field = placed in simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never have to come in contact with the inner workings of the CMSc. Thus we need locate this new functions outside the normal /editors environment. -simple.editor.send = Send this article to the webmaster for publication \ No newline at end of file +simple.editor.send = Send this article to the webmaster for publication +simple.editor.finish.success=It is successful to send this article to the webmaster for publication. +simple.editor.finish.failed=It is failed to send this article to the webmaster for publication. \ No newline at end of file Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-10 04:19:12 UTC (rev 37626) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-10 06:08:16 UTC (rev 37627) @@ -516,4 +516,6 @@ simple.editor.list.date.field = date simple.editor.list.channel.field = placed in simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never have to come in contact with the inner workings of the CMSc. Thus we need locate this new functions outside the normal /editors environment. -simple.editor.send = Stuur dit artikel naar de webmaster om gepubliceerd te worden \ No newline at end of file +simple.editor.send = Stuur dit artikel naar de webmaster om gepubliceerd te worden +simple.editor.finish.success=It is successful to send this article to the webmaster for publication. +simple.editor.finish.failed=It is failed to send this article to the webmaster for publication. \ No newline at end of file Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-10 04:19:12 UTC (rev 37626) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-10 06:08:16 UTC (rev 37627) @@ -521,4 +521,6 @@ simple.editor.list.date.field = 创建时间 simple.editor.list.channel.field = 频道 simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never
[MMBASE SCM] r37628 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: billyxie Date: 2009-08-10 08:51:33 +0200 (Mon, 10 Aug 2009) New Revision: 37628 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp Log: CMSC-1477 - 4 Based on the FD, implement the main function in simple editor overview page: edit, preview, workfolw, sorting, pageing Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp 2009-08-10 06:08:16 UTC (rev 37627) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp 2009-08-10 06:51:33 UTC (rev 37628) @@ -1,7 +1,7 @@ -%...@page language=java contentType=text/html;charset=utf-8% -%...@include file=globals.jsp % -%@ taglib prefix=edit tagdir=/WEB-INF/tags/edit % -mm:content type=text/html encoding=UTF-8 expires=0 +%...@page language=java contentType=text/html;charset=utf-8 +%%...@include file=globals.jsp +%%@ 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 Frameset//EN http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd; html:html xhtml=true cmscedit:head title=search.title ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37629 - in CMSContainer/trunk/CMSContainer/cmsc: contentrepository/src/webapp/editors/simple edit-webapp/src/java/com/finalist/cmsc/editwizard utilities/src/java/com/finalist/cmsc/struts
Author: raintang
Date: 2009-08-10 09:49:02 +0200 (Mon, 10 Aug 2009)
New Revision: 37629
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
Log:
CMSC-1479 6 Based on the FD, implement create article page
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-10 07:49:02 UTC (rev 37629)
@@ -136,6 +136,7 @@
a href=mm:url page=../WizardInitAction.do
mm:param name=objectnumbermm:field
name=number //mm:param
mm:param name=returnurl value=${returnurl} /
+ mm:param name=fromSE value=true /
/mm:url
img src=../gfx/icons/page_edit.png
alt=fmt:message key=searchform.icon.edit.title / title=fmt:message
key=searchform.icon.edit.title / //a
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-10 07:49:02 UTC (rev 37629)
@@ -78,6 +78,7 @@
a href=mm:url page=../WizardInitAction.do
mm:param name=objectnumbermm:field
name=number //mm:param
mm:param name=returnurl value=${returnurl} /
+ mm:param name=fromSE value=true /
/mm:url
img src=../gfx/icons/page_edit.png
alt=fmt:message key=searchform.icon.edit.title / title=fmt:message
key=searchform.icon.edit.title / //a
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 07:49:02 UTC (rev 37629)
@@ -70,6 +70,10 @@
Workflow.isWorkflowType(elementtype)) {
params.put(WORKFLOW, TRUE);
+ if (TRUE.equalsIgnoreCase((String)
request.getSession().getAttribute(fromSE))) {
+params.put(WORKFLOW, FALSE);
+request.getSession().removeAttribute(fromSE);
+ }
params.put(WORKFLOW-ACCEPTED-ENABLED,
Boolean.toString(Workflow.isAcceptedStepEnabled()));
String activity = DRAFT;
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
2009-08-10 06:51:33 UTC (rev 37628)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java
2009-08-10 07:49:02 UTC (rev 37629)
@@ -140,6 +140,7 @@
log.debug(actionForward: + actionForward);
actionForward += debug=true;
}
+ request.getSession().setAttribute(fromSE,
request.getParameter(fromSE));
ActionForward ret = new ActionForward(actionForward);
ret.setRedirect(true);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37630 - speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice
Author: michiel
Date: 2009-08-10 10:04:59 +0200 (Mon, 10 Aug 2009)
New Revision: 37630
Modified:
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/WebServiceServlet.java
Log:
added a small new feature, a 'default webservice' which can be presented if no
explicit ws is specified on the URL (e.g. return a list of available
webservices)
Modified:
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/WebServiceServlet.java
===
---
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/WebServiceServlet.java
2009-08-10 07:49:02 UTC (rev 37629)
+++
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/WebServiceServlet.java
2009-08-10 08:04:59 UTC (rev 37630)
@@ -40,6 +40,8 @@
protected String authenticate = name/password;
+protected String defaultService = list.xml;
+
@Override
protected MapString, Integer getAssociations() {
MapString, Integer a = super.getAssociations();
@@ -47,6 +49,16 @@
return a;
}
+
+@Override
+public void init() throws ServletException {
+super.init();
+String df = getInitParameter(defaultService);
+if (df != null df.length() 0) {
+defaultService = df;
+}
+}
+
private Cloud anonymous;
protected Cloud getAnonymousCloud() {
@@ -117,12 +129,19 @@
protected void doWebService(final HttpServletRequest req, final
HttpServletResponse res, final WebService.Type defaultType) throws
ServletException, IOException {
-String[] path = req.getPathInfo().split(/);
+WebService.Type type;
+String file;
+{
+String[] path = req.getPathInfo().split(/);
+if (path.length 1) {
+type = path.length 2 ? WebService.Type.valueOf(path[1]) :
defaultType;
+file = path.length 2 ? path[2] : path[1];
+} else {
+type = WebService.Type.GET;
+file = defaultService;
+}
+}
-WebService.Type type = path.length 2 ?
WebService.Type.valueOf(path[1]) : defaultType;
-
-String file = path.length 2 ? path[2] : path[1];
-
String wantedMimeType = getServletContext().getMimeType(file);
if (wantedMimeType == null) {
res.sendError(HttpServletResponse.SC_NOT_FOUND, No mimetype found
for ' + file + ');
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37631 - in CMSContainer/trunk: CMSContainer/cmsc/basicmodel/config/applications CMSContainer/cmsc/contentrepository/config/applications CMSContainer/cmsc/portlets/config/applications CMS
Author: billyxie Date: 2009-08-10 10:12:11 +0200 (Mon, 10 Aug 2009) New Revision: 37631 Modified: CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer/cmsc/contentrepository/config/applications/contentrepository.xml CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/contentrepository.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/contentrepository.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Modules/alias/config/applications/alias.xml CMSContainer/trunk/CMSContainer_Modules/directreaction/config/applications/reaction.xml CMSContainer/trunk/CMSContainer_Modules/fileupload/config/applications/fileupload.xml CMSContainer/trunk/CMSContainer_Modules/glossary/config/applications/glossary.xml CMSContainer/trunk/CMSContainer_Modules/linkvalidator/config/applications/linkvalidator.xml CMSContainer/trunk/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml CMSContainer/trunk/CMSContainer_Modules/rating/config/applications/rating.xml CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml CMSContainer/trunk/CMSContainer_Modules/subsite/config/applications/subsite.xml CMSContainer/trunk/CMSContainer_Modules/tasks/config/applications/tasks.xml CMSContainer/trunk/CMSContainer_Modules/versioning/config/applications/versioning.xml CMSContainer/trunk/CMSContainer_Modules/workflow/config/applications/workflow.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-banner/config/applications/banner.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-calendar/config/applications/calendar.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-ecard/config/applications/ecard.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-emailalert/config/applications/emailalert.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-gallery/config/applications/gallery.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-gallery2/config/applications/gallery2.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/config/applications/guestbook.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-maileditors/config/applications/reactform.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-mailfriend/config/applications/mailfriend.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-playlist/config/applications/playlist.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-poll/config/applications/poll.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/config/applications/tagcloud.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-teaser/config/applications/teasers.xml Log: CMSC-1474 - 1Based on the FD, implement adding simpled channel in the group management page Modified: CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml === --- CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2009-08-10 08:04:59 UTC (rev 37630) +++ CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2009-08-10 08:12:11 UTC (rev 37631) @@ -3,7 +3,7 @@
[MMBASE SCM] r37633 - mmbase/trunk/core/src/main/config/storage/databases
Author: andre Date: 2009-08-10 10:35:41 +0200 (Mon, 10 Aug 2009) New Revision: 37633 Modified: mmbase/trunk/core/src/main/config/storage/databases/hsqldb_csv.xml Log: show seems to be a disallowed field Modified: mmbase/trunk/core/src/main/config/storage/databases/hsqldb_csv.xml === --- mmbase/trunk/core/src/main/config/storage/databases/hsqldb_csv.xml 2009-08-10 08:14:39 UTC (rev 37632) +++ mmbase/trunk/core/src/main/config/storage/databases/hsqldb_csv.xml 2009-08-10 08:35:41 UTC (rev 37633) @@ -58,7 +58,8 @@ !-- HSQLdb disallowed fields are retrieved from the database -- disallowed-fields -disallowed-field name=number replacement=m_number/ +disallowed-field name=number replacement=m_number / +disallowed-field name=show replacement=m_show / /disallowed-fields /storage ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37634 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: kevinshen
Date: 2009-08-10 10:41:29 +0200 (Mon, 10 Aug 2009)
New Revision: 37634
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
Log:
CMSC-1476 3 Based on the FD, implement simple editor overview page including:
head/body/foot page, the main page frame and css
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-10 08:35:41 UTC (rev 37633)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-10 08:41:29 UTC (rev 37634)
@@ -5,9 +5,6 @@
c:set var=typesNumber value=${fn:length(typesList)} /
c:set var=channelsNumber value=${fn:length(channelsList)} /
div class=editor
- div style=margin-left:10px;color:greenh1fmt:message
key=simple.editor.title //h1/div
-
-div style=margin-left:10px;font-size:12pxfmt:message
key=simple.editor.introduction.text //div
div class=body
html:form action=/editors/simple/SimpleContentReadyAction
method=post
html:hidden property=offset/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37635 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources
Author: raintang Date: 2009-08-10 10:47:10 +0200 (Mon, 10 Aug 2009) New Revision: 37635 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties Log: CMSC-1479 6 Based on the FD, implement create article page Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-10 08:41:29 UTC (rev 37634) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-10 08:47:10 UTC (rev 37635) @@ -516,7 +516,7 @@ simple.editor.search = search simple.editor.notype.error = There's no type of any content you can deal with, please contact the webmaster. simple.editor.place.in = Placed in -simple.editor.nochannel.error = Your a not member of a group, please contact the webmaster to add you to a group. +simple.editor.nochannel.error = Your a not member of a group, or groups you belong to is not related with any channel, please contact your webmaster. simple.editor.list.date.field = date simple.editor.list.channel.field = placed in simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never have to come in contact with the inner workings of the CMSc. Thus we need locate this new functions outside the normal /editors environment. Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-10 08:41:29 UTC (rev 37634) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-10 08:47:10 UTC (rev 37635) @@ -510,9 +510,9 @@ simple.editor.draft = Klad simple.editor.ready = Klaar simple.editor.search = zoeken -simple.editor.notype.error = There's no type of any content you can deal with, please contact the webmaster. +simple.editor.notype.error = Er is geen type van de inhoud die u kunnen behandelen, kunt u contact opnemen met de webmaster. simple.editor.place.in = Placed in -simple.editor.nochannel.error = U bent geen lid van een groep, neem alstublieft contact op met de webmaster om u aan een groep toe te voegen. +simple.editor.nochannel.error = Uw een niet lid van een groep of groepen u behoort niet verbonden is met een zender, kunt u contact opnemen met uw webmaster. simple.editor.list.date.field = date simple.editor.list.channel.field = placed in simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never have to come in contact with the inner workings of the CMSc. Thus we need locate this new functions outside the normal /editors environment. Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-10 08:41:29 UTC (rev 37634) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-10 08:47:10 UTC (rev 37635) @@ -517,7 +517,7 @@ simple.editor.search = 搜索 simple.editor.notype.error = 没有您能操作内容的类型，请与管理员联系. simple.editor.place.in = 保存在 -simple.editor.nochannel.error = 你不属于任何组，请和管理员联系，要求添加到指定组. +simple.editor.nochannel.error = 您不属于任何组，或者您所属的组没有关联任何频道，请与管理员联系. simple.editor.list.date.field = 创建时间 simple.editor.list.channel.field = 频道 simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about
[MMBASE SCM] r37636 - openimages/trunk/src/main/webapp
Author: andre Date: 2009-08-10 11:47:22 +0200 (Mon, 10 Aug 2009) New Revision: 37636 Modified: openimages/trunk/src/main/webapp/index.jspx Log: some titles still wrap to 4 lines Modified: openimages/trunk/src/main/webapp/index.jspx === --- openimages/trunk/src/main/webapp/index.jspx 2009-08-10 08:47:10 UTC (rev 37635) +++ openimages/trunk/src/main/webapp/index.jspx 2009-08-10 09:47:22 UTC (rev 37636) @@ -20,7 +20,7 @@ mm:escaper id=wrapper type=substring mm:param name=from value=0 / -mm:param name=to value=36 / +mm:param name=to value=32 / mm:param name=ellipsis value=... / /mm:escaper ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37637 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: billyxie
Date: 2009-08-10 12:03:34 +0200 (Mon, 10 Aug 2009)
New Revision: 37637
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-10 09:47:22 UTC (rev 37636)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-10 10:03:34 UTC (rev 37637)
@@ -11,6 +11,9 @@
c:if test=${not empty param.message}
addLoadEvent(alert('${param.message}'));
/c:if
+ c:if test=${not empty param.workflowmessage}
+ addLoadEvent(alert('${param.workflowmessage}'));
+ /c:if
function selectChannel(channel, returnpath){
var newDirection=document.forms[0].direction.value;
var type=document.forms[0].order.value;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37638 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: kevinshen
Date: 2009-08-10 12:04:59 +0200 (Mon, 10 Aug 2009)
New Revision: 37638
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
Log:
CMSC-1476 3 Based on the FD, implement simple editor overview page including:
head/body/foot page, the main page frame and css
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-10 10:03:34 UTC (rev 37637)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-10 10:04:59 UTC (rev 37638)
@@ -118,10 +118,10 @@
c:set
var=itemStatus value=onlive/
/mm:listnodes
/c:if
-c:if test=${status
!= 'onlive'}
- c:set var=status
value=waiting/
+c:if
test=${itemStatus != 'onlive'}
+ c:set
var=itemStatus value=waiting/
/c:if
-img
src=../gfx/icons/status_${status}.png alt=fmt:message key=content.status
/: fmt:message key=content.status.${status} / title=fmt:message
key=content.status /: fmt:message key=content.status.${status} / /
+img
src=../gfx/icons/status_${itemStatus}.png alt=fmt:message
key=content.status /: fmt:message key=content.status.${itemStatus} /
title=fmt:message key=content.status /: fmt:message
key=content.status.${itemStatus} / /
/td
/tr
/mm:node
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37639 - in CMSContainer/trunk/CMSContainer/cmsc: contentrepository/src/java/com/finalist/cmsc/repository edit-webapp/src/java/com/finalist/cmsc/editwizard utilities/src/java/com/finalist
Author: raintang
Date: 2009-08-10 12:12:33 +0200 (Mon, 10 Aug 2009)
New Revision: 37639
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
Log:
CMSC-1479 6 Based on the FD, implement create article page
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
2009-08-10 10:04:59 UTC (rev 37638)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/SimpleContentUtil.java
2009-08-10 10:12:33 UTC (rev 37639)
@@ -22,6 +22,7 @@
import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.security.SecurityUtil;
+import com.finalist.cmsc.security.UserRole;
public class SimpleContentUtil {
@@ -219,7 +220,8 @@
for (int i = 0; i groups.size() ; i++) {
Node group = groups.getNode(i);
NodeList relatedChannels = group.getRelatedNodes(CONTENTCHANNEL,
MMBASEGROUPREL, SearchUtil.DESTINATION);
- if (relatedChannels.size() 0
!channels.contains(relatedChannels.getNode(0))) {
+ UserRole role = RepositoryUtil.getRole(cloud,
relatedChannels.getNode(0), false);
+ if (relatedChannels.size() 0
!channels.contains(relatedChannels.getNode(0)) role != null
SecurityUtil.isWriter(role)) {
channels.add(relatedChannels.getNode(0));
}
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 10:04:59 UTC (rev 37638)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardWorkflowController.java
2009-08-10 10:12:33 UTC (rev 37639)
@@ -72,7 +72,6 @@
params.put(WORKFLOW, TRUE);
if (TRUE.equalsIgnoreCase((String)
request.getSession().getAttribute(fromSE))) {
params.put(WORKFLOW, FALSE);
-request.getSession().removeAttribute(fromSE);
}
params.put(WORKFLOW-ACCEPTED-ENABLED,
Boolean.toString(Workflow.isAcceptedStepEnabled()));
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
2009-08-10 10:04:59 UTC (rev 37638)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java
2009-08-10 10:12:33 UTC (rev 37639)
@@ -23,6 +23,7 @@
session.removeAttribute(contenttype);
session.removeAttribute(creation);
+ request.getSession().removeAttribute(fromSE);
String returnurl = request.getParameter(returnurl);
if (StringUtils.isEmpty(returnurl)) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37640 - openimages/trunk/src/main/webapp/WEB-INF/tags/oip
Author: andre
Date: 2009-08-10 13:15:51 +0200 (Mon, 10 Aug 2009)
New Revision: 37640
Modified:
openimages/trunk/src/main/webapp/WEB-INF/tags/oip/thumb.tagx
Log:
do image thumbs more or less like the thumbs uploaded for audio and video,
except crop elsewhere to make them like preview.
Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/thumb.tagx
===
--- openimages/trunk/src/main/webapp/WEB-INF/tags/oip/thumb.tagx
2009-08-10 10:12:33 UTC (rev 37639)
+++ openimages/trunk/src/main/webapp/WEB-INF/tags/oip/thumb.tagx
2009-08-10 11:15:51 UTC (rev 37640)
@@ -40,10 +40,10 @@
/c:when
c:when test=${nodetype eq 'imagefragments'}
mm:relatednodes type=imagesources max=1
-mm:import id=found /
-mm:image
template=s(81x60gt;)+modulate(150,150)+colorspace(Gray) mode=img /
+mm:image mode=url width=81 height=60 crop=end id=img
write=false /
+img src=${img} alt=${alt} width=81 height=60 /
/mm:relatednodes
- mm:notpresent referid=found
+ mm:notpresent referid=img
img src=${mm:link('/style/images/thumb_image.png')}
alt=${empty alt ? 'image' : alt} width=81 height=60 /
/mm:notpresent
/c:when
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37641 - openimages/trunk/src/main/webapp/WEB-INF/config/media
Author: andre Date: 2009-08-10 13:17:31 +0200 (Mon, 10 Aug 2009) New Revision: 37641 Modified: openimages/trunk/src/main/webapp/WEB-INF/config/media/urlcomposers.xml Log: OIP-62 just a thumbnail and a preview needed Modified: openimages/trunk/src/main/webapp/WEB-INF/config/media/urlcomposers.xml === --- openimages/trunk/src/main/webapp/WEB-INF/config/media/urlcomposers.xml 2009-08-10 11:15:51 UTC (rev 37640) +++ openimages/trunk/src/main/webapp/WEB-INF/config/media/urlcomposers.xml 2009-08-10 11:17:31 UTC (rev 37641) @@ -7,21 +7,23 @@ urlcomposer mimetype=image/* format=* protocol=http class=org.mmbase.streams.urlcomposers.ImagesURLComposer -param name=templates(100)/param +param name=templates(81)+part(0,0,81,60)/param param name=descriptionthumbnail/param /urlcomposer +!-- urlcomposer mimetype=image/* format=* protocol=http class=org.mmbase.streams.urlcomposers.ImagesURLComposer param name=templatecolorspace(Gray)/param param name=descriptionblack/white/param /urlcomposer + -- urlcomposer mimetype=image/* format=* protocol=http class=org.mmbase.streams.urlcomposers.ImagesURLComposer -param name=templates(320x240)/param +param name=templates(320)+part(0,0,320,240)/param param name=descriptionpreview/param /urlcomposer ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37642 - mmbase/trunk/core/src/main/java/org/mmbase/datatypes
Author: michiel
Date: 2009-08-10 15:31:38 +0200 (Mon, 10 Aug 2009)
New Revision: 37642
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
Log:
some effort to get enumerations correctly in the 'toXml'
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
2009-08-10 11:17:31 UTC (rev 37641)
+++ mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
2009-08-10 13:31:38 UTC (rev 37642)
@@ -751,8 +751,19 @@
addRestriction(parent, unique,
name,description,class,property,default,unique, uniqueRestriction);
addRestriction(parent, required,
name.description,class,property,default,unique,required, requiredRestriction);
-getElement(parent, enumeration,
name,description,class,property,default,unique,required,enumeration);
-/// set this here...
+{
+Element factoryXml = getEnumerationFactory().toXml();
+if (factoryXml != null) {
+Element enumElement = getElement(parent, enumeration,
name,description,class,property,default,unique,required,enumeration);
+if (enumElement.getChildNodes().getLength() == 0) {
+Element imported = (Element)
enumElement.getOwnerDocument().importNode(factoryXml, true);
+org.w3c.dom.NodeList childs = imported.getChildNodes();
+for (int i = 0; i childs.getLength(); i++) {
+enumElement.appendChild(childs.item(i));
+}
+}
+}
+}
/**
End up in the wrong place, and not needed for javascript, so
commented out for the moment.
@@ -1427,16 +1438,23 @@
@Override
protected String valueString(Node node, Field field) {
CollectionMap.EntryC, String col = getEnumeration(null, null,
node, field);
-if(col.size() == 0) return ;
+if (col.size() == 0) {
+return ;
+}
StringBuilder buf = new StringBuilder();
IteratorMap.EntryC, String it = col.iterator();
int i = 0;
-while (it.hasNext() ++i 10) {
+while (it.hasNext() i 10) {
+i++;
Map.EntryC, String ent = it.next();
buf.append(Casting.toString(ent));
-if (it.hasNext()) buf.append(, );
+if (it.hasNext()) {
+buf.append(, );
+}
}
-if (i col.size()) buf.append(.( + (col.size() - i) + more
..);
+if (i col.size()) {
+buf.append(.( + col.size() + + (col.size() - i) + more
..);
+}
return buf.toString();
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37643 - mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml
Author: michiel
Date: 2009-08-10 15:32:16 +0200 (Mon, 10 Aug 2009)
New Revision: 37643
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeReader.java
Log:
don't whine if collector == null, you probably don't want to collect then
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeReader.java
===
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeReader.java
2009-08-10 13:31:38 UTC (rev 37642)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeReader.java
2009-08-10 13:32:16 UTC (rev 37643)
@@ -95,9 +95,14 @@
/**
* Reads a datatype.
+ * @param typeElement The xml Element defining the datatype.
+ * @param baseDataType Datatype on which this must be based
+ * @param collector
*/
public static DataTypeDefinition readDataType(Element typeElement,
BasicDataType baseDataType, DataTypeCollector collector) throws
DependencyException {
-DataTypeDefinition definition = collector.getDataTypeDefinition();
+DataTypeDefinition definition = collector == null ?
+(new DataTypeCollector(typeElement)).getDataTypeDefinition() :
+collector.getDataTypeDefinition();
definition.configure(typeElement, baseDataType);
definition.dataType.setXml(typeElement);
return definition;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37644 - mmbase/trunk/core/src/main/java/org/mmbase/util/functions
Author: michiel
Date: 2009-08-10 15:36:09 +0200 (Mon, 10 Aug 2009)
New Revision: 37644
Added:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/Type.java
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/FunctionFactory.java
Log:
support for a @Type annotation by which the datatype of a parameter can be
completely defined
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
2009-08-10 13:32:16 UTC (rev 37643)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
2009-08-10 13:36:09 UTC (rev 37644)
@@ -10,7 +10,10 @@
package org.mmbase.util.functions;
import org.mmbase.cache.Cache;
-
+import org.mmbase.util.xml.DocumentReader;
+import org.mmbase.datatypes.util.xml.*;
+import org.xml.sax.InputSource;
+import java.util.regex.*;
import java.lang.reflect.*;
import java.util.*;
import org.mmbase.util.logging.*;
@@ -93,7 +96,7 @@
* codeclaz/code. Defaults to a producer that simply calls {...@link
Class#newInstance()}.
* @since MMBase-1.8.5
*/
-public static BeanFunction getFunction(final Class claz, String name,
Producer producer) throws IllegalAccessException, InstantiationException,
InvocationTargetException {
+public static BeanFunction getFunction(final Class claz, String name,
Producer producer) throws IllegalAccessException, InstantiationException,
InvocationTargetException, DependencyException {
String key = claz.getName() + '.' + name + '.' + producer;
BeanFunction result = beanFunctionCache.get(key);
if (result == null) {
@@ -106,7 +109,7 @@
* This defaulting version of {...@link #getFunction(Class, String,
Producer)} uses a producer that uses {...@link Class#newInstance()}.
* Called from {...@link FunctionFactory}
*/
-public static BeanFunction getFunction(final Class claz, String name)
throws IllegalAccessException, InstantiationException,
InvocationTargetException {
+public static BeanFunction getFunction(final Class claz, String name)
throws IllegalAccessException, InstantiationException,
InvocationTargetException, DependencyException {
return getFunction(claz, name, new Producer() {
public Object getInstance() {
try {
@@ -152,7 +155,7 @@
/**
* @since MMBase-1.9.2
*/
-public static Parameter?[] getParameterDefinition(Object sampleInstance,
ListMethod setMethods) throws IllegalAccessException,
InvocationTargetException {
+public static Parameter?[] getParameterDefinition(Object sampleInstance,
ListMethod setMethods) throws IllegalAccessException,
InvocationTargetException, DependencyException {
Class claz = sampleInstance.getClass();
ListParameter parameters = new ArrayListParameter();
Method nodeParameter = null;
@@ -161,18 +164,32 @@
Class[] parameterTypes = m.getParameterTypes();
if (parameterTypes.length == 1 methodName.startsWith(set)) {
String parameterName = methodName.substring(3);
-boolean required = false;
-Required requiredAnnotation = m.getAnnotation(Required.class);
-required = requiredAnnotation != null;
+final org.mmbase.datatypes.DataType dataType;
+Type annotatedDataType = m.getAnnotation(Type.class);
+if (annotatedDataType != null) {
+dataType = getDataType(annotatedDataType.value(),
org.mmbase.datatypes.DataTypes.createDataType(parameterName,
parameterTypes[0]));
+} else {
+dataType =
org.mmbase.datatypes.DataTypes.createDataType(parameterName, parameterTypes[0]);
+}
+{
+boolean required = false;
+Required requiredAnnotation =
m.getAnnotation(Required.class);
+if (requiredAnnotation != null) {
+dataType.setRequired(true);
+}
+}
+
// find a corresponding getter method, which can be used for a
default value;
-Object defaultValue;
try {
+Object defaultValue;
Method getter = claz.getMethod(get + parameterName);
defaultValue = getter.invoke(sampleInstance);
+dataType.setDefaultValue(defaultValue);
} catch (NoSuchMethodException nsme) {
-defaultValue = null;
+//defaultValue = null;
}
+
if (Character.isUpperCase(parameterName.charAt(0))) {
if (parameterName.length() 1) {
[MMBASE SCM] r37645 - openimages/trunk/src/main/webapp/html
Author: andre
Date: 2009-08-10 15:55:00 +0200 (Mon, 10 Aug 2009)
New Revision: 37645
Modified:
openimages/trunk/src/main/webapp/html/video-test.html
Log:
added a line when a browser knows nothing about the video-tag (like IE8)
Modified: openimages/trunk/src/main/webapp/html/video-test.html
===
--- openimages/trunk/src/main/webapp/html/video-test.html 2009-08-10
13:36:09 UTC (rev 37644)
+++ openimages/trunk/src/main/webapp/html/video-test.html 2009-08-10
13:55:00 UTC (rev 37645)
@@ -38,6 +38,8 @@
}
+} else {
+document.write(This browser does not recognize the video tag.);
}
/script
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37647 - speeltuin/mihxil/webservice/example-webapp/src/main/config
Author: michiel Date: 2009-08-10 16:31:41 +0200 (Mon, 10 Aug 2009) New Revision: 37647 Added: speeltuin/mihxil/webservice/example-webapp/src/main/config/webservices.xml Log: example webservices moved to example webapp Added: speeltuin/mihxil/webservice/example-webapp/src/main/config/webservices.xml === --- speeltuin/mihxil/webservice/example-webapp/src/main/config/webservices.xml (rev 0) +++ speeltuin/mihxil/webservice/example-webapp/src/main/config/webservices.xml 2009-08-10 14:31:41 UTC (rev 37647) @@ -0,0 +1,25 @@ +webservices +xmlns=http://www.mmbase.org/xmlns/webservices; +xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; +xsi:schemaLocation=http://www.mmbase.org/xmlns/webservices +http://www.mmbase.org/xmlns/webservices.xsd; + + webservice type=GET + name=password class=org.mmbase.webservice.ComponentWebService +param name=componentwebservices/param +param name=blockpassword/param + /webservice + + webservice type=GET + name=password2 class=org.mmbase.webservice.FunctionWebService +param name=setutils/param +param name=namegeneratePassword/param + /webservice + + webservice type=GET + action=core:generic_basic_user + name=testaction class=org.mmbase.webservice.FunctionWebService +param name=setutils/param +param name=namegeneratePassword/param + /webservice +/webservices ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37648 - speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice
Author: michiel
Date: 2009-08-10 16:40:57 +0200 (Mon, 10 Aug 2009)
New Revision: 37648
Modified:
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/ComponentWebService.java
Log:
Modified:
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/ComponentWebService.java
===
---
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/ComponentWebService.java
2009-08-10 14:31:41 UTC (rev 37647)
+++
speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/ComponentWebService.java
2009-08-10 14:40:57 UTC (rev 37648)
@@ -130,9 +130,11 @@
public void startDocument() {
// hmm
}
+/*
public void startPrefixMapping(java.lang.String prefix,
java.lang.String uri) {
log.debug( + prefix + : + uri, new Exception());
}
+*/
});
@@ -185,12 +187,15 @@
// I first did 'job' in the executor, but that gives horrible problems
in Jetty with JspRenderers.
log.trace(Rendering);
-job.render(w, params);
-w.close();
-log.trace(Rendering ready);
-synchronized(transform) { // make sure we have the lock
-while (! state.ready) {
-transform.wait();
+try {
+job.render(w, params);
+log.trace(Rendering ready);
+} finally {
+w.close();
+synchronized(transform) { // make sure we have the lock
+while (! state.ready) {
+transform.wait();
+}
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37649 - mmbase/trunk/core/src/main/java/org/mmbase/util/functions
Author: michiel
Date: 2009-08-10 18:21:19 +0200 (Mon, 10 Aug 2009)
New Revision: 37649
Added:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/FunctionParameters.java
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/Name.java
Log:
made @Name annotation useable on bean setters too, added 'FunctionParameters'
annotation to limit the setters useable as function parameters
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
2009-08-10 14:40:57 UTC (rev 37648)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/functions/BeanFunction.java
2009-08-10 16:21:19 UTC (rev 37649)
@@ -156,7 +156,22 @@
* @since MMBase-1.9.2
*/
public static Parameter?[] getParameterDefinition(Object sampleInstance,
ListMethod setMethods) throws IllegalAccessException,
InvocationTargetException, DependencyException {
-Class claz = sampleInstance.getClass();
+Class? claz = sampleInstance.getClass();
+
+boolean mustBeAnnotated = false;
+ListString setters;
+{
+FunctionParameters fp =
claz.getAnnotation(FunctionParameters.class);
+if (fp != null) {
+mustBeAnnotated = fp.annotated();
+setters = Arrays.asList(fp.value());
+if (setters.size() == 1 setters.get(0).length() == 0) {
+setters = null;
+}
+} else {
+setters = null;
+}
+}
ListParameter parameters = new ArrayListParameter();
Method nodeParameter = null;
for (Method m : claz.getMethods()) {
@@ -164,12 +179,14 @@
Class[] parameterTypes = m.getParameterTypes();
if (parameterTypes.length == 1 methodName.startsWith(set)) {
String parameterName = methodName.substring(3);
+if (setters != null ! setters.contains(parameterName))
continue;
final org.mmbase.datatypes.DataType dataType;
Type annotatedDataType = m.getAnnotation(Type.class);
if (annotatedDataType != null) {
dataType = getDataType(annotatedDataType.value(),
org.mmbase.datatypes.DataTypes.createDataType(parameterName,
parameterTypes[0]));
} else {
+if (mustBeAnnotated) continue;
dataType =
org.mmbase.datatypes.DataTypes.createDataType(parameterName, parameterTypes[0]);
}
{
@@ -202,6 +219,9 @@
if (parameterName.equals(node)
org.mmbase.bridge.Node.class.isAssignableFrom(parameterTypes[0])) {
nodeParameter = m;
} else {
+if (m.getAnnotation(Name.class) != null) {
+parameterName = m.getAnnotation(Name.class).value();
+}
parameters.add(new ParameterObject(parameterName,
dataType));
if (setMethods != null) {
setMethods.add(m);
@@ -266,13 +286,18 @@
* @since MMBase-1.9.2
*/
public static org.mmbase.datatypes.DataType getDataType(String value,
org.mmbase.datatypes.BasicDataType base) throws
org.mmbase.datatypes.util.xml.DependencyException {
+org.mmbase.datatypes.DataType dt;
if (NCName.matcher(value).matches()) {
-return org.mmbase.datatypes.DataTypes.getDataType(value);
+ dt = org.mmbase.datatypes.DataTypes.getDataType(value);
} else {
DocumentReader reader = new DocumentReader(new InputSource(new
java.io.StringReader(value)), true,
org.mmbase.datatypes.util.xml.DataTypeReader.class);
-return
org.mmbase.datatypes.util.xml.DataTypeReader.readDataType(reader.getDocument().getDocumentElement(),
base, null).dataType;
-
+dt =
org.mmbase.datatypes.util.xml.DataTypeReader.readDataType(reader.getDocument().getDocumentElement(),
base, null).dataType;
}
+if (dt == null) {
+log.warn(Could not parse ' + value + taking + base, new
Exception());
+dt = base;
+}
+return dt;
}
Added:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/FunctionParameters.java
===
---
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/FunctionParameters.java
(rev 0)
+++
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/FunctionParameters.java
2009-08-10 16:21:19 UTC (rev 37649)
@@ -0,0 +1,37 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The
[MMBASE SCM] r37650 - mmbase/trunk/core/src/main/java/org/mmbase/util/functions
Author: michiel
Date: 2009-08-10 18:52:58 +0200 (Mon, 10 Aug 2009)
New Revision: 37650
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/Parameters.java
Log:
typo only
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/functions/Parameters.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/util/functions/Parameters.java
2009-08-10 16:21:19 UTC (rev 37649)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/functions/Parameters.java
2009-08-10 16:52:58 UTC (rev 37650)
@@ -576,7 +576,7 @@
/**
* Gets the value of a parameter, cast to a String.
* @param parameter the parameter to get
- * @return value the parameter value as a codeSTring/code
+ * @return value the parameter value as a codeString/code
*/
public String getString(Parameter? parameter) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37651 - mmbase/trunk/core/src/main/java/org/mmbase/util/transformers
Author: michiel
Date: 2009-08-10 19:21:51 +0200 (Mon, 10 Aug 2009)
New Revision: 37651
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/transformers/BeanTransformerFactory.java
Log:
didn' compile. extra exception
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/util/transformers/BeanTransformerFactory.java
===
---
mmbase/trunk/core/src/main/java/org/mmbase/util/transformers/BeanTransformerFactory.java
2009-08-10 16:52:58 UTC (rev 37650)
+++
mmbase/trunk/core/src/main/java/org/mmbase/util/transformers/BeanTransformerFactory.java
2009-08-10 17:21:51 UTC (rev 37651)
@@ -29,7 +29,8 @@
private final Parameter?[] definition;
private final ListMethod setMethods = new ArrayListMethod();
-public BeanTransformerFactory(ClassT clazz) throws
IllegalAccessException, InstantiationException,
java.lang.reflect.InvocationTargetException {
+public BeanTransformerFactory(ClassT clazz) throws
IllegalAccessException, InstantiationException,
java.lang.reflect.InvocationTargetException,
+org.mmbase.datatypes.util.xml.DependencyException {
implementation = clazz;
definition =
BeanFunction.getParameterDefinition(implementation.newInstance(), setMethods);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37652 - speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/resources
Author: michiel Date: 2009-08-10 19:25:18 +0200 (Mon, 10 Aug 2009) New Revision: 37652 Modified: speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/resources/webservices.xsd Log: Modified: speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/resources/webservices.xsd === --- speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/resources/webservices.xsd 2009-08-10 17:21:51 UTC (rev 37651) +++ speeltuin/mihxil/webservice/mmbase/src/main/java/org/mmbase/webservice/resources/webservices.xsd 2009-08-10 17:25:18 UTC (rev 37652) @@ -35,7 +35,7 @@ xsd:element ref='param' minOccurs='0' maxOccurs='unbounded'/ /xsd:sequence xsd:attribute name='type' type='xsd:string' use='optional'/ - xsd:attribute name='name' type='xsd:ncnname' use=required / + xsd:attribute name='name' type='xsd:NCName' use=required / xsd:attribute name='class' type='xsd:string' use=required / /xsd:complexType /xsd:element ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37653 - mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/filters
Author: michiel
Date: 2009-08-10 20:24:58 +0200 (Mon, 10 Aug 2009)
New Revision: 37653
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/filters/ServerDimensionSorter.java
Log:
avoid NPE
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/filters/ServerDimensionSorter.java
===
---
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/filters/ServerDimensionSorter.java
2009-08-10 17:25:18 UTC (rev 37652)
+++
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/filters/ServerDimensionSorter.java
2009-08-10 18:24:58 UTC (rev 37653)
@@ -55,12 +55,12 @@
protected int getPreference(URLComposer ri) {
Dimension dimension = ri.getDimension();
-
+if (dimension == null) dimension = Dimension.UNDETERMINED;
int index;
for (index = 0; index = preferredDimensions.size(); index++) {
if (index preferredDimensions.size()) {
Dimension dim = preferredDimensions.get(index);
-
+if (dim == null) dim = Dimension.UNDETERMINED;
if ((dim.getHeight() == -1 || dimension.getHeight() ==
dim.getHeight())
(dim.getWidth() == -1 || dimension.getWidth() ==
dim.getWidth())) {
log.debug(Comparing + dim + with + dimension + -
matched);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37654 - openimages/trunk/src/main/webapp/WEB-INF/config/streams
Author: andre Date: 2009-08-10 20:28:49 +0200 (Mon, 10 Aug 2009) New Revision: 37654 Modified: openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml Log: first to mpeg2 then to other formats Modified: openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml === --- openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml 2009-08-10 18:24:58 UTC (rev 37653) +++ openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml 2009-08-10 18:28:49 UTC (rev 37654) @@ -29,7 +29,22 @@ loganalyzer name=org.mmbase.streams.transcoders.FFMpegAnalyzer / /recognizer + !-- % ffmpeg -i video.mpg -f mpeg -vcodec mpeg2video -r 25 b 1024k -acodec libmp3lame -ab 128k -ac 2 video.flv -- transcoder mimetype=video/* id=v1 +class name=org.mmbase.streams.transcoders.FFMpegTranscoder + param name=formatmpeg/param + param name=vcodecmpeg2video/param + param name=bitrate1024k/param + param name=r25/param + param name=acodeclibmp3lame/param + param name=abitrate128k/param + param name=audioChannels2/param + param name=async1/param +/class +loganalyzer name=org.mmbase.streams.transcoders.FFMpegAnalyzer / + /transcoder + + transcoder mimetype=video/* in=v1 id=v2 class name=org.mmbase.streams.transcoders.FFMpeg2TheoraTranscoder param name=videoQuality5/param param name=width320/param @@ -38,14 +53,14 @@ loganalyzer name=org.mmbase.streams.transcoders.FFMpeg2TheoraAnalyzer / /transcoder - transcoder mimetype=video/* id=v2 + transcoder mimetype=video/* in=v1 id=v3 class name=org.mmbase.streams.transcoders.FFMpeg2TheoraTranscoder param name=videoQuality8/param /class loganalyzer name=org.mmbase.streams.transcoders.FFMpeg2TheoraAnalyzer / /transcoder - transcoder mimetype=video/* id=v3 + transcoder mimetype=video/* in=v1 id=v4 class name=org.mmbase.streams.transcoders.FFMpegTranscoder param name=formatmp4/param param name=vcodeclibx264/param ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37655 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders
Author: michiel
Date: 2009-08-10 20:46:58 +0200 (Mon, 10 Aug 2009)
New Revision: 37655
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
Log:
audio was not property recongnized at all
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
===
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
2009-08-10 18:28:49 UTC (rev 37654)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
2009-08-10 18:46:58 UTC (rev 37655)
@@ -96,7 +96,7 @@
log.service(Fixing mime type + actualMimeType + - +
newType) ;
} else {
-log.debug(MimType + actualMimeType + is correct);
+log.debug(MimeType + actualMimeType + is correct);
}
}
@@ -182,9 +182,9 @@
private static final Pattern IMAGE= Pattern.compile(.*?\\sVideo: .*?,
.*?, ([0-9]+)x([0-9]+).*);
/*
use this in stead for image matching and do height and width in other
method ?
-private static final Pattern IMAGE= Pattern.compile(^Input #\\d+,
image.*);
+private static final Pattern IMAGE= Pattern.compile(^Input #\\d+,
image.*);
*/
-
+
public boolean image(String l, Node source, Node dest) {
if (! source.isNull(bitrate)) {
// already has a bitrate
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
===
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
2009-08-10 18:28:49 UTC (rev 37654)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
2009-08-10 18:46:58 UTC (rev 37655)
@@ -64,15 +64,15 @@
}
public void ready(Node sourceNode, Node destNode) {
-log.info(Ready + sourceNode.getNumber() + (destNode == null ? :
( - + destNode.getNumber(;
+log.service(Ready() + sourceNode.getNumber() + (destNode == null ?
: ( - + destNode.getNumber(;
if (sourceNode.isNull(bitrate)) {
-log.service(Node + sourceNode.getNumber() + +
sourceNode.getStringValue(url) + is an image);
+log.info(Node + sourceNode.getNumber() + +
sourceNode.getStringValue(url) + is an image);
util.toImage(sourceNode, destNode);
-} else if (! sourceNode.getNodeManager().hasField(width)) {
-log.service(Node + sourceNode.getNumber() + +
sourceNode.getStringValue(url) + is an audio);
+} else if (sourceNode.isNull(width)) {
+log.info(Node + sourceNode.getNumber() + +
sourceNode.getStringValue(url) + is an audio);
util.toAudio(sourceNode, destNode);
} else {
-log.service(Node + sourceNode.getNumber() + +
sourceNode.getStringValue(url) + is an video);
+log.info(Node + sourceNode.getNumber() + +
sourceNode.getStringValue(url) + is an video);
util.toVideo(sourceNode, destNode);
}
//
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
===
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
2009-08-10 18:28:49 UTC (rev 37654)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
2009-08-10 18:46:58 UTC (rev 37655)
@@ -71,7 +71,7 @@
public static void main(String[] argv) throws Exception {
Logger logger = Logging.getLoggerInstance(RECOGNIZER);
-logger.setLevel(Level.WARN);
+logger.setLevel(Level.DEBUG);
Recognizer recognizer = new FFMpegRecognizer().clone();
Analyzer a = new FFMpegAnalyzer();
Node source = AnalyzerUtils.getTestNode();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37656 - in mmbase/trunk/applications/streams: . src/main/java/org/mmbase/streams/transcoders
Author: michiel
Date: 2009-08-10 20:48:57 +0200 (Mon, 10 Aug 2009)
New Revision: 37656
Modified:
mmbase/trunk/applications/streams/Makefile
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
Log:
Modified: mmbase/trunk/applications/streams/Makefile
===
--- mmbase/trunk/applications/streams/Makefile 2009-08-10 18:46:58 UTC (rev
37655)
+++ mmbase/trunk/applications/streams/Makefile 2009-08-10 18:48:57 UTC (rev
37656)
@@ -41,7 +41,8 @@
# java org.mmbase.streams.transcoders.FFMpegRecognizer samples/test.mp3
# java org.mmbase.streams.transcoders.FFMpegRecognizer samples/test.jpeg
# java org.mmbase.streams.transcoders.FFMpegRecognizer
samples/mahnamahna.broken
- java org.mmbase.streams.transcoders.FFMpegRecognizer samples/odd.ogg
+# java org.mmbase.streams.transcoders.FFMpegRecognizer samples/odd.ogg
+ java org.mmbase.streams.transcoders.FFMpegRecognizer
samples/testaudio.ogg
transcode:
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
===
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
2009-08-10 18:46:58 UTC (rev 37655)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
2009-08-10 18:48:57 UTC (rev 37656)
@@ -65,7 +65,7 @@
public void ready(Node sourceNode, Node destNode) {
log.service(Ready() + sourceNode.getNumber() + (destNode == null ?
: ( - + destNode.getNumber(;
-if (sourceNode.isNull(bitrate)) {
+if (sourceNode.isNull(bitrate) || sourceNode.getIntValue(bitrate)
= 0) {
log.info(Node + sourceNode.getNumber() + +
sourceNode.getStringValue(url) + is an image);
util.toImage(sourceNode, destNode);
} else if (sourceNode.isNull(width)) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37657 - openimages/trunk/src/main/webapp/WEB-INF/config/streams
Author: andre Date: 2009-08-10 22:21:10 +0200 (Mon, 10 Aug 2009) New Revision: 37657 Modified: openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml Log: small typo Modified: openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml === --- openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml 2009-08-10 18:48:57 UTC (rev 37656) +++ openimages/trunk/src/main/webapp/WEB-INF/config/streams/createcaches.xml 2009-08-10 20:21:10 UTC (rev 37657) @@ -29,7 +29,7 @@ loganalyzer name=org.mmbase.streams.transcoders.FFMpegAnalyzer / /recognizer - !-- % ffmpeg -i video.mpg -f mpeg -vcodec mpeg2video -r 25 b 1024k -acodec libmp3lame -ab 128k -ac 2 video.flv -- + !-- % ffmpeg -i video.mpg -f mpeg -vcodec mpeg2video -r 25 -b 1024k -acodec libmp3lame -ab 128k -ac 2 video.flv -- transcoder mimetype=video/* id=v1 class name=org.mmbase.streams.transcoders.FFMpegTranscoder param name=formatmpeg/param ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37658 - openimages/trunk/src/main/webapp/style/js
Author: andre
Date: 2009-08-10 23:34:01 +0200 (Mon, 10 Aug 2009)
New Revision: 37658
Modified:
openimages/trunk/src/main/webapp/style/js/player.js
Log:
selection of videotag the jquery way
Modified: openimages/trunk/src/main/webapp/style/js/player.js
===
--- openimages/trunk/src/main/webapp/style/js/player.js 2009-08-10 20:21:10 UTC
(rev 37657)
+++ openimages/trunk/src/main/webapp/style/js/player.js 2009-08-10 21:34:01 UTC
(rev 37658)
@@ -57,7 +57,7 @@
}
Player.prototype._init = function(id, url, config) {
-this.player = $('#' + id + ' video')[0];// the first video tag it
finds
+this.player = $('#' + id + ' video:first'); // the first video tag it
finds
this.url = url;
/* if (this.urls.length == 0) this.urls[0] = $(this.player).attr('src'); */
this.poster = $(this.player).attr('poster');
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37659 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: raintang Date: 2009-08-11 05:18:24 +0200 (Tue, 11 Aug 2009) New Revision: 37659 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp Log: CMSC-1479 6 Based on the FD, implement create article page Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp 2009-08-10 21:34:01 UTC (rev 37658) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp 2009-08-11 03:18:24 UTC (rev 37659) @@ -15,7 +15,7 @@ /html:form /div div class=ruler_greendivfmt:message key=simple.editor.ready //div/div -c:set var=returnurl value=../editors/simple/SimpleContentDraftAction.do/ +c:set var=returnurl value=../editors/simple/SimpleContentReadyAction.do/ html:form action=/editors/simple/SimpleContentReadyAction.do method=post html:text style=margin-left:10px;margin-top:10px property=title /input type=submit class=button value=fmt:message key=simple.editor.search / !-- we check to see if we have workflow, this is done by looking if the editors for the workflow are on the HD -- ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37660 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources
Author: raintang
Date: 2009-08-11 05:40:27 +0200 (Tue, 11 Aug 2009)
New Revision: 37660
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
Log:
CMSC-1491 Several issues with the Asset searching - container issue; change
title asset view
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-08-11 03:18:24 UTC (rev 37659)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-08-11 03:40:27 UTC (rev 37660)
@@ -438,7 +438,7 @@
asset.channel=Channel b {0} /b.
asset.new=New URL
asset.create=Create
-asset.asset=asset in {0}
+asset.asset=assets in {0}
asset.type=Of type b {0} /b:
asset.preview.title=Open a browser with a preview of this element.
asset.info=Info
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-08-11 03:18:24 UTC (rev 37659)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-08-11 03:40:27 UTC (rev 37660)
@@ -435,7 +435,7 @@
asset.channel=Rubriek b {0} /b.
asset.new=Nieuwe URL
asset.create=Aanmaken
-asset.asset=asset in deze rubriek
+asset.asset=assets in deze rubriek
asset.type=Van type b {0} /b:
asset.preview.title=Open een browser met een preview
asset.info=Info
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37661 - CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources
Author: raintang
Date: 2009-08-11 05:40:48 +0200 (Tue, 11 Aug 2009)
New Revision: 37661
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
Log:
CMSC-1491 Several issues with the Asset searching - container issue; change
title asset view
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-08-11 03:40:27 UTC (rev 37660)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-08-11 03:40:48 UTC (rev 37661)
@@ -432,7 +432,7 @@
asset.channel=Channel b {0} /b.
asset.new=New URL
asset.create=Create
-asset.asset=asset in {0}
+asset.asset=assets in {0}
asset.type=Of type b {0} /b:
asset.preview.title=Open a browser with a preview of this element.
asset.info=Info
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-08-11 03:40:27 UTC (rev 37660)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-08-11 03:40:48 UTC (rev 37661)
@@ -430,7 +430,7 @@
asset.channel=Rubriek b {0} /b.
asset.new=Nieuwe URL
asset.create=Aanmaken
-asset.asset=asset in deze rubriek
+asset.asset=assets in deze rubriek
asset.type=Van type b {0} /b:
asset.preview.title=Open een browser met een preview
asset.info=Info
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37662 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF
Author: kevinshen Date: 2009-08-11 07:25:04 +0200 (Tue, 11 Aug 2009) New Revision: 37662 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml Log: CMSC-1476 3 Based on the FD, implement simple editor overview page including: head/body/foot page, the main page frame and css Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml 2009-08-11 03:40:48 UTC (rev 37661) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml 2009-08-11 05:25:04 UTC (rev 37662) @@ -293,19 +293,11 @@ /action !--Simple Editor-- - action path=/editors/simple/SimpleContentAction type=com.finalist.cmsc.repository.forms.SimpleContentAction - unknown=false validate=false name=SimpleContentForm input=/editors/simple/simplecontent.jsp - forward name=success path=/editors/simple/simplecontent.jsp redirect=false / - /action - action path=/editors/simple/SimpleContentInitAction type=com.finalist.cmsc.repository.forms.SimpleContentInitAction - unknown=false validate=false - forward name=success path=/editors/simple/simplecontent.jsp redirect=false / - /action action path=/editors/simple/SimpleContentReadyAction type=com.finalist.cmsc.repository.forms.SimpleContentReadyAction - unknown=false validate=false name=SimpleContentForm input=/editors/simple/simplecontent.jsp + unknown=false validate=false scope=request name=SimpleContentForm input=/editors/simple/simplecontent.jsp /action action path=/editors/simple/SimpleContentDraftAction type=com.finalist.cmsc.repository.forms.SimpleContentDraftAction - unknown=false validate=false name=SimpleContentForm input=/editors/simple/simplecontent.jsp + unknown=false validate=false scope=request name=SimpleContentForm input=/editors/simple/simplecontent.jsp /action action path=/editors/simple/SimpleEditorChannelAction type=com.finalist.cmsc.repository.forms.SimpleEditorChannelAction unknown=false validate=false ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
