From 93d6ae8ad0d612f086e41fc6b2db052994911052 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Wed, 24 Jun 2009 22:17:23 +0000 Subject: [PATCH] fill-in action* pages title pages correctly remove nodeview and siteview since these are replaced by pcuview add information to home page --- .../monitorweb/templates/actionlist.kid | 62 +++++++------- .../monitorweb/templates/actionsummary.kid | 10 +-- .../monitorweb/templates/nodehistory.kid | 2 +- .../monitorweb/templates/nodelist.kid | 2 +- .../monitorweb/templates/nodeview.kid | 83 ------------------- .../monitorweb/templates/pcuhistory.kid | 2 +- .../monitorweb/templates/pculist.kid | 2 +- .../monitorweb/templates/pcuview.kid | 4 +- .../monitorweb/templates/sitehistory.kid | 2 +- .../monitorweb/templates/sitelist.kid | 2 +- .../monitorweb/templates/sitemenu.kid | 2 +- .../monitorweb/templates/siteview.kid | 71 ---------------- .../monitorweb/templates/welcome.kid | 6 +- 13 files changed, 51 insertions(+), 199 deletions(-) delete mode 100644 web/MonitorWeb/monitorweb/templates/nodeview.kid delete mode 100644 web/MonitorWeb/monitorweb/templates/siteview.kid diff --git a/web/MonitorWeb/monitorweb/templates/actionlist.kid b/web/MonitorWeb/monitorweb/templates/actionlist.kid index ac49259..16414e5 100644 --- a/web/MonitorWeb/monitorweb/templates/actionlist.kid +++ b/web/MonitorWeb/monitorweb/templates/actionlist.kid @@ -1,6 +1,6 @@ - - Not Acknowledged(${fc['active']}) - Acknowledged(${fc['acknowledged']}) - All(${fc['all']}) + Last Day + Last Week + Last Month - +

Actions Over the Last ${since} Days

+

+ There are no recent actions taken for this site. +

+
- - - - - - + + + + + - + - - - - - - - - - + + + + + + + +
SiteHostnameIssue (severity)Last changeNotes (acknowledged)DateAction taken onAction TypeMessage IDErrors
${node[0]}Provide AckMessage from userAdd + + ${act.hostname} + + + ${act.loginbase} + + ${act.message_id} + latest bm log + + 

 				

 			
 		

+
 		
 		
 		
diff --git a/web/MonitorWeb/monitorweb/templates/actionsummary.kid b/web/MonitorWeb/monitorweb/templates/actionsummary.kid
index b6f4955..d54e918 100644
--- a/web/MonitorWeb/monitorweb/templates/actionsummary.kid
+++ b/web/MonitorWeb/monitorweb/templates/actionsummary.kid
@@ -1,6 +1,6 @@
 
 
 		
 			
-				Last Day
-				Last Week
-				Last Month
+				Last Day
+				Last Week
+				Last Month
 			
 		
 		
@@ -37,7 +37,7 @@ def zabbix_event_ack_link(eventid):
 			
 				
 					
-					
+					
 					
 				
 			
diff --git a/web/MonitorWeb/monitorweb/templates/nodehistory.kid b/web/MonitorWeb/monitorweb/templates/nodehistory.kid
index f03b692..de60dd9 100644
--- a/web/MonitorWeb/monitorweb/templates/nodehistory.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodehistory.kid
@@ -1,6 +1,6 @@
 
 
 
-
-
-
-  

-    
Node Status

-		
-			
-				
-					
-					
-					
-					
-					
-					
-					
-					
-				
-			
-			
-				
-					
-					
-					
-					
-					
-					
-					
-				
-			
-		
SiteHostnamepingkernellast_changelast_contact

-							${node.loginbase}
-					
-						
-							${node.hostname}
-					

-    
Controlling PCU

-		
-			
-				
-					
-					
-					
-					
-				
-			
-			
-				
-				
-					
-					
-					
-					
-				
-			
-		
PCU NameModelTest Results

-						
-							${pcu_name(pcu.plc_pcu_stats)}
-						
-					
-						
-					

-    
Actions Taken

-  

-
-
diff --git a/web/MonitorWeb/monitorweb/templates/pcuhistory.kid b/web/MonitorWeb/monitorweb/templates/pcuhistory.kid
index 5f97176..79fd07b 100644
--- a/web/MonitorWeb/monitorweb/templates/pcuhistory.kid
+++ b/web/MonitorWeb/monitorweb/templates/pcuhistory.kid
@@ -1,6 +1,6 @@
 
 
 
 
 
-	
Actions Over the Last Week

+	
Actions Over the Last ${since} Days

 		

 			There are no recent actions taken for this site.
 		

diff --git a/web/MonitorWeb/monitorweb/templates/sitehistory.kid b/web/MonitorWeb/monitorweb/templates/sitehistory.kid
index 68e3c45..8dfb823 100644
--- a/web/MonitorWeb/monitorweb/templates/sitehistory.kid
+++ b/web/MonitorWeb/monitorweb/templates/sitehistory.kid
@@ -1,6 +1,6 @@
 
 
 Sites
 				PCUs
 				Nodes
-				Actions
+				Actions
 			
 			
 			
diff --git a/web/MonitorWeb/monitorweb/templates/siteview.kid b/web/MonitorWeb/monitorweb/templates/siteview.kid
deleted file mode 100644
index bf24fe5..0000000
--- a/web/MonitorWeb/monitorweb/templates/siteview.kid
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-  

-    
Site Status

-		
-			
-				
-					
-					
-					
-					
-					
-					
-				
-			
-			
-				
-					
-					
-					
-					
-					
-					
-				
-			
-		
Site nameEnabledPenaltySlices/MaxNodes/TotalStatus

-							${site.loginbase}
-					n/a${site.slices_used}/${site.slices_total}${site.nodes_up} / ${site.nodes_total}

-    
Node List

-		

-			There are no registered nodes for this PCU.
-		

-		
-			
-				
-					
-					
-					
-					
-					
-					
-					
-				
-			
-			
-				
-					
-					
-					
-					
-					
-					
-					
-				
-			
-		
Hostnamepingpcukernellast_contact

-						your.host.org
-						${node.pcu_short_status}
-						${node.pcu_short_status}

-  

-
-
diff --git a/web/MonitorWeb/monitorweb/templates/welcome.kid b/web/MonitorWeb/monitorweb/templates/welcome.kid
index d1f4b93..43fdc21 100644
--- a/web/MonitorWeb/monitorweb/templates/welcome.kid
+++ b/web/MonitorWeb/monitorweb/templates/welcome.kid
@@ -11,9 +11,9 @@
     
Learn more

     Learn more about MyOps default policies, and take part in its development
     
     now
   
-- 
2.43.0