Widelands Website

Merge lp://staging/~franku/widelands-website/new_legal_notice_page into lp://staging/widelands-website

new_legal_notice_page
Merge into trunk

Proposed by kaputtnik on 2015-08-24

Status:

Merged

Merged at revision:

401

Proposed branch:

lp://staging/~franku/widelands-website/new_legal_notice_page

Merge into:

lp://staging/widelands-website

Diff against target:

232 lines (+132/-8)

8 files modified

mainpage/forms.py (+6/-1)
mainpage/views.py (+39/-4)
media/css/base.css (+2/-2)
settings.py (+9/-0)
templates/footer.html (+2/-1)
templates/mainpage/legal_notice.html (+56/-0)
templates/mainpage/legal_notice_thanks.html (+16/-0)
urls.py (+2/-0)

To merge this branch:

bzr merge lp://staging/~franku/widelands-website/new_legal_notice_page

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
SirVer		2015-08-24	Approve on 2015-08-31
Review via email: mp+268973@code.staging.launchpad.net

Description of the change

This branch contains changes for an additional legal notice page for the website.

Added two pages:
1. legal notice page with possibility to send an inquiry to some recipients without an account on widelands.org
2. A "thanks for inquiry" page, which is seen if an inquiry has been send

- Link to legal notice page is available over the footer (so it is available on all pages)
- The recipients where the inquiry of the form is send to is defined in settings.py with "INQUIRY_RECIPIENTS =". Currently i have my Email in there, but this should be completed/replaced with an address of a mailing list. Currently you could leave my address and complete it with your email if you want. In future it should only be the email address of a mailing list. This setting could also be in "local_settings.py".
- Changed the colour of errormessages to a more comfortable red.

Because my english is a german english, the text may have to be adjusted :-D

Revision history for this message

SirVer (sirver) wrote on 2015-08-26:

Can you make the list of email adresse a setting like the list of admins?

Revision history for this message

kaputtnik (franku) wrote on 2015-08-26:

Do you mean to use a tuple like ('name', 'emailaddress')?

This should be doable.

lp://staging/~franku/widelands-website/new_legal_notice_page updated on 2015-08-27

399. By kaputtnik on 2015-08-27: recipients as name/adress

Revision history for this message

kaputtnik (franku) wrote on 2015-08-27:

Now INQUIRY_RECIPIENTS is used to have ('name','email address'). The email part is not checked for validity.

I changed also the code to gather the "message" information.

Revision history for this message

SirVer (sirver) wrote on 2015-08-31:

looks good. thanks for looking into that. I will try to merge this this week and fill in my remaining contact data.

review: Approve

Revision history for this message

SirVer (sirver) wrote on 2016-01-12:

took me forever to get around to this, but now it is merged!! thanks for doing this.

I reworded some of the english on the legal notice page and fixed a bug (import of EMAIL_BACKEND) .

Revision history for this message

GunChleoc (gunchleoc) wrote on 2016-01-16:

Some proofreading - sorry I didn't see this before.

There are no financial goal or interest. => There is no financial goal or interest.

It is customary to use Title Case in English: Project lead => Project Lead

There are several possibilities to get in contact. For questions about the game or the contents of the website please take a look at our Contact page or post in the forums. Use the one of the following methods if you do not want to make an account:

There are several possibilities to get in contact with us. For questions about the game or the contents of the website, please take a look at our Contact page or post in the forums. Use one of the following methods if you do not want to create an account:

Revision history for this message

kaputtnik (franku) wrote on 2016-01-16:

Shall i add the corrections to the current merge proposal?