Merge pull request #2 from NodeDC/master

Various fixes from NodeDC site
cconf · Nov 3, 2011 · 85a54e5 · 85a54e5
2 parents 76b78bf + e2f4ccd
commit 85a54e5
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 41 deletions.
diff --git a/_config.yml b/_config.yml
@@ -7,4 +7,4 @@ url: http://nodedc.org
 hashtag: '#nodedc'
 github_login: 'developmentseed'
 github_repo: 'bones'
-github_lanaguage: 'JavaScript'
+github_language: 'JavaScript'
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -8,7 +8,18 @@
   <!--[if IE]><link rel='stylesheet' href='{{base}}/site-ie.css' type='text/css'/><![endif]-->
   <link rel='shortcut icon' href='{{base}}/images/favicon.ico' type='image/x-icon' />
   <link href='http://fonts.googleapis.com/css?family=Jockey+One' rel='stylesheet' type='text/css'>
-  <script src='{{base}}/site.js' type='text/javascript'></script>
+  <script type='text/javascript'>
+    var site = {
+      github_language: '{{site.github_language}}',
+      github_login: '{{site.github_login}}',
+      github_repo: '{{site.github_repo}}',
+      hashtag: '{{site.hashtag}}'
+    };
+  </script>
+  <script src='{{base}}/js/jquery-1.6.4.min.js' type='text/javascript'></script>
+  <script src='{{base}}/js/underscore.js' type='text/javascript'></script>
+  <script src='{{base}}/js/backbone.js' type='text/javascript'></script>
+  <script src='{{base}}/js/site.js' type='text/javascript'></script>
 </head>
 <body>
   <div class='limiter'>
@@ -26,11 +37,16 @@
         </div>
       </div>
 
-      <div class='followers clearfix'></div>
-      <div class='tweets clearfix'></div>
-      <h2>Project from the group</h2>
+      <div class='followers clearfix'>
+      </div>
+
       <div class='follower-project clearfix'>
+        <h2>A member's {{site.github_language}} project</h2>
+      </div>
+      <div class='tweets clearfix'>
+        <h2>Tweets that mention {{site.hashtag}}</h2>
       </div>
+      <div class='editing'><p>This website is <a href='http://github.com/{{site.github_login}}/{{site.github_repo}}'>open source</a> and you can help us edit it. To submit a change, <a href='http://help.github.com/fork-a-repo/'>fork this repo</a>, commit your changes, and send us a <a href='http://help.github.com/pull-requests/'>pull request</a>.</p></div>
     </aside>
     <div id='main'>
       <header>

diff --git a/events/_posts/2011-09-20-september-meetup.md b/events/_posts/2011-09-20-september-meetup.md
@@ -7,10 +7,13 @@ Come on over to Development Seed's garage to talk about Node.js and why you shou
 
 We'll have a few five minute lightning talks around topics relating to Node.js. We're looking for a few more speakers. If you'd like to give one, please submit it here or send it to @developmentseed. So far, we have one lightning talk on the schedule.
 
-Adrian Rossouw will give an intro to Underscore.js. He'll run through some of the features of the most depended on package in npm. Underscore.js is quickly becoming a requirement for both server-side and client side developers, and its collection of small utility functions will help you work more efficiently with data structures. Underscore.js also forms the basis or inspiration for several other popular libraries, such as Backbone and Spine. More details on underscore.js are here.
+Adrian Rossouw will give an intro to [Underscore.js](http://github.com/documentcloud/underscore.js). He'll run through some of the features of the most depended on package in npm. Underscore.js is quickly becoming a requirement for both server-side and client side developers, and its collection of small utility functions will help you work more efficiently with data structures. Underscore.js also forms the basis or inspiration for several other popular libraries, such as Backbone and Spine. More details on underscore.js are here.
 
-Jeff Miccolis will present on the couch-sqlite library for Node.js, which allows a SQLite database to subscribe to changes from CouchDB. For example, this allows you to get real-time updates from Couch into a geo-enabled SQLite database.
+Jeff Miccolis will present on the [couch-sqlite](https://github.com/developmentseed/couch-sqlite)
+library for Node.js, which allows a SQLite database to subscribe to changes from CouchDB.
+For example, this allows you to get real-time updates from Couch into a geo-enabled SQLite database.
 
-Come on over around 7:00 pm. We'll do introductions and start the lightning talks at 7:30 pm. Bring some beer/drinks to share with the group - we'll provide the fridge and some snacks. Hope to see you there!
+Come on over around 7:00 pm. We'll do introductions and start the lightning talks at
+7:30 pm. Bring some beer/drinks to share with the group - we'll provide the fridge and some snacks. Hope to see you there!
 
 Development Seed's office is at 1714 14th Street NW, off the alley behind 14th Street (behind Peregrine and Cork). Turn down R street and make the first turn down the alley - you'll see our sign.
diff --git a/events/_posts/2011-10-19-october-meetup.md b/events/_posts/2011-10-19-october-meetup.md
@@ -9,7 +9,7 @@ presenters:
 
 The third-ever Node.js meetup held in Washington, DC will be Wednesday, September 19. The meetup will start at 7:00 pm, with talks starting at 7:30 so everyone has a chance to grab a drink and talk to folks. Then we'll have introductions, followed by 5 minute lightning talks on anything related to node. We're looking for volunteers to present - if you'd like to give a talk, submit an idea on the lanyard event page or tweet it at @developmentseed. So far, we have one on the lineup:
 
-- Will White will talk about testing node.js web applications with expresso, an async testing framework.
+- Will White will talk about testing node.js web applications with [expresso, an async testing framework](https://github.com/visionmedia/expresso).
 - Ryan Roemer will talk about Sunny.js, a multi-cloud datastore client for Node.js with read/write streams and async.js.
 
 Everyone is welcome - including newcomers to node.js, those interested to hear what the hype is about, and experienced developers looking to trade tricks.

diff --git a/_includes/js/backbone.js → js/backbone.js b/_includes/js/backbone.js → js/backbone.js
diff --git a/_includes/js/jquery-1.6.4.min.js → js/jquery-1.6.4.min.js b/_includes/js/jquery-1.6.4.min.js → js/jquery-1.6.4.min.js
diff --git a/site.js → js/site.js b/site.js → js/site.js
@@ -1,11 +1,7 @@
----
----
-;{% include js/jquery-1.6.4.min.js %}
-;{% include js/underscore.js %}
-;
-
 (function(context) {
 
+if (!site) throw new Error('Configuration not found');
+
 var longneck = {};
 
 longneck.githubWatcherProject = function(resp) {
@@ -19,15 +15,17 @@ longneck.githubWatcherProject = function(resp) {
             url: 'https://api.github.com/users/' + u.login + '/repos',
             dataType: 'jsonp',
             success: function(resp) {
-                if (!resp.data.length) return;
+                if (!resp.data.length) return getProjects(shuffled[++i]);
                 var repo = _(resp.data)
                     .chain()
                     .shuffle()
-                    .detect(function(r) { return r.language === '{{site.github_lanaguage}}' })
+                    .detect(function(r) {
+                        return r.language === site.github_language;
+                    })
                     .value();
 
                 if (!repo) {
-                    getProjects(shuffled[i++]);
+                    getProjects(shuffled[++i]);
                 } else {
                     var template =
                         ""
@@ -39,7 +37,7 @@ longneck.githubWatcherProject = function(resp) {
                         + "<span class='title'> <%=description%></span>"
                         + "";
                     var t = _(template).template(repo);
-                    watcherProject.html(t).addClass('loaded');
+                    watcherProject.append(t).addClass('loaded');
                 }
 
             }
@@ -53,19 +51,24 @@ longneck.githubWatchers = function() {
     $.ajax({
         // TODO: this endpoint only returns maximum 30 users. Implement random
         // pagination so we see different groups of people.
-        url: 'https://api.github.com/repos/{{site.github_login}}/{{site.github_repo}}/watchers',
+        url: 'https://api.github.com/repos/' +
+            site.github_login + '/' +
+            site.github_repo + '/watchers',
         dataType: 'jsonp',
         success: function(resp) {
             if (!resp.data.length) return;
             longneck.githubWatcherProject(resp);
             var template =
-                "<a class='github-user' target='_blank' href='http://github.com/<%=login%>'>"
-                + "<span style='background-image:url(<%=avatar_url%>)' class='thumb' /></span>"
-                + "</a>";
+                "<a class='github-user' target='_blank' href='http://github.com/<%=login%>'>" +
+                "<span style='background-image:url(<%=avatar_url%>)' class='thumb' /></span>" +
+                "<span class='popup'>" +
+                "<span class='title'><%=login%></span>" +
+                "</span>" +
+                "</a>";
             var t = _(resp.data)
                 .map(function(i) { return _(template).template(i); })
                 .join('');
-            watchers.html(t);
+            watchers.append(t);
         }
     });
 };
@@ -76,13 +79,13 @@ longneck.setup = function() {
     var tweets = $('.tweets');
 
     $('.watch').hover(
-        function() { $('.watch-docs').addClass('active') },
-        function() { $('.watch-docs').removeClass('active') }
-    )
+        function() { $('.watch-docs').addClass('active'); },
+        function() { $('.watch-docs').removeClass('active'); }
+    );
 
     $.ajax({
         url: 'http://search.twitter.com/search.json',
-        data: { q: '{{site.hashtag}}', rpp:100 },
+        data: { q: site.hashtag, rpp:100 },
         dataType: 'jsonp',
         success: function(resp) {
             if (!resp.results.length) return;
@@ -93,15 +96,14 @@ longneck.setup = function() {
                 + "<span class='title'>@<%=from_user%></span>"
                 + "<small><%=text%></small>"
                 + "</span>"
-                + "<span class='caret'></span>"
                 + "</a>";
             var t = _(resp.results.slice(0,30))
                 .map(function(i) { return _(template).template(i); })
                 .join('');
-            tweets.html(t).addClass('loaded');
+            tweets.append(t).addClass('loaded');
         }
     });
-}
+};
 $(longneck.setup);
 
 context.longneck = longneck;

diff --git a/_includes/js/underscore.js → js/underscore.js b/_includes/js/underscore.js → js/underscore.js
diff --git a/site.css b/site.css
@@ -42,14 +42,18 @@ header .logo {
   padding:0px 20px 20px;
   }
 
+.followers,
+.follower-project,
+.tweets,
+.editing { margin-bottom:10px; }
+
 .prose h1,
 .prose h2 {
   font-family: 'Jockey One', 'Helvetica Neue', Helvetica, Arial, sans-serif;
   font-size:22px;
   font-weight:normal;
   }
 
-
 /* Prose */
 .prose h1,
 .prose h2,
@@ -79,21 +83,50 @@ header .logo {
   margin:0px 0px 20px;
   }
 
-a.github-user {
+a.github-user,
+a.tweet {
   display:block;
   height:48px;
   width:48px;
   margin: 0px 4px 4px 0px;
   float:left;
+  position: relative;
   }
 
-  a.github-user .thumb {
-    display:block;
-    height:48px;
-    width:48px;
-    background:white 50% 50% no-repeat;
-    background-size:48px;
-    }
+.thumb {
+  display:block;
+  height:48px;
+  width:48px;
+  background:white 50% 50% no-repeat;
+  background-size:48px;
+  }
+
+.popup {
+  display:none;
+  position:absolute;
+  right:55px;
+  top:-5px;
+  width:180px;
+  padding:5px 20px 5px 10px;
+  background:black;
+  border-radius:5px;
+  -moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  }
+
+.popup * { color:#fff; }
+
+.popup small {
+  display: block;
+  font-size: 12px;
+  }
+
+.tweet:hover,
+.github-user:hover { z-index:1; }
+.tweet:hover .caret,
+.tweet:hover .popup,
+.github-user:hover .caret,
+.github-user:hover .popup { display:block; }
 
 .buttons {
   margin-bottom:10px;
@@ -153,6 +186,11 @@ a.github-user {
     text-align:center;
     }
 
+.editing {
+  font-size:11px;
+  line-height:16px;
+  }
+
 /*
 ** Markup free clearing
 ** Details: http://www.positioniseverything.net/easyclearing.html