merging.

codersociety · Mar 13, 2012 · 1a0a1f6 · 1a0a1f6
2 parents e9e2d4e + c0ba8dc
commit 1a0a1f6
Show file tree

Hide file tree

Showing 15 changed files with 224 additions and 126 deletions.
diff --git a/_config.yml b/_config.yml
@@ -4,7 +4,7 @@ exclude: README.md, .gitignore
 permalink: none
 baseurl: 
 url: http://codersociety.org
-hashtag: '#codersociety OR #coder-society OR #codersocietysea OR #codersocietypdx #codersocietysfo OR #codersocietyeug OR @codersociety'
+hashtag: '#codersociety OR #coder-society OR #codersocietysea OR #codersocietypdx OR #codersocietysfo OR #codersocietyeug OR @codersociety'
 github_login: 'codersociety'
 github_repo: 'codersociety.github.com'
 github_lanaguage: 'JavaScript'
diff --git a/_includes/event.html b/_includes/event.html
@@ -0,0 +1,24 @@
+<div class="event">
+	{% if item.slug %}<a class="slug" name="{{item.slug}}">{% endif %}
+	{% if item.title %}<h3>{{item.title}}</h3>{% endif %}
+	{% if item.slug %}</a>{% endif %}
+	{% if item.is_tbd %}
+		<small class='date'>TBD</small>
+	{% elsif item.date %}
+		<small class='date'>{{item.date | date:"%b %d %Y"}}</small>
+	{% endif %}
+	<div class="event description">
+		{{item.content}}
+	</div>
+	<!-- Place this tag where you want the +1 button to render -->
+	<g:plusone annotation="inline" href="{{site.baseurl}}{{item.url}}"></g:plusone>
+
+	<!-- Place this render call where appropriate -->
+	<script type="text/javascript">
+	  (function() {
+	    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+	    po.src = 'https://apis.google.com/js/plusone.js';
+	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+	  })();
+	</script>
+</div>
diff --git a/_includes/idea.html b/_includes/idea.html
@@ -0,0 +1,20 @@
+<div class="idea">
+	{% if item.slug %}<a class="slug" name="{{item.slug}}">{% endif %}
+	{% if item.title %}<h3>{{item.title}}</h3>{% endif %}
+	{% if item.slug %}</a>{% endif %}
+	<div class="idea description">
+		{{item.content}}
+	</div>
+	<div><small>If you like this idea, vote it up by clicking the +1 button!</small></div> 
+	<!-- Place this tag where you want the +1 button to render -->
+	<g:plusone annotation="inline" href="{{site.baseurl}}{{item.url}}"></g:plusone>
+
+	<!-- Place this render call where appropriate -->
+	<script type="text/javascript">
+	  (function() {
+	    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+	    po.src = 'https://apis.google.com/js/plusone.js';
+	    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+	  })();
+	</script>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-{% assign base = site.baseurl + '/' %}
 <html>
 <head>
 	<meta charset='utf-8'>
@@ -10,8 +9,19 @@
 
     <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
     <link href='http://fonts.googleapis.com/css?family=Holtwood+One+SC' rel='stylesheet' type='text/css'>
-	<link href="{{base}}assets/screen.css" media="screen" rel="stylesheet" type="text/css" />
-	<script src="{{base}}assets/site.js" type="text/javascript"></script>
+    <link href="assets/screen.css" media="screen" rel="stylesheet" type="text/css" />
+    <script src="assets/site.js" type="text/javascript"></script>
+	<script type="text/javascript">
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-29592492-1']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
 </head>
 <body>
 	<div class="content">
@@ -20,7 +30,7 @@ <h1>CODER SOCIETY</h1>
 			<span class="nav">
     			<a href="#vote">VOTE</a>
     			 / 
-    			<a href="#group">GROUP</a>
+    			<a href="http://groups.google.com/group/coder-society">GROUP</a>
     			 / 
     			<a href="#create">CREATE</a>
     		</span>

diff --git a/assets/screen.css b/assets/screen.css
@@ -185,19 +185,23 @@ div.section {
 a.github-user,
 a.tweet {
   display:block;
-  height:48px;
-  width:48px;
+  height:64px;
+  width:64px;
   margin: 0px 4px 4px 0px;
   float:left;
   position: relative;
   }
 
 .thumb {
   display:block;
-  height:48px;
-  width:48px;
+  height:64px;
+  width:64px;
   background:white 50% 50% no-repeat;
-  background-size:48px;
+  background-size:64px;
+  border-radius: 5px;
+  -moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  border: solid 1px darkgrey;
   }
 
 .popup {
@@ -228,20 +232,21 @@ a.tweet {
 .github-user:hover .popup { display:block; }
 
 .buttons {
-  margin-bottom:10px;
-  width:205px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  width: 64px;
   }
 
 .buttons a {
   text-align:center;
-  font-size: 1.2em;
+  font-size: 1em;
   font-weight: bold;
-  line-height:36px;
+  line-height:24px;
   display:block;
   margin:0;
   padding:0;
   padding:4px;
-  color: #f2f2f2;
+  color: white;
   background: #4183C4; /*#6ab;*/
   -webkit-border-radius:5px;
   -moz-border-radius:5px;
@@ -289,4 +294,14 @@ a.tweet {
 .editing {
   font-size:11px;
   line-height:16px;
-  }
+  }
+
+  small {
+    font-style: italic; 
+    display: block;
+    margin-bottom: 10px;
+}
+
+.event .description a {
+  font-weight: bold;
+}
diff --git a/events/_posts/2012-03-04-eugene.md b/events/_posts/2012-03-04-eugene.md
@@ -0,0 +1,7 @@
+---
+layout: events
+title: Eugene @ Code Chops
+slug: eugene_code_chops
+is_tbd: true
+---
+First meetup at [Code Chops](http://g.co/maps/nqr9d). Topic and date still TBD.
diff --git a/events/_posts/2012-03-04-portland.md b/events/_posts/2012-03-04-portland.md
@@ -0,0 +1,7 @@
+---
+layout: events
+title: Portland @ White Horse
+slug: portland_white_horse
+is_tbd: true
+---
+First meetup at [White Horse](http://maps.google.com/maps/place?cid=4991505720743632211). Topic and date still TBD.
diff --git a/events/_posts/2012-03-04-san-francisco.md b/events/_posts/2012-03-04-san-francisco.md
@@ -0,0 +1,7 @@
+---
+layout: events
+title: San Francisco @ TBD
+slug: san_francisco
+is_tbd: true
+---
+First meetup coming soon. Location, topic and date still TBD.
diff --git a/events/_posts/2012-03-04-seattle.md b/events/_posts/2012-03-04-seattle.md
@@ -0,0 +1,7 @@
+---
+layout: events
+title: Seattle @ Blue Box
+slug: seattle_blue_box
+is_tbd: true
+---
+First meetup at [Blue Box](http://maps.google.com/maps/place?cid=95091209907298468). Topic and date still TBD.
diff --git a/ideas/_posts/2012-03-04-continuous-development.md b/ideas/_posts/2012-03-04-continuous-development.md
@@ -0,0 +1,9 @@
+---
+layout: ideas
+title: Continuous Development
+slug: continuous_development
+---
+Continuous Development: How to keep code, tests and delivery to production flowing with minimal impedance creating a continuous cadence of delivering value to your end users. 
+
+Specifically, building a CI/CD system using TeamCity, Jenkins + AWS, or Travis-CI and how to build confidence in your code, tests and process in that environment.
+
diff --git a/ideas/_posts/2012-03-04-creating-public-apis.md b/ideas/_posts/2012-03-04-creating-public-apis.md
@@ -0,0 +1,10 @@
+---
+layout: ideas
+title: Creating Public APIs
+slug: creating_public_apis
+---
+Creating Public APIs: How to create a public API for your application. 
+
+REST + JSON? Custom client libraries? C API? Lots of ways to attack this problem. Lets take an existing app, pick a strategy and then surface an API for end users to consume. Lots of challenges there like authentication, rate limiting, shaping the data, caching and consistency, etc... 
+
+There are some great tools out there for making this easier.
diff --git a/ideas/_posts/2012-03-04-micro-services.md b/ideas/_posts/2012-03-04-micro-services.md
@@ -0,0 +1,10 @@
+---
+layout: ideas
+title: Micro Services
+slug: micro_services
+---
+How to build a future-proof system using micro-services and a language/platform agnostic messaging bus with something like ZMQ. This would show the process of writing code as a collection of miniature services that communicate over purpose built APIs using ZMQ. 
+
+This project would show how you can use such an architecture to seamlessly scale up from a single process to multi-process to multi-machine. Greatest thing about ZMQ is that it enables this in almost any language and on any OS. To expand on the topic, we may want to consider other queues also.
+
+
diff --git a/ideas/_posts/2012-03-04-polyglot-persistence.md b/ideas/_posts/2012-03-04-polyglot-persistence.md
@@ -0,0 +1,11 @@
+---
+layout: ideas
+title: PolyGlot Persistence
+slug: polyglot_persistence
+---
+What's my persistence mechanism and why you might want to do that. 
+
+Should I use MongoDB, Riak, SQLite, MySQL, SOLR/Lucene, or CouchBase to store my data? Maybe the best answer is "all of them". How to make that work? 
+
+Why and when is that a good idea? Lets talk though the design considerations and then do a project that has multiple persistence mechanisms that are well orchestrated to be better than any single system.
+
diff --git a/ideas/_posts/2012-03-04-polyglot-systems.md b/ideas/_posts/2012-03-04-polyglot-systems.md
@@ -0,0 +1,8 @@
+---
+layout: ideas
+title: PolyGlot Systems
+slug: polyglot_systems
+---
+For this we would do a simple project where we pick technologies using at least two different programming languages and have them perform different roles in an application and share information across something neutral like ZMQ or Redis. 
+
+Some of the options would be to implement with C# + Node.js/JavaScript + Ruby/Sinatra is a good starting point.