Commit Graph
499 Commits
Author SHA1 Message Date
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
Jacques Le Roux 8215b6eb58 Removed the now useless getAssociatedProductsList request-map from the common-controller (was forgot there). From Adrian's remark in dev ML.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1054072 13f79535-47bb-0310-9956-ffa450edef68
2010-12-31 09:24:42 +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
Bruno Busco 25965626af Reverted revision 1042196 as suggested by Adam.
This change introduces framework dependencies from applications.
More work is needed to the patch in https://issues.apache.org/jira/browse/OFBIZ-4037 before committing again.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042250 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 22:29:33 +00:00
Bruno Busco 587e93ba82 https://issues.apache.org/jira/browse/OFBIZ-4037
Moved the feature that allows a new user to register for an account from MyPortal to the framework so that it is available in any application.
It has also been slightly reworked (code cleaning and internationalization).
Two flags in general.properties allows to configure if the register function must be enabled or not and if the captcha function should be used.
The captcha function needs to be improved because at the moment the code is contained in an hidden field so that it is very easy for a computer to bypass it.
A possible fix for this could be to put the MD5 coding of the captcha code in the hidden field.
Then the event that checks the code should compare the MD5 codes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042196 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 14:58:18 +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
Hans Bakker eaa8f6b5d4 next to setting of the tenent id, now also the initial mountpoint if entered also refactoring:
- set delegator, dispatcher and security from session, servlet context or request's attribute to app context of birt engine before render and send email
- add the initialPath field to Tenant entity
- create the tenant context which as a default servlet using org.ofbiz.webapp.control.TenantServlet in the catalina container and check the multitenant property for initial the tenant context with root mount /
- move the changing a multi tenant delegator statement from ControlServlet to ContextFilter that could apply to every servlets
(implementation by Chattree Richard)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1032472 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 06:54:17 +00:00
Hans Bakker 6abf950e9d Optionally alow the setting of the multitenant id from the incoming domainname which is also stored in the tenant entity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1032444 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 02:04:27 +00:00
Bruno Busco 4f1d234a85 ManagePortalPages screen improvements.
The PortalPage list is now collapsible. The form to create a new portalPage has been moved to a dedicated screen.
This allows to have a less crowded screen and the portalPage being configured can be seen almost at full screen.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023447 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 09:46:52 +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
Bruno Busco 599547f6b5 The retrievePortletAttributes.groovy is not needed any more since it is now embedded in the include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023427 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:22:16 +00:00
Bruno Busco 6b64d8f840 Removed unused file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023287 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 14:07:01 +00:00
Bruno Busco bc9f49bf3f Used include-portal-page widget in Portal Admin Screen.
Removed editPortalPage.ftl not needed any more.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023285 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 14:01:19 +00:00
Bruno Busco bb966c359b Added new request "updatePortletSeqDragDrop" in portal-controller.
This allows to move the portlet rendered using the include-portal-page widget using the same service used for the portlet drag and drop.
Redundant moving services will be removed when the include-portal-page widget will have completely established.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023203 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 07:43:45 +00:00
Bruno Busco 00f98b9644 Remove unused ListPortalPage.groovy. This has been replaced by the PortalPageWorker.getPortalPages method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023195 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 06:03:41 +00:00
Erwan de Ferrieres 2b0bf1c8cc Avoiding error when trying to edit a portalPage with no portlets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005875 13f79535-47bb-0310-9956-ffa450edef68
2010-10-08 16:01:42 +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 bfccb22656 Introduces a new checkUomConversion service which returns a boolean if UomConversion exists.
It may be used by a checkUomConversion javascript which uses the getServiceResult. I put it in the getDependentDropdownValues.js file for the moment. But anyway at term I will refactor all these Ajax related scripts (like in selectall.js) in a specific file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1002353 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 20:58:21 +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 d409250b6a Fixes the linkGeos service. It was able not remove, it was only creating.
Introduce a new getRelatedGeos service which will be used soon in the Webtools/Geo mnagement. It comes from the jQuery branch and I have still not rewritten the jQuery to Prototype part. This should make smoother next merge from trunk in jQuery branch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000434 13f79535-47bb-0310-9956-ffa450edef68
2010-09-23 12:47:14 +00:00
Jacques Le Roux 0715959cbd Separates Lookup request from Ajax requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000105 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 17:54:01 +00:00
Jacques Le Roux 8172640f9a Removes dependencies from Example component to Party component by replacing Party lookups by Geo lookups.
Removes useless specific party lookups in Example component

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@999390 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:07:57 +00:00
Bruno Busco 44d6f3b2d1 - Removed more ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998691 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 16:13:12 +00:00
Bruno Busco 2704f7f99f - Removed several ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
- Replaced AddPortlet request and view-map with addPortlet. This seems to be the standard we use.
- Portlet attributes are now edited using a dedicated screen. This is how it works in the new PortalPage widget. I used the same system in the actual PortalPage system also because it was too complicated to handle it in two different way. In any case it should not hurt.
- Removed a debug string in the PortalPageColumn renderer.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998686 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 15:46:17 +00:00
Bruno Busco 3bbd2d8598 Added the <include-portal-page> widget. OFBIZ-3625 https://issues.apache.org/jira/browse/OFBIZ-3625
Using this widget, a PortalPage can now be easily rendered in any screen.
At the bottom of the page an "Edit ON/OFF" button can be used to switch the PortalPage edit mode ON and OFF so that the Portal Page can be edited "in place".
All the portlet editing requests are handled using the "save-last-view" request attribute so that a dedicated screen can be shown to set the Portlet attributes and the column width and, when submitted, the user is taken back to the portal page he was editing.

Those new requests will be used in a later commit to eliminate all the duplicated ****Adm requests that have been introduced when the Webtools portal admin screen has been created.
A simple use of the widget has been added in the Example application.

TODO:
- At the moment the portal page editing is performed on the portal page itself and no portal derivation from the "main" one is performed. This will be done in a later commit.
- The portlet moving controls both manually and by drag and drop have not been implemented yet.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998570 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 00:09:39 +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 68ef437347 New simple Geo Management in Webtools. It still misses a Geo Assoc Find Screen.
For the moment in trunk the Link Geos screen use a standard multiple dropdown. It's not easy to use (see why at http://www.ryancramer.com/journal/entries/select_multiple). In the jQuery branch I have used the asmselect plugin, much easier for end users. Actually I'm not totally satisfied by it either. It's a beta and seems to be freezed. Also the way the field is shown is not flexible enough. It's a fixed size area and I tried to work around. I could be done better though. I will have a look. Sascha thought we could use jQuery.ui.sortable but I don't think it exactly corresponds to the feature needed.

I have also changed some labels names and removed/grouped some requests (only in common now)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996658 13f79535-47bb-0310-9956-ffa450edef68
2010-09-13 19:35:40 +00:00
Bruno Busco 63e4c236d0 Deleted requests and view-maps no longer used. (Fixes errors reported in logs using the ArtifactInfo screen)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996323 13f79535-47bb-0310-9956-ffa450edef68
2010-09-12 14:46:20 +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
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