diff --git a/README.md b/README.md index efe83c8..8a67c87 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # ENSL Website -This is the source code of ENSL website. Currently deployed on [ensl.org](http://www.ensl.org). +This is the source code of ENSL website. Currently deployed on [ensl.org](https://www.ensl.org). Features: diff --git a/app/assets/stylesheets/themes/default/layout/_typography.scss b/app/assets/stylesheets/themes/default/layout/_typography.scss index f59e16d..ffacd36 100644 --- a/app/assets/stylesheets/themes/default/layout/_typography.scss +++ b/app/assets/stylesheets/themes/default/layout/_typography.scss @@ -2,8 +2,8 @@ Typography */ -@import url(http://fonts.googleapis.com/css?family=Russo+One); -@import url(http://fonts.googleapis.com/css?family=Open+Sans); +@import url(https://fonts.googleapis.com/css?family=Russo+One); +@import url(https://fonts.googleapis.com/css?family=Open+Sans); body { color: $base-font-color; diff --git a/app/assets/stylesheets/themes/flat/layout/_typography.scss b/app/assets/stylesheets/themes/flat/layout/_typography.scss index a9490e8..63db069 100644 --- a/app/assets/stylesheets/themes/flat/layout/_typography.scss +++ b/app/assets/stylesheets/themes/flat/layout/_typography.scss @@ -2,8 +2,8 @@ Typography */ -@import url(http://fonts.googleapis.com/css?family=Montserrat:400,700); -@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700); +@import url(https://fonts.googleapis.com/css?family=Montserrat:400,700); +@import url(https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700); body { color: $base-font-color; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0eb7d82..f13e54d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -195,7 +195,7 @@ module ApplicationHelper if Rails.env.production? "https://gathers.ensl.org" else - "http://gathers.staging.ensl.org" + "https://gathers.staging.ensl.org" end end end diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 4403bc6..f2d8796 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -37,7 +37,7 @@ $("#jplayer").jPlayer({ ready: function() { $(this).jPlayer("setMedia", { - mp3: "http://www.ensl.org/sounds/gather-1.mp3" + mp3: "https://www.ensl.org/sounds/gather-1.mp3" }).jPlayer("play"); var click = document.ontouchstart === undefined ? 'click' : 'touchstart'; diff --git a/app/views/layouts/notifications.html.erb b/app/views/layouts/notifications.html.erb index 7557b1c..6250656 100644 --- a/app/views/layouts/notifications.html.erb +++ b/app/views/layouts/notifications.html.erb @@ -1,9 +1,9 @@
Hello <%= h @user.username %>,
<%= yield %>
- +- (To disable these: Log In - -> Profile + (To disable these: Log In + -> Profile -> Notifications)
diff --git a/app/views/movies/vlc.html.erb b/app/views/movies/vlc.html.erb index 059b71c..b7ef82e 100644 --- a/app/views/movies/vlc.html.erb +++ b/app/views/movies/vlc.html.erb @@ -2,7 +2,7 @@ + target=https://ensl.org:29100" />If you do not receive your new password by email, please see the guide here.
+If you do not receive your new password by email, please see the guide here.
<%= form_tag({ controller: 'users', action: 'forgot' }, { class: 'square' }) do %> diff --git a/script/shell/frequently.sh b/script/shell/frequently.sh index 14bfa67..24c0d5a 100644 --- a/script/shell/frequently.sh +++ b/script/shell/frequently.sh @@ -1,3 +1,3 @@ #!/bin/bash -# wget -O /dev/null http://www.ensl.org/servers/refresh/1 -wget -O /dev/null http://www.ensl.org/tweets/refresh/1 +# wget -O /dev/null https://www.ensl.org/servers/refresh/1 +wget -O /dev/null https://www.ensl.org/tweets/refresh/1 diff --git a/script/shell/hourly.sh b/script/shell/hourly.sh index f0c7b17..fbe9c61 100644 --- a/script/shell/hourly.sh +++ b/script/shell/hourly.sh @@ -1,2 +1,2 @@ #!/bin/bash -wget -O /dev/null http://www.ensl.org/directories/refresh/1 +wget -O /dev/null https://www.ensl.org/directories/refresh/1