Index: /main/waeup.cas/trunk/waeup/cas/server.py
===================================================================
--- /main/waeup.cas/trunk/waeup/cas/server.py	(revision 10334)
+++ /main/waeup.cas/trunk/waeup/cas/server.py	(revision 10335)
@@ -1,6 +1,9 @@
 """A WSGI app for serving CAS.
 """
+import os
 from webob import exc, Response
 from webob.dec import wsgify
+
+template_dir = os.path.join(os.path.dirname(__file__), 'templates')
 
 
@@ -10,9 +13,11 @@
     @wsgify
     def __call__(self, req):
-        if req.path_qs in ['/login', '/validate', '/logout']:
-            return getattr(self, req.path_qs[1:])(req)
+        if req.path in ['/login', '/validate', '/logout']:
+            return getattr(self, req.path[1:])(req)
         return exc.HTTPNotFound()
 
     def login(self, req):
+        return Response(
+            open(os.path.join(template_dir, 'login.html'), 'r').read())
         return Response('Hi there!')
 
Index: /main/waeup.cas/trunk/waeup/cas/templates/login.html
===================================================================
--- /main/waeup.cas/trunk/waeup/cas/templates/login.html	(revision 10335)
+++ /main/waeup.cas/trunk/waeup/cas/templates/login.html	(revision 10335)
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>WAeUP Central Authentication Service</title>
+  </head>
+  <body>
+    Please enter your credentials to authenticate:
+    <form method="post">
+      <input type="text" name="username" />
+      <input type="password" name="password" />
+      <input type="submit" value="Login" />
+    </form>
+  </body>
+</html>
Index: /main/waeup.cas/trunk/waeup/cas/tests/test_server.py
===================================================================
--- /main/waeup.cas/trunk/waeup/cas/tests/test_server.py	(revision 10334)
+++ /main/waeup.cas/trunk/waeup/cas/tests/test_server.py	(revision 10335)
@@ -55,2 +55,12 @@
         resp = app(req)
         assert resp.status == '501 Not Implemented'
+
+    def test_login_simple(self):
+        # a simple login with no service will result in login screen
+        # (2.1.1#service of protocol specs)
+        app = CASServer()
+        req = Request.blank('http://localhost/login')
+        resp = app(req)
+        assert resp.status == '200 OK'
+        assert resp.content_type == 'text/html'
+        assert b'<form ' in resp.body
