Commit Graph
62 Commits
Author SHA1 Message Date
Deepak Dixit d24c956bf9 Improved: Moved plugins js from images to common/js (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818600 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 18:16:09 +00:00
Nicolas Malin aec57b51c5 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Third step, move macro ftl libraries and ftl template present on framework common to common theme
At this step, the common-theme is forced like the common component previously.

Main common screens present on CommonScreens.xml, LookupScreens.xml and HelpScreens.xml are moved to common screen with a forced rewrite to common-theme 
Warning this commit is going to follow with a other commit for CommonScreens.xml because LookupScreens.xml and HelpScreens.xml are recreated on common-theme, but to keep the history of CommonScreens.xml it was moved entirely, the second commit restore it with redirect call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806091 13f79535-47bb-0310-9956-ffa450edef68
2017-08-24 21:55:06 +00:00
Jacques Le Roux 5b002a5953 Fixes: jquery.jgrowl.min.css is linked twice in html page
(OFBIZ-7758)

I am running on trunk rev 1751489 on tomahawk theme. 
In the browser, right-click and view the page source. 
There is duplicate linking of jquery.jgrowl.min.css i.e.

<link rel="stylesheet" href="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" type="text/css"/>

The solution is to remove a hack for JPublish in fex Java classes 
and related changes (mostly "page." in ftl and xml files)

Thanks: Rohit Koushal for the path and James Yong the report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761235 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:43:16 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +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 4a276ecf91 (OFBIZ-7231) Relocate .groovy files in the framework/common component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747776 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 18:58:37 +00:00
Deepak Dixit 83696e3203 (OFBIZ-7021) Renamed framework common component ftl file name from lower camel case to upper camel case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1744783 13f79535-47bb-0310-9956-ffa450edef68
2016-05-20 18:52:54 +00:00
Deepak Dixit 209b95cbbf (OFBIZ-6823) relocate .ftl files in the framework/common component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740497 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 12:28:46 +00:00
Adrian Crum dcecdd25a4 Reorganized the screen widget src folder so classes are more organized.
This commit might break some Groovy scripts. There seemed to be a lot of C&P widget import statements, but there were no widget classes being used in the script, so I removed them. I might have overlooked something though.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652852 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 21:03:40 +00:00
Erwan de Ferrieres 8c0a41e885 tabs to spaces, no functional changes - xml files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1230481 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 10:51:58 +00:00
Erwan de Ferrieres 617345a17e A patch from Nicolas Malin - OFBIZ-4474 - PortalPage Admin screen : change portlet sequence is broken
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1195175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 15:25:36 +00:00
Erwan de Ferrieres a184533cdd Removing an unneeded line cut
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1045340 13f79535-47bb-0310-9956-ffa450edef68
2010-12-13 19:48:10 +00:00
Erwan de Ferrieres a6dd0f7566 When displaying a portal page, the page title wasn't displayed. It also now shows near the breadcrumbs end
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1045328 13f79535-47bb-0310-9956-ffa450edef68
2010-12-13 19:27:36 +00:00
Bruno Busco 4f1d234a85 ManagePortalPages screen improvements.
The PortalPage list is now collapsible. The form to create a new portalPage has been moved to a dedicated screen.
This allows to have a less crowded screen and the portalPage being configured can be seen almost at full screen.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023447 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 09:46:52 +00:00
Bruno Busco c7b53b7ae4 Removed unused showPortletUiLabelDecorator.
Generally xxxxUiLabelDecorator should not be used. Having a decorator that only adds UiLabel resources creates unnecessary screen dependences.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023429 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:33:35 +00:00
Bruno Busco 599547f6b5 The retrievePortletAttributes.groovy is not needed any more since it is now embedded in the include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023427 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:22:16 +00:00
Bruno Busco 9e6dd1f56c Replaced PortalPageScreen with the new include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023425 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 06:44:14 +00:00
Bruno Busco 53213d0f3e Used include-portal-page widget in ShowPortalPage Screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023286 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 14:02:47 +00:00
Bruno Busco b6db13d60a Added a back button to the screens used to select a portlet to be added, to change the column width and to edit portlet attributes.
The back button can be used to abort the operation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023244 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 11:06:34 +00:00
Bruno Busco f098b68cb3 Introduced the new include-portal-page in the ManagePortalPages screen.
This should be the only change that needs to be reverted if any issue with the new include-portal-page is raised.
I do not proceed further with the widget introduction into other screens for a while (even if I have a local copy of the whole OFBiz converted) so that it will be tested more.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023206 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 08:04:58 +00:00
Bruno Busco 00f98b9644 Remove unused ListPortalPage.groovy. This has been replaced by the PortalPageWorker.getPortalPages method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023195 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 06:03:41 +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 ab43dfbf0e Showing the title when a portal page is displayed on screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991947 13f79535-47bb-0310-9956-ffa450edef68
2010-09-02 14:27:17 +00:00
Erwan de Ferrieres 264d7b7099 Corrections on rev 935923
* corrected a wrong controller entry
* added a missing decorator (uiLabelDecorator)
* added a collapse button for the GenericScreenlet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@936385 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 16:16:40 +00:00
Erwan de Ferrieres 6f2642a5dd Adding a whole set of generic portlets. Those are more designed to be customised
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935923 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 13:57:26 +00:00
Hans Bakker e237fe0ba6 if menu and portalpage options are mixed, tomahawk did not display correctly in the example component and other places as reported by Bruno in the mailing list. should work now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@928131 13f79535-47bb-0310-9956-ffa450edef68
2010-03-27 03:39:08 +00:00
Hans Bakker 3daaf0a95e show portlets with/without decorators
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@925723 13f79535-47bb-0310-9956-ffa450edef68
2010-03-21 04:05:31 +00:00
Bruno Busco eecf528cd6 Added a new "PortalPageScreen" common screen. This can be used to include a portalPage wherever needed (showPortalPage.ftl shouldn't be directly used anymore). The screen needs only the portalPageId input parameter.
Used this new "PortalPageScreen" screen in place of all showPortalPage.ftl includes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@900156 13f79535-47bb-0310-9956-ffa450edef68
2010-01-17 15:15:14 +00:00
Bruno Busco 683f95cee3 A patch from Sascha Rodekamp "Drag'n'Drop update - add directly in the my portal application"
(https://issues.apache.org/jira/browse/OFBIZ-3227) - OFBIZ-3227


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884864 13f79535-47bb-0310-9956-ffa450edef68
2009-11-27 12:52:11 +00:00
Scott Gray d55301de85 Switched back to using main-decorator in ManagePortalPages, wrapped the body section in no-clear container since that was the reason why the CommonPartyDecorator was being used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883900 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 22:25:17 +00:00
Bruno Busco 220705d2da A slightly modified patch from Sascha Rodekamp "Drag 'n' Drop for myPortal + update prototype and script.aculo.us"
(https://issues.apache.org/jira/browse/OFBIZ-3190) - OFBIZ-3190

- I changed some tabs to spaces
- It seems to me that everything works with the script.aculo.us version that is already present in the framework; so I did not commit the script.aculo.us update since could break some other thing

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@881999 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:31:59 +00:00
Hans Bakker 398139f70d add a portal page as the first page in sfa containing calendar and email, but can be changed as required via preferences. add the first screens for events which will appear on the calendar. next step will be to be able to connect events/tasks to opportunities, show them in the party pprofile etc...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835270 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:04:41 +00:00
Hans Bakker 63a818ab65 extended the help system so that help pages can also be used from within the content component when available. If not found, the page within ofbiz.apache.org will be displayed. as is the case now. See the my portal component for an example. Still need to extend the <content tag so that an override template can be specified.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@803416 13f79535-47bb-0310-9956-ffa450edef68
2009-08-12 08:48:19 +00:00
Hans Bakker c57f235be9 added a special help for portal pages to provide help on portlets on that page
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@802724 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 10:25:15 +00:00
Hans Bakker 7b6032bc12 moved the portlet editscreen to the top of the page and improved error handling
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788605 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 06:34:45 +00:00
Hans Bakker 87f7a8fe37 small correction on previous commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785924 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 06:49:19 +00:00
Hans Bakker 4d037f45e1 This is a proof of concept, comments are very welcome.
The first page of myportal now shows changes which happened in the system for the logged on user in the first portlet.
The second portlet gives the total OPEN items in a certain function for the logged on user.

The first two functions which are working now:
1. Incoming communication events (email, internal notes)
2. tasks which are assigned either in projectmanager or workeffort

What is also pretty interesting is that the status can now be checked by a firefox plugin and when it changes the employee is notified from within firefox
The plugin: http://updatescanner.mozdev.org/en/index.html
and it should check the following url: (adjust to your requirements)
https://localhost:8443/myportal/control/showPortlet?portalPortletId=SystemInfoNotes&USERNAME=admin&PASSWORD=ofbiz

In the flat grey theme i also have added notifications in the header when they are available.

If the notification shows and the user clicks on the message the related portlet is shown.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785872 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 01:15:09 +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 f2ee862883 security update
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759017 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 03:52:14 +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 d4137b9f46 add the possibility to list portlets by portlet category
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746646 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 08:16:32 +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 1f1e7bb4e4 update/display portlet sequence corrected, also seed data corrected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743000 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 15:48:08 +00:00
Hans Bakker 79b5011d48 some fault fixing and added check on ownership to portalPage services.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742251 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 04:30:53 +00:00
Hans Bakker 08ba67420f cleanup of the portal pages, reduced number of screens, changed employee myportal, new user without securitygroups now also have his portal page with a profile portlet. only thing is missing is the usage of the sequence number in the portal page and portalpageportlet entity, probably completed next week
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742018 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 08:33:36 +00:00
Hans Bakker a588477be4 add screenlets to manageportal pages, add descriptions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741861 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 09:03:49 +00:00