[Mpuls-commits] r3643 - in base/trunk/mpulsweb: controllers templates/casebundle templates/casemanagement templates/logbook templates/phase/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Sep 15 10:14:59 CEST 2010
Author: torsten
Date: 2010-09-15 10:14:57 +0200 (Wed, 15 Sep 2010)
New Revision: 3643
Modified:
base/trunk/mpulsweb/controllers/case.py
base/trunk/mpulsweb/templates/casebundle/standin.mako
base/trunk/mpulsweb/templates/casemanagement/search.mako
base/trunk/mpulsweb/templates/logbook/edit_body.mako
base/trunk/mpulsweb/templates/logbook/overview.mako
base/trunk/mpulsweb/templates/logbook/overview_print.mako
base/trunk/mpulsweb/templates/logbook/show.mako
base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
Log:
Issue1164
Modified: base/trunk/mpulsweb/controllers/case.py
===================================================================
--- base/trunk/mpulsweb/controllers/case.py 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/controllers/case.py 2010-09-15 08:14:57 UTC (rev 3643)
@@ -438,12 +438,12 @@
form_result = validator.to_python(request.params)
case = self._loadCase(form_result.get('case_id'))
case.setEditor(form_result.get('editor'))
- c.status_msg = h.status_message("Bearbeiter erfolgreich gesetzt.")
+ c.status_msg = h.status_message("Bearbeiter/in erfolgreich gesetzt.")
return self.organisation(form_result.get('case_id'))
except formencode.Invalid, error:
c.form_result = error.value
c.form_errors = error.error_dict or {}
- c.status_msg = h.status_message("Fehler! Bearbeiter nicht gesetzt.")
+ c.status_msg = h.status_message("Fehler! Bearbeiter/in nicht gesetzt.")
return render('/casemanagement/organisation.mako')
@checkRole(('admin', 'cm'))
Modified: base/trunk/mpulsweb/templates/casebundle/standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/standin.mako 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/templates/casebundle/standin.mako 2010-09-15 08:14:57 UTC (rev 3643)
@@ -21,7 +21,7 @@
% if case.getEditor().id == c.current_user.id or c.current_user.isAdmin():
<li>${case.last_name | F.NA}, ${case.first_name | F.NA}</li>
% else:
- <li class="organisation_not_editor">${case.last_name}, ${case.first_name} (Nicht BearbeiterIn der Akte - Vertretung wird nicht geändert!)</li>
+ <li class="organisation_not_editor">${case.last_name}, ${case.first_name} (Nicht Bearbeiter/in der Akte - Vertretung wird nicht geändert!)</li>
% endif
% endfor
</ul>
@@ -31,7 +31,7 @@
<table>
<tr>
<th class="table_header_h table_checkbox"></th>
- <th class="table_header_h table_description">BearbeiterIn</th>
+ <th class="table_header_h table_description">Bearbeiter/in</th>
</tr>
<% idset = True %>
% for group in c.group_list:
Modified: base/trunk/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-09-15 08:14:57 UTC (rev 3643)
@@ -36,7 +36,7 @@
<td>
<input type="checkbox" name="own" id="show_own" value="1" checked="checked">
<label for="show_own">
- <img title="Eigene Fallakten" alt="Bearbeiter" src="${h.url_for('/images/icons/edit_editor.png')}">Eigene (${c.count_own})
+ <img title="Eigene Fallakten" alt="Bearbeiter/in" src="${h.url_for('/images/icons/edit_editor.png')}">Eigene (${c.count_own})
</label><br>
<input type="checkbox" name="standin" id="show_other" value="1" checked="checked">
<label for="show_other">
Modified: base/trunk/mpulsweb/templates/logbook/edit_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/edit_body.mako 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/templates/logbook/edit_body.mako 2010-09-15 08:14:57 UTC (rev 3643)
@@ -31,7 +31,7 @@
</fieldset>
<fieldset>
<legend>Eintrag</legend>
-Bearbeiter: ${session.get('USER_AUTHORIZED').shortenedName()}
+Bearbeiter/in: ${session.get('USER_AUTHORIZED').shortenedName()}
<div class="w100">
<label for="kind">Art des Eintrags:</label><br>
<select name='kind' id='kind'>
Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako 2010-09-15 08:14:57 UTC (rev 3643)
@@ -36,7 +36,7 @@
><img class="sorticon"
src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
</th>
- <th class="title table_header_h">Bearbeiter
+ <th class="title table_header_h">Bearbeiter/in
<a href="${h.url_for(controller='/logbook', action='index',
id=session.get('case').id, sort_field='bearbeiter',
sort_order='asc')}"
Modified: base/trunk/mpulsweb/templates/logbook/overview_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview_print.mako 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/templates/logbook/overview_print.mako 2010-09-15 08:14:57 UTC (rev 3643)
@@ -29,7 +29,7 @@
<td class="noborder table_row_v">${entry.getDate()} ${entry.getTime()}</td>
</tr>
<tr>
- <td class="noborder label">Bearbeiter</td>
+ <td class="noborder label">Bearbeiter/in</td>
<td class="noborder table_row_v_2">${entry.getEditor()}</td>
</tr>
<tr>
Modified: base/trunk/mpulsweb/templates/logbook/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/show.mako 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/templates/logbook/show.mako 2010-09-15 08:14:57 UTC (rev 3643)
@@ -34,7 +34,7 @@
<td class="table_row_v">${c.entry.getDate()} ${c.entry.getTime()}</td>
</tr>
<tr>
- <td class="label">Bearbeiter</td>
+ <td class="label">Bearbeiter/in</td>
<td class="table_row_v_2">${c.entry.getEditor()}</td>
</tr>
<tr>
Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2010-09-15 07:48:52 UTC (rev 3642)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2010-09-15 08:14:57 UTC (rev 3643)
@@ -12,7 +12,7 @@
<div class="import_box_dialog">
<p>
Beachten Sie, dass bei einem Phasenwechsel die Fallakte in ausgedruckter
- Form dem Jugendlichen ausgehändigt werden sollte. Weitere Informationen
+ Form dem jungen Menschen ausgehändigt werden sollte. Weitere Informationen
dazu finden Sie in der
<a href="${h.url_for(controller='/case', action='showhelp', id='datenschutz_veraenderte_daten')}" target="_blank">Hilfe</a>
</p>
More information about the Mpuls-commits
mailing list