Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=617499&r1=617498&r2=617499&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Fri Feb 1 05:48:17 2008 @@ -37,11 +37,35 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container> - <label style="head1" text="${uiLabelMap.PageTitleFindContent}"/> - <include-form name="FindContent" location="component://content/widget/content/ContentForms.xml"/> - <label style="head1" text="${uiLabelMap.PageTitleListContent}"></label> - <include-form name="ListContent" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindContent}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link target="EditContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container> + <include-form name="FindContent" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListContent}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListContent" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -65,7 +89,20 @@ <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="EditContent" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContent}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditContent" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -78,7 +115,7 @@ <set field="title" value="CMS Content Edit Page"/> <set field="titleProperty" value="PageTitleAddContent"/> <set field="currentContentMenuItemName" value="AddContent" to-scope="user"/> - <set field="tabButtonItem" value="content"/> + <set field="tabButtonItem" value="content"/> <set field="titleProperty" value="PageTitleAddContent"/> </actions> <widgets> @@ -107,9 +144,34 @@ <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListContentAssocFrom" location="component://content/widget/content/ContentForms.xml"/> - <label style="head1" text="${uiLabelMap.PageTitleListAssociations} '${uiLabelMap.CommonTo}'"></label> - <include-form name="ListContentAssocTo" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContentAssoc}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListContentAssocFrom" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListAssociations} '${uiLabelMap.CommonTo}'"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListContentAssocTo" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> <section> <condition> <and> @@ -120,8 +182,20 @@ </and> </condition> <widgets> - <label style="head1" text="${uiLabelMap.PageTitleEditAssociation}"></label> - <include-form name="EditContentAssoc" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditAssociation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditContentAssoc" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> <section> @@ -134,8 +208,20 @@ </or> </condition> <widgets> - <label style="head1" text="${uiLabelMap.PageTitleAddAssociation}"></label> - <include-form name="AddContentAssoc" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddAssociation}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddContentAssoc" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> </decorator-section> @@ -160,9 +246,34 @@ <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListContentRole" location="component://content/widget/content/ContentForms.xml"/> - <label style="head1" text="${uiLabelMap.PageTitleAddRole}"></label> - <include-form name="AddContentRole" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContentRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListContentRole" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddContentRole" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -183,9 +294,34 @@ <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListContentPurpose" location="component://content/widget/content/ContentForms.xml"/> - <label style="head1" text="${uiLabelMap.PageTitleAddPurpose}"></label> - <include-form name="AddContentPurpose" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContentPurpose}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListContentPurpose" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddPurpose}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddContentPurpose" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -206,9 +342,34 @@ <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/> - <label style="head1" text="${uiLabelMap.PageTitleAddAttribute}"></label> - <include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContentAttribute}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListContentAttribute" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddAttribute}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddContentAttribute" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -230,9 +391,34 @@ <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListContentMetaData" location="component://content/widget/content/ContentForms.xml"/> - <label style="head1" text="${uiLabelMap.PageTitleAddMetaData}"></label> - <include-form name="AddContentMetaData" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContentMetadata}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListContentMetaData" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddMetaData}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddContentMetaData" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -253,9 +439,34 @@ <widgets> <decorator-screen name="commonContentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListWorkEffortContents" location="component://content/widget/content/ContentForms.xml"/> - <label style="head1" text="${uiLabelMap.PageTitleAddWorkEffort}"></label> - <include-form name="AddWorkEffortContent" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContentWorkEffort}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListWorkEffortContents" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddWorkEffort}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddWorkEffortContent" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -273,11 +484,24 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="LookupContent" location="component://content/widget/content/ContentForms.xml"/> - <include-form name="ListLookupContent" location="component://content/widget/content/ContentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleLookupContent}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupContent" location="component://content/widget/content/ContentForms.xml"/> + <include-form name="ListLookupContent" location="component://content/widget/content/ContentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=617499&r1=617498&r2=617499&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Fri Feb 1 05:48:17 2008 @@ -20,34 +20,38 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListForumGroups" type="list" list-name="forumGroups" separate-columns="true"> - <field name="select" widget-style="tabButton" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForums?forumGroupId=${contentId}" description="forums"/></field> + <form name="ListForumGroups" type="list" list-name="forumGroups" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForums?forumGroupId=${contentId}" description="forums"/></field> <field name="forumGroupName" entry-name="contentName" parameter-name="contentName"><text/></field> <field name="forumGroupDescription" entry-name="description" parameter-name="description"><text/></field> - <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field> + <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="AddForumGroup" type="single" target="createForumGroup" title="" default-map-name="forumGroup"> + <form name="AddForumGroup" type="single" target="createForumGroup" title="" default-map-name="forumGroup" + header-row-style="header-row" default-table-style="basic-table"> <field name="forumGroupName" parameter-name="contentName"><text/></field> <field name="forumGroupDescription" parameter-name="description"><text/></field> <field name="contentTypeId"><hidden value="FORUM_ROOT"/></field> <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListForums" type="list" list-name="forums" separate-columns="true" target="updateForum"> + <form name="ListForums" type="list" list-name="forums" separate-columns="true" target="updateForum" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="contentIdTo"><hidden value="${caContentIdTo}"/></field> <field name="contentAssocTypeId"><hidden value="${caContentAssocTypeId}"/></field> <field name="contentTypeId"><hidden/></field> - <field name="select" widget-style="tabButton" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForumMessages?forumGroupId=${parameters.forumGroupId}&forumId=${contentId}" description="Msgs"/></field> + <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForumMessages?forumGroupId=${parameters.forumGroupId}&forumId=${contentId}" description="${uiLabelMap.ForumMessages}"/></field> <field name="forumName" entry-name="contentName" parameter-name="contentName"><text/></field> <field name="forumDescription" entry-name="description" parameter-name="description"><text/></field> <field name="thruDate" entry-name="caThruDate"><date-time/></field> - <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field> - <field name="deleteButton" title="${uiLabelMap.CommonDelete}"><hyperlink target="updateForum?forumGroupId=${parameters.forumGroupId}&contentIdTo=${parameters.forumGroupId}&contentId=${contentId}&contentAssocTypeId=${caContentAssocTypeId}&fromDate=${caFromDate}&deactivateExisting=yes" description="${uiLabelMap.CommonDelete}"/></field> + <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> + <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForum?forumGroupId=${parameters.forumGroupId}&contentIdTo=${parameters.forumGroupId}&contentId=${contentId}&contentAssocTypeId=${caContentAssocTypeId}&fromDate=${caFromDate}&deactivateExisting=yes" description="${uiLabelMap.CommonDelete}"/></field> <field name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate.toString().substring(0,10)}"/></field> <field name="nbrOfMessages" entry-name="childBranchCount"><display/></field> </form> - <form name="AddForum" type="single" target="createForum"> + <form name="AddForum" type="single" target="createForum" + header-row-style="header-row" default-table-style="basic-table"> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="forumName" parameter-name="contentName"><text/></field> <field name="forumDescription" parameter-name="description"><text/></field> @@ -59,14 +63,16 @@ <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ForumGroupPurposes" type="list" list-name="forumPurposes" target="deleteForumGroupPurpose" separate-columns="true"> + <form name="ForumGroupPurposes" type="list" list-name="forumPurposes" target="deleteForumGroupPurpose" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="ContentPurpose" default-field-type="edit"/> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field> <field name="contentPurposeTypeId"><display-entity entity-name="ContentPurposeType" description="${description}"/></field> <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddForumGroupPurpose" type="single" target="createForumGroupPurpose" title=""> + <form name="AddForumGroupPurpose" type="single" target="createForumGroupPurpose" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ContentPurpose" default-field-type="edit"/> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field> @@ -77,7 +83,8 @@ <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ForumGroupRoles" type="list" list-name="forumRoles" target="updateForumGroupRole" separate-columns="true"> + <form name="ForumGroupRoles" type="list" list-name="forumRoles" target="updateForumGroupRole" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-entity entity-name="ContentRole" default-field-type="edit"/> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field> @@ -87,7 +94,8 @@ <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field> <field name="deleteButton" title="${uiLabelMap.CommonDelete}"><hyperlink target="deleteForumGroupRole?forumGroupId=${parameters.forumGroupId}&contentIdTo=${parameters.forumGroupId}&contentId=${contentId}&partyId=${partyId}&roleTypeId=${roleTypeId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/></field> </form> - <form name="AddForumGroupRole" type="single" target="createForumGroupRole" default-map-name=""> + <form name="AddForumGroupRole" type="single" target="createForumGroupRole" default-map-name="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="ContentRole" default-field-type="edit"/> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field> @@ -101,7 +109,8 @@ <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListForumMessages" type="list" list-name="forumMessages" separate-columns="true" target="updateForumMessage"> + <form name="ListForumMessages" type="list" list-name="forumMessages" separate-columns="true" target="updateForumMessage" + odd-row-style="alternate-row" default-table-style="basic-table"> <row-actions> <service service-name="getContentAndDataResource" result-map-name="contentData"> <field-map field-name="contentId" env-name="contentId"/> @@ -118,13 +127,14 @@ <field position="2" name="createdBy" entry-name="createdByUserLogin"><display/></field> <field position="3" name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field> <field position="4" name="thruDate" entry-name="caThruDate"><display description="${bsh:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field> - <field position="5" name="deleteButton" title="${uiLabelMap.CommonDelete}"><hyperlink target="updateForumMessage?forumGroupId=${parameters.forumGroupId}&forumId=${parameters.forumId}&contentIdTo=${caContentIdTo}&contentId=${caContentId}&contentAssocTypeId=${caContentAssocTypeId}&fromDate=${caFromDate}&deactivateExisting=yes" description="${uiLabelMap.CommonDelete}"/></field> + <field position="5" name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForumMessage?forumGroupId=${parameters.forumGroupId}&forumId=${parameters.forumId}&contentIdTo=${caContentIdTo}&contentId=${caContentId}&contentAssocTypeId=${caContentAssocTypeId}&fromDate=${caFromDate}&deactivateExisting=yes" description="${uiLabelMap.CommonDelete}"/></field> <field position="6" name="messageText" entry-name="contentData.resultData.electronicText.textData" parameter-name="textData"><textarea rows="8"/></field> - <field position="7" name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field> - <field position="8" name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}"><hyperlink target="addForumMessage?forumGroupId=${parameters.forumGroupId}&forumId=${parameters.forumId}&forumMessageIdTo=${contentId}&contentAssocTypeId=RESPONSE" description="${uiLabelMap.FormFieldTitle_reponse}"/></field> + <field position="7" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field> + <field position="8" name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext"><hyperlink target="addForumMessage?forumGroupId=${parameters.forumGroupId}&forumId=${parameters.forumId}&forumMessageIdTo=${contentId}&contentAssocTypeId=RESPONSE" description="${uiLabelMap.FormFieldTitle_reponse}"/></field> </form> - <form name="EditForumMessage" type="single" target="updateForumMessage" default-map-name="message"> + <form name="EditForumMessage" type="single" target="updateForumMessage" default-map-name="message" + header-row-style="header-row" default-table-style="basic-table"> <actions> <service service-name="getContentAndDataResource" result-map-name="contentData"> <field-map field-name="contentId" env-name="parameters.forumMessageId"/> @@ -157,7 +167,8 @@ <field name="forumMessageText" parameter-name="textData"><textarea rows="10"/></field> <field name="addButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddForumMessage" type="single" target="updateForumMessage" default-map-name="message"> + <form name="AddForumMessage" type="single" target="updateForumMessage" default-map-name="message" + header-row-style="header-row" default-table-style="basic-table"> <field name="VIEW_INDEX"><hidden value="${parameters.VIEW_INDEX}"/></field> <field name="threadView"><hidden value="${parameters.threadView}"/></field> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> @@ -172,9 +183,11 @@ <field name="forumMessageText" parameter-name="textData"><textarea rows="10" visual-editor-enable="true" visual-editor-buttons="undo redo bold italic underline bullet indent outdent link"/></field> <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddForumThreadMessage" type="single" extends="AddForumMessage" target="updateForumThreadMessage"/> + <form name="AddForumThreadMessage" type="single" extends="AddForumMessage" target="updateForumThreadMessage" + header-row-style="header-row" default-table-style="basic-table"/> - <form name="EditForumThreadMessage" type="single" target="updateForumThreadMessage"> + <form name="EditForumThreadMessage" type="single" target="updateForumThreadMessage" + header-row-style="header-row" default-table-style="basic-table"> <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field> <field name="forumId"><hidden value="${parameters.forumId}"/></field> <field name="rsp.contentId" parameter-name="contentId"><hidden/></field> @@ -190,4 +203,4 @@ <field name="textData"><textarea rows="8"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml?rev=617499&r1=617498&r2=617499&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml Fri Feb 1 05:48:17 2008 @@ -27,10 +27,10 @@ </menu> <menu name="ForumTabBar" default-menu-item-name="Survey" type="simple"> </menu> - <menu name="ForumMessagesTabBar" type="simple"> + <menu name="ForumMessagesTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected"> <menu-item name="forumGroups" title="${uiLabelMap.FormFieldTitle_forumGroups}"><link target="findForumGroups"/></menu-item> <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums?forumGroupId=${parameters.forumGroupId}"/></menu-item> <menu-item name="messageList" title="${uiLabelMap.FormFieldTitle_messageList}"><link target="findForumMessages?forumGroupId=${parameters.forumGroupId}&forumId=${parameters.forumId}"/></menu-item> <menu-item name="messageThread" title="${uiLabelMap.FormFieldTitle_messageThread}"><link target="findForumThreads?forumGroupId=${parameters.forumGroupId}&forumId=${parameters.forumId}"/></menu-item> </menu> -</menus> +</menus> \ No newline at end of file Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=617499&r1=617498&r2=617499&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Fri Feb 1 05:48:17 2008 @@ -39,9 +39,34 @@ <if-has-permission permission="CONTENTMGR" action="_VIEW"/> </condition> <widgets> - <include-form name="ListForumGroups" location="component://content/widget/forum/ForumForms.xml"/> - <label style="head1" text="${uiLabelMap.ForumGroupCreate}"/> - <include-form name="AddForumGroup" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindForumGroup}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListForumGroups" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumGroupCreate}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddForumGroup" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> <label style="head3">You do not have permission to view this page. ("CONTENTMGR_VIEW" or "CONTENTMGR_ADMIN" needed)</label> @@ -71,9 +96,34 @@ <widgets> <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListForums" location="component://content/widget/forum/ForumForms.xml"/> - <label style="head1" text="${uiLabelMap.ForumAddTo} "${forumGroup.contentName}""/> - <include-form name="AddForum" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindForums}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListForums" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddTo} ${forumGroup.contentName}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddForum" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -98,9 +148,34 @@ <widgets> <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ForumGroupRoles" location="component://content/widget/forum/ForumForms.xml"/> - <label style="head1" text="${uiLabelMap.ForumAddRoleTo} "${forumGroup.contentName}" [${forumGroup.contentId}]"/> - <include-form name="AddForumGroupRole" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleForumGroupRoles}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ForumGroupRoles" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddRoleTo} ${forumGroup.contentName} [${forumGroup.contentId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddForumGroupRole" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -125,9 +200,34 @@ <widgets> <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ForumGroupPurposes" location="component://content/widget/forum/ForumForms.xml"/> - <label style="head1" text="${uiLabelMap.ForumAddPurposeTo} "${forumGroup.contentName}" [${forumGroup.contentId}]"/> - <include-form name="AddForumGroupPurpose" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleForumGroupPurposes}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ForumGroupPurposes" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddPurposeTo} ${forumGroup.contentName} [${forumGroup.contentId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddForumGroupPurpose" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -161,10 +261,33 @@ <if-has-permission permission="CONTENTMGR" action="_VIEW"/> </condition> <widgets> - <container> - <include-form name="ListForumMessages" location="component://content/widget/forum/ForumForms.xml"/> - <label style="head1" text="${uiLabelMap.ForumAddThreadTo}: ${forum.description}" ></label> - <include-form name="AddForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddPurposeTo} ${forumGroup.contentName} [${forumGroup.contentId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListForumMessages" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddThreadTo} ${forum.description}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> </container> </widgets> <fail-widgets> @@ -222,14 +345,39 @@ <if-has-permission permission="CONTENTMGR" action="_VIEW"/> </condition> <widgets> - <include-tree name="MessageTree" location="component://content/widget/forum/ForumTrees.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindForumMessages}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-tree name="MessageTree" location="component://content/widget/forum/ForumTrees.xml" /> + </widgets> + </section> + </container> + </container> <section> <condition> <not><if-empty field-name="requestParameters.forumThreadId"/></not> </condition> <widgets> - <label text="thread: ${requestParameters.forumThreadId}"></label> - <include-form name="EditForumThread" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumThread} ${requestParameters.forumThreadId}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditForumThread" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> <section> @@ -237,8 +385,20 @@ <not><if-empty field-name="requestParameters.forumMessageId"/></not> </condition> <widgets> - <label text="Message: ${requestParameters.forumMessageId}"></label> - <include-form name="EditForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumMessage} ${requestParameters.forumMessageId}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> </section> </widgets> @@ -264,8 +424,20 @@ <widgets> <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <label text="Add a response to message: ${contentData.resultData.content.description}"></label> - <include-form name="EditForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddResponseToMessage} ${contentData.resultData.content.description}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -288,8 +460,20 @@ <widgets> <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <label text="Add a response to message: ${forumMessage.description}"></label> - <include-form name="AddForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddResponseToMessage} ${forumMessage.description}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddForumMessage" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -311,11 +495,23 @@ <widgets> <decorator-screen name="commonForumDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <label text="Add a response to message: ${forumMessage.description}[${forumMessage.contentId}]"></label> - <include-form name="AddForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ForumAddResponseToMessage} ${forumMessage.description} [${forumMessage.contentId}]"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file |
Free forum by Nabble | Edit this page |