Commit Graph
39 Commits
Author SHA1 Message Date
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
Bruno Busco a4ef53cf69 A patch from Blas Rodriguez Somoza
OFBIZ-3678 - XHTML validation errors round 2 (specialpurpose/googlebase)
https://issues.apache.org/jira/browse/OFBIZ-3678

XHTML validation errors

    * Uppercase tags or attributes.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@934187 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 20:38:57 +00:00
Vikas Mayur ba9e225b43 Catalog Tab Bars using FTL were replaced by menu widget in r705940. Removing the FTL tab bar occurrence which was probably not removed while replacing it
with menu widget.  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930837 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 10:48:54 +00:00
Ashish Vijaywargiya fc45518ad6 Applied patch from jira issue OFBIZ-3149 - Improve Category association in eBay.
Recently multi store support for Ebay has been implemented. For the multi store support we need ProductStore > ProdCatalog > ProductCategory association. For EBay we define specific categories of type EBAY_CATEGORY, only those products that are associated to an EBay category are eligible for eBay export. In the current implementation there is no proper prodCatalogCategoryTypeId which can be used to associate eBay category to ProdCatalog, one way to associate an eBay category to ProdCatalog is as a PCCT_BROWSE_ROOT category, thus we have two categories associated to the catalog as BROWSE_ROOT, the other one is for online store. Technically, this is wrong, a catalog should be associated with only one browse root category. Due to this wrong association the eBay category doesn't show up on the advance search page of EBAY webapp, instead online store's browse root category is shown which may also contain those products which are not meant to be exported to eBay. So this category associations need to be fixed, and following is how this can be resolved:

   1. Create a new ProdCatalogCatagoryType PCCT_EBAY_ROOT
   2. Define a worker method in CatalogWorker to derive the top level (root) ebay category
   3. Now in the advance search form, first look for top level ebay category associated to the selected catalog
          * If found, derive sub category list of the top level ebay category and display, else display the top level ebay category itself
          * If not found, derive the top level browse root category (PCCT_BROWSE_ROOT) and display the sub category list for it

Thanks Parimal Gain for the contribution.
Special thanks to Mridul Pathak (Zone of Sharp Mind :-)) for discussing implementation plans & providing wonderful notes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832713 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 12:05:09 +00:00
Ashish Vijaywargiya 7c2d11d05a Applied patch from jira issue OFBIZ-3132 - Multiple productStore support to googleBase and eBay.
Changes includes following:
1) Created new search form for eBay and GoogleBase - It was not good to update *advancesearch*.ftl file present inside catalog component. Now it will be easy to maintain separate file for future deployments.
2) Restricted productStoreId and prodCatalogId field to search.
3) Added webSite drop-down on "Export to eBay" and "Export to GoogleBase" page.
4) Select webSite to get the webSiteUrl. 

Thanks Parimal for your contribution - this will surely help the community.
Special thanks to Mridul, Rishi, Chirag, Deepak & Me :-) for discussing requirement and also special thanks to Jacopo for the notes and discussion on requirements.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831534 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 12:01:52 +00:00
Bruno Busco 17288a9082 Part of OFBIZ-3067 - Menus and form widget files location
Party and Product components
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829418 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 17:41:31 +00:00
Bruno Busco 4cf618421d Part of OFBIZ-3067 - Menus and form widget files location
Catalog component
Renamed order/widget/catalog/Menus.xml to order/widget/catalog/CatalogMenus.xml
Renamed order/widget/facility/Menus.xml to order/widget/facility/FacilityMenus.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829314 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 07:14:26 +00:00
Bruno Busco a9c26eb1c1 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826483 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 18:24:32 +00:00
Jacques Le Roux b7a941d4f6 Revert r813307 on Adrian's request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813893 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 16:02:01 +00:00
Jacques Le Roux a7430a2fc2 A modified patch from Erwan de FERRIERES '"Automatic" sortable table headers" (https://issues.apache.org/jira/browse/OFBIZ-2921) - OFBIZ-2921
I was planning to wait longer, but I can't wait more. I have added a lot of small trivial changes in this patch and they are blocking me to go further on other issues...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@813307 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 08:41:19 +00:00
Ashish Vijaywargiya a974a553e4 Added GUI for GoogleBaseConfig entity - CRUD Operations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809582 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 13:31:27 +00:00
Ashish Vijaywargiya 1c7a068142 Moving screen definition to appropriate location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809555 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:24:10 +00:00
Ashish Vijaywargiya 6dc9720309 Another update on Google Base.
Following things are done in this commit:

1) Added new entity GoogleBaseConfig and reading the values from there. Also kept option to read configuration values from property file.
2) Added new ProductCategoryType record for Google Base - Thanks Jacopo for your suggestion on this.
3) Prepared data for demo purpose in DemoProduct.xml file - This demo contains the association of few product with Google Category.
4) Also prepared demo data for GoogleBaseConfig entity.
5) Provided option to have default value of webSiteUrl on the GoogleExport form - for this refer productsExportToGoogle.groovy file.

Thanks Pranay for discussing few things with me in b/w this phase of development.

In next Commit I will provide UI for GoogleBaseConfig entity(CRUD operations) so it will be easy for end user to update values in this entity easily instead of moving to webtools and do the needful.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@809552 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 12:06:14 +00:00
Jacques Le Roux 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +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 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux e8426631e8 Securing URLs, link element in screens and menus : 22th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:14:40 +00:00
Jacques Le Roux 2ae583d0a1 Securing URLs, link element in screens and menus : 10th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760787 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 05:50:07 +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
Marco Risaliti df3cdb54ff Artifact cleaning on various specialpurpose components after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739779 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 15:21:46 +00:00
Jacques Le Roux 08915956a1 <if-empty field-name= => <if-empty field=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739739 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:07:47 +00:00
Jacques Le Roux 290534059d <entity-one entity-name=(.*)value-name => <entity-one entity-name=$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739732 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 10:27:43 +00:00
Bruno Busco 925ddc52e3 - Extended Google Base AppBar from CommonAppBarMenu
- Removed redundand inclusion of StyleSheets and JavaScript (already done in GlobalDecorato). The explicit inclusion of the default maincss.css was the cause of the wrong rendering of the Menu with the new bluelight theme.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737492 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 09:07:32 +00:00
Hans Bakker ff7759b530 show the component name at the login screen for all components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@734074 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 08:47:35 +00:00
Bilgin Ismet Ibryam 4ec9a7dfc5 A patch from Bruno Busco "Replacement of FTL TabBars with menus widgets in catalog application" OFBIZ-1950.
The patch contains also a style change, which works fine with FF3 and IE7.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@705940 13f79535-47bb-0310-9956-ffa450edef68
2008-10-19 00:22:57 +00:00
Bilgin Ismet Ibryam 8fe911c2a4 Applied the patch from JIRA Issue # OFBIZ-1918 "Unable to go on the find screen of google base component." reported by Ravindra Mandre.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685121 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 11:34:42 +00:00
Jacopo Cappellato 4d0ef6bcb0 Fixed bug reported by Sam Hamilton in the dev ml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@674413 13f79535-47bb-0310-9956-ffa450edef68
2008-07-07 07:53:38 +00:00
Bilgin Ismet Ibryam 896d96bdd5 Replaced col-right style with opposed from my previous commit and other places. Thanks to Adrian for pointing out.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@668202 13f79535-47bb-0310-9956-ffa450edef68
2008-06-16 15:43:11 +00:00
Scott Gray 31f94919b7 Replaced the Tigra calendar with Calendar Date Select (http://code.google.com/p/calendardateselect/) - OFBIZ-1808
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@663501 13f79535-47bb-0310-9956-ffa450edef68
2008-06-05 08:45:10 +00:00
Marco Risaliti 888e14c705 Applied patch from JIRA Issue #1633.
Possibility to choose the product descriptions during the duplication of product.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@628297 13f79535-47bb-0310-9956-ffa450edef68
2008-02-16 13:53:59 +00:00
Adrian Crum 68c1dbbaf9 Second sweep through the maincss.css style sheet. Changed the head1, head2, and head3 style names to h1, h2, and h3. Updated affected styles in ftl and xml files.
The ecommerce component is excluded from this commit.

These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.

I won't make any more maincss.css changes for a little while. I'll let the dust settle from these two commits, then I'll go through the file and physically remove the deprecated styles.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@627051 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 19:30:09 +00:00
Adrian Crum 83ece87409 First sweep through maincss.css style sheet. Made sure all deprecated styles are marked as deprecated. Eliminated a number of deprecated styles from ftl and xml files.
The ecommerce component is excluded in this commit.

These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@627034 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 18:55:41 +00:00
Marco Risaliti 4b97bfa095 All the Google Base forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1615)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618317 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 16:31:15 +00:00
Marco Risaliti dcf4f596b8 Replace all the head4 style to head3 style.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618303 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 15:14:59 +00:00
Marco Risaliti c8c9f79d60 Now is it possible to search the product by GoodIdentification Type/Value (Part of issue OFBIZ-1372)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@603734 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 20:47:07 +00:00
Ray Alan Barlow a745f88764 Added a few more fields to the googlebase screens and source to allow loading of UK and potentially DE (EURO-not tested) products. Also added a couple more fields like brand and SKU.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@597108 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 15:09:37 +00:00
Jacopo Cappellato 6af0ee1862 Applied new patch from Marco Risaliti (OFBIZ-1372), plus additional cleanups I did in the process, to complete the task of pulling out of the product component the code related to the integration with Google Base.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@589499 13f79535-47bb-0310-9956-ffa450edef68
2007-10-29 05:51:01 +00:00
Jacopo Cappellato adab7c94dd Isolated Google Base integration into an indipendent specialpurpose component. Mostly based on the patch contributed by Marco Risaliti in OFBIZ-1372
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@589315 13f79535-47bb-0310-9956-ffa450edef68
2007-10-28 09:41:52 +00:00