commited uncommited changes

6 files changed, 36 insertions, 9 deletions

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 @@
               <p><a href="password">I forgot my password</a></p>
             </div>
             <div id="register" class="navbox">
-              <p>Don't have a dev.spline.de account?<br/><br/>
+              <p>You don't have a dev.spline.de account?<br/><br/>
               <a href="register">Create an account now</a></p>
             </div>
             {% 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 @@
 			<label for="name">project name</label>
 			<input id="name" type="text" name="project_name" value="your project's name" onfocus="clearInput('name')"/>
 			</li>
+      <li><p style="margin-bottom:-10px;"><strong>How should I name my project?</strong></p><br/>
+      We would be grateful if you could give your project an unambiguous name. For example, calling your
+      project <em class="black">mafi3</em> would definitely NOT be unambiguous, but <em class="black">loginname_ss2010_mafi3</em> would be well chosen.<br/>
+      We also do prefer lower-case letters, no white space and no dots in the project name. And there will be NO projects called <em class="black">test</em>.
+      If you were just about to write 'test', forget it! No! There will be no test projects!
+      </li>
 			<li>
 			<label for="desc">project description</label>
 			<textarea id="desc" style="width: 70%;" type="text" name="project_desc" onfocus="clearInput('desc')" rows="10" maxlength="500">describe your project here</textarea>
 			</li>
 			<li>
 			<fieldset>
-				<legend>i want my project to be <em>*</em></legend>
+        <legend>i want my project to be <strong><em>*</em></strong></legend>
 					<label><input type="radio" name="priv" value="open" checked="checked" /> open</label>
 					<label><input type="radio" name="priv" value="private" /> private</label>
 			</fieldset>
@@ -29,7 +35,7 @@
 </form>
 <hr style="margin: 20px 0 10px; width: 40%; color: #C9DCA6;" />
 <p style="width: 85%; font-size:11px; color:dark-gray; text-align:justify;">
-<em>*</em> it is recommended that your project is <em>open</em>. this means read-access for everyone (<em>open source!</em>).<br/>
-a <em>private</em> project will grant read- and write-access only to its members.
+<strong><em>*</em> It is recommended that your project is <em>open</em>. this means read- (but not write-) access for everyone (<em>open source!</em>).
+  A <em>private</em> project will grant read- and write-access only to its members.</strong>
 </p>
 {% 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 @@
 				</li>
 				<li>
 				<label for="email">E-Mail</label>
-				<input id="email_input" type="text" name="email" value="you@*.fu-berlin.de" onfocus="clearInput('email_input')"/>
+				<input id="email_input" type="text" name="email" value="you@*fu-berlin.de" onfocus="clearInput('email_input')"/>
 				</li>
 			</ol>
 		</fieldset>
@@ -27,7 +27,7 @@
 
 	<div class="c33r">
 		<div class="infobox">
-			<h1>I do not have a &nbsp;*.fu-berlin.de email address!</h1>
+			<h1>I do not have a &nbsp;*fu-berlin.de email address!</h1>
 			<p>
 			In this case write an email to <a href="mailto:dev@spline.de">dev@spline.de</a> and
 			give a good reason why you need a dev.spline.de account.