Merge branch 'master' into gh-pages

devth · devth · commit 7e93be88764a · 2010-07-30T14:30:30.000-07:00
diff --git a/index.html b/index.html
@@ -4,38 +4,74 @@
   <head>
     <title>Soliloquy</title>
 
+    <meta http-equiv="Content-Type" Content="text/html; charset=UTF-8" />
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js" type="text/javascript" charset="utf-8"></script>
     <script src="src/jquery.soliloquy.js" type="text/javascript" charset="utf-8"></script>
     
     <script type="text/javascript" charset="utf-8">
       $(function()
       {  
-        $('.feed').soliloquy().facebook( { username: 'NPR', posts: 2, relative_dates: false } );
+        $('.feed').soliloquy().facebook( { username: 'CriterionCollection', posts: 8, relative_dates: false } );
         $('.feed').soliloquy().twitter( 'devth', { posts: 5, relative_dates: false } );
         $('.feed').soliloquy().twitter_list( 'rails', 'core', { posts: 2 } );
         $('.feed').soliloquy().lastfm( { relative_dates: false });
+
+
+        $('h1').hover(function(){
+          $('.english').hide();
+          $('.japanese').show();
+        }, function(){
+          $('.english').show();
+          $('.japanese').hide();
+        });
+
       });
     </script>
 
     <style type="text/css" media="screen">
       body { font-family: 'Adobe Garamond Pro', 'Garamond Premier Pro', Garamond, Times, 'Times New Roman', serif; }
-      h1 { text-align:center; color: #ddd;  margin:40px 0; font-size:120px; }
+      h1 { text-align:center; color: #000; border-bottom: 1px solid #fff; padding-bottom: 30px; margin:40px 0; font-size:100px; 
+        text-shadow: #ccc 0px 2px 10px; position: relative;
+        height: 100px; cursor: default;
+      }
+      .japanese { display: none; position: relative; top:-20px; color: #b3001e; }
       
       .feed { width: 800px; margin: auto;}
-      .feed .post { clear: both; font-size: 20px; margin:20px; color:#333; }
+      .feed .post { clear: both; font-size: 20px; margin:10px; padding-bottom: 10px;
+        color:#333; border-bottom: 1px solid #eee; overflow: auto; 
+        background: -webkit-gradient(
+            linear, left bottom, left top,
+            color-stop(0.1, #fafafa),
+            color-stop(0.49, #fff)
+        );
+      }
 
       
       .thumbnail { float: left; display: block; padding: 0 10px 10px 10px; }
       .post_content { display: table-cell }
 
-      .created-at { font-size:70%; color:#666;}
+      .created-at { font-size:70%; color:#666; clear: both; }
       .screen-name { font-weight: bold; }
+
+      .picture { display: block; padding: 4px; }
+      .picture img { padding: 4px; border: 1px solid #ccc; }
+
+
+      .facebook .link-picture { float: left; padding: 4px 10px 4px 0; }
+      .facebook .link-content { color: #999; font-size: 90%; padding-top: 6px; display: table-cell; clear: both; }
+      .facebook .link-content .description { display: block; }
+
+      .facebook .created-at { display: block; }
+
       
     </style>
   </head>
   
   <body>
-    <h1>Soliloquy</h1>
+    <h1>
+      <span class="english">Soliloquy</span>
+      <span class="japanese">独り言</span>
+    </h1>
     <div class="feed"></div>
     <div class="twitter_list"></div>
   </body>
diff --git a/src/jquery.soliloquy.js b/src/jquery.soliloquy.js
@@ -106,7 +106,7 @@ http://github.com/devth/soliloquy
       }
       minutes = (date_time.getMinutes().toString().length == 1) ? "0" + date_time.getMinutes() : date_time.getMinutes();
       return ((date_time.getMonth() + 1) + "/" + (date_time.getDate()) + "/" + date_time.getFullYear() + 
-              " " + (hours) + ":" + minutes + ampm);
+              " at " + (hours) + ":" + minutes + ampm);
     }
   }
   function relative_time( parsed_date )
@@ -224,10 +224,32 @@ http://github.com/devth/soliloquy
       if ( post.type == "status" ){
         html += processPost( post.message );
       } else if ( post.type == "link" ){
-        html += '<div class="link"><a href="' + post.link + '">' + post.name + '</a></div>';
-        html += post.description;
+        if ( post.message ) html += '<span class="message">' + processPost(post.message) + '</span>';
+        if ( post.picture ){
+          html += '<div class="link-picture"><a href="' + post.link + '"><img src="' + post.picture + '"></a></div>';
+        }
+        html += '<div class="link-content"><a href="' + post.link + '">' + post.name + '</a><span class="description">' + post.description + '</span></div>';
+      } else if ( post.type == "photo" ){
+        html += '<span class="photo">';
+          html += post.message;
+          html += '<span class="picture">';
+            if ( post.link ) html += '<a href="' + post.link + '">';
+            html += '<img src="' + post.picture + '">';
+            if ( post.link ) html += '</a>';
+          html += '</span>';
+        html += '</span';
       }
-      html += " <span class='created-at'>" +  date_string + "</span>";
+      html += ' <span class="created-at">';
+      if ( post.icon ) html += '<img src="' + post.icon + '" /> ';
+      html += date_string + "</span>";
+
+
+      if ( post.comments ){
+        html += '<div class="comments">';
+        html += '</div>';
+      }
+      
+
     html += "</div>";
     html += '</div>';
     return html;
