merge to tip
authorJames Burke <jrburke@mozillamessaging.com>
Mon, 07 Jun 2010 17:09:13 -0700
changeset 1768 a169abe36f7913508fce711f83aeb5eb22e36177
parent 1767 d9b4e7dff1321134bc1203b7901f0b80bbb443c7 (current diff)
parent 1766 5bd292b25a8da4f1d7155b8c76836b0570909662 (diff)
child 1769 4028f561248249c017558924666e23628e2217ed
push id971
push userjrburke@gmail.com
push dateTue, 08 Jun 2010 00:09:16 +0000
merge to tip
client/api/rdapi.css
client/api/rdapi.html
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2cdb765e8983370f9d15af1bbb5480a0a100a669
GIT binary patch
literal 1737
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
RpT7FrMPdg4mf!x){{ml_D^CCb
--- a/client/api/rdapi.css
+++ b/client/api/rdapi.css
@@ -464,16 +464,25 @@ body {
 #convDisplay {
   float: right;
   margin-right: 0;
   top: 0;
   right: 0;
   width: 480px;
   background-color: #fafafa;
   z-index: 0;
+  background-image: url("i/ajax-loader.gif");
+  background-repeat: no-repeat;
+  background-position: 10px 65px;
+  min-height: 81px;
+  display: none;
+}
+
+#convDisplay.visible {
+  display: block;
 }
 
 #convDisplay .row {
   background-color: #fff;
 }
 
 #convDisplay .row.highlight {
   background-color: #ffffd9;
@@ -527,18 +536,18 @@ body {
   font-weight: normal;
 }
 
 .date.button {
   -moz-border-radius:0 0 3px 3px;
   background-color: #Fafafa;
   border: 1px solid #ccc;
   border-top: none;
-  display: table-cell;
-  padding:0 10px;
+  display: inline;
+  padding: 6px 10px 3px;
 }
 
 .date.button:hover {
   color: #000;
   cursor: pointer;
 }
 
 .inflow .date {
--- a/client/api/rdapi.html
+++ b/client/api/rdapi.html
@@ -145,20 +145,26 @@
                     showingConversation = false;
                     widgets.removeClass('hidden');
                     inflow.removeClass('fixed');
                     window.scrollTo(window.scrollX, targetTop - inflowPaddingTop - top);
                     parent.removeClass('highlight');
                     parent.addClass('read');
                     parent = null;
                     evt.preventDefault();
+                    //Andys clueless js
+                    convDisplay.removeClass('visible'); 
                 })
                 .delegate('#convDisplay .row', 'click', function (evt) {
                     convDisplay.find('.highlight').removeClass('highlight');
                     $(evt.target).addClass('highlight');
+                })
+                //Andys clueless js
+                .delegate('.list.subject', 'click', function (evt) {
+                    convDisplay.addClass('visible');              
                 });
 
                 $('#convDisplay').delegate('.quoteToggle', 'click', function (evt) {
                     var target = $(evt.target),
                         content = target.next('.quote');
 
                     if (content.hasClass('expanded')) {
                         content.removeClass('expanded');
@@ -168,16 +174,17 @@
                         target.html('Hide Quote');
                     }
                     evt.stopPropagation();
                     evt.preventDefault();
                 });
             });
         });
     </script>
+    
 </head>
 <body>
 
   <div id="header">
 
     <div class="row">
       <div class="c1 search">
       </div>
@@ -200,19 +207,17 @@
         <span class="date">{first.timestamp} - via email</span>
 
         <span class="actions">hide delete</span>
       </div>
       <div class="c1">
         <div class="avatar"><!--{from.url}--></div>
         <div class="name">{from_display[0]}</div>
         <div class="twitterActions">
-          <li>reply</li> 
-          <li>forward</li>
-          <li>&#x2605;</li>
+          <li>reply</li><li>forward</li><li>&#x2605;</li>
         </div>
       </div>
       <div class="c2">
         <div class="subject"><a class="list subject" href="#">{subject}</a></div>
         <div class="messageBody">{first.body_preview}</div>
         <div class="replies">{messages[1:] [}<div class="reply"><div class="arrow"></div>{. body schemas['rd.msg.body']}<div class="messageReply noArrow"><span class="name">{body.from_display}</span> {body.body_preview}</div></div>{]}</div>
       </div> 
       {. extraCount messages[1:].length}
@@ -274,17 +279,17 @@
   </div>
 
   <div class="conversation template widgets fullMessage" data-id="fullConversation">
     <div class="row">
       <div class="c2">
         <span class="date button">move conversation &#9660;</span>
       </div>
       <div class="c1">
-        <div class="actions"><a class="fullConvClose" href="#close">close</a></div>
+        <div class="actions"><a href="#">hide delete</a></div>
       </div>
       <div class="c3">
         <span class="subject">{subject}</span>
       </div>
     </div>
     {messages [}
       <div class="row fullReply">
         <div class="message">