- xwiki-devs@xwiki.org - lists.xwiki.org

Re: [xwiki-devs] [xwiki-notifications] r24884 - in platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg: client/plugin/macro server/plugin/macro
by Marius Dumitru Florea 05 Nov '09

05 Nov '09

Hi Thomas, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-11-05 19:21:06 +0100 (Thu, 05 Nov 2009) > New Revision: 24884 > > Modified: > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/macro/ParameterDescriptor.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java > Log: > XWIKI-4556: Modify ParameterDescriptor/PropertyDescriptor to support id/name > * add display name support to GWT ParameterDescriptor > > Modified: platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/macro/ParameterDescriptor.java > =================================================================== > --- platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/macro/ParameterDescriptor.java 2009-11-05 18:14:46 UTC (rev 24883) > +++ platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/macro/ParameterDescriptor.java 2009-11-05 18:21:06 UTC (rev 24884) > @@ -35,6 +35,12 @@ > private String id; > > /** > + * @see #getName() > + * @since 2.1M1 > + */ > + private String name; > + > + /** > * @see #getDescription() > */ > private String description; > @@ -75,6 +81,26 @@ > } > > /** > + * @return the display name of this parameter > + * @since 2.1M1 > + */ > + public String getName() > + { > + return name; > + } > + > + /** > + * Sets the display name of this parameter. > + * > + * @param id the display name of the parameter > + * @since 2.1M1 > + */ > + public void setName(String name) > + { > + this.name = name; > + } > + > + /** > * @return the parameter description > */ > public String getDescription() > > Modified: platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java > =================================================================== > --- platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java 2009-11-05 18:14:46 UTC (rev 24883) > +++ platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/server/plugin/macro/XWikiMacroService.java 2009-11-05 18:21:06 UTC (rev 24884) > @@ -87,6 +87,8 @@ > if (descriptor.getContentDescriptor() != null) { > contentDescriptor = new ParameterDescriptor(); > contentDescriptor.setId("content"); > + // TODO: internationalize content display name > + contentDescriptor.setName("content"); This should cause a Checkstyle violation. Anyway, what I wanted to ask is how do we proper internationalize a component? Thanks, Marius > contentDescriptor.setDescription(descriptor.getContentDescriptor().getDescription()); > // Just a hack to distinguish between regular strings and large strings. > contentDescriptor.setType(StringBuffer.class.getName()); > @@ -125,6 +127,7 @@ > { > ParameterDescriptor result = new ParameterDescriptor(); > result.setId(descriptor.getId()); > + result.setName(descriptor.getName()); > result.setDescription(descriptor.getDescription()); > result.setType(getMacroParameterType(descriptor.getType())); > Object defaultValue = descriptor.getDefaultValue(); > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

2 3

Re: [xwiki-devs] [xwiki-notifications] r24882 - in platform/core/trunk/xwiki-rendering: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml xwiki-rendering-tests/src/test/java/org/xwiki/rendering xwiki-rendering-tests/src/te
by Thomas Mortagne 05 Nov '09

05 Nov '09

On Thu, Nov 5, 2009 at 21:09, Vincent Massol <vincent(a)massol.net> wrote: > > On Nov 5, 2009, at 7:14 PM, tmortagne (SVN) wrote: > >> Author: tmortagne >> Date: 2009-11-05 19:14:43 +0100 (Thu, 05 Nov 2009) >> New Revision: 24882 >> >> Added: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ >> resources/link/links24.test >> Modified: >> platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ >> java/org/xwiki/rendering/internal/renderer/xhtml/ >> DefaultXHTMLLinkRenderer.java >> platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ >> java/org/xwiki/rendering/SimpleRenderingTests.java >> platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ >> java/org/xwiki/rendering/WikiRenderingTests.java >> Log: >> XWIKI-4554: NPE occurs when there is no WikiModel implementation >> registered >> >> Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/ >> src/main/java/org/xwiki/rendering/internal/renderer/xhtml/ >> DefaultXHTMLLinkRenderer.java >> =================================================================== >> --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ >> java/org/xwiki/rendering/internal/renderer/xhtml/ >> DefaultXHTMLLinkRenderer.java 2009-11-05 17:25:33 UTC (rev 24881) >> +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ >> java/org/xwiki/rendering/internal/renderer/xhtml/ >> DefaultXHTMLLinkRenderer.java 2009-11-05 18:14:43 UTC (rev 24882) >> @@ -157,7 +157,7 @@ >> */ >> public void beginLink(Link link, boolean isFreeStandingURI, >> Map<String, String> parameters) >> { >> - if (link.isExternalLink()) { >> + if (this.wikiModel == null || link.isExternalLink()) { >> beginExternalLink(link, isFreeStandingURI, parameters); >> } else { >> beginInternalLink(link, isFreeStandingURI, parameters); >> @@ -188,7 +188,7 @@ >> if (link.getType() == LinkType.INTERWIKI) { >> // TODO: Resolve the Interwiki link >> } else { >> - if ((link.getType() == LinkType.URI) && >> link.getReference().startsWith(ATTACH)) { >> + if (this.wikiModel != null && link.getType() == >> LinkType.URI && link.getReference().startsWith(ATTACH)) { >> // use the default attachment syntax parser to >> extract document name and attachment name >> Attachment attachment = >> this >> .attachmentParser >> .parse(link.getReference().substring(ATTACH.length())); >> aAttributes.put(HREF, >> this.wikiModel.getAttachmentURL(attachment.getDocumentName(), >> >> Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ >> src/test/java/org/xwiki/rendering/SimpleRenderingTests.java >> =================================================================== >> --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ >> test/java/org/xwiki/rendering/SimpleRenderingTests.java 2009-11-05 >> 17:25:33 UTC (rev 24881) >> +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ >> test/java/org/xwiki/rendering/SimpleRenderingTests.java 2009-11-05 >> 18:14:43 UTC (rev 24882) >> @@ -210,6 +210,9 @@ >> suite.addTestsFromResource("misc/misc7", false); >> suite.addTestsFromResource("encoding/encoding1", false); >> >> + // Links without WikiModel >> + suite.addTestsFromResource("link/links24", false); >> + >> return new ComponentManagerTestSetup(suite); >> } >> } >> >> Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ >> src/test/java/org/xwiki/rendering/WikiRenderingTests.java >> =================================================================== >> --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ >> test/java/org/xwiki/rendering/WikiRenderingTests.java 2009-11-05 >> 17:25:33 UTC (rev 24881) >> +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ >> test/java/org/xwiki/rendering/WikiRenderingTests.java 2009-11-05 >> 18:14:43 UTC (rev 24882) >> @@ -75,8 +75,6 @@ >> suite.addTestsFromResource("image/image3", false); >> suite.addTestsFromResource("image/image4", false); >> suite.addTestsFromResource("image/image5", false); >> - >> - suite.addTestsFromResource("link/links18", false); > > I haven't checked the sources but is it normal that this is removed? > Was it a leftover from before? Yes > > Thanks > -Vincent > > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Thomas Mortagne

1 0

Re: [xwiki-devs] [xwiki-notifications] r24882 - in platform/core/trunk/xwiki-rendering: xwiki-rendering-api/src/main/java/org/xwiki/rendering/internal/renderer/xhtml xwiki-rendering-tests/src/test/java/org/xwiki/rendering xwiki-rendering-tests/src/test/resources/link
by Vincent Massol 05 Nov '09

05 Nov '09

On Nov 5, 2009, at 7:14 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2009-11-05 19:14:43 +0100 (Thu, 05 Nov 2009) > New Revision: 24882 > > Added: > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ > resources/link/links24.test > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/internal/renderer/xhtml/ > DefaultXHTMLLinkRenderer.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ > java/org/xwiki/rendering/SimpleRenderingTests.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/test/ > java/org/xwiki/rendering/WikiRenderingTests.java > Log: > XWIKI-4554: NPE occurs when there is no WikiModel implementation > registered > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/ > src/main/java/org/xwiki/rendering/internal/renderer/xhtml/ > DefaultXHTMLLinkRenderer.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/internal/renderer/xhtml/ > DefaultXHTMLLinkRenderer.java 2009-11-05 17:25:33 UTC (rev 24881) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/src/main/ > java/org/xwiki/rendering/internal/renderer/xhtml/ > DefaultXHTMLLinkRenderer.java 2009-11-05 18:14:43 UTC (rev 24882) > @@ -157,7 +157,7 @@ > */ > public void beginLink(Link link, boolean isFreeStandingURI, > Map<String, String> parameters) > { > - if (link.isExternalLink()) { > + if (this.wikiModel == null || link.isExternalLink()) { > beginExternalLink(link, isFreeStandingURI, parameters); > } else { > beginInternalLink(link, isFreeStandingURI, parameters); > @@ -188,7 +188,7 @@ > if (link.getType() == LinkType.INTERWIKI) { > // TODO: Resolve the Interwiki link > } else { > - if ((link.getType() == LinkType.URI) && > link.getReference().startsWith(ATTACH)) { > + if (this.wikiModel != null && link.getType() == > LinkType.URI && link.getReference().startsWith(ATTACH)) { > // use the default attachment syntax parser to > extract document name and attachment name > Attachment attachment = > this > .attachmentParser > .parse(link.getReference().substring(ATTACH.length())); > aAttributes.put(HREF, > this.wikiModel.getAttachmentURL(attachment.getDocumentName(), > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ > src/test/java/org/xwiki/rendering/SimpleRenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ > test/java/org/xwiki/rendering/SimpleRenderingTests.java 2009-11-05 > 17:25:33 UTC (rev 24881) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ > test/java/org/xwiki/rendering/SimpleRenderingTests.java 2009-11-05 > 18:14:43 UTC (rev 24882) > @@ -210,6 +210,9 @@ > suite.addTestsFromResource("misc/misc7", false); > suite.addTestsFromResource("encoding/encoding1", false); > > + // Links without WikiModel > + suite.addTestsFromResource("link/links24", false); > + > return new ComponentManagerTestSetup(suite); > } > } > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/ > src/test/java/org/xwiki/rendering/WikiRenderingTests.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ > test/java/org/xwiki/rendering/WikiRenderingTests.java 2009-11-05 > 17:25:33 UTC (rev 24881) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-tests/src/ > test/java/org/xwiki/rendering/WikiRenderingTests.java 2009-11-05 > 18:14:43 UTC (rev 24882) > @@ -75,8 +75,6 @@ > suite.addTestsFromResource("image/image3", false); > suite.addTestsFromResource("image/image4", false); > suite.addTestsFromResource("image/image5", false); > - > - suite.addTestsFromResource("link/links18", false); I haven't checked the sources but is it normal that this is removed? Was it a leftover from before? Thanks -Vincent

1 0

Re: [xwiki-devs] [xwiki-notifications] r24799 - in sandbox/applications: . xwiki-application-qa xwiki-application-qa/src xwiki-application-qa/src/main xwiki-application-qa/src/main/resources xwiki-application-qa/src/main/resources/QA xwiki-application-qa/src/main/resources/QACode
by Sergiu Dumitriu 05 Nov '09

05 Nov '09

On 11/03/2009 01:34 PM, anamarias (SVN) wrote: > Author: anamarias > Date: 2009-11-03 13:34:40 +0100 (Tue, 03 Nov 2009) > New Revision: 24799 > > Log: > advanced q&a app > > Added: sandbox/applications/xwiki-application-qa/pom.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/pom.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/pom.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,14 @@ > +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> > +<parent> > +<artifactId>xwiki-applications</artifactId> > +<groupId>com.xpn.xwiki.platform.applications</groupId> > +<version>15</version> > +</parent> > +<modelVersion>4.0.0</modelVersion> > +<groupId>com.xpn.xwiki.platform.applications</groupId> > +<artifactId>xwiki-application-qa</artifactId> > +<packaging>xar</packaging> > +<name>XWiki Platform - Applications - Question&Answers</name> > +<version>1.0-SNAPSHOT</version> > +<description>Q&A Application</description> Q&A is not valid XML. The XML parser used by Maven complains about it and fails to build. > +</project> > > Added: sandbox/applications/xwiki-application-qa/src/main/resources/QA/QASearch.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/src/main/resources/QA/QASearch.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/src/main/resources/QA/QASearch.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,88 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > +<xwikidoc> > +<web>QA</web> > +<name>QASearch</name> > [snip] > +{{html clean="false" wiki="true"}} > += $msg.get('qa.search.title') = > + > +<form action=""> Please don't use a table here. Tables are supposed to be used only for data that semantically belongs in a table. > +<table> > +<tr> > +<td> > +<input type="text" name="text" value="$!request.text" size="40"/> Use $xwiki.getXMLEncoded($!{requesttext}) to prevent cross-site scripting and broken layout if the user enters some quotes. > +</td> > +<td> > +<input type="submit" value="$msg.get('qa.search.submit.button.value')"/> In general we wrapp all buttons with <span class="buttonwrapper"> > +</td> > +</tr> > +</table> > +</form> > +<p/> > +#if($request.getParameter("text")) > + #set($text = $request.getParameter("text")) > +#else > + #set($text = "") > +#end Shorter variant: #set($text = "$!{request.getParameter('text')") > + This is strange, why are you doing it like this? > +#set($space = "$doc.space") > +{{include document="${space}Code.WebSearchCode"/}} > +{{include document="XWiki.Results"/}} > +{{/html}} > +{{/velocity}} > +</content></xwikidoc> > \ No newline at end of file > > > Added: sandbox/applications/xwiki-application-qa/src/main/resources/QA/WebHome.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/src/main/resources/QA/WebHome.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/src/main/resources/QA/WebHome.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,252 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > +<xwikidoc> > +<web>QA</web> > +<name>WebHome</name> > [snip] You should use the current color theme for styling. > +<code>.qaSearchContainer, .qaAddContainer { > + background-color:#EFF6D7; > + padding:10px; > + margin-bottom:10px; > +} > + > +.qaAddContainer { > + background-color:#FFFACD; > +} > + > +.qaSearch, .qaAdd { > + font-size:1.5em; > + font-weight:bold; > + line-height:2.5em; > +} > + > +.qaSearchName, .qaAddName { > + display: inline; > + color:#B5C742; > +} > + > +.qaAddName { > + color:#E78013; > +} > + > +.qaSearchValue, .qaAddValue { > + display: inline; > + margin: 0; > +} > + > +.qaSearchValue form, .qaAddValue form { > + display: inline; > +} > + > +.qaSearchValue form input[type="text"], .qaAddValue form input[type="text"] { > + font-size:0.9em; px heights are not good. They don't scale well if the user increases the font size, or if his OS in general uses a different DPI. > + height:20px; > +} > + > +.qaSearchValue form input[type="submit"], .qaAddValue form input[type="submit"] { > + color:#4D4D4D; > + font-size:0.6em; > + height:26px; > +} > +</code></property><property><name></name></property><property><parse>0</parse> > +</property> > +<property> > [snip] > +<content>{{include document="QACode.Macros" /}} > +{{velocity filter="none"}} > +## QA variables > +#set($qaSpace = "$doc.space") > +#set($qaWebHome = "${qaSpace}.WebHome") > +#set($qaClassName = "${qaSpace}Code.${qaSpace}Class") > +#set($qaSheet = "${qaSpace}Code.${qaSpace}Sheet") > +#set($qaTemplate = "${qaSpace}Code.${qaSpace}Template") > +#set($qaSearch = "${qaSpace}.${qaSpace}Search") > +## > +$xwiki.ssx.use("$qaWebHome") > +## > +{{html clean="false" wiki="true"}} > += $msg.get('qa.webhome.title') = > +## --------------------------------------------------- > +## Let the user search for QAs > +## --------------------------------------------------- > +<div class='qaSearchContainer'> > +<div class='qaSearch'> > +<div class='qaSearchName'>Search:</div> > +<div class='qaSearchValue'> > +<form action="$xwiki.getURL("${qaSearch}")"> Not valid XHTML, since a form can contain only block level elements. You must wrap the input elements in a <div> or <fieldset>. > +<input type="text" name="text" value="$!request.text" size="40"/> Again, use a buttonwrapper. > +<input type="submit" value="$msg.get('qa.webhome.search.submit.button.value')"/> > +</form> > +</div> > +</div> > +</div> > +## --------------------------------------------------- > +## Let the user add QAs > +## --------------------------------------------------- > +<div class='qaAddContainer'> > +<div class='qaAdd'> > +<div class='qaAddName'>Submit:</div> > +<div class='qaAddValue'> > +<form action="" id="newqa"> Use a block wrapper for validity. > +<input type="hidden" name="parent" value="${qaWebHome}" /> > +<input type="hidden" name="template" value="${qaTemplate}" /> > +<input type="hidden" name="sheet" value="1" /> > +<input type="hidden" name="webname" value="${qaSpace}"/> > +<input type="hidden" name="name" value=""/> > +<input type="text" name="qa" value="" size="40"/> I know that the following code is copied from another XWiki document, but it is not OK to use onclick. > +<input type="submit" value="$msg.get('qa.webhome.add.submit.button.value')" onclick='if (updateName(this.form.qa,this.form.name)) { action="../../inline/" + this.form.webname.value + "/" + this.form.name.value; this.form.submit(); }' /> > +</form> > +</div> > +</div> > +</div> > + > +## Display Question Class admin button only for users with admin rights on the current space > +#if($xwiki.hasAdminRights()) > +Questions Class:<a href='${xwiki.getURL("$qaClassName", 'edit', 'editor=class')}'>Edit Question Class Properties (Metadata)</a> > +#end > +## > +## --------------------------------------------------- > +## Livetable for QA entries that have answers > +## --------------------------------------------------- > +== $msg.get('qa.answered.title') == > +#qaLiveGrid("ansqadiv" "$doc.space" true) > +## > +## ---------------------------------------------------- > +## Livetable for QA entries that have no answers yet > +## ---------------------------------------------------- > +== $msg.get('qa.notanswered.title') == > +#qaLiveGrid("notansqadiv" "$doc.space" false) > + > +{{/html}} > +{{/velocity}}</content> > +</xwikidoc> > > > Property changes on: sandbox/applications/xwiki-application-qa/src/main/resources/QA/WebHome.xml > ___________________________________________________________________ > Name: svn:executable > + * Why executable? > Name: svn:keywords > + Author Id Revision HeadURL > Name: svn:eol-style > + native > > Added: sandbox/applications/xwiki-application-qa/src/main/resources/QACode/Install.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/src/main/resources/QACode/Install.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/src/main/resources/QACode/Install.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,80 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > +<xwikidoc> > +<web>QACode</web> > +<name>Install</name> > [snip] > +<content>{{velocity}} > +#if(!$xwiki.hasAdminRights()) > +You are running this script as a non admin. It will have no effect. Login as admin. > +#end > + > +#set($transdoc = $xwiki.getDocument("XWiki.XWikiPreferences")) > +#set($ok = $transdoc.use("XWiki.XWikiPreferences")) > +#set($transprefs = $transdoc.getValue("documentBundles")) RecruitmentCode.Translations? > +#if($transprefs.indexOf("RecruitmentCode.Translations")==-1) > +#if($request.confirm=="1") > +#set($transprefs = "${transprefs},QACode.Translations") > +#set($ok = $transdoc.set("documentBundles", $transprefs)) > +#set($ok = $transdoc.save()) > +#end This message should be before the #end above. > +* Added translation bundle to XWiki Preferences Add an "everything OK" like message to let the user know that no work needs to be done. > +#end > + Put this on an #else branch with a link back with a confirm=1 query paraeter (if the current user has admin rights). > +1.1 Additional Install steps > +The page "QACode.Translations" also needs to be added to the translations bundles in the XWiki Preferences / Programming section. > +{{/velocity}}</content> > +</xwikidoc> > > > Added: sandbox/applications/xwiki-application-qa/src/main/resources/QACode/QAClass.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/src/main/resources/QACode/QAClass.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/src/main/resources/QACode/QAClass.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,139 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > +<xwikidoc> > +<web>QACode</web> > +<name>QAClass</name> > [snip] > +<class> > +<answer> > +</answer> > +<country> Why does a QA application need a country? > +</country> > +<fabrication> Strange word in this context... > +</fabrication> > +<pays> Who's paying? > +</pays> > +<question> A problem with the StringClass is that it can only hold 255 characters. Do you think it's enough? > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</question> > +</class> > > Added: sandbox/applications/xwiki-application-qa/src/main/resources/QACode/QASheet.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/src/main/resources/QACode/QASheet.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/src/main/resources/QACode/QASheet.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,261 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > +<xwikidoc> > +<web>QACode</web> > +<name>QASheet</name> > [snip] > +<property> > +<cache></cache> > +</property> > +<property> Again, use the color theme. > +<code>.qaContainer { > + background-color:#EFF6D7; > + padding:10px; > +} > + > +.qaQuestionContainer { > + font-size:1.5em; > + font-weight:bold; > + line-height:2.5em; > +} > + > +.qaQuestionName { > + color:#B5C742; > +} > + > +.qaQuestionValue { } > + > +.qaMetadataContainer { > + margin-left:40px; > +} > + > +.qaAnswerContainer { > + border: 1px solid #D7D7D7; > + padding:10px; > + margin-top:10px; > +} > + > +.qaAnswerName { > + color:#003399; > + font-size:1.5em; > + font-weight:bold; > +} > + > +.qaAnswerValue { } > + > +.qaUnansweredContainer { > + padding: 20px 40px; > +} > + > +.floatRight { > + float: right; > +} > + > +.qaQuestionValue pre { > + display: inline > +} > +</code></property><property><name></name></property><property><parse>0</parse> > +</property> > +<property> > +<use>onDemand</use> > +</property> > +</object> > +<content>{{velocity filter="none"}} > +#set($qaSpace = "$doc.space") > +#set($qaClassName = "${qaSpace}Code.${qaSpace}Class") > +#set($qaSheet = "${qaSpace}Code.${qaSpace}Sheet") > +## CSS Stylesheet > +$xwiki.ssx.use("$qaSheet") > +## > +{{html clean="false" wiki="true"}} > +## > +#set($qaObject = $doc.getObject("$qaClassName")) > +#set($qaClass = $qaObject.xWikiClass) > +## > +## QA properties .Value looks strange to me (C#). It's either .value or .getValue(). > +#set($qaQuestion = $qaObject.getProperty('question').Value) > +#set($qaAnswer = $qaObject.getProperty('answer').Value) > += $qaQuestion = > +<div class='qaContainer'> > +<div class='qaQuestionContainer'> > +<span class='qaQuestionName'>Q:</span> > +<span class='qaQuestionValue'>$doc.display('question')</span> > +</div> > +<div class='qaMetadataContainer'> > + #foreach($prop in $qaClass.properties) > + #set($propName = $prop.Name) > + #if($propName != 'question'&& $propName != 'answer') > + ; $prop.prettyName > + : $doc.display($prop.getName()) > + #end > + #end > +</div> > +</div> > +#if($qaAnswer!='' || $context.action=='inline' ) > +<div class='qaAnswerContainer'> > + #if($context.action=='view') > +<div class='floatRight'><a href="$doc.getURL('inline')">[Improve]</a></div> > + #end Too much HTML. > +<div class='qaAnswerName'>A:</div> > +<div class='qaAnswerValue'>$doc.display('answer')</div> > +</div> > +#else > +<div class='qaUnansweredContainer'> > +<b>This question has not been answered yet.</b><br /> And what am I supposed to do with this button if I don't have JavaScript enabled? What's wrong with a plain link? > +<input type="button" value="A: Answer Question" onclick="window.location.href='$doc.getURL('inline')'" /> > +</div> > +#end > +{{/html}} > +{{/velocity}}</content> > +</xwikidoc> > > > Added: sandbox/applications/xwiki-application-qa/src/main/resources/QACode/Translations.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/src/main/resources/QACode/Translations.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/src/main/resources/QACode/Translations.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,82 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > +<xwikidoc> > +<web>QACode</web> > +<name>Translations</name> > [snip] > +<content>qa.webhome.title=Questions& Answers > +qa.webhome.search.title=In order to find the information you're looking for, you can use the search feature of your browser to search for QA entries displayed on this page or use the search box below. > +qa.webhome.search.submit.button.value=Go! > +qa.webhome.add.title=If you don't find the QA you're looking for, create a new QA using the following form and fill the answer once you've found it! > +qa.webhome.add.submit.button.value=Add this QA > +qa.webhome.table.answered.title={0} Answered QAs (latest first) > +qa.webhome.table.notanswered.title={0} Unanswered QAs (latest first) > + > +qa.search.title=QA Search > +qa.search.submit.button.value=Search QAs > + Where are these used? > +qa.class.property.qa.question=Question > +qa.class.property.qa.answer=Answer > +qa.class.property.qa.country=Country > +qa.class.property.qa.doc.date=Last Edited > +qa.class.property.qa.doc.author=Last Author > +qa.class.property.qa.doc.name=Questions > +qa.class.property.qa.emptyvalue=- > +qa.class.property.qa._actions=Actions > + > +qa.answered.title=Answered QAs > +qa.notanswered.title=Unanswered QAs</content> > +</xwikidoc> > > > Added: sandbox/applications/xwiki-application-qa/src/main/resources/QACode/WebHome.xml > =================================================================== > --- sandbox/applications/xwiki-application-qa/src/main/resources/QACode/WebHome.xml (rev 0) > +++ sandbox/applications/xwiki-application-qa/src/main/resources/QACode/WebHome.xml 2009-11-03 12:34:40 UTC (rev 24799) > @@ -0,0 +1,61 @@ > +<?xml version="1.0" encoding="UTF-8"?> > + > +<xwikidoc> > +<web>QACode</web> > +<name>WebHome</name> > [snip] > +<content></content> A document with no content at all is not nice. At least put a short message explaining what the space is for. > +</xwikidoc> -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

[xwiki-devs] Fixing WCAG issues - Need help
by Vincent Massol 05 Nov '09

05 Nov '09

Hi devs, I need help to fix the WCAG issues I've created so far: http://jira.xwiki.org/jira/secure/IssueNavigator.jspa?mode=hide&requestId=1… Who can help? If you can, please assign yourself some issues. Thanks -Vincent

4 6

[xwiki-devs] Should XWikiStoreInterface#countDocuments distinct by fullname ?
by Jerome Velociter 05 Nov '09

05 Nov '09

Hi Sergiu, all I see in the XWikiHibernateStore that #countDocuments do distinct documents by language while #searchDocuments does not. I would have expect both to have the same behavior, so that we can use them safely using the same query as input (for example for pagination). Is there a reason for originally doing "select count(*)" versus select "count(distinct doc.fullName)" ? I think in any case we should have this API that does not distinct by language. Should it replace the current behavior ? or should we add a new API #countDocuments(String wheresql, boolean distinctFullname, XWikiContext context) ? Thanks, Jerome.

4 4

[xwiki-devs] [VOTE] Replace embed HTML elements with static image placeholder in WYSIWYG edit mode
by Marius Dumitru Florea 04 Nov '09

04 Nov '09

Embed HTML elements pose some problems: * they are loaded asynchronously and any attempt to access even the simplest DOM property like nodeType through JavaScript raises an exception if the object is not fully loaded (closed to https://bugzilla.mozilla.org/show_bug.cgi?id=331672 ). * they can't be fully controlled from JavaScript. The specific plugin that handles each of them decides the display and behavior (e.g. https://bugzilla.mozilla.org/show_bug.cgi?id=250855 a flash movie might auto start in edit mode and, unless you want to see a movie while editing, that's not nice). * they aren't reloaded after they are detached and reattached to the DOM tree using JavaScript which means that any DOM manipulation involving one of the ancestors of a embed node can lead to the disappearance of the embedded object. Sadly, appendChild, insertBefore and replaceChild detach the target node before attaching it to the new location. As a consequence there's no way to move an embed node inside the DOM tree without detaching it. So I propose we replace the embed HTML elements with static image placeholders just after the edited document finishes loading. The placeholder will have the same size as the embedded object in view mode. Note, ckeditor already does this. You can check by copying the HTML from http://jira.xwiki.org/jira/browse/XWIKI-3975 to the source of http://ckeditor.com/demo . I'm +1. Thanks, Marius

4 7

[xwiki-devs] Platform jsfx ssfx problem
by Luis Ruiz 04 Nov '09

04 Nov '09

Hi Marius, Thanks for your fast reply!! You were right, in my lib folder I didn't have the same files I have in enterprise. I can see that when I did mvn install in \plugins\skinx\target there is xwiki-plugin-skinx-1.12-SNAPSHOT.jar. Where is meant to configure that xwiki load xwiki-plugin-skinx-1.12-SNAPSHOT.jar and the other plugins? Because when I imported war file in eclipse, xwiki-plugin-skinx-1.12-SNAPSHOT.jar does not appear in plugins folder. Now my xwiki.cfg has: xwiki.plugins=\ com.xpn.xwiki.monitor.api.MonitorPlugin,\ com.xpn.xwiki.plugin.calendar.CalendarPlugin,\ com.xpn.xwiki.plugin.feed.FeedPlugin,\ com.xpn.xwiki.plugin.ldap.LDAPPlugin,\ com.xpn.xwiki.plugin.google.GooglePlugin,\ com.xpn.xwiki.plugin.flickr.FlickrPlugin,\ com.xpn.xwiki.plugin.mail.MailPlugin,\ com.xpn.xwiki.plugin.packaging.PackagePlugin,\ com.xpn.xwiki.plugin.query.QueryPlugin,\ com.xpn.xwiki.plugin.svg.SVGPlugin,\ com.xpn.xwiki.plugin.charts.ChartingPlugin,\ com.xpn.xwiki.plugin.fileupload.FileUploadPlugin,\ com.xpn.xwiki.plugin.image.ImagePlugin,\ com.xpn.xwiki.plugin.captcha.CaptchaPlugin,\ com.xpn.xwiki.plugin.userdirectory.UserDirectoryPlugin,\ com.xpn.xwiki.plugin.usertools.XWikiUserManagementToolsImpl,\ com.xpn.xwiki.plugin.zipexplorer.ZipExplorerPlugin,\ com.xpn.xwiki.plugin.autotag.AutoTagPlugin,\ com.xpn.xwiki.plugin.lucene.LucenePlugin,\ com.xpn.xwiki.plugin.diff.DiffPlugin,\ com.xpn.xwiki.plugin.rightsmanager.RightsManagerPlugin,\ com.xpn.xwiki.plugin.skinx.JsSkinExtensionPlugin,\ com.xpn.xwiki.plugin.skinx.JsSkinFileExtensionPlugin,\ com.xpn.xwiki.plugin.skinx.CssSkinExtensionPlugin,\ com.xpn.xwiki.plugin.skinx.CssSkinFileExtensionPlugin And in \WebContent\WEB-INF\lib I have xwiki-plugin-skinx-1.12-SNAPSHOT.jar but it occurs the same :(. Thanks!! Hi Luis, Luis Ruiz wrote: > Hello, > > I have compiled xwiki-web-standard-2.1- SNAPSHOT + Oracle 10G but when I run > it, everything it's ok but I can see things like this in every page: > > $xwiki.jsfx.use('js/scriptaculous/effects.js', true) > $xwiki.jsfx.use('js/xwiki/widgets/modalPopup.js', true) > $xwiki.ssfx.use('js/xwiki/widgets/modalPopup.css', true) > $xwiki.jsfx.use('js/xwiki/widgets/jumpToPage.js', true) > $xwiki.ssfx.use('js/xwiki/widgets/jumpToPage.css', true) > $xwiki.jsfx.use('uicomponents/widgets/confirmationBox.js', true) > $xwiki.ssfx.use('uicomponents/widgets/confirmationBox.css', true) > $xwiki.jsfx.use('uicomponents/widgets/confirmedAjaxRequest.js', true) > $xwiki.jsfx.use('uicomponents/widgets/notification.js', true) > $xwiki.ssfx.use('uicomponents/widgets/notification.css', true) > > $xwiki.jsfx.use('js/xwiki/viewers/attachments.js', {'forceSkinAction': true, > 'language': > ${context.language}})$xwiki.ssfx.use('js/xwiki/viewers/attachments.css', > true > > > I haven't imported an .xar yet. I even tested with a correct xwiki.cfg from > an enterprise windows installation but it continues doing the same. I have > googled and I have read that I must include jsfx and ssfx plugins, but > where? In xwiki.cfg, there is a xwiki.plugins property whose value should contain: com.xpn.xwiki.plugin.skinx.JsSkinExtensionPlugin,\ com.xpn.xwiki.plugin.skinx.JsSkinFileExtensionPlugin,\ com.xpn.xwiki.plugin.skinx.CssSkinExtensionPlugin,\ com.xpn.xwiki.plugin.skinx.CssSkinFileExtensionPlugin,\ Also, can you confirm you have the xwiki-plugin-skinx jar in your WEB-INF/lib directory? Hope this helps, Marius

2 3

[xwiki-devs] [VOTE] Add a ScriptService component role for components to expose APIs to scripting service
by Jerome Velociter 04 Nov '09

04 Nov '09

Hello all, We need to be able to expose APIs to scripting languages. Following the idea initially expressed by Vincent in this thread http://lists.xwiki.org/pipermail/devs/2009-August/013934.html, I would like to propose the following : - We add a org.xwiki.script.ScriptService component role, which is an empty tag interface that services class implements - A org.xwiki.script.ScriptServiceManager implementation gets all services injected in a roleHint/service map - This script service manager gets injected where script bindings are initialized and is bound "as is" with under "services" name. Currently in two places : in the XWikiScriptContextInitializer and in the DefaultVelocityManager (since velocity is treated separetely from JSR223 scripting languages for the moment). I've uploaded an initial patch on http://jira.xwiki.org/jira/browse/XWIKI-4551 if you want to give a look. My +1 Jerome.

3 7

[xwiki-devs] [ANN] XWiki Enterprise 2.0.3 and XWiki Enterprise Manager 2.0.3 Released
by Thomas Mortagne 03 Nov '09

03 Nov '09

The XWiki development team is pleased to announce the release of XWiki Enterprise 2.0.3 and XWiki Enterprise Manager 2.0.3. Go grab it at http://www.xwiki.org/xwiki/bin/view/Main/Download This release fix one important regressions (broken statistics) and add many Watchlist improvements and bufixes. For more informations see the Release notes at: http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXWikiEnterprise203 and http://www.xwiki.org/xwiki/bin/view/Main/ReleaseNotesXEM203. Thanks - The XWiki dev team

1 0