jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix hardcoded http:// urls.

Browse Source
This commit is contained in:
evazion
2018-01-28 20:46:33 -06:00
parent 83b96b4f3f
commit e16ae00efc
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/presenters/post_presenter.rb
View File

@@ -168,7 +168,7 @@ class PostPresenter < Presenter
def safe_mode_message(template) def safe_mode_message(template)
html = ["This image is unavailable on safe mode (#{Danbooru.config.app_name}). Go to "] html = ["This image is unavailable on safe mode (#{Danbooru.config.app_name}). Go to "]
html << template.link_to("Danbooru", "http://danbooru.donmai.us") html << template.link_to("Danbooru", "http://danbooru.donmai.us") # XXX don't hardcode.
html << " or disable safe mode to view (" html << " or disable safe mode to view ("
html << template.link_to("learn more", template.wiki_pages_path(title: "help:user_settings")) html << template.link_to("learn more", template.wiki_pages_path(title: "help:user_settings"))
html << ")." html << ")."

10
app/views/layouts/default.html.erb
View File

@@ -48,9 +48,9 @@
"@context" : "http://schema.org", "@context" : "http://schema.org",
"@type" : "Organization", "@type" : "Organization",
"name" : "<%= Danbooru.config.app_name %>", "name" : "<%= Danbooru.config.app_name %>",
"url" : "http://<%= Danbooru.config.hostname%>", "url" : "<%= root_url %>",
"sameAs" : [ "sameAs" : [
"http://twitter.com/<%= Danbooru.config.twitter_site[1..-1] %>" "https://twitter.com/<%= Danbooru.config.twitter_site[1..-1] %>"
] ]
} }
</script> </script>
@@ -59,10 +59,10 @@
{ {
"@context": "http://schema.org", "@context": "http://schema.org",
"@type": "WebSite", "@type": "WebSite",
"url" : "http://<%= Danbooru.config.hostname %>", "url" : "<%= root_url %>",
"potentialAction": [{ "potentialAction": [{
"@type": "SearchAction", "@type": "SearchAction",
"target": "http://<%= Danbooru.config.hostname %>/posts?tags={search_term_string}", "target": "<%= posts_url %>?tags={search_term_string}",
"query-input": "required name=search_term_string" "query-input": "required name=search_term_string"
}] }]
} }
@@ -73,7 +73,7 @@
"@type": "WebSite", "@type": "WebSite",
"name": "<%= Danbooru.config.app_name %>", "name": "<%= Danbooru.config.app_name %>",
"alternateName": "<%= Danbooru.config.description %>", "alternateName": "<%= Danbooru.config.description %>",
"url" : "http://<%= Danbooru.config.hostname %>" "url" : "<%= root_url %>"
} }
</script> </script>
</head> </head>

2
app/views/legacy/create_post.xml.erb
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<response> <response>
<post-id>0</post-id> <post-id>0</post-id>
<location>http://<%= Danbooru.config.hostname %>/uploads/<%= @upload.id %></location> <location><%= upload_url(@upload) %></location>
</response> </response>

16
app/views/static/mrtg.html.erb
View File

@@ -2,37 +2,37 @@
<h3>5 min</h3> <h3>5 min</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_27-day.png"> <img src="https://mrtg.vinax.net/switch3/switch3_27-day.png">
<h3>30 min</h3> <h3>30 min</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_27-week.png"> <img src="https://mrtg.vinax.net/switch3/switch3_27-week.png">
<h3>2 hour</h3> <h3>2 hour</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_27-month.png"> <img src="https://mrtg.vinax.net/switch3/switch3_27-month.png">
<h3>1 day</h3> <h3>1 day</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_27-year.png"> <img src="https://mrtg.vinax.net/switch3/switch3_27-year.png">
<h1>hijiribe</h1> <h1>hijiribe</h1>
<h3>5 min</h3> <h3>5 min</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_29-day.png"> <img src="https://mrtg.vinax.net/switch3/switch3_29-day.png">
<h3>30 min</h3> <h3>30 min</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_29-week.png"> <img src="https://mrtg.vinax.net/switch3/switch3_29-week.png">
<h3>2 hour</h3> <h3>2 hour</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_29-month.png"> <img src="https://mrtg.vinax.net/switch3/switch3_29-month.png">
<h3>1 day</h3> <h3>1 day</h3>
<img src="http://mrtg.vinax.net/switch3/switch3_29-year.png"> <img src="https://mrtg.vinax.net/switch3/switch3_29-year.png">
<% content_for(:page_title) do %> <% content_for(:page_title) do %>
MRTG - <%= Danbooru.config.app_name %> MRTG - <%= Danbooru.config.app_name %>

2
app/views/users/edit.html.erb
View File

@@ -93,7 +93,7 @@
<%= f.input :disable_responsive_mode, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Disable alternative layout for mobile and tablet" %> <%= f.input :disable_responsive_mode, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Disable alternative layout for mobile and tablet" %>
<%= f.input :custom_style, :label => "Custom <a href='http://en.wikipedia.org/wiki/Cascading_Style_Sheets'>CSS</a> style".html_safe, :hint => "Style to apply to the whole site.", :input_html => {:size => "40x5"} %> <%= f.input :custom_style, :label => "Custom <a href='https://en.wikipedia.org/wiki/Cascading_Style_Sheets'>CSS</a> style".html_safe, :hint => "Style to apply to the whole site.", :input_html => {:size => "40x5"} %>
</fieldset> </fieldset>
<%= f.button :submit, "Submit" %> <%= f.button :submit, "Submit" %>