diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-21 00:13:13 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-21 00:13:13 +0100 |
commit | e09d3a2c6692fbc16cc6788cdc32b87e86f0b60f (patch) | |
tree | decd8b232e0a237dccbb6e108b336ccb8f066384 /app/views | |
parent | 806ffbab63fb888bf71fb0dcb74bd4ec11303ab9 (diff) |
Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/about/index.html.haml | 5 | ||||
-rw-r--r-- | app/views/home/index.html.haml | 1 | ||||
-rw-r--r-- | app/views/layouts/application.html.haml | 1 | ||||
-rw-r--r-- | app/views/stream_entries/_status.html.haml | 9 |
4 files changed, 10 insertions, 6 deletions
diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml index 160a66710..fe13de837 100644 --- a/app/views/about/index.html.haml +++ b/app/views/about/index.html.haml @@ -2,6 +2,7 @@ = Rails.configuration.x.local_domain - content_for :header_tags do + = javascript_include_tag 'application_public' %meta{ property: 'og:site_name', content: 'Mastodon' }/ %meta{ property: 'og:type', content: 'website' }/ %meta{ property: 'og:title', content: Rails.configuration.x.local_domain }/ @@ -25,5 +26,5 @@ = link_to t('about.terms'), terms_path = link_to t('about.source_code'), 'https://github.com/Gargron/mastodon' - = link_to t('about.get_started'), new_user_registration_path, class: 'button' - = link_to t('auth.login'), new_user_session_path, class: 'button' + = link_to t('about.get_started'), new_user_registration_path, class: 'button webapp-btn' + = link_to t('auth.login'), new_user_session_path, class: 'button webapp-btn' diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 0adce05bf..498fae105 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,5 +1,4 @@ - content_for :header_tags do - %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/ = javascript_include_tag 'application' = react_component 'Mastodon', default_props, class: 'app-holder', prerender: false diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7e28d27ec..87f98198c 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,6 +9,7 @@ %link{:rel => "manifest", :href => "/manifest.json"}/ %meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/ %meta{:name => "theme-color", :content => "#2b90d9"}/ + %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/ %title = "#{yield(:page_title)} - " if content_for?(:page_title) diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 67cb06a83..f70e2c890 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -9,9 +9,12 @@ .entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) } - if status.reblog? .pre-header - %i.fa.fa-retweet - Shared by - = link_to display_name(status.account), TagManager.instance.url_for(status.account), class: 'name' + %div.pre-header__icon + = fa_icon('retweet fw') + %span + = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do + %strong= display_name(status.account) + = t('stream_entries.reblogged') = render partial: centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status', locals: { status: proper_status(status) } |