Author: jacopoc
Date: Sat Sep 16 05:11:19 2006
New Revision: 446860
URL:
http://svn.apache.org/viewvc?view=rev&rev=446860Log:
Ooops... reverted some changes I've committed in my last commit.
Modified:
incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl
incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java
Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?view=diff&rev=446860&r1=446859&r2=446860==============================================================================
--- incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ incubator/ofbiz/trunk/framework/common/webcommon/includes/header.ftl Sat Sep 16 05:11:19 2006
@@ -53,11 +53,10 @@
</#if>
<td align="right" width="1%" nowrap="nowrap" <#if layoutSettings.headerRightBackgroundUrl?has_content>background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
<div class="insideHeaderText">
- <#if userLogin?exists>${uiLabelMap.CommonUsername}: ${userLogin.userLoginId?if_exists} </#if>
<#if person?has_content>
- ${person.firstName?if_exists} ${person.lastName?if_exists}
+ ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists}!
<#elseif partyGroup?has_content>
- ${partyGroup.groupName?if_exists}
+ ${uiLabelMap.CommonWelcome} ${partyGroup.groupName?if_exists}!
<#else>
${uiLabelMap.CommonWelcome}!
</#if>
Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java?view=diff&rev=446860&r1=446859&r2=446860==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopPdfViewHandler.java Sat Sep 16 05:11:19 2006
@@ -87,8 +87,6 @@
*/
// read the XSL-FO XML Document
Document xslfo = null;
-Debug.log("DOCUMENTO");
-Debug.log("" + writer.toString());
try {
xslfo = UtilXml.readXmlDocument(writer.toString());
} catch (Throwable t) {