svn commit: r1173274 [2/13] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1173274 [2/13] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Tue Sep 20 17:46:13 2011 @@ -126,7 +126,7 @@ public class ContentManagementWorker { * @param suffix a string that can be used to distinguish the signature (probably not used). */ public static String buildPKSig(GenericEntity pk, String suffix) { - String sig = ""; + StringBuilder sig = new StringBuilder(""); Collection<String> keyColl = pk.getPrimaryKey().getAllKeys(); List<String> keyList = UtilMisc.makeListWritable(keyColl); Collections.sort(keyList); @@ -135,15 +135,15 @@ public class ContentManagementWorker { String ky = it.next(); String val = (String)pk.get(ky); if (UtilValidate.isNotEmpty(val)) { - if (sig.length() > 0) sig += "_"; - sig += val; + if (sig.length() > 0) sig.append("_"); + sig.append(val); } } if (UtilValidate.isNotEmpty(suffix)) { - if (sig.length() > 0) sig += "_"; - sig += suffix; + if (sig.length() > 0) sig.append("_"); + sig.append(suffix); } - return sig; + return sig.toString(); } public static void setCurrentEntityMap(HttpServletRequest request, GenericEntity ent) { Modified: ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/content/ContentServices.java Tue Sep 20 17:46:13 2011 @@ -91,7 +91,7 @@ public class ContentServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentAssocRetrievingError", UtilMisc.toMap("errorString", e.toString()), locale)); } - if (targetOperations == null || targetOperations.isEmpty()) { + if (UtilValidate.isEmpty(targetOperations)) { results.put("contentList", contentList); return results; } Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy Tue Sep 20 17:46:13 2011 @@ -31,11 +31,11 @@ surveyQuestionAndApplList = delegator.fi surveyPageList = delegator.findList("SurveyPage", EntityCondition.makeCondition([surveyId : surveyId]), null, ['sequenceNum'], null, false); surveyMultiRespList = delegator.findList("SurveyMultiResp", EntityCondition.makeCondition([surveyId : surveyId]), null, ['multiRespTitle'], null, false); -HtmlFormWrapper createSurveyQuestionWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestion", request, response); +HtmlFormWrapper createSurveyQuestionWrapper = new HtmlFormWrapper("component://content/widget/survey/SurveyForms.xml", "CreateSurveyQuestion", request, response); createSurveyQuestionWrapper.putInContext("surveyId", surveyId); createSurveyQuestionWrapper.putInContext("surveyQuestion", surveyQuestion); -HtmlFormWrapper createSurveyQuestionCategoryWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestionCategory", request, response); +HtmlFormWrapper createSurveyQuestionCategoryWrapper = new HtmlFormWrapper("component://content/widget/survey/SurveyForms.xml", "CreateSurveyQuestionCategory", request, response); createSurveyQuestionCategoryWrapper.putInContext("surveyId", surveyId); if (surveyQuestion && surveyQuestion.surveyQuestionTypeId && "OPTION".equals(surveyQuestion.surveyQuestionTypeId)) { @@ -43,7 +43,7 @@ if (surveyQuestion && surveyQuestion.sur questionOptions = delegator.findList("SurveyQuestionOption", EntityCondition.makeCondition([surveyQuestionId : surveyQuestionId]), null, ['sequenceNum'], null, false); context.questionOptions = questionOptions; - HtmlFormWrapper createSurveyOptionWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestionOption", request, response); + HtmlFormWrapper createSurveyOptionWrapper = new HtmlFormWrapper("component://content/widget/survey/SurveyForms.xml", "CreateSurveyQuestionOption", request, response); // survey question option optionSeqId = parameters.surveyOptionSeqId; Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml Tue Sep 20 17:46:13 2011 @@ -1880,6 +1880,29 @@ under the License. <response name="success" type="view" value="WebSiteSEO"/> <response name="error" type="view" value="WebSiteSEO"/> </request-map> + <!-- WebSiteContactList --> + <request-map uri="WebSiteContactList"> + <security https="true" auth="true"/> + <response name="success" type="view" value="WebSiteContactList"/> + </request-map> + <request-map uri="createWebSiteContactList"> + <security https="true" auth="false"/> + <event type="service" invoke="createWebSiteContactList"/> + <response name="success" type="view" value="WebSiteContactList"/> + <response name="error" type="view" value="WebSiteContactList"/> + </request-map> + <request-map uri="updateWebSiteContactList"> + <security https="true" auth="false"/> + <event type="service" invoke="updateWebSiteContactList"/> + <response name="success" type="view" value="WebSiteContactList"/> + <response name="error" type="view" value="WebSiteContactList"/> + </request-map> + <request-map uri="deleteWebSiteContactList"> + <security https="true" auth="false"/> + <event type="service" invoke="deleteWebSiteContactList"/> + <response name="success" type="view" value="WebSiteContactList"/> + <response name="error" type="view" value="WebSiteContactList"/> + </request-map> <!-- View Mappings --> <view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/> @@ -1920,6 +1943,7 @@ under the License. <view-map name="WebSiteCMSNav" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSNav" type="screen"/> <view-map name="EditWebSiteParties" page="component://content/widget/WebSiteScreens.xml#EditWebSiteParties" type="screen"/> <view-map name="WebSiteSEO" page="component://content/widget/WebSiteScreens.xml#WebSiteSEO" type="screen"/> + <view-map name="WebSiteContactList" page="component://content/widget/WebSiteScreens.xml#WebSiteContactList" type="screen"/> <view-map name="EditContentPurpose" page="component://content/widget/content/ContentScreens.xml#EditContentPurpose" type="screen"/> <view-map name="EditContentRole" page="component://content/widget/content/ContentScreens.xml#EditContentRole" type="screen"/> Modified: ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/web.xml Tue Sep 20 17:46:13 2011 @@ -25,11 +25,6 @@ under the License. <description>Content Manager Module of the Open For Business Project</description> <context-param> - <param-name>webSiteId</param-name> - <param-value>CONTENT_SITE</param-value> - <description>A unique ID used to look up the WebSite entity</description> - </context-param> - <context-param> <param-name>entityDelegatorName</param-name> <param-value>default</param-value> <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/LookupScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/LookupScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/LookupScreens.xml Tue Sep 20 17:46:13 2011 @@ -35,7 +35,7 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-results"> - <include-form name="lookupListLayout" location="component://content/webapp/content/lookup/LookupForms.xml"/> + <include-form name="lookupListLayout" location="component://content/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -56,10 +56,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/> + <include-form name="lookupDataResourceContent" location="component://content/widget/LookupForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupDataResourceContent" location="component://content/webapp/content/lookup/LookupForms.xml"/> + <include-form name="listLookupDataResourceContent" location="component://content/widget/LookupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/SurveyScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/SurveyScreens.xml Tue Sep 20 17:46:13 2011 @@ -40,10 +40,10 @@ under the License. <container style="button-bar"><link text="${uiLabelMap.ContentSurveyCreate}" target="EditSurvey" style="buttontext create"/></container> </decorator-section> <decorator-section name="search-options"> - <include-form name="FindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="FindSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListFindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListFindSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -115,13 +115,13 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleCreateSurvey}"> - <include-form name="EditSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="EditSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.PageTitleEditSurvey} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}"> - <include-form name="EditSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> - <include-form name="BuildSurveyFromPdf" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="EditSurvey" location="component://content/widget/survey/SurveyForms.xml"/> + <include-form name="BuildSurveyFromPdf" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </fail-widgets> </section> @@ -152,17 +152,17 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.ContentSurveyEditSurveyMultiResp}"> - <include-form name="EditSurveyMultiResp" location="component://content/webapp/content/survey/SurveyForms.xml"/> - <include-form name="ListSurveyMultiRespColumns" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="EditSurveyMultiResp" location="component://content/widget/survey/SurveyForms.xml"/> + <include-form name="ListSurveyMultiRespColumns" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ContentSurveyAddSurveyMultiRespColumn}"> - <include-form name="AddSurveyMultiRespColumn" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="AddSurveyMultiRespColumn" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </widgets> </section> </iterate-section> <screenlet title="${uiLabelMap.ContentSurveyAddSurveyMultiResp}"> - <include-form name="AddSurveyMultiResp" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="AddSurveyMultiResp" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -188,14 +188,14 @@ under the License. <platform-specific><html><html-template location="component://content/webapp/content/survey/EditSurveyQuestions.ftl"/></html></platform-specific> <!-- This page is a bit of a mess, so will cleanup/modernize later... - <include-form name="ListSurveyQuestions" location="component://content/webapp/content/survey/SurveyForms.xml"/> - <include-form name="CreateSurveyQuestion" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListSurveyQuestions" location="component://content/widget/survey/SurveyForms.xml"/> + <include-form name="CreateSurveyQuestion" location="component://content/widget/survey/SurveyForms.xml"/> --> <screenlet id="SurveyPagePanel" title="${uiLabelMap.PageTitleEditSurveyPages} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}" collapsible="true"> - <include-form name="AddSurveyPage" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="AddSurveyPage" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> - <include-form name="ListSurveyPages" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListSurveyPages" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -225,13 +225,13 @@ under the License. <parameter param-name="surveyId"/> </link> </container> - <include-form name="FindSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="FindSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ContentSurveyBuildRespondeFromPDF}"> - <include-form name="BuildSurveyResponseFromPdf" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="BuildSurveyResponseFromPdf" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleListSurveyResponse}"> - <include-form name="ListFindSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListFindSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -295,7 +295,7 @@ under the License. <decorator-section name="body"> <container><label style="h1">${uiLabelMap.PageTitleEditSurveyResponse}, ${uiLabelMap.ContentSurveyResponse}: ${parameters.surveyResponseId}, ${uiLabelMap.ContentSurveySurveyId}: ${surveyId}</label></container> <platform-specific><html><html-template location="component://content/webapp/content/survey/EditSurveyResponse.ftl"/></html></platform-specific> - <include-form name="BuildSurveyResponseFromPdf" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="BuildSurveyResponseFromPdf" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -317,10 +317,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="lookupSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="listLookupSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -341,10 +341,10 @@ under the License. <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="lookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="lookupSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listLookupSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="listLookupSurveyResponse" location="component://content/widget/survey/SurveyForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -361,7 +361,7 @@ under the License. <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> - <include-form name="ListFindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/> + <include-form name="ListFindSurvey" location="component://content/widget/survey/SurveyForms.xml"/> </widgets> </section> </screen> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/WebSiteScreens.xml Tue Sep 20 17:46:13 2011 @@ -39,7 +39,7 @@ under the License. <container style="button-bar"> <link text="${uiLabelMap.ContentCreateNewWebSite}" target="EditWebSite" style="buttontext create"/> </container> - <include-form name="ListWebSites" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSites" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -67,7 +67,7 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleEditWebSite}"> - <include-form name="EditWebSite" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="EditWebSite" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> </section> @@ -95,13 +95,13 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleWebSiteContent}"> - <include-form name="ListWebSiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSiteContent" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleCreateWebSiteContent}"> - <include-form name="CreateWebSiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="CreateWebSiteContent" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PageTitleAutoCreateContentPublishPoints}"> - <include-form name="AutoCreateWebsiteContent" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="AutoCreateWebsiteContent" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> </section> @@ -128,9 +128,9 @@ under the License. <section> <widgets> <screenlet id="AddWebSiteRolePanel" title="${uiLabelMap.PageTitleCreateWebSiteParties}" collapsible="true"> - <include-form name="CreateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="CreateWebSiteRole" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> - <include-form name="UpdateWebSiteRole" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="UpdateWebSiteRole" location="component://content/widget/website/WebSiteForms.xml"/> </widgets> </section> </decorator-section> @@ -346,10 +346,10 @@ under the License. <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="search-options"> - <include-form name="FindWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="FindWebSitePathAlias" location="component://content/widget/website/WebSiteForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="ListWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSitePathAlias" location="component://content/widget/website/WebSiteForms.xml"/> </decorator-section> </decorator-screen> </decorator-section> @@ -363,7 +363,7 @@ under the License. <set field="webSiteId" from-field="parameters.webSiteId"/> </actions> <widgets> - <include-form name="ListWebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="ListWebSitePathAlias" location="component://content/widget/website/WebSiteForms.xml"/> </widgets> </section> </screen> @@ -383,7 +383,7 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleWebSiteSEO}"> - <include-form name="CreateWebsiteSEO" location="component://content/webapp/content/website/WebSiteForms.xml"/> + <include-form name="CreateWebsiteSEO" location="component://content/widget/website/WebSiteForms.xml"/> </screenlet> </widgets> </section> @@ -392,4 +392,31 @@ under the License. </widgets> </section> </screen> + <screen name="WebSiteContactList"> + <section> + <actions> + <set field="titleProperty" value="ContentWebSiteContactList"/> + <set field="tabButtonItem" value="WebSiteContactList"/> + <set field="labelTitleProperty" value="ContentWebSiteContactList"/> + <set field="webSiteId" from-field="parameters.webSiteId"/> + <entity-one entity-name="WebSite" value-field="webSite"/> + <entity-and list="webSiteContactLists" entity-name="WebSiteContactList"> + <field-map field-name="webSiteId" from-field="webSiteId"/> + <order-by field-name="-fromDate"/> + </entity-and> + </actions> + <widgets> + <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.ContentWebSiteContactListCreate}"> + <include-form location="component://content/widget/website/WebSiteForms.xml" name="CreateWebSiteContactList"/> + </screenlet> + <screenlet title="${uiLabelMap.ContentWebSiteContactListView} of webSiteId[${webSiteId}]"> + <include-form location="component://content/widget/website/WebSiteForms.xml" name="ViewWebSiteContactList"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/cms/CMSScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/cms/CMSScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/cms/CMSScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/cms/CMSScreens.xml Tue Sep 20 17:46:13 2011 @@ -43,10 +43,10 @@ under the License. <container style="button-bar"><link target="EditAddContent" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/></container> </decorator-section> <decorator-section name="search-options"> - <include-form name="findContent" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="findContent" location="component://content/widget/cms/CMSForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listFindContent" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="listFindContent" location="component://content/widget/cms/CMSForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -100,7 +100,7 @@ under the License. <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditContent}"> - <include-form name="EditContent" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="EditContent" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -140,7 +140,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSEditPage}"> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/> - <include-form name="EditAddContentStuff" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="EditAddContentStuff" location="component://content/widget/cms/CMSForms.xml"/> <content content-id="${contentId}" enable-edit-name="notfound" edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&MASTER_caContentIdTo=${MASTER_caContentIdTo}&MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&MASTER_caFromDate=${MASTER_caFromDate}&MASTER_drDataResourceId=${MASTER_drDataResourceId}&caContentIdTo=${caContentIdTo}"/> </screenlet> </decorator-section> @@ -175,7 +175,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSAddSubContent}"> <link text="${uiLabelMap.ContentGoToFind}" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&${CMSContentFindQueryString}" style="tabletext"/> - <include-form name="EditAddSubContentStuff" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="EditAddSubContentStuff" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -200,7 +200,7 @@ under the License. <platform-specific> <html><html-template location="component://content/webapp/content/cms/AdminSearch.ftl"/></html> </platform-specific> - <include-form name="searchList" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="searchList" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -220,8 +220,8 @@ under the License. <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentCMSSearchPage}"> - <include-form name="AdminIndex" location="component://content/webapp/content/cms/CMSForms.xml"/> - <include-form name="AdminIndexAll" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="AdminIndex" location="component://content/widget/cms/CMSForms.xml"/> + <include-form name="AdminIndexAll" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -283,7 +283,7 @@ under the License. <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ContentTestPermission}"> - <include-form name="TestPermission" location="component://content/webapp/content/cms/CMSForms.xml"/> + <include-form name="TestPermission" location="component://content/widget/cms/CMSForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentForms.xml Tue Sep 20 17:46:13 2011 @@ -495,7 +495,15 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListWebSites" paginate-target="ListWebSite" paginate="true" extends="ListWebSites" extends-resource="component://content/webapp/content/website/WebSiteForms.xml"> + <form name="ListWebSites" type="list" paginate-target="ListWebSite" paginate="true" list-name="webSites" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> + <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}" sort-field="true"><display/></field> + <field name="httpHost" sort-field="true"><display/></field> <field name="webSiteContentTypeId"><display-entity entity-name="WebSiteContentType" description="${description}"/></field> <field name="fromDate"><display type="date"/></field> <field name="thruDate"><display type="date"/></field> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml Tue Sep 20 17:46:13 2011 @@ -174,6 +174,11 @@ under the License. <parameter param-name="webSiteId" from-field="parameters.webSiteId"/> </link> </menu-item> + <menu-item name="WebSiteContactList" title="${uiLabelMap.ContentWebSiteContactList}"> + <link target="WebSiteContactList"> + <parameter param-name="webSiteId" from-field="parameters.webSiteId"/> + </link> + </menu-item> </menu> <menu name="blog" menu-container-style="button-bar tab-bar" default-selected-style="selected" default-menu-item-name="content" default-permission-operation="CONTENT_ADMIN" default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="tabButtonItem" Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentScreens.xml Tue Sep 20 17:46:13 2011 @@ -86,7 +86,7 @@ under the License. <screen name="navigateContent"> <section> <actions> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/> <set field="titleProperty" value="PageTitleNavigateContent"/> <set field="tabButtonItem" value="navigateContent"/> <set field="labelTitleProperty" value="PageTitleNavigateContent"/> @@ -598,7 +598,7 @@ under the License. </widgets> </section> </screen> - + <screen name="ContentSearchOptions"> <section> <actions> @@ -616,7 +616,7 @@ under the License. </widgets> </section> </screen> - + <screen name="ContentSearchResults"> <section> <actions> @@ -634,7 +634,7 @@ under the License. </widgets> </section> </screen> - + <screen name="EditContentKeywords"> <section> <actions> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/contentsetup/ContentSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/contentsetup/ContentSetupScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/contentsetup/ContentSetupScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/contentsetup/ContentSetupScreens.xml Tue Sep 20 17:46:13 2011 @@ -33,9 +33,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentTypePanel" title="${uiLabelMap.PageTitleEditContentType}" collapsible="true"> - <include-form name="AddContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -53,9 +53,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentTypeAttrPanel" title="${uiLabelMap.PageTitleEditContentAttribute}" collapsible="true"> - <include-form name="AddContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentTypeAttr" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentTypeAttr" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentTypeAttr" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -73,9 +73,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentAssocTypePanel" title="${uiLabelMap.PageTitleEditContentAssoc}" collapsible="true"> - <include-form name="AddContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentAssocType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentAssocType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentAssocType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -93,9 +93,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentPurposeTypePanel" title="${uiLabelMap.PageTitleEditContentPurpose}" collapsible="true"> - <include-form name="AddContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentPurposeType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentPurposeType" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentPurposeType" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -113,9 +113,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentAssocPredicatePanel" title="${uiLabelMap.PageTitleEditContentAssocPredicate}" collapsible="true"> - <include-form name="AddContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentAssocPredicate" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentAssocPredicate" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentAssocPredicate" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -133,9 +133,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentPurposeOperationPanel" title="${uiLabelMap.PageTitleEditContentPurposeOperation}" collapsible="true"> - <include-form name="AddContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentPurposeOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentPurposeOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentPurposeOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -175,9 +175,9 @@ under the License. <decorator-screen name="commonContentSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="ContentOperationPanel" title="${uiLabelMap.PageTitleEditContentOperation}" collapsible="true"> - <include-form name="AddContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="AddContentOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </screenlet> - <include-form name="UpdateContentOperation" location="component://content/webapp/content/contentsetup/ContentSetupForms.xml"/> + <include-form name="UpdateContentOperation" location="component://content/widget/contentsetup/ContentSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/datasetup/DataResourceSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/datasetup/DataResourceSetupScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/datasetup/DataResourceSetupScreens.xml Tue Sep 20 17:46:13 2011 @@ -33,9 +33,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceTypePanel" title="${uiLabelMap.PageTitleEditDataResourceType}" collapsible="true"> - <include-form name="AddDataResourceType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataResourceType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateDataResourceType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateDataResourceType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -54,9 +54,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceCharacterSetPanel" title="${uiLabelMap.PageTitleEditDataResourceCharacterSet}" collapsible="true"> - <include-form name="AddCharacterSet" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddCharacterSet" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateCharacterSet" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateCharacterSet" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -75,9 +75,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceTypeAttrPanel" title="${uiLabelMap.PageTitleEditDataResourceTypeAttr}" collapsible="true"> - <include-form name="AddDataResourceTypeAttr" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataResourceTypeAttr" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateDataResourceTypeAttr" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateDataResourceTypeAttr" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -96,9 +96,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="FileExtensionPanel" title="${uiLabelMap.PageTitleEditDataResourceFileExtension}" collapsible="true"> - <include-form name="AddFileExtension" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddFileExtension" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateFileExtension" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateFileExtension" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -117,9 +117,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="MetaDataPredicatePanel" title="${uiLabelMap.PageTitleEditDataResourceMetaDataPredicate}" collapsible="true"> - <include-form name="AddMetaDataPredicate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddMetaDataPredicate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateMetaDataPredicate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateMetaDataPredicate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -138,9 +138,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceMimeTypePanel" title="${uiLabelMap.PageTitleEditDataResourceMimeType}" collapsible="true"> - <include-form name="AddMimeType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddMimeType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateMimeType" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateMimeType" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -159,9 +159,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="MimeTypeHtmlTemplatePanel" title="${uiLabelMap.PageTitleEditDataResourceMimeTypeHtmlTemplate}" collapsible="true"> - <include-form name="CreateMimeTypeHtmlTemplate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="CreateMimeTypeHtmlTemplate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateMimeTypeHtmlTemplate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateMimeTypeHtmlTemplate" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -181,9 +181,9 @@ under the License. <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet id="DataResourceCategoryPanel" title="${uiLabelMap.PageTitleEditDataResourceCategory}" collapsible="true"> - <include-form name="AddDataCategory" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="AddDataCategory" location="component://content/widget/datasetup/DataSetupForms.xml"/> </screenlet> - <include-form name="UpdateDataCategory" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/> + <include-form name="UpdateDataCategory" location="component://content/widget/datasetup/DataSetupForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20100709/applications/content/widget/layout/LayoutScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/content/widget/layout/LayoutScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/content/widget/layout/LayoutScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/content/widget/layout/LayoutScreens.xml Tue Sep 20 17:46:13 2011 @@ -44,10 +44,10 @@ under the License. </container> </decorator-section> <decorator-section name="search-options"> - <include-form name="findLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="findLayout" location="component://content/widget/layout/LayoutForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listFindLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="listFindLayout" location="component://content/widget/layout/LayoutForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -79,7 +79,7 @@ under the License. <parameter param-name="contentIdTo" value="TEMPLATE_MASTER"/> </link> </container> - <include-form name="listListLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="listListLayout" location="component://content/widget/layout/LayoutForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -100,7 +100,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditLayout}"> - <include-form name="EditLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayout" location="component://content/widget/layout/LayoutForms.xml"/> <link target="cloneLayout" text="${uiLabelMap.ContentCloneLayout}" style="buttontext"> <parameter param-name="contentId" from-field="currentValue.contentId"/> </link> @@ -127,7 +127,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditLayoutSubContent}"> - <include-form name="EditLayoutSubContent" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutSubContent" location="component://content/widget/layout/LayoutForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -148,7 +148,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutText" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutText" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -169,7 +169,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutHtml" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutHtml" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -190,7 +190,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutUrl" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutUrl" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -211,7 +211,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <!-- - <include-form name="EditLayoutImage" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="EditLayoutImage" location="component://content/widget/layout/LayoutForms.xml"/> --> </decorator-section> </decorator-screen> @@ -230,7 +230,7 @@ under the License. <decorator-screen name="commonLayoutDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleEditLayout}"> - <include-form name="AddLayout" location="component://content/webapp/content/layout/LayoutForms.xml"/> + <include-form name="AddLayout" location="component://content/widget/layout/LayoutForms.xml"/> </screenlet> </decorator-section> </decorator-screen> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/build.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/build.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/build.xml Tue Sep 20 17:46:13 2011 @@ -32,6 +32,7 @@ under the License. <path id="local.class.path"> <!--<fileset dir="${lib.dir}" includes="*.jar"/>--> <fileset dir="../../framework/base/lib" includes="*.jar"/> + <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> <fileset dir="../../framework/base/build/lib" includes="*.jar"/> <fileset dir="../../framework/entity/lib" includes="*.jar"/> <fileset dir="../../framework/entity/build/lib" includes="*.jar"/> @@ -41,13 +42,16 @@ under the License. <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/> <fileset dir="../../framework/common/build/lib" includes="*.jar"/> <fileset dir="../../applications/securityext/build/lib" includes="*.jar"/> + <fileset dir="../../framework/webapp/lib" includes="*.jar"/> + <fileset dir="../../framework/common/build/lib" includes="*.jar"/> + <fileset dir="../product/build/lib" includes="*.jar"/> </path> <!-- ================================================================== --> <!-- Compilation of the source files --> <!-- ================================================================== --> - <target name="classes" depends="prepare"/> + <!--<target name="classes" depends="prepare"/>--> <!-- ================================================================== --> <!-- Build JavaDoc --> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml Tue Sep 20 17:46:13 2011 @@ -673,6 +673,9 @@ <value xml:lang="zh">å·¥ä½ç»éªï¼å¹´ï¼</value> <value xml:lang="zh_TW">å·¥ä½ç¶é©ï¼å¹´ï¼</value> </property> + <property key="HumanHolidayName"> + <value xml:lang="en">Holiday Name</value> + </property> <property key="HumanResAddEmplLeave"> <value xml:lang="en">Add Employee Leave</value> <value xml:lang="fr">Ajouter le congé</value> @@ -2347,6 +2350,9 @@ <value xml:lang="fr">Rechercher une demande d'emploi</value> <value xml:lang="pt_BR">Procurar pro petição de emrpego</value> </property> + <property key="PageTitleAddPublicHoliday"> + <value xml:lang="en">Add Public Holiday</value> + </property> <property key="PageTitleEditApprovalStatus"> <value xml:lang="en">Edit Approval Status</value> <value xml:lang="fr">Modifier les approbations</value> @@ -2547,6 +2553,12 @@ <value xml:lang="zh">ææèè´£å表</value> <value xml:lang="zh_TW">ææè·è²¬å表</value> </property> + <property key="PageTitlePublicHoliday"> + <value xml:lang="en">Public Holiday</value> + </property> + <property key="PageTitlePublicHolidayList"> + <value xml:lang="en">Public Holiday List</value> + </property> <property key="PageTitleViewEmploymentApp"> <value xml:lang="en">View Employment App</value> <value xml:lang="fr">Voir les demandes d'emploi</value> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResHelpData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResHelpData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResHelpData.xml Tue Sep 20 17:46:13 2011 @@ -28,12 +28,12 @@ under the License. <DataResource dataResourceId="HR_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/humanres/data/helpdata/HELP_HR_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Main Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HR_main" contentTypeId="DOCUMENT" contentName="Human Resources Main." templateDataResourceId="HELP_TEMPL" dataResourceId="HR_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_HR" contentIdTo="HR_main" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HR_main"/> + <ContentAssoc contentId="HELP_HR" contentIdTo="HR_main" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HUMANRES_main"/> <!-- training --> <DataResource dataResourceId="HR_training" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/humanres/data/helpdata/HELP_HR_training.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Human Resources Training Help" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HR_training" contentTypeId="DOCUMENT" contentName="Training." templateDataResourceId="HELP_TEMPL" dataResourceId="HR_training" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_HR" contentIdTo="HR_training" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HR_training"/> + <ContentAssoc contentId="HELP_HR" contentIdTo="HR_training" contentAssocTypeId="TREE_CHILD" fromDate="2009-10-18 01:01:01" sequenceNum="000" mapKey="HUMANRES_training"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/data/HumanResTypeData.xml Tue Sep 20 17:46:13 2011 @@ -110,8 +110,6 @@ under the License. <EmplLeaveType description="Inland Restricted Holiday" hasTable="N" parentTypeId="" leaveTypeId="RESTRICTED_HOLIDAY"/> <EmplLeaveType description="Inland Special Day Off" hasTable="N" parentTypeId="" leaveTypeId="SPECIAL_DAY_OFF"/> - <WebSite webSiteId="HR" siteName="Human Resource Manager" visualThemeSetId="BACKOFFICE"/> - <EnumerationType description="Job Posting Types" enumTypeId="JOB_POSTING" hasTable="N" parentTypeId=""/> <Enumeration description="Internal Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_INTR" sequenceId="01" enumTypeId="JOB_POSTING"/> <Enumeration description="External Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_EXTR" sequenceId="02" enumTypeId="JOB_POSTING"/> @@ -165,5 +163,7 @@ under the License. <PerfRatingType perfRatingTypeId="3" hasTable="N" description="Fulfilled Expectations"/> <PerfRatingType perfRatingTypeId="4" hasTable="N" description="Frequently Exceeds"/> <PerfRatingType perfRatingTypeId="5" hasTable="N" description="Consistently Exceeds"/> - + + <!-- Public Holiday --> + <WorkEffortType workEffortTypeId="PUBLIC_HOLIDAY" description="Public Holiday" hasTable="N"/> </entity-engine-xml> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/data/helpdata/HELP_HR_main.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/data/helpdata/HELP_HR_main.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/data/helpdata/HELP_HR_main.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/data/helpdata/HELP_HR_main.xml Tue Sep 20 17:46:13 2011 @@ -22,6 +22,11 @@ under the License. xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" xmlns="http://docbook.org/ns/docbook"> <title>The Human Resources Main screen.</title> - <para> This is the default tab for the Human Resources Manager application. WIP, to be - continued...</para> + <para> This screen will show the the organization of your company, the top level company is defined in a system setup file: general.properties. + The system will list devisions and departments in the role "Internal organization" as defined in the party relationships + as a "Group member" under it in as many levels as required. + </para> + <para> + related to an "Internal Organization" is an employee position which can be full filled by an employee in an employment. + </para> </section> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/controller.xml Tue Sep 20 17:46:13 2011 @@ -1054,6 +1054,84 @@ under the License. <response name="success" type="view" value="EditEmplLeaveStatus"/> <response name="error" type="view" value="EditEmplLeaveStatus"/> </request-map> + <request-map uri="getHRChild"> + <security auth="false" https="true"/> + <event type="java" path="org.ofbiz.humanres.HumanResEvents" invoke="getChildHRCategoryTree"/> + <response name="success" type="none"/> + </request-map> + <request-map uri="createInternalOrg"> + <security https="true" auth="true"/> + <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="createInternalOrg"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="removeEmlpPosition"> + <security https="true" auth="true"/> + <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="removeEmlpPosition"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="removeInternalOrg"> + <security https="true" auth="true"/> + <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="removeInternalOrg"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="EditEmlPositionFtl"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmlPositionFtl"/> + </request-map> + <request-map uri="EditInternalOrgFtl"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditInternalOrgFtl"/> + </request-map> + <request-map uri="RemoveEmlPositionFtl"> + <security https="true" auth="true"/> + <response name="success" type="view" value="RemoveEmlPositionFtl"/> + </request-map> + <request-map uri="RemoveInternalOrgFtl"> + <security https="true" auth="true"/> + <response name="success" type="view" value="RemoveInternalOrgFtl"/> + </request-map> + <request-map uri="EditPerson"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPerson"/> + </request-map> + <request-map uri="createEmplPositionFtl"> + <security https="true" auth="true"/> + <event type="service" invoke="createEmplPosition"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="EditEmplPosition"/> + </request-map> + <request-map uri="createEmplPositionFulfillmentFtl"> + <security https="true" auth="true"/> + <event type="service" invoke="createEmplPositionFulfillment"/> + <response name="success" type="view" value="main"/> + </request-map> + <request-map uri="PublicHoliday"> + <security https="true" auth="true"/> + <response name="success" type="view" value="PublicHoliday"/> + <response name="error" type="view" value="PublicHoliday"/> + </request-map> + <request-map uri="createPublicHoliday"> + <security https="true" auth="true"/> + <event type="simple" path="component://humanres/script/org/ofbiz/humanres/HumanResEvents.xml" invoke="createPublicHoliday"/> + <response name="success" type="request-redirect-noparam" value="PublicHoliday"/> + <response name="error" type="view-last"/> + </request-map> + <request-map uri="updatePublicHoliday"> + <security https="true" auth="true"/> + <event type="service" invoke="updateWorkEffort"/> + <response name="success" type="request-redirect-noparam" value="PublicHoliday"/> + <response name="error" type="view-last"/> + </request-map> + <request-map uri="deletePublicHoliday"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteWorkEffort"/> + <response name="success" type="view" value="PublicHoliday"/> + <response name="error" type="view-last"/> + </request-map> + <!-- ===================Lookup Request===================== --> <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map> <request-map uri="LookupPayment"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayment"/></request-map> @@ -1152,6 +1230,7 @@ under the License. <view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationTypes"/> <view-map name="EditTerminationReasons" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationReasons"/> <view-map name="EditTrainingTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTrainingTypes"/> + <view-map name="PublicHoliday" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#PublicHoliday"/> <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/> <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#EditEmploymentApps"/> @@ -1162,6 +1241,11 @@ under the License. <view-map name="EditEmplLeaveReasonTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplLeaveReasonTypes"/> <view-map name="FindLeaveApprovals" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#FindLeaveApprovals"/> <view-map name="EditEmplLeaveStatus" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#EditEmplLeaveStatus"/> + <view-map name="EditEmlPositionFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionFtl"/> + <view-map name="EditInternalOrgFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditInternalOrgFtl"/> + <view-map name="RemoveEmlPositionFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#RemoveEmlPositionFtl"/> + <view-map name="RemoveInternalOrgFtl" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#RemoveInternalOrgFtl"/> + <view-map name="EditPerson" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditPerson"/> <!-- ==================Recruitment View Map===================== --> <view-map name="FindJobRequisitions" type="screen" page="component://humanres/widget/RecruitmentScreens.xml#FindJobRequisitions"/> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/webapp/humanres/WEB-INF/web.xml Tue Sep 20 17:46:13 2011 @@ -25,11 +25,6 @@ under the License. <description>HumanRes Manager Module of the Open For Business Project</description> <context-param> - <param-name>webSiteId</param-name> - <param-value>HR</param-value> - <description>A unique ID used to look up the WebSite entity</description> - </context-param> - <context-param> <param-name>entityDelegatorName</param-name> <param-value>default</param-value> <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description> Modified: ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/humanres/widget/CommonScreens.xml Tue Sep 20 17:46:13 2011 @@ -37,6 +37,8 @@ under the License. <set field="activeApp" value="humanres" global="true"/> <set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/> <set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/> <set field="applicationMenuName" value="HumanResAppBar" global="true"/> <set field="applicationMenuLocation" value="component://humanres/widget/HumanresMenus.xml" global="true"/> <set field="applicationTitle" value="${uiLabelMap.HumanResManagerApplication}" global="true"/> @@ -69,12 +71,13 @@ under the License. <section> <actions> <set field="partyId" from-field="defaultOrganizationPartyId"/> + <script location="component://humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy"></script> </actions> <widgets> <screenlet title="${uiLabelMap.FormFieldTitle_company}"> <section> <widgets> - <include-tree name="OrgTree" location="component://humanres/widget/PartyTrees.xml"/> + <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/category/CategoryTree.ftl"/></html></platform-specific> </widgets> </section> </screenlet> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |