Commit Graph
220 Commits
Author SHA1 Message Date
Jacques Le Roux 2db2a99619 A modified patch from Wai "ajax autocomplete and dialog during session timeout" https://issues.apache.org/jira/browse/OFBIZ-4813
1. autocomplete feature shows the message "no records found" during a session timeout. This could be misleading for the user.
2. During a session timeout, clicking on ajax dialog button shows a large frame containing a message indicating session has timeout. Should show a more detailed message.

jleroux: what I adapted:
* Added <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> in htmlheader-for-ajax.ftl
* Replaced also spinner.gif in Tomahawk (better be consistent)
* Added a French label an kept those existing but English (improved by Wai)
* Removed the ajaxErrorText style in ajaxNotLoggedIn screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327502 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 13:24:30 +00:00
Jacques Le Roux 27822125e1 setCountryStatesEventJs.ftl was a specialisation of setDependentDropdownValuesJs.ftl introduced 2 years ago with it. It has never been used and finally whan I thnk about it I don't see any needs to keep (slim down spirit)
So this to remove it and clean duplicated references/comments about setDependentDropdownValuesJs.ftl

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1310954 13f79535-47bb-0310-9956-ffa450edef68
2012-04-08 05:19:48 +00:00
Ashish Vijaywargiya b0e153006c Bug fix, Applied patch from jira issue - OFBIZ-4734 - User behaviour issue on auto-completer.
Currently if user type in auto-completer text box and if matches found then list display as auto-completer result list but if no matches found then user didn't know that result will come or not, even no matches found.

Change behaviour is when user type in text box then spinner (ajax loader image) shows wchich tells user that search is in progress.
If matches found or not found spinner disapperars and reult/ no result message listed in auto-completer relsult list.
Now user won't see any abnormal behaviour at ui.

Added spinner image for the auto-completer request.
Also added the "No Records Found" message if no matches found for the auto-completer search.

Thanks Nitesh, Deepak and Rishi for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303062 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 18:08:05 +00:00
Erwan de Ferrieres 0aead2f1ac tabs to spaces, no functional changes - ftl files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230479 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:39:49 +00:00
Jacques Le Roux db4b30ba20 A small comment to better understand the reason of the trick
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1226072 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 11:42:49 +00:00
Adrian Crum 7d71b0b4b6 Fixup for my previous commit. Browsers should not parse the contents of CDATA elements, but apparently they do.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1225224 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 16:39:56 +00:00
Adrian Crum 19cc573a09 Bug fix for lookup screens - jQuery was loaded twice, which resulted in quirky behavior in the lookup screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1224914 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 14:31:17 +00:00
Sascha Rodekamp 91ffcbdae6 Update jQuery:
jQuery library to version 1.7
jQuery UI to version 1.8.16
jQuery Validation to version 1.9
jQuery Flot to version 0.7
jQuery datetimepicker to version 0.9.7
and jsTree

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1199218 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 12:35:33 +00:00
Jacques Le Roux 1943d2cf4e A patch from Christian Fischer "Content HTML-safe, wasn't necessary for the autocomplete" https://issues.apache.org/jira/browse/OFBIZ-4434
Before the patch, the content was made HTML-safe, what wasn't necessary for the autocomplete. Also, it displayed things like "F&umlr", because it made the umlauts HTML-safe, too.
The patch uses the stringwrapper from the stringUtil.java to avoid the general HTML auto-encoding.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1175122 13f79535-47bb-0310-9956-ffa450edef68
2011-09-24 07:44:28 +00:00
Sascha Rodekamp 28eff53625 Update to the current jQuery Version 1.6.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163547 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 09:26:56 +00:00
Adrian Crum 1e7c1b5218 Minor Ajax code improvements:
1. LookupDecorator checks the value of the ajaxLookup parameter instead of checking if it exists.

2. The displayReturnField widget.properties setting can be overridden in a request.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1142358 13f79535-47bb-0310-9956-ffa450edef68
2011-07-03 01:49:35 +00:00
Erwan de Ferrieres 1b0f365f82 A patch from Stephane Ducas - OFBIZ-4324 - When creating a customer from the shopping cart the selected country has to be the default one
I slightly modified your patch and put the defaultCountryGeoId in CommonScreens.xml#countries so the geoId will always be filled


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139291 13f79535-47bb-0310-9956-ffa450edef68
2011-06-24 13:13:44 +00:00
Adrian Crum af5b6cfd1c Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138575 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 18:40:50 +00:00
Jacques Le Roux 742c554817 By moving formName and fieldFormName in parameters order r1138485 broke the current OOTB code which still uses htmlTemplate.lookupField
There is still an issue: the lookup button does not show

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138569 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 18:01:52 +00:00
Sascha Rodekamp 27e16a61c9 Update - jQuery update to version 1.6.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1124336 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 16:54:55 +00:00
Ashish Vijaywargiya 257a7f4b7a Applied patch(missing template file content) from jira issue - OFBIZ-4267. Thanks Deepak.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098100 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 11:26:12 +00:00
Sascha Rodekamp 7cc04db7d3 Update - Update to jQuery Version 1.5.2, the new version fixes some bugs in the library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1088502 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 08:36:05 +00:00
Sascha Rodekamp e11f878458 Update - Update the jQuery library to version 1.5.1. A few changes were necessary for this step. I updated the jQuery flot library to the current release, because the old one doesn't work with the new jQuery version, i also updated the jsTree Plugin to make it work with the new jQuery Version.
Note in jQuery 1.5 the implementation of the ajax function has been changed.

For more Information have a look at: http://blog.jquery.com/2011/01/31/jquery-15-released/


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082916 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 13:37:29 +00:00
Sascha Rodekamp 6b6a8c145d Update - Update to jQuery 1.4.4, Fix a bug in the fieldlookup.js to make it work with the new jQuery lib. This patch is to orepare the update to jQuery version 1.5.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082227 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 17:25:15 +00:00
Adrian Crum be4e05447a Removed a framework dependency on the Content component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082016 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 00:46:40 +00:00
Erwan de Ferrieres d6be0a8959 Adding a help message on how to choose a theme and how to use it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1070287 13f79535-47bb-0310-9956-ffa450edef68
2011-02-13 20:12:37 +00:00
Jacques Le Roux 3031e044bf That is the real solution for the zoom here
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068412 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 14:26:07 +00:00
Jacques Le Roux e28ad40e74 No needs to set zoom when it's already handled
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068394 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 13:56:05 +00:00
Erwan de Ferrieres e35aa879f8 Adding the fancybox jQuery plugin and using it for displaying the themes screenshots. Plugin is under the MIT license, the js code used is the one displayed for the example.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068107 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 20:33:09 +00:00
Jacques Le Roux bc37761114 Found that the default zoom level was at max zoom in, changed to 15 (0=World, 19=max zoom in)
Found also that the address example has a very small height map, but did not have enough time to fix it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1067942 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 13:17:03 +00:00
Adrian Crum 2e1ad5b135 Fixed Freemarker-generated list navigation introduced in rev 930660. That code never worked. Also fixed some Webtools FindGeneric screen issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1064944 13f79535-47bb-0310-9956-ffa450edef68
2011-01-29 02:35:22 +00:00
Jacques Le Roux 673804eb6c As requested by Jacopo on dev ML, moves setPriceRulesCondEventJs.ftl from framework to product/catalog
Also fix an orthograph error in a related French labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058719 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 19:55:07 +00:00
Jacopo Cappellato 674a4f8e1c Another missing license header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058597 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 15:06:14 +00:00
Jacques Le Roux 0a72fe8793 3 patches from Sascha Rodekamp "Localisation of labels in javascript" (https://issues.apache.org/jira/browse/OFBIZ-3964) - OFBIZ-3964
This cames from Adam's advice: http://markmail.org/message/kai5lfvlnsz7xwki

Sascha comes to this solution
The Idea is to have a method which takes a JSON Object with uiLabel Resources and label entries and returns the resolved labels in a JSON Object which can be used directly in the JS Code.
The advantage of this way, is that we have only one Ajax request which reads all labels. The alternative is an Ajax request for each label, which simplify the request (because you haven't to create a complex JSON Object) but is very expansive.

* Replaces all JS alerts with the new fancy error boxes
* Adds a few uiLabels

I simply fixed some typos. I did not test all cases but did a good review.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056497 13f79535-47bb-0310-9956-ffa450edef68
2011-01-07 20:40:31 +00:00
Adrian Crum 87e12a7227 Fixed a bug in htmlTemplate.ftl.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1053478 13f79535-47bb-0310-9956-ffa450edef68
2010-12-28 23:25:54 +00:00
Adrian Crum 17e1916e8a Finished moving security-related UI artifacts to the common component, plus added a Security UI to the webtools component.
Internationalization note: This commit contains new UI labels.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1053259 13f79535-47bb-0310-9956-ffa450edef68
2010-12-28 05:19:49 +00:00
Adrian Crum e4d3a1758e Moved remaining security UI artifacts to the common component. This commit introduces a minor dependency from framework/common to applications/party - which will be fixed in a future commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050936 13f79535-47bb-0310-9956-ffa450edef68
2010-12-19 19:10:50 +00:00
Jacques Le Roux 24fe5ff37e Merges the jQuery branch back to the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044503 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 20:40:08 +00:00
Jacques Le Roux f517be11ef revert r1037521 "Preselect default country into drop down" (https://issues.apache.org/jira/browse/OFBIZ-4013) - OFBIZ-4013
This is not how it should be done. For instance when you update a postal address from a party profile you always get selected the default country. OFBiz records correctly the change underneath but it's confusing as you don't see the right information on screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040426 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 07:45:53 +00:00
Jacques Le Roux afeee2c250 A patch from Eric de Maulde "Preselect default country into drop down" (https://issues.apache.org/jira/browse/OFBIZ-4013) - OFBIZ-4013
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037521 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 18:33:41 +00:00
Jacques Le Roux 7a9a644f08 New Price Rules screen.
I tried to make it look better by having only one Value column but I found that a field inserted by Prototype was not taken into account when submitted. As it's not possible to rename a DOM element I finally gave up and used use-when + hide/show instead. I will see if we can do better with jQuery...
I kept the old Screen + Groovy + FTL files, not for nostalgics, but in case someone has to quickly deal with fields with a lot of values (to avoid drop-down saturation). Then the Id will still be used. Note that it's also possible to do so with the new screen: you need only to put the field type in setPriceRulesCondEventJs.ftl and at top of getAssociatedPriceRulesConds service implementation in order to handle it as an Id with an input field (like it's done OOTB for Quantity and List Price)

I'd like to use the same mechanism for Promo Rules. I will do that later, hopefully before merging jQuery...

BTW, I like the now clear separation with Ajax onComplete event.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005861 13f79535-47bb-0310-9956-ffa450edef68
2010-10-08 15:33:03 +00:00
Jacques Le Roux be27d50635 Clarifies, improves and generalize getDependentDropdownValues.js.
* Now it's possible to also hide the drop-down field title
* Clarify the inputField usage (now a boolean)
* Allows to use allow-empty="true" on main field (of course dependent field as well if needed). For that onComplete is used and generalizes
* longer Fade duration (from 1.5 to 2.5) to let enough time to read...

An example of hide+hideField use with setCountryStatesEventJs.ftl.
I should "soon" commit the new Price Rules screen which uses the inputField parameter for the Quantity condition

Any functional changes as setCountryStatesEventJs.ftl and the getDependentDropdownValues optional parameters are not used OOTB


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005395 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 10:16:46 +00:00
Jacques Le Roux fdea7b2527 Change how Webtools/Geo Management is done:
* Now the link from the Find list goes to the Link Geo screen. It opens (focus on Geo field) with selected multiples (in function of assoc type) for the geo selected in Find list, and changes accordingly. In jQuery branch it will use asmselect for that 
* So the Create screen is now a Create/Edit screen with a lookup for Geo choice

This continues to allow geos Edition/Creation and to links them, but now shows also the links between geos in the Link screen. Due to native limitations of select multiples, it's not very useful in trunk but interesting in jQuery branch (I did not try to find an equivalent to asmselect in the Prototype worls, still doable...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000586 13f79535-47bb-0310-9956-ffa450edef68
2010-09-23 19:06:22 +00:00
Adam Heath 4b054e2d11 Missed some window->load document->dom:loaded changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997440 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 18:20:42 +00:00
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
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 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
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