[Mpuls-commits] r20 - in trunk: . waskaweb/i18n/de/LC_MESSAGES waskaweb/model waskaweb/public/styles waskaweb/templates/appointments/beta
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:05:38 CEST 2008
Author: thomas
Date: 2008-08-13 15:05:37 +0200 (Wed, 13 Aug 2008)
New Revision: 20
Modified:
trunk/ChangeLog.txt
trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
trunk/waskaweb/model/case.py
trunk/waskaweb/public/styles/color3.css
trunk/waskaweb/public/styles/ie6.css
trunk/waskaweb/public/styles/screen.css
trunk/waskaweb/templates/appointments/beta/show_3.mako
Log:
Load cd7ca5e17ce0 into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:05:15 UTC (rev 19)
+++ trunk/ChangeLog.txt 2008-08-13 13:05:37 UTC (rev 20)
@@ -1,5 +1,24 @@
2008-01-11 Torsten Irlaender <torsten.irlaender at intevation.de>
+ * waskaweb/public/styles/color3.css,
+ waskaweb/public/styles/ie6.css, waskaweb/public/styles/screen.css:
+ Fixed rendering error of teh formular structure in IE6+7
+
+2008-01-11 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/model/case.py: Added kundennummer to case oobject when
+ selecting a case from the overview. Fixed issue 212
+
+2008-01-11 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * waskaweb/model/case.py: convert kundennr to UTF-8. Fix for 211
+
+2008-01-11 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Tagged as Beta 13
+
+2008-01-11 Torsten Irlaender <torsten.irlaender at intevation.de>
+
* waskaweb/i18n/de/LC, SSAGES/waskaweb.po,
waskaweb/i18n/waskaweb.pot, waskaweb/public/styles/screen.css,
waskaweb/templates/administration/new_user_result.mako:
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:05:15 UTC (rev 19)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:05:37 UTC (rev 20)
@@ -194,7 +194,7 @@
#: waskaweb/templates/main.mako:173
msgid "footer_version"
-msgstr "10.01.08 | Beta 12"
+msgstr "11.01.2008 | Beta 13"
#: waskaweb/templates/main_login.mako:38
#: waskaweb/templates/start/responsible.mako:71
Modified: trunk/waskaweb/model/case.py
===================================================================
--- trunk/waskaweb/model/case.py 2008-08-13 13:05:15 UTC (rev 19)
+++ trunk/waskaweb/model/case.py 2008-08-13 13:05:37 UTC (rev 20)
@@ -59,7 +59,7 @@
ORDER by name_1"""
LOAD_CASE_DIGEST_SQL = """SELECT name_1, vorname_1, kundennummer, date_part('year', age(geburtsdatum::timestamp)) as alter, plz, strasse, wohnort, vorwahl, telefon_1, einverstaendniserklaerung from master_tbl_view WHERE id = %(id)s"""
-LOAD_CASE_SQL = """SELECT name_1, vorname_1, bearbeiter_id from master_tbl_view WHERE id = %(id)s"""
+LOAD_CASE_SQL = """SELECT name_1, vorname_1, bearbeiter_id, kundennummer from master_tbl_view WHERE id = %(id)s"""
DELETE_CASE_SQL = """select delete_master_ds(%(id)s)"""
@@ -252,6 +252,7 @@
case.id = id
case.last_name = unicode(str(result.get('name_1', '')), 'utf-8')
case.first_name = unicode(str(result.get('vorname_1', '')), 'utf-8')
+ case.knr = unicode(str(result.get('kundennummer', '')), 'utf-8')
case.editor = result.get('bearbeiter_id', None)
return case
@@ -261,8 +262,8 @@
case = Case()
case.id = id
case.first_name = unicode(str(first_name), 'utf-8')
- case.last_name = unicode(str(last_name), 'utf-8')
- case.knr = knr
+ case.last_name = unicode(str(last_name), 'utf-8')
+ case.knr = unicode(str(knr), 'utf-8')
return case
def importPdf(self, pdf):
Modified: trunk/waskaweb/public/styles/color3.css
===================================================================
--- trunk/waskaweb/public/styles/color3.css 2008-08-13 13:05:15 UTC (rev 19)
+++ trunk/waskaweb/public/styles/color3.css 2008-08-13 13:05:37 UTC (rev 20)
@@ -63,13 +63,14 @@
color: #fff;
}
+/*
.formpage span:hover {
background:#cfd1d1;
#background-image:url(../images/square.gif);
background-repeat:no-repeat;
background-position:1em 0.4em;
}
-
+*/
.menu .actions a:hover {
background:#cfd1d1;
background-image:url(../images/arrow.gif);
@@ -79,9 +80,10 @@
.formpage_highlight, .formpage span:hover.formpage_highlight, .formpage span:active {
background:#bec3c3;
- #background-image:url(../images/square.gif);
+ /*background-image:url(../images/square.gif);
background-repeat:no-repeat;
background-position:1em 0.4em;
+ */
}
/*--------------*/
Modified: trunk/waskaweb/public/styles/ie6.css
===================================================================
--- trunk/waskaweb/public/styles/ie6.css 2008-08-13 13:05:15 UTC (rev 19)
+++ trunk/waskaweb/public/styles/ie6.css 2008-08-13 13:05:37 UTC (rev 20)
@@ -29,20 +29,20 @@
div.right { margin-left:16em; }
-div#footer { width:99.6em; }
+div#footer { width:69.6em; }
/*----------*/
/* left menu*/
/*----------*/
-
+/*
.menu .formpage a { width:15.85em; }
.menu .formpage li a{ width:14.85em; }
.menu .formpage li li a { width:13.89em; }
-
+*/
/*-------*/
/* Login */
/*-------*/
Modified: trunk/waskaweb/public/styles/screen.css
===================================================================
--- trunk/waskaweb/public/styles/screen.css 2008-08-13 13:05:15 UTC (rev 19)
+++ trunk/waskaweb/public/styles/screen.css 2008-08-13 13:05:37 UTC (rev 20)
@@ -286,11 +286,11 @@
}
.menu .formpage ul {
- margin: 0.2em 0 0.2em 0.8em;
+ margin: 0.2em 0 0.2em 0.5em;
}
.menu .formpage ul ul {
- margin: 0em 0 0.2em 0.8em;
+ margin: 0em 0 0.2em 0.5em;
}
.menu .formpage li {
@@ -298,15 +298,17 @@
padding-left:0.1em;
}
+/*
.menu .formpage span, .menu .formpage li span, .menu .formpage li li span {
display:block;
text-decoration:none;
- padding-left:0.7em;
- #background-image:url(../images/square.gif);
+ padding-left:0.3em;
+ //background-image:url(../images/square.gif);
background-repeat:no-repeat;
background-position:1em 0.7em!important;
background-position:1em 0.5em;
}
+*/
/*------------*/
Modified: trunk/waskaweb/templates/appointments/beta/show_3.mako
===================================================================
--- trunk/waskaweb/templates/appointments/beta/show_3.mako 2008-08-13 13:05:15 UTC (rev 19)
+++ trunk/waskaweb/templates/appointments/beta/show_3.mako 2008-08-13 13:05:37 UTC (rev 20)
@@ -22,15 +22,15 @@
<!-- Fake table -->
<table>
<tbody><tr>
- <td class="label">Datum</td>
- <td>21.12.2007</td>
+ <td class="label table_header_v table_width_long">Datum</td>
+ <td class="table_row_v table_description">21.12.2007</td>
</tr>
<tr>
- <td class="label">Titel</td>
- <td>Weihnachtsfeier</td>
+ <td class="label table_header_v table_width_long">Titel</td>
+ <td class="table_row_v table_description">Weihnachtsfeier</td>
</tr>
<tr>
- <td class="label">Beschreibung</td>
- <td>Feier auf dem Weihnachtsmarkt. Treffpunkt: 16 Uhr am Haupteingang der Kompetenzagentur. </td>
+ <td class="label table_header_v table_width_long">Beschreibung</td>
+ <td class="table_row_v table_description">Feier auf dem Weihnachtsmarkt. Treffpunkt: 16 Uhr am Haupteingang der Kompetenzagentur. </td>
</tr>
</tbody></table>
More information about the Mpuls-commits
mailing list