From e78d2a77a7de729abef8d83c599a82dda0da5fae Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Sun, 8 Sep 2013 15:40:46 +0200 Subject: Identation, whitespace and other cosmetics fixes in templates --- okupy/templates/base.html | 37 +++++++++++----------- okupy/templates/foundation-members.html | 20 ++++++------ okupy/templates/index.html | 2 +- okupy/templates/settings-contact.html | 5 +-- okupy/templates/settings-email.html | 56 +++++++++++++++++---------------- okupy/templates/settings-gentoo.html | 5 ++- okupy/templates/settings-password.html | 2 ++ okupy/templates/settings-profile.html | 4 ++- 8 files changed, 70 insertions(+), 61 deletions(-) diff --git a/okupy/templates/base.html b/okupy/templates/base.html index d8f1b1e..e320317 100644 --- a/okupy/templates/base.html +++ b/okupy/templates/base.html @@ -59,23 +59,23 @@
  • Sources
    • - {% if user.is_authenticated %} -
  • -
  • - {{ user.username }} - -
    • - {% endif %} - + {% if user.is_authenticated %} +
  • +
  • + {{ user.username }} + +
    • + {% endif %} + @@ -105,8 +105,7 @@ - - + {% compress js %} @@ -49,6 +49,8 @@ + + {% endblock %} {# vim:se fileencoding=utf8 et ts=4 sts=4 sw=4 ft=htmldjango : #} -- cgit v1.2.3-65-gdbad From d31da637c8c7f4293d621a773fa1e0fea22834f3 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Sun, 8 Sep 2013 16:16:44 +0200 Subject: Fix the tests about rendered result, they were not properly concatenating strings --- okupy/tests/unit/test_lists.py | 18 ++++-------------- okupy/tests/unit/test_signup.py | 4 +--- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/okupy/tests/unit/test_lists.py b/okupy/tests/unit/test_lists.py index b5d7006..d34e27c 100644 --- a/okupy/tests/unit/test_lists.py +++ b/okupy/tests/unit/test_lists.py @@ -34,11 +34,7 @@ class ListsUnitTests(OkupyTestCase): def test_rendered_devlist_page(self): request = set_request(uri='/devlist') response = lists(request, 'devlist') - page_part = '\n alice' - '\n Alice Adams\n ' - '' - 'City1, Country1\n ' - 'kde, qt, cluster\n ' + page_part = '\n alice\n Alice Adams\n City1, Country1\n kde, qt, cluster\n ' # noqa self.assertIn(page_part, response.content) def test_former_devlist_url_resolves_to_lists_view(self): @@ -53,11 +49,7 @@ class ListsUnitTests(OkupyTestCase): def test_rendered_former_devlist_page(self): request = set_request(uri='/former-devlist') response = lists(request, 'former-devlist') - page_part = '\n john' - '\n John Smith\n ' - '' - 'City3, Country3\n ' - 'kernel, security\n ' + page_part = '\n john\n John Smith\n City3, Country3\n kernel, security\n ' # noqa self.assertIn(page_part, response.content) def test_foundation_members_list_url_resolves_to_lists_view(self): @@ -72,8 +64,6 @@ class ListsUnitTests(OkupyTestCase): def test_rendered_foundation_members_page(self): request = set_request(uri='/foundation-members') response = lists(request, 'foundation-members') - page_part = '\n bob' - '\n Robert Barker\n ' - '' - 'City2, Country2\n ' + page_part = '\n bob\n Robert Barker\n City2, Country2\n ' # noqa + page_part = '\n bob\n Robert Barker\n City2, Country2\n ' # noqa self.assertIn(page_part, response.content) diff --git a/okupy/tests/unit/test_signup.py b/okupy/tests/unit/test_signup.py index 459e3f8..8009546 100644 --- a/okupy/tests/unit/test_signup.py +++ b/okupy/tests/unit/test_signup.py @@ -204,9 +204,7 @@ class SignupunitTestsNoLDAP(OkupyTestCase): def test_rendered_signup_form(self): request = set_request(uri='/signup') response = signup(request) - signup_form_part = '' - '' + signup_form_part = '' # noqa self.assertIn(signup_form_part, response.content) def test_empty_signup_form_raises_form_error_messages(self): -- cgit v1.2.3-65-gdbad