Commit Graph
107 Commits
Author SHA1 Message Date
David E. Jones 70f8da92bb Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +00:00
Adrian Crum dc1c95d57f Added expression escaping to FlexibleStringExpander.java, and put some examples in the Example component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764527 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 16:56:06 +00:00
Jacques Le Roux 87654d261c Guo's solution was not working, did not search more + correct French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764207 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 14:53:02 +00:00
Jacques Le Roux 26bb37b2dc A modified patch from Guo Weizhan "Change the date function from bsh script to date EL in FormWidgetExampleForms.xml" OFBIZ-2257
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764206 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 14:40:50 +00:00
Jacques Le Roux 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +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
David E. Jones 89ba7ff311 Small change to groovy: stuff in FlexibleStringExpander to only interpret the expression/script on the initial parse and not each time it is run; tested with the stuff in the example component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763105 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 05:14:23 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Andrew Zeneski cc9b2baf9d Added Groovy support to the FlexibleStringExpander; updated example component to show usage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762610 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 03:17:31 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux 2ff381283b Securing URLs, link element in screens and menus : 30th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761977 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 18:08:08 +00:00
Jacques Le Roux 3efbbc81cd Securing URLs, link element in screens and menus : 29th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761976 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 17:46:49 +00:00
Jacques Le Roux ef0137f95b Securing URLs, link element in screens and menus : 26th set + tabs to 4 spaces
We continue to approach the end... But for some exceptions, more than the 2 I found before. I will write a compilation on dev ML at end

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761261 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 12:14:18 +00:00
Jacques Le Roux 76352e305a Securing URLs, link element in screens and menus : 24th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761238 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 10:27:18 +00:00
Jacques Le Roux e8426631e8 Securing URLs, link element in screens and menus : 22th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:14:40 +00:00
Jacques Le Roux ca876f93ce Securing URLs, link element in screens and menus : 11th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760789 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 06:16:07 +00:00
Jacques Le Roux 77a2ff1d9f 21th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

We are near the end...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759684 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:02:55 +00:00
Jacques Le Roux 8c6d89fe75 18th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

This one is huge, with some changes by hand, conversion from tabs to 4 spaces and some trailing spaces (I have activated it AnyEdit plugin following the changes I made in http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions but I wonder if I should not reverse all that - I mean my plugin setting and in wiki -, it's a nightmare!)

I did my best on this one, but I'm not sure some typos did not slip in. Anyway, alea jacta est


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759666 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 11:00:00 +00:00
Jacques Le Roux 3dd56b670a Marco's LabelsReferences8.patch : "New tool to get labels information." (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755394 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 21:01:43 +00:00
Hans Bakker 1e1ed8fba9 move all examples from the common to the example component, edit parameters of portlet in the general managePortalPage screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752401 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 08:05:34 +00:00
Hans Bakker a8c6835b35 several small bug fixes in example, portalpages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744838 13f79535-47bb-0310-9956-ffa450edef68
2009-02-16 07:40:28 +00:00
Hans Bakker f43d2f1ecf improved menu widget for portal pages, reactivated menuitem override and various other improvements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744675 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 15:10:50 +00:00
Hans Bakker 2a8d8edea4 small correction
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743657 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 08:45:11 +00:00
Hans Bakker daebecd9d5 created a new attribute on the menu widget: portal-page. With this change the example component is now changed back to use the menu widget again however also serving the portal page buttons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743639 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 07:26:16 +00:00
Hans Bakker 9ea7eebcc0 make example dashboard working again with the recent portal page changes and removed fulladmin pages from myportal because not required
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741439 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 06:59:53 +00:00
David E. Jones 7fdd5220cf Moved Help link from tab bar to the link section below it as the Help page was NOT a tab, or in other words by clicking on it you go to a screen outside fo the tab set and the tabs disappear
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741381 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 02:32:10 +00:00
Jacques Le Roux 2eeaa25b8d <if-compare field-name= => <if-compare field=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739769 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 14:13:19 +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
Jacques Le Roux be52ca66b2 These 2 lines are to be dropped later
<!-- tooltip="Same as above, uses the ${'${'bsh:...} notation to call an util method to get the now timestamp}"-->
            <!-- tooltip="Same as above, uses the \${bsh:...} notation to call an util method to get the now timestamp}"-->
Maybe even all the block about this bsh syntax should be dropped anyway... (but can still be used, so maybe better to keep it ?)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737329 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 10:57:45 +00:00
Jacques Le Roux fceaeb561a I think we have an issue in UEL when it comes to escape UEL expressions in literals.
I tried what is documented in the PDF here http://docs.ofbiz.org/download/attachments/6430/UEL.pdf, but no way.
<<To generate literal values that include the character sequence "${" or “#{“, the developer can choose to use a composite expression as shown here:
${'${'}exprA}
#{'#{'}exprB}The resulting values would then be the strings ${exprA} and #{exprB}.
Alternatively, the escape characters \$ and \# can be used to escape what would otherwise be treated as an eval-expression. Given the literal-expressions:
\${exprA}
\#{exprB}
The resulting values would again be the strings ${exprA} and #{exprB}.>>
Or maybe I'm missing something ? (Anyway it's a weird case ;o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737328 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 10:56:00 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
Jacques Le Roux 3c1e545b85 Partial Cleanup_labels34.patch from Marco Risaliti 'Clean up labels" (https://issues.apache.org/jira/browse/OFBIZ-1780) - OFBIZ-1780
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735315 13f79535-47bb-0310-9956-ffa450edef68
2009-01-17 17:34:48 +00:00
Hans Bakker ff7759b530 show the component name at the login screen for all components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@734074 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 08:47:35 +00:00
David E. Jones c9e848d99e Cleanups for new more consistent attribute names; changed AddExampleFeatureAppl form to use the newly possible combination of ajax autocomplete and lookup box, good for when user has no clue what the ID might be
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733489 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 16:39:33 +00:00
Jacques Le Roux 66ffa47fd6 This does not hurt and help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732677 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 10:36:01 +00:00
Hans Bakker 299572ab6a updates according the comments from bruno
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731508 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 09:48:15 +00:00
Hans Bakker ab68f24611 some small corrections in myportal framework and the first batch of updates for myportal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730947 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 09:48:18 +00:00
Hans Bakker af2fa0115a major cleanup of of the portalpages, files split between display and configure, user can now create/update a copy of the system pages and revert back, example component working now....next week we will do the portal component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730665 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 03:35:41 +00:00
Hans Bakker 3eaa5e80f2 have the ability to modify system pages (ownerLogin=_NA_) by copying to own number and modify there...now also available in the example component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728634 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 09:51:29 +00:00
Hans Bakker 63c50ecec4 First version of the myportal component as a replacement of the MyPage component as announced in issue OFBIZ-2052 now using the new portal functions. Introduced with this version is that the system pages (userLogin=_NA_) are never changed, but automatically a new page is created for the logged in user when he modifies the system page. The deletion function now returns to the system page design
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728389 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 04:40:27 +00:00
Jacques Le Roux a1efddafbe Some i18n and French l10n
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728288 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 15:08:03 +00:00
Jacques Le Roux 978a1bbe63 A patch from Bruno Busco "Error in DashBoardExample" '(https://issues.apache.org/jira/browse/OFBIZ-2096) - OFBIZ-2096
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728251 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 08:44:43 +00:00
Jacques Le Roux 957f67f3cd Fixed one
value="${bsh: org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"
replacing by 
    value="${date:nowTimestamp()}"
    
I let the other for now (it's easy to fix in all OFBiz by replacing the one by the other) for an live example to Adrian who is currently working on JUEL
    

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728135 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 20:29:14 +00:00
Jacques Le Roux 7334f7e684 A patch from Bruno Busco "Adding some Collapsible FieldGroup usage examples in the Form Widget Example" '(https://issues.apache.org/jira/browse/OFBIZ-2095) - OFBIZ-2095
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728125 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 19:55:39 +00:00
Jacques Le Roux 1e9dabed6a A patch from Erwan de FERRIERES "Button to print a preview of fonts in OFBiz" (https://issues.apache.org/jira/browse/OFBIZ-2094) - OFBIZ-2094
+ some i18n and French translation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728073 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:23:19 +00:00
Adrian Crum 647530a6d2 Eliminated some unnecessary nested expressions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724882 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 20:55:33 +00:00
Hans Bakker 54a5a1094a update of portal pages with including column support and now using the 'normal' ofbiz interface
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@724618 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 06:17:35 +00:00
David E. Jones e7f1dde5f5 Commit reworked initial patch from Bruno Busco in Jira #1999; this follows Brunos work but adds the PortalPageColumn entity to configure columns, just optional pixel width for now, and also cleaned up entities and added foreign keys; rewrote a few things in screen actions and simple methods and removed a bunch of unused stuff that was commented out, so hopefully there isnt any more stray code in here; moved various things to files that were less generic, ie that mention portal specifically instead of just common or something; changed controller and menu setup so that this isn't in all apps by default, in fact just the example webapp for now with the include of portal-controller.xml and adding a dashboard menu item; note that this does not include the few changes in the specialpurpose directory, just the framework stuff for now; also moved data from seed to demo as it really isn't seed data in common and example
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718185 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 07:56:27 +00:00
Jacques Le Roux bd0213dfa3 A patch from Nicolas Malin " Add filter on list to apply specific style" (https://issues.apache.org/jira/browse/OFBIZ-2032) - OFBIZ-2032
As suggested by Scott, Nicolas has replaced filter by altRowStyle, all is ok


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@711987 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 22:04:10 +00:00
Jacques Le Roux a0df0284f4 A patch from Marco Risaliti "Artifact info logs cleanup" (https://issues.apache.org/jira/browse/OFBIZ-1982) OFBIZ-1982
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@704697 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 21:38:28 +00:00