changeset 4342:2bd88d32a0a1

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 27 Sep 2008 15:34:28 +0200
parents 79f0ef6935b9 (current diff) 61b60d54b591 (diff)
children c1a7c986afa5
files MoinMoin/i18n/__init__.py docs/CHANGES jabberbot/xmppbot.py
diffstat 2 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/diff.py	Thu Sep 25 19:00:46 2008 +0200
+++ b/MoinMoin/action/diff.py	Sat Sep 27 15:34:28 2008 +0200
@@ -120,12 +120,12 @@
 
     # Revision list starts from 2...
     if oldrev == min(revlist):
-        disable_prev = u' disabled="true"'
+        disable_prev = u' disabled="disabled"'
     else:
         disable_prev = u''
 
     if newrev == max(revlist):
-        disable_next = u' disabled="true"'
+        disable_next = u' disabled="disabled"'
     else:
         disable_next = u''
 
@@ -135,13 +135,13 @@
     if request.user.may.revert(pagename):
         revert_html = """
  <td style="border:0">
-  <span style="text-align:center">
-   <form action="%s" method="get">
+  <form action="%s" method="get">
+   <div style="text-align:center">
     <input name="action" value="revert" type="hidden">
     <input name="rev" value="%d" type="hidden">
     <input value="%s" type="submit"%s>
-   </form>
-  </span>
+   </div>
+  </form>
  </td>
  """ % (page_url, rev2, _("Revert to this revision"), disable_next)
 
@@ -150,25 +150,25 @@
 <table class="diff">
 <tr>
  <td style="border:0">
-  <span style="text-align:left">
-   <form action="%s" method="get">
+  <form action="%s" method="get">
+   <div style="text-align:left">
     <input name="action" value="diff" type="hidden">
     <input name="rev1" value="%d" type="hidden">
     <input name="rev2" value="%d" type="hidden">
     <input value="%s" type="submit"%s>
-   </form>
-  </span>
+   </div>
+  </form>
  </td>
  %s
  <td style="border:0">
-  <span style="text-align:right">
-   <form action="%s" method="get">
+  <form action="%s" method="get">
+   <div style="text-align:right">
     <input name="action" value="diff" type="hidden">
     <input name="rev1" value="%d" type="hidden">
     <input name="rev2" value="%d" type="hidden">
     <input value="%s" type="submit"%s>
-   </form>
-  </span>
+   </div>
+  </form>
  </td>
 </tr>
 </table>
--- a/MoinMoin/i18n/__init__.py	Thu Sep 25 19:00:46 2008 +0200
+++ b/MoinMoin/i18n/__init__.py	Sat Sep 27 15:34:28 2008 +0200
@@ -329,7 +329,7 @@
     # is available on this wiki...
     lang = get_browser_language(request)
     if not lang:
-        available = wikiLanguages()
+        available = wikiLanguages() or ["en"]
         # Or return the wiki default language...
         if request.cfg.language_default in available:
             lang = request.cfg.language_default