Changeset 1656

Timestamp:

11/10/08 13:19:52 (2 months ago)

Author:

duncan

Message:

Page Titles:

• Add to cgi's
  
• Add in missing on reports
  
• Amend capitalisation on some titles
  

Files:

• trunk/opsview-core/lib/Reports/Report.pm (modified) (1 diff)
• trunk/opsview-core/lib/Reports/Selection.pm (modified) (1 diff)
• trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Graph.pm (modified) (1 diff)
• trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Hypergraph.pm (modified) (1 diff)
• trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Snmptrap.pm (modified) (2 diffs)
• trunk/opsview-web/lib/Opsview/Web/Controller/Root.pm (modified) (1 diff)
• trunk/opsview-web/lib/Opsview/Web/Controller/Status.pm (modified) (1 diff)
• trunk/opsview-web/lib/Opsview/Web/Controller/WrapCGI.pm (modified) (16 diffs)
• trunk/opsview-web/lib/Opsview/Web/Utils.pm (modified) (1 diff)

trunk/opsview-core/lib/Reports/Report.pm

@@ -195 +195 @@
-}
-
+=item my_type_is
+
+Returns "scheduled report"
+
+=cut
+
+sub my_type_is {
+  return "scheduled report";
+}
+
-=back
-

trunk/opsview-core/lib/Reports/Selection.pm

@@ -60 +60 @@
-}
-
+=item my_type_is
+
+Returns "report selection"
+
+=cut
+
+sub my_type_is {
+  return "report selection";
+}
+
-=back
-

trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Graph.pm

@@ -48 +48 @@
-        my ($self, $c, @args) = @_;
-        $c->stash( submit_name => "plain" );
+        $c->stash->{ page_title } .= ' > '.$c->loc('Graphs');
-        $self->NEXT::auto($c, @args);
-}

trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Hypergraph.pm

@@ -32 +32 @@
-        my $host = $c->model("OpsviewDB::Host")->retrieve(1);
-        $c->stash->{ center_on } = $host->name;
-t
+T
-}
-

trunk/opsview-web/lib/Opsview/Web/Controller/Admin/Snmptrap.pm

@@ -43 +43 @@
-        $_ = "" unless (defined $_);
-        $c->stash( number_of_saved_tracing_hosts => $_ );
-trap s
+Trap S
-}
-
@@ -53 +53 @@
-        my @hosts_with_tracing = Opsview::Host->search( snmptrap_tracing => 1 );
-        $c->stash( hosts_with_tracing => \@hosts_with_tracing );
-trap t
+Trap T
-}
-

trunk/opsview-web/lib/Opsview/Web/Controller/Root.pm

@@ -516 +516 @@
-sub about : Local {
-  my ( $self, $c ) = @_;
+  $c->stash->{page_title} .= ' > ' . $c->loc( 'About' );
-}
-

trunk/opsview-web/lib/Opsview/Web/Controller/Status.pm

@@ -53 +53 @@
-        my @hosts = sort { $a->name cmp $b->name } @validhosts;
-        $c->stash( list => \@hosts );
-    $c->stash->{page_title} .= ' > '.$c->loc('Network t
+       $c->stash->{page_title} .= ' > '.$c->loc('Network T
-}
-

trunk/opsview-web/lib/Opsview/Web/Controller/WrapCGI.pm

@@ -23 +23 @@
-use strict;
-use warnings;
-
+ Opsview::Web::Utils
-
-__PACKAGE__->config(
@@ -58 +58 @@
-sub avail :Path('avail.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Availability Report' );
+  $self->setup_specific_page_titles( $c );
-  $self->cgi_to_process($c => 'avail.cgi');
-}
@@ -79 +81 @@
-sub extinfo :Path('extinfo.cgi') {
-  my ($self, $c) = @_;
+  my $cgi_type = $c->req->param( 'type' );
+
+  my $page_title = 
+      $cgi_type == 0 ? $c->loc( 'Process Information' )
+    : $cgi_type == 1 ? $c->loc( 'Detail' )
+    : $cgi_type == 2 ? $c->loc( 'Detail' )
+    : $cgi_type == 3 ? $c->loc( 'Comments' )
+    : $cgi_type == 4 ? $c->loc( 'Performance Information' )
+    : $cgi_type == 6 ? $c->loc( 'Scheduled Downtime' )
+    : $cgi_type == 7 ? $c->loc( 'Scheduling Queue' )
+    :                 ''
+    ;
+
+  if($page_title) {
+    $c->stash->{ page_title } .= ' > ' . $c->loc( 'Status') . ' > ' . $page_title;
+    $self->setup_specific_page_titles( $c );
+  }
-  $self->cgi_to_process($c => 'extinfo.cgi');
-}
@@ -84 +103 @@
-sub histogram :Path('histogram.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Alert Histogram' );
+  $self->setup_specific_page_titles( $c );
-  $self->cgi_to_process($c => 'histogram.cgi');
-}
@@ -89 +110 @@
-sub mrtg_rrd :Path('mrtg-rrd.cgi') {
-  my ($self, $c, $arg) = @_;
+
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Network Traffic' );
-
-  # As mrtg-rrd.cgi doesn't implement any access control, we do it here
@@ -100 +123 @@
-    $c->detach("/soft_error");
-  }
+  $self->setup_specific_page_titles( $c );
-  my $it = Opsview::Host->search( ip => $hostname );
-  unless ($it->count) {
@@ -129 +153 @@
-sub history :Path('history.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Alert History' );
+  $self->setup_specific_page_titles( $c );
-  $self->cgi_to_process($c => 'history.cgi');
-}
@@ -134 +160 @@
-sub new_config :Path('config.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Nagios Configuration' );
-  $self->cgi_to_process($c => 'config.cgi');
-}
@@ -139 +166 @@
-sub tac :Path('tac.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Tactical View' );
-  $self->cgi_to_process($c => 'tac.cgi');
-}
@@ -144 +172 @@
-sub outages :Path('outages.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Network Outages' );
-  $self->cgi_to_process($c => 'outages.cgi');
-}
@@ -149 +178 @@
-sub notifications :Path('notifications.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Notifications' );
+  $self->setup_specific_page_titles( $c );
-  $self->cgi_to_process($c => 'notifications.cgi');
-}
@@ -169 +200 @@
-sub trends :Path('trends.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Trends' );
+  $self->setup_specific_page_titles( $c );
-  $self->cgi_to_process($c => 'trends.cgi');
-}
@@ -174 +207 @@
-sub showlog :Path('showlog.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Log Display' );
-  $self->cgi_to_process($c => 'showlog.cgi');
-}
@@ -179 +213 @@
-sub summary :Path('summary.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Alert Summary' );
-  $self->cgi_to_process($c => 'summary.cgi');
-}
@@ -184 +219 @@
-sub status :Path('status.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Status' );
+  $self->setup_specific_page_titles( $c );
-  $self->cgi_to_process($c => 'status.cgi');
-}
@@ -189 +226 @@
-sub statusmap :Path('statusmap.cgi') {
-  my ($self, $c) = @_;
+  $c->stash->{ page_title } .= ' > ' . $c->loc( 'Status Map' );
-  $self->cgi_to_process($c => 'statusmap.cgi');
-}

trunk/opsview-web/lib/Opsview/Web/Utils.pm

@@ -68 +68 @@
-}
-
+sub setup_specific_page_titles {
+    my ($self, $c) = @_;
+    my $host = $c->req->param( 'host' );
+    my $hostgroup = $c->req->param( 'hostgroup' );
+    my $service = $c->req->param( 'service' );
+    my $servicegroup = $c->req->param( 'servicegroup' );
+
+    if($host && $host ne 'null' ) {
+        $c->stash->{page_title} .= ' > ' . $c->loc( 'Host: [_1]', $host );
+    }
+    if($hostgroup && $hostgroup ne 'null' ) {
+        $c->stash->{page_title} .= ' > ' . $c->loc( 'Hostgroup: [_1]', $hostgroup );
+    }
+    if($service && $service ne 'null' ) {
+        $c->stash->{page_title} .= ' > ' . $c->loc( 'Service: [_1]', $service );
+    }
+    if($servicegroup && $servicegroup ne 'null' ) {
+        $c->stash->{page_title} .= ' > ' . $c->loc( 'Servicegroup: [_1]', $servicegroup );
+    }
+}
+
-1;