Commit Graph
30 Commits
Author SHA1 Message Date
Adrian Crum a90a7cb45b Changed the behavior of screenlet title bar: Do not hide title bar controls when screenlet is collapsed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1206013 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 23:01:31 +00:00
Jacques Le Roux 48c6114143 A patch from Nicolas Malin "Add famfamfam icons has generic and add possibility to surchage" https://issues.apache.org/jira/browse/OFBIZ-4259
Adds the possibility to use famfamfam icons contained in framework/images/webapp/images/famfamfam/icons.
If you want use a specific icon, it's possible to define an attribute VT_ICONS_LOC that contains the location to themes icons directory to use
It improves form rendering to pass a flexible string on image-location attribute and screen and form renderer to display an image with a text.

JLR: I just added à   before menus texts

After Erwan's remark I wondered If I should remove the CSS on buttons. But I finally found that it was complementary. Because when no image is used on a specific button you still have the default CSS style applied (typical for Add buttons as Erwan outlined). And when no default CSS style is applied you can have an image like now shown OTTB on print button when editing an Example. So I see these 2 features as complementary for now. Maybe one day, one will replace the other, but at this stage both are welcome IMO.

BTW the famfamfam (strange name ;o) icons lib is well done and really full of possibilities...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1095984 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 18:51:10 +00:00
Sascha Rodekamp f51f4fdff2 Feature - Screen Link Ajax Windows (https://issues.apache.org/jira/browse/OFBIZ-4183)
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
2011-02-17 17:01:07 +00:00
Adrian Crum 10f0b07fe5 Fixed bug in collapsible screenlet - expand/collapse link wasn't working with JavaScript turned off.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060699 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 07:23:33 +00:00
Jacques Le Roux b63a07c03d A patch from Sascha Rodekamp "Fix Portal Drag'n'Drop" (https://issues.apache.org/jira/browse/OFBIZ-4062) - OFBIZ-4062
During the last works on the my portal module, the Drag'n'Drop functionality was lost. Here is a fix which enables the Drag'n'Drop again. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056670 13f79535-47bb-0310-9956-ffa450edef68
2011-01-08 09:13:17 +00:00
Adrian Crum a925456a16 Fixed label widget rendering. Label widgets are inline elements except if they have the h1-h6 style, then they become block elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1054194 13f79535-47bb-0310-9956-ffa450edef68
2011-01-01 06:34:08 +00:00
Bruno Busco 79d86ffa14 Improved include-portal-page widget.
- 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
2010-10-16 06:58:25 +00:00
Bruno Busco 2704f7f99f - Removed several ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
- Replaced AddPortlet request and view-map with addPortlet. This seems to be the standard we use.
- Portlet attributes are now edited using a dedicated screen. This is how it works in the new PortalPage widget. I used the same system in the actual PortalPage system also because it was too complicated to handle it in two different way. In any case it should not hurt.
- Removed a debug string in the PortalPageColumn renderer.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998686 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 15:46:17 +00:00
Bruno Busco 3bbd2d8598 Added the <include-portal-page> widget. OFBIZ-3625 https://issues.apache.org/jira/browse/OFBIZ-3625
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
2010-09-19 00:09:39 +00:00
Erwan de Ferrieres 9e7053e953 XHTML validation errors round 2++ (framework) - OFBIZ-3761 (https://issues.apache.org/jira/browse/OFBIZ-3761)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945582 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 10:34:42 +00:00
Adrian Crum af0ca8e141 A patch from Blas Rodriguez Somoza: XHTML validation errors (framework/widget) - (https://issues.apache.org/jira/browse/OFBIZ-3623).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929173 13f79535-47bb-0310-9956-ffa450edef68
2010-03-30 15:35:28 +00:00
Adrian Crum 7d4a943c2a Revert 928451.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928460 13f79535-47bb-0310-9956-ffa450edef68
2010-03-28 17:46:45 +00:00
Adrian Crum 0b9abb6a8b Simplified label html renderer macro.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928451 13f79535-47bb-0310-9956-ffa450edef68
2010-03-28 16:48:22 +00:00
Bruno Busco d0d9384a6e Added a new feature that allows to save the screenlet collapsed/expanded status as a userPreference. (OFBIZ-3271)
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
2009-12-07 17:24:21 +00:00
Bilgin Ismet Ibryam 108bcc056e Fixed rendering of image elements inside link elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835081 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:38:16 +00:00
Anil Patel ca9ba906dd use has_content to check if text parameter has any value
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834748 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 03:13:35 +00:00
Adrian Crum 6281f15b38 Improved screenlet-body handling, patch from Bruno Busco - https://issues.apache.org/jira/browse/OFBIZ-3012.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826469 13f79535-47bb-0310-9956-ffa450edef68
2009-10-18 17:09:37 +00:00
Scott Gray d243d7a1fe More xhtml validation: onSubmit -> onsubmit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@816859 13f79535-47bb-0310-9956-ffa450edef68
2009-09-19 06:33:42 +00:00
Anil Patel e24a90645f Oops, had little mistake in markup ending tags.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814262 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 02:54:13 +00:00
Anil Patel 64c906feda Using style attribute value to determine appropriate html element and render it. Idea is to render better markup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@814260 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 02:03:46 +00:00
Jacques Le Roux 257a5b4d59 A replacing patch from Scott 'error to parse menu with " on screelet header' (https://issues.apache.org/jira/browse/OFBIZ-2873) - OFBIZ-2873
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@812540 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 15:02:16 +00:00
Jacques Le Roux f2016738d1 A patch from Nicolas Malin 'error whan parsing menu with " on screelet header' (https://issues.apache.org/jira/browse/OFBIZ-2873) - OFBIZ-2873
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@810807 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 08:22:49 +00:00
Jacopo Cappellato dcdffcc54e Added missing arguments to widget renderer macro; thanks to Marco Risaliti for the fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785509 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 08:43:28 +00:00
Scott Gray d3bb5b5eb1 Fixed issue reported by Sascha Rodekamp on the user mailing list
enableEditValue was being treated like a boolean but was actually a String

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770501 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 00:36:32 +00:00
Jacques Le Roux ae10eaaed3 Fix a bug (seems a typo), see dev ML for more
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768490 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 07:34:36 +00:00
Adrian Crum 1a4496c172 Some work on the screen widgets:
1. Added renderScreenBegin and renderScreenEnd methods to ScreenStringRenderer.java.
2. Updated HtmlScreenRenderer.java and MacroScreenRenderer.java to emit the <DOCTYPE> element first - before any widget comments or template content.
3. Removed <DOCTYPE> elements from templates that no longer need them.
4. Added screen and section boundary comments to MacroScreenRenderer.java.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767996 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 17:54:30 +00:00
Jacopo Cappellato 914bff7d5c A series of fixes to the new macro widget renderers to better support nested calls to rendering methods; misc fixes to the screenlet pagination code for html. Part of issue OFBIZ-2337
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767455 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 10:32:57 +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
Jacopo Cappellato 559e380427 Applied patch (with minor modifications) from Guo Weizhan for OFBIZ-1235 (new widget renderes based on Freemarker macros): note this is still a work in progress.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759086 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 10:11:46 +00:00
Jacopo Cappellato ceb610498a This is a work in progress for a refactoring of the various screen and form widget renderers; the new renderer will create output by calling Fremarker macros defined in external (configurable) files; the work is still not complete, and for this reason it is not enabled yet. Part of task OFBIZ-1235
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756369 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 08:21:11 +00:00