Skip to content

Commit f72a8ce

Browse files
author
Richard Jones
committed
merge from HEAD
1 parent 00c0857 commit f72a8ce

File tree

5 files changed

+69
-7
lines changed

5 files changed

+69
-7
lines changed

‎roundup/admin.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1717
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1818
#
19-
# $Id: admin.py,v 1.85.2.8 2005-06-24 05:34:15 richard Exp $
19+
# $Id: admin.py,v 1.85.2.9 2005-07-05 06:28:35 richard Exp $
2020

2121
'''Administration commands for maintaining Roundup trackers.
2222
'''
@@ -407,6 +407,7 @@ def do_install(self, tracker_home, args):
407407
init.write_select_db(tracker_home, backend)
408408

409409
print _("""
410+
---------------------------------------------------------------------------
410411
You should now edit the tracker configuration file:
411412
%(config_file)s""") % {"config_file": config_ini_file}
412413

@@ -427,6 +428,10 @@ def do_install(self, tracker_home, args):
427428
You may also change the database initialisation file:
428429
%(database_init_file)s
429430
... see the documentation on customizing for more information.
431+
432+
You MUST run the "roundup-admin initialise" command once you've performed
433+
the above steps.
434+
---------------------------------------------------------------------------
430435
""") % {
431436
'database_config_file': os.path.join(tracker_home, 'schema.py'),
432437
'database_init_file': os.path.join(tracker_home, 'initial_data.py'),

‎templates/classic/html/issue.search.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
</tr>
156156

157157
<tr>
158-
<th>No Sort or group:</th>
158+
<th i18n:translate="">No Sort or group:</th>
159159
<td>&nbsp;</td>
160160
<td>&nbsp;</td>
161161
<td><input type="radio" name="@sort" value=""></td>

‎templates/classic/html/page.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
2828
<input type="hidden" name="@sort" value="activity"/>
2929
<input type="hidden" name="@group" value="priority"/>
3030
<input id="search-text" name="@search_text" size="10"/>
31-
<input type="submit" id="submit" name="submit" value="Search"/>
31+
<input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value"/>
3232
</form>
3333
</div>
3434
</td>

‎templates/minimal/html/page.html‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,27 @@
1111
</script>
1212

1313
</head>
14-
<body class="body" marginwidth="0" marginheight="0">
14+
<body class="body">
1515

1616
<table class="body">
1717

1818
<tr>
1919
<td class="page-header-left">&nbsp;</td>
20-
<td class="page-header-top"><h2><span metal:define-slot="body_title">body title</span></h2></td>
20+
<td class="page-header-top">
21+
<div id="body-title">
22+
<h2><span metal:define-slot="body_title">body title</span></h2>
23+
</div>
24+
<div id="searchbox">
25+
<form method="GET" action="issue">
26+
<input type="hidden" name="@columns"
27+
value="id,activity,title,creator,assignedto,status"/>
28+
<input type="hidden" name="@sort" value="activity"/>
29+
<input type="hidden" name="@group" value="priority"/>
30+
<input id="search-text" name="@search_text" size="10"/>
31+
<input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value"/>
32+
</form>
33+
</div>
34+
</td>
2135
</tr>
2236

2337
<tr>

‎templates/minimal/html/style.css‎

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ body.body {
66
margin: 0;
77
}
88
a[href]:hover {
9-
background-color: white;
109
color:blue;
1110
text-decoration: underline;
1211
}
1312
a[href], a[href]:link {
14-
background-color: white;
1513
color:blue;
1614
text-decoration: none;
1715
}
@@ -40,12 +38,35 @@ td.sidebar {
4038
td.sidebar {
4139
display: none;
4240
}
41+
.index-controls {
42+
display: none;
43+
}
44+
#searchbox {
45+
display: none;
46+
}
4347
}
4448

4549
td.page-header-top {
4650
padding: 5px;
4751
border-bottom: 1px solid #444;
4852
}
53+
#searchbox {
54+
float: right;
55+
}
56+
57+
div#body-title {
58+
float: left;
59+
}
60+
61+
62+
div#searchbox {
63+
float: right;
64+
padding-top: 1em;
65+
}
66+
67+
div#searchbox input#search-text {
68+
width: 10em;
69+
}
4970

5071
form {
5172
margin: 0;
@@ -69,6 +90,12 @@ td.sidebar p.userblock {
6990
background-color: #eef;
7091
}
7192

93+
.form-small {
94+
padding: 0;
95+
font-size: 75%;
96+
}
97+
98+
7299
td.content {
73100
padding: 1px 5px 1px 5px;
74101
vertical-align: top;
@@ -91,6 +118,22 @@ p.error-message {
91118
color: white;
92119
font-weight: bold;
93120
}
121+
p.error-message a[href] {
122+
color: white;
123+
text-decoration: underline;
124+
}
125+
126+
127+
/* style for search forms */
128+
ul.search-checkboxes {
129+
display: inline;
130+
padding: none;
131+
list-style: none;
132+
}
133+
ul.search-checkboxes > li {
134+
display: inline;
135+
padding-right: .5em;
136+
}
94137

95138

96139
/* style for forms */

0 commit comments

Comments
 (0)