Skip to content

Commit 8e3297d

Browse files
author
Richard Jones
committed
more tweakage of help display and style issues
1 parent a043309 commit 8e3297d

File tree

8 files changed

+72
-23
lines changed

8 files changed

+72
-23
lines changed

TODO.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ pending web: rewritten documentation (can come after the beta though so stuff
5151
is settled) ... including relevant file names in customisation doc
5252
pending admin: have roundup-admin "set" command be applicable to all items
5353
in a class
54+
pending dist: include the HTML in docs
5455

5556
bug: request.url is incorrect in cgi-bin environments
5657
bug: query editing not translated to new templating

doc/installation.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Installing Roundup
33
==================
44

5-
:Version: $Revision: 1.20 $
5+
:Version: $Revision: 1.21 $
66

77
.. contents::
88

@@ -180,6 +180,10 @@ My group now looks like this::
180180

181181
support:*:1002:jblaine,samh,geezer,mail,apache
182182

183+
The instance "db" directory should be chmod'ed g+sw so that the group can
184+
write to the database, and any new files created in the database will be owned
185+
by the group.
186+
183187
An alternative to the above is to create a new user who has the sole
184188
responsibility of running roundup. This user:
185189

@@ -189,7 +193,6 @@ responsibility of running roundup. This user:
189193
4. optionally has no login password so that nobody but the "root" user
190194
may actually login and play with the roundup setup.
191195

192-
193196
Internet Setup
194197
~~~~~~~~~~~~~~
195198

roundup/cgi/client.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: client.py,v 1.22 2002-09-09 03:20:09 richard Exp $
1+
# $Id: client.py,v 1.23 2002-09-09 04:43:10 richard Exp $
22

33
__doc__ = """
44
WWW request handler (also used in the stand-alone server).
@@ -13,7 +13,7 @@
1313
from roundup.cgi.templating import getTemplate, HTMLRequest, NoTemplate
1414
from roundup.cgi import cgitb
1515

16-
from PageTemplates import PageTemplate
16+
from roundup.cgi.PageTemplates import PageTemplate
1717

1818
class Unauthorised(ValueError):
1919
pass
@@ -285,7 +285,6 @@ def determine_context(self, dre=re.compile(r'([^\d]+)(\d+)')):
285285
if self.form.has_key(':template'):
286286
self.template = self.form[':template'].value
287287

288-
289288
# see if we were passed in a message
290289
if self.form.has_key(':ok_message'):
291290
self.ok_message.append(self.form[':ok_message'].value)

roundup/cgi/templating.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ def render(self, client, classname, request, **options):
168168
__traceback_supplement__ = (PageTemplate.PageTemplateTracebackSupplement, self)
169169

170170
if self._v_errors:
171-
raise PTRuntimeError, 'Page Template %s has errors.' % self.id
171+
raise PageTemplate.PTRuntimeError, \
172+
'Page Template %s has errors.' % self.id
172173

173174
# figure the context
174175
classname = classname or client.classname
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
<table tal:define="props python:request.form['properties'].value.split(',')"
2-
border=1 cellspacing=0 cellpadding=2>
3-
<tr>
4-
<th align=left tal:repeat="prop props" tal:content="prop"></th>
5-
</tr>
6-
<tr tal:repeat="item klass/list">
7-
<td align="left" valign="top" tal:repeat="prop props"
8-
tal:content="python:item[prop]"></td>
1+
<html>
2+
<head>
3+
<link rel="stylesheet" type="text/css" href="_file/style.css">
4+
</head>
5+
<body class="body" marginwidth="0" marginheight="0">
6+
7+
<table class="classhelp"
8+
tal:define="props python:request.form['properties'].value.split(',')">
9+
<tr><th tal:repeat="prop props" tal:content="prop"></th></tr>
10+
<tr tal:repeat="item context/list">
11+
<td tal:repeat="prop props" tal:content="python:item[prop]"></td>
912
</tr>
1013
</table>
1114

15+
</body>

roundup/templates/classic/html/issue.item

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<form method="POST" onSubmit="return submit_once()"
33
enctype="multipart/form-data">
44

5+
<input type="hidden" name=":template" value="item">
56
<input type="hidden" name=":required" value="title">
67

78
<table class="form">
@@ -35,9 +36,7 @@
3536

3637
<tr>
3738
<th nowrap>Assigned To</th>
38-
<td tal:content="structure context/assignedto/menu">
39-
assignedto menu
40-
</td>
39+
<td tal:content="structure context/assignedto/menu">assignedto menu</td>
4140
<td>&nbsp;</td>
4241
<td>&nbsp;</td>
4342
</tr>
@@ -68,14 +67,16 @@ changed <b>${context/activity}</b>.">activity info</span>
6867

6968
<tal:block tal:condition="context/id">
7069
<table class="messages" tal:condition="context/messages">
71-
<tr><th colspan=2 class="header">Messages</th></tr>
70+
<tr><th colspan=3 class="header">Messages</th></tr>
7271
<tal:block tal:repeat="msg context/messages/reverse">
7372
<tr>
73+
<th><a tal:attributes="href string:msg${msg/id}"
74+
tal:content="string:msg${msg/id}"></a></th>
7475
<th tal:content="string:Author: ${msg/author}">author</th>
7576
<th tal:content="string:Date: ${msg/date}">date</th>
7677
</tr>
7778
<tr>
78-
<td colspan="2"><pre tal:content="msg/content">content</pre></td>
79+
<td colspan="3"><pre tal:content="msg/content">content</pre></td>
7980
</tr>
8081
</tal:block>
8182
</table>

roundup/templates/classic/html/page

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</head>
1111
<body class="body" marginwidth="0" marginheight="0">
1212

13-
<table border=0 cellspacing=0 cellpadding=0>
13+
<table class="body">
1414

1515
<tr>
1616
<td class="page-header-left">&nbsp;</td>

roundup/templates/classic/html/style.css

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
/* main page styles */
2-
.body {
2+
body.body {
33
font-family: sans-serif, Arial, Helvetica;
44
color: #333333;
55
}
66
a:hover { text-decoration: underline; }
77
a:link { text-decoration: none; }
88
a { text-decoration: none; }
99

10-
.page-header-left {
10+
table.body {
11+
border: 0;
12+
padding: 0;
13+
border-spacing: 0px;
14+
border-collapse: separate;
15+
}
16+
17+
td.page-header-left {
1118
background-color: #cccc88;
1219
padding: 5px;
1320
}
1421

15-
.page-header-top {
22+
td.page-header-top {
1623
background-color: #cccc88;
1724
border-bottom: 1px solid #dddd99;
1825
padding: 5px;
@@ -81,14 +88,17 @@ table.form td.optional {
8188
font-weight: bold;
8289
font-style: italic;
8390
color: #333333;
91+
empty-cells: show;
8492
}
8593

8694
table.form td {
8795
color: #333333;
96+
empty-cells: show;
8897
}
8998

9099
table.form td.html {
91100
color: #777777;
101+
empty-cells: show;
92102
}
93103

94104
/* style for lists */
@@ -124,20 +134,24 @@ table.list td {
124134
}
125135

126136
table.list td.normal {
137+
empty-cells: show;
127138
}
128139

129140
table.list td.alt {
130141
background-color: #efefef;
142+
empty-cells: show;
131143
}
132144

133145
table.list td:first-child {
134146
border-left: 1px solid #404070;
135147
border-right: 1px solid #404070;
148+
empty-cells: show;
136149
}
137150

138151
table.list th:first-child {
139152
border-left: 1px solid #404070;
140153
border-right: 1px solid #404070;
154+
empty-cells: show;
141155
}
142156

143157

@@ -168,6 +182,7 @@ table.messages td {
168182
border-top: 1px solid #afafaf;
169183
border-bottom: 1px solid #afafaf;
170184
color: black;
185+
empty-cells: show;
171186
}
172187

173188
/* style for file displays */
@@ -193,6 +208,7 @@ table.files th {
193208

194209
table.files td {
195210
font-family: monospace;
211+
empty-cells: show;
196212
}
197213

198214
/* style for history displays */
@@ -221,6 +237,7 @@ table.history th {
221237
table.history td {
222238
font-size: 90%;
223239
vertical-align: top;
240+
empty-cells: show;
224241
}
225242

226243
/* style for "other" displays */
@@ -265,3 +282,26 @@ table.classlist th {
265282
text-align: left;
266283
}
267284

285+
286+
/* style for class help display */
287+
table.classhelp {
288+
border-spacing: 0px;
289+
border-collapse: separate;
290+
width: 100%;
291+
}
292+
293+
table.classhelp th {
294+
font-weight: bold;
295+
text-align: left;
296+
color: #707040;
297+
}
298+
299+
table.classhelp td {
300+
padding: 2 2 2 2;
301+
border: 1px solid black;
302+
text-align: left;
303+
vertical-align: top;
304+
empty-cells: show;
305+
}
306+
307+

0 commit comments

Comments
 (0)