From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 28 Jan 2005 17:24:59 +0000 (+0000)
Subject: show non-intranet marker
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff4f292a70cdc31fd94929cedd2095571f6d9b60;p=scalable-opengroupware.org

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 6cd64481..6923eee3 100644
--- 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 2c685d77..08dbe640 100644
--- 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 380dde23..9e992378 100644
--- 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 0069dec7..209d038c 100644
--- 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 f4763b0f..dbdb3224 100644
--- 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;