--- ./MoinMoin/formatter/text_html.py 2003-11-09 22:00:56.000000000 +0100 +++ ./MoinMoin/formatter/text_html.py.new 2004-02-16 12:32:18.000000000 +0100 @@ -80,7 +80,7 @@ target = kw.get('target', None) if not pretty and wikiutil.isPicture(url): - return '' % (url,) + return '%s' % (url,text) if text is None: text = url str = '' --- ./MoinMoin/wikiaction.py 2003-11-09 22:00:52.000000000 +0100 +++ ./MoinMoin/wikiaction.py.new 2004-02-16 12:01:25.000000000 +0100 @@ -76,7 +76,7 @@ hiddenhits += 1 continue print '
  • ' + Page(page_name).link_to(querystr= - 'action=highlight&value=%s' % urllib.quote_plus(needle)) + 'action=highlight&value=%s' % urllib.quote_plus(needle)) print ' . . . . ' + `count` print (_(' match'), _(' matches'))[count != 1] if context: @@ -258,8 +258,8 @@ # options if not ignorews: - qstr = 'action=diff&ignorews=1' - if diff_date: qstr = '%s&date=%s' % (qstr, diff_date) + qstr = 'action=diff&ignorews=1' + if diff_date: qstr = '%s&date=%s' % (qstr, diff_date) print Page(pagename).link_to( text=_('Ignore changes in the amount of whitespace'), querystr=qstr), "

    " @@ -372,14 +372,14 @@ if file != currentpage: actions = '%s %s' % (actions, page.link_to( text=_('view'), - querystr='action=recall&date=%d' % mtime)) + querystr='action=recall&date=%d' % mtime)) if may_revert: actions = '%s %s' % (actions, page.link_to( text=_('revert'), - querystr='action=revert&date=%d' % mtime)) + querystr='action=revert&date=%d' % mtime)) actions = '%s %s' % (actions, page.link_to( text=_('diff'), - querystr='action=diff&date=%d' % mtime)) + querystr='action=diff&date=%d' % mtime)) comment = log.comment if log.action.find('/REVERT') != -1: @@ -465,9 +465,9 @@ print "

    " # links to detailed info - historylink = wikiutil.link_tag('%s?action=info&history=1' % qpagename, + historylink = wikiutil.link_tag('%s?action=info&history=1' % qpagename, _('Show "%(title)s"') % {'title': _('Revision History')}) - hitcountlink = wikiutil.link_tag('%s?action=info&hitcounts=1' % qpagename, + hitcountlink = wikiutil.link_tag('%s?action=info&hitcounts=1' % qpagename, _('Show chart "%(title)s"') % {'title': _('Page hits and edits')}) request.write("

    %s

    \n

    %s
    %s

    " % ( _('Detailed Information'), historylink, hitcountlink)) --- ./MoinMoin/wikimacro.py 2004-02-16 12:01:54.000000000 +0100 +++ ./MoinMoin/wikimacro.py.new 2004-02-16 12:02:05.000000000 +0100 @@ -223,7 +223,7 @@ index = index + _make_index_key(index_letters, """
    %s | %s | -%s +%s """ % (qpagename, not allpages, (self._('Include system pages'), self._('Exclude system pages'))[allpages], qpagename, self._('Plain title index'), qpagename, self._('XML title index')) ) --- ./MoinMoin/config.py 2004-02-16 12:10:11.000000000 +0100 +++ ./MoinMoin/config.py.new 2004-02-16 12:10:20.000000000 +0100 @@ -122,7 +122,7 @@ Info Edit Subscribe -XML +XML Print View ''', --- ./MoinMoin/wikiutil.py 2004-02-16 12:34:43.000000000 +0100 +++ ./MoinMoin/wikiutil.py.new 2004-02-16 12:42:17.000000000 +0100 @@ -618,7 +618,7 @@ user_head = config.html_head if os.environ.get('QUERY_STRING', '') or os.environ.get('REQUEST_METHOD', '') == 'POST': user_head = user_head + config.html_head_queries - request.write("%s%s - %s%s" % ( + request.write("""%s%s - %s%s""" % ( user_head, cgi.escape(text), cgi.escape(config.html_pagetitle or config.sitename), keywords.get('html_head', ''), @@ -846,8 +846,8 @@ emit_custom_html(request, config.page_footer1) print """ - +
    -
    @@ -879,7 +879,7 @@ ' size="15" maxlength="50">' '' + ' alt="Search" class="search_button">' ) % config.url_prefix titlesearch = searchfield % { 'type': 'title', @@ -920,8 +920,9 @@ print """
    + + """ emit_custom_html(request, config.page_footer2) --- ./MoinMoin/Page.py 2003-11-09 22:00:45.000000000 +0100 +++ ./MoinMoin/Page.py.new 2004-02-16 12:15:26.000000000 +0100 @@ -407,7 +407,7 @@ page_needle = self.page_name if config.allow_subpages and string.count(page_needle, '/'): page_needle = '/' + string.split(page_needle, '/')[-1] - link = '%s/%s?action=fullsearch&value=%s&literal=1&case=1&context=40' % ( + link = '%s/%s?action=fullsearch&value=%s&literal=1&camp;ase=1&context=40' % ( webapi.getScriptname(), wikiutil.quoteWikiname(self.page_name), urllib.quote_plus(page_needle, '')) @@ -528,7 +528,7 @@ print self.formatter.bullet_list(1) for page in templates: print self.formatter.listitem(1) - print wikiutil.link_tag("%s?action=edit&template=%s" % ( + print wikiutil.link_tag("%s?action=edit&template=%s" % ( wikiutil.quoteWikiname(self.page_name), wikiutil.quoteWikiname(page)), page) --- ./wiki/htdocs/css/moinmoin.css 2003-04-01 00:26:29.000000000 +0200 +++ ./wiki/htdocs/css/moinmoin.css.new 2004-02-16 12:45:18.000000000 +0100 @@ -105,3 +105,11 @@ border-width: thin; width: 100%; } + +input.search_button { + width:12px; + height:12px; + margin-left:3px; + margin-right:3px; + border:none; +} \ Pas de fin de ligne à la fin du fichier.