Commit Graph
351 Commits
Author SHA1 Message Date
Michael Brohl 5b74eac710 Improved: Client side validation is missing at Create User Login form.
(OFBIZ-7984)

Thanks: Deepak Nigam for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1774802 13f79535-47bb-0310-9956-ffa450edef68
2016-12-17 20:37:10 +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 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 5b002a5953 Fixes: jquery.jgrowl.min.css is linked twice in html page
(OFBIZ-7758)

I am running on trunk rev 1751489 on tomahawk theme. 
In the browser, right-click and view the page source. 
There is duplicate linking of jquery.jgrowl.min.css i.e.

<link rel="stylesheet" href="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" type="text/css"/>

The solution is to remove a hack for JPublish in fex Java classes 
and related changes (mostly "page." in ftl and xml files)

Thanks: Rohit Koushal for the path and James Yong the report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761235 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:43:16 +00:00
Michael Brohl 1f6f4cc740 Improved: Common: Consistent form name.
(OFBIZ-8099)

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@1761103 13f79535-47bb-0310-9956-ffa450edef68
2016-09-16 22:10:04 +00:00
Pranay Pandey 8dd9964d31 [OFBIZ-7311] - Applied the patch from the ticket. Removing the unused references of the maincss.css from source code, following is done-
1) Removed 'maincss.css' entry from 'allowedPaths' param of from web.xml
Reason: Since, there is no file like 'maincss.css' exist under any includes directory. 
2) Removed the unused references of maincss.css from FTLs, code
<link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> 
has been removed.
Reason: This is an interesting thing, these FTLs were using the maincss.css located under the images directory.
When I look the history of these files, following were my findings,
The 'maincss.css' file under the 'images' directory exist in release4.0 
http://svn.apache.org/repos/asf/ofbiz/branches/release4.0/framework/images/webapp/images/
after this release, this files no longer exist there.
3) Also, I have updated one file 'InventoryNoticeEmail.ftl' and used the basic HTML code to style, instead of using style defined in 'maincss.css' which were exist in release-4.0
4) Updated some references from 'maincss.css' to style.css in comments.
5) Also removed the entry of including '/images/maincss.css' and '/images/mainrtl.css' in SimpleDecorator
Since, these files no longer exist after release-4.0.

Thanks Wai for reviewing the work and thanks Swapnil M Mane for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758389 13f79535-47bb-0310-9956-ffa450edef68
2016-08-30 13:37:27 +00:00
Jacques Le Roux 945b7e3281 A patch from Pierre Smits for "Have TransactionTotalsPdf.pdf show the internal company show it has been generated for." https://issues.apache.org/jira/browse/OFBIZ-7920
The TransactionTotalsPdf.pdf currently doesn't show the name of the company it has been generated for.

jleroux: I asked Pierre to check that "Aree we sure that the changes in Simple.fo.ftl are general enough? I mean did you check that they will not appear in inopportune places?"
Pierre's answer:  Checked against most occurrences where the SimpleDecorator is used. A few weren't possible to check due to missing demo data.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758091 13f79535-47bb-0310-9956-ffa450edef68
2016-08-28 05:12:56 +00:00
Jacques Le Roux f47ffc755c A request from Pierre Smits for "Move *CertKeystore.groovy* to location according to best practice" https://issues.apache.org/jira/browse/OFBIZ-7892
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753196 13f79535-47bb-0310-9956-ffa450edef68
2016-07-18 10:11:56 +00:00
Jacques Le Roux 414c48d1f2 A modified patch from Pierre Smits for "Ftl to Widget: improve ViewCertificate to use widgets instead of ftl" https://issues.apache.org/jira/browse/OFBIZ-6302
jleroux: I updated the patch. I fixed things by hand: tabs in the groovy files, removed the ftl file because of a tree conflicts due to the recent ftl files move and updated org.ofbiz to org.apache.ofbiz in CertKeystore.groovy

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753024 13f79535-47bb-0310-9956-ffa450edef68
2016-07-17 08:14:46 +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
Deepak Dixit 1db94eeaee (OFBIZ-1319) Replace selectall.js occurance with OfbizUtil.js.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752900 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 06:46:24 +00:00
Jacques Le Roux a025b28013 Fixes an issue related done with "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 reported by Swapnil M Mane
<<xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">> was missing, this happened in r1749488. It was the only case like that (checked in Eclipse using validate, there are tons of other mnior issues BTW)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750050 13f79535-47bb-0310-9956-ffa450edef68
2016-06-24 08:51:05 +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 4a276ecf91 (OFBIZ-7231) Relocate .groovy files in the framework/common component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747776 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:58:37 +00:00
Deepak Dixit e929d179d8 (OFBIZ-7228) Relocate .groovy files in the party component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747770 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:39:22 +00:00
Nicolas Malin ab92393570 Add xls screen renderer to convert a screen definition like an html flow directly ready by a spreadsheet application
In addition, add an export example button on FindExample screen and add complete macro ftl renderer unit test. Issue OFBIZ-6931 proposed by Leila Mekika. Thanks to her, jacques and pierre for theirs remarks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746045 13f79535-47bb-0310-9956-ffa450edef68
2016-05-29 18:38:26 +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 cee0263cef (OFBIZ-6815) relocate .ftl files in the content component
Thanks Pierre for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740446 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 06:12:08 +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
Nicolas Malin 40d44a3513 Add new template location : VT_LOGIN_TMPLT_LOC for the login
VT_CHPWD_TMPLT_LOC for the changePassword
VT_FGPWD_TMPLT_LOC for the forgetPassword
VT_GSQUE_TMPLT_LOC for the getSecurityQuestion
Related issue OFBIZ-6868. The origin requirement came from issue OFBIZ-6843 with proposition to adding new theme with dedicate template for these previous element

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728026 13f79535-47bb-0310-9956-ffa450edef68
2016-02-02 00:08:55 +00:00
Nicolas Malin ce97afbf6b patch from Pierre Smits : Remove tooltip CommonNotModifRecreat from display fields (OFBIZ-6696), thanks for the screen clean Pierre
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1718970 13f79535-47bb-0310-9956-ffa450edef68
2015-12-09 21:24:44 +00:00
Jacques Le Roux 0dd553ec96 A modified patch from Harsha Chadhar for "New feature to reclaim a user account - Using Security Questions" https://issues.apache.org/jira/browse/OFBIZ-4983
jleroux: the issue description is quite lengthy so I will summarise it here, please refer to the Jira issue for details.
"When a customer creates an account on eCommerce site, s/he will also need to answer a security question. This security question then can be used by the user to reclaim her/his account in case s/he forgets her/his password. If the user correctly answers the required security question while reclaiming her/his account, her/his password will be sent through email notification. This part would work in the same way as the existing functionality of email password (forget password)."

The description was actually more ambitious (several questions, possibility for users to create own questions) but AFAIK these parts have not been implemented.

Apart updating the patch which did not merge, I got 2 majors issues (and few others I will not report here) I bypassed with workarounds.

Unlike Harsha, and as I reported earlier in the issue, I never got the username (userLoginId) back when using hidden parameters in the request body (not in requestParameters, ie UtilHttp.getParameterMap(request)), nor actually any parameters. This is maybe due to my OS (Windows7 was XP before) or my email client (Outlook Express then, now Thunderbird) or even my SMTP configuration (I used my ISP SMTP server) but most probably because I did it all on my sole machine (localhost). I tried to understand what was happening to request body parameters with http://www.telerik.com/fiddler, but finally gave up because it's even more complicated when https is in the picture. So I decided to rather use parameters in the URL (Query string). It's a bit less safe, though the password is OFBiz encrypted, and should be replaced. But it's safe enough because only the user should receive this message and even if the message is sniffed during its journey it should be hard to decrypt the password!

Harsha used the SecurityExtUiLabels.xml (created by ashish at r1618415) in securityext component but there is already a SecurityextUiLabels.xml in common component. Since I use Windows OFBiz was unable to retrieve the labels from SecurityExtUiLabels.xml since I guess it looked into a SecurityextUiLabels.xml. So I renamed a SecurityExtUiLabels.xml to EmailPassword.xml.










git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716915 13f79535-47bb-0310-9956-ffa450edef68
2015-11-27 20:37:15 +00:00
Jacques Le Roux 901b1a4a06 Removes tooltip="${uiLabelMap.CommonRequired}" from fields, https://issues.apache.org/jira/browse/OFBIZ-6691
Instead of a quiet S/R action, this was an unexpected pain in the ass. A considerable number of forms:
    EmployeeForms.xml
    EmploymentForms.xml
    EmplPositionForms.xml
    GlobalHRSettingForms.xml
    RecruitmentForms.xml
    QuoteForms.xml
    PartyForms.xml
    StoreForms.xml
    ContactForms.xml
    FixedAssetForms.xml
    TaskForms.xml
    scrumForms.xml
    TaskForms.xml
contained a large number of fields with 
  tooltip="${uiLabelMap.CommonRequired}"
but no 
  required-field="true"


Of course display and display-entity should not be concerned, I spotted a number of them in the lot.

I also removed a bunch of harcoded * at end of labels (those followed by required-field="true"* and spotted a number of others }*"  who still need to be carefully reviewed to see if required=true is not missing there :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709882 13f79535-47bb-0310-9956-ffa450edef68
2015-10-21 16:57:25 +00:00
Jacques Le Roux 7dc24b6902 A slightly modified patch from Taher Alkhateeb for <<replace widget-style="required" with required-field="true">> https://issues.apache.org/jira/browse/OFBIZ-6690
jleroux: after a cursory review, I simply did the chunk related to exampleName by hand, it needed more work. I also removed some trailing blanks.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709872 13f79535-47bb-0310-9956-ffa450edef68
2015-10-21 16:00:02 +00:00
Jacques Le Roux 2d47601831 An improved patch from Pierre Gaudin for "JGrowl to display alerts " https://issues.apache.org/jira/browse/OFBIZ-6023
I've been working on Jgrowl integration for a project. (https://github.com/stanlemon/jGrowl)
This allowS to display system's messages in a popup at the top of the windows even if you scroll. This is also useful for ajax call because there is no need to scroll to the top of the screen to view message.
Message can stick to the screen until it is intentionally closed by the user or not.

jleroux? as already explained in the Jira: to have it working in trunk HEAD I had to make some changes

    I put the jgrowl loading in GlobalActions rather than GlobalDecorator
    in showjGrowl() js function
        I Added a test for if (contentMessages.length) because of an error in lookups
        I did some formatting in function showjGrowl()
        I used jQuery instead of $ (same for expandAllP() and expandAll() functions)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1709679 13f79535-47bb-0310-9956-ffa450edef68
2015-10-20 20:46:42 +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
Adrian Crum 220270f628 Move theme-specific js & css references from CommonDecorator(s) to themes - https://issues.apache.org/jira/browse/OFBIZ-6362.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686655 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 17:02:22 +00:00
Nicolas Malin 484124f581 Improve widget-form with four elements : include-form, include-grid, include-menu, include-screen to offert more flexibility to define complex display. The main purpose is to complete the screen widget capacity to replace ftl screen.
With these elements, example component have a new FindExample search screen to select the display list type with a example of :
   * include-form : list examples with their features
   * include-screen : list examples with their items
   * include-grid : list examples with their status history
The element include-menu is present on FindUtilCache screen. Also a new CommonInlineBarMenu menu type to display menu with specific purpose (in-line) is now present and with this logic adding in-line-bar css class on themes thomawak and flatgrey.

This patch is combinate Issues : 
 * OFBIZ-6502 Add support for form/grid embedding within grids
 * OFBIZ-6501 Add support for screen embedding inside grids
 * OFBIZ-6404 Allow form/grid widget hyperlinks to be grouped into a single column
sub-tasks of master issue OFBIZ-6314 Widget Refactoring - Placeholder issue

Thanks to Christian and Adrian for their time

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686116 13f79535-47bb-0310-9956-ffa450edef68
2015-06-17 21:50:27 +00:00
Nicolas Malin 68522eb09b Second pass due to local problem :/ . Resynchronise template macro form xml, text, csv and fo from html related to issue OFBIZ-6461.
adding unit test that call webtools/control/WebtoolsLayoutDemo with html, text, csv, xml and fop render and detect on the stream if an FTl stacktrace is present.
The fop test is currently commented because the screenfop failed to generate WebtoolsLayoutDemo page.
To support the unit case, the screen engine has been extend to manage platform-specific : <text> and <csv>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1685132 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 16:48:55 +00:00
Nicolas Malin ae1af54128 revert previous commit, bad repo use my apologies
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1685130 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 16:46:08 +00:00
Nicolas Malin d3e95bb938 Resynchronise template macro form xml, text, csv and fo from html related to issue OFBIZ-6461.
adding unit test that call webtools/control/WebtoolsLayoutDemo with html, text, csv, xml and fop render and detect on the stream if an FTl stacktrace is present.
The fop test is currently commented because the screenfop failed to generate WebtoolsLayoutDemo page.
To support the unit case, the screen engine has been extend to manage platform-specific : <text> and <csv>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1685124 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 16:25:30 +00:00
Jacques Le Roux 23c89bab02 This defines the NotoSans font as default for report and FOP-PDF examples
With NotoSans by default, no need to specify the NotoSans "font-family" to write special characters in examples PDF (including content called from example).
This already worked in reports because of "fop.font.family=NotoSans" in fop.properties. It's also the way to use for custom reports.

I also added <auto-embed/> like we have <auto-detect/> but I'm unsure of what it does exactly (I suppose it embeds the fonts glyphs in the PDF) because the FOP documentation is unclear about it (to say the least). If someone knows better please chime in!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1675061 13f79535-47bb-0310-9956-ffa450edef68
2015-04-21 08:03:41 +00:00
Adrian Crum dcecdd25a4 Reorganized the screen widget src folder so classes are more organized.
This commit might break some Groovy scripts. There seemed to be a lot of C&P widget import statements, but there were no widget classes being used in the script, so I removed them. I might have overlooked something though.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652852 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 21:03:40 +00:00
Ashish Vijaywargiya 66e20b8d44 Applied patch from jira issue - OFBIZ-5551 - Cannot delete the record When Server Timezone and Application timeZone are different.
Thanks  SenthilMurugan for reporting the issue and thanks Deepak for providing the patch. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1639892 13f79535-47bb-0310-9956-ffa450edef68
2014-11-15 14:22:21 +00:00
Anil Patel a828e60213 [OFBIZ-3329] Removing framework code on resources in commonext.
Thanks Divesh and Mridul for helping with resuluation.
Thanks Adrian for reporting it. 
Thanks Chris Snow for reporting the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1632793 13f79535-47bb-0310-9956-ffa450edef68
2014-10-18 14:11:50 +00:00
Ashish Vijaywargiya 44bc632d5a Applied patch from jira issue - OFBIZ-1524 - Improve the way CreditCard.cardType field is managed.
Thanks Akash Jain for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1626425 13f79535-47bb-0310-9956-ffa450edef68
2014-09-20 12:16:37 +00:00
Jacques Le Roux b243ccc478 A modified patch from Ankit Jain for "We should check that the thru date is not same or older than the from date" https://issues.apache.org/jira/browse/OFBIZ-3161
jleroux: 
I reused Ankit's patch as a basis for this commit
I added an i18n label
Added a way to use alert() in showErrorAlertLoadUiLabel for generalising when no contentarea is present
Replaced $ call by jQuery
Used the <<name*='fromDate'>> and <<name*='thruDate'>> filters to get all cases (228 thruDate cases)
Still used only an alert, so it's only a warning, nothing coercive

There are other date couples like (estimatedStartDate, estimatedCompletionDate) and (actualStartDate, actualCompletionDate) but their values should not be enforced.
If ever someone wants to not let them free, then she just has to add the couples in FromThruDateCheck.js





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1598977 13f79535-47bb-0310-9956-ffa450edef68
2014-06-01 12:34:24 +00:00
Jacques Le Roux a6339f8cf9 A patch from Deepak Dixit for "Scale logo to fit content area in PDF which are based on simple decorator" https://issues.apache.org/jira/browse/OFBIZ-5006
Now logo image will be display over order pdf. Default value set in fop decorator not working properly, global set to true, Also added check in company header groovy, if logoImageUrl found in groovy then only set to context else default will be used.

Also set the logo width in company header fo.ftl as if logo image is large then it will throw warning related to content overflow on console.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1589669 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 11:35:44 +00:00
Jacques Le Roux 3cf3e413c8 When last updating jQuery I forgot to commit the calling points changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1563806 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 09:08:01 +00:00
Jacques Le Roux 747a4a3154 This is a major update of jQuery and related, it contains:
jquery-1.8.2 to jquery-1.10.2 which implies using jquery-migrate-1.2.1 for plugins compatiblities
    jquery-ui-timepicker-addon-1.0.5 to jquery-ui-timepicker-addon-1.4.3 (using min now, better i18n)
    jquery-ui-1.9.0 to jquery-ui-1.10.3
    removes jquery.ui.datepicker.js now integrated in jquery.ui
    jquery.hotkeys-0.7.9 to jquery.hotkeys-0.8
    jquery.maskedinput-1.2.2 to jquery.maskedinput-1.3.1
    jquery.validate 1.10.0 to 1.11.1 
        I never realised how much efforts have been put in this plugin!  
        I fixed an issue in JsLanguageFilesMapping generation
        I removed the messages_ptbr.js and messages_ptpt.js files and the related conundrum in JsLanguageFileMappingCreator.java
        untested, found not use cases OOTB
    jquery.jcarousel ?(2006) to 0.3.0 (2013)
        untested, found not use cases OOTB
    jquery.flot 0.7 to 0.8.2 (lot of changes, still works)
        removes useless flotpie.ftl 
        removes empty flotr folder
    jquery.mobile-1.1.0-rc.1 to jquery.mobile-1.4.0
        untested, found not use cases OOTB
    jquery.cookie to jquery.cookie-1.4.0    


Removes all useless/redundant js files (not only jQuery unused old versions)
    notably removes all under images/jquery/ui/development-bundle/ui
    removes now useless GooglemapMarkers.js and GooglemapSimple.js

Flat Grey application.js
    moves jQuery(document).ready(function() at bottom (spotted in Chrome console) 
    
css
    I did not find much issues, I spotted the title bar of the lookups, but got it fixed after some efforts.    

Issues:
    Imagemanagement:  I got issues while testing, actually I'm not quite qure how it works, even in stable demo. It should be validated again. I commit nevertheless my changes:
        moves js part from product to images component
        removes useless calls to js files (mostly in imagemanagement, but not only)
        renames jquery.min.js to sizzle.min.js. 
        Inside sizzle.min.js, updates the Dojo part to v1.10.17-pre and removes the jQuery part
        changes to use ofbizContentUrl macro for generating js calls
        jquery.rotate.js NOT! It's jQueryRotateCompressed.js http://markmail.org/message/dit3dlh3ph4jnenp
        Got ERROR 22001: A truncation error was encountered trying to shrink VARCHAR 'D:\projectsASF\ofbizClean\framework\images\webapp\images\pro&' to length 100.  I opened OFBIZ-5501 for that
    I tried to update jstree  to jstree 3 but gave up. I let the jquery.jstree-3.0.0-beta3 files in place in case someone would give it a chance...
    
Not related but while a it:
    removes <!--flot example requests--> from birt controller (moved recently to example component)
    
    

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1559769 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 16:27:09 +00:00
Jacques Le Roux 9d2e62ecf6 A modified patch from Gareth Carter for "JSON Response does not set http status on error" https://issues.apache.org/jira/browse/OFBIZ-5409
This is rather a defensive patch which secure json response on services calls. 
It might need some changes in custom code if (not recommended) an Ajax GET response is used... The util.js scrpt is introduced for that, though normally should not be needed... 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1557462 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 20:26:30 +00:00
Jacques Le Roux c28edba6d8 This fixes the geolocation in OFBiz, for both Google Maps and OpenLayers. It seems few changes, it took me more time than I thought. I hope this will last few years again, and it should be easier to maintain now.
What I did:
Upgraded from Google Maps API 2 to 3, which also means removing the keys in general.properties. They are no longer needed in API-3 (at least for our demo and local test uses), one worry less!
Refactored Google Maps code in geolocation.ftl: put more things in common,  simplified code (the API-3 is better from this POV).

For OpenLayers, due to most browsers now rejecting mixed content (HTTP vs HTTPS), I had to follow their advice and put OpenLayers-2.13.1.js + images and theme(finally not used) in the framework. Not a big deal in term of size but again one more lib to worry about. Anyway geolocation is not vital for OFBiz. I have also added a zoom and navigation widget in maps. Note that IE warns about mixed content, but you can bypass it.

While working on editGeoLocation (in Party) I noticed it does not update the elevation. I found it was possible http://www.daftlogic.com/sandbox-google-maps-find-altitude.htm but I did not implement it, lack of time...
Also I got once a NPE in CallSimpleMapProcessor (when using editGeoLocation) but was unable to reproduce (w/o changes before and after)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1554536 13f79535-47bb-0310-9956-ffa450edef68
2013-12-31 15:22:21 +00:00
Hans Bakker 834c6ac2d8 revert of unwanted commit, sorry!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535287 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:42:34 +00:00
Hans Bakker 45011c0ed1 reorganizing of files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1535286 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 06:39: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