From a85e8fac719df517dc685b1881fd757f98ac4388 Mon Sep 17 00:00:00 2001
From: Connor Turland <connor@madhattertech.ca>
Date: Sun, 20 Jan 2013 18:00:10 -0500
Subject: [PATCH] added db config default file

---
 app/views/topics/_topic.html.erb |  9 +++++++++
 config/database.yml.default      | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 config/database.yml.default

diff --git a/app/views/topics/_topic.html.erb b/app/views/topics/_topic.html.erb
index d2036e51..6dd5af7d 100644
--- a/app/views/topics/_topic.html.erb
+++ b/app/views/topics/_topic.html.erb
@@ -5,6 +5,11 @@
   #%>
 
 <%= div_for topic do %>
+
+  <% if topic.authorize_to_edit(user) %>
+    <div class="permission canEdit">  
+  <% end %>
+  
 <div class="CardOnGraph"                                                  
          id="topic_<%=topic.id %>">
       <% if topic.user == user %><%= link_to 'Delete', topic_path(topic), :class => 'delete', :confirm => 'Delete this topic and all synapses linking to it?', :method => :delete, :remote => true%><% end %>         
@@ -59,4 +64,8 @@
                        
 	  <div class="clearfloat"></div>                                          
     </div>
+    
+  <% if topic.authorize_to_edit(user) %>
+    </div>
+  <% end %>
 <% end %>
diff --git a/config/database.yml.default b/config/database.yml.default
new file mode 100644
index 00000000..6705ca8f
--- /dev/null
+++ b/config/database.yml.default
@@ -0,0 +1,21 @@
+development:
+  min_messages: WARNING
+  adapter: postgresql
+  host: 127.0.0.1
+  port: 5432
+  encoding: unicode
+  database: metamap002_development
+  pool: 5
+  username: postgres
+  password: "3112"
+
+production:
+  min_messages: WARNING
+  adapter: postgresql
+  host: ec2-107-21-107-194.compute-1.amazonaws.com
+  port: 5432
+  encoding: unicode
+  database: ddcrn2lgphjk9k
+  pool: 5
+  username: qqpckkahytovwv
+  password: "njeP6cMA8EjM9ukHk9s3ReOdy7"