Re: svn commit: r742053 - in /ofbiz/trunk: ./ applications/content/widget/ framework/common/webcommon/includes/ framework/common/webcommon/portal/ specialpurpose/webpos/widget/ themes/bluelight/includes/

Wed, 17 Feb 2010 14:28:53 -0800 

Hi David,
In this commit you introduced some lines about groovy in the .project file. Now that I have updated to Eclipse 3.5 and Groovy plugin 2.0, I wonder if we should not better remove these lines. Because I have not the same in my .project and I find that Groovy is working better now (no weird rebuilds anytime). I think we should let eveybody let his/her Grovvy configuration doing that locally. Maybe this will help also Brett who asked about that some days ago. 

Jacques

From: <jone...@apache.org>
To: <comm...@ofbiz.apache.org>
Sent: Sunday, February 08, 2009 12:08 PM

Subject: svn commit: r742053 - in /ofbiz/trunk: ./ applications/content/widget/ framework/common/webcommon/includes/ 
framework/common/webcommon/portal/ specialpurpose/webpos/widget/ themes/bluelight/includes/




Author: jonesde
Date: Sun Feb  8 11:08:32 2009
New Revision: 742053

URL: http://svn.apache.org/viewvc?rev=742053&view=rev
Log:

Resolved some more problems with the general html encoding, most of which are from funny code that should be cleaned up anyway so 
haven't run into any dilemmas so far; still looking though so could happen


Modified:
   ofbiz/trunk/.project
   ofbiz/trunk/applications/content/widget/CommonScreens.xml
   ofbiz/trunk/framework/common/webcommon/includes/header.ftl
   ofbiz/trunk/framework/common/webcommon/includes/simple.ftl
   ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
   ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml
   ofbiz/trunk/themes/bluelight/includes/header.ftl

Modified: ofbiz/trunk/.project
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/.project?rev=742053&r1=742052&r2=742053&view=diff
==============================================================================
--- ofbiz/trunk/.project (original)
+++ ofbiz/trunk/.project Sun Feb  8 11:08:32 2009
@@ -1,23 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-
<projectDescription>
 <name>ofbiz</name>
 <comment></comment>
@@ -29,8 +10,14 @@
 <arguments>
 </arguments>
 </buildCommand>
+ <buildCommand>
+ <name>org.codehaus.groovy.eclipse.groovyBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
 </buildSpec>
 <natures>
 <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.codehaus.groovy.eclipse.groovyNature</nature>
 </natures>
</projectDescription>

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml

URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=742053&r1=742052&r2=742053&view=diff

==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Feb  8 
11:08:32 2009
@@ -19,7 +19,8 @@
-->

<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- 
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
+        
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
+
    <screen name="main-decorator">
        <section>
            <actions>
@@ -27,17 +28,11 @@
                <property-map resource="ContentUiLabels" map-name="uiLabelMap" 
global="true"/>
                <property-map resource="CommonUiLabels" map-name="uiLabelMap" 
global="true"/>
                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" 
global="true"/>
-        <property-map resource="PartyUiLabels" map-name="uiLabelMap" 
global="true"/>
-        <property-map resource="ProductUiLabels" map-name="uiLabelMap" 
global="true"/>
-
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" 
global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" 
global="true"/>
                <set field="layoutSettings.companyName" 
from-field="uiLabelMap.ContentCompanyName" global="true"/>
                <set field="layoutSettings.companySubtitle" 
from-field="uiLabelMap.ContentCompanySubtitle" global="true"/>
-                <!-- layoutSettings.headerImageUrl can be used to specify an 
application specific logo; if not set,
-                     then the global layoutSettings.commonHeaderImageUrl 
(specified in GlobalDecorator) will be used. -->
-                <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.jpg" 
global="true"/>-->

-                <set field="layoutSettings.extraHead" value="&lt;link rel=&quot;stylesheet&quot; 
href=&quot;/content/images/contentForum.css&quot; type=&quot;text/css&quot;/&gt;"/>

-                <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" 
global="true"/> -->
-                <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" 
global="true"/> -->
+                <set field="layoutSettings.styleSheets[]" 
value="/content/images/contentForum.css" global="true"/>
                <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" 
global="true"/>
                <set field="activeApp" value="contentmgr" global="true"/>
                <set field="applicationMenuName" value="ContentAppBar" 
global="true"/>

Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl

URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=742053&r1=742052&r2=742053&view=diff

==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Sun Feb  8 
11:08:32 2009
@@ -76,7 +76,6 @@
            <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" 
type="text/css"/>
        </#list>
    </#if>
-    ${layoutSettings.extraHead?if_exists}
    <#if layoutSettings.VT_EXTRA_HEAD?has_content>
        <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
            ${extraHead}

Modified: ofbiz/trunk/framework/common/webcommon/includes/simple.ftl

URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/simple.ftl?rev=742053&r1=742052&r2=742053&view=diff

==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/simple.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/simple.ftl Sun Feb  8 
11:08:32 2009
@@ -51,7 +51,6 @@
            <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" 
type="text/css"/>
        </#list>
    </#if>
-    ${layoutSettings.extraHead?if_exists}
</head>

<body id="column-container" style="background: white;">

Modified: ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl

URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl?rev=742053&r1=742052&r2=742053&view=diff

==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl Sun Feb  8 
11:08:32 2009
@@ -26,12 +26,11 @@
      <#list portalPagePortlets as portlet>

        <#if (!portlet.columnSeqId?has_content && portalPageColumn_index == 0) || (portlet.columnSeqId?if_exists == 
portalPageColumn.columnSeqId)>

          <#if portlet.screenName?has_content>
-            <#assign screenFileName = portlet.screenLocation + "#" + 
portlet.screenName/>
            <div>
            ${setRequestAttribute("portalPageId", portalPage.portalPageId)}
            ${setRequestAttribute("portalPortletId", portlet.portalPortletId)}
            ${setRequestAttribute("portletSeqId", portlet.portletSeqId)}
-            ${screens.render(screenFileName)}
+            ${screens.render(portlet.screenLocation, portlet.screenName)}
            </div>
          </#if>
          <#assign firstInColumn = false/>

Modified: ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml

URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml?rev=742053&r1=742052&r2=742053&view=diff

==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Sun Feb  8 
11:08:32 2009
@@ -43,7 +43,7 @@
                <set field="layoutSettings.javaScripts[+0]" value="/images/fieldlookup.js" 
global="true"/>
                <set field="layoutSettings.javaScripts[+0]" value="/images/selectall.js" 
global="true"/>
                <set field="layoutSettings.javaScripts[+0]" value="/images/calendar1.js" 
global="true"/>

-                <set field="layoutSettings.javaScripts[+0]" value="/images/prototypejs/prototype.js" global="true"/><set 
field="layoutSettings.extraHead" value="&lt;link rel=&quot;stylesheet&quot; href=&quot;/content/images/contentForum.css&quot; 
type=&quot;text/css&quot;/&gt;" global="true"/>

+                <set field="layoutSettings.javaScripts[+0]" 
value="/images/prototypejs/prototype.js" global="true"/>

                <script 
location="component://webpos/widget/WebPosSetup.groovy"/>

@@ -51,6 +51,7 @@
                <set field="layoutSettings.styleSheets[+0]" 
value="/webpos/images/webpos.css" global="true"/>

                <set field="layoutSettings.styleSheets[+0]" value="${productStore.styleSheet}" 
default-value="/images/ecommain.css" global="true"/>

                <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" 
global="true"/>
+                <set field="layoutSettings.styleSheets[]" 
value="/content/images/contentForum.css" global="true"/>

                <set field="activeApp" value="webpos" global="true"/>
            </actions>

Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=742053&r1=742052&r2=742053&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Sun Feb  8 11:08:32 2009
@@ -76,7 +76,6 @@
            <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" 
type="text/css"/>
        </#list>
    </#if>
-    ${layoutSettings.extraHead?if_exists}
    <#if layoutSettings.VT_EXTRA_HEAD?has_content>
        <#list layoutSettings.VT_EXTRA_HEAD as extraHead>
            ${extraHead}



























					Reply via email to