From 90cd412923fedeac8f5a4abb9b17ba787990cc53 Mon Sep 17 00:00:00 2001 From: Hostmaster of the Day Date: Fri, 1 Apr 2011 02:30:27 +0200 Subject: commited uncommited changes --- templates/base.html | 2 +- templates/delete_reminder_mail.txt | 19 +++++++++++++++++++ templates/deleted_project_mail.txt | 4 ++-- templates/new_project.html | 12 +++++++++--- templates/new_project_mail.txt | 4 +++- templates/register.html | 4 ++-- 6 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 templates/delete_reminder_mail.txt (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index 6e04fea..200a316 100644 --- a/templates/base.html +++ b/templates/base.html @@ -58,7 +58,7 @@

I forgot my password

{% endif %} diff --git a/templates/delete_reminder_mail.txt b/templates/delete_reminder_mail.txt new file mode 100644 index 0000000..44e76b6 --- /dev/null +++ b/templates/delete_reminder_mail.txt @@ -0,0 +1,19 @@ +From: {{ from_addr }} +Subject: dev reminder +To: {{ to_addr }} + +Hi {{ name }}, + +you are member of one or more dev.spline.de project(s): +{{ projects }} +if any of your projects is no longer needed we ask you to delete it. +you will be supplied with a full backup of your project, so no data will be +lost in case you may need it later. + +!you should not delete projects that other people might still be using! + +to delete projects, log in to https://dev.spline.de and click on 'my projects'. +next to each project name you will find a link to delete the project. + +Yours, + dev.spline.de diff --git a/templates/deleted_project_mail.txt b/templates/deleted_project_mail.txt index c75aa54..cdb9a3a 100644 --- a/templates/deleted_project_mail.txt +++ b/templates/deleted_project_mail.txt @@ -4,8 +4,8 @@ To: {{ to_addr }} Hi dev.spline.de team, -{{ session.login }} requested the deletion of project {{ proj_name }}. -Please take care of it ASAP. +{{ session.login }} requested the deletion of project {{ proj_name }} +Please take care of it soon (but at your convenience, of course!). Yours, dev.spline.de diff --git a/templates/new_project.html b/templates/new_project.html index f89ad0a..0efc2bd 100644 --- a/templates/new_project.html +++ b/templates/new_project.html @@ -12,13 +12,19 @@ +

  • How should I name my project?


    + We would be grateful if you could give your project an unambiguous name. For example, calling your + project mafi3 would definitely NOT be unambiguous, but loginname_ss2010_mafi3 would be well chosen.
    + We also do prefer lower-case letters, no white space and no dots in the project name. And there will be NO projects called test. + If you were just about to write 'test', forget it! No! There will be no test projects! +
  • - i want my project to be * + i want my project to be *
    @@ -29,7 +35,7 @@

    -* it is recommended that your project is open. this means read-access for everyone (open source!).
    -a private project will grant read- and write-access only to its members. +* It is recommended that your project is open. this means read- (but not write-) access for everyone (open source!). + A private project will grant read- and write-access only to its members.

    {% endblock %} diff --git a/templates/new_project_mail.txt b/templates/new_project_mail.txt index 3a056c4..e9ea91d 100644 --- a/templates/new_project_mail.txt +++ b/templates/new_project_mail.txt @@ -2,10 +2,12 @@ From: {{ from_addr }} Reply-To: {{ email }} Subject: new project application from {{ session.login }} ! To: {{ to_addr }} +Content-Type: text/plain; charset="utf8" +Content-Transfer-Encoding: 8bit hello dev.spline.de, -{{ session.login }} has applied for a new project called {{ name }}. +{{ session.login }} has applied for a new project called {{ name }} the description is: {{ desc }} diff --git a/templates/register.html b/templates/register.html index 1b579f3..f197ab0 100644 --- a/templates/register.html +++ b/templates/register.html @@ -17,7 +17,7 @@
  • - +
    • @@ -27,7 +27,7 @@
    -

    I do not have a  *.fu-berlin.de email address!

    +

    I do not have a  *fu-berlin.de email address!

    In this case write an email to dev@spline.de and give a good reason why you need a dev.spline.de account. -- cgit v1.2.3