better visualization according to the functional requirements

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

diff --git a/SOGo/UI/Anais/AnaisUidSelector.m b/SOGo/UI/Anais/AnaisUidSelector.m
index 4855b880b059d48ecd0e9cabadaf9b4f1630b852..9515b59dbe3b686d460112cb21c34fe82ed10ed8 100644 (file)
--- a/SOGo/UI/Anais/AnaisUidSelector.m
+++ b/SOGo/UI/Anais/AnaisUidSelector.m
@@ -32,7 +32,7 @@
 
 - (NSString *)prettyUid;
 - (NSString *)userUid;
-
+- (NSString *)_colorizedUid:(NSString *)_uid;
 - (NSString *)showHref;
 
 - (NSString *)jsCode;
@@ -72,10 +72,18 @@
 }
 - (NSString *)prettyUid {
     if([self->calendarUIDs objectAtIndex:0] == self->uid)
-        return self->uid;
-    return [NSString stringWithFormat:@", %@", self->uid];
+        return [self _colorizedUid:self->uid];
+    return [NSString stringWithFormat:@", %@", [self _colorizedUid:self->uid]];
 }
 
+- (NSString *)_colorizedUid:(NSString *)_uid {
+    if([_uid isEqualToString:[self userUid]]) {
+        _uid = [NSString stringWithFormat:@"<span class=\""
+                                          @"anais_me\">%@</span>",
+            _uid];
+    }
+    return _uid;
+}
 
 /* Href */
 
@@ -114,6 +122,8 @@
     @"  var dst = o.parentNode;\n"
     @"  var n = document.createElement('td');\n"
     @"  n.setAttribute('id', elemId);\n"
+    @"  n.setAttribute('align', 'left');\n"
+    @"  n.setAttribute('class', 'anais_uids');\n"
     @"  dst.replaceChild(n, o);\n"
     @"}\n"
     @"function clearUidList() {\n"
@@ -143,10 +153,21 @@
     @"    s = uid;\n"
     @"  e.setAttribute('value', s);\n"
     @"  var td = document.getElementById('anaisUIDList');\n"
-    @"  if(td.hasChildNodes())\n"
-    @"    uid = ', ' + uid;\n"
-    @"  var text = document.createTextNode(uid);\n"
-    @"  td.appendChild(text);\n"
+    @"  var text;\n"
+    @"  if(td.hasChildNodes()) {\n"
+    @"    text = document.createTextNode(', ');\n"
+    @"    td.appendChild(text);\n"
+    @"  }\n"
+    @"  text = document.createTextNode(uid);\n"
+    @"  if(uid == '%@') {\n"
+    @"    var span = document.createElement('span');\n"
+    @"    span.setAttribute('class', 'anais_me');\n"
+    @"    span.appendChild(text);\n"
+    @"    td.appendChild(span);\n"
+    @"  }\n"
+    @"  else {\n"
+    @"    td.appendChild(text);\n"
+    @"  }\n"
     @"  td = document.getElementById('clearUidList');\n"
     @"  td.setAttribute('style', 'visibility:visible');\n"
     @"  td = document.getElementById('showUidList');\n"
@@ -155,7 +176,7 @@
     @"";
     
     return [NSString stringWithFormat:script,
-        [self userUid]];
+        [self userUid], [self userUid]];
 }
 
 @end

diff --git a/SOGo/UI/Anais/AnaisUidSelector.wox b/SOGo/UI/Anais/AnaisUidSelector.wox
index 83debd17ca372c879fb4d48f89dbddb305e6b096..d928fd9849c2b4718e0a0cf30c3960ca0b731550 100644 (file)
--- a/SOGo/UI/Anais/AnaisUidSelector.wox
+++ b/SOGo/UI/Anais/AnaisUidSelector.wox
@@ -54,9 +54,11 @@
   <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>

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 7edd2302946934733b1bc6f833346a0100ef5def..8dcf7642ff4fec1d5c3d5ba528462a0653403f77 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * calendar.css: additional css for Anais uids (v0.9.15)
+
        * calendar.css: additional css for other appointments (v0.9.14)
 
 2004-08-14  Marcus Mueller  <znek@mulle-kybernetik.com>

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index cc039aca8fe720e89b35bf8bb715cdccb043159e..cf9e5c1262bbe256db9dcbe38538f8ad07693b99 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15

diff --git a/SOGo/UI/Common/calendar.css b/SOGo/UI/Common/calendar.css
index 943a369bcf1989e4080ede72097213115f79febd..c1656e15c7499a4eb8e9bf26c9655c63cbb43ca5 100644 (file)
--- a/SOGo/UI/Common/calendar.css
+++ b/SOGo/UI/Common/calendar.css
@@ -19,6 +19,15 @@
   font-style:       italic;
 }
 
+.anais_me {
+  color:            #0000FF;
+}
+
+.anais_uids {
+  font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+  font-size:        10pt;
+}
+
 /* day overview */
 
 

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index f89b442d41ce56e56a24c8bcc72906eab96d7275..9804e9372e521efbabadefdb8f8b7548bcfe0fde 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-16  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * AnaisUidSelector.[wox,m]: Added colorizing of login's uid. (v0.9.66)
+
 2004-08-16  Helge Hess  <helge.hess@skyrix.com>
 
        * UIxAppointmentProposal.m: small bugfix to range processing (v0.9.65)

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 7f555bc74aa06cb31ae63affe33750fd515c3068..be53f48b6636bbb3942568f82efa0f6d922d9e45 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=65
+SUBMINOR_VERSION:=66
 
 # v0.9.61 requires libNGExtensions v4.2.102
 # v0.9.41 requires libNGObjWeb     v4.2.431