Commit Graph
42 Commits
Author SHA1 Message Date
Jacques Le Roux 6a89860bbc Improved: Move Groovy scripts from /groovyScripts/ to /src/main/groovy/
(OFBIZ-11205)

Moves FetchLogs.groovy as a 1st step

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867344 13f79535-47bb-0310-9956-ffa450edef68
2019-09-22 14:18:23 +00:00
Suraj Khurana 9ca5823a8a Improved: Consistency and Readability improvements for include-menu tag.
(OFBIZ-8972)
Thanks Ankush Upadhyay for reporting and Devanshu Vyas for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1845088 13f79535-47bb-0310-9956-ffa450edef68
2018-10-29 08:29:43 +00:00
Deepak Dixit d09255c0b7 Reverted: Minilang code readability and consistency improvements done at r#1768222, this commit reversed key and description of drop-down in the code.
(OFBIZ-9114)

Thanks  Wei Zhang for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1772880 13f79535-47bb-0310-9956-ffa450edef68
2016-12-06 12:37:42 +00:00
Divesh Dutta 70eb7ff508 Improvement: Minilang code readability and consistency improvements.
(OFBIZ-8929) (OFBIZ-8930) (OFBIZ-8953) (OFBIZ-8965) (OFBIZ-8972) (OFBIZ-8986) (OFBIZ-8991) 

Thanks: Ankush Upadhyay, Anuj Jain, Abhijeet for your patches. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768222 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 14:34:00 +00:00
Nicolas Malin 184d60206a Currently we have two methods for display log in OFBiz throught webtools :
* https://localhost:8443/webtools/control/LogView
* https://localhost:8443/webtools/control/FetchLogs
Each method use the same line rendering and the difference is : LogView display only runtime/logs/ofbiz.log (or you can surcharge it vith debug.properties) and FecthLogs list all file name ofbiz* present on runtime/logs/ofbiz.log and offert the possibility to search only line that macth a string.

I review the code to use only one script (remove LogView.groovy) and improve following points :
* Optimise the FetchLog.groovy to display with same velocity a file with or without string chain filtering
* Add a property to change the root log directory. Under linux we use /var/log/ofbiz/
* Add a regExp to match the file name of file present in the directory. Helpful when you want to see error.log
* Complete debug.properties with comment for describe example for new properties

And last point, add refresh button on the end page to reload the log without lost your state on the page.
Related issue OFBIZ-7944

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755302 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:05:48 +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 543dd8e488 (OFBIZ-7221) Relocate .groovy files in the framework/webtools component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747755 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 17:16:22 +00:00
Arun Patidar fbe2dfb9d2 [OFBIZ-7140] Added Fetch Log Functionality parallel to View Log in webtools. Thanks Rishi Solanki for new feature and patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746227 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 05:26:43 +00:00
Deepak Dixit 913d2d3ff5 (OFBIZ-7021) Renamed webtools component ftl file name from lower case to upper case pattern.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1743879 13f79535-47bb-0310-9956-ffa450edef68
2016-05-15 04:50:13 +00:00
Deepak Dixit 5063287ddf (OFBIZ-6824) Apply slightly modified patch from jira issue, updated path for ping.ftl and showDateTime.ftl in controller.xml
============================================================
relocate .ftl files in the framework/webtools component
============================================================
Thanks  Pierre Smits for your contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738581 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 12:57:45 +00:00
Jacopo Cappellato d8c412302f OFBIZ-5287: Upgrade to Log4j2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1618831 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 10:36:01 +00:00
Jacopo Cappellato 4ae936a5f3 The content rendered in the Webtools "view log" screen is now rendered from the ofbiz.log file rather then the ofbiz.html file in order to provide more control on the html code rendered in the screen. This fixes the vulnerability CVE-2013-2137
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489461 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 14:48:40 +00:00
Bruno Busco 258ace98d6 No funtional changes only layout.
Screenlet title bars and H1 titles have been removed when they simply duplicate the tab menu.
Fixed some missing tab menu highlighting.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098406 13f79535-47bb-0310-9956-ffa450edef68
2011-05-01 20:38:38 +00:00
Bruno Busco cca950be37 Converted WebTools->Logs->Service logs screen from FTL to form widget
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992791 13f79535-47bb-0310-9956-ffa450edef68
2010-09-05 14:19:11 +00:00
Bruno Busco e36939e337 Added "create", "refresh", "collapse-all" and "expand-all" classes to the pertinent button-bar buttontext links.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@902885 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 17:28:28 +00:00
Bruno Busco 7c32babcd5 Webtools application
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@887786 13f79535-47bb-0310-9956-ffa450edef68
2009-12-06 22:27:36 +00:00
Jacques Le Roux 39d105f92f Reverted changes 836044 following Adrian's issue report in https://issues.apache.org/jira/browse/OFBIZ-3206 "Recent Markup Changes Break Layout"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@880658 13f79535-47bb-0310-9956-ffa450edef68
2009-11-16 08:27:36 +00:00
Jacques Le Roux 5fc931c191 A patch from Bruno Busco "A new droppingcrumbs theme" (https://issues.apache.org/jira/browse/OFBIZ-3156) - OFBIZ-3156
An updated patch to be used to show correctly the tabbars with this theme.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836044 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:47:44 +00:00
Bruno Busco 53dbd32914 tabButtonItem variable was not always set in WebTools application resulting in the TabMenu items not highlighting as required.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832881 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 21:59:19 +00:00
Bruno Busco c3ac175016 Part of OFBIZ-3067 - Menus and form widget files location
Ecommerce, Webtools and hhfacility components
Moved forms from webapp to widget folder
Removed empty folders

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829443 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 20:20:18 +00:00
Bruno Busco 6926457840 Added TabBars menus for the WebTools application. (OFBIZ-3020)
The WebTools main screen is still untouched so that all screens can be reached in the same way as before.
When we are OK with the new screens grouping under menus we will remove the main screen as it is now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823806 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 06:46:57 +00:00
Bruno Busco 7c0b046d43 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822940 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 22:24:52 +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 101fe6961c A slightly modified patch from Bruno Busco "Updating Webtool JobList to use PerformFind and FindScreenDecorator" '(https://issues.apache.org/jira/browse/OFBIZ-2103) - OFBIZ-2103
with some i18n and French l10n


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730990 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 14:33:01 +00:00
Scott Gray 75e810a2d3 Converted the remaining framework bsh scripts to groovy
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688450 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 05:36:54 +00:00
Jacques Le Roux 3cbe576ce9 A patch from Marco Risaliti "New Styles For Framework applications" (https://issues.apache.org/jira/browse/OFBIZ-1619) - OFBIZ-1619
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@640252 13f79535-47bb-0310-9956-ffa450edef68
2008-03-23 20:20:59 +00:00
Christian Geisert ba354d8bf2 New Styles For Framework applications
Apply the new CSS styles to all the forms into the Framework applications (Example, Example Ext, Webtools) and we will have the same look and feel on the ftl screens and screen widgets
Submitted by Marco Risaliti
See OFBIZ-1619


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@628818 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 17:09:33 +00:00
Adrian Crum 68c1dbbaf9 Second sweep through the maincss.css style sheet. Changed the head1, head2, and head3 style names to h1, h2, and h3. Updated affected styles in ftl and xml files.
The ecommerce component is excluded from this commit.

These changes shouldn't break any layout. If you spot something wrong, let me know and I'll fix it.

I won't make any more maincss.css changes for a little while. I'll let the dust settle from these two commits, then I'll go through the file and physically remove the deprecated styles.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@627051 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 19:30:09 +00:00
Adrian Crum 7a20f41fe8 Improved Webtools logging screens.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@607565 13f79535-47bb-0310-9956-ffa450edef68
2007-12-30 17:47:34 +00:00
Jacopo Cappellato e55d92e07a Now the Webtools application reuses the login screens defined in the common component.
Part of OFBIZ-1320


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@585396 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 06:36:18 +00:00
David E. Jones 7d70c41c12 Did a big search/replace to change all xsd file refs from www.ofbiz.org to ofbiz.apache.org
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@539504 13f79535-47bb-0310-9956-ffa450edef68
2007-05-18 15:47:14 +00:00
Jacopo Cappellato e0cdbd091c Applied patch from Adrian Crum (OFBIZ-858) with layout enhancements for the Webtools application: eliminated table-based layout; removed deprecated CSS styles; removed embedded HTML styles.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@524378 13f79535-47bb-0310-9956-ffa450edef68
2007-03-31 06:51:14 +00:00
Jacopo Cappellato 48ff9b8778 Small fix to reflect the new location of the log files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@523249 13f79535-47bb-0310-9956-ffa450edef68
2007-03-28 09:41:52 +00:00
Jacopo Cappellato 6837cb8833 Moved ViewLog link to the main page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@511243 13f79535-47bb-0310-9956-ffa450edef68
2007-02-24 09:08:11 +00:00
Jacques Le Roux dad67935f7 A (large) patch from Scott Gray "Update ASL header" (https://issues.apache.org/jira/browse/OFBIZ-637).
I put also some svn:ignore for shark build and lib diretories and assetmaint/build 

I did some by hand lately, too much to remember. They were files with old header but without copyright. A 1st attempt I suppose, will have to check this after this commit.

I add some problems to commit this patch in one piece because it's so huge (specially with Eclipse I had to turn to Tortoise) !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@499486 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 17:15:54 +00:00
Jacopo Cappellato 16ffbf5809 Misc improvements to the Webtools log view screen:
- added a new log file appender that decorates the log messages with css; the content of this file is shown by the Webtools screen
- log messages containing ${...} notations are now supported
OFBIZ-361
Thanks to Chris Howe for most of this work.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@481544 13f79535-47bb-0310-9956-ffa450edef68
2006-12-02 10:26:09 +00:00
Jacopo Cappellato 2b032a9e1f Big i18n patch from Marco Risaliti.
OFBIZ-393


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@466018 13f79535-47bb-0310-9956-ffa450edef68
2006-10-20 07:16:54 +00:00
Jacopo Cappellato 5a334ccb11 Added a "refresh" button to the new "view log" screen.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@462763 13f79535-47bb-0310-9956-ffa450edef68
2006-10-11 10:53:14 +00:00
Jacopo Cappellato 2ab85a887d Implemented a new WebTools screen to view the content of the ofbiz log file.
It is a tool that will need a few refinements but I think it is also really useful as it is now.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@462762 13f79535-47bb-0310-9956-ffa450edef68
2006-10-11 10:51:06 +00:00
Jacopo Cappellato bf2528ec78 Added some missing resources from OFBIZ-361 (from Peter Goron).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@453164 13f79535-47bb-0310-9956-ffa450edef68
2006-10-05 09:39:41 +00:00