svn commit: r1039651 [9/38] - in /ofbiz/branches/jquery: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/commonext/config/ applications/content/config/ applications/content/we...

Modified: ofbiz/branches/jquery/applications/content/webapp/content/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/survey/SurveyForms.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/webapp/content/survey/SurveyForms.xml (original)
+++ ofbiz/branches/jquery/applications/content/webapp/content/survey/SurveyForms.xml Sat Nov 27 10:59:21 2010
@@ -41,12 +41,13 @@ under the License.
             <service result-map-list="listIt" result-map="result" service-name="performFind">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Survey"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>
         </actions>
         <auto-fields-entity entity-name="Survey" default-field-type="display"/>
-        <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}" widget-style="buttontext">
+        <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}" widget-style="buttontext" sort-field="true">
             <hyperlink description="${surveyId}" target="EditSurvey" also-hidden="false">
                 <parameter param-name="surveyId"/>
             </hyperlink>

Modified: ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteForms.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteForms.xml (original)
+++ ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteForms.xml Sat Nov 27 10:59:21 2010
@@ -58,14 +58,20 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
     <form name="ListWebSites" target="" title="" type="list" list-name="webSites" paginate-target="FindWebSite" paginate="true"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="webSiteId" title="${uiLabelMap.CommonId}" widget-style="buttontext">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <actions>
+            <set field="parameters.sortField" from-field="parameters.sortField" default-value="-webSiteId"/>
+            <entity-condition entity-name="WebSite" list="webSites">
+                <order-by field-name="${parameters.sortField}"/>
+            </entity-condition>
+        </actions>
+        <field name="webSiteId" title="${uiLabelMap.CommonId}" widget-style="buttontext" sort-field="true">
             <hyperlink description="${webSiteId}" target="EditWebSite" also-hidden="false">
                 <parameter param-name="webSiteId"/>
             </hyperlink>
         </field>
-        <field name="siteName" title="${uiLabelMap.CommonName}"><display/></field>
-        <field name="httpHost"><display/></field>
+        <field name="siteName" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
+        <field name="httpHost" sort-field="true"><display/></field>
     </form>
 
     <form name="WebSitePathAlias" target="" title="" type="list" list-name="aliases" paginate-target="WebSiteAliases" paginate="true"

Modified: ofbiz/branches/jquery/applications/content/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/SurveyScreens.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/branches/jquery/applications/content/widget/SurveyScreens.xml Sat Nov 27 10:59:21 2010
@@ -205,7 +205,7 @@ under the License.
         <section>
             <actions>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
-            <set field="titleProperty" value="PageTitleFindSurveyResponse"/>
+                <set field="titleProperty" value="PageTitleFindSurveyResponse"/>
                 <set field="tabButtonItem" value="FindSurveyResponse"/>
                 <set field="labelTitleProperty" value="PageTitleFindSurveyResponse"/>
 
@@ -355,6 +355,11 @@ under the License.
             <condition>
                 <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
             </condition>
+            <actions>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <include-form name="ListFindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/>
             </widgets>

Modified: ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml Sat Nov 27 10:59:21 2010
@@ -26,10 +26,6 @@ under the License.
                 <set field="titleProperty" value="PageTitleFindWebSite"/>
                 <set field="headerItem" value="websites"/>
                 <set field="labelTitleProperty" value="PageTitleFindWebSite"/>
-
-                <entity-condition entity-name="WebSite" list="webSites">
-                    <order-by field-name="webSiteId"/>
-                </entity-condition>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml">

Modified: ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml Sat Nov 27 10:59:21 2010
@@ -73,34 +73,34 @@ under the License.
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
                 <field-map field-name="entityName" value="Content"/>
-                <field-map field-name="orderBy" value="contentId"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
                 <field-map field-name="viewIndex" from-field="viewIndex"/>
                 <field-map field-name="viewSize" from-field="viewSize"/>
             </service>
         </actions>
 
         <field name="contentId"><hidden/></field>
-        <field name="contentName" widget-style="tabletext">
+        <field name="contentName" widget-style="tabletext" sort-field="true">
             <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
                 <sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext">
                     <parameter param-name="contentId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="description"><display/></field>
-        <field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field>
-        <field name="localeString"><display-entity entity-name="CountryCode" key-field-name="countryCode" description="${countryName}[${countryCode}]"></display-entity></field>
-        <field name="contentTypeId"><display-entity entity-name="ContentType"></display-entity></field>
-        <field name="mimeTypeId"><display-entity entity-name="MimeType"></display-entity></field>
-        <field name="dataResourceId" use-when="dataResourceId==null"><display/></field>
-        <field name="dataResourceId" use-when="dataResourceId!=null">
-                <display-entity entity-name="DataResource" description="${dataResourceName}">
-                    <sub-hyperlink target="EditDataResource" link-style="buttontext" description="[${dataResourceId}]">
+        <field name="description" sort-field="true"><display/></field>
+        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem"></display-entity></field>
+        <field name="localeString" sort-field="true"><display-entity entity-name="CountryCode" key-field-name="countryCode" description="${countryName}[${countryCode}]"></display-entity></field>
+        <field name="contentTypeId" sort-field="true"><display-entity entity-name="ContentType"></display-entity></field>
+        <field name="mimeTypeId" sort-field="true"><display-entity entity-name="MimeType"></display-entity></field>
+        <field name="dataResourceId" use-when="dataResourceId==null" sort-field="true"><display/></field>
+        <field name="dataResourceId" use-when="dataResourceId!=null" sort-field="true">
+            <display-entity entity-name="DataResource" description="${dataResourceName}">
+                <sub-hyperlink target="EditDataResource" link-style="buttontext" description="[${dataResourceId}]">
                     <parameter param-name="dataResourceId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="ownerContentId">
+        <field name="ownerContentId" sort-field="true">
             <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
                 <sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext">
                     <parameter param-name="contentId"/>

Modified: ofbiz/branches/jquery/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/ContentMenus.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/branches/jquery/applications/content/widget/content/ContentMenus.xml Sat Nov 27 10:59:21 2010
@@ -190,7 +190,7 @@ under the License.
         <menu-item name="NewBlog" title="${uiLabelMap.ContentCreateNewBlog}" widget-style="buttontext create">
             <link target="editBlog"/>
         </menu-item>
-        <menu-item name="NewBlogArticle" title="${uiLabelMap.ContentCreateNewBlogArticle}">
+        <menu-item name="NewBlogArticle" title="${uiLabelMap.ContentCreateNewBlogArticle}" widget-style="buttontext create">
             <condition>
                 <if-compare field="tabButtonItem" operator="equals" value="Articles"/>
             </condition>

Modified: ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml Sat Nov 27 10:59:21 2010
@@ -72,6 +72,7 @@ under the License.
             </condition>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
                 <include-form name="ListContent" location="component://content/widget/content/ContentForms.xml"/>

Modified: ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml Sat Nov 27 10:59:21 2010
@@ -69,28 +69,28 @@ under the License.
     <form name="ListDataResource" target="" title="" list-name="listIt" type="list" paginate-target="findDataResource"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-          <service service-name="performFind" result-map="result" result-map-list="listIt">
-            <field-map field-name="inputFields" from-field="parameters"/>
-            <field-map field-name="entityName" value="DataResource"/>
-            <field-map field-name="orderBy" value="dataResourceId"/>
-            <field-map field-name="viewIndex" from-field="viewIndex"/>
-            <field-map field-name="viewSize" from-field="viewSize"/>
-          </service>
+            <service service-name="performFind" result-map="result" result-map-list="listIt">
+                <field-map field-name="inputFields" from-field="parameters"/>
+                <field-map field-name="entityName" value="DataResource"/>
+                <field-map field-name="orderBy" from-field="parameters.sortField"/>
+                <field-map field-name="viewIndex" from-field="viewIndex"/>
+                <field-map field-name="viewSize" from-field="viewSize"/>
+            </service>
         </actions>
         <field name="dataResourceId"><hidden/></field>
-        <field name="dataResourceName" widget-style="tabletext">
+        <field name="dataResourceName" widget-style="tabletext" sort-field="true">
             <display-entity entity-name="DataResource" description="${dataResourceName}" key-field-name="dataResourceId">
                 <sub-hyperlink target="EditDataResource" description="[${dataResourceId}]" link-style="buttontext">
                     <parameter param-name="dataResourceId"/>
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="dataResourceTypeId"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field>
-        <field name="mimeTypeId"><display-entity entity-name="MimeType" description="${description}"></display-entity></field>
-        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
-        <field name="localeString"><display-entity entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"></display-entity></field>
-        <field name="createdByUserLogin"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
-        <field name="dataCategoryId"><display-entity entity-name="DataCategory" description="${categoryName}[${dataCategoryId}]"></display-entity></field>
+        <field name="dataResourceTypeId" sort-field="true"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field>
+        <field name="mimeTypeId" sort-field="true"><display-entity entity-name="MimeType" description="${description}"></display-entity></field>
+        <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"></display-entity></field>
+        <field name="localeString" sort-field="true"><display-entity entity-name="CountryCode" description="${countryName}[${countryCode}]" key-field-name="countryCode"></display-entity></field>
+        <field name="createdByUserLogin" sort-field="true"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
+        <field name="dataCategoryId" sort-field="true"><display-entity entity-name="DataCategory" description="${categoryName}[${dataCategoryId}]"></display-entity></field>
         <on-event-update-area event-type="paginate" area-id="search-results" area-target="findDataResourceSearchResults"/>
     </form>