codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-24 05:42:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #977 from chrishunt/add-apple-touch-icon

Browse source 
Add 'apple touch icon url' site setting
This commit is contained in:
Sam 2013-06-06 17:40:12 -07:00
commit 1eed1e240b
4 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/default-apple-touch-icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

1
app/models/site_setting.rb
View file

@ -80,6 +80,7 @@ class SiteSetting < ActiveRecord::Base
setting(:active_user_rate_limit_secs, 60) setting(:active_user_rate_limit_secs, 60)
setting(:previous_visit_timeout_hours, 1) setting(:previous_visit_timeout_hours, 1)
setting(:favicon_url, '/assets/default-favicon.png') setting(:favicon_url, '/assets/default-favicon.png')
setting(:apple_touch_icon_url, '/assets/default-apple-touch-icon.png')
setting(:ninja_edit_window, 5.minutes.to_i) setting(:ninja_edit_window, 5.minutes.to_i)
setting(:post_undo_action_window_mins, 10) setting(:post_undo_action_window_mins, 10)

1
app/views/layouts/application.html.erb
View file

@ -10,6 +10,7 @@
<%= canonical_link_tag %> <%= canonical_link_tag %>
<link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>"> <link rel="icon" type="image/png" href="<%=SiteSetting.favicon_url%>">
<link rel="apple-touch-icon" type="image/png" href="<%=SiteSetting.apple_touch_icon_url%>">
<%= javascript_include_tag "preload_store" %> <%= javascript_include_tag "preload_store" %>
<%= render :partial => "common/special_font_face" %> <%= render :partial => "common/special_font_face" %>

2
config/locales/server.en.yml
View file

@ -459,6 +459,8 @@ en:
logo_url: "The logo for your site eg: http://example.com/logo.png" logo_url: "The logo for your site eg: http://example.com/logo.png"
logo_small_url: "The small logo for your site used when scrolling down on topics eg: http://example.com/logo-small.png" logo_small_url: "The small logo for your site used when scrolling down on topics eg: http://example.com/logo-small.png"
favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon" favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon"
apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px."
notification_email: "The return email address used when sending system emails such as notifying users of lost passwords, new accounts etc" notification_email: "The return email address used when sending system emails such as notifying users of lost passwords, new accounts etc"
use_ssl: "Should the site be accessible via SSL? (NOT IMPLEMENTED, EXPERIMENTAL)" use_ssl: "Should the site be accessible via SSL? (NOT IMPLEMENTED, EXPERIMENTAL)"
best_of_score_threshold: "The minimum score of a post to be included in the 'best of'" best_of_score_threshold: "The minimum score of a post to be included in the 'best of'"