Merge branch 'master' of github.com:nko/website

Author: gerad

models/models.coffee

@@ -93,6 +93,12 @@ class Team
       else
         @generateSlug fn, @slug + '-'  # try with another -
 
+  toJoyentSlug: ->
+    @slug.replace(/^(\d)/, 'ko-$1')
+
+  toHerokuSlug: ->
+    'nko-' + @slug.replace(/_/g, '-').substring(0, 26)
+
 nko.Team = Team
 
 class Person

script/post-receive

@@ -1 +1 @@
-curl -X POST -d url=http://$(hostname).no.de -d head=$rev -d head_long=$newrev http://nodeknockout.com/deploys
+curl -X POST -d url=http://$(hostname).no.de -d app=$(hostname) -d head=$rev -d head_long=$newrev http://nodeknockout.com/deploys

views/teams/show.html.haml

@@ -12,7 +12,10 @@
       %h3 NOT YET DEPLOYED
     .setup_instructions{ style: 'display:' + (ctx.team.lastDeployedTo ? 'none' : '') }
       %p.note
-        You can deploy to either Joyent or Heroku.
+        You can deploy to either
+        != ' <a href="http://nodeknockout.posterous.com/countdown-to-knockout-post-11-deploying-to-jo">Joyent</a> '
+        or
+        != ' <a href="http://nodeknockout.posterous.com/countdown-to-knockout-post-8-deploying-to-her">Heroku</a>.'
         %br
         We will use the server from the most recent deploy.
       %table
@@ -42,8 +45,7 @@
               %li
                 %code
                   git remote add joyent \\<br/> ssh://node@
-                  = ctx.team.slug.replace(/^(\d)/, 'ko-$1')
-                  \.no.de/repo
+                  = ctx.team.toJoyentSlug() + '.no.de/repo'
               %li
                 %code git push joyent master
           %td
@@ -53,9 +55,8 @@
                 .coupon &nbsp;
               %li
                 %code
-                  git remote add heroku \\<br/> [email protected]:nko-
-                  = ctx.team.slug
-                  \.git
+                  git remote add heroku \\<br/> [email protected]:
+                  = ctx.team.toHerokuSlug() + '.git'
               %li
                 %code git push heroku master