[Mpuls-commits] r2505 - in wasko/branches/2.0: . mpulsweb/controllers mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/public/images/icons mpulsweb/public/images/svg mpulsweb/public/styles mpulsweb/templates/administration mpulsweb/templates/casemanagement mpulsweb/templates/documents
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Apr 23 11:01:56 CEST 2010
Author: roland
Date: 2010-04-23 11:01:53 +0200 (Fri, 23 Apr 2010)
New Revision: 2505
Added:
wasko/branches/2.0/mpulsweb/public/images/icons/sort_asc_active.png
wasko/branches/2.0/mpulsweb/public/images/icons/sort_desc_active.png
wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc.svg
wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc_active.svg
wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc.svg
wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc_active.svg
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/mpulsweb/controllers/case_overview.py
wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
wasko/branches/2.0/mpulsweb/public/styles/all.css
wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako
wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako
wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako
wasko/branches/2.0/mpulsweb/templates/documents/global_overview.mako
Log:
Wald issue #1452: added hover to some overview table
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/ChangeLog 2010-04-23 09:01:53 UTC (rev 2505)
@@ -1,3 +1,25 @@
+2010-04-23 Roland Geider <roland.geider at intevation.de>
+
+ * mpulsweb/controllers/case_overview.py:
+ * mpulsweb/public/styles/all.css:
+ * mpulsweb/templates/administration/show_usergroup.mako:
+ * mpulsweb/templates/administration/overview_user.mako:
+ * mpulsweb/templates/administration/overview_usergroups.mako:
+ * mpulsweb/templates/documents/global_overview.mako:
+ * mpulsweb/templates/casemanagement/caselist.mako: Wald issue #1452:
+ added hover to some of the overview tables and made most elements
+ clickable
+ * mpulsweb/public/images/svg/sort_desc.svg:
+ * mpulsweb/public/images/svg/sort_asc_active.svg:
+ * mpulsweb/public/images/svg/sort_asc.svg:
+ * mpulsweb/public/images/svg/sort_desc_active.svg:
+ * mpulsweb/public/images/icons/sort_asc_active.png:
+ * mpulsweb/public/images/icons/sort_desc_active.png:
+ * mpulsweb/i18n/mpulsweb.pot:
+ * mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po: Added a visual feedback
+ for sorting in tables
+
+
2010-04-23 Torsten Irländer <torsten.irlaender at intevation.de>
* mpulsweb/lib/renderer.py (ViewRenderer._renderDate.uformat_date):
Modified: wasko/branches/2.0/mpulsweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/case_overview.py 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/controllers/case_overview.py 2010-04-23 09:01:53 UTC (rev 2505)
@@ -112,7 +112,6 @@
search_options.extend(self.parseSortOptions(request.params))
search_str = ";".join(search_options)
-
# Do search
c.cases = MpulsCaseOverview()
c.cases.search(search_str)
@@ -170,6 +169,11 @@
def parseSortOptions(self, options=None):
search_options = []
sort_field, sort_order = get_sort(options)
+
+ # Pass the sort options to the template
+ c.sort_field = sort_field
+ c.sort_order = sort_order
+
# default behavior is to take the sortfield for sorting
search_options.append('sort_field:%s' % sort_field)
search_options.append('sort_order:%s' % sort_order)
Modified: wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-04-23 09:01:53 UTC (rev 2505)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2010-04-22 16:36+0100\n"
+"PO-Revision-Date: 2010-04-23 10:45+0100\n"
"Last-Translator: Roland Geider <roland.geider at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -365,8 +365,8 @@
#: mpulsweb/model/case.py:1072
#: mpulsweb/model/case.py:1073
-#: mpulsweb/templates/casemanagement/caselist.mako:104
-#: mpulsweb/templates/casemanagement/caselist.mako:105
+#: mpulsweb/templates/casemanagement/caselist.mako:127
+#: mpulsweb/templates/casemanagement/caselist.mako:128
msgid "case_state_label_open"
msgstr "Bearbeitbar"
@@ -677,7 +677,6 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:33
#: mpulsweb/templates/administration/new_usergroup.mako:31
-#: mpulsweb/templates/administration/show_usergroup.mako:23
msgid "adm_form_legend_groupdata"
msgstr "Angaben zur Benutzergruppe"
@@ -685,12 +684,11 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:39
#: mpulsweb/templates/administration/new_usergroup.mako:34
#: mpulsweb/templates/administration/new_usergroup.mako:37
-#: mpulsweb/templates/administration/show_usergroup.mako:26
msgid "adm_form_usergroup_name"
msgstr "Benutzergruppenname"
#: mpulsweb/templates/administration/edit_usergroup.mako:44
-#: mpulsweb/templates/administration/show_usergroup.mako:30
+#: mpulsweb/templates/administration/show_usergroup.mako:25
msgid "adm_form_legende_groupmember"
msgstr "Mitglieder der Gruppe"
@@ -826,21 +824,19 @@
msgid "adm_overview_tbl_header_actions"
msgstr "Aktionen"
-#: mpulsweb/templates/administration/overview_user.mako:43
-#: mpulsweb/templates/administration/overview_user.mako:60
-#: mpulsweb/templates/administration/overview_usergroups.mako:34
-#: mpulsweb/templates/administration/overview_usergroups.mako:43
+#: mpulsweb/templates/administration/overview_user.mako:48
+#: mpulsweb/templates/administration/overview_usergroups.mako:41
#: mpulsweb/templates/appointments/appointmentlist.mako:3
#: mpulsweb/templates/casemanagement/appointmentlist.mako:6
#: mpulsweb/templates/casemanagement/appointmentlist.mako:7
-#: mpulsweb/templates/casemanagement/caselist.mako:125
-#: mpulsweb/templates/casemanagement/caselist.mako:126
+#: mpulsweb/templates/casemanagement/caselist.mako:148
+#: mpulsweb/templates/casemanagement/caselist.mako:149
#: mpulsweb/templates/casemanagement/reminderlist.mako:4
#: mpulsweb/templates/documents/case_overview.mako:57
-#: mpulsweb/templates/documents/global_overview.mako:39
-#: mpulsweb/templates/documents/global_overview.mako:40
-#: mpulsweb/templates/documents/global_overview.mako:51
-#: mpulsweb/templates/documents/global_overview.mako:52
+#: mpulsweb/templates/documents/global_overview.mako:43
+#: mpulsweb/templates/documents/global_overview.mako:44
+#: mpulsweb/templates/documents/global_overview.mako:60
+#: mpulsweb/templates/documents/global_overview.mako:61
#: mpulsweb/templates/home/caseappointmentlist.mako:6
#: mpulsweb/templates/home/caseappointmentlist.mako:9
#: mpulsweb/templates/home/caseappointmentlist.mako:13
@@ -849,20 +845,18 @@
msgid "cm_overview_a_show"
msgstr "Anzeigen"
-#: mpulsweb/templates/administration/overview_user.mako:45
-#: mpulsweb/templates/administration/overview_user.mako:62
-#: mpulsweb/templates/administration/overview_usergroups.mako:35
-#: mpulsweb/templates/administration/overview_usergroups.mako:44
+#: mpulsweb/templates/administration/overview_user.mako:50
+#: mpulsweb/templates/administration/overview_usergroups.mako:42
#: mpulsweb/templates/appointments/appointmentlist.mako:5
#: mpulsweb/templates/casemanagement/appointmentlist.mako:13
#: mpulsweb/templates/casemanagement/appointmentlist.mako:14
-#: mpulsweb/templates/casemanagement/caselist.mako:154
-#: mpulsweb/templates/casemanagement/caselist.mako:155
+#: mpulsweb/templates/casemanagement/caselist.mako:177
+#: mpulsweb/templates/casemanagement/caselist.mako:178
#: mpulsweb/templates/casemanagement/reminderlist.mako:7
#: mpulsweb/templates/documents/case_overview.mako:61
#: mpulsweb/templates/documents/case_overview.mako:62
-#: mpulsweb/templates/documents/global_overview.mako:42
-#: mpulsweb/templates/documents/global_overview.mako:54
+#: mpulsweb/templates/documents/global_overview.mako:46
+#: mpulsweb/templates/documents/global_overview.mako:63
msgid "cm_overview_a_delete"
msgstr "Löschen"
@@ -878,8 +872,8 @@
msgid "adm_overview_tbl_header_groupname"
msgstr "Benutzergruppenname"
-#: mpulsweb/templates/administration/overview_usergroups.mako:53
-#: mpulsweb/templates/casemanagement/caselist.mako:171
+#: mpulsweb/templates/administration/overview_usergroups.mako:49
+#: mpulsweb/templates/casemanagement/caselist.mako:194
msgid "cm_overview_tbl_no_data_found"
msgstr "Es wurden keine Datensätze gefunden."
@@ -982,7 +976,7 @@
msgid "adm_actions_link_editusergroup"
msgstr "In Bearbeitung nehmen"
-#: mpulsweb/templates/administration/show_usergroup.mako:52
+#: mpulsweb/templates/administration/show_usergroup.mako:47
msgid "group_has_no_member"
msgstr "Die Benutzergruppe hat keine Mitglieder"
@@ -1434,53 +1428,77 @@
msgid "cm_overview_tbl_header_accesstime"
msgstr "Aktualisiert"
+#: mpulsweb/templates/casemanagement/caselist.mako:62
+#: mpulsweb/templates/casemanagement/caselist.mako:63
+#, python-format
+msgid "Sorted by %s in ascending order"
+msgstr "Sortiert nach %s in aufsteigender Reihenfolge"
+
#: mpulsweb/templates/casemanagement/caselist.mako:66
+#: mpulsweb/templates/casemanagement/caselist.mako:67
+#| msgid "Sorte in ascending order"
+msgid "Sort in ascending order"
+msgstr "In aufsteigender Reihenfolge sortieren"
+
+#: mpulsweb/templates/casemanagement/caselist.mako:76
+#: mpulsweb/templates/casemanagement/caselist.mako:77
+#, python-format
+msgid "Sorted by %s in descending order"
+msgstr "Sortiert nach %s in absteigender Reihenfolge"
+
+#: mpulsweb/templates/casemanagement/caselist.mako:80
+#: mpulsweb/templates/casemanagement/caselist.mako:81
+#| msgid "Sorte in descending order"
+msgid "Sort in descending order"
+msgstr "In absteigender Reihenfolge sortieren"
+
+#: mpulsweb/templates/casemanagement/caselist.mako:89
msgid "cm_overview_tbl_header_status"
msgstr "Status"
-#: mpulsweb/templates/casemanagement/caselist.mako:69
+#: mpulsweb/templates/casemanagement/caselist.mako:92
msgid "cm_overview_tbl_header_actions"
msgstr "Aktionen"
-#: mpulsweb/templates/casemanagement/caselist.mako:94
-#: mpulsweb/templates/casemanagement/caselist.mako:95
+#: mpulsweb/templates/casemanagement/caselist.mako:117
+#: mpulsweb/templates/casemanagement/caselist.mako:118
msgid "cm_overview_img_editor"
msgstr "Bearbeiter"
-#: mpulsweb/templates/casemanagement/caselist.mako:98
-#: mpulsweb/templates/casemanagement/caselist.mako:99
+#: mpulsweb/templates/casemanagement/caselist.mako:121
+#: mpulsweb/templates/casemanagement/caselist.mako:122
msgid "cm_overview_img_standin"
msgstr "Vertreter"
-#: mpulsweb/templates/casemanagement/caselist.mako:108
-#: mpulsweb/templates/casemanagement/caselist.mako:109
+#: mpulsweb/templates/casemanagement/caselist.mako:131
+#: mpulsweb/templates/casemanagement/caselist.mako:132
msgid "case_state_label_markdelete"
msgstr "Schwebend gelöscht"
-#: mpulsweb/templates/casemanagement/caselist.mako:112
-#: mpulsweb/templates/casemanagement/caselist.mako:113
+#: mpulsweb/templates/casemanagement/caselist.mako:135
+#: mpulsweb/templates/casemanagement/caselist.mako:136
msgid "case_state_label_markanonym"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/templates/casemanagement/caselist.mako:116
-#: mpulsweb/templates/casemanagement/caselist.mako:117
+#: mpulsweb/templates/casemanagement/caselist.mako:139
+#: mpulsweb/templates/casemanagement/caselist.mako:140
msgid "case_state_label_anonym"
msgstr "Anonymisiert"
-#: mpulsweb/templates/casemanagement/caselist.mako:132
-#: mpulsweb/templates/casemanagement/caselist.mako:133
+#: mpulsweb/templates/casemanagement/caselist.mako:155
+#: mpulsweb/templates/casemanagement/caselist.mako:156
msgid "Delete case"
msgstr "Fallakte löschen"
-#: mpulsweb/templates/casemanagement/caselist.mako:138
-#: mpulsweb/templates/casemanagement/caselist.mako:139
-#: mpulsweb/templates/casemanagement/caselist.mako:150
-#: mpulsweb/templates/casemanagement/caselist.mako:151
+#: mpulsweb/templates/casemanagement/caselist.mako:161
+#: mpulsweb/templates/casemanagement/caselist.mako:162
+#: mpulsweb/templates/casemanagement/caselist.mako:173
+#: mpulsweb/templates/casemanagement/caselist.mako:174
msgid "cm_overview_a_anonymize"
msgstr "Fallakte anonymisieren"
-#: mpulsweb/templates/casemanagement/caselist.mako:144
-#: mpulsweb/templates/casemanagement/caselist.mako:145
+#: mpulsweb/templates/casemanagement/caselist.mako:167
+#: mpulsweb/templates/casemanagement/caselist.mako:168
msgid "cm_overview_a_restore"
msgstr "Fallakte wiederherstellen"
@@ -1513,7 +1531,6 @@
msgstr "Fallaktenübersicht"
#: mpulsweb/templates/casemanagement/main.mako:19
-#| msgid "cm_info_phase"
msgid "cm_info_name"
msgstr "Name"
@@ -1527,7 +1544,6 @@
msgstr "Status"
#: mpulsweb/templates/casemanagement/main.mako:25
-#| msgid "cm_info_phase"
msgid "cm_info_nr"
msgstr "Nr."
@@ -1825,7 +1841,7 @@
msgstr "Aktionen"
#: mpulsweb/templates/documents/case_overview.mako:71
-#: mpulsweb/templates/documents/global_overview.mako:64
+#: mpulsweb/templates/documents/global_overview.mako:73
msgid "doc_overview_nofilesfound"
msgstr "Es wurden keine Dateien gefunden"
Modified: wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-04-23 09:01:53 UTC (rev 2505)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 0.1\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2010-04-22 15:24+0200\n"
+"POT-Creation-Date: 2010-04-23 10:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -337,15 +337,15 @@
msgid "Create new item"
msgstr ""
-#: mpulsweb/lib/renderer.py:1039
+#: mpulsweb/lib/renderer.py:1040
msgid "Formular errors"
msgstr ""
-#: mpulsweb/lib/renderer.py:1041
+#: mpulsweb/lib/renderer.py:1044
msgid "Formular warnings"
msgstr ""
-#: mpulsweb/lib/renderer.py:1071
+#: mpulsweb/lib/renderer.py:1076
msgid "Restore last valid value"
msgstr ""
@@ -362,8 +362,8 @@
msgstr ""
#: mpulsweb/model/case.py:1072 mpulsweb/model/case.py:1073
-#: mpulsweb/templates/casemanagement/caselist.mako:104
-#: mpulsweb/templates/casemanagement/caselist.mako:105
+#: mpulsweb/templates/casemanagement/caselist.mako:127
+#: mpulsweb/templates/casemanagement/caselist.mako:128
msgid "case_state_label_open"
msgstr ""
@@ -663,7 +663,6 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:33
#: mpulsweb/templates/administration/new_usergroup.mako:31
-#: mpulsweb/templates/administration/show_usergroup.mako:23
msgid "adm_form_legend_groupdata"
msgstr ""
@@ -671,12 +670,11 @@
#: mpulsweb/templates/administration/edit_usergroup.mako:39
#: mpulsweb/templates/administration/new_usergroup.mako:34
#: mpulsweb/templates/administration/new_usergroup.mako:37
-#: mpulsweb/templates/administration/show_usergroup.mako:26
msgid "adm_form_usergroup_name"
msgstr ""
#: mpulsweb/templates/administration/edit_usergroup.mako:44
-#: mpulsweb/templates/administration/show_usergroup.mako:30
+#: mpulsweb/templates/administration/show_usergroup.mako:25
msgid "adm_form_legende_groupmember"
msgstr ""
@@ -812,21 +810,19 @@
msgid "adm_overview_tbl_header_actions"
msgstr ""
-#: mpulsweb/templates/administration/overview_user.mako:43
-#: mpulsweb/templates/administration/overview_user.mako:60
-#: mpulsweb/templates/administration/overview_usergroups.mako:34
-#: mpulsweb/templates/administration/overview_usergroups.mako:43
+#: mpulsweb/templates/administration/overview_user.mako:48
+#: mpulsweb/templates/administration/overview_usergroups.mako:41
#: mpulsweb/templates/appointments/appointmentlist.mako:3
#: mpulsweb/templates/casemanagement/appointmentlist.mako:6
#: mpulsweb/templates/casemanagement/appointmentlist.mako:7
-#: mpulsweb/templates/casemanagement/caselist.mako:125
-#: mpulsweb/templates/casemanagement/caselist.mako:126
+#: mpulsweb/templates/casemanagement/caselist.mako:148
+#: mpulsweb/templates/casemanagement/caselist.mako:149
#: mpulsweb/templates/casemanagement/reminderlist.mako:4
#: mpulsweb/templates/documents/case_overview.mako:57
-#: mpulsweb/templates/documents/global_overview.mako:39
-#: mpulsweb/templates/documents/global_overview.mako:40
-#: mpulsweb/templates/documents/global_overview.mako:51
-#: mpulsweb/templates/documents/global_overview.mako:52
+#: mpulsweb/templates/documents/global_overview.mako:43
+#: mpulsweb/templates/documents/global_overview.mako:44
+#: mpulsweb/templates/documents/global_overview.mako:60
+#: mpulsweb/templates/documents/global_overview.mako:61
#: mpulsweb/templates/home/caseappointmentlist.mako:6
#: mpulsweb/templates/home/caseappointmentlist.mako:9
#: mpulsweb/templates/home/caseappointmentlist.mako:13
@@ -835,20 +831,18 @@
msgid "cm_overview_a_show"
msgstr ""
-#: mpulsweb/templates/administration/overview_user.mako:45
-#: mpulsweb/templates/administration/overview_user.mako:62
-#: mpulsweb/templates/administration/overview_usergroups.mako:35
-#: mpulsweb/templates/administration/overview_usergroups.mako:44
+#: mpulsweb/templates/administration/overview_user.mako:50
+#: mpulsweb/templates/administration/overview_usergroups.mako:42
#: mpulsweb/templates/appointments/appointmentlist.mako:5
#: mpulsweb/templates/casemanagement/appointmentlist.mako:13
#: mpulsweb/templates/casemanagement/appointmentlist.mako:14
-#: mpulsweb/templates/casemanagement/caselist.mako:154
-#: mpulsweb/templates/casemanagement/caselist.mako:155
+#: mpulsweb/templates/casemanagement/caselist.mako:177
+#: mpulsweb/templates/casemanagement/caselist.mako:178
#: mpulsweb/templates/casemanagement/reminderlist.mako:7
#: mpulsweb/templates/documents/case_overview.mako:61
#: mpulsweb/templates/documents/case_overview.mako:62
-#: mpulsweb/templates/documents/global_overview.mako:42
-#: mpulsweb/templates/documents/global_overview.mako:54
+#: mpulsweb/templates/documents/global_overview.mako:46
+#: mpulsweb/templates/documents/global_overview.mako:63
msgid "cm_overview_a_delete"
msgstr ""
@@ -864,8 +858,8 @@
msgid "adm_overview_tbl_header_groupname"
msgstr ""
-#: mpulsweb/templates/administration/overview_usergroups.mako:53
-#: mpulsweb/templates/casemanagement/caselist.mako:171
+#: mpulsweb/templates/administration/overview_usergroups.mako:49
+#: mpulsweb/templates/casemanagement/caselist.mako:194
msgid "cm_overview_tbl_no_data_found"
msgstr ""
@@ -968,7 +962,7 @@
msgid "adm_actions_link_editusergroup"
msgstr ""
-#: mpulsweb/templates/administration/show_usergroup.mako:52
+#: mpulsweb/templates/administration/show_usergroup.mako:47
msgid "group_has_no_member"
msgstr ""
@@ -1274,11 +1268,11 @@
msgid "logout_p_login_again"
msgstr ""
-#: mpulsweb/templates/auth/main.mako:13 mpulsweb/templates/error/main.mako:13
+#: mpulsweb/templates/auth/main.mako:13
msgid "main_login_bmf_phrase"
msgstr ""
-#: mpulsweb/templates/auth/main.mako:35 mpulsweb/templates/error/main.mako:35
+#: mpulsweb/templates/auth/main.mako:35
msgid "main_login_formular_input_error"
msgstr ""
@@ -1291,7 +1285,7 @@
#: mpulsweb/templates/casebundle/dialogs/success_editor.mako:5
#: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:5
#: mpulsweb/templates/casebundle/dialogs/success_standin.mako:5
-#: mpulsweb/templates/casemanagement/main.mako:8
+#: mpulsweb/templates/casemanagement/main.mako:10
#: mpulsweb/templates/casemanagement/new.mako:6
#: mpulsweb/templates/casemanagement/overview.mako:6
#: mpulsweb/templates/casemanagement/dialogs/confirm.mako:5
@@ -1419,53 +1413,75 @@
msgid "cm_overview_tbl_header_accesstime"
msgstr ""
+#: mpulsweb/templates/casemanagement/caselist.mako:62
+#: mpulsweb/templates/casemanagement/caselist.mako:63
+#, python-format
+msgid "Sorted by %s in ascending order"
+msgstr ""
+
#: mpulsweb/templates/casemanagement/caselist.mako:66
+#: mpulsweb/templates/casemanagement/caselist.mako:67
+msgid "Sort in ascending order"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/caselist.mako:76
+#: mpulsweb/templates/casemanagement/caselist.mako:77
+#, python-format
+msgid "Sorted by %s in descending order"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/caselist.mako:80
+#: mpulsweb/templates/casemanagement/caselist.mako:81
+msgid "Sort in descending order"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/caselist.mako:89
msgid "cm_overview_tbl_header_status"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:69
+#: mpulsweb/templates/casemanagement/caselist.mako:92
msgid "cm_overview_tbl_header_actions"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:94
-#: mpulsweb/templates/casemanagement/caselist.mako:95
+#: mpulsweb/templates/casemanagement/caselist.mako:117
+#: mpulsweb/templates/casemanagement/caselist.mako:118
msgid "cm_overview_img_editor"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:98
-#: mpulsweb/templates/casemanagement/caselist.mako:99
+#: mpulsweb/templates/casemanagement/caselist.mako:121
+#: mpulsweb/templates/casemanagement/caselist.mako:122
msgid "cm_overview_img_standin"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:108
-#: mpulsweb/templates/casemanagement/caselist.mako:109
+#: mpulsweb/templates/casemanagement/caselist.mako:131
+#: mpulsweb/templates/casemanagement/caselist.mako:132
msgid "case_state_label_markdelete"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:112
-#: mpulsweb/templates/casemanagement/caselist.mako:113
+#: mpulsweb/templates/casemanagement/caselist.mako:135
+#: mpulsweb/templates/casemanagement/caselist.mako:136
msgid "case_state_label_markanonym"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:116
-#: mpulsweb/templates/casemanagement/caselist.mako:117
+#: mpulsweb/templates/casemanagement/caselist.mako:139
+#: mpulsweb/templates/casemanagement/caselist.mako:140
msgid "case_state_label_anonym"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:132
-#: mpulsweb/templates/casemanagement/caselist.mako:133
+#: mpulsweb/templates/casemanagement/caselist.mako:155
+#: mpulsweb/templates/casemanagement/caselist.mako:156
msgid "Delete case"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:138
-#: mpulsweb/templates/casemanagement/caselist.mako:139
-#: mpulsweb/templates/casemanagement/caselist.mako:150
-#: mpulsweb/templates/casemanagement/caselist.mako:151
+#: mpulsweb/templates/casemanagement/caselist.mako:161
+#: mpulsweb/templates/casemanagement/caselist.mako:162
+#: mpulsweb/templates/casemanagement/caselist.mako:173
+#: mpulsweb/templates/casemanagement/caselist.mako:174
msgid "cm_overview_a_anonymize"
msgstr ""
-#: mpulsweb/templates/casemanagement/caselist.mako:144
-#: mpulsweb/templates/casemanagement/caselist.mako:145
+#: mpulsweb/templates/casemanagement/caselist.mako:167
+#: mpulsweb/templates/casemanagement/caselist.mako:168
msgid "cm_overview_a_restore"
msgstr ""
@@ -1486,7 +1502,7 @@
msgid "cm_actions_link_printout"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:9
+#: mpulsweb/templates/casemanagement/main.mako:11
#: mpulsweb/templates/casemanagement/overview.mako:7
#: mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako:11
#: mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako:11
@@ -1497,89 +1513,97 @@
msgid "cm_np_overview"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:26
+#: mpulsweb/templates/casemanagement/main.mako:19
+msgid "cm_info_name"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/main.mako:22
#: mpulsweb/templates/phase/phase.mako:21
msgid "cm_info_phase"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:27
+#: mpulsweb/templates/casemanagement/main.mako:23
msgid "cm_info_status"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:35
-#: mpulsweb/templates/casemanagement/main.mako:71
+#: mpulsweb/templates/casemanagement/main.mako:25
+msgid "cm_info_nr"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/main.mako:32
+#: mpulsweb/templates/casemanagement/main.mako:68
msgid "cm_main_header_data_protection"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:42
-#: mpulsweb/templates/casemanagement/main.mako:76
+#: mpulsweb/templates/casemanagement/main.mako:39
+#: mpulsweb/templates/casemanagement/main.mako:73
msgid "cm_main_set_statement"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:48
-#: mpulsweb/templates/casemanagement/main.mako:82
+#: mpulsweb/templates/casemanagement/main.mako:45
+#: mpulsweb/templates/casemanagement/main.mako:79
msgid "cm_main_revoke_statement"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:55
-#: mpulsweb/templates/casemanagement/main.mako:89
-#: mpulsweb/templates/casemanagement/main.mako:103
-#: mpulsweb/templates/casemanagement/main.mako:105
-#: mpulsweb/templates/casemanagement/main.mako:111
-#: mpulsweb/templates/casemanagement/main.mako:113
+#: mpulsweb/templates/casemanagement/main.mako:52
+#: mpulsweb/templates/casemanagement/main.mako:86
+#: mpulsweb/templates/casemanagement/main.mako:100
+#: mpulsweb/templates/casemanagement/main.mako:102
+#: mpulsweb/templates/casemanagement/main.mako:108
+#: mpulsweb/templates/casemanagement/main.mako:110
msgid "cm_main_anonymize_case"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:60
-#: mpulsweb/templates/casemanagement/main.mako:94
-#: mpulsweb/templates/casemanagement/main.mako:104
-#: mpulsweb/templates/casemanagement/main.mako:112
+#: mpulsweb/templates/casemanagement/main.mako:57
+#: mpulsweb/templates/casemanagement/main.mako:91
+#: mpulsweb/templates/casemanagement/main.mako:101
+#: mpulsweb/templates/casemanagement/main.mako:109
msgid "statement_list_statement"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:130
+#: mpulsweb/templates/casemanagement/main.mako:127
msgid "cm_menu_header_cases"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:135
+#: mpulsweb/templates/casemanagement/main.mako:132
msgid "cm_menu_link_backtooverview"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:136
+#: mpulsweb/templates/casemanagement/main.mako:133
msgid "cm_menu_link_print"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:138
+#: mpulsweb/templates/casemanagement/main.mako:135
msgid "cm_menu_link_create_reminder"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:145
+#: mpulsweb/templates/casemanagement/main.mako:142
msgid "cm_menu_header_seperator"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:151
+#: mpulsweb/templates/casemanagement/main.mako:148
msgid "cm_menu_link_digest"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:158
+#: mpulsweb/templates/casemanagement/main.mako:155
#: mpulsweb/templates/phase/phase.mako:7 mpulsweb/templates/phase/phase.mako:14
#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:7
msgid "case_cm_phase"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:164
+#: mpulsweb/templates/casemanagement/main.mako:161
msgid "cm_menu_link_organisation"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:171
+#: mpulsweb/templates/casemanagement/main.mako:168
msgid "cm_menu_link_appointment"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:187
+#: mpulsweb/templates/casemanagement/main.mako:184
msgid "cm_menu_link_documents"
msgstr ""
-#: mpulsweb/templates/casemanagement/main.mako:196
+#: mpulsweb/templates/casemanagement/main.mako:193
msgid "cm_menu_header_structure"
msgstr ""
@@ -1722,12 +1746,10 @@
msgstr ""
#: mpulsweb/templates/dialogs/confirm.mako:6
-#: mpulsweb/templates/dialogs/confirm_main.mako:7
msgid "dialog_header_confirm_option_yes"
msgstr ""
#: mpulsweb/templates/dialogs/confirm.mako:7
-#: mpulsweb/templates/dialogs/confirm_main.mako:8
msgid "dialog_header_confirm_option_no"
msgstr ""
@@ -1801,7 +1823,7 @@
msgstr ""
#: mpulsweb/templates/documents/case_overview.mako:71
-#: mpulsweb/templates/documents/global_overview.mako:64
+#: mpulsweb/templates/documents/global_overview.mako:73
msgid "doc_overview_nofilesfound"
msgstr ""
Added: wasko/branches/2.0/mpulsweb/public/images/icons/sort_asc_active.png
===================================================================
(Binary files differ)
Property changes on: wasko/branches/2.0/mpulsweb/public/images/icons/sort_asc_active.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: wasko/branches/2.0/mpulsweb/public/images/icons/sort_desc_active.png
===================================================================
(Binary files differ)
Property changes on: wasko/branches/2.0/mpulsweb/public/images/icons/sort_desc_active.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc.svg
===================================================================
--- wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc.svg 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc.svg 2010-04-23 09:01:53 UTC (rev 2505)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="141.75598"
+ height="122.89825"
+ id="svg2482"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ inkscape:export-filename="/home/roland/Desktop/test.png"
+ inkscape:export-xdpi="6.5908184"
+ inkscape:export-ydpi="6.5908184"
+ sodipodi:docname="sort_asc.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2484">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2490" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.49497475"
+ inkscape:cx="-108.04726"
+ inkscape:cy="82.826531"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="991"
+ inkscape:window-height="679"
+ inkscape:window-x="533"
+ inkscape:window-y="213" />
+ <metadata
+ id="metadata2487">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-161.45709,-354.40363)">
+ <path
+ sodipodi:type="star"
+ style="fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path2492"
+ sodipodi:sides="3"
+ sodipodi:cx="232.33508"
+ sodipodi:cy="436.16913"
+ sodipodi:r1="81.265503"
+ sodipodi:r2="40.632751"
+ sodipodi:arg1="0.52359878"
+ sodipodi:arg2="1.5707963"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 302.71307,476.80188 L 232.33508,476.80188 L 161.95709,476.80188 L 197.14609,415.85275 L 232.33508,354.90363 L 267.52408,415.85275 L 302.71307,476.80188 z" />
+ </g>
+</svg>
Added: wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc_active.svg
===================================================================
--- wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc_active.svg 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/public/images/svg/sort_asc_active.svg 2010-04-23 09:01:53 UTC (rev 2505)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="141.75598"
+ height="122.89825"
+ id="svg2482"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ inkscape:export-filename="/home/roland/Projekte/mpuls/mpulsweb/mpulsweb/public/images/icons/sort_asc_active.png"
+ inkscape:export-xdpi="6.5908184"
+ inkscape:export-ydpi="6.5908184"
+ sodipodi:docname="sort_asc_active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2484">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2490" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="91.064032"
+ inkscape:cy="7.8904865"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="991"
+ inkscape:window-height="679"
+ inkscape:window-x="586"
+ inkscape:window-y="139" />
+ <metadata
+ id="metadata2487">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-161.45709,-354.40363)">
+ <g
+ id="g3308">
+ <path
+ d="M 302.71307,476.80188 L 232.33508,476.80188 L 161.95709,476.80188 L 197.14609,415.85275 L 232.33508,354.90363 L 267.52408,415.85275 L 302.71307,476.80188 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="false"
+ sodipodi:arg2="1.5707963"
+ sodipodi:arg1="0.52359878"
+ sodipodi:r2="40.632751"
+ sodipodi:r1="81.265503"
+ sodipodi:cy="436.16913"
+ sodipodi:cx="232.33508"
+ sodipodi:sides="3"
+ id="path2492"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ sodipodi:type="star" />
+ <path
+ transform="matrix(0.6842286,0,0,0.6842286,73.364774,135.31441)"
+ sodipodi:type="star"
+ style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path3286"
+ sodipodi:sides="3"
+ sodipodi:cx="232.33508"
+ sodipodi:cy="436.16913"
+ sodipodi:r1="81.265503"
+ sodipodi:r2="40.632751"
+ sodipodi:arg1="0.52359878"
+ sodipodi:arg2="1.5707963"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 302.71307,476.80188 L 232.33508,476.80188 L 161.95709,476.80188 L 197.14609,415.85275 L 232.33508,354.90363 L 267.52408,415.85275 L 302.71307,476.80188 z" />
+ </g>
+ </g>
+</svg>
Added: wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc.svg
===================================================================
--- wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc.svg 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc.svg 2010-04-23 09:01:53 UTC (rev 2505)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="141.75598"
+ height="122.89825"
+ id="svg2482"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ inkscape:export-filename="/home/roland/Projekte/mpuls/mpulsweb/mpulsweb/public/images/icons/sort_desc.png"
+ inkscape:export-xdpi="6.5908184"
+ inkscape:export-ydpi="6.5908184"
+ sodipodi:docname="sort_desc.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2484">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2490" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="91.064032"
+ inkscape:cy="7.8904865"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="991"
+ inkscape:window-height="679"
+ inkscape:window-x="586"
+ inkscape:window-y="139" />
+ <metadata
+ id="metadata2487">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-161.45709,-354.40363)">
+ <path
+ sodipodi:type="star"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path2492"
+ sodipodi:sides="3"
+ sodipodi:cx="232.33508"
+ sodipodi:cy="436.16913"
+ sodipodi:r1="81.265503"
+ sodipodi:r2="40.632751"
+ sodipodi:arg1="0.52359878"
+ sodipodi:arg2="1.5707963"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 302.71307,476.80188 L 232.33508,476.80188 L 161.95709,476.80188 L 197.14609,415.85275 L 232.33508,354.90363 L 267.52408,415.85275 L 302.71307,476.80188 z"
+ transform="matrix(1,0,0,-1,0,831.70551)" />
+ <path
+ d="M 302.71307,476.80188 L 232.33508,476.80188 L 161.95709,476.80188 L 197.14609,415.85275 L 232.33508,354.90363 L 267.52408,415.85275 L 302.71307,476.80188 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="false"
+ sodipodi:arg2="1.5707963"
+ sodipodi:arg1="0.52359878"
+ sodipodi:r2="40.632751"
+ sodipodi:r1="81.265503"
+ sodipodi:cy="436.16913"
+ sodipodi:cx="232.33508"
+ sodipodi:sides="3"
+ id="path3286"
+ style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ sodipodi:type="star"
+ transform="matrix(0.6842286,0,0,-0.6842286,73.364774,696.3911)" />
+ </g>
+</svg>
Added: wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc_active.svg
===================================================================
--- wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc_active.svg 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/public/images/svg/sort_desc_active.svg 2010-04-23 09:01:53 UTC (rev 2505)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="141.75598"
+ height="122.89825"
+ id="svg2482"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ inkscape:export-filename="/home/roland/Projekte/mpuls/mpulsweb/mpulsweb/public/images/icons/sort_desc_active.png"
+ inkscape:export-xdpi="6.3940444"
+ inkscape:export-ydpi="6.3940444"
+ sodipodi:docname="sort_desc_active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2484">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2490" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="91.064032"
+ inkscape:cy="7.8904865"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="991"
+ inkscape:window-height="679"
+ inkscape:window-x="586"
+ inkscape:window-y="139" />
+ <metadata
+ id="metadata2487">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-161.45709,-354.40363)">
+ <g
+ id="g3308"
+ transform="matrix(1,0,0,-1,0,831.70551)">
+ <path
+ d="M 302.71307,476.80188 L 232.33508,476.80188 L 161.95709,476.80188 L 197.14609,415.85275 L 232.33508,354.90363 L 267.52408,415.85275 L 302.71307,476.80188 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="false"
+ sodipodi:arg2="1.5707963"
+ sodipodi:arg1="0.52359878"
+ sodipodi:r2="40.632751"
+ sodipodi:r1="81.265503"
+ sodipodi:cy="436.16913"
+ sodipodi:cx="232.33508"
+ sodipodi:sides="3"
+ id="path2492"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ sodipodi:type="star" />
+ <path
+ transform="matrix(0.6842286,0,0,0.6842286,73.364774,135.31441)"
+ sodipodi:type="star"
+ style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path3286"
+ sodipodi:sides="3"
+ sodipodi:cx="232.33508"
+ sodipodi:cy="436.16913"
+ sodipodi:r1="81.265503"
+ sodipodi:r2="40.632751"
+ sodipodi:arg1="0.52359878"
+ sodipodi:arg2="1.5707963"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 302.71307,476.80188 L 232.33508,476.80188 L 161.95709,476.80188 L 197.14609,415.85275 L 232.33508,354.90363 L 267.52408,415.85275 L 302.71307,476.80188 z" />
+ </g>
+ </g>
+</svg>
Modified: wasko/branches/2.0/mpulsweb/public/styles/all.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/all.css 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/public/styles/all.css 2010-04-23 09:01:53 UTC (rev 2505)
@@ -95,6 +95,17 @@
/* tr {width:50em}*/
tr {width:auto}
+.hovertable tr:hover{
+ background-color: #729fcf;
+}
+
+/* Links in hovertables should appear as normal text */
+.hovertable a{
+ color: black;
+ text-decoration: none;
+}
+
+
.table_checkbox {
width:1.6em;
}
Modified: wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/templates/administration/overview_user.mako 2010-04-23 09:01:53 UTC (rev 2505)
@@ -20,7 +20,7 @@
</div>
</div>
</div>
-<table>
+<table class="hovertable">
<tr>
<th class="table_header_h table_width_mid">${_('adm_overview_tbl_header_lastname')}</th>
<th class="table_header_h table_width_mid">${_('adm_overview_tbl_header_firstname')}</th>
@@ -32,8 +32,13 @@
% if user.login != 'adm':
% if idset==0:
<tr>
- <td>${user.last_name| F.NA}</td>
- <td>${user.first_name| F.NA}</td>
+ <% idset = 1 %>
+ % else:
+ <tr class="table_row_h">
+ <% idset = 0 %>
+ % endif
+ <td><a href="/administration/showUser/${user.id}">${user.last_name| F.NA}</a></td>
+ <td><a href="/administration/showUser/${user.id}">${user.first_name| F.NA}</a></td>
% if user.getRole() == 'Admin':
<td><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
% else:
@@ -46,25 +51,6 @@
% endif
</td>
</tr>
- <% idset = 1 %>
- % else:
- <tr>
- <td class="table_row_h">${user.last_name| F.NA}</td>
- <td class="table_row_h">${user.first_name| F.NA}</td>
- % if user.getRole() == 'Admin':
- <td class="table_row_h"><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
- % else:
- <td class="table_row_h"><img src="/images/icons/cm_grey_tag_width.gif" alt="Case-Managerin, Case-Manager" title="Case-Manager/in"></td>
- % endif
- <td class="table_row_h">
- <a href="/administration/showUser/${user.id}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- % if str(user.id) != str(session.get('USER_AUTHORIZED').id):
- <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
- % endif
- </td>
- </tr>
- <% idset = 0 %>
- % endif
% endif
% endfor
</table>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/templates/administration/overview_usergroups.mako 2010-04-23 09:01:53 UTC (rev 2505)
@@ -20,7 +20,7 @@
</div>
</div>
</div>
-<table>
+<table class="hovertable">
<tr>
<th class="table_header_h table_width_mid">${_('adm_overview_tbl_header_groupname')}</th>
<th class="table_header_h table_width_mid_s">${_('adm_overview_tbl_header_actions')}</th>
@@ -29,23 +29,19 @@
% for group in c.group_overview:
% if idset==0:
<tr>
- <td>${group.name| F.NA}</td>
+ <% idset = 1 %>
+ % else:
+ <tr class="table_row_h">
+ <% idset = 0 %>
+ % endif
<td>
- <a href="/administration/showUserGroup/${group.id}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- <a href="/administration/deleteUserGroup/${group.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="/administration/showUserGroup/${group.id}">${group.name| F.NA}</a>
</td>
- </tr>
- <% idset = 1 %>
- % else:
- <tr>
- <td class="table_row_h">${group.name| F.NA}</td>
- <td class="table_row_h">
+ <td>
<a href="/administration/showUserGroup/${group.id}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- <a href="/administration/deleteUserGroup/${group.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="/administration/deleteUserGroup/${group.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
</td>
</tr>
- <% idset = 0 %>
- % endif
% endfor
% if len(c.group_overview) <= 0:
<tr>
Modified: wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/templates/administration/show_usergroup.mako 2010-04-23 09:01:53 UTC (rev 2505)
@@ -14,7 +14,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li> <a href="/administration/editUserGroup/${c.group.id}"> ${_('adm_actions_link_editusergroup')}</a> </li>
+ <li><a href="/administration/editUserGroup/${c.group.id}"> ${_('adm_actions_link_editusergroup')}</a> </li>
<li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('menu_adm_link_usergroupoverview_back')}</a></li>
</ul>
</div>
Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako 2010-04-23 09:01:53 UTC (rev 2505)
@@ -56,9 +56,32 @@
% if h.hasRole(roles):
<th class="${style} table_header_h">${title}
<a href="/case_overview/overview?sort_field=${urlpart}&sort_order=asc">
- <img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a>
+ <img class = "sorticon"
+ %if c.sort_field == urlpart and c.sort_order == 'asc':
+ src = "/images/icons/sort_asc_active.png"
+ alt = "${_("Sorted by %s in ascending order") % title}"
+ title = "${_("Sorted by %s in ascending order") % title}"
+ %else:
+ src = "/images/icons/sort_asc.png"
+ alt = "${_("Sort in ascending order")}"
+ title = "${_("Sort in ascending order")}"
+ title = "${c.sort_field} - ${c.sort_order}"
+ %endif
+ width = "10"
+ height = "9"></a>
<a href="/case_overview/overview?sort_field=${urlpart}&sort_order=desc">
- <img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a>
+ <img class = "sorticon"
+ %if c.sort_field == urlpart and c.sort_order == 'desc':
+ src = "/images/icons/sort_desc_active.png"
+ alt = "${_("Sorted by %s in descending order") % title}"
+ title = "${_("Sorted by %s in descending order") % title}"
+ %else:
+ src = "/images/icons/sort_desc.png"
+ alt = "${_("Sort in descending order")}"
+ title = "${_("Sort in descending order")}"
+ %endif
+ width = "10"
+ height = "9"></a>
</th>
% endif
% endfor
@@ -76,7 +99,7 @@
% endif
% for title, urlpart, style, roles, get_value in fields:
% if h.hasRole(roles):
- <td>${get_value(case) | F.NA}</td>
+ <td><a href="/case/select/${case.id}/0/">${get_value(case) | F.NA}</a></td>
% endif
% endfor
<td>
@@ -156,7 +179,7 @@
% endif
</%def>
-<table>
+<table class="hovertable">
<tr>
${build_list_headers()}
</tr>
Modified: wasko/branches/2.0/mpulsweb/templates/documents/global_overview.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/documents/global_overview.mako 2010-04-23 08:47:34 UTC (rev 2504)
+++ wasko/branches/2.0/mpulsweb/templates/documents/global_overview.mako 2010-04-23 09:01:53 UTC (rev 2505)
@@ -12,16 +12,16 @@
% if h.hasRole(['admin_ka']):
<div id="modusfield">
<div class="actions">
- <ul>
- <li><a href="/document/globalUpload/"> ${_('doc_actions_link_new')}</a></li>
- </ul>
+ <ul>
+ <li><a href="/document/globalUpload/"> ${_('doc_actions_link_new')}</a></li>
+ </ul>
</div>
</div>
% endif
</div>
-<table>
+<table class="hovertable">
<tr class="table_header_h">
<th class="table_description">${_('doc_overview_tbl_header_filename')}</th>
<th class="number_field table_date">${_('doc_overview_tbl_header_filesize')}</th>
@@ -33,23 +33,32 @@
% for f in c.files:
% if idset==0:
<tr>
- <td>${ f.getName() | F.shorten, h}</td>
- <td class="number_field">${kb(f.size)} KB</td>
- <td class="table_action"><a href="/document/globalShow/${f.id}/${f.getName() | F.H}"
- target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
- title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- % if h.hasRole(['admin_ka']):
- <a href="/document/globalDelete/${f.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
- % endif
+ <td>
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">${ f.getName() | F.shorten, h}</a>
</td>
+ <td class="number_field">
+ ${kb(f.size)} KB
+ </td>
+ <td class="table_action">
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
+ title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ % if h.hasRole(['admin_ka']):
+ <a href="/document/globalDelete/${f.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ % endif
+ </td>
</tr>
<% idset = 1 %>
% else:
- <tr>
- <td class="table_row_h">${ f.getName() | F.shorten, h}</td>
- <td class="number_field table_row_h">${kb(f.size)} KB</td>
- <td class="table_row_h table_action"><a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
- title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <tr class="table_row_h">
+ <td>
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">${ f.getName() | F.shorten, h}</a>
+ </td>
+ <td class="number_field">
+ ${kb(f.size)} KB
+ </td>
+ <td class="table_action">
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
+ title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if h.hasRole(['admin_ka']):
<a href="/document/globalDelete/${f.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
% endif
More information about the Mpuls-commits
mailing list