Commit Graph
116 Commits
Author SHA1 Message Date
Nicolas Malin 7165768251 Implemented: Add a framework method to get main webapp menu with the webapp name
(OFBIZ-10601)

To improve theme management and provide better tools for new themes, we implement a method to obtain the main menu of a webapp.
Instead of just managing a menu, we extend the functionality by offering a method to expose a summary of the webapp, to simplify the navigation.

For this we add a new attribute on webapp definition app-shortcut-screen :

    <webapp name="mywebapp"
            ...
            app-shortcut-screen="component://mycomponent/widget/CommonScreens.xml#ShortcutApp"
            ...
    />

The idea is to define a new purpose screen *Shortcut* that contains what defines a webapp when an action or navigation has been requested. With this screen you can load a menu, a search, a complex description and use all screen powerfulness to resolve what displaying and support by theming

    <screen name="ShortcutApp">
        <section>
            <actions>
                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
            </actions>
            <widgets>
                <decorator-screen name="ShortcutDecorator" location="component://common/widget/CommonScreens.xml">
                    <decorator-section name="body">
                        <include-menu name="MyShortcutAppBar" location="component://mycomponent/widget/CommonMenus.xml"/>
                    </decorator-section>
                </decorator-screen>
            </widgets>
        </section>
    </screen>

Each component are self-sufficient to define what shortcuts to display without framework change or knowledge about other component.
Each theme can implement and customize the display rendering at will.

To illustrate an example of implementation we set sub menu for each webapp defined on applications and exploit it on bluelight theme.

Thanks for Dennis Balkir, Jacques Leroux, Leila Mekika and Julien Nicolas for their involvement
2021-01-15 08:56:23 +01:00
Jacques Le Roux ec2b84341e Reverted: "Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)"
This reverts commit 17eb2e4cf7.

It does not work when using <<target="javascript:........>>
I could change those cases but it's easier and safer to simply revert back to
target-type!

Thanks: James for report
2020-12-18 11:08:32 +01:00
Jacques Le Roux 17eb2e4cf7 Improved: Hyperlink target-type attribute is deprecated and should be replaced by url-mode (OFBIZ-12091)
Same for sub-hyperlink
2020-12-11 16:52:04 +01:00
holivier 9eaf180a4b Documented: migration to help system using asciidoc files
(OFBIZ-11587)

Add <set field=helpAnchor... in CommonScreens for application where it's
not present. With this commit all OFBiz application help go to the html
generated from asciidoc files
2020-09-28 15:15:04 +02:00
Akash Jain 2a9c4ce3f4 Improved: Status ID checkbox for FindPayments and FindPurchaseInvoices forms (OFBIZ-11938) 2020-08-03 16:19:06 +05:30
James Yong 2c62637752 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Accounting, Content, HR, Manufacturing.
2020-05-15 17:43:38 +08:00
Jacopo Cappellato cbad4d3e22 Fixed: Add missing view permissions checks to various screens. 2019-11-15 19:23:38 +01:00
Jacques Le Roux 4d646ce052 Improved: Use "Create" instead of "Create New" on the various screens of all
components
(OFBIZ-9905)

As the title says + removes now useless labels

Thanks: Aayush Jain for report, Sourabh Jain for the fix, Pierre Smits and 
Rishi Solanki for comments

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858291 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 17:56:44 +00:00
Michael Brohl f0550e7d7b Improved: Improve Accounting - AP container structure.
(OFBIZ-10464)

This fixes structural differences to make theme styling more consistent.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1848461 13f79535-47bb-0310-9956-ffa450edef68
2018-12-08 11:58:43 +00:00
Suraj Khurana 9ca5823a8a Improved: Consistency and Readability improvements for include-menu tag.
(OFBIZ-8972)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1845088 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:29:43 +00: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
Deepak Dixit d09255c0b7 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta 70eb7ff508 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +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 38c5ba5993 Improved: Convert search criteria on status into multi select pattern for Accounting Component
(OFBIZ-7546)

Added Check box for status fields on Find Invoice, Find Payments and Find Purchase Invoices forms.

Thanks: Mohammad Kathawala for the patch and Swapnil Shah for reporting the issue. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761134 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 06:58:41 +00:00
Michael Brohl 923b980f29 Improved: Accounting: Consistent form name.
(OFBIZ-8045)

Change all form names to upper camel case for consistency.

Thanks: Tanmay Muley for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761077 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 20:27:26 +00:00
Pranay Pandey 75fb73e348 [OFBIZ-7858] Adding paginate target on 'BillingAccountForms', 'CostForms' and 'AP/AR-InvoiceForms'.
Thanks Amardeep Singh Jhajj for reporting the issue and Chandan Khandelwal for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752933 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 12:02:36 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Jacques Le Roux 640ec64bb7 No functional changes, removes superfluous blanks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752150 13f79535-47bb-0310-9956-ffa450edef68
2016-07-11 12:42:20 +00:00
Jacques Le Roux 3e9bb67454 No functional change, fixes a typo (as ever was open in Eclipse where I fixed by hand and did not save before committing previous fix)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751699 13f79535-47bb-0310-9956-ffa450edef68
2016-07-06 15:02:19 +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 633d933e91 (OFBIZ-7219) Relocate .groovy files in the accounting ap and ar webapp.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747849 13f79535-47bb-0310-9956-ffa450edef68
2016-06-11 05:54:25 +00:00
Deepak Dixit 87601f6aca (OFBIZ-7219) Relocate .groovy files in the accounting component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747746 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 16:54:38 +00:00
Arun Patidar d3ede84d95 Applying patch from jira ticket OFBIZ-7201.
===============================================================================
Fixed different forms, screens and services affected due to removal of parentTypeId from 'PURCHASE_INVOICE' and 'SALES_INVOICE' InvoiceType data.
==============================================================================
Thanks Anurag Chandak for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747223 13f79535-47bb-0310-9956-ffa450edef68
2016-06-07 13:18:40 +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 8ace9fbcb6 (OFBIZ-6813) Apply patch from jira issue.
============================================================
relocate .ftl files in the accounting component
============================================================

Thanks Pierre Smits for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738754 13f79535-47bb-0310-9956-ffa450edef68
2016-04-12 10:17:36 +00:00
Deepak Dixit cf28e7359c (OFBIZ-6937) Applied patch from jira issue.
============================================================
Company Check payment method should be shown when issuing chek
============================================================
Thanks Akash Jain for reporting the issue and Mohammad Rehan Khan for patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735731 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 06:23:40 +00:00
Mridul Pathak 7d8f8bfc2e [OFBIZ-6185] Type-ahead regarding LookupInvoice in AP doesn't return result. Applying patch from OFBIZ-6185. Thanks Pierre Smits for reporting the issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1720920 13f79535-47bb-0310-9956-ffa450edef68
2015-12-19 13:38:46 +00:00
Nicolas Malin 895c9856b3 Cleaning forms code is needed after setting default-value in list-options and entity-options, patch related to OFBIZ-6524 and follows the resolution of OFBIZ-6490 and OFBIZ-6489. Thanks Gil Portenseigne for this effort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686674 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:58:05 +00:00
Jacopo Cappellato ecfc14a6bc ${bsh: to ${groovy: scriptlet conversions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1613432 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 13:28:20 +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
Erwan de Ferrieres 2181b0b013 Consistency with the page title for the tab menu item
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1086916 13f79535-47bb-0310-9956-ffa450edef68
2011-03-30 12:02:08 +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 9e6dd1f56c Replaced PortalPageScreen with the new include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023425 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 06:44:14 +00:00
Bruno Busco 6aa252df3b Added UiLabels resources loading in Porlets.
This fixes the missing portlet UILabels rendering when accessing the Portal Page Admin in WebTools.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996090 13f79535-47bb-0310-9956-ffa450edef68
2010-09-11 07:10:50 +00:00
Ashish Vijaywargiya 27e6d4fbc3 Applied patch from jira issue - OFBIZ-3872.
Error in Screen Ap -> Invoices -> Commission Run.

The following error screen appears when we click on find button with

partyId - Demo Agent (DemoCustAgent)
fromDate - (set current date)

org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen component://accounting/widget/ap/InvoiceScreens.xml#CommissionRun: java.lang.ClassCastException: java.lang.String cannot be cast to java.util.Collection (java.lang.String cannot be cast to java.util.Collection)

Thanks Amit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@978806 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24 06:13:06 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Vikas Mayur 25c3810fd8 Added payment lookup specific to Account Receivable and Account Payable application. This fix a bug with the payment types that was showing up wrong values in the lookup screen used before.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950986 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 13:23:47 +00:00
Vikas Mayur 9740afd145 Added invoice lookup specific to Account Receivable and Account Payable application. This fix a bug with the status and invoice type
that was showing up wrong values in the lookup screen used before.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950936 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 10:24:02 +00:00
Jacques Le Roux df40275120 A completed patch from Sascha Rodekamp "Lookup Layer Search of a Varient Product" (https://issues.apache.org/jira/browse/OFBIZ-3746) - OFBIZ-3746
Fix the variant issue in product lookups
Remove the temporary window presentation workaround (done at r939232)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@940410 13f79535-47bb-0310-9956-ffa450edef68
2010-05-03 10:37:33 +00:00
Jacques Le Roux 92699050d0 A temporary workaround for the problem reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3746: "Lookup Layer Search of a Variants Product"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939232 13f79535-47bb-0310-9956-ffa450edef68
2010-04-29 08:47:57 +00:00
Erwan de Ferrieres e9ef17a182 Correcting decorators' names, as some screens were used in AR and AP components. This is closing OFBIZ-3641
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931956 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 14:29:28 +00:00
Erwan de Ferrieres 256028190e Error screen in ap -> reports - OFBIZ-3640 (https://issues.apache.org/jira/browse/OFBIZ-3640)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931045 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 08:08:22 +00:00
Vikas Mayur 41b9e5f0fe Replaced
<if-has-permission permission="ACCOUNTING" action="_VIEW"/>
with
<if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930247 13f79535-47bb-0310-9956-ffa450edef68
2010-04-02 11:36:59 +00:00
Adam Heath b90cb4df78 Fix bad screen definitions, you can't reference a
value(defaultOrganizationPartyId) before it is set.  That variable was
being set by the decorator, which hadn't yet run when the initial
actions were being run for the main screens in these webapps.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918769 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 23:27:42 +00:00