java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 2 -
web/html/network/systems/ssm/misc/landing.pxt | 15 ++++++++++++++
web/modules/sniglets/Sniglets/HTML.pm | 9 ++++++++
web/modules/sniglets/Sniglets/Servers.pm | 4 +--
4 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit d8bd935a2299cde838e0a1a676b88645dd409d94
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 17:04:41 2013 +0100
Redirect to landing.pxt to flush out the blue messages, then go to Index.do.
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
index f4298f3..53c33c2 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
@@ -131,7 +131,7 @@
<hr />
<input type="submit" name="sscd_change_system_prefs"
value="Change Preferences" />
- <input type="hidden" name="do_nothing_redir"
value="/rhn/systems/ssm/misc/Index.do" />
+ <input type="hidden" name="do_nothing_redir"
value="landing.pxt" />
<input type="hidden" name="pxt:trap"
value="rhn:ssm_change_system_prefs_cb" />
</div>
diff --git a/web/html/network/systems/ssm/misc/landing.pxt
b/web/html/network/systems/ssm/misc/landing.pxt
new file mode 100644
index 0000000..b2304bb
--- /dev/null
+++ b/web/html/network/systems/ssm/misc/landing.pxt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+ <pxt-use class="Grail::Frame" />
+ <pxt-use class="Sniglets::HTML" />
+
+ <grail-canvas-template base="/templates/c.pxt"
mode="main_canvas">
+
+ <h1><img src="/img/rhn-icon-system_group.gif" alt="system
set" /> System Set Manager <rhn-help
href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
+
+ <rhn-navi-nav prefix="system_set_manager" depth="0"
+ file="/nav/ssm.xml" style="contentnav" />
+
+ <rhn-refresh-redirect url="/rhn/systems/ssm/misc/Index.do"/>
+ </grail-canvas-template>
+</pxt-passthrough>
diff --git a/web/modules/sniglets/Sniglets/HTML.pm
b/web/modules/sniglets/Sniglets/HTML.pm
index fe8fe6d..681e9d2 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -39,6 +39,7 @@ sub register_tags {
$pxt->register_tag("rhn-checkable", \&rhn_checkable, 10);
+ $pxt->register_tag("rhn-refresh-redirect", \&rhn_refresh_redirect);
$pxt->register_tag("rhn-autorefresh-widget",
\&rhn_autorefresh_widget);
$pxt->register_tag("rhn-return-link", \&return_link);
}
@@ -211,6 +212,14 @@ sub unless_var {
return;
}
+sub rhn_refresh_redirect {
+ my $pxt = shift;
+ my %attr = @_;
+ my $url = $pxt->derelative_url($attr{url});
+ $pxt->header_out(Refresh => "5; $url");
+ return;
+}
+
my %refresh_speeds =
( fast => [ [ 0, "None" ],
[ 5, "5 seconds" ],
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index e617245..67004e0 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -499,7 +499,7 @@ sub server_prefs_form_cb {
$pxt->push_message(site_info => $message);
}
- $pxt->redirect('/rhn/systems/ssm/misc/Index.do');
+ $pxt->redirect('landing.pxt');
}
}
@@ -602,7 +602,7 @@ sub server_set_lock_cb {
}
$pxt->push_message(site_info => $msg);
- $pxt->redirect("index.pxt");
+ $pxt->redirect("landing.pxt");
}
sub remote_command_form {
Show replies by date