svn commit: r736955 - in /ofbiz/trunk/specialpurpose/myportal: webapp/ webapp/myportal/ webapp/myportal/WEB-INF/ widget/

[hansbak-2]

Author: hansbak
Date: Thu Jan 22 22:04:49 2009
New Revision: 736955

URL: http://svn.apache.org/viewvc?rev=736955&view=rev
Log:
make the democustomer and demoemployee logins work

Added:
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl   (with props)
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl   (with props)
Modified:
    ofbiz/trunk/specialpurpose/myportal/webapp/addAttachFile.ftl
    ofbiz/trunk/specialpurpose/myportal/webapp/attachFileList.ftl
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/addAttachFile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/addAttachFile.ftl?rev=736955&r1=736954&r2=736955&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/addAttachFile.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/addAttachFile.ftl Thu Jan 22 22:04:49 2009
@@ -1,26 +0,0 @@
-  <div id="partyContent" class="screenlet">
-    <div class="screenlet-title-bar">
-      <h3>Attach File</h3>
-    </div>
-    <div class="screenlet-body">
-
-      <div class="label">${uiLabelMap.Attach}</div>
-      <form id="uploadPartyContent" method="post" enctype="multipart/form-data" action="<@ofbizUrl>uploadAttachFiletoEmail</@ofbizUrl>">
-        <input type="hidden" name="dataCategoryId" value="PERSONAL"/>
-        <input type="hidden" name="contentTypeId" value="DOCUMENT"/>
-        <input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
-        <input type="hidden" name="partyId" value="${partyId}" id="contentPartyId"/>
-        <input type="hidden" name="partyContentTypeId" value="USERDEF"/>
-        <input type="hidden" name="roleTypeId" value="CONTENT"/>
-        <input type="hidden" name="communicationEventId" value="${communicationEventId}"/>  
-        <input type="hidden" name="communicationEventTypeId" value="${communicationEventTypeId}"/>        
-        <input type="hidden" name="parentCommEventId" value="${parameters.parentCommEventId?if_exists}"/>
- <input type="hidden" name="originalCommEventId" value="${parameters.originalCommEventId?if_exists}"/>
-              
-        <input type="file" name="uploadedFile" size="25" id="uploadedFile"/>
-        <input type="submit" value="${uiLabelMap.CommonUpload}"/><br><br>
-        <input type="button" value="Back" onClick="javascript:history.go(-1);">
-      </form>
-      <div id='progress_bar'><div></div></div>
-    </div>
-  </div>

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/attachFileList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/attachFileList.ftl?rev=736955&r1=736954&r2=736955&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/attachFileList.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/attachFileList.ftl Thu Jan 22 22:04:49 2009
@@ -1,37 +0,0 @@
-  <div id="partyContentList">  
-    <div class="screenlet-title-bar">
-      <h3>Attached file</h3>
-    </div>
-    <div class="screenlet-body">
-      <#if commEventContent?has_content>
-        <table class="basic-table" cellspacing="0">
-          <#list commEventContent as commContent>
-           <#list partyContent as pContent>
-   <#assign partyId = pContent.partyId/>
-   <#if commContent.contentId == pContent.contentId>
-   <#assign content = pContent.getRelatedOne("Content")>
-   <#assign fromDate = commContent.fromDate>
-   <#assign ptype = pContent.partyContentTypeId/>
-   </#if>
-   </#list>
-            <tr>
-              <td width="30%">
-              <#if content?has_content>
-                <#if (content.contentName?has_content)>
-                    <a href="<@ofbizUrl>img/${content.contentName}?imgId=${content.dataResourceId}</@ofbizUrl>" target="blank"> ${content.contentName?if_exists}</a>
-                </#if>
-               </#if>
-               </td>
-              <td class="button-col" width="20%">
-                <a href="<@ofbizUrl>removeAttachFile/EditCommunicationEvent?partyId=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&communicationEventId=${commContent.communicationEventId}&contentId=${commContent.contentId}&fromDate=${fromDate}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
-              </td>
-              <td  width="20%">${commContent.fromDate?if_exists}</td>
-              <td  width="30%">&nbsp;</td>
-            </tr>
-          </#list>
-        </table>
-      <#else>
-        ${uiLabelMap.PartyNoContent}
-      </#if>
-      </div>
-  </div>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=736955&r1=736954&r2=736955&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Thu Jan 22 22:04:49 2009
@@ -98,7 +98,7 @@
         <security https="true" auth="true"/>
         <event type="service" invoke="createWorkEffort"/>
         <response name="success" type="request" value="myCompanyComms"/>
-        <response name="error" type="view" value="createEvent"/>
+        <response name="error" type="view" value="myCompanyComms"/>
     </request-map>
     <request-map uri="deleteEvent">
         <security https="true" auth="true"/>

Added: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl?rev=736955&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl (added)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl Thu Jan 22 22:04:49 2009
@@ -0,0 +1,26 @@
+  <div id="partyContent" class="screenlet">
+    <div class="screenlet-title-bar">
+      <h3>Attach File</h3>
+    </div>
+    <div class="screenlet-body">
+
+      <div class="label">${uiLabelMap.Attach}</div>
+      <form id="uploadPartyContent" method="post" enctype="multipart/form-data" action="<@ofbizUrl>uploadAttachFiletoEmail</@ofbizUrl>">
+        <input type="hidden" name="dataCategoryId" value="PERSONAL"/>
+        <input type="hidden" name="contentTypeId" value="DOCUMENT"/>
+        <input type="hidden" name="statusId" value="CTNT_PUBLISHED"/>
+        <input type="hidden" name="partyId" value="${partyId}" id="contentPartyId"/>
+        <input type="hidden" name="partyContentTypeId" value="USERDEF"/>
+        <input type="hidden" name="roleTypeId" value="CONTENT"/>
+        <input type="hidden" name="communicationEventId" value="${communicationEventId}"/>  
+        <input type="hidden" name="communicationEventTypeId" value="${communicationEventTypeId}"/>        
+        <input type="hidden" name="parentCommEventId" value="${parameters.parentCommEventId?if_exists}"/>
+ <input type="hidden" name="originalCommEventId" value="${parameters.originalCommEventId?if_exists}"/>
+              
+        <input type="file" name="uploadedFile" size="25" id="uploadedFile"/>
+        <input type="submit" value="${uiLabelMap.CommonUpload}"/><br><br>
+        <input type="button" value="Back" onClick="javascript:history.go(-1);">
+      </form>
+      <div id='progress_bar'><div></div></div>
+    </div>
+  </div>

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/addAttachFile.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl?rev=736955&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl (added)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl Thu Jan 22 22:04:49 2009
@@ -0,0 +1,37 @@
+  <div id="partyContentList">  
+    <div class="screenlet-title-bar">
+      <h3>Attached file</h3>
+    </div>
+    <div class="screenlet-body">
+      <#if commEventContent?has_content>
+        <table class="basic-table" cellspacing="0">
+          <#list commEventContent as commContent>
+           <#list partyContent as pContent>
+   <#assign partyId = pContent.partyId/>
+   <#if commContent.contentId == pContent.contentId>
+   <#assign content = pContent.getRelatedOne("Content")>
+   <#assign fromDate = commContent.fromDate>
+   <#assign ptype = pContent.partyContentTypeId/>
+   </#if>
+   </#list>
+            <tr>
+              <td width="30%">
+              <#if content?has_content>
+                <#if (content.contentName?has_content)>
+                    <a href="<@ofbizUrl>img/${content.contentName}?imgId=${content.dataResourceId}</@ofbizUrl>" target="blank"> ${content.contentName?if_exists}</a>
+                </#if>
+               </#if>
+               </td>
+              <td class="button-col" width="20%">
+                <a href="<@ofbizUrl>removeAttachFile/EditCommunicationEvent?partyId=${partyId}&communicationEventTypeId=EMAIL_COMMUNICATION&communicationEventId=${commContent.communicationEventId}&contentId=${commContent.contentId}&fromDate=${fromDate}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
+              </td>
+              <td  width="20%">${commContent.fromDate?if_exists}</td>
+              <td  width="30%">&nbsp;</td>
+            </tr>
+          </#list>
+        </table>
+      <#else>
+        ${uiLabelMap.PartyNoContent}
+      </#if>
+      </div>
+  </div>
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/attachFileList.ftl
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=736955&r1=736954&r2=736955&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Jan 22 22:04:49 2009
@@ -126,7 +126,7 @@
         extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" use-row-submit="true">
         <field name="portalPageId"><hidden/></field>
         <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
-            <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;portalPageId=${portalPageId}"/>
+            <hyperlink description="${subject}" target="deleteCommunicationEvents?portalPageId=${parameters.portalPageId}"/>
         </field>
         <field name="_rowSubmit" title="S">
             <check />

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=736955&r1=736954&r2=736955&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Thu Jan 22 22:04:49 2009
@@ -31,7 +31,7 @@
                 <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
             </condition>      
             <link
-                target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&amp;portalPageId=${parameters.portalPageId}&amp;partyIdFrom=${userLogin.partyId}&amp;statusId=COM_PENDING"/>
+                target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&amp;portalPageId=${parameters.portalPageId}&amp;statusId=COM_PENDING"/>
         </menu-item>
         <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}">
             <condition>
@@ -96,7 +96,7 @@
             <condition>
                 <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
             </condition>
-            <link target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&amp;portalPageId=${parameters.portalPageId}&amp;partyIdFrom=${userLogin.partyId}&amp;statusId=COM_PENDING"/>
+            <link target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&amp;portalPageId=${parameters.portalPageId}&amp;statusId=COM_PENDING"/>
         </menu-item>
         <menu-item name="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}">
             <condition>
@@ -146,7 +146,7 @@
                     <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
                 </and>
             </condition>
-            <link target="setCommunicationEventRoleStatus?communicationEventId=${parameters.communicationEventId}&amp;partyId=${userLogin.partyId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;statusId=COM_ROLE_COMPLETED"/>
+            <link target="setCommunicationEventRoleStatus?communicationEventId=${parameters.communicationEventId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;statusId=COM_ROLE_COMPLETED"/>
         </menu-item>
         <menu-item name="send" title="${uiLabelMap.CommonSend}">
             <condition>
@@ -165,7 +165,7 @@
                     <if-has-permission permission="PARTYMGR_CME-EMAIL_DELETE"/>
                 </and>
             </condition>
-            <link target="RemoveCommunicationEventRole?communicationEventId=${parameters.communicationEventId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;partyId=${userLogin.partyId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y"/>
+            <link target="RemoveCommunicationEventRole?communicationEventId=${parameters.communicationEventId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y"/>
         </menu-item>
     </menu>
     <menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">