summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--aop.gemspec1
-rw-r--r--views/layout.haml2
-rw-r--r--views/neighbors.haml2
4 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..49b161f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+.sass-cache/
diff --git a/aop.gemspec b/aop.gemspec
index 51f4641..03e7a08 100644
--- a/aop.gemspec
+++ b/aop.gemspec
@@ -34,5 +34,6 @@ Gem::Specification.new do |s|
# external requirements
s.requirements << "memcached"
s.post_install_message = "Please make sure you have memcached installed."
+
end
diff --git a/views/layout.haml b/views/layout.haml
index 827baaf..6500da8 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -6,7 +6,7 @@
%link{:rel=>'stylesheet', :href=>"#{'/style.css'}", :type => "text/css"}
%script{:type => "text/javascript", :src => "/jquery-1.8.2.js"}
:javascript
- $(document).ready(function() { $.ajax({ url: "/cid/#{@cid}/experiments", cache: true }); });
+ //$(document).ready(function() { $.ajax({ url: "/cid/#{@cid}/experiments", cache: true }); });
function show(title,element,uri) {
$(element).html("<h4>"+title+"</h4>"+"Retrieving data from PubChem. This may take some time, please be patient."+"<img src=\"/spinning-wait-icons/wait30trans.gif\" alt=\"Searching PubChem\">");
$.ajax({
diff --git a/views/neighbors.haml b/views/neighbors.haml
index c7a181a..5563392 100644
--- a/views/neighbors.haml
+++ b/views/neighbors.haml
@@ -31,4 +31,4 @@
:javascript
hide("Other inactive assays","#inactive_assays#{n}", "/cid/#{n}/assays/inactive");
- - idx += 1
+ - idx += 1