"fixed" change request #1443.

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

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 0c919a20e28bce44ee49f9b59ca9ae099e4b4b9e..276417faf809beb2850f1d7e5069c6160537e0d6 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-20  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.35
+
+       * SOGoUserHomePage.wox: in case user is not authorized to change the
+         internet access flag, the rendered text is different now
+
+       * English.lproj/Localizable.strings: provide new label for case that
+         user is not allowed to change internet access
+
 2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: fixed Cocoa compilation (v0.9.34)

diff --git a/SOGo/Main/English.lproj/Localizable.strings b/SOGo/Main/English.lproj/Localizable.strings
index 8bd9c98b2c6945314ee5bd9f5b1df29351cffb73..ae3e21df0822457d90f3148a73f1217f34aa8bfd 100644 (file)
--- a/SOGo/Main/English.lproj/Localizable.strings
+++ b/SOGo/Main/English.lproj/Localizable.strings
@@ -2,7 +2,8 @@
 
 "Homepage" = "Homepage";
 
-"Internet access authorized and" = "Internet access authorized and";
+"Internet access unauthorized and" = "Internet access unauthorized and";
+"Internet access authorized and"   = "Internet access authorized and";
 "internetAccessState_0" = "CLOSED";
 "internetAccessState_1" = "OPEN";
 

diff --git a/SOGo/Main/SOGoUserHomePage.wox b/SOGo/Main/SOGoUserHomePage.wox
index 4850127618816634b29ae38d6840b45484b2d8af..d09439a0466f0336f4b87222035faa624bd7b696 100644 (file)
--- a/SOGo/Main/SOGoUserHomePage.wox
+++ b/SOGo/Main/SOGoUserHomePage.wox
@@ -40,15 +40,28 @@
       <tr>
         <td class="wincontent">
           <p class="homepagefont">
+            <var:if condition="isNotAllowedToChangeInternetAccess">
+              <var:string label:value="Internet access unauthorized and"
+              /> <var:popup const:name="allowinternet"
+                            list="internetAccessStates"
+                            item="item"
+                            label:string="$itemInternetAccessStateText"
+                            label:selection="internetAccessState_0"
+                            const:disabled="YES"
+                 />
+            </var:if>
+            <var:if condition="isNotAllowedToChangeInternetAccess"
+                    const:negate="YES"
+            >
               <var:string label:value="Internet access authorized and"
               /> <var:popup const:name="allowinternet"
                             list="internetAccessStates"
                             item="item"
                             label:string="$itemInternetAccessStateText"
                             selection="internetAccessState"
-                            disabled="isNotAllowedToChangeInternetAccess"
                             const:onchange="toggleInternetAccessState(this)"
                  />
+            </var:if>
             <br />
             <var:string label:value="Automatic vacation messages activation" />:
             <input type="checkbox"

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index d32d5503fef4895b23ee2d39156b84c89cb33ce0..e4c2cdf37d300eeff1172cc427f4c156799e9328 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=34
+SUBMINOR_VERSION:=35
 
 # v0.9.32 requires libSOGo         v0.9.57
 # v0.9.24 requires libWEExtensions v4.5.67