From a2677bb9309c8ea3be21afbdd7ba90415507529b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 26 Jan 2019 14:44:23 -0800 Subject: [PATCH] clarify ipfs support, add missing titles for pages --- app/dmca.rb | 2 ++ app/index.rb | 11 ++++++++++- app/password_reset.rb | 3 +++ app/settings.rb | 1 + app/signin.rb | 1 + app/site.rb | 2 ++ app/site_files.rb | 4 ++++ views/{permanent_web.erb => distributed_web.erb} | 6 ++++++ views/settings/site/profile.erb | 2 +- views/site/followers.erb | 2 +- views/site/follows.erb | 2 +- 11 files changed, 32 insertions(+), 4 deletions(-) rename views/{permanent_web.erb => distributed_web.erb} (85%) diff --git a/app/dmca.rb b/app/dmca.rb index de118f0a..6037b158 100644 --- a/app/dmca.rb +++ b/app/dmca.rb @@ -1,4 +1,5 @@ get '/dmca' do + @title = 'DMCA' erb :'dmca' end @@ -8,6 +9,7 @@ get '/dmca/contact_info' do end post '/dmca/contact' do + @title = 'DMCA' @errors = [] if params[:email].empty? || params[:subject].empty? || params[:urls].empty? || params[:body].empty? diff --git a/app/index.rb b/app/index.rb index e93d8357..8bc6935f 100644 --- a/app/index.rb +++ b/app/index.rb @@ -84,6 +84,7 @@ end get '/welcome' do require_login redirect '/' if current_site.supporter? + @title = 'Welcome!' erb :'welcome', locals: {site: current_site} end @@ -118,18 +119,26 @@ get '/legal/?' do end get '/permanent-web' do - erb :'permanent_web' + redirect '/distributed-web' +end + +get '/distributed-web' do + @title = 'The Distributed Web' + erb :'distributed_web' end get '/thankyou' do + @title = 'Thank you!' erb :'thankyou' end get '/cli' do + @title = 'Command Line Interface' erb :'cli' end get '/forgot_username' do + @title = 'Forgot Username' erb :'forgot_username' end diff --git a/app/password_reset.rb b/app/password_reset.rb index 04033465..aa5a9550 100644 --- a/app/password_reset.rb +++ b/app/password_reset.rb @@ -1,4 +1,5 @@ get '/password_reset' do + @title = 'Password Reset' redirect '/' if signed_in? erb :'password_reset' end @@ -46,6 +47,8 @@ the Neocities Cat end get '/password_reset_confirm' do + @title = 'Password Reset Confirm' + if params[:token].nil? || params[:token].strip.empty? flash[:error] = 'Token cannot be empty.' redirect '/' diff --git a/app/settings.rb b/app/settings.rb index 5221c272..1a003e07 100644 --- a/app/settings.rb +++ b/app/settings.rb @@ -20,6 +20,7 @@ get '/settings/:username/?' do |username| pass if Site.select(:id).where(username: username).first.nil? require_login require_ownership_for_settings + @title = "Site settings for #{username}" erb :'settings/site' end diff --git a/app/signin.rb b/app/signin.rb index e756c594..1237e8c5 100644 --- a/app/signin.rb +++ b/app/signin.rb @@ -34,6 +34,7 @@ get '/signin/restore' do redirect '/' unless session[:deleted_site_id] @site = Site[session[:deleted_site_id]] redirect '/' if @site.nil? + @title = 'Restore Deleted Site' erb :'signin/restore' end diff --git a/app/site.rb b/app/site.rb index 020f99ca..433455be 100644 --- a/app/site.rb +++ b/app/site.rb @@ -135,6 +135,7 @@ post '/site/:username/set_editor_theme' do end get '/site/:username/follows' do |username| + @title = "Sites #{username} follows" @site = Site[username: username] not_found if @site.nil? @sites = @site.followings.collect {|f| f.site} @@ -142,6 +143,7 @@ get '/site/:username/follows' do |username| end get '/site/:username/followers' do |username| + @title = "Sites that follow #{username}" @site = Site[username: username] not_found if @site.nil? @sites = @site.follows.collect {|f| f.actioning_site} diff --git a/app/site_files.rb b/app/site_files.rb index b9a9253f..2c79fe2a 100644 --- a/app/site_files.rb +++ b/app/site_files.rb @@ -1,5 +1,6 @@ get '/site_files/new_page' do require_login + @title = 'New Page' erb :'site_files/new_page' end @@ -218,13 +219,16 @@ get %r{\/site_files\/text_editor\/(.+)} do end get '/site_files/allowed_types' do + @title = 'Allowed File Types' erb :'site_files/allowed_types' end get '/site_files/hotlinking' do + @title = 'Hotlinking Information' erb :'site_files/hotlinking' end get '/site_files/mount_info' do + @title = 'Site Mount Information' erb :'site_files/mount_info' end diff --git a/views/permanent_web.erb b/views/distributed_web.erb similarity index 85% rename from views/permanent_web.erb rename to views/distributed_web.erb index 2282d168..65eeee80 100644 --- a/views/permanent_web.erb +++ b/views/distributed_web.erb @@ -27,5 +27,11 @@

$ ipfs pin add -r THE_IPFS_CID_FOR_YOUR_SITE

+ + <% if signed_in? %> +

+ IPFS archiving is not enabled by default for all sites. If you would like to enable IPFS for your site, please visit your site's settings and enable it. +

+ <% end %> diff --git a/views/settings/site/profile.erb b/views/settings/site/profile.erb index b1a12ab5..a438ec15 100644 --- a/views/settings/site/profile.erb +++ b/views/settings/site/profile.erb @@ -27,7 +27,7 @@ checked<% end %> - > Enable IPFS Archiving + > Enable IPFS Archiving (what is this?) diff --git a/views/site/followers.erb b/views/site/followers.erb index 59c1ba8a..8421e672 100644 --- a/views/site/followers.erb +++ b/views/site/followers.erb @@ -1,7 +1,7 @@
-

Sites following <%= @site.title %>

+

Sites that follow <%= @site.title %>

diff --git a/views/site/follows.erb b/views/site/follows.erb index a5482319..c1074475 100644 --- a/views/site/follows.erb +++ b/views/site/follows.erb @@ -1,7 +1,7 @@
-

Sites <%= @site.title %> follows

+

Sites that <%= @site.title %> follows