Allow external scripts within the multi-block html template, to be rendered
within the html head tag, when a new attribute data-import is set to “head”
Thanks: Jacques for review
The new tag allows us to render a freemarker template containing javascript,
as external script in html instead of inline script.
This helps to reduce CSP errors.
(OFBIZ-10411)
To define boolean values, some ad-hoc enumeration of "true" and "false" are
repeatedly used. Since XML Schema defines a standard boolean datatype it's
better to use it.
Thanks: Mathieu Lirzin
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1846727 13f79535-47bb-0310-9956-ffa450edef68
If found this in console logs:
XmlFileLoader: File file:/home/ofbizDemo/trunk/framework/common/widget/CommonScreens.xml process error. Line: 491. Error message: cvc-complex-type.2.4.d: Invalid content was found starting with element 'xls'. No child element is expected at this point.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751055 13f79535-47bb-0310-9956-ffa450edef68
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
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
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
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
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
1. Extract and reuse common code/artifacts.
2. Organized the class structure so it makes more sense.
3. Add an XML widget visitor - this restores and improves the widget classes toString() methods. This is a WIP.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652638 13f79535-47bb-0310-9956-ffa450edef68
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
It actually does more than that. It follows Adrian's proposition of improving the GeoPoint data model.
I did not applies all of Adrian's proposition (see our conversation in the Jira issue). Feel free to apply it completely if you are inclined so.
I will also add an entry in wiki page "Revisions Requiring Data Migration (upgrade ofbiz)" at https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=7045166
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1557447 13f79535-47bb-0310-9956-ffa450edef68
And definitively fixes issues with i18n of geolocation
It introduces a "locale" attribute to the "set" operation in widget (I only tested screen, form is quite similar, should be ok) and minilang.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1554681 13f79535-47bb-0310-9956-ffa450edef68
When you want edit/remove an entity from link call it's needed to give all pk on parameter element as like :
{quote} <field name="deleteLink">
<hyperlink target="example_deleteExampleFeatureAppl">
<parameter param-name="exampleId"/>
<parameter param-name="exampleFeatureId"/>
<parameter param-name="fromDate"/>
<hyperlink/>
</field>
{quote}
To simplify, I introduce auto-parameters-entity like this :
{quote}
<field name="deleteLink">
<hyperlink target="example_deleteExampleFeatureAppl">
<auto-parameters-entity entity-name="ExampleFeatureAppl"/>
<hyperlink/>
</field>
{quote}
or
{quote}
<form name="ListExampleFeatureAppls" type="list" default-entity-name="ExampleFeatureAppl">
<field name="deleteLink">
<hyperlink target="example_deleteExampleFeatureAppl">
<auto-parameters-entity/>
<hyperlink/>
</field>
{quote}
This method is inspired from auto-fields-entity and I homogenized on widget renderer screen (link), menu (link) and form (hyperlink, sub-link)
jleroux: I simply put returns in case of no dispatcher or delegator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506835 13f79535-47bb-0310-9956-ffa450edef68
I created a new Screen <link feature. Similar to the Form Lookups a link can be opened in a layered JS Box (see Screenshot in Jira Task). It looks nice and is helpful in some cases.
You can add any screen u want. It's expected that you create a certain screen for the layered link which only contains the information you need.
The layered box doesn't contain any logic it's just a container for the screen which should be opened. So the screen it self can decide what to show. i.e if you load a form, the form itself implement the way how it react on a submit (either reload the site or perform the submit as Ajax request in the background).
There is also an example in the example section. Try to create a new Example on the mainpage.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1071698 13f79535-47bb-0310-9956-ffa450edef68
- Changed edit-mode attribute to conf-mode
- Added a use-private attribute. This is "true" by default but can be set to "fasle" if the include-portal-page must render a specific PortalPage without checking if a derived private PortalPage copy exists (i.e. in PortalPageAdmin screens)
- Fixed Portlet attributes retrieval. After each portlet rendering the attributes are removed from the context so that another instance of the same portlet in the same PortalPage that has no attribute value specified falls back to default values and not to the values of the previous portlet.
- The up/down/left/right portlet icons use the same service used for the Portlet Drag and Drop. (This is not working yet. Needs a next commit)
- Few portlet style and labels updates
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023197 13f79535-47bb-0310-9956-ffa450edef68
Using this widget, a PortalPage can now be easily rendered in any screen.
At the bottom of the page an "Edit ON/OFF" button can be used to switch the PortalPage edit mode ON and OFF so that the Portal Page can be edited "in place".
All the portlet editing requests are handled using the "save-last-view" request attribute so that a dedicated screen can be shown to set the Portlet attributes and the column width and, when submitted, the user is taken back to the portal page he was editing.
Those new requests will be used in a later commit to eliminate all the duplicated ****Adm requests that have been introduced when the Webtools portal admin screen has been created.
A simple use of the widget has been added in the Example application.
TODO:
- At the moment the portal page editing is performed on the portal page itself and no portal derivation from the "main" one is performed. This will be done in a later commit.
- The portlet moving controls both manually and by drag and drop have not been implemented yet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998570 13f79535-47bb-0310-9956-ffa450edef68
By default screenlets status are saved. A new "save-collapsed" screenlet attribute (default=true) can be used to disable this feature for selected screenlets.
An userPreference with key = screenlet.id+"_collapsed" is used to save the status.
Screenlets that share the same ID, share the same saved status also (i.e. all searchOptions screenlets used in the FindScreenDecorator use the same status). In order to have them separated a different ID should be specified.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@888030 13f79535-47bb-0310-9956-ffa450edef68
This can be used in a Decorator to check if a decorator-section has been defined and added content to in the decorated screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@885346 13f79535-47bb-0310-9956-ffa450edef68
[ \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