From d9313ba40e42f0910323fa522b104257a81a1d74 Mon Sep 17 00:00:00 2001 From: Jocelyn Delande Date: Thu, 20 Aug 2015 12:02:04 +0200 Subject: [PATCH] Remove trailing whitespaces --- AUTHORS | 2 +- LICENSE | 2 +- README.rst | 4 +- budget/static/css/main.css | 2 +- budget/templates/authenticate.html | 2 +- budget/templates/forms.html | 12 ++-- budget/templates/invitation_mail.en | 2 +- budget/templates/list_bills.html | 6 +- budget/templates/password_reminder.en | 2 +- budget/templates/reminder_mail.en | 2 +- budget/templates/send_invites.html | 2 +- budget/tests.py | 2 +- conf/nginx.conf | 4 +- docs/_themes/pelican/static/pelican.css_t | 76 +++++++++++------------ docs/api.rst | 30 ++++----- 15 files changed, 75 insertions(+), 75 deletions(-) diff --git a/AUTHORS b/AUTHORS index f10407028..89a2af3e0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,2 @@ -The project has been started by Alexis Métaireau and Frédéric Sureau. Friends are +The project has been started by Alexis Métaireau and Frédéric Sureau. Friends are helping since that in the persons of Arnaud Bos and Quentin Roy. diff --git a/LICENSE b/LICENSE index a66828404..ecc797709 100644 --- a/LICENSE +++ b/LICENSE @@ -19,7 +19,7 @@ that the following conditions are met: promote products derived from this software without specific prior written permission. -* If you meet the authors of this software in person and you want to +* If you meet the authors of this software in person and you want to pay them a beer, you're encouraged to do so. Please, do. If you have homebrewed beer, this works as well (may even be better). diff --git a/README.rst b/README.rst index 80e2fb0c2..8bcc64818 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,7 @@ the following content:: DEBUG = True SQLACHEMY_ECHO = DEBUG -You can also set the `TESTING` flag to `True` so no mails are sent +You can also set the `TESTING` flag to `True` so no mails are sent (and no exception is raised) while you're on development mode. Deploy it @@ -66,7 +66,7 @@ As a developer -------------- The best way to contribute code is to write it and to make a pull request on -github. Please, think about updating and running the tests before asking for +github. Please, think about updating and running the tests before asking for a pull request as it will help us to maintain the code clean and running. To do so:: diff --git a/budget/static/css/main.css b/budget/static/css/main.css index 3274241b8..97a3e195c 100644 --- a/budget/static/css/main.css +++ b/budget/static/css/main.css @@ -180,7 +180,7 @@ tr.payer_line .balance-name{ background: url('../images/reactivate.png') left no-repeat; color: white; } - + #bill-form > fieldset { margin-top: 10px; } diff --git a/budget/templates/authenticate.html b/budget/templates/authenticate.html index dc62a70b8..98914d09b 100644 --- a/budget/templates/authenticate.html +++ b/budget/templates/authenticate.html @@ -3,7 +3,7 @@

Authentication

{% if create_project %} -

{{ _("The project you are trying to access do not exist, do you want +

{{ _("The project you are trying to access do not exist, do you want to") }} {{ _("create it") }}{{ _("?") }}

{% endif %} diff --git a/budget/templates/forms.html b/budget/templates/forms.html index 2904e0d52..ec7351594 100644 --- a/budget/templates/forms.html +++ b/budget/templates/forms.html @@ -76,12 +76,12 @@
{% if title %}{% if edit %}{{ _("Edit this bill") }} {% else %}{{ _("Add a bill") }} {% endif %}{% endif %} {% include "display_errors.html" %} - {{ form.hidden_tag() }} - {{ input(form.date, class="datepicker") }} - {{ input(form.what) }} - {{ input(form.payer) }} - {{ input(form.amount) }} - {{ input(form.payed_for) }} + {{ form.hidden_tag() }} + {{ input(form.date, class="datepicker") }} + {{ input(form.what) }} + {{ input(form.payer) }} + {{ input(form.amount) }} + {{ input(form.payed_for) }}
{{ form.submit(class="btn btn-primary") }} diff --git a/budget/templates/invitation_mail.en b/budget/templates/invitation_mail.en index 4f5bbf069..e4ff0e9e8 100644 --- a/budget/templates/invitation_mail.en +++ b/budget/templates/invitation_mail.en @@ -1,4 +1,4 @@ -Hi, +Hi, Someone using the email address {{ g.project.contact_email }} invited you to share your expenses for "{{ g.project.name }}". diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html index f9d372a86..899fdeba0 100644 --- a/budget/templates/list_bills.html +++ b/budget/templates/list_bills.html @@ -42,13 +42,13 @@ }); $("#bal-member-"+payer_id).addClass("payer_line"); }; - + var unhighlight_owers = function(){ $('[id^="bal-member-"]').removeClass("ower_line payer_line"); }; - + $('#bill_table tbody tr').hover(highlight_owers, unhighlight_owers); - + {% endblock %} {% block sidebar %} diff --git a/budget/templates/password_reminder.en b/budget/templates/password_reminder.en index fc24a6fce..31210aab0 100644 --- a/budget/templates/password_reminder.en +++ b/budget/templates/password_reminder.en @@ -1,4 +1,4 @@ -Hi, +Hi, You requested to be reminded about your password for "{{ project.name }}". diff --git a/budget/templates/reminder_mail.en b/budget/templates/reminder_mail.en index b2e3a6552..fe57be2df 100644 --- a/budget/templates/reminder_mail.en +++ b/budget/templates/reminder_mail.en @@ -1,4 +1,4 @@ -Hi, +Hi, You have just (or someone else using your email address) created the project "{{ g.project.name }}" to share your expenses. diff --git a/budget/templates/send_invites.html b/budget/templates/send_invites.html index 9ddded1cb..7b3bdc5f8 100644 --- a/budget/templates/send_invites.html +++ b/budget/templates/send_invites.html @@ -9,7 +9,7 @@ {% endblock %} {% block content %}

{{ _("Invite people to join this project") }}

-

{{ _("Specify a (comma separated) list of email adresses you want to notify about the +

{{ _("Specify a (comma separated) list of email adresses you want to notify about the creation of this budget management project and we will send them an email for you.") }}

{{ _("If you prefer, you can") }} {{ _("skip this step") }} {{ _("and notify them yourself") }}

diff --git a/budget/tests.py b/budget/tests.py index 0f7c2a2c1..1fb9fe44e 100644 --- a/budget/tests.py +++ b/budget/tests.py @@ -532,7 +532,7 @@ def test_settle(self): for m, a in members.items(): self.assertEqual(a, balance[m.id]) return - + class APITestCase(TestCase): diff --git a/conf/nginx.conf b/conf/nginx.conf index c4a9ad52a..9ae2ca0db 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,9 +2,9 @@ server { server_name yourur; keepalive_timeout 5; - location /static/ { + location /static/ { alias /path/to/app/budget/static/; - } + } location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; diff --git a/docs/_themes/pelican/static/pelican.css_t b/docs/_themes/pelican/static/pelican.css_t index 3cb2a3c17..8d8a9b2c8 100644 --- a/docs/_themes/pelican/static/pelican.css_t +++ b/docs/_themes/pelican/static/pelican.css_t @@ -6,11 +6,11 @@ * * :copyright: Copyright 2011 by Alexis Metaireau. */ - + @import url("basic.css"); - + /* -- page layout ----------------------------------------------------------- */ - + body { font-family: Arial, sans-serif; font-size: 100%; @@ -32,17 +32,17 @@ div.bodywrapper { hr { border: 1px solid #B1B4B6; } - + div.document { } - + div.body { background-color: #ffffff; color: #3E4349; padding: 0 30px 30px 30px; font-size: 0.9em; } - + div.footer { color: #555; width: 100%; @@ -50,12 +50,12 @@ div.footer { text-align: center; font-size: 75%; } - + div.footer a { color: #444; text-decoration: underline; } - + div.related { background-color: #6BA81E; line-height: 32px; @@ -63,11 +63,11 @@ div.related { text-shadow: 0px 1px 0 #444; font-size: 0.9em; } - + div.related a { color: #E2F3CC; } - + div.sphinxsidebar { font-size: 0.75em; line-height: 1.5em; @@ -76,7 +76,7 @@ div.sphinxsidebar { div.sphinxsidebarwrapper{ padding: 20px 0; } - + div.sphinxsidebar h3, div.sphinxsidebar h4 { font-family: Arial, sans-serif; @@ -92,30 +92,30 @@ div.sphinxsidebar h4 { div.sphinxsidebar h4{ font-size: 1.1em; } - + div.sphinxsidebar h3 a { color: #444; } - - + + div.sphinxsidebar p { color: #888; padding: 5px 20px; } - + div.sphinxsidebar p.topless { } - + div.sphinxsidebar ul { margin: 10px 20px; padding: 0; color: #000; } - + div.sphinxsidebar a { color: #444; } - + div.sphinxsidebar input { border: 1px solid #ccc; font-family: sans-serif; @@ -125,19 +125,19 @@ div.sphinxsidebar input { div.sphinxsidebar input[type=text]{ margin-left: 20px; } - + /* -- body styles ----------------------------------------------------------- */ - + a { color: #005B81; text-decoration: none; } - + a:hover { color: #E32E00; text-decoration: underline; } - + div.body h1, div.body h2, div.body h3, @@ -151,7 +151,7 @@ div.body h6 { padding: 5px 0 5px 10px; text-shadow: 0px 1px 0 white } - + {% if theme_index_logo %} div.indexwrapper h1 { text-indent: -999999px; @@ -159,10 +159,10 @@ div.indexwrapper h1 { height: {{ theme_index_logo_height }}; } {% endif %} -div.body h1 { - border-top: 20px solid white; - margin-top: 0; - font-size: 250%; +div.body h1 { + border-top: 20px solid white; + margin-top: 0; + font-size: 250%; text-align: center; } @@ -171,23 +171,23 @@ div.body h3 { font-size: 120%; background-color: #D8DEE3; } div.body h4 { font-size: 110%; background-color: #D8DEE3; } div.body h5 { font-size: 100%; background-color: #D8DEE3; } div.body h6 { font-size: 100%; background-color: #D8DEE3; } - + a.headerlink { color: #c60f0f; font-size: 0.8em; padding: 0 4px 0 4px; text-decoration: none; } - + a.headerlink:hover { background-color: #c60f0f; color: white; } - + div.body p, div.body dd, div.body li { line-height: 1.5em; } - + div.admonition p.admonition-title + p { display: inline; } @@ -200,29 +200,29 @@ div.note { background-color: #eee; border: 1px solid #ccc; } - + div.seealso { background-color: #ffc; border: 1px solid #ff6; } - + div.topic { background-color: #eee; } - + div.warning { background-color: #ffe4e4; border: 1px solid #f66; } - + p.admonition-title { display: inline; } - + p.admonition-title:after { content: ":"; } - + pre { padding: 10px; background-color: #111; @@ -234,7 +234,7 @@ pre { -webkit-box-shadow: 1px 1px 1px #d8d8d8; -moz-box-shadow: 1px 1px 1px #d8d8d8; } - + tt { background-color: #ecf0f3; color: #222; diff --git a/docs/api.rst b/docs/api.rst index 34edbdbe7..ce5df7162 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -64,18 +64,18 @@ Getting information about the project:: $ curl --basic -u demo:demo http://ihatemoney.notmyidea.org/api/projects/demo { - "name": "demonstration", - "contact_email": "demo@notmyidea.org", - "password": "demo", + "name": "demonstration", + "contact_email": "demo@notmyidea.org", + "password": "demo", "id": "demo", - "active_members": [{"activated": true, "id": 31, "name": "Arnaud"}, - {"activated": true, "id": 32, "name": "Alexis"}, - {"activated": true, "id": 33, "name": "Olivier"}, - {"activated": true, "id": 34, "name": "Fred"}], - "members": [{"activated": true, "id": 31, "name": "Arnaud"}, - {"activated": true, "id": 32, "name": "Alexis"}, - {"activated": true, "id": 33, "name": "Olivier"}, - {"activated": true, "id": 34, "name": "Fred"}], + "active_members": [{"activated": true, "id": 31, "name": "Arnaud"}, + {"activated": true, "id": 32, "name": "Alexis"}, + {"activated": true, "id": 33, "name": "Olivier"}, + {"activated": true, "id": 34, "name": "Fred"}], + "members": [{"activated": true, "id": 31, "name": "Arnaud"}, + {"activated": true, "id": 32, "name": "Alexis"}, + {"activated": true, "id": 33, "name": "Olivier"}, + {"activated": true, "id": 34, "name": "Fred"}], } @@ -101,15 +101,15 @@ Members You can get all the members with a `GET` on `/api/projects//members`:: $ curl --basic -u demo:demo http://ihatemoney.notmyidea.org/api/projects/demo/members\ - [{"activated": true, "id": 31, "name": "Arnaud"}, - {"activated": true, "id": 32, "name": "Alexis"}, + [{"activated": true, "id": 31, "name": "Arnaud"}, + {"activated": true, "id": 32, "name": "Alexis"}, {"activated": true, "id": 33, "name": "Olivier"}, {"activated": true, "id": 34, "name": "Fred"}] Add a member with a `POST` request on `/api/projects//members`:: $ curl --basic -u demo:demo -X POST\ - http://ihatemoney.notmyidea.org/api/projects/demo/members -d 'name=tatayoyo' + http://ihatemoney.notmyidea.org/api/projects/demo/members -d 'name=tatayoyo' 35 You can also `PUT` a new version of a member (changing its name):: @@ -122,7 +122,7 @@ You can also `PUT` a new version of a member (changing its name):: Delete a member with a `DELETE` request on `/api/projects//members/`:: $ curl --basic -u demo:demo -X DELETE\ - http://ihatemoney.notmyidea.org/api/projects/demo/members/35 + http://ihatemoney.notmyidea.org/api/projects/demo/members/35 "OK Bills