From abb51abbc3720c99eb4c0e25800e7da658418744 Mon Sep 17 00:00:00 2001 From: Flaburgan Date: Tue, 6 Sep 2016 11:17:35 +0200 Subject: [PATCH 1/4] Remove old charset spec --- app/views/layouts/application.html.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index a1ab3aa84..cb0248113 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,7 +9,6 @@ = page_title yield(:page_title) %meta{charset: 'utf-8'}/ - %meta{"http-equiv" => "Content-Type", :content=>"text/html; charset=utf-8"}/ %meta{name: "viewport", content: "width=device-width, initial-scale=1"}/ = content_for?(:meta_data) ? yield(:meta_data) : metas_tags From 2b6bb549c2124acfccce1b9f5505507896518f19 Mon Sep 17 00:00:00 2001 From: Flaburgan Date: Tue, 6 Sep 2016 12:42:26 +0200 Subject: [PATCH 2/4] autocapitalize: off is deprecated since iOS 5 --- app/views/devise/passwords/new.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml index eccb259a2..7d21132e9 100644 --- a/app/views/devise/passwords/new.haml +++ b/app/views/devise/passwords/new.haml @@ -20,7 +20,7 @@ = f.text_field :email, class: "input-block-level form-control", required: true, - autocapitalize: "off", + autocapitalize: "none", placeholder: t("devise.passwords.new.email"), autocorrect: "off", autofocus: true, From faf450e57d70d4f1daf52cc76c68808786f49c19 Mon Sep 17 00:00:00 2001 From: Flaburgan Date: Tue, 6 Sep 2016 13:04:54 +0200 Subject: [PATCH 3/4] Don't use divs inside h3 --- app/views/home/podmin.haml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/home/podmin.haml b/app/views/home/podmin.haml index ecf1f2a03..fcee4e4b2 100644 --- a/app/views/home/podmin.haml +++ b/app/views/home/podmin.haml @@ -11,7 +11,7 @@ .col-md-4 .landing-info-card %h3.text-center - .entypo-tools + %span.entypo-tools = t(".configure_your_pod") != t(".configuration_info", database_path: content_tag(:code, "config/database.yml"), @@ -20,7 +20,7 @@ .col-md-4 .landing-info-card %h3.text-center - .entypo-add-user + %span.entypo-add-user = t(".create_an_account") != t(".create_an_account_info", sign_up_link: link_to(t("devise.shared.links.sign_up"), new_user_registration_path)) @@ -28,7 +28,7 @@ .col-md-4 .landing-info-card %h3.text-center - .entypo-key + %span.entypo-key = t(".make_yourself_an_admin") != t(".make_yourself_an_admin_info", wiki: link_to("diaspora* wiki", "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers#What_are_roles_and_how_do_I_use_them.3F_.2F_Make_yourself_an_admin"), @@ -38,7 +38,7 @@ .col-md-4 .landing-info-card %h3.text-center - .entypo-new + %span.entypo-new = t(".update_your_pod") != t(".update_your_pod_info", update_instructions: link_to(t(".update_instructions"), "https://wiki.diasporafoundation.org/Updating")) @@ -46,7 +46,7 @@ .col-md-4 .landing-info-card %h3.text-center - .entypo-lifebuoy + %span.entypo-lifebuoy = t(".getting_help") != t(".getting_help_info", faq: link_to(t(".faq_for_podmins"), "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers"), @@ -55,7 +55,7 @@ .col-md-4 .landing-info-card %h3.text-center - .entypo-code + %span.entypo-code = t(".contribute") != t(".contribute_info", report_bugs: link_to(t(".report_bugs"), "https://wiki.diasporafoundation.org/How_to_report_a_bug")) From f0e70a3c6c50db13cd075c3cf4f2c1956aec9e33 Mon Sep 17 00:00:00 2001 From: Flaburgan Date: Tue, 6 Sep 2016 13:08:32 +0200 Subject: [PATCH 4/4] Fix wrong aria label closes #7068 --- Changelog.md | 1 + app/views/devise/passwords/new.haml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 258696f32..e3ecbcf47 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ * Make the session cookies HttpOnly again [#7041](https://github.com/diaspora/diaspora/pull/7041) * Invalidate sessions with invalid CSRF tokens [#7050](https://github.com/diaspora/diaspora/pull/7050) * Liking a post will no longer update its interacted timestamp [#7030](https://github.com/diaspora/diaspora/pull/7030) +* Improve W3C compliance [#7068](https://github.com/diaspora/diaspora/pull/7068) ## Bug fixes * Post comments no longer get collapsed when interacting with a post [#7040](https://github.com/diaspora/diaspora/pull/7040) diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml index 7d21132e9..627aa3a1d 100644 --- a/app/views/devise/passwords/new.haml +++ b/app/views/devise/passwords/new.haml @@ -24,7 +24,7 @@ placeholder: t("devise.passwords.new.email"), autocorrect: "off", autofocus: true, - aria: {labelledby: "passwordLabel"} + aria: {labelledby: "emailLabel"} = f.submit t("devise.passwords.new.send_password_instructions"), class: "btn btn-block btn-primary"