diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/deleted_project_mail.txt | 4 | ||||
| -rw-r--r-- | templates/imprint.html | 6 | ||||
| -rw-r--r-- | templates/index.html | 15 | ||||
| -rw-r--r-- | templates/members.html | 2 | ||||
| -rw-r--r-- | templates/new_project_mail.txt | 1 | ||||
| -rw-r--r-- | templates/profile.html | 3 | ||||
| -rw-r--r-- | templates/projects.html | 2 |
7 files changed, 25 insertions, 8 deletions
diff --git a/templates/deleted_project_mail.txt b/templates/deleted_project_mail.txt index 712c72e..c75aa54 100644 --- a/templates/deleted_project_mail.txt +++ b/templates/deleted_project_mail.txt @@ -1,10 +1,10 @@ From: {{ from_addr }} -Subject: {{ session.login }} wants to delete project {{ project_name }} +Subject: {{ session.login }} wants to delete project {{ proj_name }} To: {{ to_addr }} Hi dev.spline.de team, -{{ session.login }} requested the deletion of project {{ project_name }}. +{{ session.login }} requested the deletion of project {{ proj_name }}. Please take care of it ASAP. Yours, diff --git a/templates/imprint.html b/templates/imprint.html index 3200652..02944a0 100644 --- a/templates/imprint.html +++ b/templates/imprint.html @@ -7,15 +7,15 @@ <table> <tr> <th>Institution:</th> - <td>Freie Universität Berlin - vertreten durch den Präsidenten Univ.-Prof. Dr. Dieter Lenzen</td> + <td>Spline is a part of the Freie Universität Berlin</td> </tr> <tr> <th>Anschrift:</th> - <td><address>Fachbereich Mathematik und Informatik, Arnimallee 14, 14195 Berlin</address></td> + <td><address>Spline, Institut für Informatik, Takustraße 9, 14195 Berlin</address></td> </tr> <tr> <th>Kontakt:</th> - <td>fbv@mi.fu-berlin.de, Tel. +49-30-838-754 51</td> + <td>spline@spline.de, Tel. +49-30-838-53860</td> </tr> <tr> <th>Rechtsform:</th> diff --git a/templates/index.html b/templates/index.html index f5c2107..bae24e5 100644 --- a/templates/index.html +++ b/templates/index.html @@ -7,11 +7,24 @@ dev.spline.de is a collaborative workspace for the staff and students at the <a href="http://www.fu-berlin.de">Freie Universität Berlin</a> <a href="http://mi.fu-berlin.de">Department of Mathematics and Computer Science</a>. It is based on -<a href="http://trac.edgewall.org">Trac</a>, +<a href="http://trac.edgewall.org" style="font-weight:bold;">Trac</a>, an enhanced wiki and issue tracking system for software development projects, and maintained by the members of <a href="http://www.spline.de">spline</a>. The system has tools to help your team collaborate, like wiki pages and mailing lists as well as tools to create and control access to source code management repositories. </p> +<p style="margin-top:0.5cm;"></p> +<h3>Trac offers</h3> +<p> +<br/> +<ul> + <li>a repository for your code</li> + <li>a bugtracker</li> + <li>a wiki</li> + <li>a timeline showing all changes</li> + <li>a commit-mailinglist</li> +</ul> +Click a project from the <a href="list_projects">project listing</a> to see an example project! +</p> {% endblock %} diff --git a/templates/members.html b/templates/members.html index 2da38c0..17cb36d 100644 --- a/templates/members.html +++ b/templates/members.html @@ -24,7 +24,7 @@ Add or delete members to/from project {{ proj }} <form action="members" method="post"> <div class="infobox" style="width:150px; border-color:#132E28; margin-left:0.4cm;"> <p>add <input name="login" style="font-style:italic; color:grey;" - type="text" value="name of user to add" size="12" maxlength="64" id="mem" onclick="clearInput('mem')"/><br/> + type="text" value="name of user" size="12" maxlength="64" id="mem" onclick="clearInput('mem')"/><br/> to project <em>{{ proj }}</em><br/> <input type="hidden" name="action" value="add" /> <input type="hidden" name="proj_name" value="{{ proj }}" /> diff --git a/templates/new_project_mail.txt b/templates/new_project_mail.txt index e69a212..3a056c4 100644 --- a/templates/new_project_mail.txt +++ b/templates/new_project_mail.txt @@ -1,4 +1,5 @@ From: {{ from_addr }} +Reply-To: {{ email }} Subject: new project application from {{ session.login }} ! To: {{ to_addr }} diff --git a/templates/profile.html b/templates/profile.html index 59ecc6c..3b186e1 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -32,4 +32,7 @@ </fieldset> <p><input type="submit" value="Submit" /></p> </form> +<p style="text-align:right"> +<a href="javascript:confirmProfileDel('del_profile')"><em>delete</em> my profile !</a> +</p> {% endblock %} diff --git a/templates/projects.html b/templates/projects.html index d3dd1c3..d316aba 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -14,7 +14,7 @@ The projects you are currently member of: </tr> {% for proj in projects %} <tr> - <td>{{ proj.0 }}</td> + <td><a style="color:#132E28; text-decoration:none; font-style:normal;" href="https://dev.spline.de/trac/{{ proj.0 }}">{{ proj.0 }}</a></td> <td onmouseover="showElement('box1')" onmouseout="hideElement('box1')"><a href="projects?action=leave&proj_name={{ proj.0 }}">leave</a></td> <td onmouseover="showElement('box2')" onmouseout="hideElement('box2')"><a href="members?proj_name={{ proj.0 }}">members</a></td> <td onmouseover="showElement('box3')" onmouseout="hideElement('box3')"> |