Commit Graph
140 Commits
Author SHA1 Message Date
David E. Jones b69664a9d6 Fixed two issues: renderDisplayField macro was missing the title attribute, implemented the multi-position single forms, for a maximum position of 2 anyway
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995313 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 04:35:26 +00:00
Erwan de Ferrieres 063d57711c new option for fields : display-size. If a field size is longer than the specified value, then length will be cut and ... will be added. The full text will be displayed as a hint. This way, a form will not be deformed by too long fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987127 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 11:12:55 +00:00
Hans Bakker 2d9b75a30f this is a revert of r731487 to downgrade freemarker from 2.3.15 to 2.3.10 because of speed problems. In order to make the older version work we changed the following:
- create new OfbizCatalogUrlTransform class
- delete CatalogUrlDirective.java class
- set ofbizCatalogUrl transform to OfbizCatalogUrlTransform class
- In htmlFormMacroLibrary.ftl file, change floor directive to floor method of Math class
- change freemarker version in .classpath and LICENSE files
We are in discussion with the freemarker developers to solve this problem there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986577 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 06:33:12 +00:00
Erwan de Ferrieres 4800e33723 Adding event and action attributes to date-time field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966202 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 12:10:08 +00:00
David E. Jones c0a8945cb8 Small change to MacroFormRenderer to use a marco for doing the form close for multi forms, necessary for those to work when rendered using the fo macro library
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@963018 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 08:55:18 +00:00
David E. Jones 1bcbfd70c4 Fixed issue with XML reserved characters in screen and form data, they will now be encoded and display properly instead of causing an error about bad formatting in an entity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957658 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 18:09:08 +00:00
David E. Jones 43569dfc03 A couple of small changes to fix XSL:FO widget rendering blow ups: in field titles replace nbsp with space, this is necessry since certain forms use this for empty cells so the renderer doesnt use the default title, also changes the screen link and image marcos to have the full parameters in the other files as it was blowing up on that too (ie with parameters passed in that it doesn't know about)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957362 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 21:47:41 +00:00
Jacques Le Roux d75fbce90a Allows to initially collapse the search screenlet of a layered lookup, default to false.
It was harder than I though because of the async nature of Ajax. So I had to use a setTimeout with a 400 ms timeout. Hopefully it will work in any environments. I chose 400 because I found it worked well on my machine, 300 also but to be sure I picked 400, 200 was too low it seems.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950481 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 10:44:16 +00:00
David E. Jones 0befa87923 Added id to field titles to allow more direct styling, hiding/showing, etc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950019 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 11:12:40 +00:00
Jacques Le Roux 1e9824ab0c * Remove useless white spaces in macro (make harder handling links in javascript)
* Implement target-parameter in case of layered lookup (was missing)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949710 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 10:33:52 +00:00
Erwan de Ferrieres 9e7053e953 XHTML validation errors round 2++ (framework) - OFBIZ-3761 (https://issues.apache.org/jira/browse/OFBIZ-3761)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945582 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 10:34:42 +00:00
Scott Gray 0f30714350 Set svn properties on all freemarker files that were missing them
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942386 13f79535-47bb-0310-9956-ffa450edef68
2010-05-08 13:51:19 +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
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 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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