Fix up talk links, navigation

uusijani · Dec 11, 2012 · c8a1d44 · c8a1d44
1 parent febcad2
commit c8a1d44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/app/index.coffee b/app/index.coffee
@@ -17,10 +17,6 @@ googleAnalytics = require 'zooniverse/lib/google_analytics'
 ContentPage = require 'controllers/content_page'
 feedbackContent = require 'views/feedback_page'
 
-# Temporarily disable Talk links
-$(document).on 'click', 'a[href*="talk"]', (e) ->
-  e.preventDefault(); alert 'Talk is currently unavailable. Sorry!'
-
 googleAnalytics.init
   account: 'UA-1224199-36'
   domain: 'snapshotserengeti.org'

diff --git a/app/models/subject.coffee b/app/models/subject.coffee
@@ -84,7 +84,7 @@ class Subject extends Model
     """.replace '\n', '', 'g'
 
   talkHref: ->
-    "http://talk.snapshotserengeti.org/objects/#{@zooniverseId}"
+    "http://talk.snapshotserengeti.org/subjects/#{@zooniverseId}"
 
   facebookHref: ->
     title = 'Snapshot Serengeti'

diff --git a/public/index.html b/public/index.html
@@ -23,9 +23,8 @@ <h1><a href="/"><img src="images/wordmark.png" alt="Snapshot Serengeti" /></a></
         <li><a href="#/about" data-i18n="navigation.about">About</a></li>
         <li><a href="#/classify" data-i18n="navigation.classify">Classify</a></li>
         <li><a href="#/profile" data-i18n="navigation.profile">Profile</a></li>
-        <li><a href="#/feedback" style="text-decoration: underline;">Feedback</a></li>
-        <!-- <li><a href="http://talk.snapshotserengeti.org/" data-i18n="navigation.discuss">Discuss</a></li> -->
-        <!-- <li><a href="http://blog.snapshotserengeti.org/" data-i18n="navigation.blog">Blog</a></li> -->
+        <li><a href="http://talk.snapshotserengeti.org/" data-i18n="navigation.discuss">Discuss</a></li>
+        <li><a href="http://blog.snapshotserengeti.org/" data-i18n="navigation.blog">Blog</a></li>
       </ul>
     </nav>