From be15da34afca67d39547a8c336d09995c9e54b4a Mon Sep 17 00:00:00 2001 From: David Fischer Date: Fri, 25 May 2018 16:28:08 -0700 Subject: [PATCH 1/5] Small footer rework --- media/css/core.css | 12 ++++++++-- readthedocs/templates/base.html | 42 ++++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/media/css/core.css b/media/css/core.css index d37ab4d7823..50c67416459 100644 --- a/media/css/core.css +++ b/media/css/core.css @@ -654,8 +654,9 @@ p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; } #footer a:hover, #footer a:active { color: white; text-decoration: underline; } /* Social icons */ -#footer .social { font-family: FontAwesome; margin-left: 25px; } -#footer .social li { float: left; } +#footer .social { font-family: FontAwesome; text-align: center; margin-top: 30px; } +#footer .social:after { clear: both; content: ''; display: table; } +#footer .social li { width: 50px; display: inline-block; } #footer .social a { text-decoration: none; opacity: 0.5; } #footer .social a:hover, #footer .social a:visited { opacity: 1; } #footer .social .icon { display: inline-block; width: 36px; height: 36px; font-size: 24px;} @@ -667,6 +668,13 @@ p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; } #footer select { float: left; width: 175px; padding: 2px; height: 24px; font-size: 12px; margin-right: 10px; } #footer input[type="submit"] { margin-top: 0; padding: 4px; height: 24px; font-size: 12px; line-height: 16px; } +/* Other footer forms */ +#footer #email-signup { margin-bottom: 20px; } +#footer #email-signup:after { clear: both; content:''; display: table; } +#footer #email-signup p { padding-right: 10px; font-size: 14px; color: #BCC1C3; } +#footer label { color: #BCC1C3; font-weight: normal; } +#footer input[type="text"], #footer input[type="email"] { padding: 4px; font-size: 12px; line-height: 16px; margin-bottom: 5px } + /* utils */ diff --git a/readthedocs/templates/base.html b/readthedocs/templates/base.html index 1b37b68b1c3..ff15e826e9e 100644 --- a/readthedocs/templates/base.html +++ b/readthedocs/templates/base.html @@ -105,12 +105,25 @@ {% block footer-content %}
@@ -133,6 +146,7 @@

{% trans "About Us" %}

{% trans "Privacy Policy" %} +
@@ -168,13 +182,23 @@

{% trans "Read the Docs" %}

+ + +
+

- - © Copyright {% now "Y" %}, {% trans "Read the Docs, Inc & contributors" %} - - {% trans "Version" %} {% readthedocs_version %} - + © Copyright {% now "Y" %}, {% trans "Read the Docs, Inc & contributors" %} +

+ +

+ {% trans "Version" %} {% readthedocs_version %}

From 43c0a643d259184942956c795947a35e8ab5d5a2 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Fri, 25 May 2018 16:42:14 -0700 Subject: [PATCH 2/5] Add strings for translation --- readthedocs/templates/base.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/readthedocs/templates/base.html b/readthedocs/templates/base.html index ff15e826e9e..f711d76f095 100644 --- a/readthedocs/templates/base.html +++ b/readthedocs/templates/base.html @@ -108,10 +108,10 @@
-

Email Newsletter

-

Sign up for our newsletter to get our latest blog updates delivered to your inbox weekly.

+

{% trans 'Email Newsletter' %}

+

{% trans 'Sign up for our newsletter to get our latest blog updates delivered to your inbox weekly.' %}

- +
@@ -119,7 +119,7 @@

Email Newsletter

-
+
From 28c17f5d83cb04061af25f7bf305cbbc51199e85 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Tue, 29 May 2018 13:52:51 -0700 Subject: [PATCH 3/5] Additional reorg of the footer --- readthedocs/templates/base.html | 47 +++++++++++++++------------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/readthedocs/templates/base.html b/readthedocs/templates/base.html index f711d76f095..5268f1c2f94 100644 --- a/readthedocs/templates/base.html +++ b/readthedocs/templates/base.html @@ -108,7 +108,14 @@
-

{% trans 'Email Newsletter' %}

+

{% trans 'Stay Updated' %}

+ + +

{% trans 'Sign up for our newsletter to get our latest blog updates delivered to your inbox weekly.' %}

@@ -127,55 +134,45 @@

{% trans 'Email Newsletter' %}

-

{% trans "About Us" %}

+

{% trans 'Get Involved' %}

-

{% trans "Read the Docs" %}

+

{% trans 'Business Info' %}

@@ -194,11 +191,11 @@

{% trans "Read the Docs" %}

- © Copyright {% now "Y" %}, {% trans "Read the Docs, Inc & contributors" %} + © Copyright {% now "Y" %}, {% trans 'Read the Docs, Inc & contributors' %}

- {% trans "Version" %} {% readthedocs_version %} + {% trans 'Version' %} {% readthedocs_version %}

From 48449e7ad880e9ea6a6edee8439ad3e4b22f2903 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Tue, 29 May 2018 13:55:36 -0700 Subject: [PATCH 4/5] Remove the extra spacing --- media/css/core.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/css/core.css b/media/css/core.css index 50c67416459..03f9f972cf0 100644 --- a/media/css/core.css +++ b/media/css/core.css @@ -654,7 +654,7 @@ p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; } #footer a:hover, #footer a:active { color: white; text-decoration: underline; } /* Social icons */ -#footer .social { font-family: FontAwesome; text-align: center; margin-top: 30px; } +#footer .social { font-family: FontAwesome; text-align: center; } #footer .social:after { clear: both; content: ''; display: table; } #footer .social li { width: 50px; display: inline-block; } #footer .social a { text-decoration: none; opacity: 0.5; } From 88ec94fbac886ca026b3f03f7cf3e8678f2c1882 Mon Sep 17 00:00:00 2001 From: David Fischer Date: Tue, 29 May 2018 15:31:56 -0700 Subject: [PATCH 5/5] Mailchimp has "error" in the footer text, check more precisely --- readthedocs/rtd_tests/tests/test_project.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/readthedocs/rtd_tests/tests/test_project.py b/readthedocs/rtd_tests/tests/test_project.py index 03e9aac8960..0d0ea9e9101 100644 --- a/readthedocs/rtd_tests/tests/test_project.py +++ b/readthedocs/rtd_tests/tests/test_project.py @@ -287,14 +287,13 @@ def test_user_cant_change_lang_to_translation_lang(self): follow=True ) self.assertEqual(resp.status_code, 200) - self.assertContains(resp, 'error') self.assertContains( resp, 'There is already a "es" translation ' 'for the read-the-docs project' ) - def test_user_can_change_project_whith_same_lang(self): + def test_user_can_change_project_with_same_lang(self): user_a = User.objects.get(username='eric') project_a = Project.objects.get(slug='read-the-docs') project_b = get( @@ -322,7 +321,7 @@ def test_user_can_change_project_whith_same_lang(self): follow=True ) self.assertEqual(resp.status_code, 200) - self.assertNotContains(resp, 'error') + self.assertNotContains(resp, 'There is already a') def test_token(self): r = self.client.get('/api/v2/project/6/token/', {})