Merge pull request #6777 from svbergerem/noscript

Add noscript warning
This commit is contained in:
Dennis Schubert 2016-03-31 22:10:39 +02:00
commit 1122dca5b8
4 changed files with 21 additions and 0 deletions

View file

@ -135,6 +135,7 @@ Contributions are very welcome, the hard work is done!
* Check for collapsible posts after images in posts have loaded [#6671](https://github.com/diaspora/diaspora/pull/6671)
* Add reason for post report to email sent to admins [#6679](https://github.com/diaspora/diaspora/pull/6679)
* Add links to the single post view of the related post to photos in the photo stream [#6621](https://github.com/diaspora/diaspora/pull/6621)
* Add a note for people with disabled JavaScript [#6777](https://github.com/diaspora/diaspora/pull/6777)
# 0.5.9.0

View file

@ -86,6 +86,21 @@ pre { word-wrap: break-word; }
&.visible { opacity: .5; }
}
.noscript {
background-color: rgba($black, .9);
height: 100%;
margin-top: -50px;
position: fixed;
width: 100%;
z-index: 9001;
h3 {
background-color: $white;
margin: 100px;
padding: 50px;
}
}
// general purpose classes
.small-horizontal-spacer {

View file

@ -49,6 +49,10 @@
%body{ class: "page-#{controller_name} action-#{action_name}" }
= yield :before_content
%noscript
.noscript
%h3= t("error_messages.need_javascript")
= content_for?(:content) ? yield(:content) : yield
= yield :after_content

View file

@ -91,6 +91,7 @@ en:
helper:
invalid_fields: "Invalid fields"
correct_the_following_errors_and_try_again: "Correct the following errors and try again."
need_javascript: "This website requires JavaScript to function properly. If you disabled JavaScript, please enable it and refresh this page."
admins:
admin_bar: