diff --git a/.gitignore b/.gitignore index 1e445b3..affeffd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,13 +10,16 @@ api_key.txt db/*.sqlite3 log/*.log tmp/pids/server.pid +tmp/cache public/data/*23andme* development.log server.pid *.swp solr/data +solr/pids config/database.yml vendor/bundle +vendor/cache public/data coverage hiredis/ @@ -24,3 +27,4 @@ log/ secret_token config/app_config.yml config/newrelic.yml +.sass-cache/ diff --git a/Gemfile b/Gemfile index a68feea..8ab65da 100644 --- a/Gemfile +++ b/Gemfile @@ -44,10 +44,11 @@ gem 'recommendify',:git => 'git://github.com/paulasmuth/recommendify.git', :ref gem 'resque', '1.23.0' gem 'resque-loner' -#group :production do -# gem 'rpm_contrib' -# gem 'newrelic_rpm' -#end +group :assets do + gem 'sass-rails', " ~> 3.2.0" + gem 'coffee-rails', " ~> 3.2.0" + gem 'uglifier' +end group :test do gem 'shoulda-context', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3877488..f02d875 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,6 +82,13 @@ GEM net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) cocaine (0.4.2) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.4.0) columnize (0.3.6) debugger (1.3.1) columnize (>= 0.3.1) @@ -91,6 +98,8 @@ GEM debugger-ruby_core_source (>= 1.1.1) debugger-ruby_core_source (1.1.8) erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) factory_girl (4.2.0) activesupport (>= 3.0.0) fitgem (0.5.2) @@ -184,6 +193,11 @@ GEM capistrano (>= 2.0.0) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) + sass (3.2.5) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) shoulda-context (1.0.2) simplecov (0.7.1) multi_json (~> 1.0) @@ -211,6 +225,9 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.35) + uglifier (1.3.0) + execjs (>= 0.3.0) + multi_json (~> 1.0, >= 1.0.2) vegas (0.1.11) rack (>= 1.0.0) will_paginate (3.0.4) @@ -224,6 +241,7 @@ DEPENDENCIES authlogic bartt-ssl_requirement (~> 1.4.0) bcrypt-ruby + coffee-rails (~> 3.2.0) debugger factory_girl fitgem @@ -247,10 +265,12 @@ DEPENDENCIES rubyzip (= 0.9.5) rvm-capistrano sanitize + sass-rails (~> 3.2.0) shoulda-context simplecov sunspot_rails sunspot_solr sunspot_test! + uglifier vegas will_paginate diff --git a/public/images/Gregor_Mendel.png b/app/assets/images/Gregor_Mendel.png similarity index 100% rename from public/images/Gregor_Mendel.png rename to app/assets/images/Gregor_Mendel.png diff --git a/public/images/a2r.png b/app/assets/images/a2r.png similarity index 100% rename from public/images/a2r.png rename to app/assets/images/a2r.png diff --git a/public/images/achievements/100phen_32px.png b/app/assets/images/achievements/100phen_32px.png similarity index 100% rename from public/images/achievements/100phen_32px.png rename to app/assets/images/achievements/100phen_32px.png diff --git a/public/images/achievements/100phen_80px.png b/app/assets/images/achievements/100phen_80px.png similarity index 100% rename from public/images/achievements/100phen_80px.png rename to app/assets/images/achievements/100phen_80px.png diff --git a/public/images/achievements/10_mio_32px.png b/app/assets/images/achievements/10_mio_32px.png similarity index 100% rename from public/images/achievements/10_mio_32px.png rename to app/assets/images/achievements/10_mio_32px.png diff --git a/public/images/achievements/10_mio_80px.png b/app/assets/images/achievements/10_mio_80px.png similarity index 100% rename from public/images/achievements/10_mio_80px.png rename to app/assets/images/achievements/10_mio_80px.png diff --git a/public/images/achievements/10addphen_32px.png b/app/assets/images/achievements/10addphen_32px.png similarity index 100% rename from public/images/achievements/10addphen_32px.png rename to app/assets/images/achievements/10addphen_32px.png diff --git a/public/images/achievements/10addphen_80px.png b/app/assets/images/achievements/10addphen_80px.png similarity index 100% rename from public/images/achievements/10addphen_80px.png rename to app/assets/images/achievements/10addphen_80px.png diff --git a/public/images/achievements/10phen_32px.png b/app/assets/images/achievements/10phen_32px.png similarity index 100% rename from public/images/achievements/10phen_32px.png rename to app/assets/images/achievements/10phen_32px.png diff --git a/public/images/achievements/10phen_80px.png b/app/assets/images/achievements/10phen_80px.png similarity index 100% rename from public/images/achievements/10phen_80px.png rename to app/assets/images/achievements/10phen_80px.png diff --git a/public/images/achievements/1addphen_32px.png b/app/assets/images/achievements/1addphen_32px.png similarity index 100% rename from public/images/achievements/1addphen_32px.png rename to app/assets/images/achievements/1addphen_32px.png diff --git a/public/images/achievements/1addphen_80px.png b/app/assets/images/achievements/1addphen_80px.png similarity index 100% rename from public/images/achievements/1addphen_80px.png rename to app/assets/images/achievements/1addphen_80px.png diff --git a/public/images/achievements/1phen_32px.png b/app/assets/images/achievements/1phen_32px.png similarity index 100% rename from public/images/achievements/1phen_32px.png rename to app/assets/images/achievements/1phen_32px.png diff --git a/public/images/achievements/1phen_80px.png b/app/assets/images/achievements/1phen_80px.png similarity index 100% rename from public/images/achievements/1phen_80px.png rename to app/assets/images/achievements/1phen_80px.png diff --git a/public/images/achievements/20phen_32px.png b/app/assets/images/achievements/20phen_32px.png similarity index 100% rename from public/images/achievements/20phen_32px.png rename to app/assets/images/achievements/20phen_32px.png diff --git a/public/images/achievements/20phen_80px.png b/app/assets/images/achievements/20phen_80px.png similarity index 100% rename from public/images/achievements/20phen_80px.png rename to app/assets/images/achievements/20phen_80px.png diff --git a/public/images/achievements/50phen_32px.png b/app/assets/images/achievements/50phen_32px.png similarity index 100% rename from public/images/achievements/50phen_32px.png rename to app/assets/images/achievements/50phen_32px.png diff --git a/public/images/achievements/50phen_80px.png b/app/assets/images/achievements/50phen_80px.png similarity index 100% rename from public/images/achievements/50phen_80px.png rename to app/assets/images/achievements/50phen_80px.png diff --git a/public/images/achievements/5addphen_32px.png b/app/assets/images/achievements/5addphen_32px.png similarity index 100% rename from public/images/achievements/5addphen_32px.png rename to app/assets/images/achievements/5addphen_32px.png diff --git a/public/images/achievements/5addphen_80px.png b/app/assets/images/achievements/5addphen_80px.png similarity index 100% rename from public/images/achievements/5addphen_80px.png rename to app/assets/images/achievements/5addphen_80px.png diff --git a/public/images/achievements/5phen_32px.png b/app/assets/images/achievements/5phen_32px.png similarity index 100% rename from public/images/achievements/5phen_32px.png rename to app/assets/images/achievements/5phen_32px.png diff --git a/public/images/achievements/5phen_80px.png b/app/assets/images/achievements/5phen_80px.png similarity index 100% rename from public/images/achievements/5phen_80px.png rename to app/assets/images/achievements/5phen_80px.png diff --git a/public/images/achievements/pub_gen_32px.png b/app/assets/images/achievements/pub_gen_32px.png similarity index 100% rename from public/images/achievements/pub_gen_32px.png rename to app/assets/images/achievements/pub_gen_32px.png diff --git a/public/images/achievements/pub_gen_80px.png b/app/assets/images/achievements/pub_gen_80px.png similarity index 100% rename from public/images/achievements/pub_gen_80px.png rename to app/assets/images/achievements/pub_gen_80px.png diff --git a/public/images/add_variation.png b/app/assets/images/add_variation.png similarity index 100% rename from public/images/add_variation.png rename to app/assets/images/add_variation.png diff --git a/public/images/add_variation_small.png b/app/assets/images/add_variation_small.png similarity index 100% rename from public/images/add_variation_small.png rename to app/assets/images/add_variation_small.png diff --git a/public/images/addphenotype.png b/app/assets/images/addphenotype.png similarity index 100% rename from public/images/addphenotype.png rename to app/assets/images/addphenotype.png diff --git a/public/images/addphenotype_small.png b/app/assets/images/addphenotype_small.png similarity index 100% rename from public/images/addphenotype_small.png rename to app/assets/images/addphenotype_small.png diff --git a/public/images/api.png b/app/assets/images/api.png similarity index 100% rename from public/images/api.png rename to app/assets/images/api.png diff --git a/public/images/api_small.png b/app/assets/images/api_small.png similarity index 100% rename from public/images/api_small.png rename to app/assets/images/api_small.png diff --git a/public/images/email_opened_small.png b/app/assets/images/email_opened_small.png similarity index 100% rename from public/images/email_opened_small.png rename to app/assets/images/email_opened_small.png diff --git a/public/images/email_small.png b/app/assets/images/email_small.png similarity index 100% rename from public/images/email_small.png rename to app/assets/images/email_small.png diff --git a/public/images/file_info_small.png b/app/assets/images/file_info_small.png similarity index 100% rename from public/images/file_info_small.png rename to app/assets/images/file_info_small.png diff --git a/public/images/filedownload.png b/app/assets/images/filedownload.png similarity index 100% rename from public/images/filedownload.png rename to app/assets/images/filedownload.png diff --git a/public/images/filedownload_small.png b/app/assets/images/filedownload_small.png similarity index 100% rename from public/images/filedownload_small.png rename to app/assets/images/filedownload_small.png diff --git a/public/images/fileupload.png b/app/assets/images/fileupload.png similarity index 100% rename from public/images/fileupload.png rename to app/assets/images/fileupload.png diff --git a/public/images/fileupload_small.png b/app/assets/images/fileupload_small.png similarity index 100% rename from public/images/fileupload_small.png rename to app/assets/images/fileupload_small.png diff --git a/public/images/fitbit-icon.png b/app/assets/images/fitbit-icon.png similarity index 100% rename from public/images/fitbit-icon.png rename to app/assets/images/fitbit-icon.png diff --git a/public/images/fitbit_logo_dark_100px.png b/app/assets/images/fitbit_logo_dark_100px.png similarity index 100% rename from public/images/fitbit_logo_dark_100px.png rename to app/assets/images/fitbit_logo_dark_100px.png diff --git a/public/images/glyphicons-halflings-white.png b/app/assets/images/glyphicons-halflings-white.png similarity index 100% rename from public/images/glyphicons-halflings-white.png rename to app/assets/images/glyphicons-halflings-white.png diff --git a/public/images/glyphicons-halflings.png b/app/assets/images/glyphicons-halflings.png similarity index 100% rename from public/images/glyphicons-halflings.png rename to app/assets/images/glyphicons-halflings.png diff --git a/public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png b/app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png rename to app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png b/app/assets/images/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png rename to app/assets/images/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png b/app/assets/images/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png rename to app/assets/images/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png b/app/assets/images/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png rename to app/assets/images/images/ui-bg_glass_75_dadada_1x400.png diff --git a/public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png b/app/assets/images/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png rename to app/assets/images/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/public/stylesheets/images/ui-bg_glass_75_ffffff_1x400.png b/app/assets/images/images/ui-bg_glass_75_ffffff_1x400.png similarity index 100% rename from public/stylesheets/images/ui-bg_glass_75_ffffff_1x400.png rename to app/assets/images/images/ui-bg_glass_75_ffffff_1x400.png diff --git a/public/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/app/assets/images/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to app/assets/images/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/app/assets/images/images/ui-bg_inset-soft_95_fef1ec_1x100.png similarity index 100% rename from public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png rename to app/assets/images/images/ui-bg_inset-soft_95_fef1ec_1x100.png diff --git a/public/stylesheets/images/ui-icons_222222_256x240.png b/app/assets/images/images/ui-icons_222222_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_222222_256x240.png rename to app/assets/images/images/ui-icons_222222_256x240.png diff --git a/public/stylesheets/images/ui-icons_2e83ff_256x240.png b/app/assets/images/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_2e83ff_256x240.png rename to app/assets/images/images/ui-icons_2e83ff_256x240.png diff --git a/public/stylesheets/images/ui-icons_454545_256x240.png b/app/assets/images/images/ui-icons_454545_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_454545_256x240.png rename to app/assets/images/images/ui-icons_454545_256x240.png diff --git a/public/stylesheets/images/ui-icons_888888_256x240.png b/app/assets/images/images/ui-icons_888888_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_888888_256x240.png rename to app/assets/images/images/ui-icons_888888_256x240.png diff --git a/public/stylesheets/images/ui-icons_cd0a0a_256x240.png b/app/assets/images/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from public/stylesheets/images/ui-icons_cd0a0a_256x240.png rename to app/assets/images/images/ui-icons_cd0a0a_256x240.png diff --git a/public/images/literature.png b/app/assets/images/literature.png similarity index 100% rename from public/images/literature.png rename to app/assets/images/literature.png diff --git a/public/images/microarray.png b/app/assets/images/microarray.png similarity index 100% rename from public/images/microarray.png rename to app/assets/images/microarray.png diff --git a/public/images/microarray_logo.png b/app/assets/images/microarray_logo.png similarity index 100% rename from public/images/microarray_logo.png rename to app/assets/images/microarray_logo.png diff --git a/public/images/oa_logo.png b/app/assets/images/oa_logo.png similarity index 100% rename from public/images/oa_logo.png rename to app/assets/images/oa_logo.png diff --git a/public/images/old_phenotypes.png b/app/assets/images/old_phenotypes.png similarity index 100% rename from public/images/old_phenotypes.png rename to app/assets/images/old_phenotypes.png diff --git a/public/images/openspnp_release.png b/app/assets/images/openspnp_release.png similarity index 100% rename from public/images/openspnp_release.png rename to app/assets/images/openspnp_release.png diff --git a/public/images/phenotypes.png b/app/assets/images/phenotypes.png similarity index 100% rename from public/images/phenotypes.png rename to app/assets/images/phenotypes.png diff --git a/public/images/phenotypesearch.png b/app/assets/images/phenotypesearch.png similarity index 100% rename from public/images/phenotypesearch.png rename to app/assets/images/phenotypesearch.png diff --git a/public/images/rails.png b/app/assets/images/rails.png similarity index 100% rename from public/images/rails.png rename to app/assets/images/rails.png diff --git a/public/images/rss.png b/app/assets/images/rss.png similarity index 100% rename from public/images/rss.png rename to app/assets/images/rss.png diff --git a/public/images/rss_small.png b/app/assets/images/rss_small.png similarity index 100% rename from public/images/rss_small.png rename to app/assets/images/rss_small.png diff --git a/public/images/sendmessage.png b/app/assets/images/sendmessage.png similarity index 100% rename from public/images/sendmessage.png rename to app/assets/images/sendmessage.png diff --git a/public/images/sendmessage_small.png b/app/assets/images/sendmessage_small.png similarity index 100% rename from public/images/sendmessage_small.png rename to app/assets/images/sendmessage_small.png diff --git a/public/images/standard_head.png b/app/assets/images/standard_head.png similarity index 100% rename from public/images/standard_head.png rename to app/assets/images/standard_head.png diff --git a/public/images/standard_medium.png b/app/assets/images/standard_medium.png similarity index 100% rename from public/images/standard_medium.png rename to app/assets/images/standard_medium.png diff --git a/public/images/standard_thumb.png b/app/assets/images/standard_thumb.png similarity index 100% rename from public/images/standard_thumb.png rename to app/assets/images/standard_thumb.png diff --git a/public/images/temp_logo.png b/app/assets/images/temp_logo.png similarity index 100% rename from public/images/temp_logo.png rename to app/assets/images/temp_logo.png diff --git a/public/javascripts/application.js b/app/assets/javascripts/application.js similarity index 68% rename from public/javascripts/application.js rename to app/assets/javascripts/application.js index 0074b56..a21fc0b 100644 --- a/public/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,5 +1,24 @@ -// Place your application-specific JavaScript functions and classes here -// This file is automatically included by javascript_include_tag :defaults +//= require ./jquery +//= require ./jquery_ujs +//= require ./nested_form +//= require ./jquery-1.7.1.min +//= require ./jquery.tablesorter.min +//= require ./jquery.ba-hashchange.min +//= require ./jquery.easytabs +//= require ./jquery-ui-1.8.16.custom.min +//= require ./bootstrap-alert +//= require ./bootstrap-modal +//= require ./bootstrap-tooltip +//= require ./bootstrap-popover +//= require ./jquery.jqplot.min +//= require ./jqplot.pieRenderer.min +//= require ./jqplot.highlighter.min +//= require ./jqplot.dateAxisRenderer.min +//= require ./jqplot.cursor.min +//= require ./jqplot.barRenderer.min +//= require ./bootstrap-collapse +//= require_self + $(document).ready(function() { $('#update_user').click(function() { diff --git a/public/javascripts/bootstrap-alert.js b/app/assets/javascripts/bootstrap-alert.js similarity index 100% rename from public/javascripts/bootstrap-alert.js rename to app/assets/javascripts/bootstrap-alert.js diff --git a/public/javascripts/bootstrap-collapse.js b/app/assets/javascripts/bootstrap-collapse.js similarity index 100% rename from public/javascripts/bootstrap-collapse.js rename to app/assets/javascripts/bootstrap-collapse.js diff --git a/public/javascripts/bootstrap-modal.js b/app/assets/javascripts/bootstrap-modal.js similarity index 100% rename from public/javascripts/bootstrap-modal.js rename to app/assets/javascripts/bootstrap-modal.js diff --git a/public/javascripts/bootstrap-popover.js b/app/assets/javascripts/bootstrap-popover.js similarity index 100% rename from public/javascripts/bootstrap-popover.js rename to app/assets/javascripts/bootstrap-popover.js diff --git a/public/javascripts/bootstrap-tooltip.js b/app/assets/javascripts/bootstrap-tooltip.js similarity index 100% rename from public/javascripts/bootstrap-tooltip.js rename to app/assets/javascripts/bootstrap-tooltip.js diff --git a/public/javascripts/dalliance-compiled.js b/app/assets/javascripts/dalliance-compiled.js similarity index 100% rename from public/javascripts/dalliance-compiled.js rename to app/assets/javascripts/dalliance-compiled.js diff --git a/public/javascripts/jqplot.barRenderer.min.js b/app/assets/javascripts/jqplot.barRenderer.min.js similarity index 100% rename from public/javascripts/jqplot.barRenderer.min.js rename to app/assets/javascripts/jqplot.barRenderer.min.js diff --git a/public/javascripts/jqplot.cursor.min.js b/app/assets/javascripts/jqplot.cursor.min.js similarity index 100% rename from public/javascripts/jqplot.cursor.min.js rename to app/assets/javascripts/jqplot.cursor.min.js diff --git a/public/javascripts/jqplot.dateAxisRenderer.min.js b/app/assets/javascripts/jqplot.dateAxisRenderer.min.js similarity index 100% rename from public/javascripts/jqplot.dateAxisRenderer.min.js rename to app/assets/javascripts/jqplot.dateAxisRenderer.min.js diff --git a/public/javascripts/jqplot.highlighter.min.js b/app/assets/javascripts/jqplot.highlighter.min.js similarity index 100% rename from public/javascripts/jqplot.highlighter.min.js rename to app/assets/javascripts/jqplot.highlighter.min.js diff --git a/public/javascripts/jqplot.pieRenderer.min.js b/app/assets/javascripts/jqplot.pieRenderer.min.js similarity index 100% rename from public/javascripts/jqplot.pieRenderer.min.js rename to app/assets/javascripts/jqplot.pieRenderer.min.js diff --git a/public/javascripts/jquery-1.7.1.min.js b/app/assets/javascripts/jquery-1.7.1.min.js similarity index 100% rename from public/javascripts/jquery-1.7.1.min.js rename to app/assets/javascripts/jquery-1.7.1.min.js diff --git a/public/javascripts/jquery-ui-1.8.16.custom.min.js b/app/assets/javascripts/jquery-ui-1.8.16.custom.min.js similarity index 100% rename from public/javascripts/jquery-ui-1.8.16.custom.min.js rename to app/assets/javascripts/jquery-ui-1.8.16.custom.min.js diff --git a/public/javascripts/jquery.ba-hashchange.min.js b/app/assets/javascripts/jquery.ba-hashchange.min.js similarity index 100% rename from public/javascripts/jquery.ba-hashchange.min.js rename to app/assets/javascripts/jquery.ba-hashchange.min.js diff --git a/public/javascripts/jquery.easytabs.js b/app/assets/javascripts/jquery.easytabs.js similarity index 100% rename from public/javascripts/jquery.easytabs.js rename to app/assets/javascripts/jquery.easytabs.js diff --git a/public/javascripts/jquery.jqplot.min.js b/app/assets/javascripts/jquery.jqplot.min.js similarity index 100% rename from public/javascripts/jquery.jqplot.min.js rename to app/assets/javascripts/jquery.jqplot.min.js diff --git a/public/javascripts/jquery.js b/app/assets/javascripts/jquery.js similarity index 100% rename from public/javascripts/jquery.js rename to app/assets/javascripts/jquery.js diff --git a/public/javascripts/jquery.min.js b/app/assets/javascripts/jquery.min.js similarity index 100% rename from public/javascripts/jquery.min.js rename to app/assets/javascripts/jquery.min.js diff --git a/public/javascripts/jquery.tablesorter.min.js b/app/assets/javascripts/jquery.tablesorter.min.js similarity index 100% rename from public/javascripts/jquery.tablesorter.min.js rename to app/assets/javascripts/jquery.tablesorter.min.js diff --git a/public/javascripts/jquery_ujs.js b/app/assets/javascripts/jquery_ujs.js similarity index 100% rename from public/javascripts/jquery_ujs.js rename to app/assets/javascripts/jquery_ujs.js diff --git a/public/javascripts/nested_form.js b/app/assets/javascripts/nested_form.js similarity index 100% rename from public/javascripts/nested_form.js rename to app/assets/javascripts/nested_form.js diff --git a/public/stylesheets/.gitkeep b/app/assets/stylesheets/.gitkeep similarity index 100% rename from public/stylesheets/.gitkeep rename to app/assets/stylesheets/.gitkeep diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000..764a108 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,4 @@ +/* +*= require_self +*= require_tree . +*/ diff --git a/public/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css similarity index 100% rename from public/stylesheets/bootstrap.css rename to app/assets/stylesheets/bootstrap.css diff --git a/public/stylesheets/jquery.jqplot.css b/app/assets/stylesheets/jquery.jqplot.css similarity index 100% rename from public/stylesheets/jquery.jqplot.css rename to app/assets/stylesheets/jquery.jqplot.css diff --git a/app/models/user.rb b/app/models/user.rb index f6ec424..05c60a5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,7 +1,7 @@ class User < ActiveRecord::Base has_attached_file :avatar, styles: { medium: "300x300>", thumb: "100x100>#", head: "32x32#" }, - default_url: '/images/standard_:style.png' + default_url: 'standard_:style.png' attr_accessible :user_phenotypes_attributes, :variation, :characteristic, :name, :password_confirmation, :password, :email, :description, :homepages, diff --git a/app/views/achievements/show.html.erb b/app/views/achievements/show.html.erb index 7a9f957..346f84b 100644 --- a/app/views/achievements/show.html.erb +++ b/app/views/achievements/show.html.erb @@ -1,19 +1,19 @@ -

Achievement: <%=@achievement.award%> <%=image_tag("/images/achievements/"+@achievement.short_name+"_80px.png",:style => "vertical-align:middle",:height=>"70",:alt => @achievement.award)%>

+

Achievement: <%=@achievement.award%> <%=image_tag("achievements/#{@achievement.short_name}_80px.png",:style => "vertical-align:middle",:height=>"70",:alt => @achievement.award)%>

Statistics
<%=((@achievement.user_achievements.length.to_f / User.find(:all).length)*100).to_s[0,5]%> % of all users received this achievement.
Users who received this achievement
+ + + + + + <%@achievement.user_achievements.each do |ua|%> - - - + + + - <%@achievement.user_achievements.each do |ua|%> - - - - - - <%end%> + <%end%>
NumberUserReceived on
NumberUserReceived on<%= ua.id %><%=link_to ua.user.name, ua.user%><%= ua.created_at %>
<%= ua.id %><%=link_to ua.user.name, ua.user%><%= ua.created_at %>
diff --git a/app/views/fitbit_profiles/dump.html.erb b/app/views/fitbit_profiles/dump.html.erb index 8be0968..f3f4abe 100644 --- a/app/views/fitbit_profiles/dump.html.erb +++ b/app/views/fitbit_profiles/dump.html.erb @@ -1,2 +1,2 @@ -<%=image_tag("/images/fitbit-icon.png")%> Dumping Fitbit data for <%=@fitbit_profile.user.name%> -

You have requested Fitbit data for the user <%= link_to(@fitbit_profile.user.name, @fitbit_profile.user)%>. The data is currently prepared and you will receive an email as soon as the data is ready to be downloaded. <%=link_to("Return to the Fitbit Profile" ,{:controller => "fitbit_profiles", :action => "show", :id => @fitbit_profile.id})%>.

\ No newline at end of file +<%=image_tag("fitbit-icon.png")%> Dumping Fitbit data for <%=@fitbit_profile.user.name%> +

You have requested Fitbit data for the user <%= link_to(@fitbit_profile.user.name, @fitbit_profile.user)%>. The data is currently prepared and you will receive an email as soon as the data is ready to be downloaded. <%=link_to("Return to the Fitbit Profile" ,{:controller => "fitbit_profiles", :action => "show", :id => @fitbit_profile.id})%>.

diff --git a/app/views/fitbit_profiles/index.html.erb b/app/views/fitbit_profiles/index.html.erb index f0037b3..b6ce666 100644 --- a/app/views/fitbit_profiles/index.html.erb +++ b/app/views/fitbit_profiles/index.html.erb @@ -1,14 +1,14 @@ -<%=image_tag("/images/fitbit-icon.png")%> Listing all connected <%=link_to("Fitbit",{:controller => "fitbit_profiles",:action => "info"},:rel => "tooltip", :title => "Want to learn more about our Fitbit-integration? Click here")%> accounts +<%=image_tag("fitbit-icon.png")%> Listing all connected <%=link_to("Fitbit",{:controller => "fitbit_profiles",:action => "info"},:rel => "tooltip", :title => "Want to learn more about our Fitbit-integration? Click here")%> accounts <%if current_user%>

- <%=link_to(image_tag("/images/filedownload_small.png",:style => "vertical-align:middle"),{:controller => "genotypes", :action => "get_dump"})%> <%=link_to("Download the dump: Includes all Fitbit data with all other phenotypes & genotyping files",{:controller => "genotypes", :action => "get_dump"}, :title => "Request download")%> + <%=link_to(image_tag("filedownload_small.png",:style => "vertical-align:middle"),{:controller => "genotypes", :action => "get_dump"})%> <%=link_to("Download the dump: Includes all Fitbit data with all other phenotypes & genotyping files",{:controller => "genotypes", :action => "get_dump"}, :title => "Request download")%>

<% end %>
<% if not current_user and @filelink != nil%>

- <%= link_to(image_tag("/images/filedownload_small.png", :style => "vertical-align:middle"), {:controller => "genotypes",:action => "dump_download"})%> <%= link_to("Download the dump: Includes all Fitbit data with all other phenotypes & genotyping files",{:controller => "genotypes", :action => "dump_download"}, :title => "Download the dump") %> + <%= link_to(image_tag("filedownload_small.png", :style => "vertical-align:middle"), {:controller => "genotypes",:action => "dump_download"})%> <%= link_to("Download the dump: Includes all Fitbit data with all other phenotypes & genotyping files",{:controller => "genotypes", :action => "dump_download"}, :title => "Download the dump") %>

Python-library to parse the provided files, courtesy of Sergei Lebedev


diff --git a/app/views/fitbit_profiles/info.html.erb b/app/views/fitbit_profiles/info.html.erb index 14fe3da..b37d5c4 100644 --- a/app/views/fitbit_profiles/info.html.erb +++ b/app/views/fitbit_profiles/info.html.erb @@ -1,4 +1,4 @@ -Connect your <%=image_tag("/images/fitbit_logo_dark_100px.png")%> account to openSNP +Connect your <%=image_tag("fitbit_logo_dark_100px.png")%> account to openSNP

Fitbit is a wearable gadget which allows you to track your activities (How many steps have you taken? How many floors have you climbed?), your sleep (How long did you sleep? How often have you awoken at night?) and also allows you to track your body-development (i.e. your weight/BMI). The data collected by and through your Fitbit is a valuable extension of the phenotypes you've already entered in openSNP.

Once you've connected your Fitbit account to openSNP we will automatically get your latest data from FitBit. Each time you synchronize your Fitbit-tracker or enter new data on Fitbit the changes will also appear on openSNP. Currently we save data about your activities, your body and your sleep.

diff --git a/app/views/fitbit_profiles/show.html.erb b/app/views/fitbit_profiles/show.html.erb index 8b9e31f..e242b44 100644 --- a/app/views/fitbit_profiles/show.html.erb +++ b/app/views/fitbit_profiles/show.html.erb @@ -1,15 +1,10 @@ -<%=image_tag("/images/fitbit-icon.png",:style => "vertical-align:middle")%> <%=link_to("Fitbit",{:controller => "fitbit_profiles",:action => "info"},:rel => "tooltip", :title => "Want to learn more about our Fitbit-integration? Click here")%> profile for <%= link_to(@fitbit_profile.user.name, @fitbit_profile.user)%> +<%=image_tag("fitbit-icon.png",:style => "vertical-align:middle")%> <%=link_to("Fitbit",{:controller => "fitbit_profiles",:action => "info"},:rel => "tooltip", :title => "Want to learn more about our Fitbit-integration? Click here")%> profile for <%= link_to(@fitbit_profile.user.name, @fitbit_profile.user)%> <%if current_user%> -

<%=link_to(image_tag("/images/filedownload_small.png",:style => "vertical-align:middle"),{:controller => "fitbit_profiles", :action => "dump", :id => @fitbit_profile.id})%> <%=link_to("Download a dump of the data",{:controller => "fitbit_profiles", :action => "dump", :id => @fitbit_profile.id})%>

+

<%=link_to(image_tag("filedownload_small.png",:style => "vertical-align:middle"),{:controller => "fitbit_profiles", :action => "dump", :id => @fitbit_profile.id})%> <%=link_to("Download a dump of the data",{:controller => "fitbit_profiles", :action => "dump", :id => @fitbit_profile.id})%>

<%else%>

If you log in to openSNP you can download a CSV-file with all the data.

<%end%> - - - - - <%if @activity != nil%> Activity Measurements - - -
Support the Open Access petition of access2research
-

We support the access2research petition for Open Access directed to the Obama administration. The petition wants to make Open Access publication of tax-funded publications mandatory. In total, 25,000 signatures are needed to have the petition officially reviewed by the White House. Non-US-citizens may sign the petition, too, so it would be great if you sign it, too! For more information, please read our blogpost on the petition. -

-

-
API: JSON methods
-

-The promised support for the Distributed Annotation System will take some time. But in the meantime you can access openSNP using some simple JSON-methods. Examples can be found for SNPs, users and phenotypes. To learn more about how to use those methods you may want to read the FAQ or this blogpost we've written about this. -

-
SSL-Support
-

-Hello everyone! We've bought a SSL-certificate so that you can safely browse this site (especially relevant if you log in to this site over an open WLAN). You can access the SSL-version of openSNP over this link. It's still experimental, so if you find anything please message Philipp or Bastian. -

-
Winning the Binary Battle and Data-Dumps
-

-What a shame: We totally forgot to announce it here. But we are the winner of the Mendeley/PLoS Binary Battle. Since this we got many new users and it's great to see how many of you are willing to share their data. If you are interested in downloading the information that is uploaded to our website you are lucky.

We just implemented three new features: The genotype-overview, the data-dump and several uploads for each user. <%=link_to "The first one gives you a table of all the genotyping files we have in our database", :controller => "genotypes", :action => "index"%>. The second can be found on the genotype-overview and it produces a zipped file that includes all genotyping-information, as well as a tabular file that includes all phenotypic information of those users. You can now also upload several genotypings, have a look at the Settings-page.

Enjoy playing around with it. And as usual: If you find any bugs please contact Philipp or Bastian. -

-
SNP-ids/names
-

-Hello everyone! We've implemented a minor change, you can now access SNPs over their name directly, together with the ID (like we had it before) - e.g. http://opensnp.org/snps/rs7566605 now leads to the SNP named rs7566605. If you encounter any problems please contact Philipp or Basti. -

- + +
+
+ + +
+
Support the Open Access petition of access2research
+

We support the access2research petition for Open Access directed to the Obama administration. The petition wants to make Open Access publication of tax-funded publications mandatory. In total, 25,000 signatures are needed to have the petition officially reviewed by the White House. Non-US-citizens may sign the petition, too, so it would be great if you sign it, too! For more information, please read our blogpost on the petition. +

<%= image_tag("a2r.png") %>
+

+
API: JSON methods
+

+ The promised support for the Distributed Annotation System will take some time. But in the meantime you can access openSNP using some simple JSON-methods. Examples can be found for SNPs, users and phenotypes. To learn more about how to use those methods you may want to read the FAQ or this blogpost we've written about this. +

+
SSL-Support
+

+ Hello everyone! We've bought a SSL-certificate so that you can safely browse this site (especially relevant if you log in to this site over an open WLAN). You can access the SSL-version of openSNP over this link. It's still experimental, so if you find anything please message Philipp or Bastian. +

+
Winning the Binary Battle and Data-Dumps
+

+ What a shame: We totally forgot to announce it here. But we are the winner of the Mendeley/PLoS Binary Battle. Since this we got many new users and it's great to see how many of you are willing to share their data. If you are interested in downloading the information that is uploaded to our website you are lucky.

We just implemented three new features: The genotype-overview, the data-dump and several uploads for each user. <%=link_to "The first one gives you a table of all the genotyping files we have in our database", :controller => "genotypes", :action => "index"%>. The second can be found on the genotype-overview and it produces a zipped file that includes all genotyping-information, as well as a tabular file that includes all phenotypic information of those users. You can now also upload several genotypings, have a look at the Settings-page.

Enjoy playing around with it. And as usual: If you find any bugs please contact Philipp or Bastian. +

+
SNP-ids/names
+

+ Hello everyone! We've implemented a minor change, you can now access SNPs over their name directly, together with the ID (like we had it before) - e.g. http://opensnp.org/snps/rs7566605 now leads to the SNP named rs7566605. If you encounter any problems please contact Philipp or Basti. +

+
-
-<%=auto_discovery_link_tag(:rss,"/rss", {:title => "RSS for all genotypes"})%> -
-

Genotypes


<%=link_to(image_tag("/images/rss_small.png"),"/rss")%>
-
-
- - - - - - - - - -<% @new_genotypes.each do |ng| %> - - - - - - - - -<% end %> -
#Genotype-IDUploaded byUploaded onDescriptionDownload
<%= Genotype.all.sort! {|a,b| a.id <=> b.id}.index(ng) + 1 %><%= ng.id %><%=image_tag ng.user.avatar.url(:head),:style => "vertical-align:middle"%> <%= link_to(User.find(ng.user_id).name, User.find(ng.user_id)) %><%= ng.created_at %><%= link_to "Click here", ng %><%= link_to "Right-click and 'Save as..'", '../data/' + ng.fs_filename %>
-
-
-

Users


- - - - - - - - -<% @new_users.each do |nu| %> - - - - - - - -<% end %> -
#IDNameJoined onLink
<%= User.all.sort! {|a,b| a.id <=> b.id}.index(nu) + 1 %><%= nu.id %><%=image_tag nu.avatar.url(:head),:style => "vertical-align:middle"%> <%= nu.name %><%= nu.created_at %><%= link_to "Profile", nu %>
-
-
-

Phenotypes


- - - - - - -<% @new_phenotypes.each do |nu| %> - - - - - -<% end %> -
NameVariations# of Users
<%= link_to nu.characteristic, nu %>
    <%nu.known_phenotypes.each do |kp|%>
  • <%= kp %>
    • <%end%>
<%= nu.number_of_users %>
-
- -
-

Phenotype Comments


- - - - - - - -<%@new_phenotype_comments.each do |pc|%> - <%if pc.phenotype != nil%> - - - - - - - <%end%> -<%end%> -
PhenotypeComment BySubjectDate
<%=link_to pc.phenotype.characteristic, pc.phenotype%><%if pc.user != nil%><%=link_to pc.user.name, pc.user%><%else%>Deleted User<%end%><%if pc.subject != ""%><%=pc.subject%><%else%>-<%end%><%=pc.created_at%>
-
- -
-

SNP Comments


- - - - - - - -<%@new_snp_comments.each do |pc|%> - - - - - - -<%end%> -
SNPComment BySubjectDate
<%=link_to pc.snp.name, pc.snp%><%if pc.user != nil%><%=link_to pc.user.name, pc.user%><%else%>Deleted User<%end%><%if pc.subject != ""%><%=pc.subject%><%else%>-<%end%><%=pc.created_at%>
-
- -
-
-

Lastest publications


<%=link_to(image_tag("/images/rss_small.png"),"/paper/rss")%>
-
+
+ <%=auto_discovery_link_tag(:rss,"/rss", {:title => "RSS for all genotypes"})%> +
+

Genotypes


<%=link_to(image_tag("rss_small.png"),"/rss")%>
+

- - - - - - - - <%@newest_paper.each do |np|%> - - - - <%if np.class == PlosPaper%> - - <%else%> - - <%end%> - - - <%end%> -
SNPAuthorTitleFound at
<%=link_to np.snp.name, np.snp%><%=np.first_author%><%= link_to( np.title.html_safe, "http://dx.doi.org/"+np.doi)%><%=link_to( np.title, np.mendeley_url)%><%=np.created_at%>
-
+ + + + + + + + + + <% @new_genotypes.each do |ng| %> + + + + + + + + + <% end %> +
#Genotype-IDUploaded byUploaded onDescriptionDownload
<%= Genotype.all.sort! {|a,b| a.id <=> b.id}.index(ng) + 1 %><%= ng.id %><%=image_tag ng.user.avatar.url(:head),:style => "vertical-align:middle"%> <%= link_to(User.find(ng.user_id).name, User.find(ng.user_id)) %><%= ng.created_at %><%= link_to "Click here", ng %><%= link_to "Right-click and 'Save as..'", '../data/' + ng.fs_filename %>
+
+
+

Users


+ + + + + + + + + <% @new_users.each do |nu| %> + + + + + + + + <% end %> +
#IDNameJoined onLink
<%= User.all.sort! {|a,b| a.id <=> b.id}.index(nu) + 1 %><%= nu.id %><%=image_tag nu.avatar.url(:head),:style => "vertical-align:middle"%> <%= nu.name %><%= nu.created_at %><%= link_to "Profile", nu %>
+
+
+

Phenotypes


+ + + + + + + <% @new_phenotypes.each do |nu| %> + + + + + + <% end %> +
NameVariations# of Users
<%= link_to nu.characteristic, nu %>
    <%nu.known_phenotypes.each do |kp|%>
  • <%= kp %>
    • <%end%>
<%= nu.number_of_users %>
+
+ +
+

Phenotype Comments


+ + + + + + + + <%@new_phenotype_comments.each do |pc|%> + <%if pc.phenotype != nil%> + + + + + + + <%end%> + <%end%> +
PhenotypeComment BySubjectDate
<%=link_to pc.phenotype.characteristic, pc.phenotype%><%if pc.user != nil%><%=link_to pc.user.name, pc.user%><%else%>Deleted User<%end%><%if pc.subject != ""%><%=pc.subject%><%else%>-<%end%><%=pc.created_at%>
+
+ +
+

SNP Comments


+ + + + + + + + <%@new_snp_comments.each do |pc|%> + + + + + + + <%end%> +
SNPComment BySubjectDate
<%=link_to pc.snp.name, pc.snp%><%if pc.user != nil%><%=link_to pc.user.name, pc.user%><%else%>Deleted User<%end%><%if pc.subject != ""%><%=pc.subject%><%else%>-<%end%><%=pc.created_at%>
+
+ +
+
+

Lastest publications


<%=link_to(image_tag("rss_small.png"),"/paper/rss")%>
+
+
+ + + + + + + + <%@newest_paper.each do |np|%> + + + + <%if np.class == PlosPaper%> + + <%else%> + + <%end%> + + + <%end%> +
SNPAuthorTitleFound at
<%=link_to np.snp.name, np.snp%><%=np.first_author%><%= link_to( np.title.html_safe, "http://dx.doi.org/"+np.doi)%><%=link_to( np.title, np.mendeley_url)%><%=np.created_at%>
+
diff --git a/app/views/phenotypes/get_genotypes.html.erb b/app/views/phenotypes/get_genotypes.html.erb index ca11622..cd7e01f 100644 --- a/app/views/phenotypes/get_genotypes.html.erb +++ b/app/views/phenotypes/get_genotypes.html.erb @@ -1,5 +1,5 @@

Your Download can start soon...

-<%=image_tag("/images/filedownload.png",:style => "float:left")%>Our servers are working hard to deliver you a file that includes all the genotyping files of users with a variation of <%=@variation%> at the phenotype <%=@phenotype.characteristic%>.

The genotyping-files currently get zipped to lighten your download. You will receive the download-link via the eMail-address you registered your account with, as soon as the file is ready.
-<%=link_to "Go Back","/phenotypes/"+@phenotype.id.to_s%> \ No newline at end of file +<%=image_tag("filedownload.png",:style => "float:left")%>Our servers are working hard to deliver you a file that includes all the genotyping files of users with a variation of <%=@variation%> at the phenotype <%=@phenotype.characteristic%>.

The genotyping-files currently get zipped to lighten your download. You will receive the download-link via the eMail-address you registered your account with, as soon as the file is ready. +<%=link_to "Go Back","/phenotypes/"+@phenotype.id.to_s%> diff --git a/app/views/phenotypes/index.html.erb b/app/views/phenotypes/index.html.erb index fa8d558..2c58b0c 100644 --- a/app/views/phenotypes/index.html.erb +++ b/app/views/phenotypes/index.html.erb @@ -1,7 +1,7 @@ Listing all phenotypes <%if current_user%>

- <%=link_to(image_tag("/images/addphenotype_small.png",:style => "vertical-align:middle" ),:action =>"new")%> <%=link_to "The phenotype of your interest is missing? Add a new one!",:action => "new"%> + <%=link_to(image_tag("addphenotype_small.png",:style => "vertical-align:middle" ),:action =>"new")%> <%=link_to "The phenotype of your interest is missing? Add a new one!",:action => "new"%>

<%end%>
diff --git a/app/views/phenotypes/show.html.erb b/app/views/phenotypes/show.html.erb index 0ca99a9..4df3cf2 100644 --- a/app/views/phenotypes/show.html.erb +++ b/app/views/phenotypes/show.html.erb @@ -6,12 +6,12 @@ <%end%> <% end %>
-<%=link_to(image_tag("/images/rss_small.png"),:action =>"feed")%> +<%=link_to(image_tag("rss_small.png"),:action =>"feed")%>
Known Phenotypes:
diff --git a/app/views/picture_phenotypes/index.html.erb b/app/views/picture_phenotypes/index.html.erb index 81bb65b..97fa7cc 100644 --- a/app/views/picture_phenotypes/index.html.erb +++ b/app/views/picture_phenotypes/index.html.erb @@ -1,7 +1,7 @@ Listing all picture phenotypes <%if current_user%>

- <%=link_to(image_tag("/images/addphenotype_small.png",:style => "vertical-align:middle" ),:action =>"new")%> <%=link_to "The picture phenotype of your interest is missing? Add a new one!",:action => "new"%> + <%=link_to(image_tag("addphenotype_small.png",:style => "vertical-align:middle" ),:action =>"new")%> <%=link_to "The picture phenotype of your interest is missing? Add a new one!",:action => "new"%>

<%end%>
diff --git a/app/views/picture_phenotypes/show.html.erb b/app/views/picture_phenotypes/show.html.erb index 58ba01b..6ef64d2 100644 --- a/app/views/picture_phenotypes/show.html.erb +++ b/app/views/picture_phenotypes/show.html.erb @@ -8,7 +8,7 @@ <%end%> <% end %>
-<%=link_to(image_tag("/images/rss_small.png"),:action =>"feed")%> +<%=link_to(image_tag("rss_small.png"),:action =>"feed")%>
    diff --git a/app/views/search_results/search.html.erb b/app/views/search_results/search.html.erb index 1acb7e5..a22ad48 100644 --- a/app/views/search_results/search.html.erb +++ b/app/views/search_results/search.html.erb @@ -157,11 +157,11 @@ <%=p.pub_year%> <%=p.reader%> <% if p.open_access == true and p.doi != nil%> - <%=link_to(p.doi,"http://dx.doi.org/"+p.doi)%> + <%=link_to(p.doi,"http://dx.doi.org/"+p.doi)%><%= image_tag("oa_logo.png" %> <%elsif p.doi != nil%> <%=link_to(p.doi,"http://dx.doi.org/"+p.doi)%> <%elsif p.open_access == true%> - <%=p.doi%> + <%=p.doi%><%= image_tag("oa_logo.png") %> <%else%> - <%end%> diff --git a/app/views/snps/show.html.erb b/app/views/snps/show.html.erb index 48c8c70..eed4873 100644 --- a/app/views/snps/show.html.erb +++ b/app/views/snps/show.html.erb @@ -184,11 +184,11 @@ <%=p.pub_year%> <%=p.reader%> <% if p.open_access == true and p.doi != nil%> - <%=link_to(p.doi,"http://dx.doi.org/"+p.doi)%> + <%=link_to(p.doi,"http://dx.doi.org/"+p.doi)%><%= image_tag("oa_logo.png") %> <%elsif p.doi != nil%> <%=link_to(p.doi,"http://dx.doi.org/"+p.doi)%> <%elsif p.open_access == true%> - <%=p.doi%> + <%=p.doi%><%= image_tag("oa_logo.png") %> <%else%> - <%end%> diff --git a/app/views/static/_faq.html.erb b/app/views/static/_faq.html.erb index 11318c0..17b3cb9 100755 --- a/app/views/static/_faq.html.erb +++ b/app/views/static/_faq.html.erb @@ -1,12 +1,12 @@

    Frequently Asked Questions

    diff --git a/app/views/users/_edit.html.erb b/app/views/users/_edit.html.erb index 70eba11..5ca2099 100644 --- a/app/views/users/_edit.html.erb +++ b/app/views/users/_edit.html.erb @@ -110,7 +110,7 @@
    -

    <%=image_tag("/images/fitbit-icon.png")%> Fitbit Settings

    +

    <%=image_tag("fitbit-icon.png")%> Fitbit Settings

    <%if @user.fitbit_profile != nil%>

    You have connected your Fitbit account with openSNP

    <%=link_to("Edit your Fitbit connection" ,{:controller => "fitbit_profiles", :action => "edit"})%>

    diff --git a/app/views/users/_user_is_not_user.html.erb b/app/views/users/_user_is_not_user.html.erb index 859c7d3..d0fe64f 100644 --- a/app/views/users/_user_is_not_user.html.erb +++ b/app/views/users/_user_is_not_user.html.erb @@ -4,20 +4,20 @@
    <%= @user.name %>'s page <%if @user.fitbit_profile != nil%> - <%=link_to(image_tag("/images/fitbit-icon.png"),{:controller => "fitbit_profiles", :action => "show", :id => @user.fitbit_profile.id},:rel =>"tooltip",:title => "See Fitbit data for this user")%> + <%=link_to(image_tag("fitbit-icon.png"),{:controller => "fitbit_profiles", :action => "show", :id => @user.fitbit_profile.id},:rel =>"tooltip",:title => "See Fitbit data for this user")%> <%end%> <% @user.achievements.each do |a|%> - <%=image_tag("/images/achievements/"+a.short_name+"_32px.png",:height=>"20px",:alt => a.award)%> + <%=image_tag("achievements/"+a.short_name+"_32px.png",:height=>"20px",:alt => a.award)%> <%end%>
    - <%if current_user%>
    <%=link_to(image_tag("/images/sendmessage_small.png",:style => "vertical-align:middle" ), :controller => "messages", :action => "new", :user_to_send => @user.id)%> <%= link_to("Send "+ @first_name + " a message", :controller => "messages", :action => "new", :user_to_send => @user.id) %>
    <%end%> + <%if current_user%>
    <%=link_to(image_tag("sendmessage_small.png",:style => "vertical-align:middle" ), :controller => "messages", :action => "new", :user_to_send => @user.id)%> <%= link_to("Send "+ @first_name + " a message", :controller => "messages", :action => "new", :user_to_send => @user.id) %>
    <%end%>
    <% if @user.genotypes != [] %>

    <%= @first_name %> has uploaded genotyping rawdata.

      <%@user.genotypes.each do |g|%> -
    • <%=link_to(image_tag("/images/filedownload_small.png",:style => "vertical-align:middle"),g.genotype.url)%> <%= link_to "Download this set (#{g.filetype})", g.genotype.url%>
      • +
    • <%=link_to(image_tag("filedownload_small.png",:style => "vertical-align:middle"),g.genotype.url)%> <%= link_to "Download this set (#{g.filetype})", g.genotype.url%>
      • <%end%>
    <% else %> diff --git a/app/views/users/_user_is_user.html.erb b/app/views/users/_user_is_user.html.erb index 7ec0e3e..0cddb4f 100644 --- a/app/views/users/_user_is_user.html.erb +++ b/app/views/users/_user_is_user.html.erb @@ -4,11 +4,11 @@
    <%if @user.fitbit_profile != nil%> - <%=link_to(image_tag("/images/fitbit-icon.png"),{:controller => "fitbit_profiles", :action => "show", :id => @user.fitbit_profile.id},:rel =>"tooltip",:title => "See your Fitbit data")%> + <%=link_to(image_tag("fitbit-icon.png"),{:controller => "fitbit_profiles", :action => "show", :id => @user.fitbit_profile.id},:rel =>"tooltip",:title => "See your Fitbit data")%> <%end%> <% current_user.achievements.each do |a|%> - <%=image_tag("/images/achievements/"+a.short_name+"_32px.png",:height=>"20px",:alt => a.award)%> + <%=image_tag("achievements/#{a.short_name}_32px.png",:height=>"20px",:alt => a.award)%> <%end%>
    @@ -50,7 +50,7 @@ <%=link_to i.characteristic, i%> - <%= link_to image_tag("/images/add_variation_small.png", :style => "vertical-align:middle"), '#new_user_phenotype_modal'+i.id.to_s, :'data-toggle' => "modal" %> + <%= link_to image_tag("add_variation_small.png", :style => "vertical-align:middle"), '#new_user_phenotype_modal'+i.id.to_s, :'data-toggle' => "modal" %> <%= render partial: "user_phenotypes/new", layout: "layouts/modal", locals: { id: "new_user_phenotype_modal"+i.id.to_s, phenotype: i } %> <%= i.number_of_users %> @@ -97,9 +97,9 @@ <%= link_to( m.subject, m ) %> <% if m.user_has_seen == false %> -<%=link_to(image_tag("/images/email_small.png"),m)%> <%=link_to("Unread!",m)%> +<%=link_to(image_tag("email_small.png"),m)%> <%=link_to("Unread!",m)%> <%else%> -<%=link_to(image_tag("/images/email_opened_small.png"),m)%> <%=link_to("Read",m)%> +<%=link_to(image_tag("email_opened_small.png"),m)%> <%=link_to("Read",m)%> <% end %> @@ -124,7 +124,7 @@ Deleted User <%end%> <%= link_to( m.subject, m ) %> - <%=link_to(image_tag("/images/email_opened_small.png"),m)%> <%=link_to("Read",m)%> + <%=link_to(image_tag("email_opened_small.png"),m)%> <%=link_to("Read",m)%> <% end %> diff --git a/config/application.rb b/config/application.rb index 7cd818e..5f288d9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -2,10 +2,12 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' -# If you have a Gemfile, require the gems listed there, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) if defined?(Bundler) - +if defined?(Bundler) + # If you precompile assets before deploying to production, use this line + Bundler.require *Rails.groups(:assets => %w(development test)) + # If you want your assets lazily compiled in production, use this line + # Bundler.require(:default, :assets, Rails.env) +end module Snpr class Application < Rails::Application @@ -41,5 +43,11 @@ module Snpr # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password, :password_confirmation] #config.action_mailer.default_url_options = { :host => "localhost" } + + # Enable the asset pipeline + config.assets.enabled = true + + # Version of your assets, change this if you want to expire all your assets + config.assets.version = '1.0' end end diff --git a/config/environments/development.rb b/config/environments/development.rb index ad8928e..a8241cb 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -29,5 +29,11 @@ Snpr::Application.configure do # Log the query plan for queries taking more than this (works # with SQLite, MySQL, and PostgreSQL) config.active_record.auto_explain_threshold_in_seconds = 0.1 + + # Do not compress assets + config.assets.compress = false + + # Expands the lines which load the assets + config.assets.debug = true end diff --git a/config/environments/production.rb b/config/environments/production.rb index 2cd041e..708053b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -47,4 +47,13 @@ Snpr::Application.configure do # Send deprecation notices to registered listeners config.active_support.deprecation = :notify + + # Compress JavaScript and CSS + config.assets.compress = true + + # Don't fallback to assets pipeline + config.assets.compile = false + + # Generate digests for assets URLs + config.assets.digest = true end diff --git a/config/environments/test.rb b/config/environments/test.rb index b6c42c3..ee796c2 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -35,4 +35,11 @@ Snpr::Application.configure do # Raise exception on mass assignment protection for Active Record models config.active_record.mass_assignment_sanitizer = :strict + + # Configure static asset server for tests with Cache-Control for performance + config.serve_static_assets = true + config.static_cache_control = "public, max-age=3600" + + # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets + config.assets.allow_debugging = true end diff --git a/public/stylesheets/default.css.bak b/public/stylesheets/default.css.bak deleted file mode 100644 index 4a78649..0000000 --- a/public/stylesheets/default.css.bak +++ /dev/null @@ -1,89 +0,0 @@ -body { - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 18px; - padding: 1em; - float: left; - color: #333333; - background-color: #F9F9F9; -} - -table, tr, td{ - border: 1px solid black; - border-collapse: collapse; - padding: 5px; -} - -table th{ - background-color: #EAF2D3; - padding: 5px; -} - -.header{ - position:absolute; - padding: 0.5em; - top:0; - left:0; - width:100%; - height:header-; - border-bottom: 1px solid; - border-color: black; - text-align: center; -} -.footer{ - position:absolute; - text-align: center; - padding: 0.5em; - bottom:0; - left:0; - width:100%; - height:footer-; - border-top: 1px solid; - border-color: black; -} -.field_with_errors { - margin-top: 10px; - padding: 2px; - background-color: red; - display: table; -} - -.field_with_errors label { - color: #fff; -} - -#error_explanation { - width: 400px; - border: 2px solid red; - padding: 7px; - padding-bottom: 12px; - margin-bottom: 20px; - background-color: #f0f0f0; -} - -#error_explanation h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px; - background-color: #c00; - color: #fff; -} - -#error_explanation p { - color: #333; - margin-bottom: 0; - padding: 5px; -} - -#error_explanation ul li { - font-size: 12px; - list-style: square; -} - - -.leftside{ - padding-top:50px; - width:550px; - height:435px; -}