Attachment 'well_formed_1.diff'
Download 1 # HG changeset patch
2 # User Stefano Zacchiroli <zack@bononia.it>
3 # Node ID 0936388f00d80f0ac9c3e71cddf3ffb8c73cf593
4 # Parent 0f95d353d15dd56a300b66ea09d68ac061f12eac
5 terminate all generated <input> tags with />
6
7 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/Page.py
8 --- a/MoinMoin/Page.py Fri Jun 16 11:39:39 2006 +0200
9 +++ b/MoinMoin/Page.py Fri Jun 16 11:40:48 2006 +0200
10 @@ -1226,7 +1226,7 @@ class Page:
11 # user-defined form preview?
12 # TODO: check if this is also an RTL form - then add ui_lang_attr
13 if pi_formtext:
14 - pi_formtext.append('<input type="hidden" name="fieldlist" value="%s">\n' %
15 + pi_formtext.append('<input type="hidden" name="fieldlist" value="%s" />\n' %
16 "|".join(pi_formfields))
17 pi_formtext.append('</form></table>\n')
18 pi_formtext.append(_(
19 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/PageEditor.py
20 --- a/MoinMoin/PageEditor.py Fri Jun 16 11:39:39 2006 +0200
21 +++ b/MoinMoin/PageEditor.py Fri Jun 16 11:40:48 2006 +0200
22 @@ -299,7 +299,7 @@ Please review the page and save then. Do
23 self.request.write(unicode(html.INPUT(type="hidden", name="action", value="edit")))
24
25 # Send revision of the page our edit is based on
26 - self.request.write('<input type="hidden" name="rev" value="%d">' % (rev,))
27 + self.request.write('<input type="hidden" name="rev" value="%d" />' % (rev,))
28
29 # Save backto in a hidden input
30 backto = form.get('backto', [None])[0]
31 @@ -308,7 +308,7 @@ Please review the page and save then. Do
32
33 # button bar
34 button_spellcheck = (SpellCheck and
35 - '<input class="button" type="submit" name="button_spellcheck" value="%s" onClick="flgChange = false;">'
36 + '<input class="button" type="submit" name="button_spellcheck" value="%s" onClick="flgChange = false;" />'
37 % _('Check Spelling')) or ''
38
39 save_button_text = _('Save Changes')
40 @@ -325,19 +325,19 @@ If you don't want that, hit '''%(cancel_
41
42
43 self.request.write('''
44 -<input class="button" type="submit" name="button_save" value="%s" onClick="flgChange = false;">
45 -<input class="button" type="submit" name="button_preview" value="%s" onClick="flgChange = false;">
46 +<input class="button" type="submit" name="button_save" value="%s" onClick="flgChange = false;" />
47 +<input class="button" type="submit" name="button_preview" value="%s" onClick="flgChange = false;" />
48 ''' % (save_button_text, _('Preview'),))
49
50 if not (self.request.cfg.editor_force and self.request.cfg.editor_default == 'text'):
51 self.request.write('''
52 -<input id="switch2gui" style="display: none;" class="button" type="submit" name="button_switch" value="%s">
53 +<input id="switch2gui" style="display: none;" class="button" type="submit" name="button_switch" value="%s" />
54 ''' % (_('GUI Mode'),))
55
56 self.request.write('''
57 %s
58 -<input class="button" type="submit" name="button_cancel" value="%s">
59 -<input type="hidden" name="editor" value="text">
60 +<input class="button" type="submit" name="button_cancel" value="%s" />
61 +<input type="hidden" name="editor" value="text" />
62 ''' % (button_spellcheck, cancel_button_text,))
63
64 # Add textarea with page text
65 @@ -364,7 +364,7 @@ If you don't want that, hit '''%(cancel_
66 self.request.write("<p>")
67 self.request.write(_("Comment:"),
68 ' <input id="editor-comment" type="text" name="comment" value="%s" maxlength="80"'
69 - ' onChange="flgChange = true;" onKeyPress="flgChange = true;">' % (
70 + ' onChange="flgChange = true;" onKeyPress="flgChange = true;" />' % (
71 wikiutil.escape(kw.get('comment', ''), 1), ))
72 self.request.write("</p>")
73
74 @@ -382,7 +382,7 @@ If you don't want that, hit '''%(cancel_
75 if self.cfg.mail_enabled:
76 self.request.write('''
77
78 -<input type="checkbox" name="trivial" id="chktrivial" value="1" %(checked)s>
79 +<input type="checkbox" name="trivial" id="chktrivial" value="1" %(checked)s />
80 <label for="chktrivial">%(label)s</label> ''' % {
81 'checked': ('', 'checked')[form.get('trivial',['0'])[0] == '1'],
82 'label': _("Trivial change"),
83 @@ -390,7 +390,7 @@ If you don't want that, hit '''%(cancel_
84
85 self.request.write('''
86
87 -<input type="checkbox" name="rstrip" id="chkrstrip" value="1" %(checked)s>
88 +<input type="checkbox" name="rstrip" id="chkrstrip" value="1" %(checked)s />
89 <label for="chkrstrip">%(label)s</label>
90 ''' % {
91 'checked': ('', 'checked')[form.get('rstrip',['0'])[0] == '1'],
92 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/PageGraphicalEditor.py
93 --- a/MoinMoin/PageGraphicalEditor.py Fri Jun 16 11:39:39 2006 +0200
94 +++ b/MoinMoin/PageGraphicalEditor.py Fri Jun 16 11:40:48 2006 +0200
95 @@ -206,7 +206,7 @@ Please review the page and save then. Do
96 self.request.write(unicode(html.INPUT(type="hidden", name="action", value="edit")))
97
98 # Send revision of the page our edit is based on
99 - self.request.write('<input type="hidden" name="rev" value="%d">' % (rev,))
100 + self.request.write('<input type="hidden" name="rev" value="%d" />' % (rev,))
101
102 # Save backto in a hidden input
103 backto = form.get('backto', [None])[0]
104 @@ -215,7 +215,7 @@ Please review the page and save then. Do
105
106 # button bar
107 button_spellcheck = (SpellCheck and
108 - '<input class="button" type="submit" name="button_spellcheck" value="%s">'
109 + '<input class="button" type="submit" name="button_spellcheck" value="%s" />'
110 % _('Check Spelling')) or ''
111
112 save_button_text = _('Save Changes')
113 @@ -231,12 +231,12 @@ If you don't want that, hit '''%(cancel_
114 }, '</em></p>')
115
116 self.request.write('''
117 -<input class="button" type="submit" name="button_save" value="%s">
118 -<input class="button" type="submit" name="button_preview" value="%s">
119 -<input class="button" type="submit" name="button_switch" value="%s">
120 +<input class="button" type="submit" name="button_save" value="%s" />
121 +<input class="button" type="submit" name="button_preview" value="%s" />
122 +<input class="button" type="submit" name="button_switch" value="%s" />
123 %s
124 -<input class="button" type="submit" name="button_cancel" value="%s">
125 -<input type="hidden" name="editor" value="gui">
126 +<input class="button" type="submit" name="button_cancel" value="%s" />
127 +<input type="hidden" name="editor" value="gui" />
128 ''' % (save_button_text, _('Preview'), _('Text mode'), button_spellcheck, cancel_button_text,))
129
130 self.sendconfirmleaving() # TODO update state of flgChange to make this work, see PageEditor
131 @@ -295,7 +295,7 @@ If you don't want that, hit '''%(cancel_
132 """)
133 self.request.write("<p>")
134 self.request.write(_("Comment:"),
135 - ' <input id="editor-comment" type="text" name="comment" value="%s" maxlength="80">' % (
136 + ' <input id="editor-comment" type="text" name="comment" value="%s" maxlength="80" />' % (
137 wikiutil.escape(kw.get('comment', ''), 1), ))
138 self.request.write("</p>")
139
140 @@ -312,7 +312,7 @@ If you don't want that, hit '''%(cancel_
141 if self.cfg.mail_enabled:
142 self.request.write('''
143
144 -<input type="checkbox" name="trivial" id="chktrivial" value="1" %(checked)s>
145 +<input type="checkbox" name="trivial" id="chktrivial" value="1" %(checked)s />
146 <label for="chktrivial">%(label)s</label> ''' % {
147 'checked': ('', 'checked')[form.get('trivial',['0'])[0] == '1'],
148 'label': _("Trivial change"),
149 @@ -320,7 +320,7 @@ If you don't want that, hit '''%(cancel_
150
151 self.request.write('''
152
153 -<input type="checkbox" name="rstrip" id="chkrstrip" value="1" %(checked)s>
154 +<input type="checkbox" name="rstrip" id="chkrstrip" value="1" %(checked)s />
155 <label for="chkrstrip">%(label)s</label>
156 </p> ''' % {
157 'checked': ('', 'checked')[form.get('rstrip',['0'])[0] == '1'],
158 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/AttachFile.py
159 --- a/MoinMoin/action/AttachFile.py Fri Jun 16 11:39:39 2006 +0200
160 +++ b/MoinMoin/action/AttachFile.py Fri Jun 16 11:40:48 2006 +0200
161 @@ -450,14 +450,14 @@ Otherwise, if "Rename to" is left blank,
162 <form action="%(baseurl)s/%(pagename)s" method="POST" enctype="multipart/form-data">
163 <dl>
164 <dt>%(upload_label_file)s</dt>
165 -<dd><input type="file" name="file" size="50"></dd>
166 +<dd><input type="file" name="file" size="50" /></dd>
167 <dt>%(upload_label_rename)s</dt>
168 -<dd><input type="text" name="rename" size="50" value="%(rename)s"></dd>
169 +<dd><input type="text" name="rename" size="50" value="%(rename)s" /></dd>
170 </dl>
171 <p>
172 -<input type="hidden" name="action" value="%(action_name)s">
173 -<input type="hidden" name="do" value="upload">
174 -<input type="submit" value="%(upload_button)s">
175 +<input type="hidden" name="action" value="%(action_name)s" />
176 +<input type="hidden" name="do" value="upload" />
177 +<input type="submit" value="%(upload_button)s" />
178 </p>
179 </form>
180 """ % {
181 @@ -471,7 +471,7 @@ Otherwise, if "Rename to" is left blank,
182 })
183
184 #<dt>%(upload_label_mime)s</dt>
185 -#<dd><input type="text" name="mime" size="50"></dd>
186 +#<dd><input type="text" name="mime" size="50" /></dd>
187 # 'upload_label_mime': _('MIME Type (optional)'),
188
189
190 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/DeletePage.py
191 --- a/MoinMoin/action/DeletePage.py Fri Jun 16 11:39:39 2006 +0200
192 +++ b/MoinMoin/action/DeletePage.py Fri Jun 16 11:40:48 2006 +0200
193 @@ -61,7 +61,7 @@ class DeletePage(ActionBase):
194 <tr>
195 <td class="label"><label>%(comment_label)s</label></td>
196 <td class="content">
197 - <input type="text" name="comment" maxlength="80">
198 + <input type="text" name="comment" maxlength="80" />
199 </td>
200 </tr>
201 <tr>
202 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/Despam.py
203 --- a/MoinMoin/action/Despam.py Fri Jun 16 11:39:39 2006 +0200
204 +++ b/MoinMoin/action/Despam.py Fri Jun 16 11:40:48 2006 +0200
205 @@ -84,9 +84,9 @@ def show_pages(request, pagename, editor
206 </table>
207 <p>
208 <form method="post" action="%s/%s">
209 -<input type="hidden" name="action" value="Despam">
210 -<input type="hidden" name="editor" value="%s">
211 -<input type="submit" name="ok" value="%s">
212 +<input type="hidden" name="action" value="Despam" />
213 +<input type="hidden" name="editor" value="%s" />
214 +<input type="submit" name="ok" value="%s" />
215 </form>
216 </p>
217 ''' % (request.getScriptname(), wikiutil.quoteWikinameURL(pagename),
218 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/PackagePages.py
219 --- a/MoinMoin/action/PackagePages.py Fri Jun 16 11:39:39 2006 +0200
220 +++ b/MoinMoin/action/PackagePages.py Fri Jun 16 11:40:48 2006 +0200
221 @@ -141,25 +141,25 @@ class PackagePages:
222 form = '''
223 %(error)s
224 <form method="post" action="">
225 -<input type="hidden" name="action" value="%(action)s">
226 +<input type="hidden" name="action" value="%(action)s" />
227 <table>
228 <tr>
229 <td class="label"><label>%(newname_label)s</label></td>
230 <td class="content">
231 - <input type="text" name="packagename" value="package.zip">
232 + <input type="text" name="packagename" value="package.zip" />
233 </td>
234 </tr>
235 <tr>
236 <td class="label"><label>%(list_label)s</label></td>
237 <td class="content">
238 - <input type="text" name="pagelist" maxlength="80">
239 + <input type="text" name="pagelist" maxlength="80" />
240 </td>
241 </tr>
242 <tr>
243 <td></td>
244 <td class="buttons">
245 - <input type="submit" name="submit" value="%(package)s">
246 - <input type="submit" name="cancel" value="%(cancel)s">
247 + <input type="submit" name="submit" value="%(package)s" />
248 + <input type="submit" name="cancel" value="%(cancel)s" />
249 </td>
250 </tr>
251 </table>
252 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/RenamePage.py
253 --- a/MoinMoin/action/RenamePage.py Fri Jun 16 11:39:39 2006 +0200
254 +++ b/MoinMoin/action/RenamePage.py Fri Jun 16 11:40:48 2006 +0200
255 @@ -73,13 +73,13 @@ class RenamePage(ActionBase):
256 <tr>
257 <td class="label"><label>%(newname_label)s</label></td>
258 <td class="content">
259 - <input type="text" name="newpagename" value="%(pagename)s">
260 + <input type="text" name="newpagename" value="%(pagename)s" />
261 </td>
262 </tr>
263 <tr>
264 <td class="label"><label>%(comment_label)s</label></td>
265 <td class="content">
266 - <input type="text" name="comment" maxlength="80">
267 + <input type="text" name="comment" maxlength="80" />
268 </td>
269 </tr>
270 <tr>
271 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/SpellCheck.py
272 --- a/MoinMoin/action/SpellCheck.py Fri Jun 16 11:39:39 2006 +0200
273 +++ b/MoinMoin/action/SpellCheck.py Fri Jun 16 11:40:48 2006 +0200
274 @@ -191,12 +191,12 @@ def checkSpelling(page, request, own_for
275 # add a form containing the bad words
276 if own_form:
277 msg = msg + ('<form method="post" action="">\n'
278 - '<input type="hidden" name="action" value="%s">\n') % action_name
279 + '<input type="hidden" name="action" value="%s" />\n') % action_name
280
281 - checkbox = '<input type="checkbox" name="newwords" value="%(word)s">%(word)s '
282 + checkbox = '<input type="checkbox" name="newwords" value="%(word)s" />%(word)s '
283 msg = msg + (
284 " ".join(map(lambda w, cb=checkbox: cb % {'word': wikiutil.escape(w),}, badwords)) +
285 - '<p><input type="submit" name="button_newwords" value="%s"></p>' %
286 + '<p><input type="submit" name="button_newwords" value="%s" /></p>' %
287 _('Add checked words to dictionary')
288 )
289 if own_form:
290 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/SubscribeUser.py
291 --- a/MoinMoin/action/SubscribeUser.py Fri Jun 16 11:39:39 2006 +0200
292 +++ b/MoinMoin/action/SubscribeUser.py Fri Jun 16 11:40:48 2006 +0200
293 @@ -22,9 +22,9 @@ def show_form(pagename, request):
294
295 request.write("""
296 <form action="" method="POST" enctype="multipart/form-data">
297 -<input type="hidden" name="action" value="SubscribeUser">
298 -Enter user names (comma separated): <input type="text" name="users" size="50">
299 -<input type="submit" value="Subscribe">
300 +<input type="hidden" name="action" value="SubscribeUser" />
301 +Enter user names (comma separated): <input type="text" name="users" size="50" />
302 +<input type="submit" value="Subscribe" />
303 </form>
304 """)
305 request.theme.send_footer(pagename)
306 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/__init__.py
307 --- a/MoinMoin/action/__init__.py Fri Jun 16 11:39:39 2006 +0200
308 +++ b/MoinMoin/action/__init__.py Fri Jun 16 11:40:48 2006 +0200
309 @@ -115,11 +115,11 @@ class ActionBase:
310 buttons = self.make_buttons()
311 buttons_html = []
312 for button in buttons:
313 - buttons_html.append('<input type="submit" name="%s" value="%s">' % button)
314 + buttons_html.append('<input type="submit" name="%s" value="%s" />' % button)
315 buttons_html = "".join(buttons_html)
316
317 if self.use_ticket:
318 - ticket_html = '<input type="hidden" name="ticket" value="%s">' % wikiutil.createTicket()
319 + ticket_html = '<input type="hidden" name="ticket" value="%s" />' % wikiutil.createTicket()
320 else:
321 ticket_html = ''
322
323 @@ -134,7 +134,7 @@ class ActionBase:
324 form_html = '''
325 %(error_html)s
326 <form method="post" action="">
327 -<input type="hidden" name="action" value="%(actionname)s">
328 +<input type="hidden" name="action" value="%(actionname)s" />
329 %(ticket_html)s
330 %(user_html)s
331 </form>''' % d
332 @@ -669,7 +669,7 @@ def do_info(pagename, request):
333 Column('rev', label='#', align='right'),
334 Column('mtime', label=_('Date'), align='right'),
335 Column('size', label=_('Size'), align='right'),
336 - Column('diff', label='<input type="submit" value="%s">' % (_("Diff"))),
337 + Column('diff', label='<input type="submit" value="%s" />' % (_("Diff"))),
338 Column('editor', label=_('Editor'), hidden=not request.cfg.show_names),
339 Column('comment', label=_('Comment')),
340 Column('action', label=_('Action')),
341 @@ -721,7 +721,7 @@ def do_info(pagename, request):
342 rchecked = ''
343 else:
344 lchecked = rchecked = ''
345 - diff = '<input type="radio" name="rev1" value="%d"%s><input type="radio" name="rev2" value="%d"%s>' % (rev,lchecked,rev,rchecked)
346 + diff = '<input type="radio" name="rev1" value="%d"%s /><input type="radio" name="rev2" value="%d"%s />' % (rev,lchecked,rev,rchecked)
347 comment = line.comment
348 if not comment and line.action.find('/REVERT') != -1:
349 comment = _("Revert to revision %(rev)d.") % {'rev': int(line.extra)}
350 @@ -785,7 +785,7 @@ def do_info(pagename, request):
351 # into the page view itself, and not in this form.
352 request.write('<form method="GET" action="">\n')
353 request.write('<div id="page-history">\n')
354 - request.write('<input type="hidden" name="action" value="diff">\n')
355 + request.write('<input type="hidden" name="action" value="diff" />\n')
356
357 history_table = DataBrowserWidget(request)
358 history_table.setData(history)
359 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/backup.py
360 --- a/MoinMoin/action/backup.py Fri Jun 16 11:39:39 2006 +0200
361 +++ b/MoinMoin/action/backup.py Fri Jun 16 11:40:48 2006 +0200
362 @@ -92,15 +92,15 @@ Please make sure your wiki configuration
363
364 request.write("""
365 <form action="%(baseurl)s/%(pagename)s" method="POST" enctype="multipart/form-data">
366 -<input type="hidden" name="action" value="backup">
367 -<input type="hidden" name="do" value="backup">
368 -<input type="submit" value="%(backup_button)s">
369 +<input type="hidden" name="action" value="backup" />
370 +<input type="hidden" name="do" value="backup" />
371 +<input type="submit" value="%(backup_button)s" />
372 </form>
373
374 <form action="%(baseurl)s/%(pagename)s" method="POST" enctype="multipart/form-data">
375 -<input type="hidden" name="action" value="backup">
376 -<input type="hidden" name="do" value="restore">
377 -<input type="submit" value="%(restore_button)s">
378 +<input type="hidden" name="action" value="backup" />
379 +<input type="hidden" name="do" value="restore" />
380 +<input type="submit" value="%(restore_button)s" />
381 </form>
382 """ % {
383 'baseurl': request.getScriptname(),
384 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/action/fckdialog.py
385 --- a/MoinMoin/action/fckdialog.py Fri Jun 16 11:39:39 2006 +0200
386 +++ b/MoinMoin/action/fckdialog.py Fri Jun 16 11:40:48 2006 +0200
387 @@ -299,17 +299,17 @@ def link_dialog(request):
388 <tr>
389 <td>
390 <form action=%(action)s method="GET">
391 - <input type="hidden" name="action" value="fckdialog">
392 - <input type="hidden" name="dialog" value="link">
393 - <input type="hidden" id="basepage" name="basepage" value="%(basepage)s">
394 + <input type="hidden" name="action" value="fckdialog" />
395 + <input type="hidden" name="dialog" value="link" />
396 + <input type="hidden" id="basepage" name="basepage" value="%(basepage)s" />
397 <table cellSpacing="0" cellPadding="0" align="center" border="0">
398 <tr>
399 <td>
400 <span fckLang="PageDlgName">Page Name</span><br>
401 - <input id="txtPagename" name="pagename" size="30" value="%(name)s">
402 + <input id="txtPagename" name="pagename" size="30" value="%(name)s" />
403 </td>
404 <td valign="bottom">
405 - <input id=btnSearchpage type="submit" value="Search">
406 + <input id=btnSearchpage type="submit" value="Search" />
407 </td>
408 </tr>
409 %(page_list)s
410 @@ -330,7 +330,7 @@ def link_dialog(request):
411 <select id="sctInterwiki" size="1">
412 %(interwiki)s
413 </select>:
414 - <input id="txtInterwikipagename"></input>
415 + <input id="txtInterwikipagename" />
416 </td>
417 </tr>
418 </table>
419 @@ -444,13 +444,13 @@ def attachment_dialog(request):
420 <tr>
421 <td>
422 <form action=%(action)s method="GET">
423 - <input type="hidden" name="action" value="fckdialog">
424 - <input type="hidden" name="dialog" value="attachment">
425 + <input type="hidden" name="action" value="fckdialog" />
426 + <input type="hidden" name="dialog" value="attachment" />
427 <table cellSpacing="0" cellPadding="0" align="center" border="0">
428 <tr>
429 <td>
430 <span fckLang="AttachmentDlgName">Attachment Name</span><br>
431 - <input id="txtAttachmentname" name="pagename" size="30" value="%(name)s">
432 + <input id="txtAttachmentname" name="pagename" size="30" value="%(name)s" />
433 </td>
434 </tr>
435 </table>
436 @@ -518,7 +518,7 @@ def image_dialog(request):
437 <tr>
438 <td colspan=2>
439 <div id="divChkLink">
440 - <input id="chkLink" type="checkbox"> Link to
441 + <input id="chkLink" type="checkbox" /> Link to
442 </div>
443 </td>
444 </table>
445 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/macro/NewPage.py
446 --- a/MoinMoin/macro/NewPage.py Fri Jun 16 11:39:39 2006 +0200
447 +++ b/MoinMoin/macro/NewPage.py Fri Jun 16 11:40:48 2006 +0200
448 @@ -87,18 +87,18 @@ class NewPage:
449 # TODO: better abstract this using the formatter
450 html = [
451 u'<form class="macro" method="get" action=""><div>',
452 - u'<input type="hidden" name="action" value="newpage">',
453 - u'<input type="hidden" name="parent" value="%s">' % wikiutil.escape(parent, 1),
454 - u'<input type="hidden" name="template" value="%s">' % wikiutil.escape(template, 1),
455 - u'<input type="hidden" name="nametemplate" value="%s">' % wikiutil.escape(nametemplate,1),
456 + u'<input type="hidden" name="action" value="newpage" />',
457 + u'<input type="hidden" name="parent" value="%s" />' % wikiutil.escape(parent, 1),
458 + u'<input type="hidden" name="template" value="%s" />' % wikiutil.escape(template, 1),
459 + u'<input type="hidden" name="nametemplate" value="%s" />' % wikiutil.escape(nametemplate,1),
460 ]
461
462 if requires_input:
463 html += [
464 - u'<input type="text" name="pagename" size="30">',
465 + u'<input type="text" name="pagename" size="30" />',
466 ]
467 html += [
468 - u'<input type="submit" value="%s">' % wikiutil.escape(label, 1),
469 + u'<input type="submit" value="%s" />' % wikiutil.escape(label, 1),
470 u'</div></form>',
471 ]
472 return self.formatter.rawHTML('\n'.join(html))
473 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/macro/__init__.py
474 --- a/MoinMoin/macro/__init__.py Fri Jun 16 11:39:39 2006 +0200
475 +++ b/MoinMoin/macro/__init__.py Fri Jun 16 11:40:48 2006 +0200
476 @@ -170,10 +170,10 @@ class Macro:
477 if type == "fullsearch":
478 boxes = [
479 u'<br>',
480 - u'<input type="checkbox" name="context" value="160" checked="checked">',
481 + u'<input type="checkbox" name="context" value="160" checked="checked" />',
482 _('Display context of search results'),
483 u'<br>',
484 - u'<input type="checkbox" name="case" value="1">',
485 + u'<input type="checkbox" name="case" value="1" />',
486 _('Case-sensitive searching'),
487 ]
488 boxes = u'\n'.join(boxes)
489 @@ -184,10 +184,10 @@ class Macro:
490 html = [
491 u'<form method="get" action="">',
492 u'<div>',
493 - u'<input type="hidden" name="action" value="fullsearch">',
494 - u'<input type="hidden" name="titlesearch" value="%i">' % type,
495 - u'<input type="text" name="value" size="30" value="%s">' % default,
496 - u'<input type="submit" value="%s">' % button,
497 + u'<input type="hidden" name="action" value="fullsearch" />',
498 + u'<input type="hidden" name="titlesearch" value="%i" />' % type,
499 + u'<input type="text" name="value" size="30" value="%s" />' % default,
500 + u'<input type="submit" value="%s" />' % button,
501 boxes,
502 u'</div>',
503 u'</form>',
504 @@ -206,9 +206,9 @@ class Macro:
505 html = [
506 u'<form method="get" action="">',
507 u'<div>',
508 - u'<input type="hidden" name="action" value="goto">',
509 - u'<input type="text" name="target" size="30">',
510 - u'<input type="submit" value="%s">' % _("Go To Page"),
511 + u'<input type="hidden" name="action" value="goto" />',
512 + u'<input type="text" name="target" size="30" />',
513 + u'<input type="submit" value="%s" />' % _("Go To Page"),
514 u'</div>',
515 u'</form>',
516 ]
517 diff -r 0f95d353d15d -r 0936388f00d8 MoinMoin/theme/__init__.py
518 --- a/MoinMoin/theme/__init__.py Fri Jun 16 11:39:39 2006 +0200
519 +++ b/MoinMoin/theme/__init__.py Fri Jun 16 11:40:48 2006 +0200
520 @@ -695,16 +695,16 @@ class ThemeBase:
521 html = u'''
522 <form id="searchform" method="get" action="">
523 <div>
524 -<input type="hidden" name="action" value="fullsearch">
525 -<input type="hidden" name="context" value="180">
526 +<input type="hidden" name="action" value="fullsearch" />
527 +<input type="hidden" name="context" value="180" />
528 <label for="searchinput">%(search_label)s</label>
529 <input id="searchinput" type="text" name="value" value="%(search_value)s" size="20"
530 onfocus="searchFocus(this)" onblur="searchBlur(this)"
531 - onkeyup="searchChange(this)" onchange="searchChange(this)" alt="Search">
532 + onkeyup="searchChange(this)" onchange="searchChange(this)" alt="Search" />
533 <input id="titlesearch" name="titlesearch" type="submit"
534 - value="%(search_title_label)s" alt="Search Titles">
535 + value="%(search_title_label)s" alt="Search Titles" />
536 <input id="fullsearch" name="fullsearch" type="submit"
537 - value="%(search_full_label)s" alt="Search Full Text">
538 + value="%(search_full_label)s" alt="Search Full Text" />
539 </div>
540 </form>
541 <script type="text/javascript">
542 @@ -1025,7 +1025,7 @@ function actionsMenuInit(title) {
543 this.selectedIndex = 0;">
544 %(options)s
545 </select>
546 - <input type="submit" value="%(do_button)s">
547 + <input type="submit" value="%(do_button)s" />
548 </div>
549 <script type="text/javascript">
550 <!--// Init menu
551 # HG changeset patch
552 # User Stefano Zacchiroli <zack@bononia.it>
553 # Node ID bba612b81758f13209851fb8368813ede8bf39a7
554 # Parent 0936388f00d80f0ac9c3e71cddf3ffb8c73cf593
555 terminate all generated <meta> tags with />
556
557 diff -r 0936388f00d8 -r bba612b81758 MoinMoin/action/fckdialog.py
558 --- a/MoinMoin/action/fckdialog.py Fri Jun 16 11:40:48 2006 +0200
559 +++ b/MoinMoin/action/fckdialog.py Fri Jun 16 11:55:47 2006 +0200
560 @@ -21,8 +21,8 @@ def macro_dialog(request):
561 <html>
562 <head>
563 <title>Insert Macro</title>
564 - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
565 - <meta content="noindex,nofollow" name="robots">
566 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
567 + <meta content="noindex,nofollow" name="robots" />
568 <script src="%s/applets/FCKeditor/editor/dialog/common/fck_dialog_common.js" type="text/javascript"></script>
569 <script language="javascript">
570
571 @@ -178,8 +178,8 @@ def page_list(request):
572 <html>
573 <head>
574 <title>Insert Page Link</title>
575 - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
576 - <meta content="noindex,nofollow" name="robots">
577 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
578 + <meta content="noindex,nofollow" name="robots" />
579 </head>
580 <body scroll="no" style="OVERFLOW: hidden">
581 <table height="100%%" cellSpacing="0" cellPadding="0" width="100%%" border="0">
582 @@ -273,8 +273,8 @@ def link_dialog(request):
583 * Frederico Caldeira Knabben (fredck@fckeditor.net)
584 -->
585 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
586 -<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
587 -<meta name="robots" content="index,nofollow">
588 +<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
589 +<meta name="robots" content="index,nofollow" />
590 <html>
591 <head>
592 <title>Link Properties</title>
593 @@ -426,8 +426,8 @@ def attachment_dialog(request):
594 * Frederico Caldeira Knabben (fredck@fckeditor.net)
595 -->
596 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
597 -<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
598 -<meta name="robots" content="index,nofollow">
599 +<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
600 +<meta name="robots" content="index,nofollow" />
601 <html>
602 <head>
603 <title>Attachment Properties</title>
604 diff -r 0936388f00d8 -r bba612b81758 MoinMoin/multiconfig.py
605 --- a/MoinMoin/multiconfig.py Fri Jun 16 11:40:48 2006 +0200
606 +++ b/MoinMoin/multiconfig.py Fri Jun 16 11:55:47 2006 +0200
607 @@ -260,10 +260,10 @@ reStructuredText Quick Reference
608 hosts_deny = []
609
610 html_head = ''
611 - html_head_queries = '''<meta name="robots" content="noindex,nofollow">\n'''
612 - html_head_posts = '''<meta name="robots" content="noindex,nofollow">\n'''
613 - html_head_index = '''<meta name="robots" content="index,follow">\n'''
614 - html_head_normal = '''<meta name="robots" content="index,nofollow">\n'''
615 + html_head_queries = '''<meta name="robots" content="noindex,nofollow" />\n'''
616 + html_head_posts = '''<meta name="robots" content="noindex,nofollow" />\n'''
617 + html_head_index = '''<meta name="robots" content="index,follow" />\n'''
618 + html_head_normal = '''<meta name="robots" content="index,nofollow" />\n'''
619 html_pagetitle = None
620
621 interwiki_preferred = [] # list of wiki names to show at top of interwiki list
622 diff -r 0936388f00d8 -r bba612b81758 MoinMoin/script/export/dump.py
623 --- a/MoinMoin/script/export/dump.py Fri Jun 16 11:40:48 2006 +0200
624 +++ b/MoinMoin/script/export/dump.py Fri Jun 16 11:55:47 2006 +0200
625 @@ -24,7 +24,7 @@ page_template = u'''<!DOCTYPE HTML PUBLI
626 page_template = u'''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
627 <html>
628 <head>
629 -<meta http-equiv="content-type" content="text/html; charset=%(charset)s">
630 +<meta http-equiv="content-type" content="text/html; charset=%(charset)s" />
631 <title>%(pagename)s</title>
632 <link rel="stylesheet" type="text/css" media="all" charset="utf-8" href="%(theme)s/css/common.css">
633 <link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="%(theme)s/css/screen.css">
634 diff -r 0936388f00d8 -r bba612b81758 MoinMoin/theme/__init__.py
635 --- a/MoinMoin/theme/__init__.py Fri Jun 16 11:40:48 2006 +0200
636 +++ b/MoinMoin/theme/__init__.py Fri Jun 16 11:55:47 2006 +0200
637 @@ -1466,14 +1466,14 @@ var gui_editor_link_text = "%(text)s";
638
639 # include charset information - needed for moin_dump or any other case
640 # when reading the html without a web server
641 - user_head.append('''<meta http-equiv="Content-Type" content="%s;charset=%s">\n''' % (page.output_mimetype, page.output_charset))
642 + user_head.append('''<meta http-equiv="Content-Type" content="%s;charset=%s" />\n''' % (page.output_mimetype, page.output_charset))
643
644 meta_keywords = request.getPragma('keywords')
645 meta_desc = request.getPragma('description')
646 if meta_keywords:
647 - user_head.append('<meta name="keywords" content="%s">\n' % escape(meta_keywords, 1))
648 + user_head.append('<meta name="keywords" content="%s" />\n' % escape(meta_keywords, 1))
649 if meta_desc:
650 - user_head.append('<meta name="description" content="%s">\n' % escape(meta_desc, 1))
651 + user_head.append('<meta name="description" content="%s" />\n' % escape(meta_desc, 1))
652
653 # search engine precautions / optimization:
654 # if it is an action or edit/search, send query headers (noindex,nofollow):
655 @@ -1496,7 +1496,7 @@ var gui_editor_link_text = "%(text)s";
656 user_head.append(request.cfg.html_head_normal)
657
658 if keywords.has_key('pi_refresh') and keywords['pi_refresh']:
659 - user_head.append('<meta http-equiv="refresh" content="%(delay)d;URL=%(url)s">' % keywords['pi_refresh'])
660 + user_head.append('<meta http-equiv="refresh" content="%(delay)d;URL=%(url)s" />' % keywords['pi_refresh'])
661
662 # output buffering increases latency but increases throughput as well
663 output = []
664 diff -r 0936388f00d8 -r bba612b81758 wiki/htdocs/applets/FCKeditor/_samples/py/sample01.py
665 --- a/wiki/htdocs/applets/FCKeditor/_samples/py/sample01.py Fri Jun 16 11:40:48 2006 +0200
666 +++ b/wiki/htdocs/applets/FCKeditor/_samples/py/sample01.py Fri Jun 16 11:55:47 2006 +0200
667 @@ -34,8 +34,8 @@ print """<!DOCTYPE HTML PUBLIC "-//W3C//
668 <html>
669 <head>
670 <title>FCKeditor - Sample</title>
671 - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
672 - <meta name="robots" content="noindex, nofollow">
673 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
674 + <meta name="robots" content="noindex, nofollow" />
675 <link href="../sample.css" rel="stylesheet" type="text/css" />
676 </head>
677 <body>
678 diff -r 0936388f00d8 -r bba612b81758 wiki/htdocs/applets/FCKeditor/_samples/py/sampleposteddata.py
679 --- a/wiki/htdocs/applets/FCKeditor/_samples/py/sampleposteddata.py Fri Jun 16 11:40:48 2006 +0200
680 +++ b/wiki/htdocs/applets/FCKeditor/_samples/py/sampleposteddata.py Fri Jun 16 11:55:47 2006 +0200
681 @@ -37,8 +37,8 @@ print """<!DOCTYPE HTML PUBLIC "-//W3C//
682 <html>
683 <head>
684 <title>FCKeditor - Samples - Posted Data</title>
685 - <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
686 - <meta name="robots" content="noindex, nofollow">
687 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
688 + <meta name="robots" content="noindex, nofollow" />
689 <link href="../sample.css" rel="stylesheet" type="text/css" />
690 </head>
691 <body>
692 # HG changeset patch
693 # User Stefano Zacchiroli <zack@bononia.it>
694 # Node ID 397b515c602e977d817f7b3fe55f80b00481c113
695 # Parent bba612b81758f13209851fb8368813ede8bf39a7
696 termine all generated <link> tags with />
697
698 diff -r bba612b81758 -r 397b515c602e MoinMoin/action/AttachFile.py
699 --- a/MoinMoin/action/AttachFile.py Fri Jun 16 11:55:47 2006 +0200
700 +++ b/MoinMoin/action/AttachFile.py Fri Jun 16 13:09:40 2006 +0200
701 @@ -371,7 +371,7 @@ def send_link_rel(request, pagename):
702 scriptName, pagename_quoted,
703 action_name, wikiutil.url_quote_plus(file))
704
705 - request.write(u'<link rel="Appendix" title="%s" href="%s">\n' % (
706 + request.write(u'<link rel="Appendix" title="%s" href="%s" />\n' % (
707 wikiutil.escape(file), wikiutil.escape(url)))
708
709
710 diff -r bba612b81758 -r 397b515c602e MoinMoin/script/export/dump.py
711 --- a/MoinMoin/script/export/dump.py Fri Jun 16 11:55:47 2006 +0200
712 +++ b/MoinMoin/script/export/dump.py Fri Jun 16 13:09:40 2006 +0200
713 @@ -26,9 +26,9 @@ page_template = u'''<!DOCTYPE HTML PUBLI
714 <head>
715 <meta http-equiv="content-type" content="text/html; charset=%(charset)s" />
716 <title>%(pagename)s</title>
717 -<link rel="stylesheet" type="text/css" media="all" charset="utf-8" href="%(theme)s/css/common.css">
718 -<link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="%(theme)s/css/screen.css">
719 -<link rel="stylesheet" type="text/css" media="print" charset="utf-8" href="%(theme)s/css/print.css">
720 +<link rel="stylesheet" type="text/css" media="all" charset="utf-8" href="%(theme)s/css/common.css" />
721 +<link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="%(theme)s/css/screen.css" />
722 +<link rel="stylesheet" type="text/css" media="print" charset="utf-8" href="%(theme)s/css/print.css" />
723 </head>
724 <body>
725 <table>
726 diff -r bba612b81758 -r 397b515c602e MoinMoin/theme/__init__.py
727 --- a/MoinMoin/theme/__init__.py Fri Jun 16 11:55:47 2006 +0200
728 +++ b/MoinMoin/theme/__init__.py Fri Jun 16 13:09:40 2006 +0200
729 @@ -580,7 +580,7 @@ class ThemeBase:
730 @rtype: string
731 @return: stylesheets links
732 """
733 - link = '<link rel="stylesheet" type="text/css" charset="%s" media="%s" href="%s">'
734 + link = '<link rel="stylesheet" type="text/css" charset="%s" media="%s" href="%s" />'
735
736 # Check mode
737 if d.get('print_mode'):
738 @@ -859,7 +859,7 @@ function actionsMenuInit(title) {
739 link = u''
740 if self.shouldUseRSS():
741 link = (u'<link rel="alternate" title="%s Recent Changes" '
742 - u'href="%s" type="application/rss+xml">') % (
743 + u'href="%s" type="application/rss+xml" />') % (
744 self.cfg.sitename,
745 self.rsshref() )
746 return link
747 @@ -1521,11 +1521,11 @@ var gui_editor_link_text = "%(text)s";
748 ))
749
750 # Links
751 - output.append('<link rel="Start" href="%s/%s">\n' % (scriptname, wikiutil.quoteWikinameURL(page_front_page)))
752 + output.append('<link rel="Start" href="%s/%s" />\n' % (scriptname, wikiutil.quoteWikinameURL(page_front_page)))
753 if pagename:
754 - output.append('<link rel="Alternate" title="%s" href="%s/%s?action=raw">\n' % (
755 + output.append('<link rel="Alternate" title="%s" href="%s/%s?action=raw" />\n' % (
756 _('Wiki Markup'), scriptname, pagename_quoted,))
757 - output.append('<link rel="Alternate" media="print" title="%s" href="%s/%s?action=print">\n' % (
758 + output.append('<link rel="Alternate" media="print" title="%s" href="%s/%s?action=print" />\n' % (
759 _('Print View'), scriptname, pagename_quoted,))
760
761 # !!! currently disabled due to Mozilla link prefetching, see
762 @@ -1538,15 +1538,15 @@ var gui_editor_link_text = "%(text)s";
763 #~ # this shopuld never happend in theory, but let's be sure
764 #~ pass
765 #~ else:
766 - #~ request.write('<link rel="First" href="%s/%s">\n' % (request.getScriptname(), quoteWikinameURL(all_pages[0]))
767 + #~ request.write('<link rel="First" href="%s/%s" />\n' % (request.getScriptname(), quoteWikinameURL(all_pages[0]))
768 #~ if pos > 0:
769 - #~ request.write('<link rel="Previous" href="%s/%s">\n' % (request.getScriptname(), quoteWikinameURL(all_pages[pos-1])))
770 + #~ request.write('<link rel="Previous" href="%s/%s" />\n' % (request.getScriptname(), quoteWikinameURL(all_pages[pos-1])))
771 #~ if pos+1 < len(all_pages):
772 - #~ request.write('<link rel="Next" href="%s/%s">\n' % (request.getScriptname(), quoteWikinameURL(all_pages[pos+1])))
773 - #~ request.write('<link rel="Last" href="%s/%s">\n' % (request.getScriptname(), quoteWikinameURL(all_pages[-1])))
774 + #~ request.write('<link rel="Next" href="%s/%s" />\n' % (request.getScriptname(), quoteWikinameURL(all_pages[pos+1])))
775 + #~ request.write('<link rel="Last" href="%s/%s" />\n' % (request.getScriptname(), quoteWikinameURL(all_pages[-1])))
776
777 if page_parent_page:
778 - output.append('<link rel="Up" href="%s/%s">\n' % (scriptname, wikiutil.quoteWikinameURL(page_parent_page)))
779 + output.append('<link rel="Up" href="%s/%s" />\n' % (scriptname, wikiutil.quoteWikinameURL(page_parent_page)))
780
781 # write buffer because we call AttachFile
782 request.write(''.join(output))
783 @@ -1557,10 +1557,10 @@ var gui_editor_link_text = "%(text)s";
784 AttachFile.send_link_rel(request, pagename)
785
786 output.extend([
787 - '<link rel="Search" href="%s/%s">\n' % (scriptname, wikiutil.quoteWikinameURL(page_find_page)),
788 - '<link rel="Index" href="%s/%s">\n' % (scriptname, wikiutil.quoteWikinameURL(page_title_index)),
789 - '<link rel="Glossary" href="%s/%s">\n' % (scriptname, wikiutil.quoteWikinameURL(page_word_index)),
790 - '<link rel="Help" href="%s/%s">\n' % (scriptname, wikiutil.quoteWikinameURL(page_help_formatting)),
791 + '<link rel="Search" href="%s/%s" />\n' % (scriptname, wikiutil.quoteWikinameURL(page_find_page)),
792 + '<link rel="Index" href="%s/%s" />\n' % (scriptname, wikiutil.quoteWikinameURL(page_title_index)),
793 + '<link rel="Glossary" href="%s/%s" />\n' % (scriptname, wikiutil.quoteWikinameURL(page_word_index)),
794 + '<link rel="Help" href="%s/%s" />\n' % (scriptname, wikiutil.quoteWikinameURL(page_help_formatting)),
795 ])
796
797 output.append("</head>\n")
798 # HG changeset patch
799 # User Stefano Zacchiroli <zack@bononia.it>
800 # Node ID 9d744af3f93e828863faceeb47cda64de5e1fa3c
801 # Parent 397b515c602e977d817f7b3fe55f80b00481c113
802 terminate all generated <input>, <meta>, <link>, <hr>, <img>, <param> element with trailing />
803
804 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/_tests/broken/test_converter_text_html_text_moin_wiki.py
805 --- a/MoinMoin/_tests/broken/test_converter_text_html_text_moin_wiki.py Fri Jun 16 13:09:40 2006 +0200
806 +++ b/MoinMoin/_tests/broken/test_converter_text_html_text_moin_wiki.py Fri Jun 16 13:28:55 2006 +0200
807 @@ -1050,7 +1050,7 @@ class ConvertInlineItemRepeatableTests(B
808
809 def testSmiley01(self):
810 test = ur":-)"
811 - output = ur"""<img src="/wiki/modern/img/smile.png" alt=":-)" height="15" width="15">"""
812 + output = ur"""<img src="/wiki/modern/img/smile.png" alt=":-)" height="15" width="15" />"""
813 self.do(test, output)
814
815 class StripTests(unittest.TestCase):
816 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/action/AttachFile.py
817 --- a/MoinMoin/action/AttachFile.py Fri Jun 16 13:09:40 2006 +0200
818 +++ b/MoinMoin/action/AttachFile.py Fri Jun 16 13:28:55 2006 +0200
819 @@ -402,15 +402,15 @@ def send_hotdraw(pagename, request):
820 request.write('<h2>' + _("Edit drawing") + '</h2>')
821 request.write("""
822 <p>
823 -<img src="%(pngpath)s%(timestamp)s">
824 +<img src="%(pngpath)s%(timestamp)s" />
825 <applet code="CH.ifa.draw.twiki.TWikiDraw.class"
826 - archive="%(pubpath)s/twikidraw.jar" width="640" height="480">
827 -<param name="drawpath" value="%(drawpath)s">
828 -<param name="pngpath" value="%(pngpath)s">
829 -<param name="savepath" value="%(savelink)s">
830 -<param name="basename" value="%(basename)s">
831 -<param name="viewpath" value="%(pagelink)s">
832 -<param name="helppath" value="%(helplink)s">
833 + archive="%(pubpath)s/twikidraw.jar" width="640" height="480" />
834 +<param name="drawpath" value="%(drawpath)s" />
835 +<param name="pngpath" value="%(pngpath)s" />
836 +<param name="savepath" value="%(savelink)s" />
837 +<param name="basename" value="%(basename)s" />
838 +<param name="viewpath" value="%(pagelink)s" />
839 +<param name="helppath" value="%(helplink)s" />
840 <strong>NOTE:</strong> You need a Java enabled browser to edit the drawing example.
841 </applet>
842 </p>""" % {
843 @@ -780,7 +780,7 @@ def send_viewfile(pagename, request):
844 mt = wikiutil.MimeType(filename=filename)
845 if mt.major == 'image':
846 timestamp = htdocs_access(request) and "?%s" % time.time() or ''
847 - request.write('<img src="%s%s" alt="%s">' % (
848 + request.write('<img src="%s%s" alt="%s" />' % (
849 getAttachUrl(pagename, filename, request, escaped=1), timestamp, wikiutil.escape(filename, 1)))
850 return
851 elif mt.major == 'text':
852 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/action/__init__.py
853 --- a/MoinMoin/action/__init__.py Fri Jun 16 13:09:40 2006 +0200
854 +++ b/MoinMoin/action/__init__.py Fri Jun 16 13:28:55 2006 +0200
855 @@ -599,7 +599,7 @@ def do_diff(pagename, request):
856 request.write('<pre>')
857 for line in lines:
858 if line[0] == "@":
859 - request.write('<hr>')
860 + request.write('<hr />')
861 request.write(wikiutil.escape(line)+'\n')
862 request.write('</pre>')
863
864 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/macro/TeudView.py
865 --- a/MoinMoin/macro/TeudView.py Fri Jun 16 13:09:40 2006 +0200
866 +++ b/MoinMoin/macro/TeudView.py Fri Jun 16 13:28:55 2006 +0200
867 @@ -53,7 +53,7 @@ def execute(macro, args):
868 pagename, path, modparts[pathidx])
869 if pathidx < pathlen:
870 navigation = navigation + '.'
871 - navigation = navigation + '<hr size="1">'
872 + navigation = navigation + '<hr size="1" />'
873 else:
874 # generate index
875 xmlstr = xmldoc.xml.document(None, encoding=config.charset)
876 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/script/export/dump.py
877 --- a/MoinMoin/script/export/dump.py Fri Jun 16 13:09:40 2006 +0200
878 +++ b/MoinMoin/script/export/dump.py Fri Jun 16 13:28:55 2006 +0200
879 @@ -18,7 +18,7 @@ from MoinMoin.action import AttachFile
880 from MoinMoin.action import AttachFile
881
882 url_prefix = "."
883 -logo_html = '<img src="logo.png">'
884 +logo_html = '<img src="logo.png" />'
885 HTML_SUFFIX = ".html"
886
887 page_template = u'''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
888 @@ -41,12 +41,12 @@ page_template = u'''<!DOCTYPE HTML PUBLI
889 </td>
890 </tr>
891 </table>
892 -<hr>
893 +<hr />
894 <div id="page">
895 <h1 id="title">%(pagename)s</h1>
896 %(pagehtml)s
897 </div>
898 -<hr>
899 +<hr />
900 %(timestamp)s
901 </body>
902 </html>
903 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/stats/hitcounts.py
904 --- a/MoinMoin/stats/hitcounts.py Fri Jun 16 13:09:40 2006 +0200
905 +++ b/MoinMoin/stats/hitcounts.py Fri Jun 16 13:28:55 2006 +0200
906 @@ -41,7 +41,7 @@ def linkto(pagename, request, params='')
907 data = {'url': page.url(request, querystr, escape=0)}
908 data.update(request.cfg.chart_options)
909 result = ('<img src="%(url)s" width="%(width)d" height="%(height)d"'
910 - ' alt="hitcounts chart">') % data
911 + ' alt="hitcounts chart" />') % data
912
913 return result
914
915 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/stats/pagesize.py
916 --- a/MoinMoin/stats/pagesize.py Fri Jun 16 13:09:40 2006 +0200
917 +++ b/MoinMoin/stats/pagesize.py Fri Jun 16 13:28:55 2006 +0200
918 @@ -38,7 +38,7 @@ def linkto(pagename, request, params='')
919 data = {'url': page.url(request, querystr, escape=0)}
920 data.update(request.cfg.chart_options)
921 result = ('<img src="%(url)s" width="%(width)d" height="%(height)d"'
922 - ' alt="pagesize chart">') % data
923 + ' alt="pagesize chart" />') % data
924 return result
925
926
927 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/stats/useragents.py
928 --- a/MoinMoin/stats/useragents.py Fri Jun 16 13:09:40 2006 +0200
929 +++ b/MoinMoin/stats/useragents.py Fri Jun 16 13:28:55 2006 +0200
930 @@ -39,7 +39,7 @@ def linkto(pagename, request, params='')
931 data = {'url': page.url(request, querystr, escape=0)}
932 data.update(request.cfg.chart_options)
933 result = ('<img src="%(url)s" width="%(width)d" height="%(height)d"'
934 - ' alt="useragents chart">') % data
935 + ' alt="useragents chart" />') % data
936
937 return result
938
939 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/theme/__init__.py
940 --- a/MoinMoin/theme/__init__.py Fri Jun 16 13:09:40 2006 +0200
941 +++ b/MoinMoin/theme/__init__.py Fri Jun 16 13:28:55 2006 +0200
942 @@ -487,7 +487,7 @@ class ThemeBase:
943 try:
944 tag = self.request.formatter.image(src=img, alt=alt, width=w, height=h)
945 except AttributeError: # XXX FIXME if we have no formatter or no request
946 - tag = '<img src="%s" alt="%s" width="%s" height="%s">' % (
947 + tag = '<img src="%s" alt="%s" width="%s" height="%s" />' % (
948 img, alt, w, h)
949 import warnings
950 warnings.warn("calling themes without correct request", DeprecationWarning)
951 diff -r 397b515c602e -r 9d744af3f93e MoinMoin/theme/modern.py
952 --- a/MoinMoin/theme/modern.py Fri Jun 16 13:09:40 2006 +0200
953 +++ b/MoinMoin/theme/modern.py Fri Jun 16 13:28:55 2006 +0200
954 @@ -35,7 +35,7 @@ class Theme(ThemeBase):
955 self.trail(d),
956 self.navibar(d),
957 #u'<hr id="pageline">',
958 - u'<div id="pageline"><hr style="display:none;"></div>',
959 + u'<div id="pageline"><hr style="display:none;" /></div>',
960 self.msg(d),
961 self.editbar(d),
962 u'</div>',
963 diff -r 397b515c602e -r 9d744af3f93e wiki/config/wikiconfig.py
964 --- a/wiki/config/wikiconfig.py Fri Jun 16 13:09:40 2006 +0200
965 +++ b/wiki/config/wikiconfig.py Fri Jun 16 13:28:55 2006 +0200
966 @@ -38,7 +38,7 @@ class Config(DefaultConfig):
967 # Wiki logo. You can use an image, text or both. [Unicode]
968 # For no logo or text, use '' - the default is to show the sitename.
969 # See also url_prefix setting below!
970 - logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo">'
971 + logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo" />'
972
973 # name of entry page / front page [Unicode], choose one of those:
974
975 diff -r 397b515c602e -r 9d744af3f93e wiki/htdocs/applets/FCKeditor/_samples/py/sample01.py
976 --- a/wiki/htdocs/applets/FCKeditor/_samples/py/sample01.py Fri Jun 16 13:09:40 2006 +0200
977 +++ b/wiki/htdocs/applets/FCKeditor/_samples/py/sample01.py Fri Jun 16 13:28:55 2006 +0200
978 @@ -42,7 +42,7 @@ print """<!DOCTYPE HTML PUBLIC "-//W3C//
979 <h1>FCKeditor - Python - Sample 1</h1>
980 This sample displays a normal HTML form with an FCKeditor with full features
981 enabled.
982 - <hr>
983 + <hr />
984 <form action="sampleposteddata.py" method="post" target="_blank">
985 """
986
987 @@ -64,10 +64,10 @@ print """
988 """
989
990 # For testing your environments
991 -print "<hr>"
992 +print "<hr />"
993 for key in os.environ.keys():
994 print "%s: %s<br>" % (key, os.environ.get(key, ""))
995 -print "<hr>"
996 +print "<hr />"
997
998 # Document footer
999 print """
1000 diff -r 397b515c602e -r 9d744af3f93e wiki/htdocs/applets/FCKeditor/_samples/py/sampleposteddata.py
1001 --- a/wiki/htdocs/applets/FCKeditor/_samples/py/sampleposteddata.py Fri Jun 16 13:09:40 2006 +0200
1002 +++ b/wiki/htdocs/applets/FCKeditor/_samples/py/sampleposteddata.py Fri Jun 16 13:28:55 2006 +0200
1003 @@ -48,7 +48,7 @@ print """
1004 print """
1005 <h1>FCKeditor - Samples - Posted Data</h1>
1006 This page lists all data posted by the form.
1007 - <hr>
1008 + <hr />
1009 <table width="100%" border="1" cellspacing="0" bordercolor="#999999">
1010 <tr style="FONT-WEIGHT: bold; COLOR: #dddddd; BACKGROUND-COLOR: #999999">
1011 <td nowrap>Field Name </td>
1012 @@ -69,10 +69,10 @@ print "</table>"
1013 print "</table>"
1014
1015 # For testing your environments
1016 -print "<hr>"
1017 +print "<hr />"
1018 for key in os.environ.keys():
1019 print "%s: %s<br>" % (key, os.environ.get(key, ""))
1020 -print "<hr>"
1021 +print "<hr />"
1022
1023 # Document footer
1024 print """
1025 diff -r 397b515c602e -r 9d744af3f93e wikiconfig.py
1026 --- a/wikiconfig.py Fri Jun 16 13:09:40 2006 +0200
1027 +++ b/wikiconfig.py Fri Jun 16 13:28:55 2006 +0200
1028 @@ -38,7 +38,7 @@ class Config(DefaultConfig):
1029 # Wiki logo. You can use an image, text or both. [Unicode]
1030 # For no logo or text, use '' - the default is to show the sitename.
1031 # See also url_prefix setting below!
1032 - logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo">'
1033 + logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo" />'
1034
1035 # name of entry page / front page [Unicode], choose one of those:
1036
1037 # HG changeset patch
1038 # User Stefano Zacchiroli <zack@bononia.it>
1039 # Node ID bb0ee6f0ced251701cc559fd491faeafaf9c312c
1040 # Parent 9d744af3f93e828863faceeb47cda64de5e1fa3c
1041 output correct form of the disabled attribute (i.e. disabled="disabled")
1042
1043 diff -r 9d744af3f93e -r bb0ee6f0ced2 MoinMoin/theme/__init__.py
1044 --- a/MoinMoin/theme/__init__.py Fri Jun 16 13:28:55 2006 +0200
1045 +++ b/MoinMoin/theme/__init__.py Fri Jun 16 13:39:36 2006 +0200
1046 @@ -963,7 +963,7 @@ function actionsMenuInit(title) {
1047 # class="disabled" is a workaround for browsers that ignore
1048 # "disabled", e.g IE, Safari
1049 # for XHTML: data['disabled'] = ' disabled="disabled"'
1050 - disabled = ' disabled class="disabled"'
1051 + disabled = ' disabled="disabled" class="disabled"'
1052
1053 # Format standard actions
1054 available = request.getAvailableActions(page)
1055 # HG changeset patch
1056 # User Stefano Zacchiroli <zack@bononia.it>
1057 # Node ID 0c1b63b9e92d2030cbf775596c7a861fc79c35a8
1058 # Parent bb0ee6f0ced251701cc559fd491faeafaf9c312c
1059 escaped '&' characters in script and hyperlink endpoints
1060
1061 diff -r bb0ee6f0ced2 -r 0c1b63b9e92d MoinMoin/formatter/text_html.py
1062 --- a/MoinMoin/formatter/text_html.py Fri Jun 16 13:39:36 2006 +0200
1063 +++ b/MoinMoin/formatter/text_html.py Fri Jun 16 14:59:09 2006 +0200
1064 @@ -633,7 +633,7 @@ class Formatter(FormatterBase):
1065 linktext = _('Upload new attachment "%(filename)s"')
1066 return wikiutil.link_tag(
1067 self.request,
1068 - ('%s?action=AttachFile&rename=%s' %
1069 + ('%s?action=AttachFile&rename=%s' %
1070 (wikiutil.quoteWikinameURL(pagename),
1071 wikiutil.url_quote_plus(fname))),
1072 linktext % {'filename': self.text(fname)})
1073 @@ -651,7 +651,7 @@ class Formatter(FormatterBase):
1074 linktext = _('Upload new attachment "%(filename)s"')
1075 return wikiutil.link_tag(
1076 self.request,
1077 - ('%s?action=AttachFile&rename=%s' %
1078 + ('%s?action=AttachFile&rename=%s' %
1079 (wikiutil.quoteWikinameURL(pagename),
1080 wikiutil.url_quote_plus(fname))),
1081 linktext % {'filename': self.text(fname)})
1082 @@ -681,14 +681,14 @@ class Formatter(FormatterBase):
1083 linktext = _('Create new drawing "%(filename)s"')
1084 return wikiutil.link_tag(
1085 self.request,
1086 - ('%s?action=AttachFile&rename=%s%s' %
1087 + ('%s?action=AttachFile&rename=%s%s' %
1088 (wikiutil.quoteWikinameURL(pagename),
1089 wikiutil.url_quote_plus(fname),
1090 - drawing and ('&drawing=%s' % wikiutil.url_quote(drawing)) or '')),
1091 + drawing and ('&drawing=%s' % wikiutil.url_quote(drawing)) or '')),
1092 linktext % {'filename': self.text(fname)})
1093
1094 mappath = AttachFile.getFilename(self.request, pagename, drawing + u'.map')
1095 - edit_link = ('%s?action=AttachFile&rename=%s&drawing=%s' % (
1096 + edit_link = ('%s?action=AttachFile&rename=%s&drawing=%s' % (
1097 wikiutil.quoteWikinameURL(pagename),
1098 wikiutil.url_quote_plus(fname),
1099 wikiutil.url_quote(drawing)))
1100 @@ -872,7 +872,7 @@ class Formatter(FormatterBase):
1101 _toggleLineNumbersScript = """
1102 <script type="text/javascript">
1103 function isnumbered(obj) {
1104 - return obj.childNodes.length && obj.firstChild.childNodes.length && obj.firstChild.firstChild.className == 'LineNumber';
1105 + return obj.childNodes.length && obj.firstChild.childNodes.length && obj.firstChild.firstChild.className == 'LineNumber';
1106 }
1107 function nformat(num,chrs,add) {
1108 var nlen = Math.max(0,chrs-(''+num).length), res = '';
1109 @@ -904,7 +904,7 @@ function remnumber(did) {
1110 var c = document.getElementById(did), l = c.firstChild;
1111 if (isnumbered(c))
1112 while (l != null) {
1113 - if (l.tagName == 'SPAN' && l.firstChild.className == 'LineNumber') l.removeChild(l.firstChild);
1114 + if (l.tagName == 'SPAN' && l.firstChild.className == 'LineNumber') l.removeChild(l.firstChild);
1115 l = l.nextSibling;
1116 }
1117 return false;
1118 diff -r bb0ee6f0ced2 -r 0c1b63b9e92d MoinMoin/theme/__init__.py
1119 --- a/MoinMoin/theme/__init__.py Fri Jun 16 13:39:36 2006 +0200
1120 +++ b/MoinMoin/theme/__init__.py Fri Jun 16 14:59:09 2006 +0200
1121 @@ -1018,7 +1018,7 @@ function actionsMenuInit(title) {
1122 <div>
1123 <label>%(label)s</label>
1124 <select name="action"
1125 - onchange="if ((this.selectedIndex != 0) &&
1126 + onchange="if ((this.selectedIndex != 0) &&
1127 (this.options[this.selectedIndex].disabled == false)) {
1128 this.form.submit();
1129 }
1130 @@ -1160,7 +1160,7 @@ actionsMenuInit('%(label)s');
1131 _ = self.request.getText
1132 return """\
1133 <script type="text/javascript">
1134 -var gui_editor_link_href = "%(url)s?action=edit&editor=gui";
1135 +var gui_editor_link_href = "%(url)s?action=edit&editor=gui";
1136 var gui_editor_link_text = "%(text)s";
1137 </script>
1138 """ % {'url': page.url(self.request),
1139 # HG changeset patch
1140 # User Stefano Zacchiroli <zack@bononia.it>
1141 # Node ID a6b99e72057bdfd2268891cefd0fec429ea0f8c1
1142 # Parent 0c1b63b9e92d2030cbf775596c7a861fc79c35a8
1143 explicitely close opened <p> tags instead of letting the browser do that
1144
1145 diff -r 0c1b63b9e92d -r a6b99e72057b MoinMoin/formatter/text_html.py
1146 --- a/MoinMoin/formatter/text_html.py Fri Jun 16 14:59:09 2006 +0200
1147 +++ b/MoinMoin/formatter/text_html.py Fri Jun 16 14:59:55 2006 +0200
1148 @@ -28,9 +28,6 @@ _blocks = Set(['dd', 'div', 'dl', 'dt',
1149
1150 _self_closing_tags = Set(['area', 'base', 'br', 'col', 'frame', 'hr', 'img', 'input',
1151 'isindex', 'link', 'meta', 'param'])
1152 -
1153 -# We only open those tags and let the browser auto-close them:
1154 -_auto_closing_tags = Set(['p'])
1155
1156 # These are the elements which generally should cause an increase in the
1157 # indention level in the html souce code.
1158 @@ -372,7 +369,7 @@ class Formatter(FormatterBase):
1159 @rtype: string
1160 @return: closing tag as a string
1161 """
1162 - if tag in _self_closing_tags or tag in _auto_closing_tags:
1163 + if tag in _self_closing_tags:
1164 # This tag was already closed
1165 tagstr = ''
1166 elif tag in _blocks:
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.