Commit Graph
23 Commits
Author SHA1 Message Date
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
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 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
Pranay Pandey a1e8562c3a [OFBIZ-7636] No functional changes. framework ftl reformatting for better code readability. Thanks Vaibhav Jain for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751469 13f79535-47bb-0310-9956-ffa450edef68
2016-07-05 13:41:14 +00:00
Pranay Pandey 247df14284 [OFBIZ-7209] No functional change. Corrected formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747207 13f79535-47bb-0310-9956-ffa450edef68
2016-06-07 12:44:52 +00:00
Pranay Pandey be6ece2105 [OFBIZ-7209] Fixed Order Ship Group PDF.
This issue was due to the declaration of map with list syntax. It was introduced when we moved from Javolution collections to java collections.
One more issue found after fixing map syntax, that is missing block elements error. Added checks to handle that error as well.

Thanks Amardeep Singh Jhajj for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747202 13f79535-47bb-0310-9956-ffa450edef68
2016-06-07 12:14:29 +00:00
Deepak Dixit 09ca38b7f6 (OFBIZ-7164) Fix typo in freemarker else tag.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746691 13f79535-47bb-0310-9956-ffa450edef68
2016-06-03 08:59:56 +00:00
Pranay Pandey 681ebea533 [OFBIZ-7130] Applied patch from the ticket to fix error on console when navigating to update party email address view.
This error occurs due to the code used for dependent drop down for country and state. At party email address update page, no dependent drop down used, so js code triggering the request with empty countryGeoId and generating console error. Added check in code that if drop down field is not present on page then no need to observe it for the change. 

Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746130 13f79535-47bb-0310-9956-ffa450edef68
2016-05-30 13:34:35 +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 5bb84a92ca (OFBIZ-6810) Removed some unused screen and ftl, found during ftl cleanup. I took extra care while removing these code this should not break anything.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1745500 13f79535-47bb-0310-9956-ffa450edef68
2016-05-25 15:05:50 +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 79a4302d2c (OFBIZ-7021) Renamed framework widget component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744782 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:21:02 +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
Nicolas Malin 7d94967a68 Convert javolution FastMap, FastSet and FastList by standard java.util.*
Related to OFBIZ-5781 Convert Javolution collections into Java collections
Thanks to Deepak Dixit and Adrian Crum for their help.

By defautl converted :
 * FastMap by HashMap
 * FastList by LinkedList
 * FastSet by HashSet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1672752 13f79535-47bb-0310-9956-ffa450edef68
2015-04-10 20:22:54 +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
Sascha Rodekamp a567174540 - Upgrade Timepicker to version 1.0.5
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1399128 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 07:01:03 +00:00
Jacques Le Roux 690a5dd02e Fix a bug reported by Chatree "JavaScript location is empty causes a double requests problem" https://issues.apache.org/jira/browse/OFBIZ-4477
In r1178199, I missed to use the default DateTime file (jquery.ui.datepicker-en.js) being still with the idea that it was handled internally.

I have also refactored/simplified JsLanguageFileMappingCreator class and put comments to better explain how all that works






git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1182731 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 09:07:12 +00:00
Jacques Le Roux 399b52a033 Closes "The time part (cursors) of the Date Time picker is not internationalized" https://issues.apache.org/jira/browse/OFBIZ-4015
Fixes the problem by:
* Updating datetimepicker from 0.9.3 to 0.9.6 (where a localization folder exists)
* Use the fantastic createJsLanguageFileMapping service Sascha introduced (I just removed the confusing wrong comment about JsLanguageFilesMapping.ftl being generated and added a block for datetimepicker, also in JsLanguageFileMappingCreator.java). A very good dynamic+static tool, kudos Sascha!

Should work also in eCommerce though I did not found any uses

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1178199 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 15:59:12 +00:00
Sascha Rodekamp 797e4caad6 localization for jQuery validate plugin is not working (https://issues.apache.org/jira/browse/OFBIZ-4275). This patch enabels the i18n file loading for the validation plugin.
Orig Msg.
the validate plugin is not using the localized files.
Everything needed seems to be there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1102597 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 08:06:05 +00:00
Sascha Rodekamp fb880c80a1 Update - i18n from DateTime display fields (https://issues.apache.org/jira/browse/OFBIZ-4014). Ofbiz can now show and interprete i18n dates and times. The Patch uses the datejs library to i18n the displayd date and time fields from the datepicker this works vice versa.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090231 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 13:05:42 +00:00