Commit Graph
650 Commits
Author SHA1 Message Date
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
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