Commit Graph
85 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
holivier 211540a966 Documented: Help link using asciidoc files via generated html
(OFBIZ-11693)

Migrate AccountingHelData.xml to added some <set field="helpAnchor" to
the correct screens

Now in accounting component only asciidoc documents are used, help link
area now link to userDocUri
(ci.apache.org/projects/ofbiz/site/trunk/ofbizdoc as default value in
general.property)
2020-06-05 15:15:21 +02: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
Jacques Le Roux cf0c677e10 Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

Fix my previous commits, there is no themes webapp so no URL at 
/themes/common/webapp/images/ofbiz_logo.png
It's only images/ofbiz_logo.png


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820978 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 12:56:30 +00:00
Jacques Le Roux b964875337 Improved: Clean images, among them logos, in all locations used
(OFBIZ-10128)

The ofbiz_logo.png is now in theme. This is only the framework part. 
I have also made change in theme but I need to review again and perhaps create 
a patch for others to review...
Note: testUpdatePartyGroup is OK

Then I'll also rename the logo in site to use the same name before maybe
referring to svn trunk repo to use only 1 file everywhere, same for the .ico
file

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1820862 13f79535-47bb-0310-9956-ffa450edef68
2018-01-11 11:05:26 +00:00
Jacques Le Roux 95b17d4d23 Improved: The main logo in screen upper part shows distorted
(OFBIZ-9990)

Fixes this issue in Tomahawk and Flat Grey themes by using ofbiz_logo.png, 
instead of the old logo deprecated ofbiz_logo.gif 

While at it use the same logo everywhere it's possible. It was needed for links 
to http://ofbiz.apache.org/images/ofbiz_logo.gif which no longer exists 
(actually seems only used for tests so could stay like that but better not refer 
to it anyway)

Also use this logo for Bluelight theme where it fits. 

It could not be used in Rainbow themes because they are using a Scalable Vector 
Graphics file (ofbiz-white.svg) that can't be replaced by the new png logo file
BTW this file still uses a TM symbol instead of a ®

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816897 13f79535-47bb-0310-9956-ffa450edef68
2017-12-01 18:45:50 +00:00
James Yong 256fd74497 Fixed: Empty Space above Find Payment header
OFBIZ-9965

This fix will check paymentId is non-empty before including the PaymentSubTabBar menu.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1814340 13f79535-47bb-0310-9956-ffa450edef68
2017-11-05 07:35:53 +00:00
Deepak Dixit 29461cdc47 Fixed: Found some more vlaue=dollor pattern in set element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806329 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 20:33:37 +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
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 22257c6996 (OFBIZ-7021) Renamed accounting component ftl file name from lower case to upper case.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742358 13f79535-47bb-0310-9956-ffa450edef68
2016-05-05 05:30:40 +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
Hans Bakker 9d39583bcf be able to set accounting company in the header, so other companent can change it too. https://issues.apache.org/jira/browse/OFBIZ-6802
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728584 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 01:45:50 +00:00
Arun Patidar 8a0af90c0f [OFBIZ-6212] Fixed the issue #1 of Accounting reports due to a minor typo and missing screen.Added a decorator screen for using with accounting report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704014 13f79535-47bb-0310-9956-ffa450edef68
2015-09-19 13:09:40 +00:00
Erwan de Ferrieres 3bb3e10014 A decorator was forgotten for OFBIZ-3641. This should be the last one. Thanks Blas for noticing !
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932083 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 20:01:51 +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
Scott Gray 6109808c8a Tabs to spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924378 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 17:28:01 +00:00
Hans Bakker afbdeab656 moved the helpscreens into the framework: a first step. core parts of the content manager to follow. Removed the references to the help screens in confluence
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@903589 13f79535-47bb-0310-9956-ffa450edef68
2010-01-27 10:09:49 +00:00
Hans Bakker 0b7e302d77 show commission run screen button from ap also in accounting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@901966 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 03:17:28 +00:00
Bruno Busco 4e8c64f5c7 Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@897530 13f79535-47bb-0310-9956-ffa450edef68
2010-01-09 20:06:32 +00:00
Hans Bakker 78fa025e71 extended the OLAP entities with the InventoryItemFact, added birt reports in the facility, Order, and accouning payment components. Please note that before these reports can be used the warehouse needs to be populated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@890830 13f79535-47bb-0310-9956-ffa450edef68
2009-12-15 15:34:29 +00:00
Bruno Busco 342e9cb614 Accounting application
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.

Removed several redundant <section><widget> tags also

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883139 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 20:14:11 +00:00
Anil Patel 52e7a3ad66 Removed extra container around labels. Apply h1 (or h2, h3) style to label instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834376 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:38:24 +00:00
Anil Patel e69b9bc5a2 Removed duplicate definition of CommonPartyDecorator. Added partyDecoratorLocation parameter to ar/ap web.xml file so they can find CommonPartyDecorator.
This issues was discussed on list after r829392 commit in response to patch on OFBIZ-3080.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831920 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 15:32:39 +00:00
Bruno Busco ca9d334eee Part of OFBIZ-3067 - Menus and form widget files location
Accounting component
Renamed accounting/widget/Menus.xml to accounting/widget/AccountingMenus.xml
Renamed accounting/widget/ap/Menus.xml to accounting/widget/ap/ApMenus.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828855 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 21:17:14 +00:00
Anil Patel 048e2c58ef Removing CommonTaxAuthorityDecorator from CommonScreens.xml because now it exists in TaxAuthorityScreens.xml file.Missed this file in my commit r826954.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828285 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 03:00:12 +00:00
Anil Patel 337f5997bc Moved CommonPartyAccountsDecorator from CommonScreens.xml to GlScreens.xml. Added partyGlDecoratorLocation parameter. The pattern of having decorator for set of screens in same file as screens is much more flexible. Same pattern is used in many our screens sets in accounting e.g Payment, Invoices, BillingAccount etc.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826708 13f79535-47bb-0310-9956-ffa450edef68
2009-10-19 16:04:53 +00:00
Anil Patel a046a2bd76 Moved CommonBillingAccountDecorator back to BillingAccountScreens.xml. Add billingAccountDecoratorLocation parameter for location. This pattern to reference screen decorator is much more flexible and is already in place in Invoice and Payment screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825663 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 21:15:38 +00:00
Ashish Vijaywargiya 9cd35b6ef8 Moved decorator screen to CommonScreens.xml file.
This will help to override decorator screen using ${parameters.mainDecoratorLocation}.

Thanks Brajesh for the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825534 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 15:50:50 +00:00
Anil Patel be9218c7ea Moved CommonPaymentDecorator to PaymentScreens file. Updated decorator location parameter name to paymentDecoratorLocation. This pattern is adopted from InvoiceScreens. This pattern allows to easily override decorator by specifying custom value to paymentDecoratorLocation parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822588 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 05:08:43 +00:00
Bruno Busco 122bdc4154 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820887 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 05:20:03 +00:00
Anil Patel 2d00d6a445 Misc cleanups in Financial Account and Payment Group screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@798113 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 12:13:53 +00:00
Adrian Crum f8fa9e3106 Put the fixed asset decorator screen back where it belongs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796873 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 20:35:18 +00:00
Ashish Vijaywargiya 012b5ab921 Applied patch from jira issue OFBIZ-2699 - Create Payment Batches for Ar Payment
Following thing is covered in this patch:
-- functionality to cancel payment group and expire association with payment. 
Thanks Awdesh & Rishi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792526 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 12:24:13 +00:00
Ashish Vijaywargiya e50dbb1796 Applied patch from jira issue OFBIZ-2699 - Create Payment Batches for Ar Payment.
Following things are covered in this patch:
– Add new tab with name overview for payment group.
– Added forms on overview screen. 

Thanks Awdesh for your contribution on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792213 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 16:27:51 +00:00
Scott Gray 28d5cedff1 Remove the freemarker payment menu and reinstate the widget version, fixes problem reported by Rishi Solanki
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791388 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 05:44:36 +00:00
Hans Bakker fd36165353 Calendars now working in accounting, workeffort and myportal with fixed asset, facility and party. reported by adrian and with help from Jacopo.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791057 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 04:21:29 +00:00
Ashish Vijaywargiya e473a0f651 Applied patch from jira issue OFBIZ-2694 (In Accouting Payment Section The PaymentSubTabBar options are not working properly, so converting it to ftl so that desired functionality can be achieved.)
There were bug reported Menu Widget code and for more details see the discussion available at OFBIZ-2684.

Thanks Surya for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790924 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 14:15:31 +00:00
Vikas Mayur dce4a20ee3 Implemented entity, crud services and ui for payment groups which will be enable user to generate checks in a batch from selected bank account (which is not implemented yet).
Thanks to Jacopo for notes. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788963 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 12:45:11 +00:00
Hans Bakker dd6243832e make the changed calendar screens also working in the accounting component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@786951 13f79535-47bb-0310-9956-ffa450edef68
2009-06-21 08:22:18 +00:00
David E. Jones 70f8da92bb Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux 9aa57f3ea4 A patch from Bruno Busco "Linking End User Documentation to OFBiz" (https://issues.apache.org/jira/browse/OFBIZ-2133) - OFBIZ-2133
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748884 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 16:29:24 +00:00
Hans Bakker 041ccc0a7d rename applicationext component to commonext
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748388 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 04:05:47 +00:00
Hans Bakker 5192a24e48 introduction of a common component for applications. moved the 2 lines containing party info to this component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748144 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 13:36:51 +00:00
Hans Bakker 33ed533574 get the title under the buttons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@747684 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 06:55:14 +00:00
Marco Risaliti 54e0334ca2 A lot of hardcoded labels cleaning and changes some wrong references
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742770 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 22:13:57 +00:00