svn commit: r734960 - in /ofbiz/trunk/applications: content/script/org/ofbiz/content/blog/ content/src/org/ofbiz/content/cms/ content/webapp/content/WEB-INF/ content/widget/content/ content/widget/forum/ ecommerce/webapp/ecommerce/WEB-INF/ ecommerce/we...

[hansbak-2]

Author: hansbak
Date: Fri Jan 16 02:18:04 2009
New Revision: 734960

URL: http://svn.apache.org/viewvc?rev=734960&view=rev
Log:
some more faultfixing and improvements in the blog functions, looks like designed properly but not debugged?

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
    ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    ofbiz/trunk/applications/content/widget/content/ContentForms.xml
    ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
    ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Fri Jan 16 02:18:04 2009
@@ -60,7 +60,8 @@
             </then>
         </if>
 
-        <!--if>
+        <log level="always" message="=========${parameters.uploadedFile}"></log>
+        <if>
             <condition>
                 <not>
                     <if-empty field="parameters.uploadedFile"/>
@@ -70,8 +71,7 @@
                 <set field="createImage.dataResourceTypeId" value="LOCAL_FILE"/>
                 <set field="createImage.dataTemplateTypeId" value="NONE"/>
                 <set field="createImage.mapKey" value="IMAGE"/>
-
-                <set field="createMain.ownerContentId" from-field="ownerContentId"/>
+                <set field="createImage.ownerContentId" from-field="ownerContentId"/>
                 <set field="createImage.contentName" from-field="parameters.contentName"/>
                 <set field="createImage.description" from-field="parameters.description"/>
                 <set field="createImage.statusId" from-field="parameters.statusId"/>
@@ -92,7 +92,7 @@
                     <set field="contentAssocTypeId" value="SUB_CONTENT"/>
                 </if-empty>
             </then>
-        </if-->
+        </if>
 
         <if>
             <condition>
@@ -103,6 +103,7 @@
             <then>
                 <!-- create text data -->
                 <set field="createText.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
+                <set field="createText.contentPurposeTypeId" value="ARTICLE"/>
                 <set field="createText.dataTemplateTypeId" value="NONE"/>
                 <set field="createText.mapKey" value="MAIN"/>
 
@@ -131,8 +132,14 @@
         <!-- we should have a primary (at least) contentId -->
         <if>
             <condition>
-                    <if-empty field="contentId"/>
-            </condition>
+               <and>
+                    <not>
+                        <if-empty field="contentId"/>
+                    </not>
+                    <not>
+                        <if-empty field="parameters.summaryData"/>
+                    </not>
+                </and>            </condition>
             <then>
                 <!-- create the summary data -->
                 <set field="createSummary.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
@@ -169,7 +176,7 @@
             <order-by field-name="caFromDate DESC"/>
         </entity-condition>
 
-        <log level="info" message="unfilteredList: ${unfilteredList}"/>
+        <!--log level="info" message="unfilteredList: ${unfilteredList}"/-->
 
         <set field="mapIn.targetOperationList[]" value="CONTENT_VIEW"/>
         <set field="mapIn.targetOperationList[]" value="CONTENT_UPDATE"/>
@@ -179,17 +186,17 @@
             <set-nonpk-fields value-field="content" map="view"/>
             <set-pk-fields value-field="content" map="view"/>
             <set field="mapIn.currentContent" from-field="content"/>
-            <log level="info" message="mapIn: ${mapIn}"/>
+            <!--log level="info" message="mapIn: ${mapIn}"/-->
             <call-service service-name="checkContentPermission" in-map-name="mapIn">
                 <result-to-field result-name="permissionStatus" field="permissionStatus"/>
             </call-service>
-            <log level="info" message="permissionStatus: ${permissionStatus}"/>
+            <!--log level="info" message="permissionStatus: ${permissionStatus}"/-->
             <if-compare operator="equals" field="permissionStatus" value="granted">
                 <set field="blogList[]" from-field="view"/>
             </if-compare>
         </iterate>
 
-        <log level="info" message="blogList: ${blogList}"/>
+        <!--log level="info" message="blogList: ${blogList}"/-->
         <field-to-result field="blogList" result-name="blogList"/>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Fri Jan 16 02:18:04 2009
@@ -104,7 +104,7 @@
             }
         } // if called through the default request, there is no request in pathinfo
 
-
+     Debug.log("========pathinfo: " + pathInfo);
         // if path info is null; check for a default content
         if (pathInfo == null) {
             List<GenericValue> defaultContents = null;
@@ -182,6 +182,7 @@
                     contentId = pathInfo;
                 }
             }
+         Debug.log("========contentId: " + contentId);
 
             // verify the request content is associated with the current website
             boolean websiteOk;
@@ -238,8 +239,11 @@
             } else {
              String contentName = null;
              String siteName = null;
-             try {
-             contentName = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentId)).getString("contentName");
+             try {
+             GenericValue content = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentId));
+             if (UtilValidate.isNotEmpty(content)) {
+             contentName = content.getString("contentName");
+             }
              siteName = delegator.findByPrimaryKeyCache("WebSite", UtilMisc.toMap("webSiteId", webSiteId)).getString("siteName");
                 } catch (GenericEntityException e) {
                     Debug.logError(e, module);

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Fri Jan 16 02:18:04 2009
@@ -88,19 +88,25 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="blogContent"/>
     </request-map>
-    <request-map uri="NewArticle">
+    <request-map uri="NewBlogArticle">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="NewArticle"/>
+        <response name="success" type="view" value="NewBlogArticle"/>
     </request-map>
     <request-map uri="createBlogArticle">
         <security https="true" auth="true"/>
         <event type="service" invoke="postBlogEntry"/>
         <response name="success" type="view" value="blogContent"/>
-        <response name="error" type="view" value="NewArticle"/>
+        <response name="error" type="view" value="NewBlogArticle"/>
     </request-map>
-    <request-map uri="ViewArticle">
+    <request-map uri="updateBlogArticle">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="ViewArticle"/>
+        <event type="service" invoke="persistBlogAll"/>
+        <response name="success" type="view" value="blogContent"/>
+        <response name="error" type="view" value="EditBlogArticle"/>
+    </request-map>
+    <request-map uri="ViewBlogArticle">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ViewBlogArticle"/>
     </request-map>
     <request-map uri="ViewBlogRss">
         <security https="true" auth="true"/>
@@ -116,9 +122,9 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="LatestResponses"/>
     </request-map>
-    <request-map uri="EditArticle">
+    <request-map uri="EditBlogArticle">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditArticle"/>
+        <response name="success" type="view" value="EditBlogArticle"/>
     </request-map>
     <request-map uri="EditBlogImage">
         <security https="true" auth="true"/>
@@ -1779,10 +1785,10 @@
     
     <view-map name="blogMain" page="component://content/widget/forum/BlogScreens.xml#BlogMain" type="screen"/>
     <view-map name="blogContent" page="component://content/widget/forum/BlogScreens.xml#BlogContent" type="screen"/>
-    <view-map name="ViewArticle" page="component://content/widget/forum/BlogScreens.xml#ViewArticle" type="screen"/>
+    <view-map name="ViewBlogArticle" page="component://content/widget/forum/BlogScreens.xml#ViewArticle" type="screen"/>
     <view-map name="EditBlog" type="screen" page="component://content/widget/forum/BlogScreens.xml#EditBlog"/>
-    <view-map name="NewArticle" page="component://content/widget/forum/BlogScreens.xml#NewArticle" type="screen"/>
-    <view-map name="EditArticle" page="component://content/widget/forum/BlogScreens.xml#EditArticle" type="screen"/>
+    <view-map name="NewBlogArticle" page="component://content/widget/forum/BlogScreens.xml#NewArticle" type="screen"/>
+    <view-map name="EditBlogArticle" page="component://content/widget/forum/BlogScreens.xml#EditArticle" type="screen"/>
     <view-map name="ViewResponse" page="component://content/widget/forum/BlogScreens.xml#BlogMain" type="screen"/>
     <view-map name="RespondBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#AddBlogResponse"/>
     <view-map name="EditBlogText" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/>

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Fri Jan 16 02:18:04 2009
@@ -134,7 +134,7 @@
         </field>
         <field name="dataResourceId">
             <lookup target-form-name="LookupDataResource">
-                <sub-hyperlink use-when="&quot;${currentValue.dataResourceId}&quot;.length()>0" link-style="buttontext" target-type="intra-app" target="EditDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/>
+                <sub-hyperlink link-style="buttontext" target="EditDataResource?dataResourceId=${currentValue.dataResourceId}" description="${uiLabelMap.ContentGoToDataResource}"/>
             </lookup>
         </field>
         <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field>

Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Fri Jan 16 02:18:04 2009
@@ -136,7 +136,6 @@
     <menu name="blogSub" menu-container-style="button-bar button-style-2" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
         default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="currentMenuItemName"
         title="" type="simple">
-        
         <menu-item name="NewBlog" title="${uiLabelMap.CommonCreateNew}">
             <link target="editBlog"/>
         </menu-item>
@@ -146,7 +145,7 @@
         title="" type="simple">
         
         <menu-item name="NewBlog" title="${uiLabelMap.CommonCreateNew}">
-            <link target="NewArticle?blogContentId=${parameters.blogContentId}"/>
+            <link target="NewBlogArticle?blogContentId=${parameters.blogContentId}"/>
         </menu-item>
     </menu>
 </menus>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Fri Jan 16 02:18:04 2009
@@ -109,7 +109,16 @@
         </menu-item>
         <menu-item name="uploadImage" title="${uiLabelMap.ContentDataResourceImage}" >
             <condition>
-                <if-compare field-name="currentValue.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"/>
+                <or>
+                    <if-compare field-name="currentValue.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"/>
+                    <and>
+                        <if-compare field-name="currentValue.dataResourceTypeId" operator="contains" value="FILE"/>
+                        <or>
+                            <if-compare field-name="currentValue.mimeTypeId" operator="contains" value="image"/>
+                            <if-compare field-name="currentValue.mimeTypeId" operator="contains" value="Image"/>
+                        </or>
+                    </and>
+                </or>
             </condition>
             <link target="UploadImage?dataResourceId=${parameters.dataResourceId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Fri Jan 16 02:18:04 2009
@@ -238,7 +238,7 @@
                 <decorator-screen name="commonDataResourceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <include-form name="ImageUpload" location="component://content/widget/content/DataResourceForms.xml"/>
-                        <content dataresource-id="${currentValue.dataResourceId}"/>
+                        <content dataresource-id="${currentValue.dataResourceId}" border="false"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Fri Jan 16 02:18:04 2009
@@ -39,7 +39,7 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="contentId"><hidden/></field>
         <field name="contentName" widget-style="tabletext">
-            <hyperlink target="EditArticle?articleContentId=${contentId}&amp;blogContentId=${parameters.blogContentId}" description="${contentName} [${contentId}]"/>
+            <hyperlink target="EditBlogArticle?articleContentId=${contentId}&amp;blogContentId=${parameters.blogContentId}" description="${contentName} [${contentId}]"/>
         </field>
         <field name="description"><display/></field>
         <field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri Jan 16 02:18:04 2009
@@ -1286,9 +1286,9 @@
         <response name="success" type="view" value="MainBlog"/>
     </request-map>
 
-    <request-map uri="ViewArticle">
+    <request-map uri="ViewBlogArticle">
         <security https="false" auth="false"/>
-        <response name="success" type="view" value="ViewArticle"/>
+        <response name="success" type="view" value="ViewBlogArticle"/>
     </request-map>
 
     <request-map uri="ViewBlogRss">
@@ -1308,24 +1308,24 @@
         <response name="success" type="view" value="LatestResponses"/>
     </request-map>
 
-    <request-map uri="NewArticle">
-        <security auth="true"/>
-        <response name="success" type="view" value="NewArticle"/>
+    <request-map uri="NewBlogArticle">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="NewBlogArticle"/>
     </request-map>
-    <request-map uri="EditArticle">
-        <security auth="true"/>
-        <response name="success" type="view" value="EditArticle"/>
+    <request-map uri="EditBlogArticle">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditBlogArticle"/>
     </request-map>
 
-    <request-map uri="EditBlogImage">
-        <security https="false" auth="true"/>
+    <!--request-map uri="EditBlogImage">
+        <security https="true" auth="true"/>
         <response name="success" type="view" value="EditBlogImage"/>
     </request-map>
 
     <request-map uri="EditBlogText">
         <security https="false" auth="true"/>
         <response name="success" type="view" value="EditBlogText"/>
-    </request-map>
+    </request-map-->
 
     <request-map uri="RespondBlog">
         <security https="false" auth="true"/>
@@ -1333,13 +1333,20 @@
     </request-map>
 
     <request-map uri="createBlogArticle">
-        <security https="false" auth="true"/>
+        <security https="true" auth="true"/>
         <event type="service" invoke="postBlogEntry"/>
-        <response name="success" type="view" value="EditBlog"/>
-        <response name="error" type="view" value="EditBlog"/>
+        <response name="success" type="view" value="ViewBlogArticle"/>
+        <response name="error" type="view" value="EditBlogArticle"/>
     </request-map>
-
-    <request-map uri="persistBlogSummary">
+    
+    <request-map uri="updateBlogArticle">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="persistBlogAll"/>
+        <response name="success" type="view" value="ViewBlogArticle"/>
+        <response name="error" type="view" value="EditBlogArticle"/>
+    </request-map>
+    
+    <!--request-map uri="persistBlogSummary">
         <security https="false" auth="true"/>
         <event type="service" invoke="persistContentAndAssoc"/>
         <response name="success" type="view" value="EditBlog"/>
@@ -1358,7 +1365,7 @@
         <event type="service" invoke="persistContentAndAssoc"/>
         <response name="success" type="view" value="EditBlog"/>
         <response name="error" type="view" value="EditBlog"/>
-    </request-map>
+    </request-map-->
     
     <request-map uri="createBlogResponse">
         <security https="true" auth="true"/>
@@ -1877,9 +1884,9 @@
 
     <!-- Blog Views -->
     <view-map name="MainBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#MainBlog"/>
-    <view-map name="ViewArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#ViewArticle"/>
-    <view-map name="NewArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#NewArticle"/>
-    <view-map name="EditArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditArticle"/>
+    <view-map name="ViewBlogArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#ViewArticle"/>
+    <view-map name="NewBlogArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#NewArticle"/>
+    <view-map name="EditBlogArticle" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditArticle"/>
     <view-map name="ViewResponse" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#ViewResponse"/>
     <view-map name="RespondBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#AddBlogResponse"/>
     <view-map name="EditBlogText" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css Fri Jan 16 02:18:04 2009
@@ -4,8 +4,8 @@
 font-size: 100%;
 text-decoration: none;
 font-family: Verdana, Arial, Helvetica, sans-serif;
-padding-right: 18%;
-padding-left: 14%;
+padding-right: 210px;
+padding-left: 160px;
 }
 
 .treeHeader, .treeHeaderCurrent {

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml Fri Jan 16 02:18:04 2009
@@ -20,10 +20,6 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">        
     <menu name="view_edit" default-title-style="tabButton" default-selected-style="tabButtonSelected" default-menu-item-name="all" orientation="horizontal" menu-width="100%" default-tooltip-style="tabletext" default-widget-style="tabButton" menu-container-style="blogmenuwrapper" title="" type="simple">
-        <menu-item name="view" title="View">
-            <!--<link  text="View" target="ViewBlog?articleContentId=${blog.contentId}&amp;ownerContentId=${blog.ownerContentId}" style="tabButton" />-->
-            <link text="View" target="ViewArticle?articleContentId=${blog.contentId}&amp;blogContentId=${blog.contentIdStart}" style="buttontext"/>
-        </menu-item>
         <menu-item name="edit" title="Edit">
             <condition>
                 <or>
@@ -31,7 +27,7 @@
                     <if-entity-permission entity-id="${blog.contentId}" entity-name="Content" target-operation="CONTENT_UPDATE"/>
                 </or>
             </condition>
-            <link text="Edit" target="EditArticle?articleContentId=${blog.contentId}&amp;blogContentId=${blog.contentIdStart}" style="buttontext" url-mode="inter-app"/>
+            <link text="Edit" target="EditBlogArticle?articleContentId=${blog.contentId}&amp;blogContentId=${blog.contentIdStart}" style="buttontext"/>
         </menu-item>                
     </menu>
 </menus>

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml?rev=734960&r1=734959&r2=734960&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml Fri Jan 16 02:18:04 2009
@@ -49,11 +49,11 @@
                                 <if-service-permission service-name="genericContentPermission" main-action="CREATE" context-map="crPerm"/>
                             </condition>
                             <widgets>
-                                <link text="Add New" target="NewArticle?blogContentId=${blogContentId}" style="buttontext"/>
+                                <link text="Add New" target="NewBlogArticle?blogContentId=${blogContentId}" style="buttontext"/>
                             </widgets>
                         </section>
 
-                        <link target="ViewBlogRss?blogContentId=${blogContent.contentId}&amp;mainLinkReq=MainBlog&amp;entryLinkReq=ViewArticle" target-window="_blank">
+                        <link target="ViewBlogRss?blogContentId=${blogContent.contentId}&amp;mainLinkReq=MainBlog&amp;entryLinkReq=ViewBlogArticle" target-window="_blank">
                             <image src="/images/feed-icon-14x14.png" id="feedIcon" height="12px"/>
                         </link>
                     </container>
@@ -69,7 +69,6 @@
         <section>
             <actions>
                 <set field="MainColumnStyle" value="nocolumns"/>
-                <property-to-field property="blog.view.size" field="blogViewSize" resource="blog" default="10"/>
                 <set field="blogContentId" from-field="parameters.blogContentId"/>
                 <entity-condition entity-name="ContentAssocViewTo" use-cache="false" list-name="blogList">
                     <condition-list combine="and">
@@ -80,7 +79,6 @@
                     </condition-list>
                     <order-by field-name="caFromDate DESC"/>
                 </entity-condition>
-                <set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
 
                 <!-- permission fields -->
                 <set field="upPerm.contentId" from-field="blogContentId"/>
@@ -113,7 +111,7 @@
                                     <container style="blogwrapper">
                                         <include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/>
                                         <label text="&lt;p/&gt;"/>
-                                        <link text="${blog.contentName} [${blog.contentId}]" target="ViewArticle?articleContentId=${blog.contentId}&amp;blogContentId=${blogContentId}" style="blogheader" url-mode="inter-app"/>
+                                        <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle?articleContentId=${blog.contentId}&amp;blogContentId=${blogContentId}" style="blogheader"/>
                                         <!--
                                             <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" />
                                         -->
@@ -133,7 +131,7 @@
                                         <include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/>
                                         <label text="&lt;p/&gt;"/>
                                         <!--<label text="${blog.contentName} [${blog.contentId}]" style="blogheader"/>-->
-                                        <link text="${blog.contentName} [${blog.contentId}]" target="ViewArticle?articleContentId=${blog.contentId}&amp;blogContentId=${blogContentId}" style="blogheader" url-mode="inter-app"/>
+                                        <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle?articleContentId=${blog.contentId}&amp;blogContentId=${blogContentId}" style="blogheader" url-mode="inter-app"/>
                                         <!--
                                             <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" />
                                         -->
@@ -155,7 +153,6 @@
         <section>
             <actions>
                 <set field="blogContentId" from-field="parameters.blogContentId"/>
-                
                 <set field="crPerm.ownerContentId" from-field="parameters.blogContentId"/>
                 <set field="crPerm.contentOperationId" value="CONTENT_CREATE"/>
                 <set field="crPerm.contentPurposeTypeId" value="ARTICLE"/>
@@ -288,7 +285,7 @@
                                 </condition>
                                 <widgets>
                                     <container style="rightjustify">
-                                        <link text="Edit" target="EditArticle?contentId=${articleContentId}&amp;blogContentId=${blogContentId}" style="buttontext"/>
+                                        <link text="Edit" target="EditBlogArticle?contentId=${articleContentId}&amp;blogContentId=${blogContentId}" style="buttontext"/>
                                     </container>
                                 </widgets>
                             </section>
@@ -341,7 +338,7 @@
                         <label text="&lt;p/&gt;"/>
                         <container style="bloghr">
                             <container style="leftjustify">
-                                <link text="${article.contentName}: ${article.description}" target="ViewArticle?articleContentId=${articleContentId}&amp;blogContentId=${blogContentId}" style="blogtitle"/>
+                                <link text="${article.contentName}: ${article.description}" target="ViewBlogArticle?articleContentId=${articleContentId}&amp;blogContentId=${blogContentId}" style="blogtitle"/>
                                 <label text=" --&gt; ${content.contentName}: ${content.description}" style="blogtitle"/>
                             </container>
                             <section>
@@ -536,8 +533,8 @@
         <section>
             <widgets>
                 <container>
-                    <link text="${rsp.contentName}[${rsp.contentId}]" target="ViewArticle?articleContentId=${articleContentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;blogContentId=${parameters.blogContentId}" style="responseheader"/>
-                    <link text="View Blog Article" target="ViewArticle?articleContentId=${articleContentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;blogContentId=${parameters.blogContentId}" style="buttontext"/>
+                    <link text="${rsp.contentName}[${rsp.contentId}]" target="ViewBlogArticle?articleContentId=${articleContentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;blogContentId=${parameters.blogContentId}" style="responseheader"/>
+                    <link text="View Blog Article" target="ViewBlogArticle?articleContentId=${articleContentId}&amp;ownerContentId=${rsp.ownerContentId}&amp;blogContentId=${parameters.blogContentId}" style="buttontext"/>
                     <container style="responsetext">
                         <label text="${rsp.description}" style="responsetext"/>
                         <label text="(Posted on: ${rsp.createdDate})" style="responsetext"/>