[Bedework-commit] carddav r117 - in trunk/clients/javascript/bwAddrbookClient: . resources

Fri Sep 17 16:53:44 EDT 2010

Author: johnsa
Date: 2010-09-17 16:53:44 -0400 (Fri, 17 Sep 2010)
New Revision: 117

Modified:
   trunk/clients/javascript/bwAddrbookClient/index.html
   trunk/clients/javascript/bwAddrbookClient/resources/addressbook.css
   trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js
Log:
javascript client: adding menus and highlighting

Modified: trunk/clients/javascript/bwAddrbookClient/index.html
===================================================================

--- trunk/clients/javascript/bwAddrbookClient/index.html	2010-09-17 19:32:31 UTC (rev 116)
+++ trunk/clients/javascript/bwAddrbookClient/index.html	2010-09-17 20:53:44 UTC (rev 117)
@@ -34,18 +34,29 @@
   </head>
   <body>
     <div id="searchBar" class="ui-layout-north">
+      <!-- The search and filter box performs a filter on local values and 
+           a search on remote values.  Its behavior depends on what is 
+           selected in the booksAndGroups pane. -->
       <div id="searchBox">
         <input type="text" id="search" value=""/>
-        <button id="searchButton">search...</button>
+        <button id="searchButton">filter...</button>
       </div>
-      <button id="add">add...</button>
+      <ul id="add">
+        <li>
+          <ul>
+            <li class="contact">contact</li>
+            <li class="group">group</li>
+          </ul>
+          add...
+        </li>
+      </ul>
     </div>
     <ul id="booksAndGroups" class="ui-layout-west">
       <li class="book">
         public
       </li>
       <li class="book">
-        personal
+        <a href="#" id="uuid9876543" class="selected">personal</a>
         <ul>
           <li class="group">
             group a

Modified: trunk/clients/javascript/bwAddrbookClient/resources/addressbook.css
===================================================================
--- trunk/clients/javascript/bwAddrbookClient/resources/addressbook.css	2010-09-17 19:32:31 UTC (rev 116)
+++ trunk/clients/javascript/bwAddrbookClient/resources/addressbook.css	2010-09-17 20:53:44 UTC (rev 117)
@@ -20,12 +20,12 @@
 body {
 	font-family: Arial, Helvetica, sans-serif;
 	background-color: #ddd;
-	color: black;
+	color: #333;
 }
 #searchBar {
 	padding: 0.5em;
 	border-bottom: 1px solid #aaf;
-	color: black;
+	color: #333;
 	background-color: white;
 }
 #searchBox {
@@ -33,39 +33,85 @@
 }
 #searchBox input {
   background-color: #eef;
-  color: black;
+  color: #333;
   border: 1px solid #aaf;
   width: 200px;
 }
+ul#add {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  cursor: pointer;
+  border: 1px solid #aaf;
+  background-color: #eef;
+  color: #333;
+  width: 100px;
+  position: relative;
+  white-space: nowrap;
+}
+li.book {
+  list-style-image: url("silk/book.png");
+}
+li.group {
+  list-style-image: url("silk/group.png");
+}
+li.contact {
+  list-style-image: url("silk/user.png");
+}
+ul#add li {
+  background-color: #eef;
+  padding: 0.15em 1em 0.3em 5px;
+}
+ul#add ul {
+  display:  none;
+  position: absolute;
+  left: -1px;
+  width: 100%;
+  margin: 1.2em 0 0 0;
+  padding: 0;
+  border: 1px solid #aaf;
+  list-style: disc inside none;
+}
+ul#add ul li { 
+	padding: 0.25em 0.5em 0.25em 0.5em; 
+}
+ul#add ul li:hover { 
+	background-color: #ff9; 
+	color: #333;
+}
+ul#add li:hover ul { 
+	display:  block; 
+	background-color: #eef;
+	color: #333; 
+}
 ul#booksAndGroups {
 	float: left;
 	margin: 1em 2em 1em 0.5em;
 	padding-top: 1em;
 	white-space: nowrap;
   list-style: disc outside none;
-  color: black;
+  color: #333;
   background-color: white;
 }
 #booksAndGroups li {
   margin: 0 0 0.25em 2em;
 }
-#booksAndGroups li.book {
-	list-style-image: url("silk/book.png");
-}
-#booksAndGroups li.group {
-  list-style-image: url("silk/group.png");
-}
 #booksAndGroups ul {
 	margin-top: 0.5em;
 }
 #booksAndGroups ul li {
   margin-bottom: 0.25em;
 }
+#booksAndGroups a.selected {
+	background-color: #ff9;
+	color: #333;
+  border-bottom: 1px solid #eee;
+}
 #content {
   float: left;
 	border-left: 1px solid #aaf;
 	padding: 1em;
-  color: black;
+  color: #333;
   background-color: white;
 }
 h1 {
@@ -82,4 +128,9 @@
 em {
   font-style: italic;
   font-size: 0.9em;
+}
+a {
+  color: #333;
+  background-color: transparent;
+  text-decoration: none;
 }
\ No newline at end of file

Modified: trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js
===================================================================
--- trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js	2010-09-17 19:32:31 UTC (rev 116)
+++ trunk/clients/javascript/bwAddrbookClient/resources/addressbook.js	2010-09-17 20:53:44 UTC (rev 117)
@@ -45,8 +45,8 @@
   
   // Create the three-panel layout
   myLayout = $('body').layout({
-    //  enable showOverflow on west-pane so popups will overlap north pane
-      west__showOverflowOnHover: true
+    //  enable showOverflow on north-pane so popups will overlap west pane
+      north__showOverflowOnHover: true
 
     //  some resizing/toggling settings
     , north__closable:     false // OVERRIDE the pane-default of closable: true

