Adrian Crum
7d4a943c2a
Revert 928451.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928460 13f79535-47bb-0310-9956-ffa450edef68
2010-03-28 17:46:45 +00:00
Adrian Crum
0b9abb6a8b
Simplified label html renderer macro.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928451 13f79535-47bb-0310-9956-ffa450edef68
2010-03-28 16:48:22 +00:00
Jacques Le Roux
cfe8ef9dec
Oops, wrong commit at r928304. I thought I was in the lookup block, moreover I put one quote too many :/. To be revisited...
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928307 13f79535-47bb-0310-9956-ffa450edef68
2010-03-27 23:59:24 +00:00
Jacques Le Roux
a323ba2de6
A little improvement for sight impaired users
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928304 13f79535-47bb-0310-9956-ffa450edef68
2010-03-27 23:28:18 +00:00
Jacques Le Roux
3e33b7c700
To be consistent with definitions in widget-form.xsd, change renderLookupField attributes names prefixed by lookup to no prefixes (eg lookupPresentation becomes presentation)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928240 13f79535-47bb-0310-9956-ffa450edef68
2010-03-27 17:50:16 +00:00
Adrian Crum
a88013f96c
Restored the original Binding setup used for Groovy scripts.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927173 13f79535-47bb-0310-9956-ffa450edef68
2010-03-24 20:23:58 +00:00
Adrian Crum
7125cab539
Small fixup for last commit.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926825 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 22:44:29 +00:00
Adrian Crum
50cc22e375
Added the ability for screen widgets to invoke Groovy script methods. Groovy script methods do not have parameters; parameters are passed in the context - just like other screen widget actions. To use:
...
<actions>
<script location="groovyLocation#methodName"/>
</actions>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926819 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 22:34:54 +00:00
Andrew Zeneski
495ae7e99b
fixed issue with firefox opening the clear links in a new window; changed the javascript to onclick; href is now just a javascript:void()
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926761 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 20:11:53 +00:00
Erwan de Ferrieres
415b2b3fe3
Adding alternate parameter to all the renderers. This was forgotten at r926006
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926250 13f79535-47bb-0310-9956-ffa450edef68
2010-03-22 18:31:47 +00:00
Andrew Zeneski
538a0d8829
added link + javascript to clear lookup field when the text area is disabled; also clears the description field if it exists
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926207 13f79535-47bb-0310-9956-ffa450edef68
2010-03-22 17:32:25 +00:00
Erwan de Ferrieres
14ca433955
Adding alternate tag when using hyperlink in forms. If the image is not found, then the alternate text will be displayed
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@926006 13f79535-47bb-0310-9956-ffa450edef68
2010-03-22 09:10:24 +00:00
Scott Gray
6109808c8a
Tabs to spaces
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924378 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 17:28:01 +00:00
Adam Heath
2eb1768f1d
Fix lots of bad xhtml tags, need to have a space before the ending /.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@923545 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 01:56:41 +00:00
Jacques Le Roux
9652e69f8f
Allow double quote in title. This is possible because, at least OOTB, all title should be localized. Hence from a label in an XML file, and nothing prevent to use double quotes there
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921773 13f79535-47bb-0310-9956-ffa450edef68
2010-03-11 10:17:15 +00:00
Jacques Le Roux
a7a09a0817
As suggested by Adam and Scott move the encodeQuotes static method (actually renamed encodeDoubleQuotes) from UtilHttp to FreeMarkerWorker
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921714 13f79535-47bb-0310-9956-ffa450edef68
2010-03-11 07:57:27 +00:00
Jacques Le Roux
ca38a526fa
Following r921421, here is the right and simplest solution (KISS way).
...
Simply encoding the tooltip (why I did not think about that before, really sometimes I wonder how my brain is working, I need to stop working for it to begin to work)
There are no needs to encode char like >, but of course < is needed (in he XML file) since else there is a problem in the XML labels file (always the same issue: around vs inside)
So yes, it's only a matter of encoding at the right place, ie before the "around vs inside" issue arises
Good night ;)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921643 13f79535-47bb-0310-9956-ffa450edef68
2010-03-11 00:20:57 +00:00
Jacques Le Roux
9fbb7f392c
Fix a small encoding bug found in Example Widget form
...
Set default values for fields 4&5 (time dropdowns)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921401 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 15:29:44 +00:00
Jacopo Cappellato
0e57369c97
Reverted rev. 920359 (by erwan) and reimplemented in a cleaner way by refactoring the renderHyperlinkTitle code.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921397 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 15:21:23 +00:00
Jacopo Cappellato
32aa30cfcb
Minor code simplification: no functional changes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921305 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 11:15:30 +00:00
Erwan de Ferrieres
dbc53a2fb8
html string encoding for alternate and description tags on image field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921287 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 10:24:33 +00:00
Erwan de Ferrieres
80b67af4e4
Correcting a wrong macro name (missing letter)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921109 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 20:32:47 +00:00
Erwan de Ferrieres
060a8e14de
Adding missing tags in r920770 as spotted on the dev mailing list in the *FormMacroLibrary.ftl files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921099 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 20:22:35 +00:00
Erwan de Ferrieres
245534d516
Adding description and alternate text on a field type="image"
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920770 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 10:18:54 +00:00
Scott Gray
42cffa5c24
[CVE-2010-0432] Multiple fixes to the macro and html form widget renderers to ensure that all output is encoded when necessary.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920372 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 16:05:24 +00:00
Scott Gray
8d2545c68e
[CVE-2010-0432] Menu widget links of type hidden-form were not correctly encoding the value attribute.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920369 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 16:05:09 +00:00
Erwan de Ferrieres
84c5f1b037
When making CSV or PDF exports, and having sort-field as table headers, the descriptions weren't displayed in the exported documents.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920359 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 15:36:04 +00:00
Bruno Busco
ef3857b87e
Added parameter default values to renderLookupField and renderNextPrev macros.
...
This allows to call the macro in the FTL files without specifying all the parameters.
Part of OFBIZ-3541
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920116 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 21:15:36 +00:00
Bruno Busco
458e17a104
The widgets macros are now usable in the FTL files also.
...
Using these macros in FTL should improve code reuse and avoid having different HTML between widgets based screens and FTL based ones.
This has been developed in OFBIZ-3541.
Thank you Bilgin and Jacques for reviewing and improving the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920115 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 21:11:16 +00:00
Jacques Le Roux
9014106755
A modified patch from Sascha Rodekamp "Some improvements for the layer lookup" ( https://issues.apache.org/jira/browse/OFBIZ-3524 ) - OFBIZ-3524
...
A little fix for the faded background and make fading as default.
I have also refactored a bit the lookups examples fields
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920061 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 19:23:42 +00:00
Scott Gray
f55d6f8fe4
Added missing svn props, no code changes
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918840 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 03:37:57 +00:00
Jacques Le Roux
ff4623a475
Re-apply r912645
...
<<Make use of FSE.expand(), instead of expandString, to provide support
for direct setting of values in widgets. This closes OFBIZ-3486.>>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918476 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 14:03:19 +00:00
Jacques Le Roux
423ce79a21
A slightly modified patch from Sascha Rodekamp " Some improvements for the layer lookup" ( https://issues.apache.org/jira/browse/OFBIZ-3524 ) - OFBIZ-3524
...
A flag was added to fade the background behind the layered lookup (ie all the screen but the lookup) when a layer is opened.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917940 13f79535-47bb-0310-9956-ffa450edef68
2010-03-02 10:02:04 +00:00
Jacques Le Roux
292f1cda85
This allows to hide the field at left of the lookup button. It may be used to chain an action without coming back to the original place, so the field make any sense. In my case reassigning a work effort from a list.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917152 13f79535-47bb-0310-9956-ffa450edef68
2010-02-28 09:58:29 +00:00
Hans Bakker
df4af4bd37
Ebaystore:
...
fixed error in xml form when use radio field type.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916546 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 03:01:59 +00:00
Adam Heath
b0192e663c
Reverting 912645, for now, until I have time to investigate further.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915650 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 03:31:49 +00:00
David E. Jones
e72da60d42
Fixed issue where link parameters where not adjusted for TimeZone, though they are expected to be in the event processing which causes links and such with times and timestamps, and sometimes dates, to not match what they came from; now time zone adjustment is done for link parameters
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915644 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 02:31:37 +00:00
Bilgin Ismet Ibryam
149a5a0909
Allow hiding header for multi forms.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915516 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 20:59:31 +00:00
Adam Heath
350a287883
Make use of FSE.expand(), instead of expandString, to provide support
...
for direct setting of values in widgets. This closes OFBIZ-3486.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912645 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 16:34:47 +00:00
Bruno Busco
2302c33259
Fixed wrong markup for Date-Time field introduced in rev. 911079.
...
Thank you Adrian for reporting in ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@911305 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 10:05:41 +00:00
Bruno Busco
ee1f838fa3
Removed unused calGif parameter from Form rendering Macros
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@911186 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 21:57:22 +00:00
Bruno Busco
024a4afc4d
The Visual Theme can now re-define the calendar button icon
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@911079 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 17:17:52 +00:00
Jacopo Cappellato
6ed667e6d9
Added newly added (in rev. 908894) renderDisplayField input arguments.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@908912 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 10:33:19 +00:00
Erwan de Ferrieres
311e0d14ac
Adding a new field type in forms' display so we can display an image and keep a list's consistency
...
Example :
<field name="displayProduct" use-when="!"foo".equals(productId)">
<hyperlink target="EditProduct" image-location="/images/next.gif" also-hidden="false"/>
</field>
<field name="displayProduct" use-when=""Cap".equals(productId)">
<display type="image" image-location="/images/ofbiz.ico"/>
</field>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@908894 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 09:27:01 +00:00
Erwan de Ferrieres
636239c235
Remove the differences in columns in a fom as reported by Nicolas Malin on the dev mailing list.
...
More details on this issue here : https://issues.apache.org/jira/browse/OFBIZ-3444 with screenshots and an example
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@906973 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 15:31:48 +00:00
Jacques Le Roux
2b1c7c2292
The syntax of the new attributes introduced by the layer lookup were verbose.
...
We know we are in a lookup element and no attributes interfere. So I reduced the verbosity by removing the "lookup-" part everywhere it was possible (ie everywhere)
So we go from
lookup-presentation
lookup-height
lookup-width
lookup-position
to
presentation
height
width
position
in the lookup element
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@906584 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 18:02:38 +00:00
Jacques Le Roux
609898f9f6
A slightly modifief patch from Sascha Rodekamp "The positioning mechanism of the new lookups is only working with the bizznesstime theme" ( https://issues.apache.org/jira/browse/OFBIZ-3430 ) - OFBIZ-3430
...
For the moment I only removed comments around an error which is useful. I guess Sascha was blocked by it during his tests and forgot to remove it. BTW I improved the error and one related (variables names explicit)
I will certainly do a review on the format later to avoid both in the same commit (if any changes are needed anyway)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@906524 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 15:30:50 +00:00
Adrian Crum
667b8e9a5c
As discussed on the dev mailing list, eliminated checks for FlexibleStringExpander.getOriginal() returning null. Use FlexibleStringExpander.isEmpty() instead.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@905863 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 01:44:24 +00:00
Bilgin Ismet Ibryam
32881a0747
Added missing HtmlTreeRenderer to screen context. Bug reported by Jens Oechsler in user list.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@905581 13f79535-47bb-0310-9956-ffa450edef68
2010-02-02 11:12:45 +00:00
Jacques Le Roux
84c1ca9272
Fix an issue when using the layer lookup with a fieldLookup3 style lookup (ie a lookup which shows name but uses an Id underneath).
...
This last fix allows to use the layer lookup in any cases already covert by OFBiz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@904922 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:09:53 +00:00