diff --git a/app/assets/images/default-apple-touch-icon.png b/app/assets/images/default-apple-touch-icon.png new file mode 100644 index 000000000..8f6b0aeae Binary files /dev/null and b/app/assets/images/default-apple-touch-icon.png differ diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index b9ee60a47..e5b99a922 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -80,6 +80,7 @@ class SiteSetting < ActiveRecord::Base setting(:active_user_rate_limit_secs, 60) setting(:previous_visit_timeout_hours, 1) 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(:post_undo_action_window_mins, 10) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index daf24d84e..c82dbd09d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,7 @@ <%= canonical_link_tag %> + <%= javascript_include_tag "preload_store" %> <%= render :partial => "common/special_font_face" %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index dbd2ad511..c26747ea4 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -459,6 +459,8 @@ en: 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" 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" 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'"