[Cluster-devel] conga/luci/plone-custom login_success portlet_ ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-09-19 14:59:27

Modified files:
	luci/plone-custom: login_success portlet_login 

Log message:
	cleanup

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_success.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/portlet_login.diff?cvsroot=cluster&r1=1.7&r2=1.8

--- conga/luci/plone-custom/login_success	2006/09/19 14:48:21	1.5
+++ conga/luci/plone-custom/login_success	2006/09/19 14:59:27	1.6
@@ -12,7 +12,7 @@
 
 <div metal:fill-slot="main">
 	<div tal:condition="not:isAnon">
-	<div tal:define="came_from request/came_from|string:/luci/homebase/;
+	<div tal:define="came_from request/came_from|nothing;
 					 initial_login request/initial_login|nothing;
 					 js_enabled python:request.get('js_enabled','1')!='0';">
 
@@ -55,4 +55,3 @@
 
 </body>
 </html>
-
--- conga/luci/plone-custom/portlet_login	2006/09/19 14:48:21	1.7
+++ conga/luci/plone-custom/portlet_login	2006/09/19 14:59:27	1.8
@@ -11,9 +11,9 @@
 	 tal:define="pageloc python: request.URL.split('/')[-1];
 				 okToShowHere python: not pageloc in ('login_form', 'join_form');
 				 auth nocall:here/acl_users/credentials_cookie_auth|nothing"
-	 tal:condition="python: isAnon and okToShowHere">
+	 tal:condition="isAnon">
 
-<tal:block tal:condition="python: here.siteIsSetup()">
+<tal:block tal:condition="python: okToShowHere and here.siteIsSetup()">
 
 <dl class="portlet"
 	id="portlet-login"