Commit Graph
25 Commits
Author SHA1 Message Date
Aditya Sharma e97f45c381 Fixed: removed unused asmselect files and unused variable asm_asmListItemPercentOfForm (OFBIZ-10113)
asm select library is already replaced with select2 library, but the library files still exist in code base unused.
asm_asmListItemPercentOfForm varaible was used to set the width of the selected items which were displaced distictly from select fields. With select2, the selected items display inside the input field so it is no more needed

Thanks Jacques Le Roux for reporting it
2021-05-12 11:57:54 +05:30
James Yong 591b0442c7 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Webtools, Themes.
2020-05-15 21:25:12 +08:00
Deepak Dixit 1a7aee6685 Improved:Use from-field pattern instead of value=dollor pattern in 'set' element
Apply slightly modified patch from jira issue, fixed some typo (OFBIZ-9607)
Thanks Suraj Khurana and Rohit Rai for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806326 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 20:23:40 +00:00
Nicolas Malin 40fdd2ca73 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step 
#9 Change all set screen and script that call widget.properties values replaced by call to modelTheme

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806150 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 10:02:34 +00:00
Nicolas Malin aec57b51c5 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Third step, move macro ftl libraries and ftl template present on framework common to common theme
At this step, the common-theme is forced like the common component previously.

Main common screens present on CommonScreens.xml, LookupScreens.xml and HelpScreens.xml are moved to common screen with a forced rewrite to common-theme 
Warning this commit is going to follow with a other commit for CommonScreens.xml because LookupScreens.xml and HelpScreens.xml are recreated on common-theme, but to keep the history of CommonScreens.xml it was moved entirely, the second commit restore it with redirect call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806091 13f79535-47bb-0310-9956-ffa450edef68
2017-08-24 21:55:06 +00:00
Jacques Le Roux e99b90b591 No functional change, removes trailing blanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1784253 13f79535-47bb-0310-9956-ffa450edef68
2017-02-24 10:23:45 +00:00
Divesh Dutta 738a12bec1 Improvement: Miniland code readability and consistency improvements
(OFBIZ-8744) (OFBIZ-8745) (OFBIZ-8746) (OFBIZ-8748) (OFBIZ-8829) (OFBIZ-8830) (OFBIZ-8907) (OFBIZ-8908) (OFBIZ-8924) (OFBIZ-8925) 

Thanks: Ankush Upadhyay , Sega patidar , Abhijeet Ashapure for your patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768219 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:14:04 +00:00
Divesh Dutta 85ce444748 Improvement: Minilang code readibility and conistency improvements
(OFBIZ-8445) (OFBIZ-8447) (OFBIZ-8448) (OFBIZ-8450) ( OFBIZ-8451) (OFBIZ-8653) (OFBIZ-8740) (OFBIZ-8741) (OFBIZ-8742) (OFBIZ-8743)

Thanks: Devanshu Vyas, Anuj Jain, Sega Patidar, Abhijeet Ashapure for your patches

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768209 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 12:41:35 +00:00
Jacques Le Roux 9ab9f3a70e No functional change, fixes a typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751680 13f79535-47bb-0310-9956-ffa450edef68
2016-07-06 13:40:21 +00:00
Jacques Le Roux c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit 543dd8e488 (OFBIZ-7221) Relocate .groovy files in the framework/webtools component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747755 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 17:16:22 +00:00
Deepak Dixit 83696e3203 (OFBIZ-7021) Renamed framework common component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744783 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:52:54 +00:00
Deepak Dixit 209b95cbbf (OFBIZ-6823) relocate .ftl files in the framework/common component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740497 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:28:46 +00:00
Deepak Dixit 5063287ddf (OFBIZ-6824) Apply slightly modified patch from jira issue, updated path for ping.ftl and showDateTime.ftl in controller.xml
============================================================
relocate .ftl files in the framework/webtools component
============================================================
Thanks  Pierre Smits for your contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738581 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 12:57:45 +00:00
Jacques Le Roux 5befa22833 A modified patch from Pierre Smits for "Display GeoPoint with map in WebTools" https://issues.apache.org/jira/browse/OFBIZ-6527
Currently only a list of geoPoints is shown. The user experience will improve when we not only show that, but a map as well.

jleroux: 
I refactored the js scripts in party editGeoLocation.ftl and added webtools GeoLocation.ftl into a new common GoogleGeoLocation.ftl template now included in both party editGeoLocation.ftl and webtools GeoLocation.ftl 
I also removed trailing blanks in common GeoLocation.ftl template. 
I also added a French label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1713627 13f79535-47bb-0310-9956-ffa450edef68
2015-11-10 12:32:01 +00:00
Jacques Le Roux 4d2a942aa4 A patch from Gil Portenseigne for "Add a mean to untie geo associations" https://issues.apache.org/jira/browse/OFBIZ-6528
In the Webtools we can asociate Geos but we have yet no means to untie them

This patch adds a new grid in EditGeoScreen to see/delete GeoAssoc and CommonEntityLabels default-resource-name on GeoAssocType for translation purpose.

jleroux: On Pierre's Smits suggestion Gil also added a clickable link to open the associated Geo and a column to show the geoTypeId of the associated Geo.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1687259 13f79535-47bb-0310-9956-ffa450edef68
2015-06-24 13:10:00 +00:00
Jacques Le Roux 6c650d849a A patch from Pierre Smits for "Adding GeoPoints overview to geo management" https://issues.apache.org/jira/browse/OFBIZ-6148
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667969 13f79535-47bb-0310-9956-ffa450edef68
2015-03-20 09:48:24 +00:00
Adrian Crum c30924d47f Removed unnecessary screenlet widget from the Find Geos screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1666511 13f79535-47bb-0310-9956-ffa450edef68
2015-03-13 16:48:36 +00:00
Jacques Le Roux 53ccd2ceb7 Fixes "Overview of routings does not paginate" https://issues.apache.org/jira/browse/OFBIZ-5322 and more
Actually it does paginate but the value is not dependent on widget property widget.form.defaultViewSize which default value is 20. It uses a default value of 50 which is defined by

<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="3"/>

You can easily test it using https://localhost:8443/manufacturing/control/FindRouting?VIEW_SIZE=3

This is legacy from pre Apache era. I found 143 cases where a default-value is defined in screens for VIEW_SIZE.

I did not look into details for the 143 cases but I believe most are also legacy.
There are few default values: 10, 20, 30, 50, 500 and even an extreme case of 10000 for InventoryItemTotalsExport!
There is only one comment for LookupBulkAddProducts which is also legacy: <!-- 10 rows seems more appropriate given screen size, etc. -->

I suggest to OOTB replace all those by the widget.form.defaultViewSize value.
Things will then be consistent and easily changeable on a global scale using the widget property.
Or if really needed forcing the default-value as it's done now.

So this would be applied on the 143 cases (I checked, viewSizeDefaultValue does not exist in any screen)

<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526387 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 05:55:32 +00:00
Hans Bakker 56323a459b make the webtools screens use the decorator location from web.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1455024 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 07:35:16 +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 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 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