now if you press C it will close the full conversation
authorAndy Chung <andy@mozillamessaging.com>
Tue, 15 Jun 2010 16:52:36 -0700
changeset 1779 5f8b0ff1ef822d412f73d26a4479d8c5fe5ad1bf
parent 1778 f759fb23d8abf31dedec8984894618ae0c8b2c3e
child 1780 de6948b10a36be09a02a891b5260678a5e2e7ec1
push id982
push userandy@mozillamessaging.com
push dateTue, 15 Jun 2010 23:52:44 +0000
now if you press C it will close the full conversation
client/api/rdapi.css
client/api/rdapi.html
client/inflow/css/Conversation.css
index c5034362db803f3968fd38810225096f971625af..e5c96404ffab81d49d0f7ff2df364f8397deb1c6
GIT binary patch
literal 18508
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
--- a/client/api/rdapi.html
+++ b/client/api/rdapi.html
@@ -76,16 +76,20 @@
                         if (highlighted.length) {
                             newHighlight = highlighted.prev();
                             if (!newHighlight.hasClass('fullReply')) {
                                 newHighlight = null;
                             }
                         } else {
                             newHighlight = $('#convDisplay .fullReply').first();
                         }
+                    } else if (showingConversation && keyCode === 67) {
+                        //c
+                        $('.fullConvClose').click();
+                        return;
                     }
 
                     //If here is a newHeighlight, make it the new focus
                     if (newHighlight && newHighlight.length) {
                         if (isMessageNav) {
                             newHighlight.click();
                             //Make sure message can be seen.
                             rect = newHighlight[0].getBoundingClientRect();
@@ -210,17 +214,17 @@
     </div>
   </div>
 
   <div class="inflow templateContainer">
     <div class="row template convSummary" data-api="inflow/conversations/personal">
       {. first messages[0].schemas['rd.msg.body']}
       {. from rdapi.identity(first.from)}
       <div class="c3">
-        <span class="date">{first.timestamp} - via email</span>
+        <span class="date">{first.timestamp} - via source</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>
@@ -254,17 +258,19 @@
           <li class="twitterOptions">Lists</li>
           -->
       </div>
     </div>
     
     <div class="row">
       <div class="c3 folders">
         <div class="title">folders &mdash; show all &mdash; new folder</div>
-          <li>Sent</li>
+          <li class="pinned">Sent</li>
+          <li class="pinned">Archived</li>
+          <li class="pinned">Trash</li>
           <li>Travel</li>
           <li>Shopping</li>
           <li>Family</li>
           <li>Work</li>
       </div>
     </div>
     
     <div class="row">
--- a/client/inflow/css/Conversation.css
+++ b/client/inflow/css/Conversation.css
@@ -34,17 +34,17 @@
   -webkit-border-radius: 2px;
   border: 1px solid #ddd;
   background-color: #fff;
   /*background-image: url("../i/rd_message_bg.png");
   background-repeat: repeat-x;*/
 }
 
 .rdwConversation.active {
-  border: 1px solid #666;
+  border: 1px solid #bbb;
 }
 
 /*### IMPERSONAL ###*/
 .rdwConversation > .newImpersonal {
   padding: 10px;
   position: absolute;
   bottom: 25px;
   left: 35px;