From 6382aef9420036ef4d2f5d8cf1193d3c7d702115 Mon Sep 17 00:00:00 2001
From: Gabriela Rodriguez <gabelula@gmail.com>
Date: Sat, 1 Jun 2013 15:05:10 -0700
Subject: [PATCH] Listing Sources: Show calendar or Organization name. PT
 23709559

---
 Gemfile.lock                     | 360 +++++++++++++++++--------------
 app/helpers/sources_helper.rb    |   2 +-
 app/views/sources/index.html.erb |   4 +-
 3 files changed, 206 insertions(+), 160 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b341a7c22..0f614d8ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,220 +1,266 @@
 GIT
-  remote: git://github.com/activate/formtastic-bootstrap.git
+  remote: git://github.com/igal/loofah-activerecord.git
+  revision: 0000c8c5d666e3e2a148f3ba44b051e5c22b9387
+  branch: with_rails_3.1_and_3.2
+  specs:
+    loofah-activerecord (1.0.0.20120811132815)
+      loofah (>= 1.0.0)
+
+GIT
+  remote: git://github.com/ncri/validation_reflection.git
+  revision: 60320e6beb088808fd625a8d958dbd0d2661d494
+  ref: 60320e6beb088808fd625a8d958dbd0d2661d494
+  specs:
+    validation_reflection (1.0.0)
+
+GIT
+  remote: git@github.com:activate/formtastic-bootstrap.git
   revision: 87c14ba421605f74faa61300f12a736e617f10e2
   specs:
     formtastic-bootstrap (1.1.2)
       formtastic (~> 2.0.2)
       rails (~> 3.0)
 
-GIT
-  remote: git://github.com/sferik/rails_admin.git
-  revision: 7d1006824b8ac027b7bcea3716804511ccaa92a9
-  branch: rails-3.0
-  specs:
-    rails_admin (0.0.1)
-      builder (~> 2.1.0)
-      haml (>= 3.1.0, < 3.3.0)
-      rails (~> 3.0.11)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.11)
-      actionpack (= 3.0.11)
-      mail (~> 2.2.19)
-    actionpack (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.11)
-      activesupport (= 3.0.11)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.11)
-      activemodel (= 3.0.11)
-      activesupport (= 3.0.11)
-    activesupport (3.0.11)
-    acts-as-taggable-on (2.0.6)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.10)
-    bcrypt-ruby (3.0.1)
-    bluecloth (2.1.0)
-    builder (2.1.2)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    acts-as-taggable-on (2.3.3)
+      rails (~> 3.0)
+    arel (3.0.2)
+    bluecloth (2.2.0)
+    builder (3.0.4)
+    capistrano (2.12.0)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
+    capistrano-ext (1.2.1)
+      capistrano (>= 1.0.0)
     coderay (1.0.9)
-    columnize (0.3.4)
-    devise (1.5.4)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
+    columnize (0.3.6)
+    database_cleaner (0.8.0)
     diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    exception_notification (2.4.1)
-    factory_girl (1.3.3)
-    factory_girl_rails (1.0.1)
-      factory_girl (~> 1.3)
+    erubis (2.7.0)
+    exception_notification (2.6.1)
+      actionmailer (>= 3.0.4)
+    factory_girl (2.6.4)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
+    fattr (2.2.1)
+    ffi (1.8.1)
     formtastic (2.0.2)
       rails (~> 3.0)
-    geokit (1.5.0)
-    haml (3.1.8)
-    htmlentities (4.2.3)
-    httparty (0.8.1)
+    geokit (1.6.5)
       multi_json
+    growl (1.0.3)
+    guard (1.3.3)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (1.2.1)
+      guard (>= 1.1)
+    guard-spork (1.1.0)
+      guard (>= 1.1)
+      spork (>= 0.8.4)
+    haml (4.0.3)
+      tilt
+    highline (1.6.19)
+    hike (1.2.2)
+    htmlentities (4.3.1)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
       multi_xml
-    i18n (0.5.0)
+    i18n (0.6.1)
+    journey (1.0.4)
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    loofah (1.0.0)
-      nokogiri (>= 1.3.3)
-    loofah-activerecord (1.0.0)
-      loofah (>= 1.0.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    listen (1.1.4)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    loofah (1.2.1)
+      nokogiri (>= 1.4.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.23)
-    multi_json (1.7.2)
+    multi_json (1.7.4)
     multi_xml (0.5.3)
+    net-scp (1.1.1)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     nokogiri (1.5.9)
-    orm_adapter (0.0.7)
-    paper_trail (2.2.4)
-      rails (~> 3)
+    options (2.3.0)
+      fattr
+    paper_trail (2.6.3)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
     paper_trail_manager (0.2.0)
       paper_trail (~> 2.0)
       rails (~> 3.0)
       rake
       will_paginate (~> 3.0.pre2)
     polyglot (0.3.3)
-    pry (0.9.12.1)
+    progress_bar (0.4.0)
+      highline (~> 1.6.1)
+      options (~> 2.3.0)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.11)
-      actionmailer (= 3.0.11)
-      actionpack (= 3.0.11)
-      activerecord (= 3.0.11)
-      activeresource (= 3.0.11)
-      activesupport (= 3.0.11)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.0.11)
-    railties (3.0.11)
-      actionpack (= 3.0.11)
-      activesupport (= 3.0.11)
+      railties (= 3.2.13)
+    rails3-jquery-autocomplete (1.0.11)
+      rails (~> 3.0)
+    rails_autolink (1.0.9)
+      rails (~> 3.1)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (>= 0.14.6, < 2.0)
     rake (10.0.4)
-    rbx-require-relative (0.0.9)
-    rcov (0.9.9)
-    rdoc (3.8)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
+    rdoc (3.12)
+      json (~> 1.4)
     ri_cal (0.8.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.4)
-    slop (3.4.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    rubyzip (0.9.9)
+    slop (3.4.5)
+    spork (0.9.2)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
-    themes_for_rails (0.4.2)
-      rails (~> 3.0.0)
-      themes_for_rails
-    thor (0.14.6)
+    themes_for_rails (0.5.1)
+      rails (>= 3.0.0)
+    thor (0.18.1)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    validation_reflection (1.0.0)
-    warden (1.2.1)
-      rack (>= 1.0)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (3.0.pre2)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  acts-as-taggable-on (= 2.0.6)
-  bluecloth (= 2.1.0)
-  columnize (= 0.3.4)
-  devise
-  exception_notification (= 2.4.1)
-  factory_girl_rails (= 1.0.1)
-  formtastic (~> 2.0)
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  acts-as-taggable-on (= 2.3.3)
+  bluecloth (= 2.2.0)
+  capistrano (= 2.12.0)
+  capistrano-ext (= 1.2.1)
+  columnize (= 0.3.6)
+  database_cleaner (~> 0.8.0)
+  exception_notification (= 2.6.1)
+  factory_girl_rails (= 1.7.0)
+  formtastic (= 2.0.2)
   formtastic-bootstrap!
-  geokit (= 1.5.0)
+  geokit (= 1.6.5)
+  growl
+  guard (~> 1.3.0)
+  guard-rspec (~> 1.2.1)
+  guard-spork (~> 1.1.0)
   haml
-  htmlentities (= 4.2.3)
-  httparty (= 0.8.1)
+  htmlentities (= 4.3.1)
+  httparty (= 0.8.3)
+  jdbc-sqlite3
   jquery-rails (= 1.0.19)
-  loofah (= 1.0.0)
-  loofah-activerecord (= 1.0.0)
+  jruby-openssl
+  jruby-rack
+  loofah (= 1.2.1)
+  loofah-activerecord!
   multi_json
-  paper_trail (= 2.2.4)
-  paper_trail_manager
+  paper_trail (= 2.6.3)
+  paper_trail_manager (>= 0.2.0)
+  progress_bar (= 0.4.0)
   pry
-  rails (= 3.0.11)
-  rails_admin!
-  rcov (= 0.9.9)
-  rdoc (= 3.8)
+  rails (= 3.2.13)
+  rails3-jquery-autocomplete
+  rails_autolink (= 1.0.9)
+  rdoc (= 3.12)
   ri_cal (= 0.8.8)
-  rspec-rails (= 2.6.0)
-  ruby-debug
-  ruby-debug19
-  rubyzip (= 0.9.4)
+  rspec-rails (= 2.11.0)
+  rubyzip (= 0.9.9)
+  spork (~> 0.9.2)
   sqlite3
-  themes_for_rails (= 0.4.2)
-  validation_reflection (= 1.0.0)
+  themes_for_rails (= 0.5.1)
+  validation_reflection!
+  warbler
   webrat (= 0.7.3)
-  will_paginate (= 3.0.pre2)
+  will_paginate (= 3.0.3)
diff --git a/app/helpers/sources_helper.rb b/app/helpers/sources_helper.rb
index f218ae803..3ef0481c0 100644
--- a/app/helpers/sources_helper.rb
+++ b/app/helpers/sources_helper.rb
@@ -1,6 +1,6 @@
 module SourcesHelper
   # Return HTML with a link to the the external source URL.
   def source_url_link(source)
-    return link_to source.url, source.url, { :rel => "nofollow", :target => "_BLANK" }
+    return link_to source.title, source.url, { :rel => "nofollow", :target => "_BLANK" }
   end
 end
diff --git a/app/views/sources/index.html.erb b/app/views/sources/index.html.erb
index a246a039b..2eb55c58b 100644
--- a/app/views/sources/index.html.erb
+++ b/app/views/sources/index.html.erb
@@ -3,13 +3,13 @@
 <table>
   <tr>
     <th>Manage</th>
-    <th>URL</th>
+    <th>Title</th>
   </tr>
 
   <% for source in @sources %>
   <tr class="<%= cycle 'odd', 'even' %>">
     <td>
-      <%= link_to 'Show', source %> | 
+      <%= link_to 'Show', source %> |
       <%= link_to 'Destroy', source, :confirm => 'Are you sure?', :method => :delete %>
     </td>
     <td><%= source_url_link source %></td>