You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/11/07 04:34:53 UTC
svn commit: r1198615 - in /ofbiz/trunk:
applications/content/servicedef/services_content.xml
applications/content/servicedef/services_data.xml
applications/party/servicedef/services.xml
themes/tomahawk/webapp/tomahawk/css/style.css
Author: hansbak
Date: Mon Nov 7 03:34:52 2011
New Revision: 1198615
URL: http://svn.apache.org/viewvc?rev=1198615&view=rev
Log:
allow html=safe in comments and descriptions
Modified:
ofbiz/trunk/applications/content/servicedef/services_content.xml
ofbiz/trunk/applications/content/servicedef/services_data.xml
ofbiz/trunk/applications/party/servicedef/services.xml
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/applications/content/servicedef/services_content.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_content.xml?rev=1198615&r1=1198614&r2=1198615&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_content.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_content.xml Mon Nov 7 03:34:52 2011
@@ -48,6 +48,8 @@
<attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="sequenceNum" type="Long" mode="IN" optional="true"/>
<override name="contentTypeId" default-value="DOCUMENT"/>
+ <override name="contentName" allow-html="safe"/>
+ <override name="description" allow-html="safe"/>
</service>
<service name="createTextAndUploadedContent" engine="simple" auth="true"
@@ -129,6 +131,8 @@
<attribute mode="IN" name="displayFailCond" optional="true" type="Boolean"/>
<attribute mode="INOUT" name="roleTypeList" optional="true" type="List"/>
<!-- end of depricated fields -->
+ <override name="contentName" allow-html="safe"/>
+ <override name="description" allow-html="safe"/>
</service>
<service name="updateTextContent" engine="group" auth="true">
Modified: ofbiz/trunk/applications/content/servicedef/services_data.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_data.xml?rev=1198615&r1=1198614&r2=1198615&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_data.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_data.xml Mon Nov 7 03:34:52 2011
@@ -38,6 +38,7 @@
<attribute name="dataResource" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/>
<attribute name="uploadedFile" type="java.nio.ByteBuffer" mode="IN" optional="true"/>
<override name="objectInfo" allow-html="safe"/>
+ <override name="dataResourceName" allow-html="safe"/>
</service>
<service name="createDataResourceAndAssocToContent" default-entity-name="DataResource" engine="simple"
location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceAndAssocToContent" auth="true">
@@ -59,6 +60,7 @@
<attribute name="dataResourceId" type="String" mode="OUT" optional="false"/>
<attribute name="dataResource" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/>
<override name="objectInfo" allow-html="safe"/>
+ <override name="dataResourceName" allow-html="safe"/>
</service>
<service name="removeDataResource" engine="simple" default-entity-name="DataResource" auth="true"
location="component://content/script/org/ofbiz/content/data/DataServices.xml" invoke="deleteDataResource">
Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=1198615&r1=1198614&r2=1198615&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Mon Nov 7 03:34:52 2011
@@ -120,6 +120,7 @@ under the License.
<attribute name="externalId" type="String" mode="IN" optional="true"/>
<attribute name="statusId" type="String" mode="IN" optional="true"/>
<override name="groupName" optional="false"/>
+ <override name="comments" allow-html="safe"/>
</service>
<service name="updatePartyGroup" engine="java" default-entity-name="PartyGroup"
location="org.ofbiz.party.party.PartyServices" invoke="updatePartyGroup" auth="true">
@@ -132,6 +133,7 @@ under the License.
<attribute name="preferredCurrencyUomId" type="String" mode="IN" optional="true"/>
<attribute name="externalId" type="String" mode="IN" optional="true"/>
<attribute name="statusId" type="String" mode="IN" optional="true"/>
+ <override name="comments" allow-html="safe"/>
</service>
<service name="savePartyNameChange" engine="simple"
Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1198615&r1=1198614&r2=1198615&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Mon Nov 7 03:34:52 2011
@@ -947,7 +947,6 @@ text-align: center;
/* ==================================== */
#logo-area {
background: url(../images/ofbiz_logo.png) no-repeat;
-width:385px;
height:50px;
}
@@ -957,7 +956,6 @@ height:100%;
}
#org-logo-area {
-width:385px;
height:50px;
}