Jacopo Cappellato
711a3b619d
Mostly completed the implementation of widget macro renderers for xml and text output.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763520 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 06:01:21 +00:00
Jacopo Cappellato
a02c3abaa8
A bunch of fixes and enhancements to the new widget renderers based on Freemarker macros.
...
Converted to new technology the xsl-fo renderer and view handler.
Better handling of platform dependent templates included in screens: the proper one is now choosen according to the name of the renderer; the name is returned by a new method of the widget renderer interface.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763511 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 04:14:38 +00:00
Jacques Le Roux
b9c3ddef08
2d part and end of an effort to remove trailing spaces
...
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg )
Of course this effort to remove trailing spaces has no functional implications.
Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {
So these changes are also in this commit, should not be a problem anyway.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacopo Cappellato
640e11b07c
Misc fixes and enhancements to the new Macro renderer stuff.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762727 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 12:06:03 +00:00
Jacopo Cappellato
64b3ffefd3
Added some code, commented out, for upcoming (hopefully) implementation of macro renderers for menu and tree widgets
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761664 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 13:14:51 +00:00
Jacopo Cappellato
66bd9ee52e
Work in progress, commented out for now, to convert table based layout for single forms to divs.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761521 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 04:40:18 +00:00
Hans Bakker
f1a117cced
give error message instead of NPE
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761178 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:20:59 +00:00
Hans Bakker
42a3130c65
only check for privat portal pages in the menu if a user is logged in
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761177 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:18:49 +00:00
Jacopo Cappellato
a6c633bf34
Several minor cleanups (most of them are formatting fixes); part of OFBIZ-1235
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761173 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:09:45 +00:00
Jacopo Cappellato
4f98f0c316
Committed patch from Guo Weizhan, part of OFBIZ-1235: mostly completed implementation of the form renderer based on Freemarker macros. The patch contains some small (mostly formatting) issues that I will clean up tomorrow. Now the new renderers and view handlers are ready for testing.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760976 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 17:33:58 +00:00
Hans Bakker
1b23be60c1
cleanup in myportal, move taskslist back to project manager
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759965 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 13:36:47 +00:00
Jacopo Cappellato
9fe4d7064a
Reverted some comments that I erroneously committed in rev 759871.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759875 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 08:37:10 +00:00
Jacopo Cappellato
0c987ea969
Applied patch (second part of jis work) from Guo Weizhan for OFBIZ-1235 (new widget renderes based on Freemarker macros): note this is still a work in progress.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759871 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 08:32:37 +00:00
Adam Heath
453ad64ed5
Fix lines that *only* have whitespace.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759246 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:59:28 +00:00
Jacopo Cappellato
559e380427
Applied patch (with minor modifications) from Guo Weizhan for OFBIZ-1235 (new widget renderes based on Freemarker macros): note this is still a work in progress.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759086 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 10:11:46 +00:00
David E. Jones
3c6eb0b5d3
Remove log message I left in there by accidento
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757313 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 03:51:28 +00:00
Adam Heath
4161d4e2bf
Fix purely empty whitespace lines, and remove trailing whitespace.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757077 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:24:58 +00:00
Jacopo Cappellato
ceb610498a
This is a work in progress for a refactoring of the various screen and form widget renderers; the new renderer will create output by calling Fremarker macros defined in external (configurable) files; the work is still not complete, and for this reason it is not enabled yet. Part of task OFBIZ-1235
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756369 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 08:21:11 +00:00
Jacques Le Roux
0e0519e802
All tabs to 4 spaces in *.groovy, *.java, *.xml
...
Done with Eclipse S/R "\t"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755696 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 18:43:49 +00:00
David E. Jones
d1d6b46ab8
Added auto option for link-type that will figure out if a hidden-form is needed or not; the hidden-form option will only work for intra-app links that refer to a request that calls an event; changed the ProductForms hyperlink defs to not specify a link-type any more and just use the auto; note that for targets with parameters inline in the URL and not in the parameter sub-element the parameters will still be in the form action and not in hidden fields, so those need to be changed for this to be effective
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755377 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 20:05:34 +00:00
David E. Jones
34f9e0a0f6
Added link-type=hidden-form attribute and parameter sub-element to the menu and screen widget link elements; some refactoring and cleanup to avoid too much code redundancy in this (though there is certainly still quite a bit here); changes the MyPortalMenus.xml#CommSubTabBar to use this since it is an example reported by Bilgin; WARNING: I don't have a good test case for this so testing from Bilgin or I guess Hans would be very appreciated
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755022 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 22:12:30 +00:00
David E. Jones
1a908b3421
Added support for the parameter sub-element and the link-type attribute to the sub-hyperlink element, though all of them seem to go to links and not to requests that call services so this isn't needed as far as I can tell so far
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754811 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 03:53:52 +00:00
David E. Jones
205c28a30f
Finished link-type=hidden-form support for type=multi forms, using the EditFeatureGroupAppls page/form as a test case, with improvements now in place there
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754637 13f79535-47bb-0310-9956-ffa450edef68
2009-03-15 09:15:30 +00:00
David E. Jones
deb37314b9
Enhanced Form Widget hyperlink type field to support a link-type of hidden-form and to be able to put parameters in a sub-element with name/value (or from-field) pairs; used the EditProductPrices page in the catalog manager as a test case, especially for the Delete ProductPrice links; also improved the URLs there with request-redirect; this is part of the effort to make things generally more secure as parameters are passed in the body and under https will be encrypted; note that this doesn't support multi type forms yet
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754626 13f79535-47bb-0310-9956-ffa450edef68
2009-03-15 07:41:31 +00:00
Adam Heath
4a69ab1e71
I got ahead of myself; there were more cases of broken english in
...
error messages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753241 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 13:32:59 +00:00
Adam Heath
5d5814cbf7
Make some error messages better english, and improve what they say.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@753240 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 13:29:39 +00:00
David E. Jones
419bd1e381
Changed tree widget code to use plain space instead of nbsp in order to work better with the encoding, and not actually show the ampersand and semicolon; thanks to Marco for pointing this out
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752806 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 08:20:54 +00:00
Hans Bakker
883ff808a1
and a comment from adrian and adam
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751348 13f79535-47bb-0310-9956-ffa450edef68
2009-03-08 01:44:24 +00:00
Hans Bakker
3279dfa17a
remove spaces around the '=' sign in the html src statement...pointed to by Jacques...(no problem if you correct it :-) )
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751346 13f79535-47bb-0310-9956-ffa450edef68
2009-03-08 01:18:38 +00:00
Jacques Le Roux
fe92b4d177
a "if(" has slipped in r751066
...
Please take care of
http://java.sun.com/docs/codeconv/html/CodeConventions.doc7.html#682
http://java.sun.com/docs/codeconv/html/CodeConventions.doc9.html#331
http://java.sun.com/docs/codeconv/html/CodeConventions.doc6.html#430
(actually of all these conventions)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751220 13f79535-47bb-0310-9956-ffa450edef68
2009-03-07 08:12:32 +00:00
Jacques Le Roux
b4d2ff078b
A patch from Stephen Rufle "WidgetWorker outputting empty image tags." ( https://issues.apache.org/jira/browse/OFBIZ-2230 ) - OFBIZ-2230
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751066 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 20:42:51 +00:00
Jacques Le Roux
f796e230d2
catch( => catch(
...
}else => } else
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751005 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:55:43 +00:00
Jacques Le Roux
fc6db9e886
if( => if (
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750997 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:36:09 +00:00
Jacques Le Roux
13a934f823
In spirit of Adam's r749341 and following http://java.sun.com/docs/codeconv/html/CodeConventions.doc7.html#489
...
The idea is also that a lot of code is duplicated and then changed (copy/paste). Hence having a rightly formatted code help to keep it rightly formatted
1st (simple) step : ){ => ) { (I checked all occurrences but of course other pairs of eyeballs are welcome)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@750993 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 17:31:13 +00:00
David E. Jones
e13468762e
Small change to allow for a null context which is used in the artifact info stuff
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749961 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 10:54:53 +00:00
Jacques Le Roux
bc0a179886
Better comment
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748814 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 11:03:30 +00:00
Jacques Le Roux
00557ef41b
This is a generalized solution for an issue reported on dev ML <<encode-output="false" for display type="currency">>
...
By default encode-output is true for display fields. If the type is currency an amount like 1260 will be rendered as US$1,260.00 in USA but should be rendered 1 260,00 $ in France.
So with encoding an is introduced in place of the space. And finally it's not rendered as 1 260,00 $ but as 1,00 $ which is ... false!
See also r747364
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748803 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 10:04:30 +00:00
David E. Jones
2471cffc96
Addressed more issues with output encoding, based on feedback from Michele Orru in OFBIZ-1959 plus looking for other similar problems in code, and some random testing around; this should catch quite a bit more stuff as there were various places in the form, menu, tree and screen widgets that needed output encoding for data to be presented to the user through a browser; also a few cleanups here and there
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746409 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 23:00:36 +00:00
David E. Jones
ee8708e9b2
No functional changes, just type/generics cleanups
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746303 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 17:41:48 +00:00
Hans Bakker
27775ded91
add a picture to the hyperlink keyword in a form to allow moving records up/down and not showing the sequenceNum field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745434 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 08:52:59 +00:00
Hans Bakker
f43d2f1ecf
improved menu widget for portal pages, reactivated menuitem override and various other improvements
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744675 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 15:10:50 +00:00
Jacques Le Roux
01cce258d5
This fix "Encoding issue in screenFop" https://issues.apache.org/jira/browse/OFBIZ-2183 - OFBIZ-2183
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744061 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 10:58:24 +00:00
Hans Bakker
daebecd9d5
created a new attribute on the menu widget: portal-page. With this change the example component is now changed back to use the menu widget again however also serving the portal page buttons
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743639 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 07:26:16 +00:00
Jacques Le Roux
10d468f314
Fix an issue about Delivery Schedule Info reported on user ML. I checked it's fine in other cases.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742716 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 20:16:15 +00:00
David E. Jones
7d5264a0e8
Fixed appbar issue with html encoding, so general encoding turned back on too
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742030 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 09:05:45 +00:00
David E. Jones
8eb602faf7
Commented out lines that cause the general html encoding, need to track down problem with app bar in manager apps
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742016 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 08:18:37 +00:00
David E. Jones
ebd5c3e78f
Implemented StringModel extension and BeansWrapper extension to load it in order to encode strings for HTML use; this is only done throught the HtmlWidget class that is part of the screen widget, so won't interfere with other FTL uses; note that there is other experimental code in here for wrapping the GenericValue object for html encoding, but that option wasn't very complete so went this way instead; this option behaves better and is more transparent than that escape x as x?html option for FTL files; there are also a few cleanups of typos and things in here; note that this means we have a different Configuration object and so a different template cache, and so we have different cache settings and such; after applying this I found a few places that encoded things they shouldn't but for the most part it is pretty good; will be committing some changes in applications in a bit to resolve a couple of these issues in ecommerce; all should watch out for funny things showing up as HTML text instead of being interpreted by the browser as HTML, meaning it was encoded; in extreme cases just comment out lines 71-73 of HtmlWidget.java to turn off this encoding
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742013 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 07:40:40 +00:00
David E. Jones
cea6620fbd
Added general usage of ESAPI HTML and XML encoding for the form widget; removed the old partially implemented use of the StringEscapeUtils stuff; includes attribute on the form field element called encode-output that is true by default so if HTML encoding is not desired then must be set to false
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741857 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 08:56:19 +00:00
David E. Jones
afb434f132
More log message refinements for more info, but less message and noise
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741742 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 21:37:42 +00:00
David E. Jones
3f3f0008d8
Some small changes so that something like the recent nbsp in a labels file won't cause everything to fail, ie just noisily log the error and treat the file/label as missing
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741692 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 19:45:53 +00:00