Merge branch 'master' of github.com:cloudfuji/kandan

Gemfile

@@ -20,7 +20,7 @@ gem '_bushido-faye', '0.8.2'
 # Helper gems
 gem 'kaminari'
 gem 'aws-sdk'
-gem 'paperclip'
+gem 'cloudfuji_paperclip'
 gem 'remotipart'
 gem 'jquery-rails'
 

Gemfile.lock

@@ -56,6 +56,12 @@ GEM
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
       rest-client (>= 1.6.1)
+    cloudfuji_paperclip (3.0.3)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (>= 0.0.2)
+      mime-types
     cocaine (0.2.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -106,16 +112,11 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.3.2)
     multi_xml (0.4.2)
     nokogiri (1.5.0)
     orm_adapter (0.0.6)
-    paperclip (2.7.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
-      mime-types
     pg (0.12.2)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -166,7 +167,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -184,14 +185,14 @@ DEPENDENCIES
   aws-sdk
   bourbon
   cloudfuji
+  cloudfuji_paperclip
   coffee-rails (~> 3.2.1)
   devise
   devise_cloudfuji_authenticatable
   eco
   execjs
   jquery-rails
   kaminari
-  paperclip
   pg (= 0.12.2)
   rails (= 3.2.2)
   remotipart

README.md

@@ -1,4 +1,4 @@
-Kandan - Modern Open Source Chat
+Kandan - [Modern Open Source Chat](http://www.kandan.me)
 ================================
 The slickest chat app out there. Open-source and well-supported to boot.
 
@@ -119,7 +119,7 @@ Get Involved!
 =============
 That's not a question, it's an order! Or more of a friendly offer, really. Kandan is a fully open-source app, so dive in and start adding features, fixing bugs (what bugs?), and cleaning up the code.
 
-* Talk with us on the [mailing list])(https://groups.google.com/forum/?fromgroups#!forum/cloudfuji)
+* Talk with us on the [mailing list](https://groups.google.com/forum/?fromgroups#!forum/cloudfuji)
 * GitHub [issues tracker](https://github.com/cloudfuji/kandan/issues)
 * Twitter [@cloudfuji](https://twitter.com/#!/cloudfuji)
 * [New-wave open-source meetup](www.meetup.com/San-Francisco-New-Wave-Open-Source-Apps/) - we meetup once a month to share tips on how developers grow business around super high-quality open source software

app/assets/javascripts/backbone/plugins/attachments.js.coffee

@@ -30,7 +30,7 @@ class Kandan.Plugins.Attachments
 
     fileItemTemplate: _.template '''
       <div class="file_item">
-        <a href="<%= url %>">
+        <a target="_blank" href="<%= url %>">
           <img src="<%= iconUrl %>"/>
           <span><%= fileName %></span>
         </a>
@@ -59,7 +59,7 @@ class Kandan.Plugins.Attachments
 
 
 
-  # TODO this part is very bad for APIs! shoudnt be exposing a backbone collection in a plugin.
+  # TODO this part is very bad for APIs! Shouldn't be exposing a backbone collection in a plugin.
   @render: ($widgetEl)->
     $uploadForm = @templates.dropzone({
       channelId:    Kandan.Data.Channels.activeChannelId(),
@@ -121,6 +121,11 @@ class Kandan.Plugins.Attachments
 
       dragOver: ->
         console.log "reached dropzone!"
+        $(".dropzone").text("UPLOAD!")
+
+      dragLeave: ->
+        console.log "left dropzone!"
+        $(".dropzone").text("Drop file here to upload")
     })
 
 

app/models/attachment.rb

@@ -1,4 +1,4 @@
-require 'paperclip'
+require 'cloudfuji_paperclip'
 
 class Attachment < ActiveRecord::Base
   belongs_to :channel

app/views/main/index.html.erb

@@ -43,6 +43,6 @@
 
 </div>
   <div class="user_menu">
-    <a href="<%= destroy_user_session_path %>">logout</a>
+    <%= link_to 'logout', destroy_user_session_path, :method => :destroy %>
   </div>