Author: hhubner Date: 2006-03-12 15:07:24 -0500 (Sun, 12 Mar 2006) New Revision: 1922
Modified: branches/xml-class-rework/projects/bos/payment-website/templates/login.xml branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp Log: Make administrative login work properly again.
Modified: branches/xml-class-rework/projects/bos/payment-website/templates/login.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/login.xml 2006-03-12 18:23:55 UTC (rev 1921) +++ branches/xml-class-rework/projects/bos/payment-website/templates/login.xml 2006-03-12 20:07:24 UTC (rev 1922) @@ -1,29 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<html> - <head> - <title>Please login in to the BOS CMS</title> - </head> - <body> - <h1>Login</h1> - - <p>Please log in to the BOS CMS</p> - - <form method="post"> - <table> - <tr> - <td>Username</td> - <td><input name="__username"/></td> - </tr> - <tr> - <td>Password</td> - <td><input name="__password" type="password"/></td> - </tr> - <tr> - <td colspan="2"> - <input type="submit" name="action" value="login"/> - </td> - </tr> - </table> - </form> - </body> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:bos="http://createrainforest.org%22%3E + bos:admin-login-page + <head> + <title>Please login in to the BOS CMS</title> + <link rel="stylesheet" href="/static/cms.css" /> + </head> + <body> + <img src="/images/bos-logo.gif" width="348" height="255"/> + + <p>Please log in to the BOS CMS</p> + + <form method="post"> + <table> + <tr> + <td>Username</td> + <td><input name="__username"/></td> + </tr> + <tr> + <td>Password</td> + <td><input name="__password" type="password"/></td> + </tr> + <tr> + <td colspan="2"> + <input type="submit" name="action" value="login"/> + </td> + </tr> + </table> + </form> + </body> + </bos:admin-login-page> </html> \ No newline at end of file
Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 18:23:55 UTC (rev 1921) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 20:07:24 UTC (rev 1922) @@ -136,3 +136,8 @@ (format nil "~D" (apply #'+ (mapcar #'(lambda (contract) (length (contract-m2s contract))) (sponsor-contracts sponsor)))))) (mapc #'emit-template-node children)) + +(define-bknr-tag admin-login-page (&key children) + (if (admin-p (bknr-request-user (get-template-var :request))) + (html (:head ((:meta :http-equiv "refresh" :content "0; url=/admin")))) + (mapc #'emit-template-node children))) \ No newline at end of file