svn commit: r507302 - in /ofbiz/trunk/applications/ecommerce: webapp/ecommerce/blog/ webapp/ecommerce/images/ widget/blog/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r507302 - in /ofbiz/trunk/applications/ecommerce: webapp/ecommerce/blog/ webapp/ecommerce/images/ widget/blog/

jaz-3
Author: jaz
Date: Tue Feb 13 15:27:03 2007
New Revision: 507302

URL: http://svn.apache.org/viewvc?view=rev&rev=507302
Log:
blog cleanups

Added:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl   (with props)
Removed:
    ofbiz/trunk/applications/ecommerce/widget/blog/textimage.ftl
Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogTemplates.xml
    ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml

Added: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl?view=auto&rev=507302
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl (added)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl Tue Feb 13 15:27:03 2007
@@ -0,0 +1,123 @@
+<#--
+  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.
+  -->
+
+<#--
+# This page displays both the textarea for text and the file upload control.
+# It was awkward to do it with screen widgets because need to show checkboxes
+# by each control.
+-->
+
+<#-- This code sets the checkboxes based on existing data -->
+<#assign text_check=""/>
+<#assign img_check=""/>
+<#if (imageContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED") || drMimeTypeId?default("")?starts_with("image"))>
+    <#assign img_check="checked"/>
+</#if>
+<#if (textContent?has_content && drMimeTypeId?default("")?starts_with("text"))
+        || (textContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED"))
+        || !img_check?has_content>
+    <#assign text_check="checked"/>
+</#if>
+
+<#-- Sets one of the two templates -->
+<#assign topleft_check=""/>
+<#assign topcenter_check=""/>
+<#if view.drDataResourceId?has_content && view.drDataResourceId == "BLOG_TPL_TOPLEFT">
+    <#assign topleft_check="checked"/>
+<#else>
+    <#assign topcenter_check="checked"/>
+</#if>
+
+<#-- Fills in existing text -->
+<#assign textData=""/>
+<#if electronicText?has_content >
+    <#if electronicText.textData?has_content >
+        <#assign textData=electronicText.textData/>
+    </#if>
+</#if>
+
+<#-- Stores the ids for existing data -->
+<#assign textContentId=""/>
+<#assign textDataResourceId=""/>
+
+<#if textContent?has_content >
+    <#assign textContentId=textContent.contentId?if_exists/>
+    <#assign textDataResourceId=textContent.drDataResourceId?if_exists/>
+</#if>
+
+<#if textElectronicText?has_content && textElectronicText.textData?has_content >
+    <#assign textData=textElectronicText.textData/>
+</#if>
+
+<#assign imageContentId=""/>
+<#assign imageDataResourceId=""/>
+
+<#if imageContent?has_content >
+    <#assign imageContentId=imageContent.contentId?if_exists/>
+    <#assign imageDataResourceId=imageContent.drDataResourceId?if_exists/>
+</#if>
+
+<input type="hidden" name="textContentId" value="${textContentId}"/>
+<input type="hidden" name="imageContentId" value="${imageContentId}"/>
+<input type="hidden" name="textDataResourceId" value="${textDataResourceId}"/>
+<input type="hidden" name="imageDataResourceId" value="${imageDataResourceId}"/>
+
+<table>
+    <tr>
+        <td width="10%" align="right">
+        <span class="treeHeader"> </span>
+        </td>
+        <td>&nbsp;</td>
+        <td width="5%" align="left" valign="top">
+        <div class="inputBox"><input type="checkBox" ${text_check} name="drMimeTypeId_TEXT" value="Y"/>Text</div>
+        </td>
+        <td>&nbsp;</td>
+        <td width="60%" align="left"
+        <textarea class="textAreaBox" class="inputBox" name="mainData" cols="60" rows="24">${textData?if_exists}</textarea>
+        </td>
+        <td width="10%" align="right">
+        <span class="treeHeader"> </span>
+        </td>
+    </tr>
+
+    <tr>
+        <td width="10%" align="right">
+            <span class="treeHeader"> </span>
+        </td>
+        <td>&nbsp;</td>
+        <td width="5%" align="left" valign="top">
+            <div class="inputBox"><input type="checkbox" ${img_check} name="drMimeTypeId_IMAGE" value="Y"/>Image</div>
+        </td>
+        <td>&nbsp;</td>
+        <td width="60%" align="left">
+            <div class="inputBox">Existing file name:  <#if imageContent?has_content && imageContent.drObjectInfo?has_content>${imageContent.drObjectInfo}</#if></div>
+            <br/>
+            <input type="file" class="inputBox" name="imageData" size="25"/>
+            <#--
+            Force: <input type="checkbox" value="true" name="forceElectronicText"/>
+            -->
+            <br/>
+            Top-left:<input type="radio" ${topleft_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPLEFT"/>
+            &nbsp;Top-center:<input type="radio" ${topcenter_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPCENTER"/>
+        </td>
+        <td width="10%" align="right">
+            <span class="treeHeader">&nbsp;</span>
+        </td>
+    </tr>
+</table>

Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/TextImage.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl?view=diff&rev=507302&r1=507301&r2=507302
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/blog/blogs.ftl Tue Feb 13 15:27:03 2007
@@ -22,10 +22,10 @@
         <div class="boxhead">${uiLabelMap.ProductBrowseBlogs}</div>
     </div>
     <div class="screenlet-body">
-            <#list blogs as blog>
+        <#list blogs as blog>
             <div class="browsecategorytext" style="margin-left: 10px">
-               -&nbsp;<a href="<@ofbizUrl>MainBlog?caContentId=${blog.contentId}&amp;ownerContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
+                -&nbsp;<a href="<@ofbizUrl>MainBlog?caContentId=${blog.contentId}&amp;ownerContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName}</a>
             </div>
-            </#list>  
+        </#list>
     </div>
 </div>

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?view=diff&rev=507302&r1=507301&r2=507302
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/blog.css Tue Feb 13 15:27:03 2007
@@ -1,639 +1,199 @@
-.treeHeader, .treeHeaderCurrent {
-        color:blue;
-        font-size:12;
-        text-decoration:none;
-        }
-.treeHeaderCurrent {
-        color:black;
-        font-size:14;
-        font-weight:bold;
-        }
-.treeHeaderOutline {
-        color:black;
-        font-size:14;
-        font-weight:medium;
-        }
-.treeHeaderPage {
-        color:blue;
-        font-size:14;
-        font-weight:bold;
-        text-decoration:none;
-        }
-.treeHeaderSubPage {
-        color:blue;
-        font-size:12;
-        font-weight:medium;
-        text-decoration:none;
-        text-align:right;
-        width:100%;
-        }
-.tocItem {
-        color:blue;
-        font-size:12;
-        text-decoration:none;
-        }
-.tocItemCurrent {
-        color:black;
-        font-size:14;
-        font-weight:bold;
-        }
-.editwrapper {
-        color:black;
-        background:#ffffff;
-        font-size:16;
-        text-decoration:none;
-        margin-left:12px;
-        margin-top:2px;
-        border-top:1px solid black;
-        border-left:1px solid black;
-        }
-.contentwrapper {
-        color:black;
-        background:#ffffff;
-        font-size:16;
-        text-decoration:none;
-        margin-left:12px;
-        margin-top:2px;
-        }
-.tocwrapper {
-        color:black;
-        background:#ffffff;
-        font-size:16;
-        text-decoration:none;
-        margin-left:12px;
-        margin-top:2px;
-        }
-.menuwrapper {
-        color:#DDDDDD;
-        background:#ffffff;
-        font-size:10;
-        text-decoration:none;
-        margin-left:12px;
-        margin-right:20px;
-        width:80%;
-        text-align:right;
-        }
-.menuButton {
-        color:black;
-        background:#ffffff;
-        font-size:10;
-        text-decoration:none;
-        border-width:1px;
-        border-style:solid;
-        border-color:black;
-        }
-        
-.appbarleft {
-        border-width:0px;
-        border-style:solid;
-        border-color:black;
-        width:45%;
-        position:relative;
-        top:0;
-        height:20px;
- }        
-
-.appbarmid {
-        border-width:0px;
-        border-style:solid;
-        border-color:black;
-        width:20%;
-        position:relative;
-        top:-20px;
- }        
-
-.appbarright {
-        border-width:0px;
-        border-style:solid;
-        border-color:black;
-        width:15%;
-        position:relative;
-        float:right;
-        top:-20px;
-        text-align:left;
- }        
-
-.contenttext {
-        color:black;
-        background:#ffffff;
-        font-size:14;
-        text-decoration:none;
-        margin-left:12px;
-        margin-right:20px;
-        margin-top:8px;
-        }
-
-/*
-.expandcollapse { color:black; background:lightblue; font-size:16; text-decoration:none;
-       border-width:2px; border-color:black; border-style:solid;
-        }
-*/
-.header, .header0, .header1, .header2, .header3, .header4, .header5, .header6, .header7, {
-        color:black;
-        font-family:serif;
-        }
-.header0 {
-        font-size:17pt;
-        }
-.header1 {
-        font-size:16pt;
-        }
-.header2 {
-        font-size:15pt;
-        }
-.header3 {
-        font-size:14pt;
-        }
-.header4 {
-        font-size:13pt;
-        }
-.header5 {
-        font-size:12pt;
-        }
-.header6 {
-        font-size:12pt;
-        }
-.header7 {
-        font-size:12pt;
-        }
-.header8 {
-        font-size:12pt;
-        }
-.header9 {
-        font-size:12pt;
-        }
-.header10 {
-        font-size:12pt;
-        }
-.largetitle, .largetitlePlum, .largetitleCharcoal, .largetitleBlack {
-        font-size:60px;
-        color:black;
-        font-family:Times New Roman;
-        font-weight:medium;
-    text-align:center;
-        margin-left:0px;
-        margin-right:0px;
-        }
-        
-.largetitlePlum {
-        color:darkmagenta;
-        }
-.largetitleCharcoal {
-        color:#666666;
-        }
-.largetitleBlack {
-        color:black;
-        }
-        
-.smalltitle {
-        font-size:16pt;
-        color:black;
-        font-family:serif;
- text-align:center;
-        margin-left:20px;
-        margin-right:20px;
-        }
+.blogs {
+position: inherit;
+width: inherit;
+font-size: 62.5%;
+text-decoration: none;
+font-family: Verdana, Arial, Helvetica, sans-serif;
+padding-right: 18%;
+padding-left: 14%;
+}
 
-.floatleft {
-        display:inline;
-        float:left;
-        }
-.topcentered {
-        display:block;
-        text-align:center;
-        }
-        
-.blogheader {
- color:black;
- font-size:12pt;
- font-weight:bold;
- text-align:left;
- font-family:verdana, arial, sans-serif;
- margin-left:10px;
- }
-
-.blogtext {
- color:#222222;
- font-size:12pt;
- font-weight:medium;
- text-align:left;
- font-family:verdana, arial, sans-serif;
- margin-left:20px;
- }
-
-.blogtitle{
-        color: black;
-        background:#D4D0C8;
-        font-size:22;
- font-weight:bold;
- text-align:left;
- font-family:verdana, arial, sans-serif;
-        text-decoration:none;
-        display:inline;
-        float:left;
-        }
-        
-.blogtitleboxed {
-        color: black;
-        background:#D4D0C8;
-        font-size:22;
-        text-decoration:none;
-        border:1px solid black;
-        padding:4px;
-        display:inline;
-        float:left;
-        }
-        
-.bloghr {
-        color: black;
-        background:#D4D0C8;
-        padding:4px;
-        height:22pt;
-        }        
-        
-.blogwrapper {
- position: relative;
-        background:#eeeeee;
-        padding:4px;
-        margin-top:6px;
- font-size:12pt;
- font-weight:medium;
- text-align:left;
- font-family:verdana, arial, sans-serif;
-        }        
+.treeHeader, .treeHeaderCurrent {
+color: black;
+font-weight: bold;
+text-decoration: none;
+}
 
-.blogcontentwrapper {
-        background:#f8f8f8;
-        border:1px solid #000000;
-        padding:4px;
-        margin-top:6px;
- color:black;
- font-size:12pt;
- font-weight:medium;
- text-align:left;
- font-family:verdana, arial, sans-serif;
-        }        
-
-
-.responseheader {
- color:black;
- font-size:12pt;
- font-weight:bold;
- text-align:left;
- font-family:verdana, arial, sans-serif;
- margin-left:10px;
- }
-
-.responsetext {
- color:#222222;
- font-size:12pt;
- font-weight:medium;
- text-align:left;
- font-family:verdana, arial, sans-serif;
- margin-left:20px;
- }
-
-.responseTreeWrapper {
-        color:black;
-        background:#ffffff;
-        font-size:12pt;
- font-weight:medium;
- font-family:verdana, arial, sans-serif;
- text-align:left;
-        text-decoration:none;
-        margin-left:12px;
-        margin-top:2px;
-        border-top:1px solid black;
-        border-left:1px solid black;
-        }
-        
-.responseSelected {
-        background:#BBBBBB;
-        border:1px dashed black;
-        }        
-.forummenuwrapper {
-        color:#8B008B;
-        background:#D4D0C8;
-        font-size:10;
-        text-decoration:none;
-        margin-left:12px;
-        margin-right:20px;
-        float:right;
-        text-align:right;
-        max-width:50%;
-        padding-left:14px;
-        }
-.forumheader {
- color:black;
- font-size:12pt;
- font-weight:bold;
- text-align:left;
- font-family:verdana, arial, sans-serif;
- margin-left:10px;
- }
-
-.forumtext {
- color:#222222;
- font-size:12pt;
- font-weight:medium;
- text-align:left;
- font-family:verdana, arial, sans-serif;
- margin-left:20px;
- }
-
-.forumtitle{
-        color:#8B008B;
-        background:#D4D0C8;
-        font-size:22;
- font-weight:bold;
- text-align:left;
- font-family:verdana, arial, sans-serif;
-        text-decoration:none;
-        display:inline;
-        float:left;
-        }
-        
-.forumtitleboxed {
-        color:#8B008B;
-        background:#D4D0C8;
-        font-size:22;
-        text-decoration:none;
-        border:1px solid black;
-        padding:4px;
-        display:inline;
-        float:left;
-        }
-        
-.forumhr {
-        color:#8B008B;
-        background:#D4D0C8;
-        border:1px solid #8B008B;
-        padding:4px;
-        height:22pt;
-        }        
-        
-.forumwrapper {
-        background:#D4D0C8;
-        border:1px solid #8B008B;
-        padding:4px;
-        margin-top:6px;
- font-size:12pt;
- font-weight:medium;
- text-align:left;
- font-family:verdana, arial, sans-serif;
-        }        
-
-.forumcontentwrapper {
-        background:#f8f8f8;
-        border:1px solid #000000;
-        padding:4px;
-        margin-top:6px;
- color:black;
- font-size:12pt;
- font-weight:medium;
- text-align:left;
- font-family:verdana, arial, sans-serif;
-        }        
-
-
-.blogboxoutside {
-background: #FFFFFF;
-padding: 0px;
-border-color: #999999;
-border-style: solid;
-border-width: 1px 1px 1px 1px;
-max-width:40%;
+.treeHeaderCurrent {
+color: black;
+font-weight: bold;
 }
-.boxleft {
-position: relative;
-background: #FFFFFF;
-padding: 0px;
-border-color: #999999;
-border-style: solid;
-border-width: 1px 1px 1px 1px;
-max-width:48%;
-width:40%;
-margin-left:40px;
+
+.treeHeaderOutline {
+color: black;
+font-weight: normal;
 }
-.boxright {
-position: relative;
-background: #FFFFFF;
-padding: 0px;
-border-color: #999999;
-border-style: solid;
-border-width: 1px 1px 1px 1px;
-max-width:48%;
-width:40%;
-margin-right:40px;
-margin-bottom:10px;
-text-align:center;
-}
-
-.sidebarleft {
-position: absolute;
-left: 0px;
-top: 160px;
-width: 19%;
-max-width: 19%;
-min-width: 120px;
-height: 100%;
-
-background: #FFFFFF;
-padding: 8px;
-border-color: #666666;
-border-style: dashed;
-border-width: 1px 1px 1px 1px;
-z-index: 1;
-}
-
-.sidebarright {
-position: absolute;
-left: 840px;
-top: 140px;
-width: 140;
-
-background: white;
-padding: 8px;
-}
-
-.midbar {
-position: absolute;
-left: 0;
-top: 140px;
-width: 800px;
-min-width: 356px;
-max-width:80%;
-
-background: #FFFFFF;
-padding: 8px;
-border-color: #666666;
-border-style: solid;
-border-width: 1px 1px 1px 1px;
-z-index: 3;
-vertical-align: top;
-margin-left: 10px;
-margin-right: 10px;
-margin-top: 0px;
-margin-bottom: 5px;
-}
-
-.midbarcontent, .midbarleft, .midbarright {
-padding: 8px;
-margin: 4px;
-}
-
-.midbarleft {
-left:0px;
-top:0px;
-max-width:360px;
-}
-
-.midbarright {
-left:400px;
-top:0px;
-max-width:360px;
+
+.treeHeaderPage {
+color: blue;
+font-weight: bold;
+text-decoration: none;
 }
-
-.topleft {
-background: #ffffff;
-border: 2px dashed black;
-padding: 8px;
-font-size:14pt;
-font-family:Arial;
-font-weight: bolder;
-color:black;
-max-width:200px;
-vertical-align: top;
-float: left;
-margin-top: 4px;
-margin-left: 4px;
-margin-bottom: 4px;
-margin-right: 8px;
-}
-
-.toparea {
-position:absolute;
-top: 0px;
-left: 0px;
+
+.treeHeaderSubPage {
+color: blue;
+font-weight: normal;
+text-decoration: none;
+text-align: right;
 width: 100%;
-min-width: 600px;
-height: 120px;
-margin-left: 10px;
-margin-right: 10px;
-margin-top: 5px;
-margin-bottom: 5px;
-background: #ffffff;
-border: 1px solid black;
 }
 
-.boxheadbrk {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-margin: 0px;
-font-size: 8pt;
+.tocItem {
+color: blue;
+text-decoration: none;
+}
+
+.tocItemCurrent {
+color: black;
 font-weight: bold;
+}
+
+.editwrapper {
+color: black;
+background: #ffffff;
+text-decoration: none;
+margin-left: 12px;
+margin-top: 2px;
+border-top: 1px solid black;
+border-left: 1px solid black;
+}
+
+.contentwrapper {
+color: black;
+background: #ffffff;
 text-decoration: none;
-color: #FFFFFF;
+margin-left: 12px;
+margin-top: 2px;
+}
+
+.floatleft {
+display: inline;
+position: relative;
+vertical-align: text-top;
+/*float: left;*/
+}
+
+.topcentered {
 display: block;
+text-align: center;
 }
 
-.boxtopright {
-float: right;
-width: 59%;
+.rightjustify {
+display: inline;
+position: relative;
 text-align: right;
 }
-.boxtopleft{
-float: left;
-width: 39%;
+
+.blogheader {
+color: black;
+font-weight: bold;
 text-align: left;
+margin-left: 10px;
 }
-.alignfill{
-width: 100%;
-min-width: 30%;
+
+.blogtext {
+color: #222222;
+font-weight: normal;
+text-align: left;
+margin-left: 20px;
+font-size: 1.0em;
 }
-.alignindent{
-text-indent: 20px;
+
+.blogtext:hover {
+background: #fffeee;    
 }
-.required-field {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px;
+
+.blogtitle {
 font-weight: bold;
+text-align: left;
 text-decoration: none;
-color: blue;
+display: inline;
 }
 
-.acqqbox {
-position:absolute;
-left:500px;
-top:0px;
-width:300px;
-height:120px;
+.blogtitleboxed {
+font-size: 1.1em;
+color: black;
+background: #D4D0C8;
+text-decoration: none;
+border: 1px solid black;
+padding: 4px;
+display: inline;
 }
 
-A.tabButton {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px;
-font-weight: bold;
-text-decoration: none;
-color: #666666;
-background: #D4D0C8;
-padding-right: 5px;
-padding-left: 5px;
-padding-top: 1px;
-padding-bottom: 1px;
-border: solid #666666 1px;
+.bloghr {
+border: 0.1em solid #999999;
+color: white;
+background: #000099;
+padding: 4px;
+height: 12px;
 }
 
-A.tabButton:hover {
-color: #FFFFFF;
-background: #666666;
-border: solid #666666 1px;
+.blogwrapper {
+position: relative;
+background: #eeeeee;
+padding: 4px;
+margin-top: 6px;
+font-weight: normal;
+text-align: left;
 }
 
-A.tabButtonSelected {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px;
-font-weight: bold;
-text-decoration: none;
-color: #FFFFFF;
-background: #666666;
-padding-right: 5px;
-padding-left: 5px;
-padding-top: 1px;
-padding-bottom: 1px;
-border: solid #666666 1px;
+.blogwrapper:hover {
+background: #fffeee;
 }
 
-A.tabButtonSelected:hover {
-color: #FFFFFF;
-border: solid #666666 1px;
+.blogcontentwrapper {
+background: #f8f8f8;
+font-size: 1.1em;
+border: 1px solid #000000;
+padding: 15px 5px 15px 5px;
+margin-top: 6px;
+color: black;
+font-weight: normal;
+text-align: left;
 }
 
-.tableheadtext {
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px;
+.blogcontentwrapper:hover {
+background: #fffeee;
+}
+
+.responseheader, A.responseheader {
+color: #000099;
 font-weight: bold;
+text-align: left;
 text-decoration: none;
+margin-left: 10px;
+}
+
+A.responseheader:hover {
+color: #ff0000;
+text-decoration: underline;
+}
+
+.responsetext {
+color: #222222;
+font-weight: normal;
+text-align: left;
+margin-left: 20px;
+}
+
+.responseTreeWrapper:hover {
+background: #fffeee;
+}
+
+.responseTreeWrapper {
 color: black;
+background: #ffffff;
+font-weight: normal;
+text-align: left;
+text-decoration: none;
+margin-left: 12px;
+margin-top: 2px;
+border-top: 1px solid black;
+border-left: 1px solid black;
 }
 
-.columncenter {
-position: absolute;
-left: 0;
-top: 140px;
-width: 800px;
-min-width: 356px;
-max-width:80%;
-
-background: #FFFFFF;
-padding: 8px;
-border-color: #666666;
-border-style: solid;
-border-width: 1px 1px 1px 1px;
-z-index: 3;
-vertical-align: top;
-margin-left: 10px;
-margin-right: 10px;
-margin-top: 0px;
-margin-bottom: 5px;
+.responseSelected {
+background: #BBBBBB;
+border: 1px dashed black;
 }
-
+

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml?view=diff&rev=507302&r1=507301&r2=507302
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogForms.xml Tue Feb 13 15:27:03 2007
@@ -1,89 +1,101 @@
 <?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
 
-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.
--->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
-
-    <form name="findBlogContent" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        default-entity-name="ContentAssocDataResourceViewFrom"
-        target="CMSContentFind" title="" type="single">
-        <field name="caContentIdTo" title="Publish-to content" >
+  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.
+  -->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+    <form name="findBlogContent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" title="" type="single">
+        <field name="caContentIdTo" title="Publish-to content">
             <drop-down>
-               <option key="OFBIZBLOGROOT" description="Blogs"/>
-               <option key="OFBIZFORUMROOT" description="Forums"/>
+                <option key="OFBIZBLOGROOT" description="Blogs"/>
+                <option key="OFBIZFORUMROOT" description="Forums"/>
             </drop-down>
         </field>
-        <field name="caMapKey" title="Map Key" ><text-find/></field>
-        <field name="caContentAssocTypeId" title="Assoc Type Id" ><text-find/></field>
-        <field name="caFromDate" title="From Date" ><date-find/></field>
-        <field name="contentId" title="Content Id" ><text-find/></field>
-        <field name="dataResourceId" title="Data Resource Id" ><text-find/></field>
-        <field name="contentName" title="Name" ><text-find/></field>
-        <field name="submitButton" title="Find" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="caMapKey" title="Map Key">
+            <text-find/>
+        </field>
+        <field name="caContentAssocTypeId" title="Assoc Type Id">
+            <text-find/>
+        </field>
+        <field name="caFromDate" title="From Date">
+            <date-find/>
+        </field>
+        <field name="contentId" title="Content Id">
+            <text-find/>
+        </field>
+        <field name="dataResourceId" title="Data Resource Id">
+            <text-find/>
+        </field>
+        <field name="contentName" title="Name">
+            <text-find/>
+        </field>
+        <field name="submitButton" title="Find" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
         <field name="createBlog" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="New Blog"  target="EditBlogArticle"/>
+            <hyperlink also-hidden="false" description="New Blog" target="EditBlogArticle"/>
         </field>
         <field name="createForum" title=" " widget-style="buttontext">
-            <hyperlink also-hidden="false" description="New Forum"  target="EditForumArticle"/>
+            <hyperlink also-hidden="false" description="New Forum" target="EditForumArticle"/>
         </field>
-
     </form>
 
     <form name="listFindBlogContent" type="list" target="" default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" paginate-target="/CMSContentFind" view-size="20">
         <actions>
-            <service service-name="performFind" result-map-list-iterator-name="listIt">
+            <service service-name="performFind" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>
                 <field-map field-name="entityName" env-name="entityName"/>
             </service>
         </actions>
-    
+
         <field name="editContent" title="">
-            <hyperlink also-hidden="false" description="Edit" target="CMSContentEdit?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}&amp;contentIdTo=${contentIdTo}"/>
+            <hyperlink also-hidden="false" description="Edit" target="CMSContentEdit?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}&amp;contentIdTo=${contentIdTo}"/>
+        </field>
+        <field name="contentId" title="Content Id">
+            <display/>
+        </field>
+        <field name="dataResourceId" title="Data Resource Id">
+            <display/>
+        </field>
+        <field name="contentName" title="Name">
+            <display/>
         </field>
-        <field name="contentId" title="Content Id" ><display/></field>
-        <field name="dataResourceId" title="Data Resource Id" ><display/></field>
-        <field name="contentName" title="Name" ><display/></field>
     </form>
 
-    <form name="AddBlogResponse" target="persistBlogResponse" title="" type="single"
-        default-title-style="treeHeader"
-        default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <auto-fields-entity entity-name="ContentAssocDataResourceViewTo" default-field-type="hidden" map-name="rsp" />
+    <form name="AddBlogResponse" target="persistBlogResponse" title="" type="single" default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="ContentAssocDataResourceViewTo" default-field-type="hidden" map-name="rsp"/>
         <field name="contentName" title="Short title" entry-name="contentName" map-name="rsp">
-          <text size="40"/>
+            <text size="40"/>
         </field>
-        <field name="description" title="Slightly longer title (250 chars max)" map-name="rsp">
-          <textarea cols="40" rows="6"/>
+        <field name="description" title="Description (250 chars max)" map-name="rsp">
+            <textarea cols="40" rows="6"/>
         </field>
         <field name="contentId" entry-name="contentId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
         <field name="articleContentId" entry-name="articleContentId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
         <field name="ownerContentId" entry-name="ownerContentId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
         <field name="caContentId" entry-name="caContentId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
         <!--
         <field name="contentContentId" entry-name="caContentIdTo" map-name="rsp">
@@ -91,31 +103,31 @@
         </field>
             -->
         <field name="contentTypeId" entry-name="contentTypeId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
         <field name="drDataResourceTypeId" entry-name="drDataResourceTypeId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
         <field name="caContentAssocTypeId" entry-name="caContentAssocTypeId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
-        <field name="textData" title="Response"  map-name="rsp">
+        <field name="textData" title="Response" map-name="rsp">
             <textarea cols="60" rows="12"/>
         </field>
-        <field name="statusId" >
-           <radio no-current-selected-key="BLOG_DRAFT">
-             <option key="BLOG_PUBLISHED" description="POST"/>
-             <option key="BLOG_DRAFT" description="PREVIEW"/>
-           </radio>
+        <field name="statusId">
+            <radio no-current-selected-key="BLOG_DRAFT">
+                <option key="BLOG_PUBLISHED" description="POST"/>
+                <option key="BLOG_DRAFT" description="PREVIEW"/>
+            </radio>
         </field>
         <field name="submitButton" title="Submit" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
-       <field name="deactivateExisting" >
-                <hidden value="false"/>
+        <field name="deactivateExisting">
+            <hidden value="false"/>
         </field>
-       <field name="contentPurposeString" >
-                <hidden value="RESPONSE"/>
+        <field name="contentPurposeString">
+            <hidden value="RESPONSE"/>
         </field>
         <sort-order>
             <sort-field name="contentName"/>
@@ -125,115 +137,217 @@
             <sort-field name="submitButton"/>
         </sort-order>
     </form>
-    <form name="EditBlogResponse" target="persistBlogResponse" title="" type="single"
-        default-title-style="treeHeader"
-        default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <sort-order>
-            <sort-field name="contentId"/>
-            <sort-field name="contentName"/>
-            <sort-field name="description"/>
-            <sort-field name="textData"/>
-            <sort-field name="statusId"/>
-            <sort-field name="submitButton"/>
-        </sort-order>
-      <auto-fields-entity entity-name="Content" default-field-type="hidden"  map-name="content" />
-      <auto-fields-entity entity-name="DataResource" default-field-type="hidden"  map-name="dataResource" />
+
+    <form name="EditBlogResponse" target="persistBlogResponse" title="" type="single" default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-entity entity-name="Content" default-field-type="hidden" map-name="content"/>
+        <auto-fields-entity entity-name="DataResource" default-field-type="hidden" map-name="dataResource"/>
         <field name="contentName" title="Short title" entry-name="contentName" map-name="rsp">
-          <text size="40"/>
+            <text size="40"/>
         </field>
         <field name="description" title="Slightly longer title (250 chars max)">
-          <textarea cols="40" rows="6"/>
+            <textarea cols="40" rows="6"/>
         </field>
         <field name="contentId" entry-name="contentId" map-name="parameters">
-          <display/>
+            <display/>
         </field>
         <field name="articleContentId" entry-name="articleContentId" map-name="rsp">
-          <hidden/>
+            <hidden/>
         </field>
         <field name="textData" title="Response" map-name="electronicText">
             <textarea cols="60" rows="12"/>
         </field>
-        <field name="statusId" >
-           <radio no-current-selected-key="BLOG_DRAFT">
-             <option key="BLOG_PUBLISHED" description="POST"/>
-             <option key="BLOG_DRAFT" description="PREVIEW"/>
-           </radio>
+        <field name="statusId">
+            <radio no-current-selected-key="BLOG_DRAFT">
+                <option key="BLOG_PUBLISHED" description="POST"/>
+                <option key="BLOG_DRAFT" description="PREVIEW"/>
+            </radio>
         </field>
         <field name="submitButton" title="Submit" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
-       <field name="deactivateExisting" >
-                <hidden value="true"/>
+        <field name="deactivateExisting">
+            <hidden value="true"/>
         </field>
-       <field name="contentPurposeString" >
-                <hidden value="RESPONSE"/>
+        <field name="contentPurposeString">
+            <hidden value="RESPONSE"/>
         </field>
+        <sort-order>
+            <sort-field name="contentId"/>
+            <sort-field name="contentName"/>
+            <sort-field name="description"/>
+            <sort-field name="textData"/>
+            <sort-field name="statusId"/>
+            <sort-field name="submitButton"/>
+        </sort-order>
     </form>
-    <form name="EditBlogAll" target="persistBlogAll" title="" type="upload"
-        default-title-style="treeHeader"
-        skip-end="true"
-        default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <field name="contentIdStart" map-name="view"><hidden/></field>
-        <field name="caContentId" map-name="view"><hidden/></field>
-        <field name="caContentIdTo" map-name="view"><hidden/></field>
-        <field name="caContentAssocTypeId" map-name="view"><hidden/></field>
-        <field name="caFromDate" map-name="view"><hidden/></field>
-        <field name="caThruDate" map-name="view"><hidden/></field>
-        <field name="caContentAssocPredicateId" map-name="view"><hidden/></field>
-        <field name="caDataSourceId" map-name="view"><hidden/></field>
-        <field name="caSequenceNum" map-name="view"><hidden/></field>
-        <field name="caMapKey" map-name="view"><hidden/></field>
-        <field name="caUpperCoordinate" map-name="view"><hidden/></field>
-        <field name="caLeftCoordinate" map-name="view"><hidden/></field>
-        <field name="caCreatedDate" map-name="view"><hidden/></field>
-        <field name="caCreatedByUserLogin" map-name="view"><hidden/></field>
-        <field name="caLastModifiedDate" map-name="view"><hidden/></field>
-        <field name="caLastModifiedByUserLogin" map-name="view"><hidden/></field>
-        <field name="contentTypeId" map-name="view"><hidden/></field>
-        <field name="ownerContentId" map-name="view"><hidden/></field>
-        <field name="instanceOfContentId" map-name="view"><hidden/></field>
-        <field name="dataResourceId" map-name="view"><hidden/></field>
-        <field name="templateDataResourceId" map-name="view"><hidden/></field>
-        <field name="dataSourceId" map-name="view"><hidden/></field>
-        <field name="privilegeEnumId" map-name="view"><hidden/></field>
-        <field name="serviceName" map-name="view"><hidden/></field>
-        <field name="localeString" map-name="view"><hidden/></field>
-        <field name="mimeTypeId" map-name="view"><hidden/></field>
-        <field name="characterSetId" map-name="view"><hidden/></field>
-        <field name="childLeafCount" map-name="view"><hidden/></field>
-        <field name="childBranchCount" map-name="view"><hidden/></field>
-        <field name="createdDate" map-name="view"><hidden/></field>
-        <field name="createdByUserLogin" map-name="view"><hidden/></field>
-        <field name="lastModifiedDate" map-name="view"><hidden/></field>
-        <field name="lastModifiedByUserLogin" map-name="view"><hidden/></field>
-        <field name="drDataResourceId" map-name="view"><hidden/></field>
-        <field name="drDataResourceTypeId" map-name="view"><hidden/></field>
-        <field name="drDataTemplateTypeId" map-name="view"><hidden/></field>
-        <field name="drDataCategoryId" map-name="view"><hidden/></field>
-        <field name="drDataSourceId" map-name="view"><hidden/></field>
-        <field name="drStatusId" map-name="view"><hidden/></field>
-        <field name="drDataResourceName" map-name="view"><hidden/></field>
-        <field name="drLocaleString" map-name="view"><hidden/></field>
-        <field name="drMimeTypeId" map-name="view"><hidden/></field>
-        <field name="drCharacterSetId" map-name="view"><hidden/></field>
-        <field name="drObjectInfo" map-name="view"><hidden/></field>
-        <field name="drRelatedDetailId" map-name="view"><hidden/></field>
-        <field name="drIsPublic" map-name="view"><hidden/></field>
-        <field name="drCreatedDate" map-name="view"><hidden/></field>
-        <field name="drCreatedByUserLogin" map-name="view"><hidden/></field>
-        <field name="drLastModifiedDate" map-name="view"><hidden/></field>
-        <field name="drLastModifiedByUserLogin" map-name="view"><hidden/></field>
-        <field name="deactivateExisting" map-name="view"><hidden/></field>
-        <field name="contentPurposeString" map-name="view"><hidden/></field>          <field name="contentName" title="Short title" map-name="view" >
-          <text size="40"/>
+
+    <form name="EditBlogAll" target="persistBlogAll" title="" type="upload" default-title-style="treeHeader" skip-end="true" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <field name="contentIdStart" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caContentId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caContentIdTo" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caContentAssocTypeId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caFromDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caThruDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caContentAssocPredicateId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caDataSourceId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caSequenceNum" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caMapKey" map-name="view">
+            <hidden/>
         </field>
-        <field name="description" title="Slightly longer title (250 chars max)" map-name="view" >
-          <textarea cols="40" rows="2"/>
+        <field name="caUpperCoordinate" map-name="view">
+            <hidden/>
         </field>
-       <field name="contentId" title="Blog ID"  map-name="parameters" use-when="contentId!=null">
-          <display/>
+        <field name="caLeftCoordinate" map-name="view">
+            <hidden/>
         </field>
-        <field name="summaryData" title="Summary" entry-name="textData" map-name="summaryText" >
+        <field name="caCreatedDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caCreatedByUserLogin" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caLastModifiedDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="caLastModifiedByUserLogin" map-name="view">
+            <hidden/>
+        </field>
+        <field name="contentTypeId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="ownerContentId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="instanceOfContentId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="dataResourceId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="templateDataResourceId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="dataSourceId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="privilegeEnumId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="serviceName" map-name="view">
+            <hidden/>
+        </field>
+        <field name="localeString" map-name="view">
+            <hidden/>
+        </field>
+        <field name="mimeTypeId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="characterSetId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="childLeafCount" map-name="view">
+            <hidden/>
+        </field>
+        <field name="childBranchCount" map-name="view">
+            <hidden/>
+        </field>
+        <field name="createdDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="createdByUserLogin" map-name="view">
+            <hidden/>
+        </field>
+        <field name="lastModifiedDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="lastModifiedByUserLogin" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drDataResourceId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drDataResourceTypeId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drDataTemplateTypeId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drDataCategoryId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drDataSourceId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drStatusId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drDataResourceName" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drLocaleString" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drMimeTypeId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drCharacterSetId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drObjectInfo" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drRelatedDetailId" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drIsPublic" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drCreatedDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drCreatedByUserLogin" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drLastModifiedDate" map-name="view">
+            <hidden/>
+        </field>
+        <field name="drLastModifiedByUserLogin" map-name="view">
+            <hidden/>
+        </field>
+        <field name="deactivateExisting" map-name="view">
+            <hidden/>
+        </field>
+        <field name="contentPurposeString" map-name="view">
+            <hidden/>
+        </field>
+        <field name="contentName" title="Short title" map-name="view">
+            <text size="40"/>
+        </field>
+        <field name="description" title="Slightly longer title (250 chars max)" map-name="view">
+            <textarea cols="40" rows="2"/>
+        </field>
+        <field name="contentId" title="Blog ID" map-name="parameters" use-when="contentId!=null">
+            <display/>
+        </field>
+        <field name="summaryData" title="Summary" entry-name="textData" map-name="summaryText">
             <textarea cols="60" rows="4"/>
         </field>
         <!--
@@ -241,17 +355,17 @@
             <textarea cols="60" rows="12"/>
         </field>
             -->
-        <field name="statusId" >
-           <radio no-current-selected-key="BLOG_DRAFT">
-             <option key="BLOG_PUBLISHED" description="POST"/>
-             <option key="BLOG_DRAFT" description="PREVIEW"/>
-           </radio>
+        <field name="statusId">
+            <radio no-current-selected-key="BLOG_DRAFT">
+                <option key="BLOG_PUBLISHED" description="POST"/>
+                <option key="BLOG_DRAFT" description="PREVIEW"/>
+            </radio>
         </field>
-       <field name="deactivateExisting" >
-                <hidden value="false"/>
+        <field name="deactivateExisting">
+            <hidden value="false"/>
         </field>
-       <field name="contentPurposeString" >
-                <hidden value="ARTICLE"/>
+        <field name="contentPurposeString">
+            <hidden value="ARTICLE"/>
         </field>
         <sort-order>
             <sort-field name="contentId"/>
@@ -263,19 +377,14 @@
             <sort-field name="submitButton"/>
         </sort-order>
     </form>
-    
-    <form name="editFormSubmit" target="" title="" type="single"
-        default-title-style="treeHeader"
-        skip-start="true"
-        skip-end="true"
-        default-tooltip-style="tabletext" default-widget-style="inputBox">
-        <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+
+    <form name="editFormSubmit" target="" title="" type="single" default-title-style="treeHeader" skip-start="true" skip-end="true" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <field name="submitButton" title="Submit" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
     </form>
-    
-    <form name="editFormEnd" target="" title="" type="single"
-        default-title-style="treeHeader"
-        skip-start="true"
-        default-tooltip-style="tabletext" default-widget-style="inputBox">
+
+    <form name="editFormEnd" target="" title="" type="single" default-title-style="treeHeader" skip-start="true" default-tooltip-style="tabletext" default-widget-style="inputBox">        
     </form>
-    
+
 </forms>

Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml?view=diff&rev=507302&r1=507301&r2=507302
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogMenus.xml Tue Feb 13 15:27:03 2007
@@ -1,63 +1,37 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-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
+  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
+  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.
--->
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
-  
-  <menu name="blogmenu" 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-wrapper-style="blogmenuwrapper"
-        title="" type="simple">
-        <menu-item name="BLOGROOTJAZ" title="Andy's Blog" >
-            <link target="MainBlog?contentContentId=BLOGROOTJAZ&amp;currentMenuItemName=BLOGROOTJAZ" target-window="_top" style="tabButton" />
-        </menu-item>
-        <menu-item name="BLOGROOTJONES" title="David's Blog" >
-            <link target="MainBlog?contentContentId=BLOGROOTJONES&amp;currentMenuItemName=BLOGROOTJONES" target-window="_top" style="tabButton" />
-        </menu-item>
-        <menu-item name="all" title="All" >
-            <link target="MainBlog?contentContentId=BLOGROOTJAZ|BLOGROOTJONES&amp;currentMenuItemName=all" target-window="_top" style="tabButton" />
-        </menu-item>
-  </menu>
-  <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-wrapper-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="ViewBlog?articleContentId=${blog.contentId}&amp;caContentId=${blog.contentIdStart}&amp;caContentIdTo=${blog.caContentIdTo}&amp;contentId=${blog.contentId}&amp;caContentAssocTypeId=${blog.caContentAssocTypeId}&amp;caFromDate=${blog.caFromDate}&amp;drDataResourceId=${blog.dataResourceId}" style="tabButton" url-mode="inter-app"/>
-        </menu-item>
-        <menu-item name="edit" title="Edit" >
-          <condition>
-            <and>
-            <if-compare field-name="blog.statusId" operator="not-equals" value="BLOG_PUBLISHED"/>
-            <if-entity-permission entity-id="${blog.contentId}" entity-name="Content" target-operation="CONTENT_UPDATE"/>
-            </and>
-          </condition>
-                      <link  text="Edit" target="EditBlog?caContentId=${blog.contentIdStart}&amp;caContentIdTo=${blog.caContentIdTo}&amp;contentId=${blog.contentId}&amp;caContentAssocTypeId=${blog.caContentAssocTypeId}&amp;caFromDate=${blog.caFromDate}&amp;drDataResourceId=${blog.dataResourceId}" style="tabButton"  url-mode="inter-app"/>
+  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.
+  -->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.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="ViewBlog?articleContentId=${blog.contentId}&amp;caContentId=${blog.contentIdStart}&amp;caContentIdTo=${blog.caContentIdTo}&amp;contentId=${blog.contentId}&amp;caContentAssocTypeId=${blog.caContentAssocTypeId}&amp;caFromDate=${blog.caFromDate}&amp;drDataResourceId=${blog.dataResourceId}" style="buttontext" url-mode="inter-app"/>
         </menu-item>
-  </menu>
+        <menu-item name="edit" title="Edit">
+            <condition>
+                <or>
+                    <if-has-permission permission="CONTENTMGR" action="UPDATE"/>
+                    <if-entity-permission entity-id="${blog.contentId}" entity-name="Content" target-operation="CONTENT_UPDATE"/>
+                </or>
+            </condition>
+            <link text="Edit" target="EditBlog?caContentId=${blog.contentIdStart}&amp;caContentIdTo=${blog.caContentIdTo}&amp;contentId=${blog.contentId}&amp;caContentAssocTypeId=${blog.caContentAssocTypeId}&amp;caFromDate=${blog.caFromDate}&amp;drDataResourceId=${blog.dataResourceId}" style="buttontext" url-mode="inter-app"/>
+        </menu-item>                
+    </menu>
 </menus>