moved some templates

added support for some special mail headers

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@844 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog
index b973e9b9a4bb3db7e9255fd2316e20b4b9a543d0..397cf7e522e306741ae4b6246132cffd3636ca3d 100644 (file)
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * MailerUI/UIxMailView.wox: added support for list headers, for the
+         organization header, for some spam-assassin and virus scanning fields
+
+       * moved remaining mail templates to Templates/MailerUI/
+
 2005-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxMailToSelection.wox: changed inclusion of JavaScript to resource

diff --git a/SOGo/UI/Templates/UIxMailAccountView.wox b/SOGo/UI/Templates/MailerUI/UIxMailAccountView.wox
similarity index 100%
rename from SOGo/UI/Templates/UIxMailAccountView.wox
rename to SOGo/UI/Templates/MailerUI/UIxMailAccountView.wox

diff --git a/SOGo/UI/Templates/UIxMailAccountsView.wox b/SOGo/UI/Templates/MailerUI/UIxMailAccountsView.wox
similarity index 100%
rename from SOGo/UI/Templates/UIxMailAccountsView.wox
rename to SOGo/UI/Templates/MailerUI/UIxMailAccountsView.wox

diff --git a/SOGo/UI/Templates/UIxMailAddressbook.wox b/SOGo/UI/Templates/MailerUI/UIxMailAddressbook.wox
similarity index 100%
rename from SOGo/UI/Templates/UIxMailAddressbook.wox
rename to SOGo/UI/Templates/MailerUI/UIxMailAddressbook.wox

diff --git a/SOGo/UI/Templates/UIxMailToSelection.wox b/SOGo/UI/Templates/MailerUI/UIxMailToSelection.wox
similarity index 100%
rename from SOGo/UI/Templates/UIxMailToSelection.wox
rename to SOGo/UI/Templates/MailerUI/UIxMailToSelection.wox

diff --git a/SOGo/UI/Templates/MailerUI/UIxMailView.wox b/SOGo/UI/Templates/MailerUI/UIxMailView.wox
index be283004f135bab28fda15fa5d8fc7d9e2842f50..02a8ca5509e13735c1f9d8a3aaf87925c243d3dc 100644 (file)
--- a/SOGo/UI/Templates/MailerUI/UIxMailView.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailView.wox
@@ -10,7 +10,7 @@
   title="panelTitle"
   const:hideFolderTree="1"
 >
-  <!-- TODO: refactor address rendering into an own component -->
+  <!-- TODO: refactor address rendering into an own component(/element) -->
 
   <!-- 
     Note: We cannot make this section static (like the toolbar) because the CC
@@ -72,7 +72,85 @@
         </td>
       </tr>
     </var:if>
+
+
+    <!-- header fields if available -->
+    <var:if condition="clientObject.hasMailHeaderInCoreInfos">
+
+      <var:if condition="clientObject.mailHeaders.organization.isNotEmpty">
+        <tr class="mailer_fieldrow">
+          <td class="mailer_fieldname" 
+              ><var:string label:value="Organization"/>:</td>
+          <td class="mailer_fieldvalue">
+            <var:if-qualifier
+               const:condition="organization hasPrefix: 'http://'" 
+               object="clientObject.mailHeaders">
+              <a var:href="clientObject.mailHeaders.organization"
+                 var:string="clientObject.mailHeaders.organization" />
+            </var:if-qualifier>
+            <var:if-qualifier
+               const:condition="organization hasPrefix: 'http://'" 
+               object="clientObject.mailHeaders"
+               const:negate="1">
+              <var:string value="clientObject.mailHeaders.organization" />
+            </var:if-qualifier>
+          </td>
+        </tr>
+      </var:if>
+      
+      <var:if condition="clientObject.mailHeaders.list-id.isNotEmpty">
+        <tr class="mailer_fieldrow">
+          <td class="mailer_fieldname" 
+              ><var:string label:value="Mailinglist"/>:</td>
+          <td class="mailer_fieldvalue">
+            <a var:href="clientObject.mailingListArchiveURL"
+               target="_blank"
+               var:string="clientObject.mailHeaders.list-id" />
+            |
+            <a var:href="clientObject.mailingListSubscribeURL"
+               target="_blank"><var:string label:value="subscribe"/></a>
+            |
+            <a var:href="clientObject.mailingListUnsubscribeURL"
+               target="_blank"><var:string label:value="unsubscribe"/></a>
+          </td>
+        </tr>
+      </var:if>
+      
+      <var:if condition="clientObject.mailHeaders.x-virus-status.isNotEmpty">
+        <tr class="mailer_fieldrow">
+          <td class="mailer_fieldname" 
+              ><var:string label:value="Virusstatus"/>:</td>
+          <td class="mailer_fieldvalue">
+            <var:string value="clientObject.mailHeaders.x-virus-status" />
+          </td>
+        </tr>
+      </var:if>
+
+      <var:if condition="clientObject.mailHeaders.x-spam-level.isNotEmpty">
+        <tr class="mailer_fieldrow">
+          <td class="mailer_fieldname" 
+              ><var:string label:value="Spamlevel"/>:</td>
+          <td class="mailer_fieldvalue">
+            <var:string value="clientObject.mailHeaders.x-spam-level" />
+            <var:if condition="clientObject.mailHeaders.x-spam-flag"
+                    const:value="YES">
+              / <var:string label:value="marked as spam by mailserver" />
+            </var:if>
+          </td>
+        </tr>
+      </var:if>
+      
+      <!-- all headers
+      <tr class="mailer_fieldrow">
+        <td class="mailer_fieldname" ><var:string label:value="Header"/>:</td>
+        <td class="mailer_fieldvalue">
+           <pre><var:string value="clientObject.mailHeaders" /></pre>
+        </td>
+      </tr>
+      -->
+    </var:if>
   </table>
+
   
   <div class="mailer_mailcontent">
     <var:component value="contentViewerComponent"