Commit Graph
210 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
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
Adrian Crum 9e24170402 Converted login message in lookup screen to a link to the login page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229344 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 20:52:04 +00:00
Adrian Crum bae6b61fe8 Give the login screen a page title.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1229135 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:07:23 +00:00
Adrian Crum 3704ef9399 Moved screen rendering context initialization from the GlobalDecorator to a separate screen widget - so the initializations can be included in other decorators. Also cleaned up the GlobalDecorator formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1209054 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 12:41:03 +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 810bd966a8 Fix a small bug: layoutSettings.javaScripts was used when layoutSettings.styleSheets should have been used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182310 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 11:18:28 +00:00
Jacques Le Roux 8c06f33d4b A patch from Kiran Gawde "Reference to datetimepicker is wrong in CommonScreens.xml" https://issues.apache.org/jira/browse/OFBIZ-4463
Need to replace
/images/jquery/plugins/datetimepicker-0.9.6/jquery-ui-timepicker-addon.css
with:
/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css

Note the reference is in two places.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1180398 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 16:09:32 +00:00
Jacques Le Roux 399b52a033 Closes "The time part (cursors) of the Date Time picker is not internationalized" https://issues.apache.org/jira/browse/OFBIZ-4015
Fixes the problem by:
* Updating datetimepicker from 0.9.3 to 0.9.6 (where a localization folder exists)
* Use the fantastic createJsLanguageFileMapping service Sascha introduced (I just removed the confusing wrong comment about JsLanguageFilesMapping.ftl being generated and added a block for datetimepicker, also in JsLanguageFileMappingCreator.java). A very good dynamic+static tool, kudos Sascha!

Should work also in eCommerce though I did not found any uses

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1178199 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 15:59:12 +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 850cec4603 Minor Ajax code improvement: The defaultViewSize widget.properties setting can be overridden in a screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1142458 13f79535-47bb-0310-9956-ffa450edef68
2011-07-03 16:48: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
Hans Bakker 7a1dfe1464 update to the catalog/category tree: works now with IE and is using Ajax to update the middle section using the tree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1130415 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 06:22:03 +00:00
Sascha Rodekamp 23d8737b1d Update to jQuery UI Version 1.8.13
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1124697 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 11:59:43 +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
Sascha Rodekamp 6e8d61e42f after session timeout, ajax popup dialogbox shows ofbiz login screen (https://issues.apache.org/jira/browse/OFBIZ-4256).
If the session is timed out the request handler checks weather it is an ajax request or not (The information comes from the request header if the X-Requested-With contains XMLHttpRequest we haven an ajax request.).
If it is an ajax request it don't return the normal "checkLogin" request, i return a a special ajaxCheckLogin request. This request can point to an site which shows the "Please Login Hint".

Orig Msg:
Take the following page (for example) https://localhost/content/control/findContent

field "Data Resource Id" has an icon beside it that creates an ajax dialog pop up. If the session has already timed out. The dialog box would show the login screen.

I suspect that all pages containing this functionality would exhibit the same symptom.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1102615 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 08:52:15 +00:00
Sascha Rodekamp 797e4caad6 localization for jQuery validate plugin is not working (https://issues.apache.org/jira/browse/OFBIZ-4275). This patch enabels the i18n file loading for the validation plugin.
Orig Msg.
the validate plugin is not using the localized files.
Everything needed seems to be there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1102597 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 08:06:05 +00:00
Jacques Le Roux 48c6114143 A patch from Nicolas Malin "Add famfamfam icons has generic and add possibility to surchage" https://issues.apache.org/jira/browse/OFBIZ-4259
Adds the possibility to use famfamfam icons contained in framework/images/webapp/images/famfamfam/icons.
If you want use a specific icon, it's possible to define an attribute VT_ICONS_LOC that contains the location to themes icons directory to use
It improves form rendering to pass a flexible string on image-location attribute and screen and form renderer to display an image with a text.

JLR: I just added à &nbsp; before menus texts

After Erwan's remark I wondered If I should remove the CSS on buttons. But I finally found that it was complementary. Because when no image is used on a specific button you still have the default CSS style applied (typical for Add buttons as Erwan outlined). And when no default CSS style is applied you can have an image like now shown OTTB on print button when editing an Example. So I see these 2 features as complementary for now. Maybe one day, one will replace the other, but at this stage both are welcome IMO.

BTW the famfamfam (strange name ;o) icons lib is well done and really full of possibilities...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1095984 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 18:51:10 +00:00
Sascha Rodekamp fb880c80a1 Update - i18n from DateTime display fields (https://issues.apache.org/jira/browse/OFBIZ-4014). Ofbiz can now show and interprete i18n dates and times. The Patch uses the datejs library to i18n the displayd date and time fields from the datepicker this works vice versa.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090231 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 13:05:42 +00:00
Sascha Rodekamp c1e2a81191 Update - jQuery UI to version 1.8.11. The current jQuery UI Version is build on jQuery version 1.5.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1088549 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 10:42:28 +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 7bfd621b6f Removed framework dependency on the Party component, introduced in rev 897842.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082017 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 00:48:56 +00:00
Adrian Crum 050ef03215 Partially revert a change made in rev 894330 - put multi-column screen elements back in the GlobalDecorator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082004 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 23:49:07 +00:00
Erwan de Ferrieres d7ad06b90c Adding a masked input capability to the date fields, use mask=Y and the field type will be taken for it. jQuery pPlugin is from http://digitalbush.com/projects/masked-input-plugin/ and under a MIT license
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1081333 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 11:15:24 +00:00
David E. Jones 3b20b9c06f Reversing accidental commit in rev 1072292
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1072301 13f79535-47bb-0310-9956-ffa450edef68
2011-02-19 10:38:13 +00:00
David E. Jones 2d28cc3d66 VUA-429 full implementation to add a path through the screens for creating a sales order for a contact and add a customer for the contact in the process
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1072292 13f79535-47bb-0310-9956-ffa450edef68
2011-02-19 10:13:50 +00:00
Erwan de Ferrieres d23662467b OFBIZ-4170 : a bug was present in the timepicker plugin and values under 01:05:10 couldn't be selected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1069542 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 19:45:22 +00:00
Adrian Crum 74cb3f0103 Made the Find Screen "Search Results" text match the "Search Options" text. Also includes a layout demo and the CSS changes needed for the Flat Grey visual theme.
This is kind of kludgy. We need a screenlet-title style.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061056 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 23:09:37 +00:00
Adrian Crum 60b30b5af1 Move "Search Options" text to screenlet title bar in the FindDecorator screen. It's now visible when the screenlet is collapsed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060701 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 07:39:16 +00:00
Adrian Crum de0ac1ce2e Named some of the GlobalDecorator sections so they're easier to find in markup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059391 13f79535-47bb-0310-9956-ffa450edef68
2011-01-15 19:00:04 +00:00
Jacques Le Roux 2fa0a5e0a9 Remove an useless commented out block of code after an exchange with Bilgin on dev ML. No functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1055370 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 09:26:45 +00:00
Adrian Crum 619d302f7d FindScreenDecorator uses the page-title style.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1053770 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 23:30:54 +00:00
Jacques Le Roux 4736420673 A patch from Sascha Rodekamp "Update the Datepicker to version 0.9.1" (https://issues.apache.org/jira/browse/OFBIZ-4056) - OFBIZ-4056
Updates the timepicker. Seems that it's more stable and they fixed a few issues. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1049151 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 16:39:30 +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
Bruno Busco 6d1f3fe479 Removed PortalPageScreen and showPortalPage.ftl since they have been replaced by include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023428 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:24:40 +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
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 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 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
Jacques Le Roux 4cd873d37c A slightly modified "only one lookup decorator" patch from Sascha Rodekamp related to "Replace popup lookups by layer lookups" (https://issues.apache.org/jira/browse/OFBIZ-3442) - OFBIZ-3442
Merge the 2 lookup decorators in only one and dynamically adapt the rendered content

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935578 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 14:03:41 +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
Adam Heath f1c942842f Remove hard-coded BIZZNESS_TIME theme settings, so the default in
general.properties gets used.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915651 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 03:32:26 +00:00
Jacques Le Roux 90cb99c795 To be consistent with r915397 which switched default theme to TOMAHAWK.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@915461 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 18:08:24 +00:00
Hans Bakker c021cd1379 corrected: used field name as a value for fieldname defaultCurrencyUomId as reported in OFBIZ-3482
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@910460 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 10:45:16 +00:00
Bilgin Ismet Ibryam 1502b94baf Added autocomplete support to LookupLayerPopupDecorator screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@907456 13f79535-47bb-0310-9956-ffa450edef68
2010-02-07 17:48:22 +00:00
Hans Bakker baeb94be10 removed framework dependency on the commonext component introduced in 816083 and as reported in he mailinglist by Adrian
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@904970 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 03:59:51 +00:00