Commit Graph
311 Commits
Author SHA1 Message Date
Jacques Le Roux d41c42d069 Fix a bug in setDependentDropdownValuesJs.ftl (used in conjunction with getDependentDropdownValues.js)
I just realize that I missed to change from maindId to paramKey in the observe event. It works with country where the values are the same (countryGeoId), but in other cases it does not (notably in the issue reported at https://issues.apache.org/jira/browse/OFBIZ-3247

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989829 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 17:11:43 +00:00
Jacques Le Roux 792aa82bee A solution for "State field is missing - Not in List or N/A" reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3247 - OFBIZ-3247
I finally decided to use the new Dependent Dropdowns mechanim.
I have also refined how it's used in Example to avoid confusion, so changed setDependentDropdownValuesJs.ftl to pass paramKey when it's different from mainId

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988508 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 12:32:52 +00:00
Jacques Le Roux 5fdb5272c5 Forgot to put the license headers into new files in r986370
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986407 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 17:40:28 +00:00
Jacques Le Roux 7a285eed10 Miscellaneous improvement in Form Widgets examples. Notably introduces an, as much as possible generalized (so far), dependent drop-downs example. I have introduced 2 couples of dependent drop-downs.
The 1st one, country/states, is a common one and does not need (ie it's better to not) to be generalized. It can be used as is. It needs some pieces which are all included, see comments and follow... 

The 2d, category/products, have been taken as example but is not a good candidate. What if you get much categ or/and products? Anyway it's a good OOTB example and I had it at hand, so I used it. I have tried to generalize (abstract the couple of dropdowns) and it's almost there. The only issue I crossed, is when you want to use a couple of dependent drop-downs in the same form. As it's not a common case, the setDependentDropdownValuesJs.ftl template-script can be used in most cases...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986370 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 16:18:24 +00:00
Jacques Le Roux 04d4634019 Removes deprecated and useless framework/common/webcommon/WEB-INF/geolocation.ftl, it has been replaced by framework/common/webcommon/includes/geolocation.ftl
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986266 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 11:25:24 +00:00
Erwan de Ferrieres 0ae7083542 Adding geolocation using openstreetmap, examples are taken from the google existing ones
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986095 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 18:56:25 +00:00
Jacques Le Roux 4ced84dd08 A patch from Karl Pitrich "When editing Portal Pages, Drag & Drop for Portlets does not work" (https://issues.apache.org/jira/browse/OFBIZ-3889) - OFBIZ-3889
When editing Portlet Pages, either in MyPortal or PortalAdm, Drag & Drop of Portlets does not work.
Where are several Issues in the MyPortal, some have fixes, none is commited to trunk.

Problems:

    * in myportal.js, function getDestinationInformationPortlets(): DOM ID's are not handled correctly
    * in framework/webtools/widget/PortalAdmScreens.xml: required javascript + css files are not included


JLR: 
While working on this I have found other issues: the login.ftl files used in hhfacility and myportal were not tenant enabled. They are different  but by chance in myportal very close to common so I was finally able  to do both at along with  Karl's changes. Actually I wanted to do 2 commits but forget to uncheck the files while doing a second attempt to commit.

MyPortal
 * The login process in MyPortal was not tenant enabled, it's done in this commit.
 * I kept its specificity : newRegisterLogin and wonder why it has not been extended to common?

hhfacility
The login process in hhfacility was not tenant enabled, it's done in this commit. Doing so, I saw there i18n is not done, not an issue for me...







git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985163 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 11:43:38 +00:00
David E. Jones 800a85a38e Fixed two bugs with autocomplete functionality: init script in selectall.js was not doing the search/replace properly for ampersands, in the FindAutocompleteOptions.groovy script the andExprs were not really anded together so split into the or and main and lists and assembled the conditions properly, which will fix the conditionFields and the andCondition fields
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@980348 13f79535-47bb-0310-9956-ffa450edef68
2010-07-29 07:53:06 +00:00
Jacques Le Roux 1c0d7111b1 Makes fadeBackground="true" as it's by default in xsd and allow to pass disabled(true or false)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@979104 13f79535-47bb-0310-9956-ffa450edef68
2010-07-25 19:57:16 +00:00
David E. Jones 339da2c8f1 Added support for passing extra server-side parameters in a Map from the screen definition, ie screen actions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965154 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 02:24:21 +00:00
Jacques Le Roux f2fbad78d5 Improvement on r960336. Fix a problem reported by Scott on dev ML.
I tested locally, and I think I have done it right this time


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960491 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:10:19 +00:00
Jacques Le Roux 82aba53fa5 Improvement on r960336 (should fix a problem reported by Scott on dev ML.)
I tested locally, but I'm not quite sure it's sufficient


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960401 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:23:47 +00:00
Erwan de Ferrieres 417be33da1 When an error message is displayed, clicking on it will make it disappear
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959960 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 12:10:58 +00:00
Erwan de Ferrieres baffc03933 Better handling of text when displayed in a chart
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957494 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 10:27:50 +00:00
Jacques Le Roux acbf699a1c Fix a bug introduced at r950481
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950860 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 03:26:17 +00:00
Adam Heath 9cc1b3e521 Revert wrongly committed 950265
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950269 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:55:59 +00:00
Adam Heath 0a84a9166c Minor fixes to make webtools work underneath webslinger(not ready to go
public).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950265 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:47:24 +00:00
Jacques Le Roux 2a1a5aee14 We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Erwan de Ferrieres f9c4de5efc Avoiding possible errors when adding portlets via web interface and logged as admin
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948479 13f79535-47bb-0310-9956-ffa450edef68
2010-05-26 15:47:47 +00:00
Jacques Le Roux 14adf43d86 * Especially fix a bug in fieldlookup.js.
When using description-field-name in a layered lookup called from another layered lookup (recursively or not) the description-field-name parameter (target2) in the call from the 2d lookup button was not modified, therefore the link was not working.

Miscellaneous:
* Format and fix some typos in fieldlookup.js
* Removes now useless commented out functions set_value and set_values in lookup.ftl
* Improves comments in FormWidgetExampleForms.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@947392 13f79535-47bb-0310-9956-ffa450edef68
2010-05-23 10:08:21 +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
Erwan de Ferrieres f4fc13be2e Adding ISO216 pageMasters, and including all the page formats in start.fo.ftl, so it can be used when printing a document
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945340 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 20:17:30 +00:00
Jacques Le Roux 31d2f5094e A patch from Ankit Jain "Link back to login page from Forgot Password page" https://issues.apache.org/jira/browse/OFBIZ-3469 - OFBIZ-3469
This one works! (with a little help from me)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945061 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 10:19:18 +00:00
Erwan de Ferrieres a877c6fc4b Adding the capacity to create charts in OFBiz. Examples are based on the example component, and examples must be created to show charts.
Charts are using the flotr library (http://code.google.com/p/flotr/) which is under a MIT license and is based on the Prototype Javascript Framework.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945044 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 09:29:38 +00:00
Jacques Le Roux ed6dda1757 Revert r945037, because I found it's not right when going back from logout -> forgot password, I got this error message
org.ofbiz.webapp.control.RequestHandlerException: Unknown request [authview]; this request does not exist or cannot be called directly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945042 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 09:26:48 +00:00
Jacques Le Roux 9bdd97a693 A patch from Ankit Jain "Link back to login page from Forgot Password page" https://issues.apache.org/jira/browse/OFBIZ-3469 - OFBIZ-3469
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945037 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 09:13:36 +00:00
Jacques Le Roux ed63676d23 A patch from Ankit Jain "Layered lookup inside the layered lookup not working" https://issues.apache.org/jira/browse/OFBIZ-3768 - OFBIZ-3768
This patch definitely closes this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944614 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 11:42:01 +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
Jacques Le Roux be5dce281e Fix a non visible NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940849 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 13:32:21 +00:00
Bruno Busco 1664f3e90e A patch from Blas Rodriguez Somoza
OFBIZ-3732 - XHTML validation errors round 2++ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3732
geolocation.ftl
Script content need to be inside markup comment to avoid character encoding issues.

EntityImport.ftl
attributes without values

EntityImportDir.ftl
attributes without values

EntityImportReaders.ftl
attributes without values

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939757 13f79535-47bb-0310-9956-ffa450edef68
2010-04-30 17:46:49 +00:00
Scott Gray 52b08f4574 Removed all references to the deprecated GenericDelegator method findAll(String)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938947 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 11:30:23 +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 58dbbf00fd new improvement for portals : administrative interface, same as ManagePortalPages but for all pages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@937230 13f79535-47bb-0310-9956-ffa450edef68
2010-04-23 10:18:41 +00:00
Bilgin Ismet Ibryam 6fe14b4033 A better query for autocompleter descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936635 13f79535-47bb-0310-9956-ffa450edef68
2010-04-22 07:42:10 +00:00
Erwan de Ferrieres 264d7b7099 Corrections on rev 935923
* corrected a wrong controller entry
* added a missing decorator (uiLabelDecorator)
* added a collapse button for the GenericScreenlet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936385 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 16:16:40 +00:00
Erwan de Ferrieres 6f2642a5dd Adding a whole set of generic portlets. Those are more designed to be customised
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935923 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:57:26 +00:00
Erwan de Ferrieres a290ba895d misc. corrections on portal :
* when editing a portlet, getting the previous values
* displaying portlets with the right order
* portletId was not retrieved in showPortlet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935898 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:04:17 +00:00
Bruno Busco 38c435ca8d A slightly changed (tabs replaced with spaces) patch from Blas Rodriguez Somoza
OFBIZ-3681 - XHTML validation errors round 2+ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3681
XHTML validation errors

    * Unclosed tags
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * Uppercase tags or attributes.
    * Unencoded ampersands in urls.

Other errors:

common/webcommon/includes/listVisualThemes.ftl
Line 19: style tag is not allowed here, style must be in the style attribute of the tag.

webtools/webapp/webtools/stats/StatBinsHistory.ftl
Line 29: duplicated id

webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Lin 32, 104: form must be outside table.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935311 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 07:52:08 +00:00
Jacques Le Roux 68acd1438f 20 is not a valid argument to position. This was not a big deal as it defaulted to empty, which for the moment defaults to normal. At term we will put "topleft" as default here
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@933151 13f79535-47bb-0310-9956-ffa450edef68
2010-04-12 08:53:52 +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
Bruno Busco 5d5e489598 A patch from Blas Rodriguez Somoza
OFBIZ-3637 - XHTML validation errors (framework excluding widget) round 2
https://issues.apache.org/jira/browse/OFBIZ-3637

XHTML validation errors

    * Unclosed tags INPUT, IMG, BR...
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * required attributes not included (alt in img, type in style, type in script etc)
    * Uppercase tags or attributes.
    * Unencoded entities (ampersands).

Other changes:

selectall.js
line 333. ajaxAutoCompleter must work with unenconded or encoded ampersands.

EntityRefMain.ftl
line 176. <div> must be </div>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932733 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 14:35:07 +00:00
Adrian Crum da42890638 A patch from Blas Rodriguez Somoza - XHTML validation errors (framework excluding widget) (https://issues.apache.org/jira/browse/OFBIZ-3622).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930701 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 15:29:58 +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
Bilgin Ismet Ibryam cebc361953 If there is no map center and zoom level provided for google map, get these values from all the markers on the map. If there are no markers, use 0 for latitude and longitude.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928804 13f79535-47bb-0310-9956-ffa450edef68
2010-03-29 15:16:55 +00:00
Bilgin Ismet Ibryam de0b52bfe6 Removed hardcoded width and height pixels from google map template, which now allows setting them also in percentages.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928733 13f79535-47bb-0310-9956-ffa450edef68
2010-03-29 11:51:49 +00:00
Erwan de Ferrieres cfe049b424 As suggested by Adrian, adding an option to hide the tenant ID's textbox in login form
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927924 13f79535-47bb-0310-9956-ffa450edef68
2010-03-26 15:44:04 +00:00
David E. Jones 8e3edae07f Merged multitenant20100310 branch into the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927271 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 04:42:26 +00:00
Hans Bakker 3daaf0a95e show portlets with/without decorators
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@925723 13f79535-47bb-0310-9956-ffa450edef68
2010-03-21 04:05:31 +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