[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga/luci homebase/form-chooser homebase/form ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2006-10-09 16:16:11

Modified files:
	luci/homebase  : form-chooser form-macros index_html 
	luci/cluster   : form-chooser form-macros index_html 
	                 resource-form-macros 
	luci/storage   : form-chooser form-macros 

Log message:
	add page titles where appropriate

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-chooser.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/index_html.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-chooser.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.77&r2=1.78
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-chooser.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- conga/luci/homebase/form-chooser	2006/07/18 19:25:20	1.9
+++ conga/luci/homebase/form-chooser	2006/10/09 16:16:11	1.10
@@ -1,11 +1,11 @@
 <html>
 
 <head>
-	<title tal:content="template/title">The title</title>
+	<title id="pagetitle" tal:content="title">The title</title>
 </head>
 
 <tal:comment replace="nothing">
-	$Id: form-chooser,v 1.9 2006/07/18 19:25:20 rmccabe Exp $
+	$Id: form-chooser,v 1.10 2006/10/09 16:16:11 rmccabe Exp $
 </tal:comment>
 
 <body>
--- conga/luci/homebase/form-macros	2006/09/27 22:49:09	1.38
+++ conga/luci/homebase/form-macros	2006/10/09 16:16:11	1.39
@@ -1,11 +1,11 @@
 <html>
 
 <tal:comment replace="nothing">
-	$Id: form-macros,v 1.38 2006/09/27 22:49:09 rmccabe Exp $
+	$Id: form-macros,v 1.39 2006/10/09 16:16:11 rmccabe Exp $
 </tal:comment>
 
 <head>
-	<title tal:content="template/title">homebase</title>
+	<title tal:content="string:"></title>
 </head>
 
 <body>
@@ -40,7 +40,6 @@
 			- user was selected,
 			- selected index is valid
 	</tal:comment>
-
 	<script type="text/javascript" src="/luci/homebase/validate_user_del.js">
 	</script>
 
@@ -48,6 +47,10 @@
 		tal:define="global userList python:here.portal_membership.listMembers();
 					global blankForm python:1" />
 
+	<script type="text/javascript">
+		set_page_title('Luci — homebase — Delete a Luci user');
+	</script>
+
 	<form name="adminform" method="post" action=""
 		tal:condition="python: userList and len(userList) > 0">
 
@@ -102,6 +105,9 @@
 
 	<script type="text/javascript" src="/luci/homebase/validate_user_add.js">
 	</script>
+	<script type="text/javascript">
+		set_page_title('Luci — homebase — Add a Luci user');
+	</script>
 
 	<form name="adminform" method="post" action="">
 		<h2 class="homebase">Add a User</h2>
@@ -164,6 +170,9 @@
 
 	<script type="text/javascript" src="/luci/homebase/validate_perm.js">
 	</script>
+	<script type="text/javascript">
+		set_page_title('Luci — homebase — Set Luci user permissions');
+	</script>
 
 	<span
 		tal:omit-tag=""
@@ -278,6 +287,10 @@
 	<script type="text/javascript" src="/luci/homebase/validate_sys_remove.js">
 	</script>
 
+	<script type="text/javascript">
+		set_page_title('Luci — homebase — Remove a system or cluster from Luci');
+	</script>
+
 	<span tal:omit-tag=""
 		tal:define="global systems python:here.getSystems();
 					global blankForm python:1;
@@ -385,6 +398,10 @@
 	<script type="text/javascript" src="/luci/homebase/validate_sys_add.js">
 	</script>
 
+	<script type="text/javascript">
+		set_page_title('Luci — homebase — Add a storage system to be managed by Luci');
+	</script>
+
 	<form name="adminform" method="post" action="">
 		<h2 class="homebase">Add a System</h2>
 
@@ -461,6 +478,10 @@
 	<script type="text/javascript" src="/luci/homebase/validate_cluster_add.js">
 	</script>
 
+	<script type="text/javascript">
+		set_page_title('Luci — homebase — Add a running cluster to be managed by Luci');
+	</script>
+
 	<tal:block tal:omit-tag=""
 		tal:define="global sessionObj python:request.SESSION.get('checkRet')" />
 
@@ -564,6 +585,9 @@
 
 	<script type="text/javascript" src="/luci/homebase/validate_cluster_add_initial.js">
 	</script>
+	<script type="text/javascript">
+		set_page_title('Luci — homebase — Add a running cluster to be managed by Luci');
+	</script>
 
 	<form name="adminform" action="" method="post">
 		<input name="pagetype" type="hidden"
--- conga/luci/homebase/index_html	2006/09/29 21:41:43	1.17
+++ conga/luci/homebase/index_html	2006/10/09 16:16:11	1.18
@@ -15,7 +15,7 @@
 					xml:lang language">
 
 <tal:comment replace="nothing">
-	$Id: index_html,v 1.17 2006/09/29 21:41:43 rmccabe Exp $
+	$Id: index_html,v 1.18 2006/10/09 16:16:11 rmccabe Exp $
 </tal:comment>
 
 <head metal:use-macro="here/header/macros/html_header">
@@ -55,6 +55,7 @@
 	</metal:cssslot>
 
 	<metal:javascriptslot fill-slot="javascript_head_slot">
+		<script type="text/javascript" src="/luci/conga.js"></script>
 		<script type="text/javascript"
 			src="/luci/homebase/homebase_common.js">
 		</script>
@@ -63,7 +64,6 @@
 	</metal:javascriptslot>
 </head>
 
-
 <body tal:attributes="class here/getSectionFromURL;
 						dir python:test(isRTL, 'rtl', 'ltr')">
 
--- conga/luci/cluster/form-chooser	2006/09/27 22:24:11	1.8
+++ conga/luci/cluster/form-chooser	2006/10/09 16:16:11	1.9
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title tal:content="template/title">The title</title>
+    <title tal:content="string:"></title>
   </head>
   <body>
 
--- conga/luci/cluster/form-macros	2006/10/04 17:45:06	1.77
+++ conga/luci/cluster/form-macros	2006/10/09 16:16:11	1.78
@@ -1,13 +1,13 @@
 <html>
 
 <head>
-		<title tal:content="template/title">The title</title>
+	<title tal:content="string:"></title>
 </head>
 
 <body>
 
 <div metal:define-macro="entry-form">
-		<h2>Entry Form</h2>
+	<h2>Entry Form</h2>
 </div>
 
 <div metal:define-macro="busywaitpage">
@@ -135,6 +135,9 @@
 	<script type="text/javascript"
 		src="/luci/homebase/validate_cluster_add.js">
 	</script>
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — Deploy a cluster');
+	</script>
 
 	<tal:block tal:omit-tag=""
 		tal:define="global sessionObj python: request.SESSION.get('checkRet')" />
@@ -291,6 +294,9 @@
 </div>
 
 <div metal:define-macro="clusterconfig-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — Configure cluster properties');
+	</script>
 	<tal:comment tal:replace="nothing">
 		<span tal:define="global ricci_agent python: here.getRicciAgentForCluster(request)"/>
 	</tal:comment>
@@ -883,6 +889,9 @@
 </div>
 
 <div metal:define-macro="node-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — nodes — properties');
+	</script>
 	<tal:comment tal:replace="nothing">
 		First table row is status icon, name, and dropdown
 		Second row is daemon macro and failoverdom membership
@@ -1078,6 +1087,9 @@
 </div>
 
 <div metal:define-macro="nodes-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — nodes');
+	</script>
 <div id="node_list" tal:define="
 	global ricci_agent python: here.getRicciAgentForCluster(request);
 	global status python: here.getClusterStatus(ricci_agent);
@@ -1194,6 +1206,9 @@
 </div>
 
 <div metal:define-macro="nodeadd-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — Add a new cluster node');
+	</script>
 	<script type="text/javascript"
 		src="/luci/homebase/homebase_common.js">
 	</script>
@@ -1278,6 +1293,9 @@
 </div>
 
 <div metal:define-macro="servicelist-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — services');
+	</script>
 	<tal:block tal:omit-tag=""
 		tal:define="
 			global ricci_agent python: here.getRicciAgentForCluster(request);
@@ -1339,6 +1357,9 @@
 </div>
 
 <div metal:define-macro="serviceadd-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — services — Add a new service');
+	</script>
 	<tal:block metal:use-macro="here/form-macros/macros/service-config-head-macro" />
 
 	<h2>Add a Service</h2>
@@ -1397,6 +1418,9 @@
 </div>
 
 <div metal:define-macro="servicestart">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — services — Start a service');
+	</script>
 	<span tal:define="global ricci_agent python: here.getRicciAgentForCluster(request)"/>
 	<span tal:define="result python: here.serviceStart(ricci_agent, request)"/>
 	<!-- <span metal:use-macro="here/form-macros/macros/serviceconfig-form"/> -->
@@ -1404,12 +1428,18 @@
 
 
 <div metal:define-macro="servicerestart">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — services — Restart a service');
+	</script>
 	<span tal:define="global ricci_agent python: here.getRicciAgentForCluster(request)"/>
 	<span tal:define="result python: here.serviceRestart(ricci_agent, request)"/>
 	<!-- <span metal:use-macro="here/form-macros/macros/serviceconfig-form"/> -->
 </div>
 
 <div metal:define-macro="servicestop">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — services — Stop a service');
+	</script>
 	<span tal:define="global ricci_agent python: here.getRicciAgentForCluster(request)"/>
 	<span tal:define="result python: here.serviceStop(ricci_agent,request)"/>
 	<!-- <span metal:use-macro="here/form-macros/macros/serviceconfig-form"/> -->
@@ -1466,6 +1496,9 @@
 </div>
 
 <div metal:define-macro="serviceconfig-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — services — Configure a service');
+	</script>
 	<tal:block metal:use-macro="here/form-macros/macros/service-config-head-macro" />
 	<table class="cluster service" width="100%">
 		<tr class="cluster service info_top">
@@ -1608,6 +1641,9 @@
 </div>
 
 <div metal:define-macro="fdomlist-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — failover domains');
+	</script>
 	<tal:block
 		tal:define="
 			global ragent python: here.getRicciAgentForCluster(request);
@@ -1674,10 +1710,16 @@
 </div>
 
 <div metal:define-macro="fdomadd-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — failover domains — Add a failover domain');
+	</script>
 	<h2>Failover Domain Add Form</h2>
 </div>
 
 <div metal:define-macro="fdomconfig-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — failover domains — Configure a failover domain');
+	</script>
 	<h2>Failover Domain Configuration Form</h2>
 </div>
 
@@ -1690,18 +1732,30 @@
 </div>
 
 <div metal:define-macro="fencedevs-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — fence devices');
+	</script>
 	<h2>Fence Devices Form</h2>
 </div>
 
 <div metal:define-macro="fencedevlist-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — fence devices');
+	</script>
 	<h2>Fence Device List Form</h2>
 </div>
 
 <div metal:define-macro="fencedevadd-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — fence devices - Add a new fence device');
+	</script>
 	<h2>Fence Device Add Form</h2>
 </div>
 
 <div metal:define-macro="fencedevconfig-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — fence devices - Configure a fence device');
+	</script>
 	<h2>Fence Device Configuration Form</h2>
 </div>
 
--- conga/luci/cluster/index_html	2006/10/04 16:10:22	1.17
+++ conga/luci/cluster/index_html	2006/10/09 16:16:11	1.18
@@ -67,6 +67,7 @@
 
     <metal:javascriptslot fill-slot="javascript_head_slot">
       <tal:comment replace="nothing"> A slot where you can insert javascript in the header from a template </tal:comment>
+		<script type="text/javascript" src="/luci/conga.js"></script>
       <SCRIPT TYPE="text/javascript">
       <!--
        function dropdown(mySel)
--- conga/luci/cluster/resource-form-macros	2006/10/02 22:42:53	1.19
+++ conga/luci/cluster/resource-form-macros	2006/10/09 16:16:11	1.20
@@ -36,6 +36,9 @@
 </div>
 
 <div metal:define-macro="resources-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — resources');
+	</script>
 	<h2>Resources for <span tal:replace="request/clustername" /></h2>
 
 	<tal:block
@@ -77,10 +80,16 @@
 </div>
 
 <div metal:define-macro="resourceslist-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — resources');
+	</script>
 	<h2>Resources List Form</h2>
 </div>
 
 <div metal:define-macro="resourceremove-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — resources — Remove a resource');
+	</script>
 	<h2>Resources Remove Form</h2>
 
 	<tal:block tal:define="
@@ -181,6 +190,9 @@
 </div>
 
 <div metal:define-macro="resourceadd-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — resources — Add a resource');
+	</script>
 	<script type="text/javascript"
 		src="/luci/homebase/homebase_common.js">
 	</script>
@@ -200,6 +212,9 @@
 </div>
 
 <div metal:define-macro="resource-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — resources — Resource details');
+	</script>
 	<tal:block
 		tal:define="global res python: here.getResourceInfo(modelb, request)" />
 
@@ -232,6 +247,9 @@
 </div>
 
 <div metal:define-macro="resourceconfig-form">
+	<script type="text/javascript">
+		set_page_title('Luci — cluster — resources — Configure a resource');
+	</script>
 	<script type="text/javascript"
 		src="/luci/homebase/homebase_common.js">
 	</script>
--- conga/luci/storage/form-chooser	2006/10/07 01:04:01	1.3
+++ conga/luci/storage/form-chooser	2006/10/09 16:16:11	1.4
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title tal:content="template/title">The title</title>
+    <title id="pagetitle" tal:content="template/title">The title</title>
   </head>
   <body>
  
--- conga/luci/storage/form-macros	2006/10/07 01:04:01	1.8
+++ conga/luci/storage/form-macros	2006/10/09 16:16:11	1.9
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title tal:content="template/title">The title</title>
+    <title tal:content="string:"></title>
   </head>
   <body>
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]