Changeset 2984

Timestamp:

04/12/05 15:12:24 (8 years ago)

Author:

hauma

Message:

• Improved output of the redirect macro. Display the redirection target to enable clients with disabled JavaScript to follow the redirect.

File:

• trac/trunk/wiki-macros/redirect.py (modified) (1 diff)

trac/trunk/wiki-macros/redirect.py

@@ -6 +6 @@
 from trac.WikiFormatter import CommonFormatter
 
+NL = "\n"
+
 def execute(hdf, args, env):
+    preview = hdf.getValue('args.preview', "")
     db = env.get_db_cnx()
     out = StringIO()
     fmt = CommonFormatter(hdf, env, db)
+
     if args:
         link = fmt._expand_module_link(args)
         if link[0] != None:
-            # out.write("<tt>");
-            # out.write(link[0]);
-            # out.write("</tt>");
-            out.write("<script language=\"JavaScript\">\n")
-            out.write("document.location=\"")
-            out.write(link[0])
-            out.write("\";\n")
-            out.write("</script>")
-            return out.getvalue()
+            out.write('<div class="system-message">')
+            out.write('<strong>Redirect: </strong>')
+            out.write('You should have been redirected to ')
+            out.write('<a href="' + link[0] + '">')
+            out.write(args)
+            out.write('</a>')
+            out.write('.')
+            if not preview:
+                out.write('Since redirection doesn\'t seem to work, please click ')
+                out.write('<a href="' + link[0] + '">')
+                out.write('here')
+                out.write('</a>')
+                out.write('.')
+
+            out.write('</div>')
+
+            if not preview:
+                out.write(NL)
+                out.write('<script language="JavaScript">' + NL)
+                out.write('document.location="' + link[0] + '";' + NL)
+                out.write('</script>' + NL)
         else:
-            out.write('<div class="system-message"><strong>Error: Redirection target not found.</strong></div>')
+            out.write('<div class="system-message">')
+            out.write('<strong>Redirection Error: </strong>')
+            out.write('Redirection target not found.')
+            out.write('</div>')
+
     else:
-        out.write('<div class="system-message"><strong>Error: Missing redirection URL.</strong></div>')
+        out.write('<div class="system-message">')
+        out.write('<strong>Redirection Error: </strong>')
+        out.write('Missing redirection target.')
+        out.write('</div>')
 
+    return out.getvalue()
+