diff --git a/app/views/user_mailer/dump.html.erb b/app/views/user_mailer/dump.html.erb index ec047865..5e757ae2 100644 --- a/app/views/user_mailer/dump.html.erb +++ b/app/views/user_mailer/dump.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

the data dump (including all the genotyping files and the associated phenotypes) you requested for download from openSNP are now available in @@ -12,13 +12,13 @@ "Go and download them!

- -- + --
openSNP thanks Seven Bridges – and its biomedical data analysis platform – along with our Patreons for supporting our hosting costs.
- <%= image_tag("SBG_logo.png") %> + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %>

diff --git a/app/views/user_mailer/duplicate_file.html.erb b/app/views/user_mailer/duplicate_file.html.erb index 3c668bbf..75728a20 100644 --- a/app/views/user_mailer/duplicate_file.html.erb +++ b/app/views/user_mailer/duplicate_file.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

You have recently uploaded a genotyping to our repository, but it looks like we have stored the same file already!
@@ -14,19 +14,19 @@

If there is no genotyping listed in your user-account, please contact us!
- If you need help you can read the FAQ <%=faq_url()%> or contact us by replying to this mail. + If you need help you can read the FAQ or contact us by replying to this mail.

Cheers, your openSNP-team.

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/file_has_mails.html.erb b/app/views/user_mailer/file_has_mails.html.erb index eeacbda2..844a4a6c 100644 --- a/app/views/user_mailer/file_has_mails.html.erb +++ b/app/views/user_mailer/file_has_mails.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

You have recently uploaded a genotyping to our repository, but it looks like it contains email addresses. Some users have uploaded files with email addresses of strangers in the past, which we obviously cannot allow. @@ -12,19 +12,19 @@ The easiest way to fix this is to find out why your file contains email addresses, to remove these, and to re-upload it.

- If you need help you can read the FAQ <%=faq_url()%> or contact us by replying to this mail. + If you need help you can read the FAQ or contact us by replying to this mail.

Cheers, your openSNP-team.

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/finished_parsing.html.erb b/app/views/user_mailer/finished_parsing.html.erb index 205388c0..a40b692b 100644 --- a/app/views/user_mailer/finished_parsing.html.erb +++ b/app/views/user_mailer/finished_parsing.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

I just finished parsing your <%= @vendor %> file. I found a total of <%= @stats[:rows_without_comments] %> rows (exclusive comments) in it and was @@ -17,13 +17,13 @@ Cheers,
The OpenSNP Parser

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/fitbit_dump.html.erb b/app/views/user_mailer/fitbit_dump.html.erb index b56f3d44..f590c543 100644 --- a/app/views/user_mailer/fitbit_dump.html.erb +++ b/app/views/user_mailer/fitbit_dump.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

the Fitbit data you requested for "> @@ -18,13 +18,13 @@ Cheers,
your openSNP team

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/genotyping_results.html.erb b/app/views/user_mailer/genotyping_results.html.erb index e9dedfda..5bfd6332 100644 --- a/app/views/user_mailer/genotyping_results.html.erb +++ b/app/views/user_mailer/genotyping_results.html.erb @@ -4,7 +4,7 @@ -

Hi,

+ Hi,

the genetic data for the variation <%=@variation%> for <%=@phenotype_name%> you requested "> @@ -18,13 +18,13 @@ Cheers,
your openSNP team

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/new_message.html.erb b/app/views/user_mailer/new_message.html.erb index b322c2d7..77d72752 100644 --- a/app/views/user_mailer/new_message.html.erb +++ b/app/views/user_mailer/new_message.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

you just got a new message from <%=User.find_by_id(@message.from_id).name%> with the following subject: <%=@message.subject%> Below you find the text of the message: @@ -12,29 +12,29 @@

--- SNIP --- - +
<%= @message.body %> - +
--- SNAP ---

- PLEASE DO NOT ANSWER THIS MAIL DIRECTLY. You can read and reply to this message by clicking this link: <%= message_url(@message) %> + PLEASE DO NOT ANSWER THIS MAIL DIRECTLY. .

Cheers,
your openSNP team

- -- + --
You receive this email because you enabled the message-notification-settings. To change your notification-settings you can visit <%=edit_user_url(@user)%>#notifications

openSNP thanks Seven Bridges – and its biomedical data analysis platform – along with our Patreons for supporting our hosting costs.
- <%= image_tag("SBG_logo.png") %> + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> diff --git a/app/views/user_mailer/new_message.text.erb b/app/views/user_mailer/new_message.text.erb index 195f03b2..cfc29bd9 100644 --- a/app/views/user_mailer/new_message.text.erb +++ b/app/views/user_mailer/new_message.text.erb @@ -4,6 +4,7 @@ you just got a new message from <%=User.find_by_id(@message.from_id).name%> with Below you find the text of the message: --- SNIP --- +
<%= @message.body %> diff --git a/app/views/user_mailer/new_phenotype.html.erb b/app/views/user_mailer/new_phenotype.html.erb index adea7cc5..0c33feca 100644 --- a/app/views/user_mailer/new_phenotype.html.erb +++ b/app/views/user_mailer/new_phenotype.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

The new phenotype "<%=@phenotype.characteristic%>" was just entered on openSNP. @@ -13,14 +13,14 @@ The new phenotype "<%=@phenotype.characteristic%>" was just entered on openSNP. Cheers,
your openSNP team

- -- + --
You receive this email because you enabled the phenotype-notification-settings. To change your notification-settings you can visit <%=edit_user_url(@user)%>#notifications

openSNP thanks Seven Bridges – and its biomedical data analysis platform – along with our Patreons for supporting our hosting costs.
- <%= image_tag("SBG_logo.png") %> + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> diff --git a/app/views/user_mailer/new_phenotype_comment.html.erb b/app/views/user_mailer/new_phenotype_comment.html.erb index bddbd4cf..348e3d6a 100644 --- a/app/views/user_mailer/new_phenotype_comment.html.erb +++ b/app/views/user_mailer/new_phenotype_comment.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

<%=@phenotype_comment.user.name%> just replied to a phenotype comment on the Phenotype <%=@phenotype_comment.phenotype.characteristic%> from you. This is the text of the reply: @@ -12,29 +12,29 @@

--- SNIP --- - +
<%=@phenotype_comment.comment_text%> - +
--- SNAP ---

- PLEASE DO NOT ANSWER THIS MAIL DIRECTLY. You can read and reply to this comment by clicking this link: <%= phenotype_url(@phenotype_comment.phenotype) %> + PLEASE DO NOT ANSWER THIS MAIL DIRECTLY. You can read and reply to this comment by clicking this link.

Cheers,
your openSNP team

- -- + --
You receive this email because you enabled the phenotype-notification-settings. To change your notification-settings you can visit <%=edit_user_url(@user)%>#notifications

openSNP thanks Seven Bridges – and its biomedical data analysis platform – along with our Patreons for supporting our hosting costs.
- <%= image_tag("SBG_logo.png") %> + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> diff --git a/app/views/user_mailer/new_phenotype_comment.text.erb b/app/views/user_mailer/new_phenotype_comment.text.erb index d57a47b2..51ca6a62 100644 --- a/app/views/user_mailer/new_phenotype_comment.text.erb +++ b/app/views/user_mailer/new_phenotype_comment.text.erb @@ -4,6 +4,7 @@ Hello <%=@user.name%>, This is the text of the reply: --- SNIP --- +
<%=@phenotype_comment.comment_text%> diff --git a/app/views/user_mailer/new_picture_phenotype_comment.html.erb b/app/views/user_mailer/new_picture_phenotype_comment.html.erb index 91236365..5655f09b 100644 --- a/app/views/user_mailer/new_picture_phenotype_comment.html.erb +++ b/app/views/user_mailer/new_picture_phenotype_comment.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

<%=@phenotype_comment.user.name%> just replied to a phenotype comment on the Picture Phenotype <%=@phenotype_comment.picture_phenotype.characteristic%> from you. This is the text of the reply: @@ -12,29 +12,29 @@

--- SNIP --- - +
<%=@phenotype_comment.comment_text%> - +
--- SNAP ---

- You can read and reply to this comment by clicking this link: <%=picture_phenotype_url(@phenotype_comment.picture_phenotype)%>#comments + You can read and reply to this comment by clicking this link.

Cheers,
your openSNP team

- -- + --
You receive this email because you enabled the phenotype-notification-settings. To change your notification-settings you can visit <%=edit_user_url(@user)%>#notifications

openSNP thanks Seven Bridges – and its biomedical data analysis platform – along with our Patreons for supporting our hosting costs.
- <%= image_tag("SBG_logo.png") %> + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> diff --git a/app/views/user_mailer/new_picture_phenotype_comment.text.erb b/app/views/user_mailer/new_picture_phenotype_comment.text.erb index e4e1a8c9..fee49684 100644 --- a/app/views/user_mailer/new_picture_phenotype_comment.text.erb +++ b/app/views/user_mailer/new_picture_phenotype_comment.text.erb @@ -4,6 +4,7 @@ Hello <%=@user.name%>, This is the text of the reply: --- SNIP --- +
<%=@phenotype_comment.comment_text%> diff --git a/app/views/user_mailer/new_snp_comment.html.erb b/app/views/user_mailer/new_snp_comment.html.erb index 4d3e4640..99e5cddc 100644 --- a/app/views/user_mailer/new_snp_comment.html.erb +++ b/app/views/user_mailer/new_snp_comment.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

<%=@snp_comment.user.name%> just replied to a SNP comment on the SNP <%=@snp_comment.snp.name%> from you. This is the text of the reply: @@ -12,29 +12,29 @@

--- SNIP --- - +
<%=@snp_comment.comment_text%> - +
--- SNAP ---

- You can read and reply to this comment by clicking this link: <%=snp_url(@snp_comment.snp)%>#comments + You can read and reply to this comment by clicking this link.

Cheers,
your openSNP team

- -- - You receive this email because you enabled the phenotype-notification-settings. To change your notification-settings you can visit <%=edit_user_url(@user)%>#notifications

+ --
+ You receive this email because you enabled the phenotype-notification-settings. To change your notification-settings you can visit <%=edit_user_url(@user)%>#notifications

openSNP thanks Seven Bridges – and its biomedical data analysis platform – along with our Patreons for supporting our hosting costs.
- <%= image_tag("SBG_logo.png") %> + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> diff --git a/app/views/user_mailer/new_snp_comment.text.erb b/app/views/user_mailer/new_snp_comment.text.erb index 94f65984..8bbb77c8 100644 --- a/app/views/user_mailer/new_snp_comment.text.erb +++ b/app/views/user_mailer/new_snp_comment.text.erb @@ -4,6 +4,7 @@ Hello <%=@user.name%>, This is the text of the reply: --- SNIP --- +
<%=@snp_comment.comment_text%> diff --git a/app/views/user_mailer/newsletter.html.erb b/app/views/user_mailer/newsletter.html.erb index f9f955a4..1be2523d 100644 --- a/app/views/user_mailer/newsletter.html.erb +++ b/app/views/user_mailer/newsletter.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

We are collaborating with the Health Ethics and Policy Lab [1] at the University of Zurich, on a study that aims to investigate your experiences with sharing genetic and other kinds of data through openSNP (and other platforms). This is valuable knowledge for us in openSNP and for anyone interested in data sharing. We would be really grateful if you would participate in this short https://www.surveymonkey.com/r/openSNP survey. Below, you can see more information about the survey. @@ -26,14 +26,14 @@ Cheers,
your openSNP team

- -- + --
You're receiving this email as your openSNP-settings say that you're okay with getting some emails from the openSNP-team. You can change this setting really easy at https://opensnp.org/users/<%=@user.id%>/edit#notifications

openSNP thanks Seven Bridges – and its biomedical data analysis platform – along with our Patreons for supporting our hosting costs.
- <%= image_tag("SBG_logo.png") %> + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> diff --git a/app/views/user_mailer/no_dump.html.erb b/app/views/user_mailer/no_dump.html.erb index d57c796b..0c263675 100644 --- a/app/views/user_mailer/no_dump.html.erb +++ b/app/views/user_mailer/no_dump.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

you get this mail because you requested to download a dump of all the genotypes in openSNP.org. Unfortunately there are no genotypes yet. Maybe you want to upload your data?

@@ -15,13 +15,13 @@ you get this mail because you requested to download a dump of all the genotypes Cheers, your openSNP-team.

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/no_genotyping_results.html.erb b/app/views/user_mailer/no_genotyping_results.html.erb index 7fbe6856..5971614d 100644 --- a/app/views/user_mailer/no_genotyping_results.html.erb +++ b/app/views/user_mailer/no_genotyping_results.html.erb @@ -4,24 +4,24 @@ -

Hi,

+ Hi,

we're sorry to tell you that we don't have any users with uploaded genetic data that share the the variation <%=@variation%> for <%=@phenotype_name%> yet.

- If you need help you can read the FAQ <%=faq_url()%> or contact us by replying to this mail. + If you need help you can read the FAQ or contact us by replying to this mail.

Cheers, your openSNP-team.

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/parsing_error.html.erb b/app/views/user_mailer/parsing_error.html.erb index e7f81910..ca2c06f3 100644 --- a/app/views/user_mailer/parsing_error.html.erb +++ b/app/views/user_mailer/parsing_error.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

We are sorry to inform you that there was at least one line in your genotyping-file, excluding the header, that could not be parsed correctly. This may be a minor problem or not. If you can't see your local genotypes for the SNPs or you encounter any other problems you could try to delete your genotyping file at <%=edit_user_url(@user)%>. Afterwards you can re-upload your genotyping file. @@ -12,19 +12,19 @@

- If you need help you can read the FAQ <%=faq_url()%> or contact us by replying to this mail. + If you need help you can read the FAQ or contact us by replying to this mail.

Cheers, your openSNP-team.

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/password_reset_instructions.html.erb b/app/views/user_mailer/password_reset_instructions.html.erb index 6076819b..aadc6e3a 100644 --- a/app/views/user_mailer/password_reset_instructions.html.erb +++ b/app/views/user_mailer/password_reset_instructions.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

A request to reset your password has been made. If you did not make this request, simply ignore this email. @@ -14,23 +14,23 @@ <%=edit_password_reset_url(@user.perishable_token)%> If the above URL does not work try copying and pasting it into your browser. - If you continue to have problem please feel free to contact us. + If you continue to have problem please feel free to contact us.

- If you need help you can read the FAQ <%=faq_url()%> or contact us by replying to this mail. + If you need help you can read the FAQ or contact us by replying to this mail.

Cheers, your openSNP-team.

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/app/views/user_mailer/welcome_user.html.erb b/app/views/user_mailer/welcome_user.html.erb index 6cfc8cf4..ea85f2a1 100644 --- a/app/views/user_mailer/welcome_user.html.erb +++ b/app/views/user_mailer/welcome_user.html.erb @@ -4,7 +4,7 @@ -

Hi <%=@user.name%>,

+ Hi <%=@user.name%>,

Welcome to openSNP.org – the platform for sharing genotyping raw data. We hope you enjoy using openSNP, can meet some interesting people and have the chance to learn some new things about our genome. @@ -15,19 +15,19 @@ To edit your settings visit <%=edit_user_url(@user)%>

- If you need help you can read the FAQ <%=faq_url()%> or contact us by replying to this mail. + If you need help you can read the FAQ or contact us by replying to this mail.

Cheers, your openSNP-team.

- -- - openSNP thanks Seven Bridges – - and its biomedical data analysis platform – - along with our Patreons for supporting our - hosting costs.
- - <%= image_tag("SBG_logo.png") %> - + --
+ openSNP thanks Seven Bridges – + and its biomedical data analysis platform – + along with our Patreons for supporting our + hosting costs.
+ + <%= image_tag("http://"+ActionMailer::Base.default_url_options[:host]+"/assets/SBG_logo.png") %> + diff --git a/config/application.rb b/config/application.rb index 48e1f037..4d6f4849 100644 --- a/config/application.rb +++ b/config/application.rb @@ -42,6 +42,7 @@ class Application < Rails::Application config.filter_parameters += [:password, :password_confirmation] config.action_mailer.default_url_options = { host: 'opensnp.org' } + #config.action_mailer.default_url_options = { host: 'localhost:3000' } # Enable the asset pipeline config.assets.enabled = true diff --git a/config/environments/development.rb b/config/environments/development.rb index e5c37e97..21f25175 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -12,6 +12,8 @@ config.action_controller.perform_caching = false # Don't care if the mailer can't send + config.action_mailer.delivery_method = :smtp + config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 } config.action_mailer.raise_delivery_errors = false # Print deprecation notices to the Rails logger @@ -32,4 +34,3 @@ # Serve files from /public directory config.serve_static_files = true end - diff --git a/serverscript b/serverscript old mode 100644 new mode 100755