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 2009/02/07 10:03:49 UTC
svn commit: r741861 - in /ofbiz/trunk:
framework/common/webcommon/portal/editPortalPage.ftl
framework/common/widget/PortalPageForms.xml
framework/common/widget/PortalPageScreens.xml
specialpurpose/myportal/data/MyPortalTypeData.xml
Author: hansbak
Date: Sat Feb 7 09:03:49 2009
New Revision: 741861
URL: http://svn.apache.org/viewvc?rev=741861&view=rev
Log:
add screenlets to manageportal pages, add descriptions
Modified:
ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
ofbiz/trunk/framework/common/widget/PortalPageForms.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=741861&r1=741860&r2=741861&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Sat Feb 7 09:03:49 2009
@@ -17,51 +17,36 @@
under the License.
-->
<#if portalPage?has_content>
-<div id="manage-portal-toolbar">
- <div class="portlet-config">
- <div class="portlet-config-title-bar">
- <ul>
- <li class="title">PortalPage : ${portalPage.portalPageName} [${portalPage.portalPageId}]</li>
- <li id="add-column">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddColumn}</a>
- </li>
- </ul>
- </div></div>
- <br class="clear"/>
-</div>
<table width="100%">
- <tr>
- <#list portalPageColumnList?if_exists as portalPageColumn>
- <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> ${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
- <ul>
- <li id="delete-column">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
- </li>
- <li id="add-portlet">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a>
- </li>
- <li id="column-width">
- <select name="setColWidth" onchange="window.location=this.value;">
- <option value="">${uiLabelMap.CommonSetColumnWidth}</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 10> selected</#if> value="<@o...@ofbizUrl>">10%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 20> selected</#if> value="<@o...@ofbizUrl>">20%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 30> selected</#if> value="<@o...@ofbizUrl>">30%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 40> selected</#if> value="<@o...@ofbizUrl>">40%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 50> selected</#if> value="<@o...@ofbizUrl>">50%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 60> selected</#if> value="<@o...@ofbizUrl>">60%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 70> selected</#if> value="<@o...@ofbizUrl>">70%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 80> selected</#if> value="<@o...@ofbizUrl>">80%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 90> selected</#if> value="<@o...@ofbizUrl>">90%</option>
- <option <#if portalPageColumn.columnWidthPercentage?default(0) == 100> selected</#if> value="<@o...@ofbizUrl>">100%</option>
- </select>
- </li>
- </ul>
- </td>
- <#if portalPageColumn_has_next>
- <td> </td>
- </#if>
- </#list>
- </tr>
+ <tr>
+ <#list portalPageColumnList?if_exists as portalPageColumn>
+ <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> ${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
+ <hr/>
+ <ul>
+ <li id="delete-column"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></li>
+ <li id="add-portlet"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a></li>
+ <li id="column-width">
+ <select name="setColWidth" onchange="window.location=this.value;">
+ <option value="">${uiLabelMap.CommonSetColumnWidth}</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 10> selected</#if> value="<@o...@ofbizUrl>">10%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 20> selected</#if> value="<@o...@ofbizUrl>">20%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 30> selected</#if> value="<@o...@ofbizUrl>">30%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 40> selected</#if> value="<@o...@ofbizUrl>">40%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 50> selected</#if> value="<@o...@ofbizUrl>">50%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 60> selected</#if> value="<@o...@ofbizUrl>">60%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 70> selected</#if> value="<@o...@ofbizUrl>">70%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 80> selected</#if> value="<@o...@ofbizUrl>">80%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 90> selected</#if> value="<@o...@ofbizUrl>">90%</option>
+ <option <#if portalPageColumn.columnWidthPercentage?default(0) == 100> selected</#if> value="<@o...@ofbizUrl>">100%</option>
+ </select>
+ </li>
+ </ul>
+ </td>
+ <#if portalPageColumn_has_next>
+ <td> </td>
+ </#if>
+ </#list>
+ </tr>
<tr>
<#list portalPageColumnList?if_exists as portalPageColumn>
<td style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> ${uiLabelMap.CommonWidth}:${portalPageColumn.columnWidthPercentage}%;</#if>">
@@ -70,7 +55,6 @@
<#if (!portlet.columnSeqId?has_content && portalPageColumn_index == 0) || (portlet.columnSeqId?if_exists == portalPageColumn.columnSeqId)>
<#if portlet.screenName?has_content>
<#assign portletUrlLink = "portalPageId="+portalPage.portalPageId+"&portalPortletId="+portlet.portalPortletId+"&portletSeqId="+portlet.portletSeqId+"&parentPortalPageId="+parentPortalPageId/>
-
<div class="portlet-config">
<div class="portlet-config-title-bar">
<ul>
@@ -105,9 +89,9 @@
<option value="">${uiLabelMap.CommonMoveToPortalPage}</option>
<#list portalPages as portalPageList>
- <#if portalPage.portalPageId != portalPageList.portalPageId>
+ <#if portalPage.portalPageId != portalPageList.portalPageId>
<option value="<@o...@ofbizUrl>">${portalPageList.portalPageName}</option>
- </#if>
+ </#if>
</#list>
</select>
</li>
Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=741861&r1=741860&r2=741861&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sat Feb 7 09:03:49 2009
@@ -27,8 +27,8 @@
<script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/>
</actions>
- <field name="portalPageId" title="${uiLabelMap.CommonId}" sort-field="true">
- <hyperlink description="${portalPageId}" target="editPortalPage?portalPageId=${portalPageId}&parentPortalPageId=${userLoginSecurityGroupId}"/>
+ <field name="portalPageId" title="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="editPortalPage?portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}"/>
</field>
<field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
<field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true">
@@ -62,9 +62,9 @@
<script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPages.groovy"/>
</actions>
<field name="parentPortalPageId"><hidden value="${parameters.portalPageId}"/></field>
- <field name="portalPageName" parameter-name="portalPageName"><text/></field>
- <field name="description"><text/></field>
- <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
+ <field name="portalPageName" position="1"><text/></field>
+ <field name="description" position="2"><text/></field>
+ <field name="createButton"><submit button-type="button"/></field>
</form>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=741861&r1=741860&r2=741861&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sat Feb 7 09:03:49 2009
@@ -58,9 +58,16 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListPortalPages" location="component://common/widget/PortalPageForms.xml"/>
- <include-form name="NewPortalPage" location="component://common/widget/PortalPageForms.xml"/>
- <platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
+ <screenlet title="Portal pages for application: ${parameters.parentPortalPageId}">
+ <include-form name="ListPortalPages" location="component://common/widget/PortalPageForms.xml"/>
+ </screenlet>
+ <screenlet title="Add a new portal Page">
+ <include-form name="NewPortalPage" location="component://common/widget/PortalPageForms.xml"/>
+ </screenlet>
+ <screenlet title="Edit portal page: ${portalPage.portalPageName} [${parameters.portalPageId}]">
+ <link target="addPortalPageColumn?portalPageId=${portalPage.portalPageId}&parentPortalPageId=${portalPage.parentPortalPageId}" text="${uiLabelMap.CommonAddColumn}" style="buttontext"/>
+ <platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=741861&r1=741860&r2=741861&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Sat Feb 7 09:03:49 2009
@@ -30,13 +30,13 @@
<!-- no security group -->
<PortalPage portalPageId="MYPORTAL_NONE" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE" sequenceNum="00" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE" />
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE1" sequenceNum="01" portalPageName="My Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="02" portalPageName="My Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="03" portalPageName="Other Communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="04" portalPageName="Company communications" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="05" portalPageName="My Time Sheets" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
- <PortalPage portalPageId="MYPORTAL_EMPLOYEE6" sequenceNum="06" portalPageName="My Tasks" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE" sequenceNum="00" portalPageName="Main" description="The OFBiz My Portal Main page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE" />
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE1" sequenceNum="01" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="02" portalPageName="My Communications" description="The OFBiz My Portal commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="03" portalPageName="Other Communications" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="04" portalPageName="Company communications" description="The OFBiz My Portal Company commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="05" portalPageName="My Time Sheets" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
+ <PortalPage portalPageId="MYPORTAL_EMPLOYEE6" sequenceNum="06" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/>
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="00" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML" />
<PortalPage portalPageId="MYPORTAL_EMPL-NOEML1" sequenceNum="01" portalPageName="My Profile" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/>