lots of progress w/ wmsy, still focus issues

davidascher · Feb 27, 2011 · b582f03 · b582f03
1 parent 03f4dab
commit b582f03
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 103 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,3 +1,4 @@
+
 - fix initial signup experience w/ 200 return code
 - figure out how to process existing email sent to the customer
 - figure out how to get responses from the customer
@@ -8,7 +9,6 @@
 - do bot detection - things from bots don't go into conversations
   they go into notification queues
 
-- figure out how to use redis to do conversation mapping
 - /recent_correspondents
 
 

diff --git a/cherrypick.js b/cherrypick.js
@@ -78,8 +78,6 @@ function api(app) {
                 var email = author['email'];
                 if (!author['name']) author['name'] = email
                 var date = new Date(Date.parse(message['receivedDate']));
-                console.log("message.date = " + message['receivedDate'])
-                console.log(date.toUTCString());
                 if (date > earliestDate)
                   earliestDate = date;
                 if (! (email in participantMap)) {
@@ -91,7 +89,6 @@ function api(app) {
               convo['participants'] = participants;
               convo['unreadCount'] = messages.length;
               convo['totalCount'] = messages.length;
-              console.log("EARLIEST DATE: ", earliestDate.toUTCString());
               convo['date'] = earliestDate.toUTCString();
               convo['star'] = false; // XXX
               convo['messages'] = messages;

diff --git a/public/Neue/index.html b/public/Neue/index.html
@@ -87,6 +87,7 @@ <h1>Labels</h1>
                     <h1>Inbox</h1>
                 </header>
                 <div id="content" style="display: inline-block;">
+                </div>
             </section>
         </div>
 
@@ -105,33 +106,7 @@ <h1>Inbox</h1>
                     <button>more</button>
                 </div>
             </div>
-            <div class="title hbox">
-                <div class="subject overflow boxFlex">
-                    Lunch tomorrow
-                </div>
-                <div class="tags">
-                    <span>inbox</span>
-                </div>
-                <span class="starred">&#x2605;</span>
-            </div>
-            <div class="messageBody">
-                <div class="messageBodyHeader hbox">
-                    <div class="boxFlex">
-                        <span class="from">Bryan Clark</span> 
-                        <span class="to">to Andy Chung</span>
-                    </div>
-                    <div>
-                        <span class="date">Oct 7</span>
-                    </div>
-                </div>
-                <p>Hey Andy</p>
-                <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec cursus consequat ante ut viverra. Integer turpis libero, fringilla at bibendum sed, elementum ut diam. Cras dignissim turpis nec lorem placerat pellentesque. Nam enim risus, suscipit id volutpat fermentum, venenatis et torto</p>
-                <div class="messageBodyFooter hbox">
-                    <div class="boxFlex">
-                        <button>reply</button>
-                        <button>forward</button>
-                    </div>
-                </div>
+            <div id="messagelist">
             </div>
         </div>
     </section>

diff --git a/public/Neue/js/neue.js b/public/Neue/js/neue.js
@@ -6,7 +6,7 @@ $(document).ready(function($) {
     // size sections to 100% height of window
     $(window).bind("load resize", function() {
         var h = $(window).height();
-        $("#primaryNav, #conversation, #primaryNav section").css({ "height" : h });
+        //$("#primaryNav, #conversation, #primaryNav section").css({ "height" : h });
     });
 
     // size listWrap 

diff --git a/public/Neue/style.css b/public/Neue/style.css
@@ -270,12 +270,12 @@ button:active {
         margin: 0 auto;
         padding: 0 10px;
         position: relative;
-        opacity: 0;
+        /*opacity: 0;*/
         min-height: 100%;
     }
 
     body.conversationView .message {
-        opacity: 1;
+        /*opacity: 1;*/
     }
 
     .message .fullMsgHeader {

diff --git a/public/ui.html b/public/ui.html
@@ -4,19 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>Wmsy Simple Messages Example</title>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-    <script type="text/javascript">
-      var console;
-      if (!console)
-        console = {
-          log: function() {},
-          error: function() {},
-          info: function() {},
-          warn: function() {},
-      };
-      function dump(aMsgWithNewline) {
-        console.log(aMsgWithNewline.replace("\n", "", "g"));
-      }
-    </script>
+    <script type="text/javascript" src="Neue/js/jquery.prettydate.js"></script>
     <script type="text/javascript" src="requirejs/require.js"></script>
     <script>
       require(