Commit Graph
1568 Commits
Author SHA1 Message Date
Scott Gray 94bc3f63ca Put the null check a little higher so that it actually does the check before an NPE can occur. Giving up on this transform, I hate the content component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941139 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 02:25:26 +00:00
Scott Gray 8bc1d451e0 Document the list of transform arguments (no idea what they do at the moment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941130 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 01:13:58 +00:00
Scott Gray 5f0606e67f Rearrange some local variables in the hope of making things more readable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941129 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 01:13:47 +00:00
Scott Gray 7f6d3ade75 Replace the copy/paste class description with a description I found in an old commit log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941126 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 00:46:45 +00:00
Scott Gray f3855603ac Remove unused methods ahead of trying to figure out what the hell the transform does.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941119 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 00:17:17 +00:00
Erwan de Ferrieres 585db14ada Update on r938816 to make portals menus work again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941007 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 19:44:05 +00:00
Bilgin Ismet Ibryam 0c28946a40 Moved autocompleter indicator creation to javascript.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940274 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 17:44:01 +00:00
Adrian Crum 2f3e21e31b Fixed a problem with the Ajax auto-completer code. Empty src attribute in an img element causes some browsers to load the page more than once.
Many thanks to Scott for pointing me in the right direction.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940245 13f79535-47bb-0310-9956-ffa450edef68
2010-05-02 15:10:36 +00:00
Adrian Crum ed0e37d5c3 Turn off noisy logging.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939896 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 01:32:01 +00:00
Jacques Le Roux 62a4f24086 A last patch from Chris Snow "Provide better user help" (https://issues.apache.org/jira/browse/OFBIZ-3702) - OFBIZ-3702
Answers the last point Scott outlined on dev ML



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939479 13f79535-47bb-0310-9956-ffa450edef68
2010-04-29 20:46:44 +00:00
Jacques Le Roux ad20beb7a9 An improving patch from Chris Snow "Provide better user help" (https://issues.apache.org/jira/browse/OFBIZ-3702) - OFBIZ-3702
Answers 3 of 4 points Scott outlined on dev ML



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939216 13f79535-47bb-0310-9956-ffa450edef68
2010-04-29 06:39:25 +00:00
Jacques Le Roux 2f6a7c3d09 A slightly modified patch from Chris Snow "Provide better user help" (https://issues.apache.org/jira/browse/OFBIZ-3702) - OFBIZ-3702
Provides help by hovering over the field label. See Example for... an example :o) And also https://issues.apache.org/jira/secure/attachment/12442717/fieldLabelTooltip2.png


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938844 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 10:02:57 +00:00
David E. Jones 168b7fce65 Refactored the various link getParameterList methods to return a Map and expand with the context like most of the other get methods that are used during rendering; that is the biggest change but was part of adding a parameters-map attribute to the form widget hyperlink element to be able to use a script to prepare part or all of the parameters map used in the hidden form instead of having to manually declare all parameters
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938816 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 08:33:37 +00:00
Erwan de Ferrieres 0996aaac34 Modifying the description for accounting-number, adding the mention that it's configurable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938019 13f79535-47bb-0310-9956-ffa450edef68
2010-04-26 12:34:33 +00:00
Erwan de Ferrieres e268db4a97 Adding a new display type "accouting-number", which allows to display negatives in parentheses
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937964 13f79535-47bb-0310-9956-ffa450edef68
2010-04-26 08:51:25 +00:00
Jacques Le Roux e714f96c66 Closes "Replace popup lookups by layer lookups" (https://issues.apache.org/jira/browse/OFBIZ-3442) - OFBIZ-3442
Not all cases have been resolved but this patch takes this into account and should not introduce any not known issues. These issues are identified at "Layer popup umbrella main task" (https://issues.apache.org/jira/browse/OFBIZ-3445). They will be resolved later and are actually bugs so will be committed later when fixed. They are
* "Allow to open a layer lookup from a layer lookup" (https://issues.apache.org/jira/browse/OFBIZ-3446) and its specific case "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693)
* "The minimize/enlarge buttons (+ -) blocks the layer" (https://issues.apache.org/jira/browse/OFBIZ-3692)
* "When you get disconnected (time out) from a layered lookup, you then get afterward ugly screens" (https://issues.apache.org/jira/browse/OFBIZ-3450)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937852 13f79535-47bb-0310-9956-ffa450edef68
2010-04-25 18:49:01 +00:00
Erwan de Ferrieres f0eb1cf0b0 Enabling localization for portal page names, adding the CommonPortalEntityLabels file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936845 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 13:50:24 +00:00
Bilgin Ismet Ibryam 4513ee6a09 Enabled lookup descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936638 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 07:46:41 +00:00
Jacques Le Roux d8515b0d03 The recent CSS changes had an impact on clearText position.
I quickly commit but if I had enough time I would prefer to put the style as a class in the themes CSS files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936175 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 06:50:16 +00:00
Erwan de Ferrieres 6f83531f2e Modifying French uiLabels to have them shorter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935892 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 12:29:09 +00:00
Andrew Zeneski d581e1f823 text-find can also include 'numeric' fields; added lessThan, greaterThan options to the schema (code support was already there)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935687 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 18:00:24 +00:00
Bruno Busco 0cb13d9b58 A patch from Blas Rodriguez Somoza
OFBIZ-3708 - Fields should be defined with span not div. (radio, date, lookup)
https://issues.apache.org/jira/browse/OFBIZ-3708
Field markup should be a valid inline element.

Defining fields with div (block) instead of span (inline) creates several problems:

    * Missalignments in screen. (See LOOKUP_CAL screenshots)
    * Implies a end-of-line after the div. (See CAL screenshots)
    * If used inside inline elements which should be OK, becames XHTML validation errors. (Manufacturing -> MRP -> MRP log)

Because this is a markup problem, it spans to all the themes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935312 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 08:06:28 +00:00
Bruno Busco d5c2d0d92f A slightly changed (tabs replaced with spaces) patch from Blas Rodriguez Somoza
OFBIZ-3671 - XHTML validation errors (framework/widget) In xml (xhtml) ID must be unique
https://issues.apache.org/jira/browse/OFBIZ-3671

In XML id is a special attribute which must be unique.

    * ModelFormField.java must have the method getCurrentContainerId which is already on ModelForm
    * MacroFormRendered and HtmlFormRenderer must be modified to use the getCurrentContainerID instead of getIdName
    * htmlFormMacroLibrary. span id must be different from the associated hidden field.

Also:

htmlFormMacroLibrary
Line 73: readonly attribute without value.
Lines 102.103: better formatted, more readable javascript call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935197 13f79535-47bb-0310-9956-ffa450edef68
2010-04-17 16:10:24 +00:00
Scott Gray d5c795b8f0 Doh, forgot to remove the import
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935143 13f79535-47bb-0310-9956-ffa450edef68
2010-04-17 07:48:33 +00:00
Scott Gray 2d64fd155b Removed unused import, removed implements declaration (the superclass already declares it) and removed some unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935142 13f79535-47bb-0310-9956-ffa450edef68
2010-04-17 07:47:09 +00:00
Erwan de Ferrieres 08359da5c5 removing image path from request parameters after rendering the given hyperlink to avoid associating it to other link not having images in a list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933244 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 14:08:02 +00:00
Bilgin Ismet Ibryam 12c181dea7 Added missing macro renderer parameters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933134 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 08:14:42 +00:00
Bilgin Ismet Ibryam 82a5bf6b02 A patch from OFBIZ-3555 "Show lookup value descriptions". This enhancements allows displaying a description for the IDs in lookup fields. To enable this feature set widget.lookup.showDescription to Y in widget.properties
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933130 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 07:54:10 +00:00
Bilgin Ismet Ibryam 906d1cd234 Fixed wrong argument name passed to renderContainerField macro. Thanks to Blas for reporting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933099 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 06:13:40 +00:00
Bruno Busco ea99105d8c A slightly changed patch from Blas Rodriguez Somoza
OFBIZ-3626 - XHTML validation errors (framework/widget) Bugs in ModelForm (fieldgroups, itemrows with links)
https://issues.apache.org/jira/browse/OFBIZ-3626

Errors in ModelForm in fieldgroups and itemrows.
I only removed some tabs and added curly brackets


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932840 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 06:29:53 +00:00
Scott Gray 80804f0931 Removed usage of the deprecated macro renderer constructors
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932174 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 23:23:33 +00:00
Scott Gray 5796fe94d7 Deprecated the form and screen macro renderer constructors and added new ones that don't take an Appendable as an argument
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932173 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 23:23:25 +00:00
Scott Gray a255f30b29 Fixed a bug in the macro form renderer where the writer being passed in to the render* methods was being ignored and the writer supplied in the constructor was being used instead, this causes problems when multiple writers are being used to render a page.
Solved by ignoring the writer passed into the constructor (I'll deprecate that constructor and put in a new one shortly) and instead maintaining a separate freemarker environment for each appendable passed into the renderer using a WeakHashMap.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932172 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 23:14:17 +00:00
Scott Gray 1f29264b91 Fixed a bug in the macro screen renderer where the writer being passed in to the render* methods was being ignored and the writer supplied in the constructor was being used instead, this causes problems when multiple writers are being used to render a page.
Solved by ignoring the writer passed into the constructor (I'll deprecate that constructor and put in a new one shortly) and instead maintaining a separate freemarker environment for each appendable passed into the renderer using a WeakHashMap.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932171 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 23:14:12 +00:00
Scott Gray 44e130fc03 Removed an unused import and a couple of unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932164 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 23:13:33 +00:00
Scott Gray 7263531123 I can never remember if the timeout is seconds or milli-seconds, so I've added documentation to remind me.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931774 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 04:08:47 +00:00
Scott Gray 9658e8c30e Remove some unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931422 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 03:51:02 +00:00
Scott Gray 9b4de5dadc Added support for setting a class attribute (using widget-style) on the div rendered by ContainerField.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931416 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 03:31:24 +00:00
Scott Gray 990e174e75 Cleaned up renderContainerFindField [sic] to use the writer directly
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931393 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 01:06:14 +00:00
Scott Gray 3f0a06483f Removed an unnecessary cast, some autogenerated TODO commments and added a missing @Override
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931378 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 00:18:52 +00:00
Scott Gray 29bf43bb3a Removed a field declaration that was already present on the superclass
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931377 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 00:18:47 +00:00
Scott Gray 0b42ce7ffa A few basic code cleanups, nothing functional:
- Static field wasn't being accessed in a static way
- Removed a bunch of unnecessary casts
- Removed a redundant null check

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931374 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 23:57:22 +00:00
Bilgin Ismet Ibryam e2c539b0ef Removed double ampersands from autoCompleterTarget, because it was breaking autocompleters.
Autocompleter code (a third party library) expects only one ampersand and adds the second one itself during ajax call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930670 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 12:28:33 +00:00
Bilgin Ismet Ibryam 2c208a4b35 Using == is more readable than = for comparisons (even both work the same way in FTLs)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930666 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 11:48:14 +00:00
Bilgin Ismet Ibryam 2a29d19bc0 Committed a patch from OFBIZ-3541 "Using Widgets html form templates in FTL files". This change will make autocompleter available also in ftl lookups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930660 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 10:38:19 +00:00
Jacques Le Roux 964c4c302d A modified patch (indentation done mostly) from Blas Rodriguez Somoza "XHTML validation errors (framework/widget) Tree widget and Date time field rendering issues" https://issues.apache.org/jira/browse/OFBIZ-3628 - OFBIZ-3628
htmlTreeMacroLibrary.ftl
Tree widget renders unclosed <li> tags.
Example from Accounting -> Global GL settings -> Navigate accounts
<ul class="basic-tree">
<li><ul class="basic-tree">
<li>
<li><a class="collapsed" href="/accounting/control/GlAccountNavigate?trail=null|100000"> </a><a href="/accounting/control/GlAccountNavigate?glAccountId=100000&trail=null">100000

htmlFormMacroLibrary (macro renderDateTimeField)
selected attribute without value
<option value="AM" selected>
input inside ul
<ul>
......
<input type="hidden" name="${compositeType}" value="Timestamp"/>
</ul>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930516 13f79535-47bb-0310-9956-ffa450edef68
2010-04-03 12:42:36 +00:00
Erwan de Ferrieres 68c6130cf1 Fixing a NPE introduced at rev.929173
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929576 13f79535-47bb-0310-9956-ffa450edef68
2010-03-31 15:09:59 +00:00
Erwan de Ferrieres e185d50179 Correcting a NPE introduced at rev 929157 when using sub-hyperlink
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929449 13f79535-47bb-0310-9956-ffa450edef68
2010-03-31 09:54:55 +00:00
Adrian Crum af0ca8e141 A patch from Blas Rodriguez Somoza: XHTML validation errors (framework/widget) - (https://issues.apache.org/jira/browse/OFBIZ-3623).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929173 13f79535-47bb-0310-9956-ffa450edef68
2010-03-30 15:35:28 +00:00
Erwan de Ferrieres ddc80e3cb6 Adding title for images in hyperlink field or in a field displaying an image. Use the description if exists otherwise takes the title.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929157 13f79535-47bb-0310-9956-ffa450edef68
2010-03-30 14:45:45 +00:00