Commit Graph
125 Commits
Author SHA1 Message Date
Adrian Crum d1776fcbc4 Improved iCalendar integration:
1. Work effort tasks are now converted to VTODO.
2. Event reminders can be a popup alarm
3. Fixed invalid iCalendar creation

Tested with Mozilla Sunbird. Sunbird has some annoying bugs when using read-only calendars - which they are aware of but haven't fixed. Someday I'll make the iCalendar read/write.

This commit includes a migration service for anyone who was using this feature previously.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@784195 13f79535-47bb-0310-9956-ffa450edef68
2009-06-12 17:03:42 +00:00
Adrian Crum a4bd184acd Small fixup for last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@783552 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 22:14:40 +00:00
Adrian Crum 5fe277e26d Added a lookup screen for time duration. Added an example to the Edit Work Effort screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@783550 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 22:13:07 +00:00
Hans Bakker 314034ccdf small adjustment in fo report: invoice description column wider and more space for header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@782516 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 03:28:54 +00:00
Anil Patel c8d4c428a2 Moved html body element start and end out of header and footer templates files. Added generic sections for body section of page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@778991 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 04:31:12 +00:00
Jacques Le Roux 4a6c5cfd6c Revert r772941 at David's demand: <<The dynamic dates represented here do not copyright the files that the code is in, they copyright what the code produces, and that is constantly changing so the dynamic date is appropriate."
On my side, I tried to find legal informations but did not find anything clear.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@773211 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 12:09:09 +00:00
Jacques Le Roux fdcfdb2979 Revert r767694
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@773100 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 20:59:14 +00:00
Jacques Le Roux c1d75da437 See http://markmail.org/message/znytl2y4inpmxbdo (David Goodenough's advice on copyright update)
extract : "My understanding of the Berne Convention rules for Copyright (which covers most jurisdictions - even the USA now), is that the copyright period only gets extended when the copyrighted item gets updated."

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772941 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 11:15:08 +00:00
Jacopo Cappellato 9eaac35f4d Implemented macros for new renderers methods for creen widgets; cleaned up SimpleDecorator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768213 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 07:59:08 +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
Jacques Le Roux c50dd8feab Allow new lines, and more, in error and event messages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767694 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 22:29:29 +00:00
David E. Jones 8e2ae77503 Changed theme selection page label for link going back to main from Cancel to Done; as discussed a bit ago on the mailing list this is confusing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766520 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 21:11:18 +00:00
David E. Jones 32e673754a Moved old default theme data and files to new flatgrey theme; small corrections for use of messages.ftl; added setting in general.properties for the default theme ID; changed default theme to smoothfeather
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765862 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 06:29:09 +00:00
Hans Bakker 70c4771995 make header expand/collaps again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764492 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 14:47:27 +00:00
Adrian Crum f67ea1a83e Removed duplicate DOCTYPE element.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764301 13f79535-47bb-0310-9956-ffa450edef68
2009-04-12 16:53:26 +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
Jacques Le Roux 56568efcce A patch from Bruno Busco "Security update (Link to hidden form change) for Visual Theme selection" https://issues.apache.org/jira/browse/OFBIZ-2255
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759044 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 07:47:31 +00:00
David E. Jones 3eee2073cc Moved some party dependent services out of the framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757644 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 03:44:59 +00:00
Bilgin Ismet Ibryam d5c8d3da4f Trivial fix, reported by Bruno
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@754644 13f79535-47bb-0310-9956-ffa450edef68
2009-03-15 10:15:20 +00:00
Hans Bakker 8cf87156b5 some improvement on the change default organization partyId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752760 13f79535-47bb-0310-9956-ffa450edef68
2009-03-12 03:32:06 +00:00
Hans Bakker bb2a666832 if there are more than one default party organization to select from, present a drop down in the header so it can easily be changed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752416 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 10:17:26 +00:00
Jacques Le Roux dcf4045d4f Easier to read
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751550 13f79535-47bb-0310-9956-ffa450edef68
2009-03-08 23:24:33 +00:00
David E. Jones f876f9a0c1 Simple implementation of feature discussed on the mailing list to facilitate getting back to a view after some generic action, like schanging the locale which this commit has use the new feature as a test case; I'm not sure I like this approach, will send message to dev list about it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749959 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 10:27:52 +00:00
Jacques Le Roux 9aa57f3ea4 A patch from Bruno Busco "Linking End User Documentation to OFBiz" (https://issues.apache.org/jira/browse/OFBIZ-2133) - OFBIZ-2133
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748884 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 16:29:24 +00:00
Hans Bakker 5192a24e48 introduction of a common component for applications. moved the 2 lines containing party info to this component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@748144 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 13:36:51 +00:00
David E. Jones a0d0a10ebc Resolved some more problems with the general html encoding, most of which are from funny code that should be cleaned up anyway so haven't run into any dilemmas so far; still looking though so could happen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742053 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 11:08:32 +00:00
David E. Jones 3d122767ba Fixed issue with links in footer caused by change to general html encoding in ftl files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742034 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 09:40:32 +00:00
David E. Jones 7d5264a0e8 Fixed appbar issue with html encoding, so general encoding turned back on too
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742030 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 09:05:45 +00:00
Jacques Le Roux 96af0d1bd7 Footer l10n and French i18n
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741532 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 11:11:46 +00:00
Jacques Le Roux cadb5144e2 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741514 13f79535-47bb-0310-9956-ffa450edef68 2009-02-06 10:33:22 +00:00
David E. Jones afe3dc9c81 A few related changes:
Big refactor of ControlServlet, RequestManager, RequestHandler, and ConfigXMLReader so that simple objects are used instead of Maps within Maps within Maps for the data from the controller.xml file, which results in eliminating hundreds of lines of code including the entire RequestHandler class. I have tested this a lot with different apps that use the ControlServlet differently, but this is a very big change so there could still be issues. Based on this cleanup future issues and new features should be easier and less error prone, and that is why doing it now in order to help with a number of other improvements and bug fixes that are part of this commit.

Also added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues wd in and also going to the same page after login from auth=true or from clicking on the login link.

Related to cleaning up login URLs also changed how the request and parameters passed to a request before a login are saved and used after a login is successful so that it URL parameters go on the URL in a redirect to the original request to make it more transparent, and non-URL parameters just stay in the session and are used when the original request is run again to avoid putting sensitive information like passwords and big information like textarea data in the URL, which has been a problem before.

To see what some of these things combined can do try going to the example app, login, click on the New Example link, then logout in another tab or window, then go back to the New Example page and enter a name and a whole bunch of text in the long description then click Create, the system will show you the login page so enter username/password, and then after login you'll see a nice URL to EditExample with the correct exampleId parameter and all of the data entered before login successfully saved and never appearing in a URL.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741374 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 02:14:19 +00:00
Jacques Le Roux 345d64b204 A patch from Bruno Busco " Moving Timestamp to footer" '(https://issues.apache.org/jira/browse/OFBIZ-2164) - OFBIZ-2164
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@740299 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 13:21:30 +00:00
Jacques Le Roux 6b08a4dfaa A patch from Bruno Busco "Removing Login/Logout from AppBarMenu" '(https://issues.apache.org/jira/browse/OFBIZ-2156) - OFBIZ-2156
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739594 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 19:58:33 +00:00
Scott Gray 773fe29a3d Fixed a misplaced </p>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738371 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 05:27:37 +00:00
Scott Gray 8c5d3f720d Removed duplicate type attributes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738366 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 05:01:49 +00:00
Jacques Le Roux 65fa17a5c6 A patch from Bruno Busco "Drop-down Applications Bar" '(https://issues.apache.org/jira/browse/OFBIZ-2118) - OFBIZ-2118
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737309 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 06:56:32 +00:00
Jacques Le Roux dbfba6ebbb Cleanup_labels30.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@733454 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 11:22:56 +00:00
Hans Bakker 23fdd82ad3 only show default organization when a user is logged in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729426 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 14:57:44 +00:00
Hans Bakker a2c5b444ce OFBIZ-2097: show organizationPartyId in header(can be set in preferences), rewrote financial history to show currencies, invoice/p[aymentworker now can show in actual and organizationparty currency
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729396 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 06:26:14 +00:00
Jacques Le Roux 31d56e8064 A patch from Ravindra Mandre "The userPrefGroupId field on UserPrefGroupType should be userPrefGroupTypeId, as per conventions" (https://issues.apache.org/jira/browse/OFBIZ-1996) - OFBIZ-1996
With some help by Vikas Mayur for the "Upgrading OFBiz from earlier revisions" Wiki page update


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@712366 13f79535-47bb-0310-9956-ffa450edef68
2008-11-08 08:59:31 +00:00
Jacques Le Roux 15cb5780dc A patch from Bruno Busco "A screenshot for the default visual theme" (https://issues.apache.org/jira/browse/OFBIZ-1983) - OFBIZ-1983
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@701614 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 08:36:28 +00:00
Adrian Crum 08d114f1d8 Temporal Expression UI artifacts. There is a Temporal Expression Maintenance screen in the Webtools component.
I tried my best to break this up into re-usable pieces and put them where I thought they made sense. Feel free to move things around if you have a better idea.

Internationalization note: this commit contains new UI labels.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@700310 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 23:58:59 +00:00
Adrian Crum 32682b431a Visual Themes framework - for more information see https://issues.apache.org/jira/browse/OFBIZ-1885.
This commit provides a means to swap out the current UI theme for another one. Alternate style sheets, templates, JavScript files, etc can be used to give OFBiz a completely different look.

Right now the plan is to have "theme libraries" that can be dropped in the hot-deploy folder. Work still needs to be done to connect web stores and product catalogs to the visual theme framework.

Users can select their preferred theme in the back-office applications.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@698346 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 20:58:23 +00:00
Adrian Crum f7ab19876b Removed availableLocales and availableTimeZones from screen rendering context - they are not needed anymore. Also deleted an unused ftl file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686622 13f79535-47bb-0310-9956-ffa450edef68
2008-08-17 16:37:42 +00:00
Adrian Crum adc1d1d145 Collapsible masthead, based upon a patch provided by Bruno Busco - https://issues.apache.org/jira/browse/OFBIZ-1919.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686515 13f79535-47bb-0310-9956-ffa450edef68
2008-08-16 15:52:47 +00:00
Adrian Crum 89245c4d92 Better handling of the masthead logo image link.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685969 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 17:33:29 +00:00
Adrian Crum af7a0409c1 Removed deprecated CSS styles from the maincss.css file. I skipped the eCommerce component because it doesn't use that style sheet, and I also skipped the content component because it is used in eCommerce.
This shouldn't affect any layout. If it does, just post a message on the dev ml (with link please) and I'll fix it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@675831 13f79535-47bb-0310-9956-ffa450edef68
2008-07-11 04:02:30 +00:00
Adrian Crum e2e5268f42 Improved Lookup decorator, submitted by Bruno Busco - https://issues.apache.org/jira/browse/OFBIZ-1841, with modifications by me.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@667965 13f79535-47bb-0310-9956-ffa450edef68
2008-06-15 15:20:10 +00:00
Jacques Le Roux 9274a5d90a A patch from Bruno Busco "ERP header logo should link to home url" (https://issues.apache.org/jira/browse/OFBIZ-1834) - OFBIZ-1834
I changed the default link from "/" to "/catalog/control/main" which makes more sense OOTB

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@665919 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 22:14:56 +00:00
Jacques Le Roux cf1c245266 I wondered why it did not work. Lol, I was really tired when I wrote that. Adrian already fixed a typo, here is the last. It works now :o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@663611 13f79535-47bb-0310-9956-ffa450edef68
2008-06-05 13:56:51 +00:00