show non-intranet marker

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

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 6cd64481b1bbf7cfd7c10db02c6e9c89b2df22c4..6923eee31569de03cae93347d9cdd181d2041fa3 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,12 @@
 2005-01-28  Helge Hess  <helge.hess@skyrix.com>
 
+       * v0.9.79
+
+       * UIxMailEditor.wox: localized 'Subject' label, shows 'non-intranet'
+         marker if 'MinequProvenance' HTTP header is not set to 'intranet'
+
+       * mailer.css: added marker for internet-mails (#1153)
+
        * v0.9.78
 
        * UIxMailListView.m: properly mark deleted mails using line-through

diff --git a/SOGo/UI/Mailer/UIxMailEditor.wox b/SOGo/UI/Mailer/UIxMailEditor.wox
index 2c685d774a6548d65fc17d04e9287d7dee0a8b6b..08dbe64003abaffa494041af675d3207a145510f 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditor.wox
+++ b/SOGo/UI/Mailer/UIxMailEditor.wox
@@ -22,6 +22,14 @@
   </div>
 -->
   
+  <var:if condition="request.headers.MinequProvenance" const:value="intranet"
+          const:negate="1">
+    <div id="compose_internetmarker">
+      <var:string
+          label:value="This mail is being sent from an unsecure network!" />
+    </div>
+  </var:if>
+  
   <div id="compose_toselection">
     <var:component className="UIxMailToSelection"
                    to="to"
@@ -34,8 +42,7 @@
     <table border="0" width="100%">
       <tr>
         <td class="compose_label" width="15%">
-          <!-- TODO: localize -->
-          <a rsrc:href="tbird_073_compose.png">Subject:</a>
+          <var:string label:value="Subject" />:
         </td>
         <td width="85%"><input name="subject" 
                                id="compose_subject_input" type="text" 

diff --git a/SOGo/UI/Mailer/UIxMailToSelection.m b/SOGo/UI/Mailer/UIxMailToSelection.m
index 380dde23572a7e0249edc46e07d397569ad21e58..9e992378c1272812338b03624ae27919d77d1548 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailToSelection.m
+++ b/SOGo/UI/Mailer/UIxMailToSelection.m
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2004 SKYRIX Software AG
+ Copyright (C) 2004-2005 SKYRIX Software AG
  
  This file is part of OpenGroupware.org.
  
@@ -17,9 +17,7 @@
  License along with OGo; see the file COPYING.  If not, write to the
  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
- */
-// $Id$
-
+*/
 
 #include <SOGoUI/UIxComponent.h>
 

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 0069dec7e03be84f4472729a33727b6c35906f7a..209d038c7d4ee55ed066d5cb2a4b868f5dca4c96 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=77
+SUBMINOR_VERSION:=79
 
 # v0.9.78 requires SoObjects/Mailer v0.9.58
 # v0.9.77 requires SoObjects/Mailer v0.9.57

diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index f4763b0f76133fd37cdd5841ba4e94b6a569e8a4..dbdb32247e8199157973fd9dd7b7ceebd4f0fff9 100644 (file)
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -335,6 +335,14 @@ div#compose_fromline {
 }
 div#compose_toselection { 
 }
+div#compose_internetmarker { 
+  padding:          8px;
+  text-align:       center;
+  background-color: white;
+  border-color:     red;
+  border-width:     2px;
+  border-style:     solid;
+}
 div#compose_subject { 
   border-bottom-color: #808080;
   border-bottom-width: 1;