From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 19 Sep 2007 05:22:19 -0000
Subject: [Cluster-devel] conga/luci/plone-custom failsafe_login_form.cp ...
Message-ID: <20070919052219.5870.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-09-19 05:22:18

Modified files:
	luci/plone-custom: failsafe_login_form.cpt login_form.cpt 
	                   portlet_login 

Log message:
	Fix 277661: RFE: Better instructions on the luci login page if luci_admin not run.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/failsafe_login_form.cpt.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_form.cpt.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/portlet_login.diff?cvsroot=cluster&r1=1.10&r2=1.11

--- conga/luci/plone-custom/failsafe_login_form.cpt	2006/09/21 21:45:36	1.3
+++ conga/luci/plone-custom/failsafe_login_form.cpt	2007/09/19 05:22:18	1.4
@@ -143,8 +143,10 @@
 </tal:block>
 
 <div style="margin-top:1em" tal:condition="python: not here.siteIsSetup()">
-	The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
+	The Luci server has not been initialized. To initialize it, log in in to the server as root and run the commands
+	<br><code style="margin-left:+1.5em">service luci stop</code>
 	<br><code style="margin-left:+1.5em">luci_admin init</code>
+	<br><code style="margin-left:+1.5em">service luci start</code>
 </div>
 
 </div>
--- conga/luci/plone-custom/login_form.cpt	2006/09/21 21:45:36	1.3
+++ conga/luci/plone-custom/login_form.cpt	2007/09/19 05:22:18	1.4
@@ -136,8 +136,10 @@
 </tal:block>
 
 <div style="margin-top:1em" tal:condition="python: not here.siteIsSetup()">
-	The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
+	The Luci server has not been initialized. To initialize it, log in in to the server as root and run the commands
+	<br><code style="margin-left:+1.5em">service luci stop</code>
 	<br><code style="margin-left:+1.5em">luci_admin init</code>
+	<br><code style="margin-left:+1.5em">service luci start</code>
 </div>
 
 </div>
--- conga/luci/plone-custom/portlet_login	2007/09/11 16:04:33	1.10
+++ conga/luci/plone-custom/portlet_login	2007/09/19 05:22:18	1.11
@@ -108,8 +108,10 @@
 </tal:block>
 
 <div style="margin-top:1em" tal:condition="python: not here.siteIsSetup()">
-	The Luci server has not been initialized. To initialize it, log in in to the server as root and run the command
-	<br/><code style="margin-left:+1.5em">luci_admin init</code>
+	The Luci server has not been initialized. To initialize it, log in in to the server as root and run the commands
+	<br><code style="margin-left:+1.5em">service luci stop</code>
+	<br><code style="margin-left:+1.5em">luci_admin init</code>
+	<br><code style="margin-left:+1.5em">service luci start</code>
 </div>