Skip to content

Commit bfdc43d

Browse files
author
Richard Jones
committed
changed the default message list in issues to display the message body
. made backends.__init__ be more specific about which ImportErrors it really wants to ignore . fixed the example addresses in the templates to use correct example domains . cleaned out the template stylesheets, removing a bunch of junk that really wasn't necessary (font specs, styles never used) and added a style for message content
1 parent 722c210 commit bfdc43d

File tree

10 files changed

+77
-200
lines changed

10 files changed

+77
-200
lines changed

CHANGES.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Feature:
2828
behaviour. Setting them to 'yes' will add the author/recipients to the nosy
2929
on messages that create issues and followup messages.
3030
. reverting to dates for intervals > 2 months sucks
31+
. changed the default message list in issues to display the message body
3132

3233
Fixed:
3334
. stop sending blank (whitespace-only) notes
@@ -47,7 +48,12 @@ Fixed:
4748
. #449374 ] re-enable bsddb3 backend
4849
bsddb3 backend now works, reinstating
4950
. #551483 ] assignedto in Client.make_index_link
50-
51+
. made backends.__init__ be more specific about which ImportErrors it really
52+
wants to ignore
53+
. fixed the example addresses in the templates to use correct example domains
54+
. cleaned out the template stylesheets, removing a bunch of junk that really
55+
wasn't necessary (font specs, styles never used) and added a style for
56+
message content
5157

5258
2002-03-25 - 0.4.1
5359
Feature:

roundup/backends/__init__.py

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,50 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: __init__.py,v 1.11 2002-02-16 08:39:42 richard Exp $
18+
# $Id: __init__.py,v 1.12 2002-05-22 00:32:33 richard Exp $
1919

2020
__all__ = []
2121

2222
try:
23-
import sys
23+
import sys, anydbm
2424
if not hasattr(sys, 'version_info') or sys.version_info < (2,1,2):
25-
import anydbm, dumbdbm
25+
import dumbdbm
2626
# dumbdbm only works in python 2.1.2+
2727
assert anydbm._defaultmod != dumbdbm
2828
del anydbm
2929
del dumbdbm
30+
except AssertionError:
31+
print "WARNING: you should upgrade to python 2.1.3"
32+
except ImportError, message:
33+
if str(message) != 'No module named anydbm': raise
34+
else:
3035
import back_anydbm
3136
anydbm = back_anydbm
3237
__all__.append('anydbm')
33-
except AssertionError:
34-
pass
35-
except ImportError:
36-
pass
3738

3839
try:
40+
import bsddb
41+
except ImportError, message:
42+
if str(message) != 'No module named bsddb': raise
43+
else:
3944
import back_bsddb
4045
bsddb = back_bsddb
4146
__all__.append('bsddb')
42-
except ImportError:
43-
pass
4447

4548
try:
49+
import bsddb3
50+
except ImportError, message:
51+
if str(message) != 'No module named bsddb3': raise
52+
else:
4653
import back_bsddb3
4754
bsddb3 = back_bsddb3
4855
__all__.append('bsddb3')
49-
except ImportError:
50-
pass
5156

5257
#
5358
# $Log: not supported by cvs2svn $
59+
# Revision 1.11 2002/02/16 08:39:42 richard
60+
# . #516854 ] "My Issues" and redisplay
61+
#
5462
# Revision 1.10 2002/01/22 07:08:50 richard
5563
# I was certain I'd already done this (there's even a change note in
5664
# CHANGES)...
Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
<!-- $Id: msg.index,v 1.2 2001-07-29 04:07:37 richard Exp $-->
2-
<tr>
3-
<property name="date">
4-
<td><display call="link('date')"></td>
5-
</property>
6-
<property name="author">
7-
<td><display call="plain('author')"></td>
8-
</property>
9-
<property name="summary">
10-
<td><display call="plain('summary')"></td>
11-
</property>
1+
<!-- $Id: msg.index,v 1.3 2002-05-22 00:32:34 richard Exp $-->
2+
<tr class="row-hilite">
3+
<td><display call="link('date')"></td>
4+
<td><display call="plain('author')"></td>
5+
</tr>
6+
<tr class="msg-content">
7+
<td colspan=2><pre><display call="plain('content', escape=1)"></pre></td>
128
</tr>

roundup/templates/classic/html/msg.item

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
<!-- $Id: msg.item,v 1.2 2001-07-29 04:07:37 richard Exp $-->
1+
<!-- $Id: msg.item,v 1.3 2002-05-22 00:32:34 richard Exp $-->
22
<table border=0 cellspacing=0 cellpadding=2>
33

4-
<tr class="strong-header">
5-
<td colspan=2>Message Information</td>
6-
</td>
7-
84
<tr bgcolor="ffffea">
95
<td width=1% nowrap align=right><span class="form-label">Author</span></td>
106
<td class="form-text"><display call="plain('author')"></td>
@@ -22,7 +18,7 @@
2218

2319
<tr bgcolor="ffeaff">
2420
<td colspan=2 class="form-text">
25-
<pre><display call="plain('content')"></pre>
21+
<pre><display call="plain('content', escape=1)"></pre>
2622
</td>
2723
</tr>
2824

@@ -31,7 +27,7 @@
3127
<tr><td colspan=2><display call="list('files')"></td></tr>
3228
</property>
3329

34-
<tr class="strong-header"><td colspan=2><b>History</b></td><tr>
30+
<tr class="history-header"><td colspan=2><b>History</b></td><tr>
3531
<tr><td colspan=2><display call="history()"></td></tr>
3632

3733
</table>
Lines changed: 11 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
h1 {
2-
font-family: Verdana, Helvetica, sans-serif;
3-
font-size: 18pt;
4-
font-weight: bold;
5-
}
6-
7-
h2 {
8-
font-family: Verdana, Helvetica, sans-serif;
9-
font-size: 16pt;
10-
font-weight: bold;
11-
}
12-
13-
h3 {
14-
font-family: Verdana, Helvetica, sans-serif;
15-
font-size: 12pt;
16-
font-weight: bold;
17-
}
18-
191
a:hover {
202
font-family: Verdana, Helvetica, sans-serif;
213
text-decoration: underline;
@@ -36,32 +18,17 @@ a {
3618

3719
p {
3820
font-family: Verdana, Helvetica, sans-serif;
39-
font-size: 10pt;
4021
color: #333333;
4122
}
4223

4324
th {
4425
font-family: Verdana, Helvetica, sans-serif;
4526
font-weight: bold;
46-
font-size: 10pt;
4727
color: #333333;
4828
}
4929

5030
.form-help {
5131
font-family: Verdana, Helvetica, sans-serif;
52-
font-size: 10pt;
53-
color: #333333;
54-
}
55-
56-
.std-text {
57-
font-family: Verdana, Helvetica, sans-serif;
58-
font-size: 10pt;
59-
color: #333333;
60-
}
61-
62-
.tab-small {
63-
font-family: Verdana, Helvetica, sans-serif;
64-
font-size: 8pt;
6532
color: #333333;
6633
}
6734

@@ -73,57 +40,28 @@ th {
7340

7441
.strong-header {
7542
font-family: Verdana, Helvetica, sans-serif;
76-
font-size: 12pt;
7743
font-weight: bold;
7844
background-color: #000000;
7945
color: #ffffff;
8046
}
8147

82-
.msg-header {
83-
font-family: Verdana, Helvetica, sans-serif;
84-
font-size: 12pt;
85-
font-weight: bold;
86-
background-color: #EE71AC;
87-
color: #ffffff;
88-
}
89-
9048
.file-header {
9149
font-family: Verdana, Helvetica, sans-serif;
92-
font-size: 12pt;
9350
font-weight: bold;
9451
background-color: #41BE62;
9552
color: #ffffff;
9653
}
9754

9855
.history-header {
9956
font-family: Verdana, Helvetica, sans-serif;
100-
font-size: 12pt;
10157
font-weight: bold;
10258
background-color: #739DEE;
10359
color: #ffffff;
10460
}
10561

106-
.list-header {
107-
background-color: #aaccff;
108-
color: #000000;
109-
border: none;
110-
}
111-
112-
.list-item {
113-
font-family: Verdana, Helvetica, sans-serif;
114-
font-size: 10pt;
115-
}
116-
117-
.list-nav {
118-
font-family: Verdana, Helvetica, sans-serif;
119-
font-size: 10pt;
120-
font-weight: bold;
121-
}
122-
12362
.row-normal {
12463
background-color: #ffffff;
12564
border: none;
126-
12765
}
12866

12967
.row-hilite {
@@ -171,15 +109,20 @@ th {
171109
border: none;
172110
}
173111

174-
.section-bar {
175-
background-color: #707070;
112+
.msg-header {
113+
font-family: Verdana, Helvetica, sans-serif;
114+
font-weight: bold;
115+
background-color: #EE71AC;
176116
color: #ffffff;
177-
border: 1px solid #404040;
117+
}
118+
119+
.msg-content {
120+
font-family: monospace;
121+
background-color: #ffeaff;
122+
color: #000000;
178123
}
179124

180125
.system-msg {
181-
font-family: Verdana, Helvetica, sans-serif;
182-
font-size: 10pt;
183126
background-color: #ffffff;
184127
border: 1px solid #000000;
185128
margin-bottom: 6px;
@@ -190,41 +133,30 @@ th {
190133
}
191134

192135
.form-title {
193-
font-family: Verdana, Helvetica, sans-serif;
194136
font-weight: bold;
195-
font-size: 12pt;
196137
color: #333333;
197138
}
198139

199140
.form-label {
200-
font-family: Verdana, Helvetica, sans-serif;
201141
font-weight: bold;
202-
font-size: 10pt;
203142
color: #333333;
204143
}
205144

206145
.form-optional {
207-
font-family: Verdana, Helvetica, sans-serif;
208146
font-weight: bold;
209147
font-style: italic;
210-
font-size: 10pt;
211148
color: #333333;
212149
}
213150

214151
.form-element {
215-
font-family: Verdana, Helvetica, aans-serif;
216-
font-size: 10pt;
217152
color: #000000;
218153
}
219154

220155
.form-text {
221-
font-family: Verdana, Helvetica, sans-serif;
222-
font-size: 10pt;
223156
color: #333333;
224157
}
225158

226159
.form-mono {
227160
font-family: monospace;
228-
font-size: 12px;
229-
text-decoration: none;
230161
}
162+

roundup/templates/classic/instance_config.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: instance_config.py,v 1.16 2002-05-21 06:05:54 richard Exp $
18+
# $Id: instance_config.py,v 1.17 2002-05-22 00:32:33 richard Exp $
1919

2020
MAIL_DOMAIN=MAILHOST=HTTP_HOST=None
2121
HTTP_PORT=0
@@ -36,7 +36,7 @@
3636

3737
# The domain name used for email addresses.
3838
if not MAIL_DOMAIN:
39-
MAIL_DOMAIN = 'fill.me.in.'
39+
MAIL_DOMAIN = 'your.tracker.email.domain.example'
4040

4141
# the next two are only used for the standalone HTTP server.
4242
if not HTTP_HOST:
@@ -57,7 +57,7 @@
5757
ISSUE_TRACKER_EMAIL = 'issue_tracker@%s'%MAIL_DOMAIN
5858

5959
# The web address that the instance is viewable at
60-
ISSUE_TRACKER_WEB = 'http://some.useful.url/'
60+
ISSUE_TRACKER_WEB = 'http://your.tracker.url.example/'
6161

6262
# The email address that roundup will complain to if it runs into trouble
6363
ADMIN_EMAIL = 'roundup-admin@%s'%MAIL_DOMAIN
@@ -162,6 +162,9 @@
162162

163163
#
164164
# $Log: not supported by cvs2svn $
165+
# Revision 1.16 2002/05/21 06:05:54 richard
166+
# . #551483 ] assignedto in Client.make_index_link
167+
#
165168
# Revision 1.15 2002/05/02 07:56:34 richard
166169
# . added option to automatically add the authors and recipients of messages
167170
# to the nosy lists with the options ADD_AUTHOR_TO_NOSY (default 'new') and
Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
<!-- $Id: msg.index,v 1.3 2001-09-27 06:45:58 richard Exp $-->
1+
<!-- $Id: msg.index,v 1.4 2002-05-22 00:32:34 richard Exp $-->
22
<tr class="row-hilite">
3-
<property name="date">
4-
<td><display call="link('date')"></td>
5-
</property>
6-
<property name="author">
7-
<td><display call="plain('author')"></td>
8-
</property>
3+
<td><display call="link('date')"></td>
4+
<td><display call="plain('author')"></td>
95
</tr>
10-
<tr bgcolor="ffeaff">
6+
<tr class="msg-content">
117
<td colspan=2><pre><display call="plain('content', escape=1)"></pre></td>
128
</tr>

roundup/templates/extended/html/msg.item

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Id: msg.item,v 1.1 2001-07-23 04:21:20 richard Exp $-->
1+
<!-- $Id: msg.item,v 1.2 2002-05-22 00:32:34 richard Exp $-->
22
<table border=0 cellspacing=0 cellpadding=2>
33

44
<tr class="strong-header">
@@ -22,7 +22,7 @@
2222

2323
<tr bgcolor="ffeaff">
2424
<td colspan=2 class="form-text">
25-
<pre><display call="plain('content')"></pre>
25+
<pre><display call="plain('content', escape=1)"></pre>
2626
</td>
2727
</tr>
2828

0 commit comments

Comments
 (0)