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/07/04 09:33:19 UTC
svn commit: r1142577 - in /ofbiz/trunk: applications/content/data/
applications/content/script/org/ofbiz/content/content/
applications/content/servicedef/ specialpurpose/ecommerce/data/
specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/ specialpurpose/...
Author: hansbak
Date: Mon Jul 4 07:33:18 2011
New Revision: 1142577
URL: http://svn.apache.org/viewvc?rev=1142577&view=rev
Log:
use and demonstrate the seo friendly urls in the content/ecommerce blog function, add seca to update new created content
Added:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl (with props)
Removed:
ofbiz/trunk/applications/content/data/ContentScheduleServiceData.xml
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/content/servicedef/secas.xml
ofbiz/trunk/applications/content/servicedef/services.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoContentAltUrl.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Mon Jul 4 07:33:18 2011
@@ -1277,76 +1277,40 @@
</call-class-method>
</simple-method>
- <simple-method method-name="convertContentAltUrls" short-description="Convert Content Alternative URLs.">
- <if-compare operator="equals" value="Y" field="parameters.allowConvert">
- <entity-condition list="contents" entity-name="Content">
- <condition-expr field-name="contentName" operator="not-equals" from-field="nullField"/>
- <select-field field-name="contentId"/>
- <select-field field-name="contentName"/>
- </entity-condition>
- <iterate entry="content" list="contents">
- <set field="updateObjectInfo"/>
- <entity-condition list="contentAssocDataResources" entity-name="ContentAssocDataResourceViewTo">
- <condition-list combine="and">
- <condition-expr field-name="caContentAssocTypeId" operator="equals" value="ALTERNATIVE_URL"/>
- <condition-expr field-name="contentIdStart" operator="equals" from-field="content.contentId"/>
- </condition-list>
- <select-field field-name="contentIdStart"/>
- <select-field field-name="dataResourceId"/>
- <select-field field-name="caFromDate"/>
- <select-field field-name="caThruDate"/>
- </entity-condition>
- <filter-list-by-date list="contentAssocDataResources" from-field-name="caFromDate" thru-field-name="caThruDate"/>
- <if-not-empty field="contentAssocDataResources">
- <first-from-list entry="contentAssocDataResource" list="contentAssocDataResources"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
- <field-map field-name="dataResourceId" from-field="contentAssocDataResource.dataResourceId"/>
- </entity-one>
- <if-compare-field operator="not-equals" field="electronicText.textData" to-field="content.contentName" type="String">
- <call-class-method method-name="invalidCharacter" class-name="org.ofbiz.common.UrlServletHelper" ret-field="altUrl">
- <field field="content.contentName"/>
- </call-class-method>
- <set field="altUrl" value="/${altUrl}-${contentAssocDataResources.contentIdStart}-content"/>
- <set field="updateDataResourceCtx.dataResourceId" from-field="contentAssocDataResource.dataResourceId"/>
- <set field="updateDataResourceCtx.objectInfo" from-field="altUrl"/>
- <call-service service-name="updateDataResource" in-map-name="updateDataResourceCtx" include-user-login="true"/>
-
- <set field="electronicTextCtx.dataResourceId" from-field="contentAssocDataResource.dataResourceId"/>
- <set field="electronicTextCtx.textData" from-field="content.contentName"/>
- <call-service service-name="updateElectronicText" in-map-name="electronicTextCtx"></call-service>
-
- </if-compare-field>
- <else>
- <call-class-method method-name="invalidCharacter" class-name="org.ofbiz.common.UrlServletHelper" ret-field="altUrl">
- <field field="content.contentName"/>
- </call-class-method>
- <set field="altUrl" value="/${altUrl}-${content.contentId}-content"/>
- <sequenced-id sequence-name="DataResource" field="createDataResourceCtx.dataResourceId"/>
- <set field="createDataResourceCtx.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
- <set field="createDataResourceCtx.dataTemplateTypeId" value="FTL"/>
- <set field="createDataResourceCtx.objectInfo" from-field="altUrl"/>
- <set field="createDataResourceCtx.statusId" value="CTNT_IN_PROGRESS"/>
- <call-service service-name="createDataResource" in-map-name="createDataResourceCtx" include-user-login="true">
- <result-to-field result-name="dataResourceId" field="dataResourceId"/>
- </call-service>
- <set field="electronicTextCtx.dataResourceId" from-field="dataResourceId"/>
- <set field="electronicTextCtx.textData" from-field="content.contentName"/>
- <call-service service-name="createElectronicText" in-map-name="electronicTextCtx"></call-service>
-
- <sequenced-id sequence-name="Content" field="contentCtx.contentId"/>
- <set field="contentCtx.contentTypeId" value="DOCUMENT"/>
- <set field="contentCtx.dataResourceId" from-field="dataResourceId"/>
- <call-service service-name="createContent" in-map-name="contentCtx" include-user-login="true">
- <result-to-field result-name="contentId" field="contentIdTo"/>
- </call-service>
-
- <set field="createContentAssocCtx.contentId" from-field="content.contentId"/>
- <set field="createContentAssocCtx.contentIdTo" from-field="contentIdTo"/>
- <set field="createContentAssocCtx.contentAssocTypeId" value="ALTERNATIVE_URL"/>
- <call-service service-name="createContentAssoc" in-map-name="createContentAssocCtx"/>
- </else>
- </if-not-empty>
- </iterate>
- </if-compare>
+ <simple-method method-name="createContentAlternativeUrl" short-description="Create Content Alternative URLs.">
+ <set field="contentId" from-field="parameters.contentId"/>
+ <entity-one value-field="content" entity-name="Content">
+ <field-map field-name="contentId" from-field="contentId"/>
+ </entity-one>
+ <if-not-empty field="content.contentName">
+ <call-class-method method-name="invalidCharacter" class-name="org.ofbiz.common.UrlServletHelper" ret-field="altUrl">
+ <field field="content.contentName"/>
+ </call-class-method>
+ <set field="altUrl" value="/${altUrl}-${content.contentId}-content"/>
+ <sequenced-id sequence-name="DataResource" field="createDataResourceCtx.dataResourceId"/>
+ <set field="createDataResourceCtx.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
+ <set field="createDataResourceCtx.dataTemplateTypeId" value="FTL"/>
+ <set field="createDataResourceCtx.objectInfo" from-field="altUrl"/>
+ <set field="createDataResourceCtx.statusId" value="CTNT_IN_PROGRESS"/>
+ <call-service service-name="createDataResource" in-map-name="createDataResourceCtx" include-user-login="true">
+ <result-to-field result-name="dataResourceId" field="dataResourceId"/>
+ </call-service>
+ <set field="electronicTextCtx.dataResourceId" from-field="dataResourceId"/>
+ <set field="electronicTextCtx.textData" from-field="content.contentName"/>
+ <call-service service-name="createElectronicText" in-map-name="electronicTextCtx"></call-service>
+
+ <sequenced-id sequence-name="Content" field="contentCtx.contentId"/>
+ <set field="contentCtx.contentTypeId" value="DOCUMENT"/>
+ <set field="contentCtx.dataResourceId" from-field="dataResourceId"/>
+ <call-service service-name="createContent" in-map-name="contentCtx" include-user-login="true">
+ <result-to-field result-name="contentId" field="contentIdTo"/>
+ </call-service>
+
+ <set field="createContentAssocCtx.contentId" from-field="content.contentId"/>
+ <set field="createContentAssocCtx.contentIdTo" from-field="contentIdTo"/>
+ <set field="createContentAssocCtx.contentAssocTypeId" value="ALTERNATIVE_URL"/>
+ <call-service service-name="createContentAssoc" in-map-name="createContentAssocCtx"/>
+ </if-not-empty>
</simple-method>
+
</simple-methods>
Modified: ofbiz/trunk/applications/content/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/secas.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/secas.xml Mon Jul 4 07:33:18 2011
@@ -178,5 +178,9 @@ under the License.
<eca service="updateContentAssoc" event="in-validate">
<action service="checkContentAssocIds" mode="sync"/>
</eca>
+
+ <eca service="createContent" event="return">
+ <action service="createContentAlternativeUrl" mode="sync" run-as-user="system"/>
+ </eca>
</service-eca>
Modified: ofbiz/trunk/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services.xml Mon Jul 4 07:33:18 2011
@@ -1197,11 +1197,10 @@
<permission-service service-name="genericContentPermission" main-action="CREATE"/>
<attribute name="contentId" type="String" mode="IN" optional="false"/>
</service>
-
- <!-- Convert Content Alternative Urls -->
- <service name="convertContentAltUrls" engine="simple"
- location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="convertContentAltUrls" auth="true">
- <description>Convert Content Alternative URL</description>
- <attribute name="allowConvert" mode="IN" type="String" optional="false"></attribute>
+
+ <service name="createContentAlternativeUrl" engine="simple"
+ location="component://content/script/org/ofbiz/content/content/ContentServices.xml" invoke="createContentAlternativeUrl" auth="true">
+ <description>Create Content Alternative URL</description>
+ <attribute name="contentId" mode="IN" type="String" optional="false"></attribute>
</service>
</services>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoContentAltUrl.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoContentAltUrl.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoContentAltUrl.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoContentAltUrl.xml Mon Jul 4 07:33:18 2011
@@ -21,29 +21,19 @@ under the License.
<!-- Demo Content Alternative Url -->
<!-- The content alternative url come from the contentName in the Content entity.-->
- <!-- Can use convertContentAltUrls service job to create all content alternative url if the contentName is exist. -->
- <DataResource dataResourceId="DRS_ALT_URL" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/Store-Policies-2-STORE_POLICIES2-content"/>
- <ElectronicText dataResourceId="DRS_ALT_URL" textData="Store Policies 2"/>
- <Content contentId="CNT_ALTURL_ASSOC" contentTypeId="DOCUMENT" dataResourceId="DRS_ALT_URL" statusId="CTNT_IN_PROGRESS"/>
- <ContentAssoc contentId="STORE_POLICIES2" contentIdTo="CNT_ALTURL_ASSOC" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
+ <DataResource dataResourceId="DRS_CNT_URL005" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/Cute-Kid-BLG10000-content"/>
+ <ElectronicText dataResourceId="DRS_CNT_URL005" textData="Cute Kid"/>
+ <Content contentId="CNT_ALTURL_005" contentTypeId="DOCUMENT" dataResourceId="DRS_CNT_URL005" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="BLG10000" contentIdTo="CNT_ALTURL_005" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
- <DataResource dataResourceId="DRS_CNT_URL001" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/Store-Policies-STORE_POLICIES-content"/>
- <ElectronicText dataResourceId="DRS_CNT_URL001" textData="Store Policies"/>
- <Content contentId="CNT_ALTURL_001" contentTypeId="DOCUMENT" dataResourceId="DRS_CNT_URL001" statusId="CTNT_IN_PROGRESS"/>
- <ContentAssoc contentId="STORE_POLICIES" contentIdTo="CNT_ALTURL_001" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
+ <DataResource dataResourceId="DRS_CNT_URL006" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/Next-Linus-BLG10010-content"/>
+ <ElectronicText dataResourceId="DRS_CNT_URL006" textData="Next Linus"/>
+ <Content contentId="CNT_ALTURL_006" contentTypeId="DOCUMENT" dataResourceId="DRS_CNT_URL006" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="BLG10010" contentIdTo="CNT_ALTURL_006" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
- <DataResource dataResourceId="DRS_CNT_URL002" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/Policies-POLICY-content"/>
- <ElectronicText dataResourceId="DRS_CNT_URL002" textData="Policies"/>
- <Content contentId="CNT_ALTURL_002" contentTypeId="DOCUMENT" dataResourceId="DRS_CNT_URL002" statusId="CTNT_IN_PROGRESS"/>
- <ContentAssoc contentId="POLICY" contentIdTo="CNT_ALTURL_002" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
+ <DataResource dataResourceId="DRS_CNT_URL007" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/2008-Elections-BLG10007-content"/>
+ <ElectronicText dataResourceId="DRS_CNT_URL007" textData="2008 Elections"/>
+ <Content contentId="CNT_ALTURL_007" contentTypeId="DOCUMENT" dataResourceId="DRS_CNT_URL007" statusId="CTNT_IN_PROGRESS"/>
+ <ContentAssoc contentId="BLG10007" contentIdTo="CNT_ALTURL_007" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
- <DataResource dataResourceId="DRS_CNT_URL003" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/Widgets-CNTWIDGETS-content"/>
- <ElectronicText dataResourceId="DRS_CNT_URL003" textData="Widgets"/>
- <Content contentId="CNT_ALTURL_003" contentTypeId="DOCUMENT" dataResourceId="DRS_CNT_URL003" statusId="CTNT_IN_PROGRESS"/>
- <ContentAssoc contentId="CNTWIDGETS" contentIdTo="CNT_ALTURL_003" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
-
- <DataResource dataResourceId="DRS_CNT_URL004" dataResourceTypeId="ELECTRONIC_TEXT" statusId="CTNT_IN_PROGRESS" objectInfo="/Gizmos-CNTGIZMOS-content"/>
- <ElectronicText dataResourceId="DRS_CNT_URL004" textData="Gizmos"/>
- <Content contentId="CNT_ALTURL_004" contentTypeId="DOCUMENT" dataResourceId="DRS_CNT_URL004" statusId="CTNT_IN_PROGRESS"/>
- <ContentAssoc contentId="CNTGIZMOS" contentIdTo="CNT_ALTURL_004" contentAssocTypeId="ALTERNATIVE_URL" fromDate="2011-06-23 01:01:01"></ContentAssoc>
</entity-engine-xml>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Jul 4 07:33:18 2011
@@ -1976,15 +1976,6 @@ under the License.
<response name="error" type="view" value="error"/>
</request-map>
- <!-- Content Information -->
- <request-map uri="contentInfoCategory">
- <security https="false" auth="false"/>
- <response name="success" type="view" value="contentInfoCategory"/>
- </request-map>
- <request-map uri="contentViewInfo">
- <security https="false" auth="false"/>
- <response name="success" type="view" value="contentViewInfo"/>
- </request-map>
<!-- End of Request Mappings -->
<!-- View Mappings -->
@@ -2140,8 +2131,6 @@ under the License.
<!-- Product Category 's Ajax -->
<view-map name="productCategoryList" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#productCategoryList"/>
-
- <!-- Content Information -->
- <view-map name="contentViewInfo" type="screen" page="component://ecommerce/widget/ContentScreens.xml#contentViewInfo"/>
+
<!-- End of View Mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Mon Jul 4 07:33:18 2011
@@ -70,11 +70,11 @@ under the License.
<display-name>ContentUrlFilter</display-name>
<filter-class>org.ofbiz.content.content.ContentUrlFilter</filter-class>
<init-param>
- <param-name>defaultLocaleString</param-name>
- <param-value>en_US</param-value>
+ <param-name>defaultLocaleString</param-name>
+ <param-value>en_US</param-value>
</init-param>
<init-param><param-name>redirectUrl</param-name><param-value>/control/main</param-value></init-param>
- <init-param><param-name>viewRequest</param-name><param-value>contentViewInfo</param-value></init-param>
+ <init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param>
</filter>
<filter>
<filter-name>ContextFilter</filter-name>
Added: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl?rev=1142577&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl (added)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl Mon Jul 4 07:33:18 2011
@@ -0,0 +1,21 @@
+<#--
+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.
+-->
+
+<a href="<@OfbizContentAltUrl contentId=blog.contentId viewContent='ViewBlogArticle'/>" >${blog.contentName} [${blog.contentId}]</a>
+
Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Jul 4 07:33:18 2011
@@ -112,7 +112,6 @@ under the License.
<include-screen name="forums" location="component://ecommerce/widget/ForumScreens.xml"/>
<include-screen name="content_categories" location="component://ecommerce/widget/ContentScreens.xml"/>
<include-screen name="blogs" location="component://ecommerce/widget/blog/BlogScreens.xml"/>
- <include-screen name="contentInfoCategory" location="component://ecommerce/widget/ContentScreens.xml"/>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml Mon Jul 4 07:33:18 2011
@@ -40,13 +40,5 @@ under the License.
<field name="dataResourceId"><display/></field>
<field name="contentName"><display/></field>
</form>
- <form name="contentInfomation" target="" title="" type="single"
- header-row-style="header-row" default-table-style="basic-table">
- <field name="contentName"><display description="${content.contentName}"/></field>
- <field name="description"><display description="${content.description}"/></field>
- <field name="createdByUserLogin" title="${uiLabelMap.EcommerceOwner}"><display description="${content.createdByUserLogin}"/></field>
- <field name="localeString" title="${uiLabelMap.CommonLanguageTitle}"><display description="${content.localeString}"/></field>
- <field name="createdDate" title="${uiLabelMap.EcommerceModifyDate}"><display description="${content.createdDate}"/></field>
- </form>
</forms>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ContentScreens.xml Mon Jul 4 07:33:18 2011
@@ -158,35 +158,4 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="contentInfoCategory">
- <section>
- <widgets>
- <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/content/content_topic.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </screen>
- <screen name="contentViewInfo">
- <section>
- <actions>
- <set field="leftbarScreenName" value="leftbar"/>
- <set field="rightbarScreenName" value="rightbar"/>
- <set field="MainColumnStyle" value="center"/>
- <set field="titleProperty" value="PageTitleViewContent"/>
- <set field="headerItem" value="Content Info"/>
- <entity-one entity-name="Content" value-field="content">
- <field-map field-name="contentId" from-field="parameters.contentId"/>
- </entity-one>
- <set field="contentDataResource" from-field="contentDataResources[0]"></set>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet title="${uiLabelMap.EcommerceContentInformation}: ${content.contentId}">
- <include-form name="contentInfomation" location="component://ecommerce/widget/ContentForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml?rev=1142577&r1=1142576&r2=1142577&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml Mon Jul 4 07:33:18 2011
@@ -116,10 +116,11 @@
<widgets>
<container style="blogwrapper">
<include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/>
- <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl"/></html></platform-specific>
+ <!--<link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
<parameter param-name="contentId" from-field="blog.contentId"/>
<parameter param-name="blogContentId"/>
- </link>
+ </link>-->
<!--
<link text="Latest" target="LatestResponses" >
<parameter param-name="ownerContentId" from-field="blog.ownerContentId"/>
@@ -139,10 +140,11 @@
<container style="blogwrapper">
<include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/>
<!--<label text="${blog.contentName} [${blog.contentId}]" style="blogheader"/>-->
- <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/blog/blogContentAltLink.ftl"/></html></platform-specific>
+ <!--<link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader">
<parameter param-name="contentId" from-field="blog.contentId"/>
<parameter param-name="blogContentId"/>
- </link>
+ </link>-->
<!--
<link text="Latest" target="LatestResponses" >
<parameter param-name="ownerContentId" from-field="blog.ownerContentId"/>