layout changes, new debug option

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

diff --git a/SOGo/UI/Anais/AnaisUidSelector.m b/SOGo/UI/Anais/AnaisUidSelector.m
index 4a8d124a9dca8fa8f77710c2aeddb80eae56fd5b..99ce1c2529a7c0e422379e50a7c00a33c7df9c40 100644 (file)
--- a/SOGo/UI/Anais/AnaisUidSelector.m
+++ b/SOGo/UI/Anais/AnaisUidSelector.m
@@ -148,6 +148,10 @@
     @"  var td = document.getElementById('addMeToo');\n"
     @"  td.setAttribute('style', 'visibility:hidden');\n"
     @"}\n"
+    @"function clearAllAndAddMe() {\n"
+    @"  clearUidList();\n"
+    @"  addMeToo();\n"
+    @"}\n"
     @"function addUidFromAnais() {\n"
     @"  var uid = arguments[2]; \n"
     @"  addUid('','','','',uid,''); \n"

diff --git a/SOGo/UI/Anais/ChangeLog b/SOGo/UI/Anais/ChangeLog
index e5af99193c6664f8f3d816f7b1ebc8fd619f18c1..b5ec70622408b112f50911380f0816aa46505d5d 100644 (file)
--- a/SOGo/UI/Anais/ChangeLog
+++ b/SOGo/UI/Anais/ChangeLog
@@ -1,8 +1,17 @@
-2004-03-23  Marcus Mueller  <znek@mulle-kybernetik.com>
+2005-07-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.21
+
+       * AnaisUidSelector.m: added new 'clearAllAndAddMe' Javascript function
+         which is called by the new 'me alone' button
+       
+       * English.lproj/Localizable.strings: added 'me alone' label
+
+2005-03-23  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * renamed "default.strings" to "Localizable.strings" (v0.9.20)
 
-2004-01-07  Marcus Mueller  <znek@mulle-kybernetik.com>
+2005-01-07  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * {English/French}.lproj/default.strings: changed encoding from
          ISO-Latin-1 to UTF-8, which is now the default (v0.9.19)

diff --git a/SOGo/UI/Anais/English.lproj/Localizable.strings b/SOGo/UI/Anais/English.lproj/Localizable.strings
index 5cab1f2b3fc3fb0586e03d6f42f118e9e8e823e6..30cdd477395ebfee8d730153d604d9a4d649f3ef 100644 (file)
--- a/SOGo/UI/Anais/English.lproj/Localizable.strings
+++ b/SOGo/UI/Anais/English.lproj/Localizable.strings
@@ -12,3 +12,5 @@
 "clear"                        = "clear";
 // show the calendar, composed of the selected uids
 "show"                 = "show";
+// clear the list of uids and add myself
+"me alone"             = "just me";

diff --git a/SOGo/UI/Anais/Version b/SOGo/UI/Anais/Version
index d18647abfa5a1b2d9a8c56fb1c876c2dbff8d13f..22150ddbc165afdc051e056f4ecd5c05d186409b 100644 (file)
--- a/SOGo/UI/Anais/Version
+++ b/SOGo/UI/Anais/Version
@@ -1,3 +1,3 @@
 # $Id: Version 165 2004-08-05 17:55:50Z znek $
 
-SUBMINOR_VERSION:=20
+SUBMINOR_VERSION:=21

diff --git a/SOGo/UI/Templates/AnaisUidSelector.wox b/SOGo/UI/Templates/AnaisUidSelector.wox
index 0948f28b5f3896485f74ea2a968dff1bb44eb16a..abf85770d810f67b1eb6f57dec14f8ef442477b8 100644 (file)
--- a/SOGo/UI/Templates/AnaisUidSelector.wox
+++ b/SOGo/UI/Templates/AnaisUidSelector.wox
@@ -1,68 +1,78 @@
 <?xml version='1.0' standalone='yes'?>
 
-<table xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:var="http://www.skyrix.com/od/binding"
-       xmlns:const="http://www.skyrix.com/od/constant"
-       xmlns:rsrc="OGo:url"
-       xmlns:label="OGo:label"
-       width="100%"
-       border="0"
+<span xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+      xmlns:label="OGo:label"
  >
   <script language="JavaScript">
     <var:string value="jsCode" const:escapeHTML="NO" />
   </script>
-  <tr valign="top">
-    <td align="left">
-      <table cellspacing="2" cellpadding="0">
-        <tr valign="middle">
-          <td>
-            <var:component className="AnaisSelector"
-                           label:title="Search in Anais"
-                           const:windowId="UidSelector"
-                           const:callback="addUidFromAnais"
-            />
-            <var:component className="UIxContactSelector"
-                           label:title="Search in Addressbook"
-                           const:windowId="UidSelector"
-                           const:callback="addUid"
-            />
-          </td>
-          <td id="addMeToo" class="button_submit_env" var:style="meTooStyle">
+  <table cellspacing="2" cellpadding="0" width="100%" border="0">
+    <var:if condition="isAccessRestricted" const:negate="YES">
+      <tr valign="middle">
+        <td>
+          <var:component className="AnaisSelector"
+                         label:title="Search in Anais"
+                         const:windowId="UidSelector"
+                         const:callback="addUidFromAnais"
+          />
+          <var:component className="UIxContactSelector"
+                         label:title="Search in Addressbook"
+                         const:windowId="UidSelector"
+                         const:callback="addUid"
+          />
+          <span id="addMeToo" class="button_submit_env" var:style="meTooStyle">
             <a href="javascript:addMeToo()"
                class="button_submit"
             ><var:string label:value="me too" /></a>
-          </td>
-          <td id="clearUidList" class="button_submit_env">
-            <a href="javascript:clearUidList()"
-                class="button_submit"
-             ><var:string label:value="clear" /></a>
-          </td>
-          <td id="showUidList" class="button_submit_env">
-            <form var:href="showHref">
-              <input type="hidden"
-                     name="anaisUIDString"
-                     id="anaisUIDString"
-                     var:value="calendarUIDString"
-              />
-              <input type="hidden"
-                     name="previousMethod"
-                     var:value="ownMethodName"
-              />
-              <input type="submit" label:value="show" class="button_auto" />
-            </form>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr valign="middle">
-    <td id="anaisUIDList"
-        align="left"
-        class="anais_uids"
-    ><var:foreach list="calendarUIDs"
-                  item="uid"
-     ><var:string value="prettyUid"
-                  const:escapeHTML="NO"
-      /></var:foreach></td>
-  </tr>
-</table>
+          </span>
+          <span id="clearAllAndAddMe" class="button_submit_env">
+            <a href="javascript:clearAllAndAddMe()"
+               class="button_submit"
+            ><var:string label:value="me alone" /></a>
+          </span>
+        </td>
+        <td align="right" valign="middle" rowspan="2">
+          <div style="clear: both; text-align: center;">
+            <div style="margin-bottom: 4px;">
+              <span id="clearUidList" class="button_submit_env">
+                <a href="javascript:clearUidList()"
+                    class="button_submit"
+                 ><var:string label:value="clear" /></a>
+              </span>
+            </div>
+            <div style="margin-top: 4px;">
+              <span id="showUidList" class="button_submit_env">
+                <form var:href="showHref">
+                  <input type="hidden"
+                         name="anaisUIDString"
+                         id="anaisUIDString"
+                         var:value="calendarUIDString"
+                  />
+                  <input type="hidden"
+                         name="previousMethod"
+                         var:value="ownMethodName"
+                  />
+                  <input type="submit" label:value="show" class="button_auto" />
+                </form>
+              </span>
+            </div>
+          </div>
+        </td>
+      </tr>
+    </var:if>
+    <tr valign="top">
+      <td id="anaisUIDList"
+          align="left"
+          class="anais_uids"
+      ><var:foreach list="calendarUIDs"
+                    item="uid"
+       ><var:string value="prettyUid"
+                    const:escapeHTML="NO"
+        /></var:foreach>
+      </td>
+    </tr>
+  </table>
+</span>

diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog
index 47bb72c16f2194079e63420fb0840ca2477fe173..8f1dc6a1359ac1c6cef40ed610edb3511d55916a 100644 (file)
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -2,6 +2,11 @@
 
        * UIxPageFrame.wox: added 'help' hyperlink
 
+       * UIxPageFrame.wox: added 'isAccessRestricted' debug output
+
+       * AnaisUidSelector.wox: changed layout, added new 'me alone' button
+         as requested
+
 2005-07-06  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxCalInlineAptView.wox: add private appointment icon for non-public

diff --git a/SOGo/UI/Templates/UIxPageFrame.wox b/SOGo/UI/Templates/UIxPageFrame.wox
index 5ca725a3e49d4893bb38b949a93d51aee8c9db9d..e7cfe084cac5df2dc9fc92982708500655febb02 100644 (file)
--- a/SOGo/UI/Templates/UIxPageFrame.wox
+++ b/SOGo/UI/Templates/UIxPageFrame.wox
@@ -127,7 +127,17 @@
                   /><var:string value="emailForUser"
                     /><var:entity const:name="gt"
                   /></td>
-              </tr>            </table>
+              </tr>
+              <tr>
+                <td valign="top">Access Restricted:</td>
+                <td valign="top">
+                  <var:if condition="isAccessRestricted">YES</var:if>
+                  <var:if condition="isAccessRestricted"
+                          const:negate="YES"
+                  >NO</var:if>  
+                </td>
+              </tr>
+            </table>
           </td>
         </tr>
       </var:if>