You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Ashish Vijaywargiya <as...@hotwaxmedia.com> on 2009/09/25 11:47:41 UTC
Re: svn commit: r818780 - in /ofbiz/trunk: applications/commonext/widget/
applications/content/src/org/ofbiz/content/data/ applications/content/template/docbook/html/
framework/base/src/org/ofbiz/base/util/ framework/common/data/ framework/common/webcommon...
Hans,
Here are few issues in your code. Please fix it and commit the code ASAP.
Thanks!
1) Instead of 5 space you should provide 4 space. See the first and
second line after else if() statement.
} else if ("XSLT".equals(dataTemplateTypeId)) {
+ File sourceFileLocation = null;
+ File targetFileLocation = new File(System.getProperty("ofbiz.home")+"/runtime/tempfiles/docbook.css");
+ if (templateContext.get("visualThemeId") != null){
+ Map layoutSettings = (Map) templateContext.get("layoutSettings");
+ List<String> docbookStyleSheets = (List) layoutSettings.get("VT_DOCBOOKSTYLESHEET");
+ String docbookStyleLocation = docbookStyleSheets.get(0);
+ sourceFileLocation = new File(System.getProperty("ofbiz.home")+"/themes"+docbookStyleLocation);
+ }
2) 8 space should be changed to 4 space.
+ if(sourceFileLocation.exists()){
+ UtilMisc.copyFile(sourceFileLocation,targetFileLocation);
+ }
3) Tab present in this line:
+ InputStream in = new FileInputStream(sourceLocation);
4)8 space should be changed to 4 space.
+ if (sourceLocation.isDirectory()) {
+ throw new IOException("File is a directory, not a file, cannot copy") ;
+ } else {
5) To increase readability of code, following code should be spaced by 4
space instead of 8 inside else if() block.
String templateLocation =
DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"),
dataResource.getString("objectInfo"), (String)
templateContext.get("contextRoot")).toString();
// render the XSLT template and file
String outDoc = null;
try {
outDoc =
XslTransform.renderTemplate(templateLocation, (String)
templateContext.get("docFile"));
} catch (TransformerException c) {
Debug.logError("XSL TransformerException: " +
c.getMessage(), module);
}
out.append(outDoc);
--
Regards
Ashish Vijaywargiya
HotWax Media Pvt. Ltd.
http://www.hotwaxmedia.com
Helping hand around the World ...
USA | Italy | India | New Zealand
hansbak@apache.org wrote:
> Author: hansbak
> Date: Fri Sep 25 09:16:26 2009
> New Revision: 818780
>
> URL: http://svn.apache.org/viewvc?rev=818780&view=rev
> Log:
> docbook files now converted to html using a first (simple) visual scheme dependent css stylesheet. This css is now also used for the display of the help files
>
> Added:
> ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css (with props)
> ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css (with props)
> ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (with props)
> ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css (with props)
> Modified:
> ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
> ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
> ofbiz/trunk/applications/content/template/docbook/html/param.xsl
> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
> ofbiz/trunk/framework/common/data/CommonTypeData.xml
> ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
> ofbiz/trunk/runtime/tempfiles/ (props changed)
> ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
> ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
>
> Modified: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/HelpScreens.xml?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (original)
> +++ ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Fri Sep 25 09:16:26 2009
> @@ -31,7 +31,7 @@
> <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
> </service>
> <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
> -
> + <set field="lookupType" value="HELP"/>
> <property-map resource="general" map-name="generalProperties" global="true"/>
> <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="BIZZNESS_TIME"/>
> <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
>
> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Fri Sep 25 09:16:26 2009
> @@ -686,6 +686,17 @@
> }
>
> } else if ("XSLT".equals(dataTemplateTypeId)) {
> + File sourceFileLocation = null;
> + File targetFileLocation = new File(System.getProperty("ofbiz.home")+"/runtime/tempfiles/docbook.css");
> + if (templateContext.get("visualThemeId") != null){
> + Map layoutSettings = (Map) templateContext.get("layoutSettings");
> + List<String> docbookStyleSheets = (List) layoutSettings.get("VT_DOCBOOKSTYLESHEET");
> + String docbookStyleLocation = docbookStyleSheets.get(0);
> + sourceFileLocation = new File(System.getProperty("ofbiz.home")+"/themes"+docbookStyleLocation);
> + }
> + if(sourceFileLocation.exists()){
> + UtilMisc.copyFile(sourceFileLocation,targetFileLocation);
> + }
> // get the template data for rendering
> String templateLocation = DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).toString();
> // render the XSLT template and file
>
> Modified: ofbiz/trunk/applications/content/template/docbook/html/param.xsl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/docbook/html/param.xsl?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/template/docbook/html/param.xsl (original)
> +++ ofbiz/trunk/applications/content/template/docbook/html/param.xsl Fri Sep 25 09:16:26 2009
> @@ -208,7 +208,7 @@
> <xsl:param name="html.head.legalnotice.link.multiple" select="1"/>
> <xsl:param name="html.longdesc" select="1"/>
> <xsl:param name="html.longdesc.link" select="$html.longdesc"/>
> -<xsl:param name="html.stylesheet"/>
> +<xsl:param name="html.stylesheet">/tempfiles/docbook.css</xsl:param>
> <xsl:param name="html.stylesheet.type">text/css</xsl:param>
> <xsl:param name="htmlhelp.alias.file">alias.h</xsl:param>
> <xsl:param name="htmlhelp.autolabel" select="0"/>
>
> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java Fri Sep 25 09:16:26 2009
> @@ -18,6 +18,12 @@
> *******************************************************************************/
> package org.ofbiz.base.util;
>
> +import java.io.File;
> +import java.io.FileInputStream;
> +import java.io.FileOutputStream;
> +import java.io.IOException;
> +import java.io.InputStream;
> +import java.io.OutputStream;
> import java.io.Serializable;
> import java.math.BigDecimal;
> import java.util.Collection;
> @@ -1008,4 +1014,23 @@
> this.wait(timeout);
> }
> }
> + public static void copyFile(File sourceLocation , File targetLocation) throws IOException {
> +
> + if (sourceLocation.isDirectory()) {
> + throw new IOException("File is a directory, not a file, cannot copy") ;
> + } else {
> +
> + InputStream in = new FileInputStream(sourceLocation);
> + OutputStream out = new FileOutputStream(targetLocation);
> +
> + // Copy the bits from instream to outstream
> + byte[] buf = new byte[1024];
> + int len;
> + while ((len = in.read(buf)) > 0) {
> + out.write(buf, 0, len);
> + }
> + in.close();
> + out.close();
> + }
> + }
> }
>
> Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
> +++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Fri Sep 25 09:16:26 2009
> @@ -107,6 +107,8 @@
> <EnumerationType description="Visual Theme Resource Type (stylesheet, javascript file, etc)" enumTypeId="VT_RES_TYPE" hasTable="N"/>
> <Enumeration enumId="VT_NAME" description="Visual Theme name" enumTypeId="VT_RES_TYPE" sequenceId="00"/>
> <Enumeration enumId="VT_STYLESHEET" description="Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="01"/>
> + <Enumeration enumId="VT_HELPSTYLESHEET" description="Help Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
> + <Enumeration enumId="VT_DOCBOOKSTYLESHEET" description="Docbook Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
> <Enumeration enumId="VT_RTL_STYLESHEET" description="Right-to-Left (RTL) Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
> <Enumeration enumId="VT_SHORTCUT_ICON" description="Shortcut Icon URL" enumTypeId="VT_RES_TYPE" sequenceId="03"/>
> <Enumeration enumId="VT_EXTRA_HEAD" description="Additional <tt><head></tt> Element Markup" enumTypeId="VT_RES_TYPE" sequenceId="04"/>
>
> Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
> +++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Fri Sep 25 09:16:26 2009
> @@ -52,6 +52,11 @@
> <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
> </#list>
> </#if>
> + <#if layoutSettings.VT_HELPSTYLESHEET?has_content && lookupType?has_content>
> + <#list layoutSettings.VT_HELPSTYLESHEET as styleSheet>
> + <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
> + </#list>
> + </#if>
> <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
> <#list layoutSettings.rtlStyleSheets as styleSheet>
> <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
>
> Propchange: ofbiz/trunk/runtime/tempfiles/
> ------------------------------------------------------------------------------
> --- svn:ignore (original)
> +++ svn:ignore Fri Sep 25 09:16:26 2009
> @@ -1 +1,2 @@
> captcha
> +docbook.css
>
> Modified: ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml (original)
> +++ ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml Fri Sep 25 09:16:26 2009
> @@ -22,6 +22,8 @@
> <VisualTheme visualThemeId="BIZZNESS_TIME" visualThemeSetId="BACKOFFICE" description="It's bizzness, it's bizzness time. I couldn't have said it better myself. This theme gets down"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAME" resourceValue="BIZZNESS_TIME" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bizznesstime/css/style.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/bizznesstime/css/help.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/bizznesstime/webapp/bizznesstime/css/docbook.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
>
> Added: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css?rev=818780&view=auto
> ==============================================================================
> --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css (added)
> +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css Fri Sep 25 09:16:26 2009
> @@ -0,0 +1,38 @@
> +/***********************************************
> +APACHE OPEN FOR BUSINESS
> +Licensed to the Apache Software Foundation (ASF) under one
> +or more contributor license agreements. See the NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this file
> +to you under the Apache License, Version 2.0 (the
> +"License"); you may not use this file except in compliance
> +with the License. You may obtain a copy of the License at
> +
> +http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing,
> +software distributed under the License is distributed on an
> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +KIND, either express or implied. See the License for the
> +specific language governing permissions and limitations
> +under the License.
> +***********************************************/
> +body {background:transparent url(/images/ofbiz_logo.gif) no-repeat scroll left top;
> + color: #000;
> + font-family: Verdana, Arial, Helvetica, sans-serif;
> + font-size:.75em;
> + line-height:1.5em;padding:50px 0 0;
> +}
> +
> +a:hover {
> + color:#111111;
> + text-decoration:underline;
> +}
> +a:visited {
> + color:#000;
> + text-decoration:underline;
> +}
> +a {
> + color:#555;
> + text-decoration:underline;
> +}
>
> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
> ------------------------------------------------------------------------------
> svn:keywords = "Date Rev Author URL Id"
>
> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
> ------------------------------------------------------------------------------
> svn:mime-type = text/css
>
> Added: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css?rev=818780&view=auto
> ==============================================================================
> --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css (added)
> +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css Fri Sep 25 09:16:26 2009
> @@ -0,0 +1,35 @@
> +/***********************************************
> +APACHE OPEN FOR BUSINESS
> +Licensed to the Apache Software Foundation (ASF) under one
> +or more contributor license agreements. See the NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this file
> +to you under the Apache License, Version 2.0 (the
> +"License"); you may not use this file except in compliance
> +with the License. You may obtain a copy of the License at
> +
> +http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing,
> +software distributed under the License is distributed on an
> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +KIND, either express or implied. See the License for the
> +specific language governing permissions and limitations
> +under the License.
> +***********************************************/
> +body {
> + background:none;
> +}
> +
> +.left-border {
> + float:left;width:25%;
> +}
> +
> +.contentarea {
> + margin: 0 0 0 0.5em;
> + padding:0 0 0 0.5em;
> +}
> +.leftonly {
> + float:none;
> + min-height:25em;
> +}
>
> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> ------------------------------------------------------------------------------
> svn:mime-type = text/css
>
> Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=818780&r1=818779&r2=818780&view=diff
> ==============================================================================
> --- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
> +++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri Sep 25 09:16:26 2009
> @@ -22,6 +22,8 @@
> <VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Old OFBiz Standard Floating Layout"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/flatgrey/help.css" sequenceId="01"/>
> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/flatgrey/webapp/flatgrey/docbook.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
>
> Added: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css?rev=818780&view=auto
> ==============================================================================
> --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (added)
> +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css Fri Sep 25 09:16:26 2009
> @@ -0,0 +1,41 @@
> +/***********************************************
> +APACHE OPEN FOR BUSINESS
> +Licensed to the Apache Software Foundation (ASF) under one
> +or more contributor license agreements. See the NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this file
> +to you under the Apache License, Version 2.0 (the
> +"License"); you may not use this file except in compliance
> +with the License. You may obtain a copy of the License at
> +
> +http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing,
> +software distributed under the License is distributed on an
> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +KIND, either express or implied. See the License for the
> +specific language governing permissions and limitations
> +under the License.
> +***********************************************/
> +h1, h2, h3, h4, h5, h6 {
> +color:#000099;
> +}
> +
> +body {background:transparent url(/images/ofbiz_logo.gif) no-repeat scroll left top;
> + color: #000;
> + font-family:verdana,arial,sans-serif;
> + padding:50px 0 0;
> +}
> +
> +a:hover, a:active {
> + text-decoration:underline;
> +}
> +a:visited {
> + color:purple;
> + font-weight:bold;
> +}
> +a {
> + color:#000099;
> + text-decoration:none;
> + font-weight:bold;
> +}
>
> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> ------------------------------------------------------------------------------
> svn:mime-type = text/css
>
> Added: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css?rev=818780&view=auto
> ==============================================================================
> --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css (added)
> +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css Fri Sep 25 09:16:26 2009
> @@ -0,0 +1,19 @@
> +/***********************************************
> +APACHE OPEN FOR BUSINESS
> +Licensed to the Apache Software Foundation (ASF) under one
> +or more contributor license agreements. See the NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership. The ASF licenses this file
> +to you under the Apache License, Version 2.0 (the
> +"License"); you may not use this file except in compliance
> +with the License. You may obtain a copy of the License at
> +
> +http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing,
> +software distributed under the License is distributed on an
> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +KIND, either express or implied. See the License for the
> +specific language governing permissions and limitations
> +under the License.
> +***********************************************/
>
> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> ------------------------------------------------------------------------------
> svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> ------------------------------------------------------------------------------
> svn:mime-type = text/css
>
>
>
Re: svn commit: r818780 - in /ofbiz/trunk: applications/commonext/widget/
applications/content/src/org/ofbiz/content/data/ applications/content/template/docbook/html/
framework/base/src/org/ofbiz/base/util/ framework/common/data/ framework/common/webcommon...
Posted by Ashish Vijaywargiya <as...@hotwaxmedia.com>.
Hello Hans,
Thanks for your quick turn around on this Hans. I appreciate your help
to *rework* on all such issues.
Waiting for the day when I will save my time and putting comments on
such work ;)
Anyway lets hope for the best!
I noticed that you have done a commit before few minutes but you have
missed point # 3 & #4.
Probably you will take care of that soon .. looking forward to have that
done too. :-)
--
Regards
Ashish Vijaywargiya
HotWax Media Pvt. Ltd.
http://www.hotwaxmedia.com
Helping hand around the World ...
USA | Italy | New Zealand | India
Hans Bakker wrote:
> Hi Ashish,
>
> the amount of work you put into this, i am surprised....
> but of course as soon as possible! thank you for the comments
>
> Hans
>
>
> On Fri, 2009-09-25 at 15:17 +0530, Ashish Vijaywargiya wrote:
>
>> Hans,
>>
>> Here are few issues in your code. Please fix it and commit the code ASAP.
>> Thanks!
>>
>> 1) Instead of 5 space you should provide 4 space. See the first and
>> second line after else if() statement.
>>
>> } else if ("XSLT".equals(dataTemplateTypeId)) {
>> + File sourceFileLocation = null;
>> + File targetFileLocation = new File(System.getProperty("ofbiz.home")+"/runtime/tempfiles/docbook.css");
>> + if (templateContext.get("visualThemeId") != null){
>> + Map layoutSettings = (Map) templateContext.get("layoutSettings");
>> + List<String> docbookStyleSheets = (List) layoutSettings.get("VT_DOCBOOKSTYLESHEET");
>> + String docbookStyleLocation = docbookStyleSheets.get(0);
>> + sourceFileLocation = new File(System.getProperty("ofbiz.home")+"/themes"+docbookStyleLocation);
>> + }
>>
>>
>> 2) 8 space should be changed to 4 space.
>>
>> + if(sourceFileLocation.exists()){
>> + UtilMisc.copyFile(sourceFileLocation,targetFileLocation);
>> + }
>>
>>
>> 3) Tab present in this line:
>>
>> + InputStream in = new FileInputStream(sourceLocation);
>>
>> 4)8 space should be changed to 4 space.
>> + if (sourceLocation.isDirectory()) {
>> + throw new IOException("File is a directory, not a file, cannot copy") ;
>> + } else {
>>
>>
>> 5) To increase readability of code, following code should be spaced by 4
>> space instead of 8 inside else if() block.
>>
>> String templateLocation =
>> DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"),
>> dataResource.getString("objectInfo"), (String)
>> templateContext.get("contextRoot")).toString();
>> // render the XSLT template and file
>> String outDoc = null;
>> try {
>> outDoc =
>> XslTransform.renderTemplate(templateLocation, (String)
>> templateContext.get("docFile"));
>> } catch (TransformerException c) {
>> Debug.logError("XSL TransformerException: " +
>> c.getMessage(), module);
>> }
>> out.append(outDoc);
>>
>> --
>> Regards
>> Ashish Vijaywargiya
>> HotWax Media Pvt. Ltd.
>> http://www.hotwaxmedia.com
>>
>> Helping hand around the World ...
>> USA | Italy | India | New Zealand
>>
>>
>> hansbak@apache.org wrote:
>>
>>> Author: hansbak
>>> Date: Fri Sep 25 09:16:26 2009
>>> New Revision: 818780
>>>
>>> URL: http://svn.apache.org/viewvc?rev=818780&view=rev
>>> Log:
>>> docbook files now converted to html using a first (simple) visual scheme dependent css stylesheet. This css is now also used for the display of the help files
>>>
>>> Added:
>>> ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css (with props)
>>> ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css (with props)
>>> ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (with props)
>>> ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css (with props)
>>> Modified:
>>> ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
>>> ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
>>> ofbiz/trunk/applications/content/template/docbook/html/param.xsl
>>> ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
>>> ofbiz/trunk/framework/common/data/CommonTypeData.xml
>>> ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
>>> ofbiz/trunk/runtime/tempfiles/ (props changed)
>>> ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
>>> ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
>>>
>>> Modified: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/HelpScreens.xml?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (original)
>>> +++ ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Fri Sep 25 09:16:26 2009
>>> @@ -31,7 +31,7 @@
>>> <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
>>> </service>
>>> <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
>>> -
>>> + <set field="lookupType" value="HELP"/>
>>> <property-map resource="general" map-name="generalProperties" global="true"/>
>>> <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="BIZZNESS_TIME"/>
>>> <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
>>>
>>> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
>>> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Fri Sep 25 09:16:26 2009
>>> @@ -686,6 +686,17 @@
>>> }
>>>
>>> } else if ("XSLT".equals(dataTemplateTypeId)) {
>>> + File sourceFileLocation = null;
>>> + File targetFileLocation = new File(System.getProperty("ofbiz.home")+"/runtime/tempfiles/docbook.css");
>>> + if (templateContext.get("visualThemeId") != null){
>>> + Map layoutSettings = (Map) templateContext.get("layoutSettings");
>>> + List<String> docbookStyleSheets = (List) layoutSettings.get("VT_DOCBOOKSTYLESHEET");
>>> + String docbookStyleLocation = docbookStyleSheets.get(0);
>>> + sourceFileLocation = new File(System.getProperty("ofbiz.home")+"/themes"+docbookStyleLocation);
>>> + }
>>> + if(sourceFileLocation.exists()){
>>> + UtilMisc.copyFile(sourceFileLocation,targetFileLocation);
>>> + }
>>> // get the template data for rendering
>>> String templateLocation = DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).toString();
>>> // render the XSLT template and file
>>>
>>> Modified: ofbiz/trunk/applications/content/template/docbook/html/param.xsl
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/docbook/html/param.xsl?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/content/template/docbook/html/param.xsl (original)
>>> +++ ofbiz/trunk/applications/content/template/docbook/html/param.xsl Fri Sep 25 09:16:26 2009
>>> @@ -208,7 +208,7 @@
>>> <xsl:param name="html.head.legalnotice.link.multiple" select="1"/>
>>> <xsl:param name="html.longdesc" select="1"/>
>>> <xsl:param name="html.longdesc.link" select="$html.longdesc"/>
>>> -<xsl:param name="html.stylesheet"/>
>>> +<xsl:param name="html.stylesheet">/tempfiles/docbook.css</xsl:param>
>>> <xsl:param name="html.stylesheet.type">text/css</xsl:param>
>>> <xsl:param name="htmlhelp.alias.file">alias.h</xsl:param>
>>> <xsl:param name="htmlhelp.autolabel" select="0"/>
>>>
>>> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
>>> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java Fri Sep 25 09:16:26 2009
>>> @@ -18,6 +18,12 @@
>>> *******************************************************************************/
>>> package org.ofbiz.base.util;
>>>
>>> +import java.io.File;
>>> +import java.io.FileInputStream;
>>> +import java.io.FileOutputStream;
>>> +import java.io.IOException;
>>> +import java.io.InputStream;
>>> +import java.io.OutputStream;
>>> import java.io.Serializable;
>>> import java.math.BigDecimal;
>>> import java.util.Collection;
>>> @@ -1008,4 +1014,23 @@
>>> this.wait(timeout);
>>> }
>>> }
>>> + public static void copyFile(File sourceLocation , File targetLocation) throws IOException {
>>> +
>>> + if (sourceLocation.isDirectory()) {
>>> + throw new IOException("File is a directory, not a file, cannot copy") ;
>>> + } else {
>>> +
>>> + InputStream in = new FileInputStream(sourceLocation);
>>> + OutputStream out = new FileOutputStream(targetLocation);
>>> +
>>> + // Copy the bits from instream to outstream
>>> + byte[] buf = new byte[1024];
>>> + int len;
>>> + while ((len = in.read(buf)) > 0) {
>>> + out.write(buf, 0, len);
>>> + }
>>> + in.close();
>>> + out.close();
>>> + }
>>> + }
>>> }
>>>
>>> Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
>>> +++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Fri Sep 25 09:16:26 2009
>>> @@ -107,6 +107,8 @@
>>> <EnumerationType description="Visual Theme Resource Type (stylesheet, javascript file, etc)" enumTypeId="VT_RES_TYPE" hasTable="N"/>
>>> <Enumeration enumId="VT_NAME" description="Visual Theme name" enumTypeId="VT_RES_TYPE" sequenceId="00"/>
>>> <Enumeration enumId="VT_STYLESHEET" description="Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="01"/>
>>> + <Enumeration enumId="VT_HELPSTYLESHEET" description="Help Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
>>> + <Enumeration enumId="VT_DOCBOOKSTYLESHEET" description="Docbook Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
>>> <Enumeration enumId="VT_RTL_STYLESHEET" description="Right-to-Left (RTL) Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
>>> <Enumeration enumId="VT_SHORTCUT_ICON" description="Shortcut Icon URL" enumTypeId="VT_RES_TYPE" sequenceId="03"/>
>>> <Enumeration enumId="VT_EXTRA_HEAD" description="Additional <tt><head></tt> Element Markup" enumTypeId="VT_RES_TYPE" sequenceId="04"/>
>>>
>>> Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
>>> +++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Fri Sep 25 09:16:26 2009
>>> @@ -52,6 +52,11 @@
>>> <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
>>> </#list>
>>> </#if>
>>> + <#if layoutSettings.VT_HELPSTYLESHEET?has_content && lookupType?has_content>
>>> + <#list layoutSettings.VT_HELPSTYLESHEET as styleSheet>
>>> + <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
>>> + </#list>
>>> + </#if>
>>> <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
>>> <#list layoutSettings.rtlStyleSheets as styleSheet>
>>> <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
>>>
>>> Propchange: ofbiz/trunk/runtime/tempfiles/
>>> ------------------------------------------------------------------------------
>>> --- svn:ignore (original)
>>> +++ svn:ignore Fri Sep 25 09:16:26 2009
>>> @@ -1 +1,2 @@
>>> captcha
>>> +docbook.css
>>>
>>> Modified: ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml (original)
>>> +++ ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml Fri Sep 25 09:16:26 2009
>>> @@ -22,6 +22,8 @@
>>> <VisualTheme visualThemeId="BIZZNESS_TIME" visualThemeSetId="BACKOFFICE" description="It's bizzness, it's bizzness time. I couldn't have said it better myself. This theme gets down"/>
>>> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAME" resourceValue="BIZZNESS_TIME" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bizznesstime/css/style.css" sequenceId="01"/>
>>> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/bizznesstime/css/help.css" sequenceId="01"/>
>>> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/bizznesstime/webapp/bizznesstime/css/docbook.css" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
>>>
>>> Added: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css?rev=818780&view=auto
>>> ==============================================================================
>>> --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css (added)
>>> +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css Fri Sep 25 09:16:26 2009
>>> @@ -0,0 +1,38 @@
>>> +/***********************************************
>>> +APACHE OPEN FOR BUSINESS
>>> +Licensed to the Apache Software Foundation (ASF) under one
>>> +or more contributor license agreements. See the NOTICE file
>>> +distributed with this work for additional information
>>> +regarding copyright ownership. The ASF licenses this file
>>> +to you under the Apache License, Version 2.0 (the
>>> +"License"); you may not use this file except in compliance
>>> +with the License. You may obtain a copy of the License at
>>> +
>>> +http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +Unless required by applicable law or agreed to in writing,
>>> +software distributed under the License is distributed on an
>>> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> +KIND, either express or implied. See the License for the
>>> +specific language governing permissions and limitations
>>> +under the License.
>>> +***********************************************/
>>> +body {background:transparent url(/images/ofbiz_logo.gif) no-repeat scroll left top;
>>> + color: #000;
>>> + font-family: Verdana, Arial, Helvetica, sans-serif;
>>> + font-size:.75em;
>>> + line-height:1.5em;padding:50px 0 0;
>>> +}
>>> +
>>> +a:hover {
>>> + color:#111111;
>>> + text-decoration:underline;
>>> +}
>>> +a:visited {
>>> + color:#000;
>>> + text-decoration:underline;
>>> +}
>>> +a {
>>> + color:#555;
>>> + text-decoration:underline;
>>> +}
>>>
>>> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
>>> ------------------------------------------------------------------------------
>>> svn:keywords = "Date Rev Author URL Id"
>>>
>>> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/css
>>>
>>> Added: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css?rev=818780&view=auto
>>> ==============================================================================
>>> --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css (added)
>>> +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css Fri Sep 25 09:16:26 2009
>>> @@ -0,0 +1,35 @@
>>> +/***********************************************
>>> +APACHE OPEN FOR BUSINESS
>>> +Licensed to the Apache Software Foundation (ASF) under one
>>> +or more contributor license agreements. See the NOTICE file
>>> +distributed with this work for additional information
>>> +regarding copyright ownership. The ASF licenses this file
>>> +to you under the Apache License, Version 2.0 (the
>>> +"License"); you may not use this file except in compliance
>>> +with the License. You may obtain a copy of the License at
>>> +
>>> +http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +Unless required by applicable law or agreed to in writing,
>>> +software distributed under the License is distributed on an
>>> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> +KIND, either express or implied. See the License for the
>>> +specific language governing permissions and limitations
>>> +under the License.
>>> +***********************************************/
>>> +body {
>>> + background:none;
>>> +}
>>> +
>>> +.left-border {
>>> + float:left;width:25%;
>>> +}
>>> +
>>> +.contentarea {
>>> + margin: 0 0 0 0.5em;
>>> + padding:0 0 0 0.5em;
>>> +}
>>> +.leftonly {
>>> + float:none;
>>> + min-height:25em;
>>> +}
>>>
>>> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/css
>>>
>>> Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=818780&r1=818779&r2=818780&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
>>> +++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri Sep 25 09:16:26 2009
>>> @@ -22,6 +22,8 @@
>>> <VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Old OFBiz Standard Floating Layout"/>
>>> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
>>> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/flatgrey/help.css" sequenceId="01"/>
>>> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/flatgrey/webapp/flatgrey/docbook.css" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
>>> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
>>>
>>> Added: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css?rev=818780&view=auto
>>> ==============================================================================
>>> --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (added)
>>> +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css Fri Sep 25 09:16:26 2009
>>> @@ -0,0 +1,41 @@
>>> +/***********************************************
>>> +APACHE OPEN FOR BUSINESS
>>> +Licensed to the Apache Software Foundation (ASF) under one
>>> +or more contributor license agreements. See the NOTICE file
>>> +distributed with this work for additional information
>>> +regarding copyright ownership. The ASF licenses this file
>>> +to you under the Apache License, Version 2.0 (the
>>> +"License"); you may not use this file except in compliance
>>> +with the License. You may obtain a copy of the License at
>>> +
>>> +http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +Unless required by applicable law or agreed to in writing,
>>> +software distributed under the License is distributed on an
>>> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> +KIND, either express or implied. See the License for the
>>> +specific language governing permissions and limitations
>>> +under the License.
>>> +***********************************************/
>>> +h1, h2, h3, h4, h5, h6 {
>>> +color:#000099;
>>> +}
>>> +
>>> +body {background:transparent url(/images/ofbiz_logo.gif) no-repeat scroll left top;
>>> + color: #000;
>>> + font-family:verdana,arial,sans-serif;
>>> + padding:50px 0 0;
>>> +}
>>> +
>>> +a:hover, a:active {
>>> + text-decoration:underline;
>>> +}
>>> +a:visited {
>>> + color:purple;
>>> + font-weight:bold;
>>> +}
>>> +a {
>>> + color:#000099;
>>> + text-decoration:none;
>>> + font-weight:bold;
>>> +}
>>>
>>> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/css
>>>
>>> Added: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css?rev=818780&view=auto
>>> ==============================================================================
>>> --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css (added)
>>> +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css Fri Sep 25 09:16:26 2009
>>> @@ -0,0 +1,19 @@
>>> +/***********************************************
>>> +APACHE OPEN FOR BUSINESS
>>> +Licensed to the Apache Software Foundation (ASF) under one
>>> +or more contributor license agreements. See the NOTICE file
>>> +distributed with this work for additional information
>>> +regarding copyright ownership. The ASF licenses this file
>>> +to you under the Apache License, Version 2.0 (the
>>> +"License"); you may not use this file except in compliance
>>> +with the License. You may obtain a copy of the License at
>>> +
>>> +http://www.apache.org/licenses/LICENSE-2.0
>>> +
>>> +Unless required by applicable law or agreed to in writing,
>>> +software distributed under the License is distributed on an
>>> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> +KIND, either express or implied. See the License for the
>>> +specific language governing permissions and limitations
>>> +under the License.
>>> +***********************************************/
>>>
>>> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
>>> ------------------------------------------------------------------------------
>>> svn:eol-style = native
>>>
>>> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
>>> ------------------------------------------------------------------------------
>>> svn:keywords = Date Rev Author URL Id
>>>
>>> Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
>>> ------------------------------------------------------------------------------
>>> svn:mime-type = text/css
>>>
>>>
>>>
>>>
Re: svn commit: r818780 - in /ofbiz/trunk:
applications/commonext/widget/
applications/content/src/org/ofbiz/content/data/
applications/content/template/docbook/html/
framework/base/src/org/ofbiz/base/util/ framework/common/data/
framework/common/webcommon...
Posted by Hans Bakker <ma...@antwebsystems.com>.
Hi Ashish,
the amount of work you put into this, i am surprised....
but of course as soon as possible! thank you for the comments
Hans
On Fri, 2009-09-25 at 15:17 +0530, Ashish Vijaywargiya wrote:
> Hans,
>
> Here are few issues in your code. Please fix it and commit the code ASAP.
> Thanks!
>
> 1) Instead of 5 space you should provide 4 space. See the first and
> second line after else if() statement.
>
> } else if ("XSLT".equals(dataTemplateTypeId)) {
> + File sourceFileLocation = null;
> + File targetFileLocation = new File(System.getProperty("ofbiz.home")+"/runtime/tempfiles/docbook.css");
> + if (templateContext.get("visualThemeId") != null){
> + Map layoutSettings = (Map) templateContext.get("layoutSettings");
> + List<String> docbookStyleSheets = (List) layoutSettings.get("VT_DOCBOOKSTYLESHEET");
> + String docbookStyleLocation = docbookStyleSheets.get(0);
> + sourceFileLocation = new File(System.getProperty("ofbiz.home")+"/themes"+docbookStyleLocation);
> + }
>
>
> 2) 8 space should be changed to 4 space.
>
> + if(sourceFileLocation.exists()){
> + UtilMisc.copyFile(sourceFileLocation,targetFileLocation);
> + }
>
>
> 3) Tab present in this line:
>
> + InputStream in = new FileInputStream(sourceLocation);
>
> 4)8 space should be changed to 4 space.
> + if (sourceLocation.isDirectory()) {
> + throw new IOException("File is a directory, not a file, cannot copy") ;
> + } else {
>
>
> 5) To increase readability of code, following code should be spaced by 4
> space instead of 8 inside else if() block.
>
> String templateLocation =
> DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"),
> dataResource.getString("objectInfo"), (String)
> templateContext.get("contextRoot")).toString();
> // render the XSLT template and file
> String outDoc = null;
> try {
> outDoc =
> XslTransform.renderTemplate(templateLocation, (String)
> templateContext.get("docFile"));
> } catch (TransformerException c) {
> Debug.logError("XSL TransformerException: " +
> c.getMessage(), module);
> }
> out.append(outDoc);
>
> --
> Regards
> Ashish Vijaywargiya
> HotWax Media Pvt. Ltd.
> http://www.hotwaxmedia.com
>
> Helping hand around the World ...
> USA | Italy | India | New Zealand
>
>
> hansbak@apache.org wrote:
> > Author: hansbak
> > Date: Fri Sep 25 09:16:26 2009
> > New Revision: 818780
> >
> > URL: http://svn.apache.org/viewvc?rev=818780&view=rev
> > Log:
> > docbook files now converted to html using a first (simple) visual scheme dependent css stylesheet. This css is now also used for the display of the help files
> >
> > Added:
> > ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css (with props)
> > ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css (with props)
> > ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (with props)
> > ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css (with props)
> > Modified:
> > ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
> > ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
> > ofbiz/trunk/applications/content/template/docbook/html/param.xsl
> > ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
> > ofbiz/trunk/framework/common/data/CommonTypeData.xml
> > ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
> > ofbiz/trunk/runtime/tempfiles/ (props changed)
> > ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
> > ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
> >
> > Modified: ofbiz/trunk/applications/commonext/widget/HelpScreens.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/HelpScreens.xml?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/applications/commonext/widget/HelpScreens.xml (original)
> > +++ ofbiz/trunk/applications/commonext/widget/HelpScreens.xml Fri Sep 25 09:16:26 2009
> > @@ -31,7 +31,7 @@
> > <field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
> > </service>
> > <set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
> > -
> > + <set field="lookupType" value="HELP"/>
> > <property-map resource="general" map-name="generalProperties" global="true"/>
> > <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="BIZZNESS_TIME"/>
> > <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
> >
> > Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
> > +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Fri Sep 25 09:16:26 2009
> > @@ -686,6 +686,17 @@
> > }
> >
> > } else if ("XSLT".equals(dataTemplateTypeId)) {
> > + File sourceFileLocation = null;
> > + File targetFileLocation = new File(System.getProperty("ofbiz.home")+"/runtime/tempfiles/docbook.css");
> > + if (templateContext.get("visualThemeId") != null){
> > + Map layoutSettings = (Map) templateContext.get("layoutSettings");
> > + List<String> docbookStyleSheets = (List) layoutSettings.get("VT_DOCBOOKSTYLESHEET");
> > + String docbookStyleLocation = docbookStyleSheets.get(0);
> > + sourceFileLocation = new File(System.getProperty("ofbiz.home")+"/themes"+docbookStyleLocation);
> > + }
> > + if(sourceFileLocation.exists()){
> > + UtilMisc.copyFile(sourceFileLocation,targetFileLocation);
> > + }
> > // get the template data for rendering
> > String templateLocation = DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).toString();
> > // render the XSLT template and file
> >
> > Modified: ofbiz/trunk/applications/content/template/docbook/html/param.xsl
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/docbook/html/param.xsl?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/applications/content/template/docbook/html/param.xsl (original)
> > +++ ofbiz/trunk/applications/content/template/docbook/html/param.xsl Fri Sep 25 09:16:26 2009
> > @@ -208,7 +208,7 @@
> > <xsl:param name="html.head.legalnotice.link.multiple" select="1"/>
> > <xsl:param name="html.longdesc" select="1"/>
> > <xsl:param name="html.longdesc.link" select="$html.longdesc"/>
> > -<xsl:param name="html.stylesheet"/>
> > +<xsl:param name="html.stylesheet">/tempfiles/docbook.css</xsl:param>
> > <xsl:param name="html.stylesheet.type">text/css</xsl:param>
> > <xsl:param name="htmlhelp.alias.file">alias.h</xsl:param>
> > <xsl:param name="htmlhelp.autolabel" select="0"/>
> >
> > Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
> > +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java Fri Sep 25 09:16:26 2009
> > @@ -18,6 +18,12 @@
> > *******************************************************************************/
> > package org.ofbiz.base.util;
> >
> > +import java.io.File;
> > +import java.io.FileInputStream;
> > +import java.io.FileOutputStream;
> > +import java.io.IOException;
> > +import java.io.InputStream;
> > +import java.io.OutputStream;
> > import java.io.Serializable;
> > import java.math.BigDecimal;
> > import java.util.Collection;
> > @@ -1008,4 +1014,23 @@
> > this.wait(timeout);
> > }
> > }
> > + public static void copyFile(File sourceLocation , File targetLocation) throws IOException {
> > +
> > + if (sourceLocation.isDirectory()) {
> > + throw new IOException("File is a directory, not a file, cannot copy") ;
> > + } else {
> > +
> > + InputStream in = new FileInputStream(sourceLocation);
> > + OutputStream out = new FileOutputStream(targetLocation);
> > +
> > + // Copy the bits from instream to outstream
> > + byte[] buf = new byte[1024];
> > + int len;
> > + while ((len = in.read(buf)) > 0) {
> > + out.write(buf, 0, len);
> > + }
> > + in.close();
> > + out.close();
> > + }
> > + }
> > }
> >
> > Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
> > +++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Fri Sep 25 09:16:26 2009
> > @@ -107,6 +107,8 @@
> > <EnumerationType description="Visual Theme Resource Type (stylesheet, javascript file, etc)" enumTypeId="VT_RES_TYPE" hasTable="N"/>
> > <Enumeration enumId="VT_NAME" description="Visual Theme name" enumTypeId="VT_RES_TYPE" sequenceId="00"/>
> > <Enumeration enumId="VT_STYLESHEET" description="Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="01"/>
> > + <Enumeration enumId="VT_HELPSTYLESHEET" description="Help Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
> > + <Enumeration enumId="VT_DOCBOOKSTYLESHEET" description="Docbook Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
> > <Enumeration enumId="VT_RTL_STYLESHEET" description="Right-to-Left (RTL) Style Sheet URL" enumTypeId="VT_RES_TYPE" sequenceId="02"/>
> > <Enumeration enumId="VT_SHORTCUT_ICON" description="Shortcut Icon URL" enumTypeId="VT_RES_TYPE" sequenceId="03"/>
> > <Enumeration enumId="VT_EXTRA_HEAD" description="Additional <tt><head></tt> Element Markup" enumTypeId="VT_RES_TYPE" sequenceId="04"/>
> >
> > Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
> > +++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Fri Sep 25 09:16:26 2009
> > @@ -52,6 +52,11 @@
> > <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
> > </#list>
> > </#if>
> > + <#if layoutSettings.VT_HELPSTYLESHEET?has_content && lookupType?has_content>
> > + <#list layoutSettings.VT_HELPSTYLESHEET as styleSheet>
> > + <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
> > + </#list>
> > + </#if>
> > <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
> > <#list layoutSettings.rtlStyleSheets as styleSheet>
> > <link rel="stylesheet" href="<@o...@ofbizContentUrl>" type="text/css"/>
> >
> > Propchange: ofbiz/trunk/runtime/tempfiles/
> > ------------------------------------------------------------------------------
> > --- svn:ignore (original)
> > +++ svn:ignore Fri Sep 25 09:16:26 2009
> > @@ -1 +1,2 @@
> > captcha
> > +docbook.css
> >
> > Modified: ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml (original)
> > +++ ofbiz/trunk/themes/bizznesstime/data/BizznessTimeThemeData.xml Fri Sep 25 09:16:26 2009
> > @@ -22,6 +22,8 @@
> > <VisualTheme visualThemeId="BIZZNESS_TIME" visualThemeSetId="BACKOFFICE" description="It's bizzness, it's bizzness time. I couldn't have said it better myself. This theme gets down"/>
> > <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAME" resourceValue="BIZZNESS_TIME" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bizznesstime/css/style.css" sequenceId="01"/>
> > + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/bizznesstime/css/help.css" sequenceId="01"/>
> > + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/bizznesstime/webapp/bizznesstime/css/docbook.css" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> >
> > Added: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css?rev=818780&view=auto
> > ==============================================================================
> > --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css (added)
> > +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css Fri Sep 25 09:16:26 2009
> > @@ -0,0 +1,38 @@
> > +/***********************************************
> > +APACHE OPEN FOR BUSINESS
> > +Licensed to the Apache Software Foundation (ASF) under one
> > +or more contributor license agreements. See the NOTICE file
> > +distributed with this work for additional information
> > +regarding copyright ownership. The ASF licenses this file
> > +to you under the Apache License, Version 2.0 (the
> > +"License"); you may not use this file except in compliance
> > +with the License. You may obtain a copy of the License at
> > +
> > +http://www.apache.org/licenses/LICENSE-2.0
> > +
> > +Unless required by applicable law or agreed to in writing,
> > +software distributed under the License is distributed on an
> > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +KIND, either express or implied. See the License for the
> > +specific language governing permissions and limitations
> > +under the License.
> > +***********************************************/
> > +body {background:transparent url(/images/ofbiz_logo.gif) no-repeat scroll left top;
> > + color: #000;
> > + font-family: Verdana, Arial, Helvetica, sans-serif;
> > + font-size:.75em;
> > + line-height:1.5em;padding:50px 0 0;
> > +}
> > +
> > +a:hover {
> > + color:#111111;
> > + text-decoration:underline;
> > +}
> > +a:visited {
> > + color:#000;
> > + text-decoration:underline;
> > +}
> > +a {
> > + color:#555;
> > + text-decoration:underline;
> > +}
> >
> > Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
> > ------------------------------------------------------------------------------
> > svn:keywords = "Date Rev Author URL Id"
> >
> > Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/docbook.css
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/css
> >
> > Added: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css?rev=818780&view=auto
> > ==============================================================================
> > --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css (added)
> > +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css Fri Sep 25 09:16:26 2009
> > @@ -0,0 +1,35 @@
> > +/***********************************************
> > +APACHE OPEN FOR BUSINESS
> > +Licensed to the Apache Software Foundation (ASF) under one
> > +or more contributor license agreements. See the NOTICE file
> > +distributed with this work for additional information
> > +regarding copyright ownership. The ASF licenses this file
> > +to you under the Apache License, Version 2.0 (the
> > +"License"); you may not use this file except in compliance
> > +with the License. You may obtain a copy of the License at
> > +
> > +http://www.apache.org/licenses/LICENSE-2.0
> > +
> > +Unless required by applicable law or agreed to in writing,
> > +software distributed under the License is distributed on an
> > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +KIND, either express or implied. See the License for the
> > +specific language governing permissions and limitations
> > +under the License.
> > +***********************************************/
> > +body {
> > + background:none;
> > +}
> > +
> > +.left-border {
> > + float:left;width:25%;
> > +}
> > +
> > +.contentarea {
> > + margin: 0 0 0 0.5em;
> > + padding:0 0 0 0.5em;
> > +}
> > +.leftonly {
> > + float:none;
> > + min-height:25em;
> > +}
> >
> > Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> > ------------------------------------------------------------------------------
> > svn:keywords = Date Rev Author URL Id
> >
> > Propchange: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/css
> >
> > Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=818780&r1=818779&r2=818780&view=diff
> > ==============================================================================
> > --- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
> > +++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri Sep 25 09:16:26 2009
> > @@ -22,6 +22,8 @@
> > <VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Old OFBiz Standard Floating Layout"/>
> > <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
> > + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/flatgrey/help.css" sequenceId="01"/>
> > + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/flatgrey/webapp/flatgrey/docbook.css" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
> > <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
> >
> > Added: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css?rev=818780&view=auto
> > ==============================================================================
> > --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css (added)
> > +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css Fri Sep 25 09:16:26 2009
> > @@ -0,0 +1,41 @@
> > +/***********************************************
> > +APACHE OPEN FOR BUSINESS
> > +Licensed to the Apache Software Foundation (ASF) under one
> > +or more contributor license agreements. See the NOTICE file
> > +distributed with this work for additional information
> > +regarding copyright ownership. The ASF licenses this file
> > +to you under the Apache License, Version 2.0 (the
> > +"License"); you may not use this file except in compliance
> > +with the License. You may obtain a copy of the License at
> > +
> > +http://www.apache.org/licenses/LICENSE-2.0
> > +
> > +Unless required by applicable law or agreed to in writing,
> > +software distributed under the License is distributed on an
> > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +KIND, either express or implied. See the License for the
> > +specific language governing permissions and limitations
> > +under the License.
> > +***********************************************/
> > +h1, h2, h3, h4, h5, h6 {
> > +color:#000099;
> > +}
> > +
> > +body {background:transparent url(/images/ofbiz_logo.gif) no-repeat scroll left top;
> > + color: #000;
> > + font-family:verdana,arial,sans-serif;
> > + padding:50px 0 0;
> > +}
> > +
> > +a:hover, a:active {
> > + text-decoration:underline;
> > +}
> > +a:visited {
> > + color:purple;
> > + font-weight:bold;
> > +}
> > +a {
> > + color:#000099;
> > + text-decoration:none;
> > + font-weight:bold;
> > +}
> >
> > Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> > ------------------------------------------------------------------------------
> > svn:keywords = Date Rev Author URL Id
> >
> > Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/docbook.css
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/css
> >
> > Added: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css?rev=818780&view=auto
> > ==============================================================================
> > --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css (added)
> > +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css Fri Sep 25 09:16:26 2009
> > @@ -0,0 +1,19 @@
> > +/***********************************************
> > +APACHE OPEN FOR BUSINESS
> > +Licensed to the Apache Software Foundation (ASF) under one
> > +or more contributor license agreements. See the NOTICE file
> > +distributed with this work for additional information
> > +regarding copyright ownership. The ASF licenses this file
> > +to you under the Apache License, Version 2.0 (the
> > +"License"); you may not use this file except in compliance
> > +with the License. You may obtain a copy of the License at
> > +
> > +http://www.apache.org/licenses/LICENSE-2.0
> > +
> > +Unless required by applicable law or agreed to in writing,
> > +software distributed under the License is distributed on an
> > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +KIND, either express or implied. See the License for the
> > +specific language governing permissions and limitations
> > +under the License.
> > +***********************************************/
> >
> > Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> > ------------------------------------------------------------------------------
> > svn:eol-style = native
> >
> > Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> > ------------------------------------------------------------------------------
> > svn:keywords = Date Rev Author URL Id
> >
> > Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/help.css
> > ------------------------------------------------------------------------------
> > svn:mime-type = text/css
> >
> >
> >
--
Antwebsystems.com: Quality OFBiz services for competitive rates