Commit Graph
61 Commits
Author SHA1 Message Date
James Yong 2c62637752 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Accounting, Content, HR, Manufacturing.
2020-05-15 17:43:38 +08: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
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 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 25b56a03ea (OFBIZ-7223) Relocate .groovy files in the content component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747756 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 17:21:10 +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
Jacques Le Roux 5d65e6e84b A modified patch from James Young based on a an original patch from Christoph Neuroth for "Improved CMS tree: more functionality and faster for large trees" - https://issues.apache.org/jira/browse/OFBIZ-4502
We here at [Lusini|http://www.lusini.de/] did several improvements to the CMS backend to make it more usable for large CMS installations. 

* Improved performance of CMS tree
** loading nodes dynamically using AJAX
*** Created ContentJsonEvents to handle the JSON calls
** use OFBiz entity caches
** removed duplicate execution of WebSitePublishPoint.groovy
*** removed reference from controller.xml as it is not used anywhere

* Moving nodes in CMS tree possible now using drag'n'drop
** ContentJsonEvents returns updated node attributes
** Adjusted WebSiteCMSNav.ftl to update the moved node with the data from the ajax request
** Needed to replace the jstree jQuery plugin by the current version available on the jstree website

* Made nodes deleteable
** added remove to context menu
** We did not want to delete the WebSitePathAlias entities right away, so we added a fromDate and thruDate to it. 
*** extended WebSitePathAlias entity definition: added fromDate and thruDate
*** now checking for date range everywhere when accessing path aliases
*** This also allows users to publish or unpublish contents under a certain URL automatically at some time in the future. 
** created event to "delete" a node
*** thruDate of all assocs pointing to this node are set to current timestamp
*** thruDate of WebSitePathAliases pointing to this content or any contents below are set to current timestamp
*** this way nothing is actually removed from the DB and a "undo" would be possible if necessary
** extracted context menu to variable so it can be reused for all trees

* fixed missing references to uiLabels in CMS menu bar

* Activated cookie plugin so the selected node is remembered



jleroux: I made few changes
* Use of UtilGenerics.cast() in new ContentJsonEvents.java rather than @SuppressWarnings("unchecked")
* Removal of the commented out block "Lusini: disable RTE". I see no reasons why we would not use elRTE. Notably in relation with adding errors where it's currently used in trunk demo
* I changed the line 
    var unmovableSubtrees = [false, "categoryChildren_LusiniBrowseRoot", "homeContentsRoot", "merchantContentsRoot"];
    We have no such subtrees OOTB but it's good to keep the idea, I just renamed categoryChildren_LusiniBrowseRoot to categoryChildren and put an explaining comment
* I have roughly added the labels ContentWebSiteErrors, ContentWebSiteAddNewErrors and ContentWebSiteAddError, though I have a doubt about how this works. At least it's different than on trunk demo where it seems to works better (despite having uncommented out elRTE in this commit). ALso I don't remember how to add a menu worked (if it worked).
* I checked the version of jstree we use is the same than in the original patch from Christoph Neuroth. BTW at r1559769 I tried to update jstree  to jstree 3 but gave up.
* I removed the jquery.cookie.js implemnentation and replaced link in WebSiteCMSNav.ftl. I already updted to jquery.cookie-1.4.0 at r1559769

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738588 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 14:17:30 +00:00
Michael Brohl 0027619e9e Manually applied patch from jira issue OFBIZ-5679: Functionality to add WebSitePathAlias records is missing.
This adds a "Create Website Path Alias" menu item to the WebSiteAliases view and allows to edit/delete teh entries.

Thanks Pierre Smits for reporting the issue and Willem Janssen for providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682295 13f79535-47bb-0310-9956-ffa450edef68
2015-05-28 18:10:51 +00:00
Hans Bakker fbbda360c4 update of the content -> website -> cms:
1. can not update image 2. do not display mapKey field whan create new successful 3. do not display image and mapkey field when click on tree, all fixed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202024 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 03:20:31 +00:00
Jacques Le Roux e39b17220a Closes "i18n for elrte editor" https://issues.apache.org/jira/browse/OFBIZ-4051
Fixes the i18n elrte Editor issue in Freemarker templates (Content and Ebay)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1178175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-02 10:42:39 +00:00
Vikas Mayur 153203cd03 Moved form widgets from webapp to widget folder. Contribution from Deepak Dixit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1160233 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 12:14:25 +00:00
Vikas Mayur a9372fbb65 Reverted r1160209 & r1160213 as the files aren't moved correctly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1160226 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 12:03:21 +00:00
Vikas Mayur d6f433a5e1 Moved form widgets from webapp to widget folder. Contribution from Deepak Dixit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1160209 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 11:30:31 +00:00
Hans Bakker 4102bee329 update websiteContactlist entity according Jacopo's comments, added services and screens to website and contactlist to maintain the data, a contribution of 'M', an employee of antwebsystems.com
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1159508 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 05:57:25 +00:00
Hans Bakker 53abb5b2ac added an function on the website level: 'SEO' to generate missing seofiendly url's on a catalog, category, product and content level. entities records which have alread a seofriendly alternative url are not touched
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1153034 13f79535-47bb-0310-9956-ffa450edef68
2011-08-02 05:56:47 +00:00
Sascha Rodekamp dab9603a73 Filtering and Sorting of WebSite Path Aliases (https://issues.apache.org/jira/browse/OFBIZ-4334) - Patch from Manuela Gruendlinger
When using lots of WebSite Path Aliases, it is quite hard to find a specific Path Alias in a list with about 30 pages. Searching for a path alias and sorting the results would really help here.
Added patch that allows searching for path alias and sorting the list.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1144267 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 11:21:53 +00:00
Jacques Le Roux 48eea97f2e A patch from Martin Kreidenweis "Links to Path Alias and Meta Tags in CMS don't work any more" (https://issues.apache.org/jira/browse/OFBIZ-4108) - OFBIZ-4108
* Go to https://demo-trunk.ofbiz.apache.org/content/control/WebSiteCms?webSiteId=WebStore
* Select some content, e.g. "Store Policies"
* Try to click the "Path Alias" or "Meta Tags" links at the top. They cause a JavaScript error: "destroyEditor is not defined"

This patch removes calls to non-existing destroyEditor() javascript function, fixes the url to the path alias, and adds the missing screenlets to the path alias and meta tags screens 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1057775 13f79535-47bb-0310-9956-ffa450edef68
2011-01-11 18:04:19 +00:00
Jacques Le Roux 0d6dbe2977 Useless and faulty log I left there some time ago
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056752 13f79535-47bb-0310-9956-ffa450edef68
2011-01-08 18:34:25 +00:00
Marco Risaliti 301bc2ccc4 A missed right parentheses
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056495 13f79535-47bb-0310-9956-ffa450edef68
2011-01-07 20:36:25 +00:00
Jacques Le Roux 24fe5ff37e Merges the jQuery branch back to the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044503 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 20:40:08 +00:00
Bruno Busco ac92eeffd0 Enabled column sorting in Survey list, WebSite list and DataResource list forms
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037078 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19 23:19:10 +00:00
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
Ashish Vijaywargiya 62a47436c3 Applied patch from jira issue - OFBIZ-3487 - Improvement on CMS component.
1.  Adding sequenceNum field on ContentPurpose entity.
2. Adding ContentAssocAndContentPurpose view entity.
3. Fixed NPE issue on WebSiteCMSContent.ftl file.
4. Created ContentPurposeType data for "LANDING_PAGE_IMAGE".

Thanks Amit & Vivek for the contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@911774 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 10:27:10 +00:00
Bruno Busco d46461ef36 Merged multiple labels in one
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@904735 13f79535-47bb-0310-9956-ffa450edef68
2010-01-30 08:49:59 +00:00
Bruno Busco 11c1256111 Added a "create" class to the buttontext for buttons that represents "Create New" operations.
This allows themes to style these buttons with additional "+" icons or whatever.
The idea is to add a "functional" class wherever needed so that the button-bar can be styled better by the theme.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899899 13f79535-47bb-0310-9956-ffa450edef68
2010-01-16 08:19:35 +00:00
Bruno Busco c30c24b95c Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826269 13f79535-47bb-0310-9956-ffa450edef68
2009-10-17 15:11:32 +00:00
Bruno Busco c6aad8c403 Ooops,
Removed a screenlet container that I wrongly left in a previous commit (container to screenlet change)
Thank you Patrick Antivackis for reporting this in ML.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821907 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 16:31:14 +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
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
Hans Bakker 6d8a0478b0 corrected spelling error and uiLabelMap not found
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@745370 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 03:18:50 +00:00
Marco Risaliti a68519cc0b Artifact cleaning on content component after recent changes on xsd files (OFBIZ-2137)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739777 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 15:16:33 +00:00
Jacques Le Roux 5d9fd471dc <field-map(.*)env-name => <field-map$1from-field
<service(.*)result-map-name => <service$1result-map

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739764 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 13:54:08 +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
Adrian Crum 3c57e10bd3 Put the screenlet back in the Content Manager screen. The "no-clear" CSS style is intended to be used when problems arise from using menus or screenlets inside multi-column layouts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736341 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 16:59:55 +00:00
Hans Bakker 312db5de21 reverted back from a screenlet to container pattern because it does not work in the cmssite navigation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736285 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 11:04:58 +00:00
Hans Bakker c651196086 add aliaslist to website screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731263 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 14:55:18 +00:00
Hans Bakker eb45e55ca1 replaced website ftl menu with menu widget and moved decorator to commonscreens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731258 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 13:38:40 +00:00
Marco Risaliti 774a0ba9af A lot of cleaning into Content labels (Part of OFBIZ-1780)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731189 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 07:43:52 +00:00
Ashish Vijaywargiya 5e55a5b8fc Patch from Awdesh Parihar , part of JIRA issue https://issues.apache.org/jira/browse/OFBIZ-1839.
Based on comments of Adrain.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@671181 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 14:20:06 +00:00
Marco Risaliti bf65b1ad7a Converted some content bsh scripts to groovy (Part of issue OFBIZ-1801)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667666 13f79535-47bb-0310-9956-ffa450edef68
2008-06-13 22:02:46 +00:00
Ashish Vijaywargiya 670dbfeff3 Patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1839.
Container to Screenlet conversion is done on Content component.

Thanks Awdesh Singh Parihar for your patch.
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667013 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 09:34:05 +00:00
Scott Gray c31b59e59a Fix for OFBIZ-1652 reported by Jacques Le Roux, Websites -> CMS wasn't working properly. There were two problems:
There was no uiLabelMap defined in the context for WebSiteCMSContent.ftl
There was no div tag with id="cmscontent" which is where dojo tries to load the content after clicking on an item in the tree

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@657468 13f79535-47bb-0310-9956-ffa450edef68
2008-05-17 21:58:38 +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
Marco Risaliti 97bce9030c Replace all the head4 style to head3 style.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@618302 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 15:12:07 +00:00
Marco Risaliti 35b3063f09 WebSite/Survey/Forum/Content/Lookup forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1601)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@617499 13f79535-47bb-0310-9956-ffa450edef68
2008-02-01 13:48:17 +00:00
Adrian Crum 085e65e5b8 Eliminated redundant code by switching components over to the common login and password change screens. I didn't change the hand held component - since it will probably need its own login screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@588474 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 02:29:49 +00:00