Commit Graph
93 Commits
Author SHA1 Message Date
Jacques Le Roux fdeedf23ee Improved: Adds the HTML <input> accept Attribute in form widgets and Freemaker templates (OFBIZ-12049)
As explained at
https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept
this is only an help for the users (ie not a security feature), but an
appreciable one easy to implement.

Here we start with website/WebSiteCMSContent.ftl
Also add some missing file extensions
2020-12-07 18:45:25 +01:00
James Yong 9960b1cdb8 Improved: Move page-specific script links to html template (OFBIZ-11799)
Use importLibrary js function to load jstree in DisplayContentNav.ftl.
Tested page at
/exampleext/control/showHelp?helpTopic=EXAMPLEEXT_main&portalPageId=&formName=help&presentation=undefined&id=undefined
2020-08-23 12:23:15 +08:00
James Yong 1f9c300027 Improved: Move page-specific script links to html template (OFBIZ-11799)
Use importLibrary js function to load jstree and cookie js in ContentNav.ftl and CategoryTree.ftl.
Tested on
/content/control/navigateContent
/humanres/control/main
2020-08-22 21:11:20 +08:00
James Yong 39c1e280f9 Improved: Move page-specific script links to html template (OFBIZ-11799)
refactoring +
importLibrary function to use crossDomain = true to allow js file to be shown under browser's sources folder
2020-08-16 18:05:32 +08:00
James Yong 55df1c7db0 Improved: Move page-specific script links to html template (OFBIZ-11799)
Use importLibrary js function to load elrte js and css
Tested on
https://localhost:8443/content/control/findForumMessages?forumGroupId=WebStoreFORUM&forumId=10000
https://localhost:8443/content/control/WebSiteCms?webSiteId=CmsSite
2020-08-16 14:35:35 +08:00
James Yong 4e563a67ff Fixed: showHelp not working (OFBIZ-11803)
Fixed Navigation tree is not displayed in showHelp page.
2020-06-06 19:49:26 +08:00
Michael Brohl c332322017 Fixed: CMS add content not working.
(OFBIZ-10833)

This fixes the missing content association and wrong update of the
parent content reported by Ingo Wolfmayr. Thanks Sebastian Berg for
providing the patch.
2020-02-18 21:28:14 +01:00
James Yong 05ffbd2817 Improved: Add 'controlPath' attribute to 'ofbizUrl' freemarker macro
(OFBIZ-11317)

Adding the controlPath attribute to allow the controls by ofbizUrl to support uri to other OFBiz web application.

Thanks: Jacques for the review
2020-01-12 22:25:50 +08:00
Deepak Dixit b5da481d29 Improved: Use input type=submit for form submission (OFBIZ-10482)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837892 13f79535-47bb-0310-9956-ffa450edef68
2018-08-12 08:52:51 +00:00
Deepak Dixit 2fe25b3d79 Improved: Replace #assign with #local in all the ftl macros
(OFBIZ-10516)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1837830 13f79535-47bb-0310-9956-ffa450edef68
2018-08-10 18:49:03 +00:00
Deepak Dixit 3093b5a476 Improved: Used input type=submit instead of anchor and javascript code to submit form where applicable.
(OFBIZ-10482)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836905 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 13:27:22 +00:00
Deepak Dixit d71d1c4617 Improved: Removed unused code, input type image was used to submit form usign onClick event. These code was from pre-apache era
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836894 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 12:26:31 +00:00
Deepak Dixit ef0c694a46 Improved: Use application/javascript instead of text/javascript
(OFBIZ-10492)
Replace text/javascript with application/javascript in all the script tag

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836886 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 10:51:52 +00:00
Deepak Dixit 397628ba7d Improved: Remove use of deprecated language attribute from script tag
(OFBIZ-10491)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836545 13f79535-47bb-0310-9956-ffa450edef68
2018-07-24 11:26:23 +00:00
Deepak Dixit ed0d8475a9 Removed: Found unused code while review.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836432 13f79535-47bb-0310-9956-ffa450edef68
2018-07-22 10:07:13 +00:00
Michael Brohl 90ec73fe65 Improved: Improve layout and structure of forms.
(OFBIZ-10221)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1827077 13f79535-47bb-0310-9956-ffa450edef68
2018-03-17 11:54:28 +00:00
Jacques Le Roux aa98ace180 Fixed: Error on updating sub content of CMS webSIte
(OFBIZ-10096)

Steps to reproduce:
Get to 
https://demo-trunk.ofbiz.apache.org/content/control/WebSiteCms?webSiteId=CmsSite
4. From WebSIteNav, click on Cms Site Demo Home page
Edit content in editor and click save button (available in editor)
It gives error:
The Following Errors Occurred:
The following required parameter is missing: 
  [IN] [updateContentAssoc.contentIdTo]

jleroux: the elrte internal button works but not the widget Save button

Thanks: Aditya

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821115 13f79535-47bb-0310-9956-ffa450edef68
2018-01-14 18:43:49 +00:00
Jacques Le Roux 70b99a6db9 Reverts from r1821001 (for OFBIZ-10113) some unrelated files (pending changes)
that inadvertently slipped in.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821028 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 20:06:03 +00:00
Jacques Le Roux 19d9b3ca30 Improved: Replace Asm select plugin with Select2.
(OFBIZ-10113)

Current Asm Select Plugin 
http://www.ryancramer.com/journal/entries/asmselect_v104/
can be replaced with Select2 (https://select2.org/).

* Select2 has much better community support on GitHub with 386 contributors 
  while Asm Select Plugin is handled by Ryan Cramer on http://www.ryancramer.com/.
* Select2 has 37 releases while Asm select has very few releases yet.
* Both the plugin has MIT license.

Refer https://select2.org/ and  
https://github.com/select2/select2 for more features and other information.

Added i18n support so added logic in JsLanguageFileMappingCreator and 
JsLanguageFilesMapping accordingly.
Added some custom CSS as the Select2 seems to be too fancy in accordance 
with the current OFBiz themes

Verify:
Multiple drop-downs field in FormWidgetExamples.
https://localhost:8443/example/control/FormWidgetExamples

Find Request page with StatusId , CustRequestId
https://localhost:8443/ordermgr/control/FindRequest

I have replaced the plugins though I feel the implementation of select multiple 
js code is to be reviewed & refactored. I will pick when I am done with all my 
current tasks if I get some consensus.

Thanks: Aditya 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821001 13f79535-47bb-0310-9956-ffa450edef68
2018-01-12 15:47:47 +00:00
Deepak Dixit 7e19de9966 Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818003 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:03:17 +00:00
Deepak Dixit 63258e90f8 Reverted r#1817989, workign fine locally, reverted for now will check and commit again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817998 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 10:42:32 +00:00
Deepak Dixit d1f85a7e5d Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817989 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 09:21:33 +00:00
Deepak Dixit c559bc00c8 Fixed: Corrected elseif tag closing in GenericSurvey.ftl file found this while working on OFBIZ-9254
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812287 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16 11:56:21 +00:00
Deepak Dixit d310aaf2cd Improved: Inconsistent String Comparisons, Applied patch for ftl file.
Thanks Devanshu Vyas for your contribution. (OFBIZ-9254)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812285 13f79535-47bb-0310-9956-ffa450edef68
2017-10-16 11:31:40 +00:00
Jacques Le Roux 2382cd9cbd No functional change, these files were missing the ASL2 header
I stop here, please help at https://ci.apache.org/projects/ofbiz/rat-output.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812225 13f79535-47bb-0310-9956-ffa450edef68
2017-10-15 17:40:59 +00:00
Deepak Dixit 88493836bc Improved: Moved jquery related js/plugins from images to common-theme webapp and made changes accordinlgy. (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809389 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:41:28 +00:00
Deepak Dixit dea31737ea Fixed: Moved SurveyOptions.ftl in correct location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801364 13f79535-47bb-0310-9956-ffa450edef68
2017-07-09 10:03:41 +00:00
Arun Patidar 44c0caa799 Improved: Set autocomplete to off for all the password fields.(OFBIZ-9471)
Thanks Ritesh Kumar for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801324 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 21:07:51 +00:00
Hans Bakker 3c15931494 missing </div> and reduce length of lines
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1774853 13f79535-47bb-0310-9956-ffa450edef68
2016-12-18 07:01:48 +00:00
Jacques Le Roux a4cd270ca4 Fixed: You cannot edit an image in content
(OFBIZ-7000)

If you get to
content/control/EditLayout?drDataResourceId=NOCONTENTFOUND&contentId=NOCONTENTFOUND
When trying to editing you get an error

Mohammed Rehan Khan explored the issue and found that there is a condition in 
DataResourceWorker method to render content of 'text' mime type only, for others
 it returns exception.

We can fix this by setting up mimeTypeID as null in request param

Question: Why setting up mimeTypeTypeId as 'null' is fixing this issue?
Answer: As we don't have image specific worker method for rendering these type 
of contents, so we are using DataResourceWorker.renderDataResourceAsText() 
to render image type content as well. Due to following condition, 
targetMimeTypeId is setting up as "text/html" if sent null and hence not 
throwing the exception reported in the ticket.

Thanks: Mohammed Rehan Khan for the patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1765094 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 17:12:28 +00:00
Ashish Vijaywargiya 98af5e29e5 Applied patch from jira issue - OFBIZ-7872 - Clean up commented out code in Free Marker Template for Content.
Thanks Aman for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758037 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 14:02:30 +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
Ashish Vijaywargiya 86ec0749b9 Applied patch from jira issue - OFBIZ-6214 - Have overview of questions in EditSurveyQuestions.ftl paginate properly.
Thanks Pierre for creating the issue and thanks Yashwant for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751483 13f79535-47bb-0310-9956-ffa450edef68
2016-07-05 14:07:47 +00:00
Divesh Dutta dd1e7ee3d3 [OFBIZ-7578] Content component: Checkbox and Radio buttons should get selected on clicking upon their labels. Thanks Mohammad Kathawala for your patch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751341 13f79535-47bb-0310-9956-ffa450edef68
2016-07-04 16:46:51 +00:00
Ashish Vijaywargiya 2e30592be6 Applied patch from jira issue OFBIZ-7565 - Remove HtmlFormWrapper dependencies from Survey Question Screen.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1750306 13f79535-47bb-0310-9956-ffa450edef68
2016-06-27 08:14:21 +00:00
Ashish Vijaywargiya 2672c0d915 Applied patch from jira issue OFBIZ-7527 - Questions from category should not come to apply on survey when creating/editing any question.
Thanks Ravi for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749845 13f79535-47bb-0310-9956-ffa450edef68
2016-06-23 06:45:28 +00:00
Pranay Pandey 90850d787f [OFBIZ-7154] UI improvement, made question field read-only as not being edited with SurveyQuestionAppl and corrected button labels for Survey Question Create/Update form.
Thanks Swapnil M Mane for reporting the issue, thanks Vaibhav Jain for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746779 13f79535-47bb-0310-9956-ffa450edef68
2016-06-04 05:48:55 +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
Jacques Le Roux be402d8a4e A patch from Ingo Wolfmayr for "CMS does not store "Long text"" https://issues.apache.org/jira/browse/OFBIZ-7050
When you create content via CMS 
(Content --> Websites --> [Select Website for example WebStore] --> CMS )
the text content does not get stored. No error message available.

TextData was not submitted. Additionally I corrected a Javascript call as the used function signature does not exist.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743100 13f79535-47bb-0310-9956-ffa450edef68
2016-05-10 05:51:38 +00:00
Deepak Dixit 9f279ed58b (OFBIZ-7043) Remove commented code labeled as "TO BE REMOVED" since 2008.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742503 13f79535-47bb-0310-9956-ffa450edef68
2016-05-06 06:48:38 +00:00
Deepak Dixit 84ad66589e (OFBIZ-7021) Renamed content component ftl file name from lower case to upper case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742457 13f79535-47bb-0310-9956-ffa450edef68
2016-05-05 18:11:54 +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
Deepak Dixit 089321c65a Applied patch from jira issue OFBIZ-6397 : Survey : FTL error message when using Enumeration or Geo question type
Thanks Gil Portenseigne for reporting the issue and providing the fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680840 13f79535-47bb-0310-9956-ffa450edef68
2015-05-21 12:10:57 +00:00
Ashish Vijaywargiya d0566c2968 Applied the patch OFBIZ-4902_application.patch from OFBIZ-4902 - Replace in Freemarker templates the deprecated built-ins: default, exists, if_exists.
Thanks http://ofbiz.us team for providing the patch work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618336 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 11:34:57 +00:00
Jacopo Cappellato 672dc55f1e Moved the docbook distribution from applications/content to specialpurpose/cmssite, the only component that requires it. The Docbook schemas are still in the content component because they are required to render the online help screens of the applications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524112 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 16:11:00 +00:00
Jacques Le Roux 962091598a As a 1st step of "Proposal for a new help system" https://issues.apache.org/jira/browse/OFBIZ-4941, update docbook to version 1.77.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1395307 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 14:02:53 +00:00
Jacques Le Roux 1996cda067 Looks like somehow I missed a bunch of files at r1395296. To be sure I will remove all before re-adding all again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1395300 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 13:42:48 +00:00
Jacques Le Roux 15bc749091 As a 1st step of "Proposal for a new help system" https://issues.apache.org/jira/browse/OFBIZ-4941, update docbook to version 1.77.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1395298 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 13:31:52 +00:00
Adam Heath 43efe66c75 DEPRECATION: applications/content: GenericValue.getRelated/getRelatedCache variants replaced with a single getRelated variant that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343511 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:17:44 +00:00
Adam Heath a92d79d341 DEPRECATION: applications/content: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1343481 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:12:04 +00:00