From bd33c28d08a0766644accb118363e37a80d28bcc Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Fri, 13 Nov 2015 16:25:34 +0100
Subject: [PATCH] move login form (NodeView) to cco.member; + helper methods in
 NodeView

---
 browser/configure.zcml | 4 ++--
 browser/node.py        | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/browser/configure.zcml b/browser/configure.zcml
index e4dec31..a82194e 100644
--- a/browser/configure.zcml
+++ b/browser/configure.zcml
@@ -34,10 +34,10 @@
 
   <!-- login/logout -->
 
-  <page for="loops.interfaces.INode"
+  <!--<page for="loops.interfaces.INode"
         name="login.html"
         class="loops.browser.auth.LoginForm"
-        permission="zope.View" />
+        permission="zope.View" />-->
 
   <page for="loops.interfaces.INode"
         name="logout.html"
diff --git a/browser/node.py b/browser/node.py
index 00cf611..87c591c 100755
--- a/browser/node.py
+++ b/browser/node.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2013 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2015 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -422,8 +422,11 @@ class NodeView(BaseView):
     @Lazy
     def logoutUrl(self):
         nextUrl = urllib.urlencode(dict(nextUrl=self.menu.url))
-        return 'logout.html?' + nextUrl
+        return '%s/logout.html?%s' % (self.menu.url, nextUrl)
 
+    @Lazy
+    def authenticationMethod(self):
+        return self.viewAnnotations.get('auth_method') or 'standard'
 
     # virtual target support