diff --git a/ChangeLog b/ChangeLog index cd95dc7d8..39edf5975 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2012-09-13 Ludovic Marcotte +2012-09-16 Francis Lachapelle + + * UI/WebServerResources/dtree.js (s): when selecting a node, + also select the parent so the entire row is highlighted. + +2012-09-13 Ludovic Marcotte * Fixed bug #1942. We now set the app name to "SOGo" for the Samba/OpenChange application so wox are properly diff --git a/NEWS b/NEWS index cccf0e64d..223b11b0b 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,8 @@ New Features Enhancements - calendars list and mini-calendar are now always visible - tasks list has moved to a table in a tabs view along the events list + - rows in tree view are now 4 pixels taller + - node selection in trees now highlights entire row Bug Fixes diff --git a/UI/WebServerResources/AdministrationUI.js b/UI/WebServerResources/AdministrationUI.js index e5d7857c2..e026b40e2 100644 --- a/UI/WebServerResources/AdministrationUI.js +++ b/UI/WebServerResources/AdministrationUI.js @@ -45,15 +45,15 @@ function buildUsersTree(treeDiv, response) { d.icon.folder = ResourcesURL + '/tbtv_leaf_corner_17x17.png'; d.icon.folderOpen = ResourcesURL + '/tbtv_leaf_corner_17x17.png'; d.icon.node = ResourcesURL + '/tbtv_leaf_corner_17x17.png'; - d.icon.line = ResourcesURL + '/tbtv_line_17x17.gif'; - d.icon.join = ResourcesURL + '/tbtv_junction_17x17.gif'; - d.icon.joinBottom = ResourcesURL + '/tbtv_corner_17x17.gif'; - d.icon.plus = ResourcesURL + '/tbtv_plus_17x17.gif'; - d.icon.plusBottom = ResourcesURL + '/tbtv_corner_plus_17x17.gif'; - d.icon.minus = ResourcesURL + '/tbtv_minus_17x17.gif'; - d.icon.minusBottom = ResourcesURL + '/tbtv_corner_minus_17x17.gif'; - d.icon.nlPlus = ResourcesURL + '/tbtv_corner_plus_17x17.gif'; - d.icon.nlMinus = ResourcesURL + '/tbtv_corner_minus_17x17.gif'; + d.icon.line = ResourcesURL + '/tbtv_line_17x22.png'; + d.icon.join = ResourcesURL + '/tbtv_junction_17x22.png'; + d.icon.joinBottom = ResourcesURL + '/tbtv_corner_17x22.png'; + d.icon.plus = ResourcesURL + '/tbtv_plus_17x22.png'; + d.icon.plusBottom = ResourcesURL + '/tbtv_corner_plus_17x22.png'; + d.icon.minus = ResourcesURL + '/tbtv_minus_17x22.png'; + d.icon.minusBottom = ResourcesURL + '/tbtv_corner_minus_17x22.png'; + d.icon.nlPlus = ResourcesURL + '/tbtv_corner_plus_17x22.png'; + d.icon.nlMinus = ResourcesURL + '/tbtv_corner_minus_17x22.png'; d.icon.empty = ResourcesURL + '/empty.gif'; d.preload (); d.add(0, -1, ''); diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index d75dd72bd..02436cc51 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -1930,10 +1930,8 @@ function refreshContacts() { function openInbox(node) { var done = false; openMailbox(node.parentNode.getAttribute("dataname"), false); - var tree = $("mailboxTree"); - tree.selectedEntry = node; - node.selectElement(); mailboxTree.o(1); + mailboxTree.s(2); } function initMailer(event) { @@ -2027,15 +2025,15 @@ function initMailboxTree() { mailboxTree.icon.folder = ResourcesURL + "/tbtv_leaf_corner_17x17.png"; mailboxTree.icon.folderOpen = ResourcesURL + "/tbtv_leaf_corner_17x17.png"; mailboxTree.icon.node = ResourcesURL + "/tbtv_leaf_corner_17x17.png"; - mailboxTree.icon.line = ResourcesURL + "/tbtv_line_17x17.gif"; - mailboxTree.icon.join = ResourcesURL + "/tbtv_junction_17x17.gif"; - mailboxTree.icon.joinBottom = ResourcesURL + "/tbtv_corner_17x17.gif"; - mailboxTree.icon.plus = ResourcesURL + "/tbtv_plus_17x17.gif"; - mailboxTree.icon.plusBottom = ResourcesURL + "/tbtv_corner_plus_17x17.gif"; - mailboxTree.icon.minus = ResourcesURL + "/tbtv_minus_17x17.gif"; - mailboxTree.icon.minusBottom = ResourcesURL + "/tbtv_corner_minus_17x17.gif"; - mailboxTree.icon.nlPlus = ResourcesURL + "/tbtv_corner_plus_17x17.gif"; - mailboxTree.icon.nlMinus = ResourcesURL + "/tbtv_corner_minus_17x17.gif"; + mailboxTree.icon.line = ResourcesURL + "/tbtv_line_17x22.png"; + mailboxTree.icon.join = ResourcesURL + "/tbtv_junction_17x22.png"; + mailboxTree.icon.joinBottom = ResourcesURL + "/tbtv_corner_17x22.png"; + mailboxTree.icon.plus = ResourcesURL + "/tbtv_plus_17x22.png"; + mailboxTree.icon.plusBottom = ResourcesURL + "/tbtv_corner_plus_17x22.png"; + mailboxTree.icon.minus = ResourcesURL + "/tbtv_minus_17x22.png"; + mailboxTree.icon.minusBottom = ResourcesURL + "/tbtv_corner_minus_17x22.png"; + mailboxTree.icon.nlPlus = ResourcesURL + "/tbtv_corner_plus_17x22.png"; + mailboxTree.icon.nlMinus = ResourcesURL + "/tbtv_corner_minus_17x22.png"; mailboxTree.icon.empty = ResourcesURL + "/empty.gif"; mailboxTree.preload (); diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js index 06a4e99d2..93f36042a 100644 --- a/UI/WebServerResources/UIxContactsUserFolders.js +++ b/UI/WebServerResources/UIxContactsUserFolders.js @@ -69,15 +69,15 @@ function buildUsersTree(treeDiv, response) { d.icon.folder = ResourcesURL + '/tbtv_leaf_corner_17x17.png'; d.icon.folderOpen = ResourcesURL + '/tbtv_leaf_corner_17x17.png'; d.icon.node = ResourcesURL + '/tbtv_leaf_corner_17x17.png'; - d.icon.line = ResourcesURL + '/tbtv_line_17x17.gif'; - d.icon.join = ResourcesURL + '/tbtv_junction_17x17.gif'; - d.icon.joinBottom = ResourcesURL + '/tbtv_corner_17x17.gif'; - d.icon.plus = ResourcesURL + '/tbtv_plus_17x17.gif'; - d.icon.plusBottom = ResourcesURL + '/tbtv_corner_plus_17x17.gif'; - d.icon.minus = ResourcesURL + '/tbtv_minus_17x17.gif'; - d.icon.minusBottom = ResourcesURL + '/tbtv_corner_minus_17x17.gif'; - d.icon.nlPlus = ResourcesURL + '/tbtv_corner_plus_17x17.gif'; - d.icon.nlMinus = ResourcesURL + '/tbtv_corner_minus_17x17.gif'; + d.icon.line = ResourcesURL + '/tbtv_line_17x22.png'; + d.icon.join = ResourcesURL + '/tbtv_junction_17x22.png'; + d.icon.joinBottom = ResourcesURL + '/tbtv_corner_17x22.png'; + d.icon.plus = ResourcesURL + '/tbtv_plus_17x22.png'; + d.icon.plusBottom = ResourcesURL + '/tbtv_corner_plus_17x22.png'; + d.icon.minus = ResourcesURL + '/tbtv_minus_17x22.png'; + d.icon.minusBottom = ResourcesURL + '/tbtv_corner_minus_17x22.png'; + d.icon.nlPlus = ResourcesURL + '/tbtv_corner_plus_17x22.png'; + d.icon.nlMinus = ResourcesURL + '/tbtv_corner_minus_17x22.png'; d.icon.empty = ResourcesURL + '/empty.gif'; d.preload (); d.add(0, -1, ''); diff --git a/UI/WebServerResources/dtree.css b/UI/WebServerResources/dtree.css index 3fc2fe5ea..37638e86c 100644 --- a/UI/WebServerResources/dtree.css +++ b/UI/WebServerResources/dtree.css @@ -12,7 +12,7 @@ .dtree img { - vertical-align: top; + vertical-align: middle; border: 0px; padding: 0px; margin: 0px; @@ -29,6 +29,7 @@ { white-space: nowrap; padding: 1px 2px; + line-height: 2em; } .dtree a.node:hover @@ -41,5 +42,8 @@ overflow: hidden; } -DIV.dTreeNode -{ height: 18px; } +.dTreeNode +{ height: 22px; } + +.dTreeNode._selected +{ background-color: #9ABCD8; } diff --git a/UI/WebServerResources/dtree.js b/UI/WebServerResources/dtree.js index f223dce97..3f59d9013 100644 --- a/UI/WebServerResources/dtree.js +++ b/UI/WebServerResources/dtree.js @@ -277,9 +277,11 @@ dTree.prototype = { if (this.selectedNode || this.selectedNode==0) { eOld = document.getElementById("s" + this.obj + this.selectedNode); eOld.deselect(); + eOld.parentNode.removeClassName('_selected'); } eNew = document.getElementById("s" + this.obj + id); eNew.selectElement(); + eNew.parentNode.addClassName('_selected'); this.selectedNode = id; if (this.config.useCookies) this.setCookie('cs' + this.obj, cn.id); } diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css index 6897de86a..d2d64d822 100644 --- a/UI/WebServerResources/generic.css +++ b/UI/WebServerResources/generic.css @@ -506,9 +506,7 @@ DIV.noJavascriptErrorMessage A margin: 0px auto; } LI.denied -{ n0background-color: #fefefe; - font-style: italic; - color: #f33; } +{ color: #999; } .popupMenu LI:hover, .popupMenu LI.selected, @@ -526,14 +524,14 @@ LI._selected.denied } .hidden -{ visibility: hidden; } +{ display: none; } /* folder tree (js) )*/ DIV.dTreeNode A SPAN.nodeName { margin: 0px .2em; - padding-left: .2em; - padding-right: .2em; + padding: 0px .2em; + display: inline-block; } DIV.dTreeNode A._selected SPAN.nodeName @@ -554,6 +552,8 @@ DIV.dTreeNode SPAN._dragOver { background-color: #9ABCD8 !important; color: #fff !important; + -webkit-border-radius: 4px; + border-radius: 4px; } /* resizable columns */ diff --git a/UI/WebServerResources/tbtv_corner_17x17.gif b/UI/WebServerResources/tbtv_corner_17x17.gif deleted file mode 100644 index c60f47619..000000000 Binary files a/UI/WebServerResources/tbtv_corner_17x17.gif and /dev/null differ diff --git a/UI/WebServerResources/tbtv_corner_17x22.png b/UI/WebServerResources/tbtv_corner_17x22.png new file mode 100644 index 000000000..14eb35934 Binary files /dev/null and b/UI/WebServerResources/tbtv_corner_17x22.png differ diff --git a/UI/WebServerResources/tbtv_corner_minus_17x17.gif b/UI/WebServerResources/tbtv_corner_minus_17x17.gif deleted file mode 100644 index 203472b6d..000000000 Binary files a/UI/WebServerResources/tbtv_corner_minus_17x17.gif and /dev/null differ diff --git a/UI/WebServerResources/tbtv_corner_minus_17x22.png b/UI/WebServerResources/tbtv_corner_minus_17x22.png new file mode 100644 index 000000000..466061731 Binary files /dev/null and b/UI/WebServerResources/tbtv_corner_minus_17x22.png differ diff --git a/UI/WebServerResources/tbtv_corner_plus_17x17.gif b/UI/WebServerResources/tbtv_corner_plus_17x17.gif deleted file mode 100644 index b27016f3d..000000000 Binary files a/UI/WebServerResources/tbtv_corner_plus_17x17.gif and /dev/null differ diff --git a/UI/WebServerResources/tbtv_corner_plus_17x22.png b/UI/WebServerResources/tbtv_corner_plus_17x22.png new file mode 100644 index 000000000..d11437976 Binary files /dev/null and b/UI/WebServerResources/tbtv_corner_plus_17x22.png differ diff --git a/UI/WebServerResources/tbtv_junction_17x17.gif b/UI/WebServerResources/tbtv_junction_17x17.gif deleted file mode 100644 index 0137956d2..000000000 Binary files a/UI/WebServerResources/tbtv_junction_17x17.gif and /dev/null differ diff --git a/UI/WebServerResources/tbtv_junction_17x22.png b/UI/WebServerResources/tbtv_junction_17x22.png new file mode 100644 index 000000000..7dd6816be Binary files /dev/null and b/UI/WebServerResources/tbtv_junction_17x22.png differ diff --git a/UI/WebServerResources/tbtv_line_17x17.gif b/UI/WebServerResources/tbtv_line_17x17.gif deleted file mode 100644 index a3e12b178..000000000 Binary files a/UI/WebServerResources/tbtv_line_17x17.gif and /dev/null differ diff --git a/UI/WebServerResources/tbtv_line_17x22.png b/UI/WebServerResources/tbtv_line_17x22.png new file mode 100644 index 000000000..19504b49c Binary files /dev/null and b/UI/WebServerResources/tbtv_line_17x22.png differ diff --git a/UI/WebServerResources/tbtv_minus_17x17.gif b/UI/WebServerResources/tbtv_minus_17x17.gif deleted file mode 100644 index 9b5190435..000000000 Binary files a/UI/WebServerResources/tbtv_minus_17x17.gif and /dev/null differ diff --git a/UI/WebServerResources/tbtv_minus_17x22.png b/UI/WebServerResources/tbtv_minus_17x22.png new file mode 100644 index 000000000..2c8d61cc4 Binary files /dev/null and b/UI/WebServerResources/tbtv_minus_17x22.png differ diff --git a/UI/WebServerResources/tbtv_plus_17x17.gif b/UI/WebServerResources/tbtv_plus_17x17.gif deleted file mode 100644 index 4722da582..000000000 Binary files a/UI/WebServerResources/tbtv_plus_17x17.gif and /dev/null differ diff --git a/UI/WebServerResources/tbtv_plus_17x22.png b/UI/WebServerResources/tbtv_plus_17x22.png new file mode 100644 index 000000000..386dcf2a5 Binary files /dev/null and b/UI/WebServerResources/tbtv_plus_17x22.png differ