Monotone-Parent: 145acd1ad78984a6f26963cc9b6abb3e5c915bcd

Monotone-Revision: d73281348e68338299c1595a484a8a1033de3cd1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-07-17T17:30:42
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/UIxMailListView.js

@@ -41,23 +41,125 @@ function moveTo(uri) {
   alert("MoveTo: " + uri);
 }
 
-function popupSearchMenu(elem, event, menuName)
+function popupSearchMenu(event, menuId)
 {
-  relX = (event.pageX
-	  - (elem.parentNode.offsetLeft + elem.offsetLeft));
-  relY = (event.pageY
-	  - elem.parentNode.parentNode.parentNode.offsetTop);
-  window.alert(elem.style.height);
-//   if (event.button == 1
-// && 
-//     acceptClick = false;
-//   bodyOnClick = "" + document.body.getAttribute("onclick");
-//   document.body.setAttribute("onclick", "onBodyClick('" + menuId + "'); return false;");
-//   popup = document.getElementById(menuId);
-//   popup.setAttribute("style", "visibility: visible; top: " + event.pageY
-// 		     + "px; left: " + event.pageX + "px;" );
-//   menuClickNode = node;
-//   window.alert
+  var node = event.target;
 
-  return false;
+  superNode = node.parentNode.parentNode.parentNode;
+  relX = (event.pageX - superNode.offsetLeft - node.offsetLeft);
+  relY = (event.pageY - superNode.offsetTop - node.offsetTop);
+
+  if (event.button == 0
+      && relX < 24) {
+    log('popup');
+    event.cancelBubble = true;
+    event.returnValue = false;
+
+    var popup = document.getElementById(menuId);
+    hideMenu(popup);
+
+    var menuTop = superNode.offsetTop + node.offsetTop + node.offsetHeight;
+    var menuLeft = superNode.offsetLeft + node.offsetLeft;
+    var heightDiff = (window.innerHeight
+		      - (menuTop + popup.offsetHeight));
+    if (heightDiff < 0)
+      menuTop += heightDiff;
+
+    var leftDiff = (window.innerWidth
+		    - (menuLeft + popup.offsetWidth));
+    if (leftDiff < 0)
+      menuLeft -= popup.offsetWidth;
+
+    popup.style.top = menuTop + "px";
+    popup.style.left = menuLeft + "px";
+    popup.style.visibility = "visible";
+    menuClickNode = node;
+  
+    bodyOnClick = "" + document.body.getAttribute("onclick");
+    document.body.setAttribute("onclick", "onBodyClick('" + menuId + "');");
+  }
+}
+
+function setSearchCriteria(event)
+{
+  searchField = document.getElementById('searchValue');
+  searchCriteria = document.getElementById('searchCriteria');
+  
+  node = event.target;
+  searchField.setAttribute("ghost-phrase", node.innerHTML);
+  searchCriteria = node.getAttribute('id');
+}
+
+function onSearchChange()
+{
+  log('onSearchChange');
+}
+
+function onSearchMouseDown(event)
+{
+  log('onSearchMouseDown');
+
+  searchField = document.getElementById('searchValue');
+  superNode = searchField.parentNode.parentNode.parentNode;
+  relX = (event.pageX - superNode.offsetLeft - searchField.offsetLeft);
+  relY = (event.pageY - superNode.offsetTop - searchField.offsetTop);
+
+  if (relY < 24) {
+    log('menu');
+    event.cancelBubble = true;
+    event.returnValue = false;
+  }
+}
+
+function onSearchFocus(event)
+{
+  log('onSearchFocus');
+  searchField = document.getElementById('searchValue');
+  ghostPhrase = searchField.getAttribute("ghost-phrase");
+  if (searchField.value == ghostPhrase) {
+    searchField.value = "";
+    searchField.setAttribute("modified", "");
+  } else {
+    searchField.select();
+  }
+
+  searchField.style.color = "#000";
+}
+
+function onSearchBlur()
+{
+  log('onSearchBlur');
+  var searchField = document.getElementById('searchValue');
+  var ghostPhrase = searchField.getAttribute("ghost-phrase");
+
+  if (searchField.value == "") {
+    searchField.setAttribute("modified", "");
+    searchField.style.color = "#aaa";
+    searchField.value = ghostPhrase;
+  } else if (searchField.value == ghostPhrase) {
+    searchField.setAttribute("modified", "");
+    searchField.style.color = "#aaa";
+  } else {
+    searchField.setAttribute("modified", "yes");
+    searchField.style.color = "#000";
+  }
+}
+
+function initCriteria()
+{
+  var searchCriteria = document.getElementById('searchCriteria');
+  var searchField = document.getElementById('searchValue');
+  var firstOption;
+ 
+  if (searchCriteria.value == ''
+      || searchField.value == '') {
+    firstOption = document.getElementById('searchOptions').childNodes[1];
+    searchCriteria.value = firstOption.getAttribute('id');
+    searchField.value = firstOption.innerHTML;
+    searchField.setAttribute('ghost-phrase', firstOption.innerHTML);
+    searchField.setAttribute("modified", "");
+    searchField.style.color = "#aaa";
+
+    log(searchField.value);
+  }
 }

UI/WebServerResources/generic.js

@@ -24,14 +24,13 @@
 
 /* generic stuff */
 
-logWindow = window.open('', 'logWindow',
-			'directories = no; location = no; menubar = no; resizable = no;'
-			+ 'scrollbars = yes; status = no; toolbar = no; width = 80em; height = 25em;');
+logWindow = window.open('', 'logWindow');
 logWindow.document.write('<html><head><title>JavaScript log</title></head>'
 			 + '<body style="font-family: monospace;'
-			 + 'font-size: 10pt;">'
-			 + '<div class="log" id="logArea"></div></body>'
-			 +'</html>');
+			 + 'font-size: 10pt; overflow: scroll;">'
+			 + '<div class="log" id="logArea"'
+			 + ' onclick="this.innerHTML=\'\';"></div></body>'
+			 + '</html>');
 logWindow.resizeTo(640,480);
 logArea = logWindow.document.getElementById('logArea');
 logArea.innerHTML = '';
@@ -267,7 +266,8 @@ function getSelectedNodes(parentNode) {
   return selArray.join('|');
 }
 
-function onRowClick(node, event) {
+function onRowClick(event) {
+  var node = event.target;
 //   var text = document.getElementById('list');
 //   text.innerHTML = '';
 
@@ -295,39 +295,52 @@ function onRowClick(node, event) {
 /* popup menus */
 
 var bodyOnClick = "";
-var acceptClick = false;
+// var acceptClick = false;
 var menuClickNode = null;
 var currentSubmenu = null;
 
-function onMenuClick(node, event, menuId)
+function onMenuClick(event, menuId)
 {
+  var node = event.target;
+
   event.cancelBubble = true;
   event.returnValue = false;
 
-  if (event.button == 1)
-    acceptClick = false;
-  bodyOnClick = "" + document.body.getAttribute("onclick");
-  document.body.setAttribute("onclick", "onBodyClick('" + menuId + "'); return false;");
   var popup = document.getElementById(menuId);
   hideMenu(popup);
-  popup.style.top = event.pageY + "px";
-  popup.style.left = event.pageX + "px";
+
+  var menuTop = event.pageY;
+  var menuLeft = event.pageX;
+  var heightDiff = (window.innerHeight
+		    - (menuTop + popup.offsetHeight));
+  if (heightDiff < 0)
+    menuTop += heightDiff;
+
+  var leftDiff = (window.innerWidth
+		  - (menuLeft + popup.offsetWidth));
+  if (leftDiff < 0)
+    menuLeft -= popup.offsetWidth;
+
+  popup.style.top = menuTop + "px";
+  popup.style.left = menuLeft + "px";
   popup.style.visibility = "visible";
   menuClickNode = node;
 
-  return false;
+  bodyOnClick = "" + document.body.getAttribute("onclick");
+  document.body.setAttribute("onclick", "onBodyClick('" + menuId + "');");
 }
 
 function onBodyClick(menuId)
 {
-  if (!acceptClick)
-    acceptClick = true;
-  else
-    {
+//   if (!acceptClick)
+//     acceptClick = true;
+//   else
+//     {
       popup = document.getElementById(menuId);
       hideMenu(popup);
       document.body.setAttribute("onclick", bodyOnClick);
-    }
+      menuClickNode = null;
+//     }
 
   return false;
 }
@@ -368,10 +381,22 @@ function dropDownSubmenu(event)
     var submenuNode = document.getElementById(submenu);
     node.parentNode.parentNode.submenu = submenuNode;
     var menuTop = (node.parentNode.parentNode.offsetTop
-      + node.offsetTop - 1);
+		   + node.offsetTop - 1);
+
+    var heightDiff = (window.innerHeight
+		      - (menuTop + submenuNode.offsetHeight));
+    if (heightDiff < 0)
+      menuTop += heightDiff;
     var menuLeft = (node.parentNode.parentNode.offsetLeft
 		    + node.parentNode.parentNode.offsetWidth
 		    - 2);
+    var leftDiff = (window.innerWidth
+		    - (menuLeft + submenuNode.offsetWidth));
+    if (leftDiff < 0)
+      menuLeft -= (node.parentNode.parentNode.offsetWidth
+		   + submenuNode.offsetWidth
+		   - 4);
+
     submenuNode.style.top = menuTop + "px";
     submenuNode.style.left = menuLeft + "px";
     submenuNode.style.visibility = "visible";

UI/WebServerResources/mailer.css

@@ -528,7 +528,7 @@ TABLE#messageList TR._selected TD
   color: #fff;
 }
 
-SPAN.searchBox INPUT
+INPUT#searchValue
 {
   height: 22px;
   margin-right: 1em;
@@ -543,8 +543,11 @@ SPAN.searchBox INPUT
   background-image: url('/SOGo.woa/WebServerResources/Search-bar.png');
   background-repeat: no-repeat;
   background-position: 2px 2px;
+  color: #aaa;
 }
 
+INPUT#searchValue:focus
+{ color: #000; }
 
 /* drag handles */
 DIV#dragHandle

UI/WebServerResources/mailer.js

@@ -36,9 +36,11 @@
 /* mail list */
 
 function openMessageWindow(sender, msguid, url) {
-  return window.open(url, "SOGo_msg_" + msguid,
-	   "width=640,height=480,resizable=1,scrollbars=1,toolbar=0," +
-	   "location=0,directories=0,status=0,menubar=0,copyhistory=0")
+  var msgWin = window.open(url, "SOGo_msg_" + msguid,
+			   "width=640,height=480,resizable=1,scrollbars=1,toolbar=0," +
+			   "location=0,directories=0,status=0,menubar=0,copyhistory=0");
+
+  msgWin.focus();
 }
 
 function clickedUid(sender, msguid) {
@@ -46,6 +48,7 @@ function clickedUid(sender, msguid) {
   openMessageWindow(sender, msguid, msguid + "/view");
   return true;
 }
+
 function doubleClickedUid(sender, msguid) {
   alert("DOUBLE Clicked " + msguid);