Changes to 'refs/tags/spacewalk-web-1.9.10-1'
by Michael Mraka
Tag 'spacewalk-web-1.9.10-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-01-31 10:05 +0000
Tagging package [spacewalk-web] version [1.9.10-1] in directory [web/].
Changes since quartz-1.8.4-4:
Michael Mraka (8):
there's no abrt on RHEL5
look for pxt includes outside of document root
moved template files out of document root
pack templates into rpm
pack branding template files outside of document root
removed no longer necessary directory definitions
RewriteLock is no longer valid in apache 2.4
Automatic commit of package [spacewalk-web] release [1.9.10-1].
Milan Zazrivec (1):
correct the case
Stephen Herr (1):
856608 - moved rhncfg dependency on spacewalk-backend-libs to base package
---
branding/spacewalk-branding.spec | 16
branding/zz-spacewalk-branding.conf | 7
client/tools/rhncfg/rhncfg.spec | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6
rel-eng/comps/comps-spacewalk-client-rhel5.xml | 1
rel-eng/packages/spacewalk-web | 2
rel-eng/tito.props | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 21
spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf | 2
web/conf/rhn_web.conf | 3
web/html/formletters/forgot_accounts.xml | 20
web/html/formletters/forgot_password.xml | 20
web/html/nav/activation_key.xml | 38 -
web/html/nav/channel_detail.xml | 32 -
web/html/nav/duplicate_systems_tabs.xml | 14
web/html/nav/manage_channel.xml | 75 --
web/html/nav/package_detail.xml | 22
web/html/nav/sitenav-authenticated.xml | 269 ----------
web/html/nav/sitenav.xml | 42 -
web/html/nav/ssm.xml | 116 ----
web/html/nav/system_detail.xml | 195 -------
web/html/nav/system_group_detail.xml | 23
web/html/nav/user_detail.xml | 26
web/html/network/components/legends/errata-list-legend.pxi | 10
web/html/network/components/legends/event-status.pxi | 10
web/html/network/components/legends/event-type.pxi | 11
web/html/network/components/legends/scout-config-legend.pxi | 18
web/html/network/components/legends/system-list-legend.pxi | 28 -
web/html/network/components/message_queues/local.pxi | 9
web/html/network/components/message_queues/site.pxi | 8
web/html/network/components/monitoring/create_notification_method.pxi | 50 -
web/html/network/components/monitoring/delete_notification_method.pxi | 44 -
web/html/network/components/monitoring/edit_notification_method.pxi | 54 --
web/html/network/components/monitoring/notification_methods.pxi | 30 -
web/html/network/components/schedule_action-interface.pxi | 22
web/html/network/components/status_bar/main.pxi | 20
web/html/network/components/status_bar/ssm.pxi | 19
web/html/network/components/system_groups/sgdc_header.pxi | 26
web/html/network/components/systems/reschedule_action_form.pxi | 16
web/html/network/components/systems/system_details_toolbar.pxi | 36 -
web/include/Makefile | 20
web/include/formletters/forgot_accounts.xml | 20
web/include/formletters/forgot_password.xml | 20
web/include/nav/activation_key.xml | 38 +
web/include/nav/channel_detail.xml | 31 +
web/include/nav/duplicate_systems_tabs.xml | 14
web/include/nav/manage_channel.xml | 74 ++
web/include/nav/package_detail.xml | 22
web/include/nav/sitenav-authenticated.xml | 269 ++++++++++
web/include/nav/sitenav.xml | 42 +
web/include/nav/ssm.xml | 116 ++++
web/include/nav/system_detail.xml | 195 +++++++
web/include/nav/system_group_detail.xml | 23
web/include/nav/user_detail.xml | 26
web/include/network/components/legends/errata-list-legend.pxi | 10
web/include/network/components/legends/event-status.pxi | 10
web/include/network/components/legends/event-type.pxi | 11
web/include/network/components/legends/scout-config-legend.pxi | 17
web/include/network/components/legends/system-list-legend.pxi | 28 +
web/include/network/components/message_queues/local.pxi | 9
web/include/network/components/message_queues/site.pxi | 8
web/include/network/components/monitoring/create_notification_method.pxi | 50 +
web/include/network/components/monitoring/delete_notification_method.pxi | 44 +
web/include/network/components/monitoring/edit_notification_method.pxi | 54 ++
web/include/network/components/monitoring/notification_methods.pxi | 29 +
web/include/network/components/schedule_action-interface.pxi | 22
web/include/network/components/status_bar/main.pxi | 20
web/include/network/components/status_bar/ssm.pxi | 19
web/include/network/components/system_groups/sgdc_header.pxi | 26
web/include/network/components/systems/reschedule_action_form.pxi | 16
web/include/network/components/systems/system_details_toolbar.pxi | 35 +
web/modules/pxt/PXT/Request.pm | 2
web/modules/sniglets/Sniglets/Navi.pm | 4
web/spacewalk-web.spec | 8
74 files changed, 1344 insertions(+), 1353 deletions(-)
---
11 years, 2 months
8 commits - branding/spacewalk-branding.spec branding/zz-spacewalk-branding.conf rel-eng/packages spacewalk/config web/conf web/html web/include web/modules web/spacewalk-web.spec
by Michael Mraka
branding/spacewalk-branding.spec | 22
branding/zz-spacewalk-branding.conf | 7
rel-eng/packages/spacewalk-branding | 2
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 21
spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf | 2
web/conf/rhn_web.conf | 3
web/html/formletters/forgot_accounts.xml | 20
web/html/formletters/forgot_password.xml | 20
web/html/nav/activation_key.xml | 38 -
web/html/nav/channel_detail.xml | 32 -
web/html/nav/duplicate_systems_tabs.xml | 14
web/html/nav/manage_channel.xml | 75 --
web/html/nav/package_detail.xml | 22
web/html/nav/sitenav-authenticated.xml | 269 ----------
web/html/nav/sitenav.xml | 42 -
web/html/nav/ssm.xml | 116 ----
web/html/nav/system_detail.xml | 195 -------
web/html/nav/system_group_detail.xml | 23
web/html/nav/user_detail.xml | 26
web/html/network/components/legends/errata-list-legend.pxi | 10
web/html/network/components/legends/event-status.pxi | 10
web/html/network/components/legends/event-type.pxi | 11
web/html/network/components/legends/scout-config-legend.pxi | 18
web/html/network/components/legends/system-list-legend.pxi | 28 -
web/html/network/components/message_queues/local.pxi | 9
web/html/network/components/message_queues/site.pxi | 8
web/html/network/components/monitoring/create_notification_method.pxi | 50 -
web/html/network/components/monitoring/delete_notification_method.pxi | 44 -
web/html/network/components/monitoring/edit_notification_method.pxi | 54 --
web/html/network/components/monitoring/notification_methods.pxi | 30 -
web/html/network/components/schedule_action-interface.pxi | 22
web/html/network/components/status_bar/main.pxi | 20
web/html/network/components/status_bar/ssm.pxi | 19
web/html/network/components/system_groups/sgdc_header.pxi | 26
web/html/network/components/systems/reschedule_action_form.pxi | 16
web/html/network/components/systems/system_details_toolbar.pxi | 36 -
web/include/Makefile | 20
web/include/formletters/forgot_accounts.xml | 20
web/include/formletters/forgot_password.xml | 20
web/include/nav/activation_key.xml | 38 +
web/include/nav/channel_detail.xml | 31 +
web/include/nav/duplicate_systems_tabs.xml | 14
web/include/nav/manage_channel.xml | 74 ++
web/include/nav/package_detail.xml | 22
web/include/nav/sitenav-authenticated.xml | 269 ++++++++++
web/include/nav/sitenav.xml | 42 +
web/include/nav/ssm.xml | 116 ++++
web/include/nav/system_detail.xml | 195 +++++++
web/include/nav/system_group_detail.xml | 23
web/include/nav/user_detail.xml | 26
web/include/network/components/legends/errata-list-legend.pxi | 10
web/include/network/components/legends/event-status.pxi | 10
web/include/network/components/legends/event-type.pxi | 11
web/include/network/components/legends/scout-config-legend.pxi | 17
web/include/network/components/legends/system-list-legend.pxi | 28 +
web/include/network/components/message_queues/local.pxi | 9
web/include/network/components/message_queues/site.pxi | 8
web/include/network/components/monitoring/create_notification_method.pxi | 50 +
web/include/network/components/monitoring/delete_notification_method.pxi | 44 +
web/include/network/components/monitoring/edit_notification_method.pxi | 54 ++
web/include/network/components/monitoring/notification_methods.pxi | 29 +
web/include/network/components/schedule_action-interface.pxi | 22
web/include/network/components/status_bar/main.pxi | 20
web/include/network/components/status_bar/ssm.pxi | 19
web/include/network/components/system_groups/sgdc_header.pxi | 26
web/include/network/components/systems/reschedule_action_form.pxi | 16
web/include/network/components/systems/system_details_toolbar.pxi | 35 +
web/modules/pxt/PXT/Request.pm | 2
web/modules/sniglets/Sniglets/Navi.pm | 4
web/spacewalk-web.spec | 8
71 files changed, 1345 insertions(+), 1349 deletions(-)
New commits:
commit 77f0e5ea2f8c3bb568b248af28effde62c5fcdae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 31 11:05:56 2013 +0100
Automatic commit of package [spacewalk-branding] release [1.9.5-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index a24c402..d49743f 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.9.4
+Version: 1.9.5
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -88,6 +88,10 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Jan 31 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.5-1
+- removed no longer necessary directory definitions
+- pack branding template files outside of document root
+
* Tue Dec 04 2012 Jan Pazdziora 1.9.4-1
- On Fedoras, start to use tomcat >= 7.
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 01e7685..2d73ca4 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.9.4-1 branding/
+1.9.5-1 branding/
commit 707c5aab04afe727e66c478136d852da8cfafb24
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 31 11:05:39 2013 +0100
Automatic commit of package [spacewalk-web] release [1.9.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index a171c55..b4ba24a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.9-1 web/
+1.9.10-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index fc935ea..894616a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.9
+Version: 1.9.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -255,6 +255,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Jan 31 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.10-1
+- moved template files out of document root
+- look for pxt includes outside of document root
+
* Mon Jan 28 2013 Jan Pazdziora 1.9.9-1
- With removal of TracerList, all_traces is not longer used, removing.
commit f0afa665eeef3cb1f1148a42484fce6598335bb5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 29 15:29:01 2013 +0100
RewriteLock is no longer valid in apache 2.4
diff --git a/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf b/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
index 0eb26ef..e7203ad 100644
--- a/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
+++ b/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
@@ -3,7 +3,9 @@ KeepAlive On
MaxKeepAliveRequests 400
KeepAliveTimeout 15
RewriteEngine on
+<IfVersion == 2.2>
RewriteLock run/rhnccrewrite.lock
+</IfVersion>
RewriteMap KeyToSatId prg:/usr/share/rhn/satidmap.pl
RewriteRule ^/satconfig/(.*) /${KeyToSatId:$1?%{QUERY_STRING}} [PT]
#RewriteRule ^/satconfig/(.*) /$1 [PT]
commit 1dfd2ba21314d431345cbbf1a50064f48ef84a00
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 23 11:31:22 2013 +0100
removed no longer necessary directory definitions
diff --git a/branding/zz-spacewalk-branding.conf b/branding/zz-spacewalk-branding.conf
deleted file mode 100644
index fe3039c..0000000
--- a/branding/zz-spacewalk-branding.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<Directory "/var/www/html/templates/">
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 3bd884b..73385c6 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -290,13 +290,6 @@ PerlModule PXT::ApacheAuth
require acl user_role(monitoring_admin)
</Directory>
-<Directory "/var/www/html/network/components">
- AuthType Basic
- AuthName "RHN Org Admin Area"
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
-
<Directory "/var/www/html/network/software/channels">
AuthType Basic
AuthName "RHN Channel Area"
@@ -378,17 +371,3 @@ PerlModule PXT::ApacheAuth
PerlSetVar errata_context manage
</Directory>
-<Directory "/var/www/html/nav">
- AuthType Basic
- AuthName "RHN Org Admin Area"
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
-
-<Directory "/var/www/html/formletters">
- AuthType Basic
- AuthName "RHN Org Admin Area"
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
-
commit 9663c8cc1e754a11cb4371c98566ffe2b478830c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 23 14:31:21 2013 +0100
pack branding template files outside of document root
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 7e8bcac62..a24c402 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -27,11 +27,10 @@ jar -cf java-branding.jar -C java/code/src com
%install
rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -p -m 644 zz-spacewalk-branding.conf %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -d -m 755 %{buildroot}/%{_var}/www/html
-install -d -m 755 %{buildroot}/%{_var}/www/html/nav
+install -d -m 755 %{buildroot}%{_var}/www/html
install -d -m 755 %{buildroot}%{_datadir}/spacewalk
+install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web
+install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web/nav
install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/
%if 0%{?rhel} && 0%{?rhel} < 6
install -d -m 755 %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/
@@ -49,8 +48,8 @@ cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
# one in source:
cp -p img/favicon.ico %{buildroot}/%{_var}/www/html/
-cp -pR templates %{buildroot}/%{_var}/www/html/
-cp -pR styles %{buildroot}/%{_var}/www/html/nav/
+cp -pR templates %{buildroot}%{_datadir}/spacewalk/web/
+cp -pR styles %{buildroot}%{_datadir}/spacewalk/web/nav/
cp -pR setup %{buildroot}%{_datadir}/spacewalk/
cp -pR java-branding.jar %{buildroot}%{_datadir}/rhn/lib/
%if 0%{?rhel} && 0%{?rhel} < 6
@@ -69,16 +68,11 @@ rm -rf %{buildroot}
%files
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-branding.conf
%dir %{_var}/www/html/css
%{_var}/www/html/css/*
%dir /%{_var}/www/html/img
%{_var}/www/html/img/*
%{_var}/www/html/favicon.ico
-%dir /%{_var}/www/html/templates
-%{_var}/www/html/templates/*
-%dir /%{_var}/www/html/nav/styles
-%{_var}/www/html/nav/styles/*
%{_datadir}/spacewalk/
%{_datadir}/rhn/lib/java-branding.jar
%if 0%{?rhel} && 0%{?rhel} < 6
commit cc237c654e054ad587a94c1167127cb1ab93f664
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 23 11:31:22 2013 +0100
pack templates into rpm
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 8870e92..fc935ea 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -125,6 +125,7 @@ make -f Makefile.spacewalk-web PERLARGS="INSTALLDIRS=vendor" %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make -C modules install DESTDIR=$RPM_BUILD_ROOT PERLARGS="INSTALLDIRS=vendor" %{?_smp_mflags}
make -C html install PREFIX=$RPM_BUILD_ROOT
+make -C include install PREFIX=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -249,6 +250,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n spacewalk-html
%{_var}/www/html/*
+%{_datadir}/spacewalk/web
%doc LICENSE
# $Id$
commit ddcafa632dfcc01e4fc3e2e3c381936b81b6ccf4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 22 16:15:22 2013 +0100
moved template files out of document root
diff --git a/web/html/formletters/forgot_accounts.xml b/web/html/formletters/forgot_accounts.xml
deleted file mode 100644
index 175a5da..0000000
--- a/web/html/formletters/forgot_accounts.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<postal-letter subject="&product_name; Login Information">
-[ This is an automated email sent to <email-address /> at your request. ]
-
-You have requested a list of all <product-name /> logins associated
-with the email address <email-address />.
-
-Existing login(s):
-<account-list />
-
-You may reset the passwords for any of the above Red Hat logins at:
-
- https://<postal-template-replace label="hostname" default=" unknown hostname " />/help/forgot_password.pxt
-
-If you continue to have difficulties logging in, please contact
-your <product-name /> administrator for further assistance.
-If you did not request this email be sent, please disregard this message.
-
-Thank you for using <product-name />.
-<postal-template-replace label="email_footer"/>
-</postal-letter>
diff --git a/web/html/formletters/forgot_password.xml b/web/html/formletters/forgot_password.xml
deleted file mode 100644
index 51a22b4..0000000
--- a/web/html/formletters/forgot_password.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<postal-letter subject="&product_name; Password Reset">
-[ This is an automated email sent to <email-address /> at your request. ]
-
-Your <product-name /> password has been reset. To sign in, go to:
-
-https://<postal-template-replace label="hostname" default=" unknown hostname " />/
-
-And use the following username and password:
-
-Username: <username />
-Password: <password />
-
-Once you have logged in, you may then change your password.
-
-If you continue to have difficulties logging in, please contact
-your <product-name /> administrator for further assistance.
-
-Thank you for using <product-name />.
-<postal-template-replace label="email_footer"/>
-</postal-letter>
diff --git a/web/html/nav/activation_key.xml b/web/html/nav/activation_key.xml
deleted file mode 100644
index 69a3ca7..0000000
--- a/web/html/nav/activation_key.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="activation_key" invisible="1" title-depth="1" acl_mixins="RHN::Access::Token">
- <rhn-formvar name="tid" />
-
- <rhn-tab name="Details" url="/rhn/activationkeys/Edit.do" />
- <rhn-tab name="Child Channels" url="/rhn/activationkeys/channels/ChildChannels.do"/>
-
- <rhn-tab name="Packages"
- url="/rhn/activationkeys/packages/Packages.do"/>
- <rhn-tab name="Configuration"
- url="/rhn/activationkeys/configuration/List.do"
- acl="token_has_entitlement(provisioning_entitled)">
- <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
-
- <rhn-tab name="nav.sdc.config.list_unsubscribe_channels" url="/rhn/activationkeys/configuration/List.do">
- <rhn-tab url="/rhn/activationkeys/configuration/List.do"/>
- </rhn-tab>
- <rhn-tab name="nav.sdc.config.subscribe_channels" url="/rhn/activationkeys/configuration/Subscribe.do">
- <rhn-tab url="/rhn/activationkeys/configuration/Subscribe.do"/>
- </rhn-tab>
- <rhn-tab name="nav.sdc.config.rank_channels" url="/rhn/activationkeys/configuration/Rank.do">
- <rhn-tab url="/rhn/activationkeys/configuration/Rank.do"/>
- </rhn-tab>
-
- </rhn-tab>
-
-
- <rhn-tab name="Groups" url="/rhn/activationkeys/groups/List.do" >
- <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
- <rhn-tab name="List / Leave" url="/rhn/activationkeys/groups/List.do">
- <rhn-tab url="/rhn/activationkeys/groups/List.do"/>
- </rhn-tab>
- <rhn-tab name="Join" url="/rhn/activationkeys/groups/Add.do">
- <rhn-tab url="/rhn/activationkeys/groups/Add.do"/>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Activated Systems" url="/rhn/activationkeys/systems/List.do" />
-</rhn-navi-tree>
diff --git a/web/html/nav/channel_detail.xml b/web/html/nav/channel_detail.xml
deleted file mode 100644
index 6a0724a..0000000
--- a/web/html/nav/channel_detail.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="channel_detail" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
- <rhn-tab name="Details">
- <rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribers" acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()">
- <rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Managers" acl="org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()">
- <rhn-tab-url>/network/software/channels/managers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Errata" acl="channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/rhn/channels/ChannelErrata.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Packages">
- <rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Patches" acl="channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Patch Clusters" acl="channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/network/software/channels/patchsets.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribed Systems" on-click="Sniglets::Lists->navi_empty_set" node-id="systems_subscribed_to_channel">
- <rhn-tab-url>/rhn/channels/ChannelSubscribers.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Target Systems" acl="channel_subscribable()">
- <rhn-tab-url>/rhn/channels/TargetSystems.do</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
-
diff --git a/web/html/nav/duplicate_systems_tabs.xml b/web/html/nav/duplicate_systems_tabs.xml
deleted file mode 100644
index 8d710d6..0000000
--- a/web/html/nav/duplicate_systems_tabs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="duplicate_tabs" invisible="1" title-depth="1"
-formvar="inactive_count"
- acl_mixins="RHN::Access::Action">
- <rhn-tab name="duplicate.systems.nav.ips">
- <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="duplicate.systems.nav.hostname">
- <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="duplicate.systems.nav.mac_address">
- <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/nav/manage_channel.xml b/web/html/nav/manage_channel.xml
deleted file mode 100644
index 14807bc..0000000
--- a/web/html/nav/manage_channel.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="manage_channel" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
- <rhn-tab name="Details">
- <rhn-tab-url>/rhn/channels/manage/Edit.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/clone.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribers" acl="channel_exists();org_entitlement(sw_mgr_enterprise); org_channel_setting(not_globally_subscribable);user_can_admin_channel()">
- <rhn-tab-url>/network/software/channels/manage/subscribers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Organizations" acl="channel_exists(); channel_is_protected(); org_entitlement(sw_mgr_enterprise); user_role(org_admin)">
- <rhn-tab-url>/rhn/multiorg/channels/OrgList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Managers" acl="channel_exists();org_entitlement(sw_mgr_enterprise);user_role(channel_admin)">
- <rhn-tab-url>/network/software/channels/manage/managers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Errata" acl="channel_exists();user_can_admin_channel();channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/rhn/channels/manage/errata/Errata.do</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_errata">
- <rhn-tab-url>/rhn/channels/manage/errata/ListRemove.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/errata/ConfirmRemove.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_errata">
- <rhn-tab-url>/rhn/channels/manage/errata/Add.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Clone" acl="channel_is_clone();user_role(channel_admin)" on-click="Sniglets::Lists->navi_empty_set" node-id="clone_channel_errata">
- <rhn-tab-url>/network/software/channels/manage/errata/clone.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/errata/clone_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Sync" acl="channel_is_clone();user_role(channel_admin);" node-id="sync_errata">
- <rhn-tab-url>/rhn/channels/manage/errata/SyncErrata.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/errata/ConfirmSyncPackages.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Packages" acl="channel_exists()">
- <rhn-tab-url>/rhn/channels/manage/ChannelPackageMenu.do</rhn-tab-url>
- <rhn-tab name="List / Remove" >
- <rhn-tab-url>/rhn/channels/manage/ChannelPackages.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/ChannelPackagesRemove.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
- <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAdd.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAddConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Compare" acl="channel_exists(); not channel_packaging_type(sysv-solaris)" url="/network/software/channels/manage/packages/compare/index.pxt">
- <rhn-tab-directory>/network/software/channels/manage/packages/compare</rhn-tab-directory>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Repositories" acl="channel_exists()">
- <rhn-tab-url>/rhn/channels/manage/Repositories.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Patches" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patches/index.pxt</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patches/patch_list.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patches/remove_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patches/add.pxt?view_channel=no_channels</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patches/add.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patches/add_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Patchsets" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patchsets/index.pxt</rhn-tab-url>
- <rhn-tab name="List/Remove" on-click="Sniglets::Lists->navi_empty_set" >
- <rhn-tab-url>/rhn/channels/manage/solaris/ListPatchSets.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt?view_channel=no_channels</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patchsets/add_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-</rhn-navi-tree>
-
diff --git a/web/html/nav/package_detail.xml b/web/html/nav/package_detail.xml
deleted file mode 100644
index e245bf2..0000000
--- a/web/html/nav/package_detail.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="package_detail" invisible="1" formvar="pid" title-depth="1" acl_mixins="RHN::Access::Package">
- <rhn-tab name="Details" url="/rhn/software/packages/Details.do">
- <rhn-tab name="Overview" url="/rhn/software/packages/Details.do"/>
- <rhn-tab name="Dependencies" url="/network/software/packages/dependencies.pxt"/>
- <rhn-tab name="Package Map" url="/network/software/packages/package_map.pxt" acl="package_type_capable(package_map)"/>
- <rhn-tab name="Change Log" url="/rhn/software/packages/ChangeLog.do" acl="package_type_capable(change_log)"/>
- <rhn-tab name="File List" url="/network/software/packages/file_list.pxt" acl="package_type_capable(file_list)"/>
- </rhn-tab>
- <rhn-tab name="New Versions" url="/network/software/packages/newer_versions.pxt"/>
- <rhn-tab name="Patches" url="/network/software/packages/patches_patching_package.pxt" acl="package_type_capable(solaris_patchable)"/>
- <rhn-tab name="Packages" url="/network/software/packages/patch_packages.pxt" acl="package_type_capable(solaris_patch)"/>
- <rhn-tab name="Patch Clusters" url="/network/software/packages/patch_patchsets.pxt" acl="package_type_capable(solaris_patch)"/>
- <rhn-tab name="Patches" url="/network/software/packages/patchset_patches.pxt" acl="package_type_capable(solaris_patchset)"/>
- <rhn-tab name="Patched Systems" url="/network/software/packages/system_list_for_patch.pxt" acl="package_type_capable(solaris_patch)"/>
- <rhn-tab name="Installed Systems" url="/network/software/packages/system_list.pxt" acl="not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)"/>
- <rhn-tab name="Installed Systems" url="/network/software/packages/system_list_for_patchset.pxt" acl="package_type_capable(solaris_patchset)"/>
- <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patch.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patch)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
- <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patchset.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
- <rhn-tab name="Target Systems"
- url="/network/software/packages/target_system_list.pxt" acl="org_entitlement(sw_mgr_enterprise);not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
-</rhn-navi-tree>
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
deleted file mode 100644
index 4d24d85..0000000
--- a/web/html/nav/sitenav-authenticated.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav" title-depth="0">
- <rhn-tab name="Overview" url="/rhn/YourRhn.do" active-image="tab-your_rhn-selected.gif" inactive-image="tab-your_rhn.gif">
- <rhn-tab name="Overview" url="/rhn/YourRhn.do"/>
- <rhn-tab name="Your Account" url="/rhn/account/UserDetails.do" >
- <rhn-tab name="Addresses">
- <rhn-tab-url>/rhn/account/Addresses.do</rhn-tab-url>
- <rhn-tab-url>/rhn/account/EditAddress.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Change Email" url="/rhn/account/ChangeEmail.do" />
- <rhn-tab name="Account Deactivation" url="/rhn/account/AccountDeactivation.do"/>
- </rhn-tab>
- <rhn-tab name="Your Preferences" url="/rhn/account/UserPreferences.do" />
- <rhn-tab name="Locale Preferences" url="/rhn/account/LocalePreferences.do" />
- <rhn-tab name="Subscription Management" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" >
- <rhn-tab name="System Entitlements" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" />
- <rhn-tab name="Software Channel Entitlements" url="/rhn/channels/software/Entitlements.do" acl="user_role(org_admin)" />
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Systems" url="/rhn/systems/Overview.do">
- <rhn-tab name="Overview" url="/rhn/systems/Overview.do" acl="org_entitlement(sw_mgr_enterprise)"/>
- <rhn-tab name="Systems" url="/rhn/systems/SystemList.do">
- <rhn-tab-directory>/rhn/systems/details</rhn-tab-directory>
- <rhn-tab-directory>/network/systems/details</rhn-tab-directory>
- <rhn-tab name="All" url="/rhn/systems/SystemList.do"/>
- <rhn-tab name="Virtual Systems" url="/rhn/systems/VirtualSystemsList.do"/>
- <rhn-tab name="Out of Date" url="/rhn/systems/OutOfDate.do"/>
- <rhn-tab name="Unentitled" url="/rhn/systems/Unentitled.do"/>
- <rhn-tab name="Ungrouped" url="/rhn/systems/Ungrouped.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
- <rhn-tab name="Inactive" url="/rhn/systems/Inactive.do"/>
- <rhn-tab name="Recently Registered" url="/rhn/systems/Registered.do"/>
- <rhn-tab name="Proxy" url="/rhn/systems/ProxyList.do" acl="org_channel_family(rhn-proxy) or not is_satellite(); user_role(org_admin)"/>
- <rhn-tab name="Duplicate Systems" url="/rhn/systems/DuplicateIPList.do">
- <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/DuplicateSystemsCompare.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Currency" url="/rhn/systems/SystemCurrency.do"/>
- </rhn-tab>
- <rhn-tab name="System Groups" acl="org_entitlement(sw_mgr_enterprise)">
- <rhn-tab-directory>/rhn/systems/groups</rhn-tab-directory>
- <rhn-tab-directory>/rhn/groups</rhn-tab-directory>
- <rhn-tab-directory>/network/systems/groups</rhn-tab-directory>
- <rhn-tab-url>/rhn/systems/SystemGroupList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Set Manager" url="/rhn/ssm/index.do" acl="org_entitlement(sw_mgr_enterprise)">
- <rhn-tab-directory>/network/systems/ssm</rhn-tab-directory>
- <rhn-tab name="Status" url="/rhn/ssm/ViewAllLog.do" acl="org_entitlement(sw_mgr_enterprise)"/>
- </rhn-tab>
- <rhn-tab name="Advanced Search" url="/rhn/systems/Search.do" acl="org_entitlement(sw_mgr_enterprise)" />
- <rhn-tab name="Activation Keys" acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)">
- <rhn-tab-url>/rhn/activationkeys/List.do</rhn-tab-url>
- <rhn-tab-url>/rhn/activationkeys/Edit.do</rhn-tab-url>
- <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
- <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
- <rhn-tab-directory>/rhn/activationkeys/systems</rhn-tab-directory>
- <rhn-tab-directory>/network/account/activation_keys</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Stored Profiles" acl="org_entitlement(sw_mgr_enterprise);">
- <rhn-tab-url>/rhn/profiles/List.do</rhn-tab-url>
- <rhn-tab-directory>/network/profiles</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Custom System Info" acl="org_entitlement(rhn_provisioning)">
- <rhn-tab-url>/rhn/systems/customdata/CustomDataList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Kickstart" url="/rhn/kickstart/KickstartOverview.do" acl="org_entitlement(rhn_provisioning); user_role(config_admin)">
- <rhn-tab name="Profiles" url="/rhn/kickstart/Kickstarts.do">
- <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Bare Metal" url="/rhn/kickstart/KickstartIpRanges.do" />
- <rhn-tab name="GPG and SSL Keys" url="/rhn/keys/CryptoKeysList.do">
- <rhn-tab-directory>/rhn/keys</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Distributions" url="/rhn/kickstart/ViewTrees.do" acl="user_role(org_admin)">
- <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
- <rhn-tab-url>/rhn/kickstart/TreeEdit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="File Preservation" url="/rhn/systems/provisioning/preservation/PreservationList.do" />
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif">
- <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
- <rhn-tab-directory>/rhn/errata</rhn-tab-directory>
- <rhn-tab name="Relevant" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
- <rhn-tab name="All" url="/rhn/errata/AllErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
- </rhn-tab>
- <rhn-tab name="Advanced Search" url="/rhn/errata/Search.do"/>
- <rhn-tab name="Manage Errata" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)">
- <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
- <rhn-tab name="Published" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)" />
- <rhn-tab name="Unpublished" url="/rhn/errata/manage/UnpublishedErrata.do" acl="user_role(channel_admin)" />
- </rhn-tab>
- <rhn-tab name="Clone Errata" url="/rhn/errata/manage/CloneErrata.do" acl="user_role(channel_admin)">
- <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Channels" url="/rhn/software/channels/All.do" active-image="tab-channels-selected.gif" inactive-image="tab-channels.gif">
- <rhn-tab name="Software Channels" url="/rhn/software/channels/All.do">
- <rhn-tab-directory>/rhn/channels</rhn-tab-directory>
- <rhn-tab-directory>/network/channels</rhn-tab-directory>
- <rhn-tab-directory>/network/software/channels</rhn-tab-directory>
- <rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/>
- <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/Vendor.do"/>
- <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/>
- <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/>
- <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/>
- <rhn-tab name="Retired Channels" url="/rhn/software/channels/Retired.do"/>
- </rhn-tab>
- <rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
- <rhn-tab-directory>/network/software/packages</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Manage Software Channels" acl="user_can_manage_channels()">
- <rhn-tab-directory>/network/software/channels/manage</rhn-tab-directory>
- <rhn-tab-url>/rhn/channels/manage/Manage.do</rhn-tab-url>
- <rhn-tab name="Manage Software Packages" acl="user_role(channel_admin)" node-id="manage_packages">
- <rhn-tab-directory>/rhn/software/manage/packages</rhn-tab-directory>
- <rhn-tab-url>/rhn/software/manage/packages/PackageList.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Audit" url="/rhn/audit/ListXccdf.do">
- <rhn-tab-directory>/rhn/audit</rhn-tab-directory>
- <rhn-tab name="OpenSCAP" url="/rhn/audit/ListXccdf.do">
- <rhn-tab name="All Scans" url="/rhn/audit/ListXccdf.do"/>
- <rhn-tab name="XCCDF Diff" url="/rhn/audit/scap/Diff.do">
- <rhn-tab-url>/rhn/audit/scap/DiffSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Advanced Search" url="/rhn/audit/scap/Search.do"/>
- </rhn-tab>
- <rhn-tab name="audit.nav.logreview" url="/rhn/audit/Overview.do" acl="not is_satellite()">
- <rhn-tab name="Overview" url="/rhn/audit/Overview.do" />
- <rhn-tab name="Reviews" url="/rhn/audit/Machine.do" />
- <rhn-tab name="Search" url="/rhn/audit/Search.do" />
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Configuration" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)">
- <rhn-tab-directory>/rhn/configuration</rhn-tab-directory>
- <rhn-tab name="Overview" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)" />
- <rhn-tab name="Configuration Channels" url="/rhn/configuration/GlobalConfigChannelList.do" acl="user_role(config_admin)" />
- <rhn-tab name="Configuration Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" >
- <rhn-tab-directory>/rhn/configuration/file</rhn-tab-directory>
- <rhn-tab name="Centrally-Managed Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" />
- <rhn-tab name="Locally-Managed Files" url="/rhn/configuration/file/LocalConfigFileList.do" acl="user_role(config_admin)" />
- </rhn-tab>
- <rhn-tab name="Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)">
- <rhn-tab-directory>/rhn/configuration/system</rhn-tab-directory>
- <rhn-tab name="Managed Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)" />
- <rhn-tab name="Target Systems" url="/rhn/configuration/system/TargetSystems.do" acl="user_role(config_admin)">
- <rhn-tab-url>/rhn/configuration/system/TargetSystemsSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirmSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/configuration/system/Summary.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Schedule" url="/rhn/schedule/PendingActions.do" active-image="tab-schedule-selected.gif" inactive-image="tab-schedule.gif">
- <rhn-tab name="Pending Actions" url="/rhn/schedule/PendingActions.do"/>
- <rhn-tab name="Failed Actions" url="/rhn/schedule/FailedActions.do"/>
- <rhn-tab name="Completed Actions" url="/rhn/schedule/CompletedActions.do"/>
- <rhn-tab name="Archived Actions" url="/rhn/schedule/ArchivedActions.do"/>
- </rhn-tab>
- <rhn-tab name="Users" url="/rhn/users/ActiveList.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)" active-image="tab-users-selected.gif" inactive-image="tab-users.gif">
- <rhn-tab name="User List" url="/rhn/users/ActiveList.do">
- <rhn-tab-directory>/network/users</rhn-tab-directory>
- <rhn-tab name="Active" url="/rhn/users/ActiveList.do"/>
- <rhn-tab name="Disabled" url="/rhn/users/DisabledList.do"/>
- <rhn-tab name="All" url="/rhn/users/UserList.do"/>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Monitoring" url="/rhn/monitoring/ProbeList.do" active-image="tab-monitoring-selected.gif" inactive-image="tab-monitoring.gif" acl="show_monitoring()">
- <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
- <rhn-tab name="Status" url="/rhn/monitoring/ProbeList.do">
- <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Scout Config Push" acl="show_monitoring();" url="/network/monitoring/scout/index.pxt" >
- <rhn-tab-url>/network/monitoring/scout/index.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Notification" url="/rhn/monitoring/config/notification/Methods.do">
- <rhn-tab-url>rhn/monitoring/config/notification/NotificationMethods.do</rhn-tab-url>
- <rhn-tab name="Filters" url="/rhn/monitoring/config/notification/ActiveFilters.do"/>
- </rhn-tab>
- <rhn-tab name="Probe Suites" url="/rhn/monitoring/config/ProbeSuites.do">
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteCreate.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteEdit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteListProbes.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeCreate.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeEdit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystems.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystemsEdit.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Admin" url="/rhn/admin/multiorg/Organizations.do" active-image="tab-tools-selected.gif" inactive-image="tab-tools.gif" acl="user_role(satellite_admin)">
- <rhn-tab name="Organizations" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Organizations.do">
- <rhn-tab-url>/rhn/admin/multiorg/OrgDetails.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgUsers.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/DeleteOrg.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgSystemSubscriptions.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgSoftwareSubscriptions.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgCreate.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgConfigDetails.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscriptions" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/SoftwareEntitlements.do">
- <rhn-tab name="Software Channel Entitlements" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/multiorg/SoftwareEntitlements.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Entitlements" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/multiorg/SystemEntitlements.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/EntitlementOrgs.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Users" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Users.do">
- </rhn-tab>
- <rhn-tab acl="user_role(satellite_admin)" url="/rhn/admin/config/GeneralConfig.do">
- <rhn-tab-name><pxt-config var="product_name"/> Configuration</rhn-tab-name>
- <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
- <rhn-tab-url>/internal/satellite/config/restart_required.pxt</rhn-tab-url>
- <rhn-tab-url>/internal/satellite/config/restart_in_progress.pxt</rhn-tab-url>
- <rhn-tab name="General" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Monitoring" acl="show_monitoring(); user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/MonitoringConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Certificate" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/CertificateConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Bootstrap Script" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/BootstrapConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Organizations" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/Orgs.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Restart" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/Restart.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Cobbler" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/Cobbler.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Task Engine Status" acl="user_role(satellite_admin)" url="/rhn/admin/TaskStatus.do">
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Help" url="/rhn/help/index.do" active-image="tab-help-selected.gif" inactive-image="tab-help.gif">
- <rhn-tab-directory>/help</rhn-tab-directory>
- <rhn-tab name="Reference Guide" url="https://www.redhat.com/docs/manuals/satellite">
- <rhn-tab-directory>/rhn/help/reference/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Installation Guide" url="https://www.redhat.com/docs/manuals/satellite" >
- <rhn-tab-directory>/rhn/help/satellite/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Proxy Guide" url="https://www.redhat.com/docs/manuals/satellite">
- <rhn-tab-directory>/rhn/help/proxy/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Client Configuration" url="https://www.redhat.com/docs/manuals/satellite">
- <rhn-tab-directory>/rhn/help/client-config/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Channel Management" url="https://www.redhat.com/docs/manuals/satellite" >
- <rhn-tab-directory>/rhn/help/channel-mgmt/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Release Notes" url="https://www.redhat.com/docs/manuals/satellite" >
- <rhn-tab-directory>/rhn/help/release-notes/satellite/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="API" url="/rhn/apidoc/index.jsp" />
- <rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
- </rhn-tab>
-
-</rhn-navi-tree>
diff --git a/web/html/nav/sitenav.xml b/web/html/nav/sitenav.xml
deleted file mode 100644
index 9775219..0000000
--- a/web/html/nav/sitenav.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav_unauth" title-depth="0">
- <rhn-tab name="Install" url="/rhn/newlogin/CreateFirstUser.do" acl="need_first_user()">
- </rhn-tab>
- <rhn-tab name="Sign In" url="/" active-image="tab-sign_in-selected.gif" inactive-image="tab-sign_in.gif">
- </rhn-tab>
-
- <rhn-tab name="About" url="/help/about.pxt" active-image="tab-about_rhn-selected.gif" inactive-image="tab-about_rhn.gif" >
- <rhn-tab name="About" url="/help/about.pxt" />
- <rhn-tab name="Help Desk" url="/rhn/help/index.do" />
- <rhn-tab name="Lookup Login/Password" url="/help/forgot_password.pxt" />
- <rhn-tab name="Release Notes" url="/rhn/help/dispatcher/release_notes">
- <rhn-tab-directory>/rhn/help/release-notes/satellite</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Reference Guide" url="/rhn/help/dispatcher/reference_guide">
- <rhn-tab-directory>/rhn/help/reference</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Installation Guide" url="/rhn/help/dispatcher/install_guide">
- <rhn-tab-directory>/rhn/help/satellite</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Proxy Guide" url="/rhn/help/dispatcher/proxy_guide">
- <rhn-tab-directory>/rhn/help/proxy</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Client Configuration" url="/rhn/help/dispatcher/client_config_guide">
- <rhn-tab-directory>/rhn/help/client-config</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Channel Management" url="/rhn/help/dispatcher/channel_mgmt_guide">
- <rhn-tab-directory>/rhn/help/channel-mgmt</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="API" url="/rhn/apidoc/index.jsp">
- <rhn-tab name="Overview" url="/rhn/apidoc/index.jsp">
- <rhn-tab-directory>/rhn/apidoc</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="FAQs" url="/rhn/apidoc/faqs.jsp" />
- <rhn-tab name="Sample Scripts" url="/rhn/apidoc/scripts.jsp" />
- </rhn-tab>
- <rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
-</rhn-tab>
-
-
-</rhn-navi-tree>
diff --git a/web/html/nav/ssm.xml b/web/html/nav/ssm.xml
deleted file mode 100644
index 12f464b..0000000
--- a/web/html/nav/ssm.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="ssm" invisible="1" title-depth="1">
- <rhn-tab name="Overview" url="/rhn/ssm/index.do" />
- <rhn-tab name="Systems">
- <rhn-tab-url>/rhn/systems/ssm/ListSystems.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Errata"
- on-click="Sniglets::Lists->navi_empty_set"
- node-id="system_errata_list">
- <rhn-tab-url>/network/systems/ssm/errata/index.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/errata/systems_affected.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/errata/apply_errata_confirm.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Packages">
-
- <rhn-tab-url>/rhn/ssm/Packages.do</rhn-tab-url>
-
- <rhn-tab name="Install">
- <rhn-tab-url>/rhn/ssm/PackageInstall.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Remove">
- <rhn-tab-url>/rhn/ssm/PackageRemove.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Upgrade">
- <rhn-tab-url>/rhn/ssm/PackageUpgrade.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Verify">
- <rhn-tab-url>/rhn/ssm/PackageVerify.do</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Patches" acl="global_config(enable_solaris_support)">
-
- <rhn-tab-url>/network/systems/ssm/patches/index.pxt</rhn-tab-url>
-
- <rhn-tab name="Install">
- <rhn-tab-url>/network/systems/ssm/patches/install.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patches/install_channel.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patches/install_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Remove">
- <rhn-tab-url>/network/systems/ssm/patches/remove.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patches/remove_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Patch Clusters" acl="global_config(enable_solaris_support)">
-
- <rhn-tab-url>/network/systems/ssm/patchsets/index.pxt</rhn-tab-url>
-
- <rhn-tab name="Install">
- <rhn-tab-url>/network/systems/ssm/patchsets/install.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patchsets/install_channel.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patchsets/install_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Groups" acl="user_role(org_admin)">
- <rhn-tab-url>/network/systems/ssm/groups/index.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/groups/alter_membership_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/groups/create.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Channels">
- <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
- <rhn-tab name="Base Channels">
- <rhn-tab-url>/rhn/channel/ssm/BaseChannelSubscribe.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Child Channels">
- <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptionsConfirm.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Configuration" url="/rhn/systems/ssm/config/Deploy.do">
- <rhn-tab name="Deploy Files" url="/rhn/systems/ssm/config/Deploy.do" />
- <rhn-tab name="Compare Files" url="/rhn/systems/ssm/config/Diff.do" />
- <rhn-tab name="Subscribe to Channels" url="/rhn/systems/ssm/config/Subscribe.do" />
- <rhn-tab name="Unsubscribe from Channels" url="/rhn/systems/ssm/config/Unsubscribe.do" />
- <rhn-tab name="Enable Configuration" url="/rhn/systems/ssm/config/Enable.do" />
- </rhn-tab>
-
- <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do">
- <rhn-tab name="Kickstart" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do" >
- <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByProfile.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByIp.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Tag Systems" url="/network/systems/ssm/provisioning/tag_systems.pxt" />
- <rhn-tab name="Rollback" url="/network/systems/ssm/provisioning/rollback.pxt">
- <rhn-tab-url>/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Remote Command" url="/network/systems/ssm/provisioning/remote_command.pxt">
- <rhn-tab-url>/network/systems/ssm/provisioning/remote_command_conf.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Misc">
- <rhn-tab-url>/rhn/systems/ssm/misc/Index.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/HardwareRefresh.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/SoftwareRefresh.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/change_sys_pref_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/prof_conv_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/DeleteConfirm.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/reboot_systems_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/upgrade_slot.pxt</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/nav/system_detail.xml b/web/html/nav/system_detail.xml
deleted file mode 100644
index 46fb590..0000000
--- a/web/html/nav/system_detail.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="system_detail" invisible="1" title-depth="1" acl_mixins="RHN::Access::System">
- <rhn-formvar name="sid" />
- <rhn-tab name="Details" url="/rhn/systems/details/Overview.do">
- <rhn-tab name="Overview" url="/rhn/systems/details/Overview.do" />
- <rhn-tab name="Properties" url="/rhn/systems/details/Edit.do" />
- <rhn-tab name="Remote Command" acl="system_feature(ftr_remote_command)">
- <rhn-tab-url>/network/systems/details/remote_commands.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Connection" url="/network/systems/details/connection.pxt" acl="org_has_proxies()"/>
- <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt" acl="user_role(org_admin); system_feature(ftr_proxy_capable) or system_is_proxy(); org_channel_family(rhn-proxy) or system_is_proxy(); child_channel_candidate(rhn-proxy) or system_is_proxy(); org_entitlement(rhn_provisioning); not system_is_satellite(); not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)">
- <rhn-tab name="Activation" url="/network/systems/details/proxy.pxt" />
- <rhn-tab name="Systems Using Proxy" url="/network/systems/details/proxy-clients.pxt" acl="system_is_proxy()"/>
- </rhn-tab>
- <rhn-tab name="Reactivation" url="/network/systems/details/activation.pxt" acl="system_feature(ftr_agent_smith)"/>
- <rhn-tab name="Hardware">
- <rhn-tab-url>/rhn/systems/details/SystemHardware.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Migrate" acl="user_role(org_admin)" url="/rhn/systems/details/SystemMigrate.do" />
- <rhn-tab name="Notes">
- <rhn-tab-url>/rhn/systems/details/Notes.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/EditNote.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Custom Info" acl="system_feature(ftr_custom_info)">
- <rhn-tab-url>/rhn/systems/details/ListCustomData.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Software" url="/rhn/systems/details/packages/Packages.do">
-
- <rhn-tab name="Errata" acl="system_feature(ftr_errata_updates); not is_solaris()">
- <rhn-tab-url>/rhn/systems/details/ErrataList.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Patches" node-id="system_patch_list" acl="is_solaris()">
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_list">
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchListConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Install" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_available_list">
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstall.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstallConfirm.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Patch Clusters" on-click="Sniglets::Lists->navi_empty_set" node-id="solaris_patchset_list" acl="is_solaris()">
- <rhn-tab-url>/rhn/systems/details/packages/patchsets/PatchSetList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/patchsets/InstallPatchSet.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Packages" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/Packages.do</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list" acl="system_feature(ftr_package_remove)">
- <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/RemoveConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="List" acl="not system_feature(ftr_package_remove)">
- <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Upgrade" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_upgradable_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/UpgradableList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Install" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_installable_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/InstallPackages.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/InstallConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Verify" acl="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_verifiable_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/VerifyPackages.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/VerifyConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Profiles" acl="system_feature(ftr_profile_compare)" on-click="Sniglets::Lists->navi_empty_set" node-id="packages_for_system_sync">
- <rhn-tab-url>/rhn/systems/details/packages/profiles/ShowProfiles.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/profiles/Create.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareSystems.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareProfiles.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Software Channels" acl="system_feature(ftr_package_updates)">
- <rhn-tab-url>/rhn/systems/details/SystemChannels.do</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Configuration" acl="system_feature(ftr_config)" url="/rhn/systems/details/configuration/Overview.do">
-
- <rhn-tab-directory>/rhn/systems/details/configuration</rhn-tab-directory>
-
- <rhn-tab name="Overview" url="/rhn/systems/details/configuration/Overview.do"/>
-
- <rhn-tab name="View/Modify Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do">
- <rhn-tab name="Centrally Managed Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do"/>
- <rhn-tab name="Locally Managed Files" url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do"/>
- <rhn-tab name="Sandbox Managed Files" url="/rhn/systems/details/configuration/ViewModifySandboxPaths.do"/>
- </rhn-tab>
-
- <rhn-tab name="Add Files" url="/rhn/systems/details/configuration/addfiles/UploadFile.do">
- <rhn-tab name="Upload File" url="/rhn/systems/details/configuration/addfiles/UploadFile.do"/>
- <rhn-tab name="Import Files" url="/rhn/systems/details/configuration/addfiles/ImportFile.do">
- <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirmSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Create File" url="/rhn/systems/details/configuration/addfiles/CreateFile.do"/>
- </rhn-tab>
-
- <rhn-tab name="Deploy Files" url="/rhn/systems/details/configuration/DeployFile.do">
- <rhn-tab-url>/rhn/systems/details/configuration/DeployFileSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirmSubmit.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Compare Files" url="/rhn/systems/details/configuration/DiffFile.do">
- <rhn-tab-url>/rhn/systems/details/configuration/DiffFileSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirmSubmit.do</rhn-tab-url>
- </rhn-tab>
-
-
- <rhn-tab name="Manage Configuration Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
- <rhn-tab name="List/Unsubscribe from Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
- <rhn-tab-url>/rhn/systems/details/configuration/ConfigChannelListUnsubscribeSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribe to Channels" url="/rhn/systems/details/configuration/SubscriptionsSetup.do">
- <rhn-tab-url>/rhn/systems/details/configuration/SubscriptionsSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="View/Modify Rankings" url="/rhn/systems/details/configuration/RankChannels.do"/>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Provisioning" acl="not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)" url="/rhn/systems/details/kickstart/ScheduleWizard.do">
-
- <rhn-tab name="Kickstart" url="/rhn/systems/details/kickstart/ScheduleWizard.do" acl="system_feature(ftr_kickstart); not is_solaris()" node-id="kickstart_details">
- <rhn-tab-directory>/rhn/systems/details/kickstart</rhn-tab-directory>
- <rhn-tab name="Session Status" url="/rhn/systems/details/kickstart/SessionStatus.do" acl="system_kickstart_session_exists()">
- <rhn-tab-url>/rhn/systems/details/kickstart/SessionCancel.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Schedule" url="/rhn/kickstart/ScheduleWizard.do"/>
- <rhn-tab name="kickstart.variable.nav" url="/rhn/systems/details/kickstart/Variables.do" acl="cobbler_system_record_exists()"/>
- </rhn-tab>
-
- <rhn-tab name="Snapshots" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/index.pxt" hide_all_children_unless_active="1">
- <rhn-tab name="Rollback" formvar="ss_id" url="/network/systems/details/history/snapshots/rollback.pxt" />
- <rhn-tab name="Groups" formvar="ss_id" url="/network/systems/details/history/snapshots/groups.pxt" />
- <rhn-tab name="Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/channels.pxt" />
- <rhn-tab name="Packages" formvar="ss_id" url="/network/systems/details/history/snapshots/packages.pxt">
- <rhn-tab-url>/network/systems/details/history/snapshots/unservable_packages.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Config Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/namespaces.pxt" />
- <rhn-tab name="Config Files" formvar="ss_id" url="/network/systems/details/history/snapshots/config.pxt" />
- <rhn-tab name="Snapshot Tags" formvar="ss_id" url="/network/systems/details/history/snapshots/snapshot_tags.pxt">
- <rhn-tab-url>/network/systems/details/history/snapshots/add_snapshot_tag.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Snapshot Tags" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/system_tags.pxt" />
-
- </rhn-tab>
-
- <rhn-tab name="Monitoring" acl="show_monitoring(); system_feature(ftr_probes)">
- <rhn-tab-directory>/rhn/systems/details/probes</rhn-tab-directory>
- <rhn-tab-url>/rhn/systems/details/probes/ProbesList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/probes/ProbeDetails.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/probes/ProbeEdit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/probes/ProbeDelete.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/probes/create.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/probes/delete_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Groups" acl="system_feature(ftr_system_grouping); user_role(org_admin) or user_role(system_group_admin)">
- <rhn-tab-url>/rhn/systems/details/groups/ListRemove.do</rhn-tab-url>
- <rhn-tab name="List / Leave" url="/rhn/systems/details/groups/ListRemove.do"/>
- <rhn-tab name="Join" url="/rhn/systems/details/groups/Add.do"/>
- </rhn-tab>
-
- <rhn-tab name="Virtualization" acl="not system_is_virtual(); system_has_management_entitlement()">
- <rhn-tab-url>/rhn/systems/details/virtualization/VirtualGuestsList.do</rhn-tab-url>
- <rhn-tab name="Details" url="/rhn/systems/details/virtualization/VirtualGuestsList.do"/>
- <rhn-tab name="Provisioning" url="/rhn/systems/details/virtualization/ProvisionVirtualizationWizard.do" acl="system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)"/>
- </rhn-tab>
-
- <rhn-tab name="Groups" url="/rhn/systems/details/groups/ListRemove.do" acl="system_feature(ftr_system_grouping); not user_role(org_admin); not user_role(system_group_admin)"/>
-
- <rhn-tab name="Audit" url="/rhn/systems/details/audit/ListScap.do"/>
-
- <rhn-tab name="Events">
- <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/history/event.pxt</rhn-tab-url>
- <rhn-tab name="Pending">
- <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="History">
- <rhn-tab-url>/network/systems/details/history/history.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/nav/system_group_detail.xml b/web/html/nav/system_group_detail.xml
deleted file mode 100644
index 2bba613..0000000
--- a/web/html/nav/system_group_detail.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="system_group_detail" invisible="1" formvar="sgid" title-depth="1">
- <rhn-tab name="Details">
- <rhn-tab-url>/network/systems/groups/details.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/groups/delete_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Systems">
- <rhn-tab-url>/rhn/groups/ListRemoveSystems.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Target Systems" acl="user_role(system_group_admin)">
- <rhn-tab-url>/rhn/groups/AddSystems.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Errata" on-click="Sniglets::Lists->navi_empty_set" node-id="system_group_errata_list">
- <rhn-tab-url>/network/systems/groups/errata_list.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/groups/systems_affected_by_errata.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Admins" url="/network/systems/groups/admin_list.pxt" acl="user_role(system_group_admin)" />
-
- <rhn-tab name="Probes" url="/network/systems/groups/probe_list.pxt" acl="org_entitlement(rhn_monitor)" />
-
-</rhn-navi-tree>
diff --git a/web/html/nav/user_detail.xml b/web/html/nav/user_detail.xml
deleted file mode 100644
index 857c446..0000000
--- a/web/html/nav/user_detail.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="user_detail" invisible="1" formvar="uid" title-depth="1">
- <rhn-tab name="Details">
- <rhn-tab-url>/rhn/users/UserDetails.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Groups">
- <rhn-tab-url>/rhn/users/AssignedSystemGroups.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Systems">
- <rhn-tab-url>/rhn/users/SystemsAdmined.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Channel Permissions" acl="user_role(channel_admin)" url="/rhn/users/ChannelPerms.do">
- <rhn-tab name="Subscription" url="/rhn/users/ChannelPerms.do" />
- <rhn-tab name="Management" url="/rhn/users/ChannelManagementPerms.do" acl="org_role(channel_admin)"/>
- </rhn-tab>
- <rhn-tab name="Preferences">
- <rhn-tab-url>/rhn/users/UserPreferences.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Addresses">
- <rhn-tab-url>/rhn/users/Addresses.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Notification Methods" acl="org_entitlement(rhn_monitor)">
- <rhn-tab-url>/network/users/details/contact_methods/index.pxt</rhn-tab-url>
- <rhn-tab-directory>/network/users/details/contact_methods</rhn-tab-directory>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/network/components/legends/errata-list-legend.pxi b/web/html/network/components/legends/errata-list-legend.pxi
deleted file mode 100644
index e2f17c4..0000000
--- a/web/html/network/components/legends/errata-list-legend.pxi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>Errata Legend</h2>
- <ul>
- <li><img src="/img/wrh-security.gif" alt="" />Security</li>
- <li><img src="/img/wrh-bug.gif" alt="" />Bug Fix</li>
- <li><img src="/img/wrh-product.gif" alt="" />Enhancement</li>
- </ul>
-</div>
diff --git a/web/html/network/components/legends/event-status.pxi b/web/html/network/components/legends/event-status.pxi
deleted file mode 100644
index 7666896..0000000
--- a/web/html/network/components/legends/event-status.pxi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>Event Status Legend</h2>
- <ul>
- <li><img src="/img/rhn-listicon-ok.gif" alt="" />Complete</li>
- <li><img src="/img/rhn-listicon-error.gif" alt="" />Failure</li>
- <li><img src="/img/rhn-listicon-activity.gif" alt="" />Activity Occuring</li>
- </ul>
-</div>
diff --git a/web/html/network/components/legends/event-type.pxi b/web/html/network/components/legends/event-type.pxi
deleted file mode 100644
index ce8506a..0000000
--- a/web/html/network/components/legends/event-type.pxi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>Event Type Legend</h2>
- <ul>
- <li><img src="/img/rhn-listicon-package.gif" alt="" />Package Event</li>
- <li><img src="/img/rhn-listicon-errata.gif" alt="" />Errata Event</li>
- <li><img src="/img/rhn-listicon-preferences.gif" alt="" />Preferences Event</li>
- <li><img src="/img/rhn-listicon-system.gif" alt="" />System Event</li>
- </ul>
-</div>
diff --git a/web/html/network/components/legends/scout-config-legend.pxi b/web/html/network/components/legends/scout-config-legend.pxi
deleted file mode 100644
index 7ec3c67..0000000
--- a/web/html/network/components/legends/scout-config-legend.pxi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<div class="sideleg">
-<h2>Scout Config Legend</h2>
-<ul>
-<li><img title="Scout is fully updated with the latest probe data"
- alt="Scout is fully updated with the latest probe data" src="/img/configureScoutOK.gif" />Fully Updated</li>
-<li><img title="A Scout Config Push is required"
- alt="A Scout Config Push is required" src="/img/configureScout.gif" />Push Required</li>
-<li><img title="The last Scout Config Push generated warnings."
- alt="The last Scout Config Push generated warnings." src="/img/configureScoutWarning.gif" />Push had Warnings </li>
-<li><img title="The last Scout Config Push failed."
- alt="The last Scout Config Push failed." src="/img/configureScoutError.gif" />Push Failed</li>
-<li><img title="The Scout Config Push is in progress"
- alt="The Scout Config Push is in progress" src="/img/configureScoutPending.gif" />Push in Progress</li>
-</ul>
-</div>
-
diff --git a/web/html/network/components/legends/system-list-legend.pxi b/web/html/network/components/legends/system-list-legend.pxi
deleted file mode 100644
index fd1d284..0000000
--- a/web/html/network/components/legends/system-list-legend.pxi
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<pxt-passthrough>
-
-<pxt-use class="Sniglets::Users" />
-
-<div class="sideleg">
- <h2>System Legend</h2>
- <ul>
- <li><img src="/img/icon_up2date.gif" alt="" />OK</li>
- <li><img src="/img/icon_crit_update.gif" alt="" />Critical</li>
- <li><img src="/img/icon_reg_update.gif" alt="" />Warning</li>
- <li><img src="/img/icon_checkin.gif" alt="" />Unknown</li>
-<rhn-require acl="org_entitlement(sw_mgr_enterprise)">
- <li><img src="/img/icon_locked.gif" alt="" />Locked</li>
-</rhn-require>
-<rhn-require acl="org_entitlement(rhn_provisioning)">
- <li><img src="/img/icon_kickstart_session.gif" alt="" />Kickstarting</li>
-</rhn-require>
- <li><img src="/img/icon_pending.gif" alt="" />Pending Actions</li>
- <li><img src="/img/icon_unentitled.gif" alt="" />Unentitled</li>
-<rhn-require acl="org_entitlement(rhn_monitor)">
- <li><img src="/img/icon_subicon_monitoring.gif" alt="" />Monitoring Status</li>
-</rhn-require>
- </ul>
-</div>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/message_queues/local.pxi b/web/html/network/components/message_queues/local.pxi
deleted file mode 100644
index cc3caf7..0000000
--- a/web/html/network/components/message_queues/local.pxi
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-messages queue="local_alert">
- <div class="local-alert">{messages}</div>
-</pxt-messages>
-<pxt-messages queue="local_info">
- <div class="local-info">{messages}</div>
-</pxt-messages>
-</pxt-passthrough>
diff --git a/web/html/network/components/message_queues/site.pxi b/web/html/network/components/message_queues/site.pxi
deleted file mode 100644
index 77c6540..0000000
--- a/web/html/network/components/message_queues/site.pxi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-messages queue="site_info">
- <div class="site-info">
- {messages}
- </div>
-</pxt-messages>
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/create_notification_method.pxi b/web/html/network/components/monitoring/create_notification_method.pxi
deleted file mode 100644
index e9230ad..0000000
--- a/web/html/network/components/monitoring/create_notification_method.pxi
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::ContactMethod" />
-
-<h2>Create Notification Method</h2>
-
-<pxt-formvar>
-
-<div class="page-summary">
- <p>Create a notification method using the form provided.</p>
-</div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-
- <pxt-form method="post">
-
- <table class="details">
-
- <tr>
- <th>Method Name:</th>
- <td><input type="text" size="30" name="method_name" value="" maxlength="20" /></td>
- </tr>
- <tr>
- <th>Email:</th>
- <td><input type="text" size="30" name="method_email" value="" maxlength="50" /></td>
- </tr>
- <tr>
- <th>Message Format:</th>
- <td>
- <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="" />Short (Pager-Style) Messages
- </td>
- </tr>
- </table>
-
- <div align="right">
- <hr />
- <input type="hidden" name="pxt:trap" value="rhn:contact-method-create-cb" />
- <input type="hidden" name="redirect_to" value="index.pxt?uid={formvar:uid}" />
- <input type="submit" name="create_method" value="Create Method" />
- <pxt-hidden name="uid" />
- </div>
-
- </pxt-form>
-</pxt-formvar>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/delete_notification_method.pxi b/web/html/network/components/monitoring/delete_notification_method.pxi
deleted file mode 100644
index df76853..0000000
--- a/web/html/network/components/monitoring/delete_notification_method.pxi
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::ContactMethod" />
-<pxt-use class="Sniglets::Lists" />
-
-<h2>Notification Method Deletion Confirmation</h2>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<rhn-if-method-dependencies value="true">
- <div class="page-summary">
- <p>The <strong><rhn-contact-method-name /></strong> Notification Method cannot be deleted due to the following dependencies:</p>
- <p>Please note that only systems which you have permission to manage will be linked to from this page.</p>
- </div>
-
- <rhn-listview class="Sniglets::ListView::ProbeList" mode="probes_for_contact_method">
- <column name="System" label="system_name" sort_by="1" align="left" width="35%">
- <url>/rhn/systems/details/Overview.do?sid={column:system_id}</url>
- </column>
- <column name="Probe" label="probe_description" width="30%" align="left">
- <url>/rhn/systems/details/probes/ProbeDetails.do?probe_id={column:probe_id}&sid={column:system_id}</url>
- </column>
- </rhn-listview>
-</rhn-if-method-dependencies>
-
-<rhn-if-method-dependencies value="false">
- <div class="page-summary">
- <p>Delete Notification Method: <strong><rhn-contact-method-name /></strong></p>
- </div>
- <div align="right">
- <hr />
- <pxt-form method="post">
- <pxt-hidden name="cmid" />
- <input type="hidden" name="success_redirect" value="index.pxt?uid={formvar:uid}" />
- <input type="hidden" name="pxt:trap" value="rhn:contact-method-delete-cb" />
- <input type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
- </pxt-form>
- </div>
-</rhn-if-method-dependencies>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/edit_notification_method.pxi b/web/html/network/components/monitoring/edit_notification_method.pxi
deleted file mode 100644
index 53dce07..0000000
--- a/web/html/network/components/monitoring/edit_notification_method.pxi
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::ContactMethod" />
-
-<h2>Notification Method Details</h2>
-
-<pxt-formvar>
-
-<div class="toolbar"><rhn-deletion-link url="delete_confirm.pxt?cmid={formvar:cmid}" type="method" /></div>
-<div class="page-summary">
- <p>Edit this notification method using the form provided.</p>
-</div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
- <pxt-form method="post">
-
-<rhn-contact-method-edit-form>
-
- <table class="details">
- <tr>
- <th>Method Name:</th>
- <td><input type="text" size="30" name="method_name" value="{method_name}" maxlength="20" /></td>
- </tr>
- <tr>
- <th>Email:</th>
- <td><input type="text" size="30" name="method_email" value="{method_email}" maxlength="50" /></td>
- </tr>
- <tr>
- <th>Message Format:</th>
- <td>
- <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="{use_pager_type}" />Short (Pager-Style) Messages
- </td>
- </tr>
- </table>
-
- <div align="right">
- <hr />
- <input type="hidden" name="pxt:trap" value="rhn:contact-method-edit-cb" />
- <input type="hidden" name="redirect_to" value="index.pxt?uid={uid}" />
- <input type="submit" name="update_method" value="Update Method" />
- <pxt-hidden name="uid" />
- <pxt-hidden name="cmid" />
- </div>
-
-</rhn-contact-method-edit-form>
-
- </pxt-form>
-</pxt-formvar>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/notification_methods.pxi b/web/html/network/components/monitoring/notification_methods.pxi
deleted file mode 100644
index ecaea0b..0000000
--- a/web/html/network/components/monitoring/notification_methods.pxi
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Lists" />
-
-<h2>Monitoring Notification Methods</h2>
-
-<pxt-formvar>
-
-<div class="toolbar"><rhn-creation-link url="create.pxt?uid={formvar:uid}" type="method" /></div>
-
-<div class="page-summary">
- <p>A list of methods available for notification of monitoring events.</p>
-</div>
-
-<rhn-listview class="Sniglets::ListView::ContactMethodList" mode="users_contact_methods">
- <empty_list_message>No Notification Methods Available.</empty_list_message>
-
- <column name="Method Name" label="method_name" sort_by="1" width="50%" align="left">
- <url>edit.pxt?cmid={column:recid}</url>
- </column>
-
- <column name="Destination" label="method_target" sort_by="1" width="30%" align="left" />
-</rhn-listview>
-
-</pxt-formvar>
-
-</pxt-passthrough>
-
diff --git a/web/html/network/components/schedule_action-interface.pxi b/web/html/network/components/schedule_action-interface.pxi
deleted file mode 100644
index dece6b4..0000000
--- a/web/html/network/components/schedule_action-interface.pxi
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="schedule_time" value="asap" checked="1" /></td>
- <th>Schedule action as soon as possible</th>
- </tr>
- <tr>
- <td><input type="radio" name="schedule_time" value="at_entered_time" /></td>
- <th>Schedule action for no sooner than:</th>
- </tr>
- <tr>
- <th><img src="/img/rhn-icon-schedule.gif" alt="Date Selection" /></th>
- <td>{date_selection}</td>
- </tr>
-</table>
-
-<div align="right">
-<hr />
-{button}
-</div>
-</pxt-passthrough>
diff --git a/web/html/network/components/status_bar/main.pxi b/web/html/network/components/status_bar/main.pxi
deleted file mode 100644
index cf8416a..0000000
--- a/web/html/network/components/status_bar/main.pxi
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::Header" />
- <pxt-use class="Sniglets::Search" />
- <pxt-use class="Sniglets::Sets" />
-
-<div id="bar">
-
-<div id="systembar">
-<div id="systembarinner">
-<pxt-include file="/network/components/status_bar/ssm.pxi" />
-</div>
-</div>
-
-</div>
-<!-- close bar -->
-
-
-</pxt-passthrough>
diff --git a/web/html/network/components/status_bar/ssm.pxi b/web/html/network/components/status_bar/ssm.pxi
deleted file mode 100644
index 8ba51ad..0000000
--- a/web/html/network/components/status_bar/ssm.pxi
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::Lists" />
-<pxt-use class="Sniglets::HTML" />
-
-<div>
-<rhn-require acl="user_authenticated(); org_entitlement(sw_mgr_enterprise)">
- <span id="header_selcount"><rhn-set-totals set="system_list" noun="system"/></span>
-
- <a class="button" href="/rhn/ssm/index.do">Manage</a>
-
-<rhn-return-link default="/network">
- <a class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
-</rhn-return-link>
-
-</rhn-require>
-</div>
-</pxt-passthrough>
diff --git a/web/html/network/components/system_groups/sgdc_header.pxi b/web/html/network/components/system_groups/sgdc_header.pxi
deleted file mode 100644
index 084fd23..0000000
--- a/web/html/network/components/system_groups/sgdc_header.pxi
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::ServerGroup" />
-
-<pxt-formvar>
-
- <rhn-toolbar base="h1"
- img="/img/rhn-icon-system_group.gif"
- alt="system group"
- help-url="s1-sm-systems.jsp#s2-sm-system-group-list"
- misc-url="/network/systems/ssm/work_with_group.pxt?sgid={formvar:sgid}&pxt_trap=rhn:work_with_group_cb"
- misc-alt="work with group"
- misc-img="/img/work_with_group.gif"
- misc-text="work with group"
- deletion-type="group"
- deletion-url="delete_confirm.pxt?sgid={formvar:sgid}"
- deletion-acl="user_role(system_group_admin)">
- <rhn-server-group-name />
- </rhn-toolbar>
-
- <rhn-navi-nav prefix="system_group_details" depth="0" file="/nav/system_group_detail.xml" style="contentnav" />
-
-</pxt-formvar>
-</pxt-passthrough>
diff --git a/web/html/network/components/systems/reschedule_action_form.pxi b/web/html/network/components/systems/reschedule_action_form.pxi
deleted file mode 100644
index 94676d2..0000000
--- a/web/html/network/components/systems/reschedule_action_form.pxi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- This history event was caused by a failed scheduled action.<br/>
- <p>If you have corrected the problem, you may reschedule the action below.</p>
- <pxt-form method="post">
-<pxt-formvar>
- <pxt-hidden name="sid" />
- <input type="hidden" name="aid" value="{formvar:hid}" />
- <input type="hidden" name="success_redirect" value="/network/systems/details/history/pending.pxt" />
- <input type="hidden" name="pxt:trap" value="rhn:reschedule_action_cb" />
- <input type="submit" value="Reschedule" />
-</pxt-formvar>
- </pxt-form>
-
-</pxt-passthrough>
\ No newline at end of file
diff --git a/web/html/network/components/systems/system_details_toolbar.pxi b/web/html/network/components/systems/system_details_toolbar.pxi
deleted file mode 100644
index 0d54619..0000000
--- a/web/html/network/components/systems/system_details_toolbar.pxi
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Servers" />
-<pxt-use class="Sniglets::Users" />
-<pxt-formvar>
-<!-- Regular system -->
-<rhn-require acl="not system_is_virtual_host(); not system_is_virtual()">
- <rhn-toolbar base="h1" img="/img/rhn-icon-system.gif"
- alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
- deletion-type="system">
- <rhn-server-name />
- </rhn-toolbar>
-</rhn-require>
-<!-- virtual host -->
-<rhn-require acl="system_is_virtual_host()">
- <rhn-toolbar base="h1" img="/img/virt-host.png"
- alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
- deletion-type="system">
- <rhn-server-name />
- </rhn-toolbar>
-</rhn-require>
-<!-- virtual guest -->
-<rhn-require acl="system_is_virtual()">
- <rhn-toolbar base="h1" img="/img/virt-guest.png"
- alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
- deletion-type="system">
- <rhn-server-name />
- </rhn-toolbar>
-</rhn-require>
-</pxt-formvar>
-</pxt-passthrough>
-
diff --git a/web/include/Makefile b/web/include/Makefile
new file mode 100644
index 0000000..2095184
--- /dev/null
+++ b/web/include/Makefile
@@ -0,0 +1,20 @@
+# Makefile for installing the html files for RHN
+#
+# $Id$
+
+TOP = ..
+
+# Project defines
+INSTALL_DEST = /usr/share/spacewalk/web
+
+# common stuff
+include $(TOP)/Makefile.defs
+
+# exclude these files from instalation
+NO_INSTALL = Makefile
+
+all::
+
+install:: $(PREFIX)/$(INSTALL_DEST)
+ tar cpf - $(addprefix --exclude ,$(NO_INSTALL)) . | \
+ tar vxf - -C $(PREFIX)$(INSTALL_DEST)
diff --git a/web/include/formletters/forgot_accounts.xml b/web/include/formletters/forgot_accounts.xml
new file mode 100644
index 0000000..175a5da
--- /dev/null
+++ b/web/include/formletters/forgot_accounts.xml
@@ -0,0 +1,20 @@
+<postal-letter subject="&product_name; Login Information">
+[ This is an automated email sent to <email-address /> at your request. ]
+
+You have requested a list of all <product-name /> logins associated
+with the email address <email-address />.
+
+Existing login(s):
+<account-list />
+
+You may reset the passwords for any of the above Red Hat logins at:
+
+ https://<postal-template-replace label="hostname" default=" unknown hostname " />/help/forgot_password.pxt
+
+If you continue to have difficulties logging in, please contact
+your <product-name /> administrator for further assistance.
+If you did not request this email be sent, please disregard this message.
+
+Thank you for using <product-name />.
+<postal-template-replace label="email_footer"/>
+</postal-letter>
diff --git a/web/include/formletters/forgot_password.xml b/web/include/formletters/forgot_password.xml
new file mode 100644
index 0000000..51a22b4
--- /dev/null
+++ b/web/include/formletters/forgot_password.xml
@@ -0,0 +1,20 @@
+<postal-letter subject="&product_name; Password Reset">
+[ This is an automated email sent to <email-address /> at your request. ]
+
+Your <product-name /> password has been reset. To sign in, go to:
+
+https://<postal-template-replace label="hostname" default=" unknown hostname " />/
+
+And use the following username and password:
+
+Username: <username />
+Password: <password />
+
+Once you have logged in, you may then change your password.
+
+If you continue to have difficulties logging in, please contact
+your <product-name /> administrator for further assistance.
+
+Thank you for using <product-name />.
+<postal-template-replace label="email_footer"/>
+</postal-letter>
diff --git a/web/include/nav/activation_key.xml b/web/include/nav/activation_key.xml
new file mode 100644
index 0000000..06f38ff
--- /dev/null
+++ b/web/include/nav/activation_key.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="activation_key" invisible="1" title-depth="1" acl_mixins="RHN::Access::Token">
+ <rhn-formvar name="tid" />
+
+ <rhn-tab name="Details" url="/rhn/activationkeys/Edit.do" />
+ <rhn-tab name="Child Channels" url="/rhn/activationkeys/channels/ChildChannels.do"/>
+
+ <rhn-tab name="Packages"
+ url="/rhn/activationkeys/packages/Packages.do"/>
+ <rhn-tab name="Configuration"
+ url="/rhn/activationkeys/configuration/List.do"
+ acl="token_has_entitlement(provisioning_entitled)">
+ <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
+
+ <rhn-tab name="nav.sdc.config.list_unsubscribe_channels" url="/rhn/activationkeys/configuration/List.do">
+ <rhn-tab url="/rhn/activationkeys/configuration/List.do"/>
+ </rhn-tab>
+ <rhn-tab name="nav.sdc.config.subscribe_channels" url="/rhn/activationkeys/configuration/Subscribe.do">
+ <rhn-tab url="/rhn/activationkeys/configuration/Subscribe.do"/>
+ </rhn-tab>
+ <rhn-tab name="nav.sdc.config.rank_channels" url="/rhn/activationkeys/configuration/Rank.do">
+ <rhn-tab url="/rhn/activationkeys/configuration/Rank.do"/>
+ </rhn-tab>
+
+ </rhn-tab>
+
+
+ <rhn-tab name="Groups" url="/rhn/activationkeys/groups/List.do" >
+ <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
+ <rhn-tab name="List / Leave" url="/rhn/activationkeys/groups/List.do">
+ <rhn-tab url="/rhn/activationkeys/groups/List.do"/>
+ </rhn-tab>
+ <rhn-tab name="Join" url="/rhn/activationkeys/groups/Add.do">
+ <rhn-tab url="/rhn/activationkeys/groups/Add.do"/>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Activated Systems" url="/rhn/activationkeys/systems/List.do" />
+</rhn-navi-tree>
diff --git a/web/include/nav/channel_detail.xml b/web/include/nav/channel_detail.xml
new file mode 100644
index 0000000..c0ee0c4
--- /dev/null
+++ b/web/include/nav/channel_detail.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="channel_detail" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribers" acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()">
+ <rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Managers" acl="org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()">
+ <rhn-tab-url>/network/software/channels/managers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Errata" acl="channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/rhn/channels/ChannelErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Packages">
+ <rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Patches" acl="channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Patch Clusters" acl="channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/network/software/channels/patchsets.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribed Systems" on-click="Sniglets::Lists->navi_empty_set" node-id="systems_subscribed_to_channel">
+ <rhn-tab-url>/rhn/channels/ChannelSubscribers.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Target Systems" acl="channel_subscribable()">
+ <rhn-tab-url>/rhn/channels/TargetSystems.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/duplicate_systems_tabs.xml b/web/include/nav/duplicate_systems_tabs.xml
new file mode 100644
index 0000000..8d710d6
--- /dev/null
+++ b/web/include/nav/duplicate_systems_tabs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="duplicate_tabs" invisible="1" title-depth="1"
+formvar="inactive_count"
+ acl_mixins="RHN::Access::Action">
+ <rhn-tab name="duplicate.systems.nav.ips">
+ <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="duplicate.systems.nav.hostname">
+ <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="duplicate.systems.nav.mac_address">
+ <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/manage_channel.xml b/web/include/nav/manage_channel.xml
new file mode 100644
index 0000000..21f6b4c
--- /dev/null
+++ b/web/include/nav/manage_channel.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="manage_channel" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/rhn/channels/manage/Edit.do</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/clone.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribers" acl="channel_exists();org_entitlement(sw_mgr_enterprise); org_channel_setting(not_globally_subscribable);user_can_admin_channel()">
+ <rhn-tab-url>/network/software/channels/manage/subscribers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Organizations" acl="channel_exists(); channel_is_protected(); org_entitlement(sw_mgr_enterprise); user_role(org_admin)">
+ <rhn-tab-url>/rhn/multiorg/channels/OrgList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Managers" acl="channel_exists();org_entitlement(sw_mgr_enterprise);user_role(channel_admin)">
+ <rhn-tab-url>/network/software/channels/manage/managers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Errata" acl="channel_exists();user_can_admin_channel();channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/rhn/channels/manage/errata/Errata.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_errata">
+ <rhn-tab-url>/rhn/channels/manage/errata/ListRemove.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/errata/ConfirmRemove.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_errata">
+ <rhn-tab-url>/rhn/channels/manage/errata/Add.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Clone" acl="channel_is_clone();user_role(channel_admin)" on-click="Sniglets::Lists->navi_empty_set" node-id="clone_channel_errata">
+ <rhn-tab-url>/network/software/channels/manage/errata/clone.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/errata/clone_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Sync" acl="channel_is_clone();user_role(channel_admin);" node-id="sync_errata">
+ <rhn-tab-url>/rhn/channels/manage/errata/SyncErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/errata/ConfirmSyncPackages.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Packages" acl="channel_exists()">
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackageMenu.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" >
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackages.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackagesRemove.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAdd.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAddConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Compare" acl="channel_exists(); not channel_packaging_type(sysv-solaris)" url="/network/software/channels/manage/packages/compare/index.pxt">
+ <rhn-tab-directory>/network/software/channels/manage/packages/compare</rhn-tab-directory>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Repositories" acl="channel_exists()">
+ <rhn-tab-url>/rhn/channels/manage/Repositories.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Patches" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patches/index.pxt</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patches/patch_list.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patches/remove_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patches/add.pxt?view_channel=no_channels</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patches/add.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patches/add_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Patchsets" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patchsets/index.pxt</rhn-tab-url>
+ <rhn-tab name="List/Remove" on-click="Sniglets::Lists->navi_empty_set" >
+ <rhn-tab-url>/rhn/channels/manage/solaris/ListPatchSets.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt?view_channel=no_channels</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patchsets/add_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/package_detail.xml b/web/include/nav/package_detail.xml
new file mode 100644
index 0000000..e245bf2
--- /dev/null
+++ b/web/include/nav/package_detail.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="package_detail" invisible="1" formvar="pid" title-depth="1" acl_mixins="RHN::Access::Package">
+ <rhn-tab name="Details" url="/rhn/software/packages/Details.do">
+ <rhn-tab name="Overview" url="/rhn/software/packages/Details.do"/>
+ <rhn-tab name="Dependencies" url="/network/software/packages/dependencies.pxt"/>
+ <rhn-tab name="Package Map" url="/network/software/packages/package_map.pxt" acl="package_type_capable(package_map)"/>
+ <rhn-tab name="Change Log" url="/rhn/software/packages/ChangeLog.do" acl="package_type_capable(change_log)"/>
+ <rhn-tab name="File List" url="/network/software/packages/file_list.pxt" acl="package_type_capable(file_list)"/>
+ </rhn-tab>
+ <rhn-tab name="New Versions" url="/network/software/packages/newer_versions.pxt"/>
+ <rhn-tab name="Patches" url="/network/software/packages/patches_patching_package.pxt" acl="package_type_capable(solaris_patchable)"/>
+ <rhn-tab name="Packages" url="/network/software/packages/patch_packages.pxt" acl="package_type_capable(solaris_patch)"/>
+ <rhn-tab name="Patch Clusters" url="/network/software/packages/patch_patchsets.pxt" acl="package_type_capable(solaris_patch)"/>
+ <rhn-tab name="Patches" url="/network/software/packages/patchset_patches.pxt" acl="package_type_capable(solaris_patchset)"/>
+ <rhn-tab name="Patched Systems" url="/network/software/packages/system_list_for_patch.pxt" acl="package_type_capable(solaris_patch)"/>
+ <rhn-tab name="Installed Systems" url="/network/software/packages/system_list.pxt" acl="not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)"/>
+ <rhn-tab name="Installed Systems" url="/network/software/packages/system_list_for_patchset.pxt" acl="package_type_capable(solaris_patchset)"/>
+ <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patch.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patch)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
+ <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patchset.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
+ <rhn-tab name="Target Systems"
+ url="/network/software/packages/target_system_list.pxt" acl="org_entitlement(sw_mgr_enterprise);not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
+</rhn-navi-tree>
diff --git a/web/include/nav/sitenav-authenticated.xml b/web/include/nav/sitenav-authenticated.xml
new file mode 100644
index 0000000..5f8fa2c
--- /dev/null
+++ b/web/include/nav/sitenav-authenticated.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav" title-depth="0">
+ <rhn-tab name="Overview" url="/rhn/YourRhn.do" active-image="tab-your_rhn-selected.gif" inactive-image="tab-your_rhn.gif">
+ <rhn-tab name="Overview" url="/rhn/YourRhn.do"/>
+ <rhn-tab name="Your Account" url="/rhn/account/UserDetails.do" >
+ <rhn-tab name="Addresses">
+ <rhn-tab-url>/rhn/account/Addresses.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/account/EditAddress.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Change Email" url="/rhn/account/ChangeEmail.do" />
+ <rhn-tab name="Account Deactivation" url="/rhn/account/AccountDeactivation.do"/>
+ </rhn-tab>
+ <rhn-tab name="Your Preferences" url="/rhn/account/UserPreferences.do" />
+ <rhn-tab name="Locale Preferences" url="/rhn/account/LocalePreferences.do" />
+ <rhn-tab name="Subscription Management" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" >
+ <rhn-tab name="System Entitlements" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" />
+ <rhn-tab name="Software Channel Entitlements" url="/rhn/channels/software/Entitlements.do" acl="user_role(org_admin)" />
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Systems" url="/rhn/systems/Overview.do">
+ <rhn-tab name="Overview" url="/rhn/systems/Overview.do" acl="org_entitlement(sw_mgr_enterprise)"/>
+ <rhn-tab name="Systems" url="/rhn/systems/SystemList.do">
+ <rhn-tab-directory>/rhn/systems/details</rhn-tab-directory>
+ <rhn-tab-directory>/network/systems/details</rhn-tab-directory>
+ <rhn-tab name="All" url="/rhn/systems/SystemList.do"/>
+ <rhn-tab name="Virtual Systems" url="/rhn/systems/VirtualSystemsList.do"/>
+ <rhn-tab name="Out of Date" url="/rhn/systems/OutOfDate.do"/>
+ <rhn-tab name="Unentitled" url="/rhn/systems/Unentitled.do"/>
+ <rhn-tab name="Ungrouped" url="/rhn/systems/Ungrouped.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ <rhn-tab name="Inactive" url="/rhn/systems/Inactive.do"/>
+ <rhn-tab name="Recently Registered" url="/rhn/systems/Registered.do"/>
+ <rhn-tab name="Proxy" url="/rhn/systems/ProxyList.do" acl="org_channel_family(rhn-proxy) or not is_satellite(); user_role(org_admin)"/>
+ <rhn-tab name="Duplicate Systems" url="/rhn/systems/DuplicateIPList.do">
+ <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateSystemsCompare.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Currency" url="/rhn/systems/SystemCurrency.do"/>
+ </rhn-tab>
+ <rhn-tab name="System Groups" acl="org_entitlement(sw_mgr_enterprise)">
+ <rhn-tab-directory>/rhn/systems/groups</rhn-tab-directory>
+ <rhn-tab-directory>/rhn/groups</rhn-tab-directory>
+ <rhn-tab-directory>/network/systems/groups</rhn-tab-directory>
+ <rhn-tab-url>/rhn/systems/SystemGroupList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Set Manager" url="/rhn/ssm/index.do" acl="org_entitlement(sw_mgr_enterprise)">
+ <rhn-tab-directory>/network/systems/ssm</rhn-tab-directory>
+ <rhn-tab name="Status" url="/rhn/ssm/ViewAllLog.do" acl="org_entitlement(sw_mgr_enterprise)"/>
+ </rhn-tab>
+ <rhn-tab name="Advanced Search" url="/rhn/systems/Search.do" acl="org_entitlement(sw_mgr_enterprise)" />
+ <rhn-tab name="Activation Keys" acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)">
+ <rhn-tab-url>/rhn/activationkeys/List.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/activationkeys/Edit.do</rhn-tab-url>
+ <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
+ <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
+ <rhn-tab-directory>/rhn/activationkeys/systems</rhn-tab-directory>
+ <rhn-tab-directory>/network/account/activation_keys</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Stored Profiles" acl="org_entitlement(sw_mgr_enterprise);">
+ <rhn-tab-url>/rhn/profiles/List.do</rhn-tab-url>
+ <rhn-tab-directory>/network/profiles</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Custom System Info" acl="org_entitlement(rhn_provisioning)">
+ <rhn-tab-url>/rhn/systems/customdata/CustomDataList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Kickstart" url="/rhn/kickstart/KickstartOverview.do" acl="org_entitlement(rhn_provisioning); user_role(config_admin)">
+ <rhn-tab name="Profiles" url="/rhn/kickstart/Kickstarts.do">
+ <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Bare Metal" url="/rhn/kickstart/KickstartIpRanges.do" />
+ <rhn-tab name="GPG and SSL Keys" url="/rhn/keys/CryptoKeysList.do">
+ <rhn-tab-directory>/rhn/keys</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Distributions" url="/rhn/kickstart/ViewTrees.do" acl="user_role(org_admin)">
+ <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
+ <rhn-tab-url>/rhn/kickstart/TreeEdit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="File Preservation" url="/rhn/systems/provisioning/preservation/PreservationList.do" />
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif">
+ <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
+ <rhn-tab-directory>/rhn/errata</rhn-tab-directory>
+ <rhn-tab name="Relevant" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
+ <rhn-tab name="All" url="/rhn/errata/AllErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
+ </rhn-tab>
+ <rhn-tab name="Advanced Search" url="/rhn/errata/Search.do"/>
+ <rhn-tab name="Manage Errata" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)">
+ <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
+ <rhn-tab name="Published" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)" />
+ <rhn-tab name="Unpublished" url="/rhn/errata/manage/UnpublishedErrata.do" acl="user_role(channel_admin)" />
+ </rhn-tab>
+ <rhn-tab name="Clone Errata" url="/rhn/errata/manage/CloneErrata.do" acl="user_role(channel_admin)">
+ <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Channels" url="/rhn/software/channels/All.do" active-image="tab-channels-selected.gif" inactive-image="tab-channels.gif">
+ <rhn-tab name="Software Channels" url="/rhn/software/channels/All.do">
+ <rhn-tab-directory>/rhn/channels</rhn-tab-directory>
+ <rhn-tab-directory>/network/channels</rhn-tab-directory>
+ <rhn-tab-directory>/network/software/channels</rhn-tab-directory>
+ <rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/>
+ <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/Vendor.do"/>
+ <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/>
+ <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/>
+ <rhn-tab name="Retired Channels" url="/rhn/software/channels/Retired.do"/>
+ </rhn-tab>
+ <rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
+ <rhn-tab-directory>/network/software/packages</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Manage Software Channels" acl="user_can_manage_channels()">
+ <rhn-tab-directory>/network/software/channels/manage</rhn-tab-directory>
+ <rhn-tab-url>/rhn/channels/manage/Manage.do</rhn-tab-url>
+ <rhn-tab name="Manage Software Packages" acl="user_role(channel_admin)" node-id="manage_packages">
+ <rhn-tab-directory>/rhn/software/manage/packages</rhn-tab-directory>
+ <rhn-tab-url>/rhn/software/manage/packages/PackageList.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Audit" url="/rhn/audit/ListXccdf.do">
+ <rhn-tab-directory>/rhn/audit</rhn-tab-directory>
+ <rhn-tab name="OpenSCAP" url="/rhn/audit/ListXccdf.do">
+ <rhn-tab name="All Scans" url="/rhn/audit/ListXccdf.do"/>
+ <rhn-tab name="XCCDF Diff" url="/rhn/audit/scap/Diff.do">
+ <rhn-tab-url>/rhn/audit/scap/DiffSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Advanced Search" url="/rhn/audit/scap/Search.do"/>
+ </rhn-tab>
+ <rhn-tab name="audit.nav.logreview" url="/rhn/audit/Overview.do" acl="not is_satellite()">
+ <rhn-tab name="Overview" url="/rhn/audit/Overview.do" />
+ <rhn-tab name="Reviews" url="/rhn/audit/Machine.do" />
+ <rhn-tab name="Search" url="/rhn/audit/Search.do" />
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Configuration" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)">
+ <rhn-tab-directory>/rhn/configuration</rhn-tab-directory>
+ <rhn-tab name="Overview" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)" />
+ <rhn-tab name="Configuration Channels" url="/rhn/configuration/GlobalConfigChannelList.do" acl="user_role(config_admin)" />
+ <rhn-tab name="Configuration Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" >
+ <rhn-tab-directory>/rhn/configuration/file</rhn-tab-directory>
+ <rhn-tab name="Centrally-Managed Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" />
+ <rhn-tab name="Locally-Managed Files" url="/rhn/configuration/file/LocalConfigFileList.do" acl="user_role(config_admin)" />
+ </rhn-tab>
+ <rhn-tab name="Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)">
+ <rhn-tab-directory>/rhn/configuration/system</rhn-tab-directory>
+ <rhn-tab name="Managed Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)" />
+ <rhn-tab name="Target Systems" url="/rhn/configuration/system/TargetSystems.do" acl="user_role(config_admin)">
+ <rhn-tab-url>/rhn/configuration/system/TargetSystemsSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirmSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/configuration/system/Summary.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Schedule" url="/rhn/schedule/PendingActions.do" active-image="tab-schedule-selected.gif" inactive-image="tab-schedule.gif">
+ <rhn-tab name="Pending Actions" url="/rhn/schedule/PendingActions.do"/>
+ <rhn-tab name="Failed Actions" url="/rhn/schedule/FailedActions.do"/>
+ <rhn-tab name="Completed Actions" url="/rhn/schedule/CompletedActions.do"/>
+ <rhn-tab name="Archived Actions" url="/rhn/schedule/ArchivedActions.do"/>
+ </rhn-tab>
+ <rhn-tab name="Users" url="/rhn/users/ActiveList.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)" active-image="tab-users-selected.gif" inactive-image="tab-users.gif">
+ <rhn-tab name="User List" url="/rhn/users/ActiveList.do">
+ <rhn-tab-directory>/network/users</rhn-tab-directory>
+ <rhn-tab name="Active" url="/rhn/users/ActiveList.do"/>
+ <rhn-tab name="Disabled" url="/rhn/users/DisabledList.do"/>
+ <rhn-tab name="All" url="/rhn/users/UserList.do"/>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Monitoring" url="/rhn/monitoring/ProbeList.do" active-image="tab-monitoring-selected.gif" inactive-image="tab-monitoring.gif" acl="show_monitoring()">
+ <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
+ <rhn-tab name="Status" url="/rhn/monitoring/ProbeList.do">
+ <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Scout Config Push" acl="show_monitoring();" url="/network/monitoring/scout/index.pxt" >
+ <rhn-tab-url>/network/monitoring/scout/index.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Notification" url="/rhn/monitoring/config/notification/Methods.do">
+ <rhn-tab-url>rhn/monitoring/config/notification/NotificationMethods.do</rhn-tab-url>
+ <rhn-tab name="Filters" url="/rhn/monitoring/config/notification/ActiveFilters.do"/>
+ </rhn-tab>
+ <rhn-tab name="Probe Suites" url="/rhn/monitoring/config/ProbeSuites.do">
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteCreate.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteEdit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteListProbes.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeCreate.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeEdit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystems.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystemsEdit.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Admin" url="/rhn/admin/multiorg/Organizations.do" active-image="tab-tools-selected.gif" inactive-image="tab-tools.gif" acl="user_role(satellite_admin)">
+ <rhn-tab name="Organizations" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Organizations.do">
+ <rhn-tab-url>/rhn/admin/multiorg/OrgDetails.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgUsers.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/DeleteOrg.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgSystemSubscriptions.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgSoftwareSubscriptions.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgCreate.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgConfigDetails.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscriptions" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/SoftwareEntitlements.do">
+ <rhn-tab name="Software Channel Entitlements" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/multiorg/SoftwareEntitlements.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Entitlements" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/multiorg/SystemEntitlements.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/EntitlementOrgs.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Users" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Users.do">
+ </rhn-tab>
+ <rhn-tab acl="user_role(satellite_admin)" url="/rhn/admin/config/GeneralConfig.do">
+ <rhn-tab-name><pxt-config var="product_name"/> Configuration</rhn-tab-name>
+ <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
+ <rhn-tab-url>/internal/satellite/config/restart_required.pxt</rhn-tab-url>
+ <rhn-tab-url>/internal/satellite/config/restart_in_progress.pxt</rhn-tab-url>
+ <rhn-tab name="General" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Monitoring" acl="show_monitoring(); user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/MonitoringConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Certificate" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/CertificateConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Bootstrap Script" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/BootstrapConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Organizations" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/Orgs.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Restart" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/Restart.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Cobbler" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/Cobbler.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Task Engine Status" acl="user_role(satellite_admin)" url="/rhn/admin/TaskStatus.do">
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Help" url="/rhn/help/index.do" active-image="tab-help-selected.gif" inactive-image="tab-help.gif">
+ <rhn-tab-directory>/help</rhn-tab-directory>
+ <rhn-tab name="Reference Guide" url="https://www.redhat.com/docs/manuals/satellite">
+ <rhn-tab-directory>/rhn/help/reference/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Installation Guide" url="https://www.redhat.com/docs/manuals/satellite" >
+ <rhn-tab-directory>/rhn/help/satellite/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Proxy Guide" url="https://www.redhat.com/docs/manuals/satellite">
+ <rhn-tab-directory>/rhn/help/proxy/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Client Configuration" url="https://www.redhat.com/docs/manuals/satellite">
+ <rhn-tab-directory>/rhn/help/client-config/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Channel Management" url="https://www.redhat.com/docs/manuals/satellite" >
+ <rhn-tab-directory>/rhn/help/channel-mgmt/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Release Notes" url="https://www.redhat.com/docs/manuals/satellite" >
+ <rhn-tab-directory>/rhn/help/release-notes/satellite/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="API" url="/rhn/apidoc/index.jsp" />
+ <rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
+ </rhn-tab>
+
+</rhn-navi-tree>
diff --git a/web/include/nav/sitenav.xml b/web/include/nav/sitenav.xml
new file mode 100644
index 0000000..9775219
--- /dev/null
+++ b/web/include/nav/sitenav.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav_unauth" title-depth="0">
+ <rhn-tab name="Install" url="/rhn/newlogin/CreateFirstUser.do" acl="need_first_user()">
+ </rhn-tab>
+ <rhn-tab name="Sign In" url="/" active-image="tab-sign_in-selected.gif" inactive-image="tab-sign_in.gif">
+ </rhn-tab>
+
+ <rhn-tab name="About" url="/help/about.pxt" active-image="tab-about_rhn-selected.gif" inactive-image="tab-about_rhn.gif" >
+ <rhn-tab name="About" url="/help/about.pxt" />
+ <rhn-tab name="Help Desk" url="/rhn/help/index.do" />
+ <rhn-tab name="Lookup Login/Password" url="/help/forgot_password.pxt" />
+ <rhn-tab name="Release Notes" url="/rhn/help/dispatcher/release_notes">
+ <rhn-tab-directory>/rhn/help/release-notes/satellite</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Reference Guide" url="/rhn/help/dispatcher/reference_guide">
+ <rhn-tab-directory>/rhn/help/reference</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Installation Guide" url="/rhn/help/dispatcher/install_guide">
+ <rhn-tab-directory>/rhn/help/satellite</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Proxy Guide" url="/rhn/help/dispatcher/proxy_guide">
+ <rhn-tab-directory>/rhn/help/proxy</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Client Configuration" url="/rhn/help/dispatcher/client_config_guide">
+ <rhn-tab-directory>/rhn/help/client-config</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Channel Management" url="/rhn/help/dispatcher/channel_mgmt_guide">
+ <rhn-tab-directory>/rhn/help/channel-mgmt</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="API" url="/rhn/apidoc/index.jsp">
+ <rhn-tab name="Overview" url="/rhn/apidoc/index.jsp">
+ <rhn-tab-directory>/rhn/apidoc</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="FAQs" url="/rhn/apidoc/faqs.jsp" />
+ <rhn-tab name="Sample Scripts" url="/rhn/apidoc/scripts.jsp" />
+ </rhn-tab>
+ <rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
+</rhn-tab>
+
+
+</rhn-navi-tree>
diff --git a/web/include/nav/ssm.xml b/web/include/nav/ssm.xml
new file mode 100644
index 0000000..d3b0872
--- /dev/null
+++ b/web/include/nav/ssm.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="ssm" invisible="1" title-depth="1">
+ <rhn-tab name="Overview" url="/rhn/ssm/index.do" />
+ <rhn-tab name="Systems">
+ <rhn-tab-url>/rhn/systems/ssm/ListSystems.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Errata"
+ on-click="Sniglets::Lists->navi_empty_set"
+ node-id="system_errata_list">
+ <rhn-tab-url>/network/systems/ssm/errata/index.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/errata/systems_affected.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/errata/apply_errata_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Packages">
+
+ <rhn-tab-url>/rhn/ssm/Packages.do</rhn-tab-url>
+
+ <rhn-tab name="Install">
+ <rhn-tab-url>/rhn/ssm/PackageInstall.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Remove">
+ <rhn-tab-url>/rhn/ssm/PackageRemove.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Upgrade">
+ <rhn-tab-url>/rhn/ssm/PackageUpgrade.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Verify">
+ <rhn-tab-url>/rhn/ssm/PackageVerify.do</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Patches" acl="global_config(enable_solaris_support)">
+
+ <rhn-tab-url>/network/systems/ssm/patches/index.pxt</rhn-tab-url>
+
+ <rhn-tab name="Install">
+ <rhn-tab-url>/network/systems/ssm/patches/install.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patches/install_channel.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patches/install_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Remove">
+ <rhn-tab-url>/network/systems/ssm/patches/remove.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patches/remove_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Patch Clusters" acl="global_config(enable_solaris_support)">
+
+ <rhn-tab-url>/network/systems/ssm/patchsets/index.pxt</rhn-tab-url>
+
+ <rhn-tab name="Install">
+ <rhn-tab-url>/network/systems/ssm/patchsets/install.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patchsets/install_channel.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patchsets/install_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Groups" acl="user_role(org_admin)">
+ <rhn-tab-url>/network/systems/ssm/groups/index.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/groups/alter_membership_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/groups/create.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Channels">
+ <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
+ <rhn-tab name="Base Channels">
+ <rhn-tab-url>/rhn/channel/ssm/BaseChannelSubscribe.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Child Channels">
+ <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptionsConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Configuration" url="/rhn/systems/ssm/config/Deploy.do">
+ <rhn-tab name="Deploy Files" url="/rhn/systems/ssm/config/Deploy.do" />
+ <rhn-tab name="Compare Files" url="/rhn/systems/ssm/config/Diff.do" />
+ <rhn-tab name="Subscribe to Channels" url="/rhn/systems/ssm/config/Subscribe.do" />
+ <rhn-tab name="Unsubscribe from Channels" url="/rhn/systems/ssm/config/Unsubscribe.do" />
+ <rhn-tab name="Enable Configuration" url="/rhn/systems/ssm/config/Enable.do" />
+ </rhn-tab>
+
+ <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do">
+ <rhn-tab name="Kickstart" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do" >
+ <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByProfile.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByIp.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Tag Systems" url="/network/systems/ssm/provisioning/tag_systems.pxt" />
+ <rhn-tab name="Rollback" url="/network/systems/ssm/provisioning/rollback.pxt">
+ <rhn-tab-url>/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Remote Command" url="/network/systems/ssm/provisioning/remote_command.pxt">
+ <rhn-tab-url>/network/systems/ssm/provisioning/remote_command_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Misc">
+ <rhn-tab-url>/rhn/systems/ssm/misc/Index.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/HardwareRefresh.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/SoftwareRefresh.do</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/change_sys_pref_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/prof_conv_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/DeleteConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/reboot_systems_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/upgrade_slot.pxt</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/system_detail.xml b/web/include/nav/system_detail.xml
new file mode 100644
index 0000000..57f93f7
--- /dev/null
+++ b/web/include/nav/system_detail.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="system_detail" invisible="1" title-depth="1" acl_mixins="RHN::Access::System">
+ <rhn-formvar name="sid" />
+ <rhn-tab name="Details" url="/rhn/systems/details/Overview.do">
+ <rhn-tab name="Overview" url="/rhn/systems/details/Overview.do" />
+ <rhn-tab name="Properties" url="/rhn/systems/details/Edit.do" />
+ <rhn-tab name="Remote Command" acl="system_feature(ftr_remote_command)">
+ <rhn-tab-url>/network/systems/details/remote_commands.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Connection" url="/network/systems/details/connection.pxt" acl="org_has_proxies()"/>
+ <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt" acl="user_role(org_admin); system_feature(ftr_proxy_capable) or system_is_proxy(); org_channel_family(rhn-proxy) or system_is_proxy(); child_channel_candidate(rhn-proxy) or system_is_proxy(); org_entitlement(rhn_provisioning); not system_is_satellite(); not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)">
+ <rhn-tab name="Activation" url="/network/systems/details/proxy.pxt" />
+ <rhn-tab name="Systems Using Proxy" url="/network/systems/details/proxy-clients.pxt" acl="system_is_proxy()"/>
+ </rhn-tab>
+ <rhn-tab name="Reactivation" url="/network/systems/details/activation.pxt" acl="system_feature(ftr_agent_smith)"/>
+ <rhn-tab name="Hardware">
+ <rhn-tab-url>/rhn/systems/details/SystemHardware.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Migrate" acl="user_role(org_admin)" url="/rhn/systems/details/SystemMigrate.do" />
+ <rhn-tab name="Notes">
+ <rhn-tab-url>/rhn/systems/details/Notes.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/EditNote.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Custom Info" acl="system_feature(ftr_custom_info)">
+ <rhn-tab-url>/rhn/systems/details/ListCustomData.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Software" url="/rhn/systems/details/packages/Packages.do">
+
+ <rhn-tab name="Errata" acl="system_feature(ftr_errata_updates); not is_solaris()">
+ <rhn-tab-url>/rhn/systems/details/ErrataList.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Patches" node-id="system_patch_list" acl="is_solaris()">
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_list">
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchListConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Install" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_available_list">
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstall.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstallConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Patch Clusters" on-click="Sniglets::Lists->navi_empty_set" node-id="solaris_patchset_list" acl="is_solaris()">
+ <rhn-tab-url>/rhn/systems/details/packages/patchsets/PatchSetList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/patchsets/InstallPatchSet.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Packages" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/Packages.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list" acl="system_feature(ftr_package_remove)">
+ <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/RemoveConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="List" acl="not system_feature(ftr_package_remove)">
+ <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Upgrade" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_upgradable_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/UpgradableList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Install" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_installable_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/InstallPackages.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/InstallConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Verify" acl="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_verifiable_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/VerifyPackages.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/VerifyConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Profiles" acl="system_feature(ftr_profile_compare)" on-click="Sniglets::Lists->navi_empty_set" node-id="packages_for_system_sync">
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/ShowProfiles.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/Create.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareSystems.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareProfiles.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Software Channels" acl="system_feature(ftr_package_updates)">
+ <rhn-tab-url>/rhn/systems/details/SystemChannels.do</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Configuration" acl="system_feature(ftr_config)" url="/rhn/systems/details/configuration/Overview.do">
+
+ <rhn-tab-directory>/rhn/systems/details/configuration</rhn-tab-directory>
+
+ <rhn-tab name="Overview" url="/rhn/systems/details/configuration/Overview.do"/>
+
+ <rhn-tab name="View/Modify Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do">
+ <rhn-tab name="Centrally Managed Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do"/>
+ <rhn-tab name="Locally Managed Files" url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do"/>
+ <rhn-tab name="Sandbox Managed Files" url="/rhn/systems/details/configuration/ViewModifySandboxPaths.do"/>
+ </rhn-tab>
+
+ <rhn-tab name="Add Files" url="/rhn/systems/details/configuration/addfiles/UploadFile.do">
+ <rhn-tab name="Upload File" url="/rhn/systems/details/configuration/addfiles/UploadFile.do"/>
+ <rhn-tab name="Import Files" url="/rhn/systems/details/configuration/addfiles/ImportFile.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirmSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Create File" url="/rhn/systems/details/configuration/addfiles/CreateFile.do"/>
+ </rhn-tab>
+
+ <rhn-tab name="Deploy Files" url="/rhn/systems/details/configuration/DeployFile.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/DeployFileSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirmSubmit.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Compare Files" url="/rhn/systems/details/configuration/DiffFile.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/DiffFileSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirmSubmit.do</rhn-tab-url>
+ </rhn-tab>
+
+
+ <rhn-tab name="Manage Configuration Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
+ <rhn-tab name="List/Unsubscribe from Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/ConfigChannelListUnsubscribeSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribe to Channels" url="/rhn/systems/details/configuration/SubscriptionsSetup.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/SubscriptionsSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="View/Modify Rankings" url="/rhn/systems/details/configuration/RankChannels.do"/>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Provisioning" acl="not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)" url="/rhn/systems/details/kickstart/ScheduleWizard.do">
+
+ <rhn-tab name="Kickstart" url="/rhn/systems/details/kickstart/ScheduleWizard.do" acl="system_feature(ftr_kickstart); not is_solaris()" node-id="kickstart_details">
+ <rhn-tab-directory>/rhn/systems/details/kickstart</rhn-tab-directory>
+ <rhn-tab name="Session Status" url="/rhn/systems/details/kickstart/SessionStatus.do" acl="system_kickstart_session_exists()">
+ <rhn-tab-url>/rhn/systems/details/kickstart/SessionCancel.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Schedule" url="/rhn/kickstart/ScheduleWizard.do"/>
+ <rhn-tab name="kickstart.variable.nav" url="/rhn/systems/details/kickstart/Variables.do" acl="cobbler_system_record_exists()"/>
+ </rhn-tab>
+
+ <rhn-tab name="Snapshots" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/index.pxt" hide_all_children_unless_active="1">
+ <rhn-tab name="Rollback" formvar="ss_id" url="/network/systems/details/history/snapshots/rollback.pxt" />
+ <rhn-tab name="Groups" formvar="ss_id" url="/network/systems/details/history/snapshots/groups.pxt" />
+ <rhn-tab name="Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/channels.pxt" />
+ <rhn-tab name="Packages" formvar="ss_id" url="/network/systems/details/history/snapshots/packages.pxt">
+ <rhn-tab-url>/network/systems/details/history/snapshots/unservable_packages.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Config Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/namespaces.pxt" />
+ <rhn-tab name="Config Files" formvar="ss_id" url="/network/systems/details/history/snapshots/config.pxt" />
+ <rhn-tab name="Snapshot Tags" formvar="ss_id" url="/network/systems/details/history/snapshots/snapshot_tags.pxt">
+ <rhn-tab-url>/network/systems/details/history/snapshots/add_snapshot_tag.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Snapshot Tags" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/system_tags.pxt" />
+
+ </rhn-tab>
+
+ <rhn-tab name="Monitoring" acl="show_monitoring(); system_feature(ftr_probes)">
+ <rhn-tab-directory>/rhn/systems/details/probes</rhn-tab-directory>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbesList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbeDetails.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbeEdit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbeDelete.do</rhn-tab-url>
+ <rhn-tab-url>/network/systems/details/probes/create.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/details/probes/delete_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Groups" acl="system_feature(ftr_system_grouping); user_role(org_admin) or user_role(system_group_admin)">
+ <rhn-tab-url>/rhn/systems/details/groups/ListRemove.do</rhn-tab-url>
+ <rhn-tab name="List / Leave" url="/rhn/systems/details/groups/ListRemove.do"/>
+ <rhn-tab name="Join" url="/rhn/systems/details/groups/Add.do"/>
+ </rhn-tab>
+
+ <rhn-tab name="Virtualization" acl="not system_is_virtual(); system_has_management_entitlement()">
+ <rhn-tab-url>/rhn/systems/details/virtualization/VirtualGuestsList.do</rhn-tab-url>
+ <rhn-tab name="Details" url="/rhn/systems/details/virtualization/VirtualGuestsList.do"/>
+ <rhn-tab name="Provisioning" url="/rhn/systems/details/virtualization/ProvisionVirtualizationWizard.do" acl="system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)"/>
+ </rhn-tab>
+
+ <rhn-tab name="Groups" url="/rhn/systems/details/groups/ListRemove.do" acl="system_feature(ftr_system_grouping); not user_role(org_admin); not user_role(system_group_admin)"/>
+
+ <rhn-tab name="Audit" url="/rhn/systems/details/audit/ListScap.do"/>
+
+ <rhn-tab name="Events">
+ <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/details/history/event.pxt</rhn-tab-url>
+ <rhn-tab name="Pending">
+ <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="History">
+ <rhn-tab-url>/network/systems/details/history/history.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/system_group_detail.xml b/web/include/nav/system_group_detail.xml
new file mode 100644
index 0000000..2bba613
--- /dev/null
+++ b/web/include/nav/system_group_detail.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="system_group_detail" invisible="1" formvar="sgid" title-depth="1">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/network/systems/groups/details.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/groups/delete_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Systems">
+ <rhn-tab-url>/rhn/groups/ListRemoveSystems.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Target Systems" acl="user_role(system_group_admin)">
+ <rhn-tab-url>/rhn/groups/AddSystems.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Errata" on-click="Sniglets::Lists->navi_empty_set" node-id="system_group_errata_list">
+ <rhn-tab-url>/network/systems/groups/errata_list.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/groups/systems_affected_by_errata.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Admins" url="/network/systems/groups/admin_list.pxt" acl="user_role(system_group_admin)" />
+
+ <rhn-tab name="Probes" url="/network/systems/groups/probe_list.pxt" acl="org_entitlement(rhn_monitor)" />
+
+</rhn-navi-tree>
diff --git a/web/include/nav/user_detail.xml b/web/include/nav/user_detail.xml
new file mode 100644
index 0000000..857c446
--- /dev/null
+++ b/web/include/nav/user_detail.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="user_detail" invisible="1" formvar="uid" title-depth="1">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/rhn/users/UserDetails.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Groups">
+ <rhn-tab-url>/rhn/users/AssignedSystemGroups.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Systems">
+ <rhn-tab-url>/rhn/users/SystemsAdmined.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Channel Permissions" acl="user_role(channel_admin)" url="/rhn/users/ChannelPerms.do">
+ <rhn-tab name="Subscription" url="/rhn/users/ChannelPerms.do" />
+ <rhn-tab name="Management" url="/rhn/users/ChannelManagementPerms.do" acl="org_role(channel_admin)"/>
+ </rhn-tab>
+ <rhn-tab name="Preferences">
+ <rhn-tab-url>/rhn/users/UserPreferences.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Addresses">
+ <rhn-tab-url>/rhn/users/Addresses.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Notification Methods" acl="org_entitlement(rhn_monitor)">
+ <rhn-tab-url>/network/users/details/contact_methods/index.pxt</rhn-tab-url>
+ <rhn-tab-directory>/network/users/details/contact_methods</rhn-tab-directory>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/network/components/legends/errata-list-legend.pxi b/web/include/network/components/legends/errata-list-legend.pxi
new file mode 100644
index 0000000..e2f17c4
--- /dev/null
+++ b/web/include/network/components/legends/errata-list-legend.pxi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<div class="sideleg">
+ <h2>Errata Legend</h2>
+ <ul>
+ <li><img src="/img/wrh-security.gif" alt="" />Security</li>
+ <li><img src="/img/wrh-bug.gif" alt="" />Bug Fix</li>
+ <li><img src="/img/wrh-product.gif" alt="" />Enhancement</li>
+ </ul>
+</div>
diff --git a/web/include/network/components/legends/event-status.pxi b/web/include/network/components/legends/event-status.pxi
new file mode 100644
index 0000000..7666896
--- /dev/null
+++ b/web/include/network/components/legends/event-status.pxi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<div class="sideleg">
+ <h2>Event Status Legend</h2>
+ <ul>
+ <li><img src="/img/rhn-listicon-ok.gif" alt="" />Complete</li>
+ <li><img src="/img/rhn-listicon-error.gif" alt="" />Failure</li>
+ <li><img src="/img/rhn-listicon-activity.gif" alt="" />Activity Occuring</li>
+ </ul>
+</div>
diff --git a/web/include/network/components/legends/event-type.pxi b/web/include/network/components/legends/event-type.pxi
new file mode 100644
index 0000000..ce8506a
--- /dev/null
+++ b/web/include/network/components/legends/event-type.pxi
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<div class="sideleg">
+ <h2>Event Type Legend</h2>
+ <ul>
+ <li><img src="/img/rhn-listicon-package.gif" alt="" />Package Event</li>
+ <li><img src="/img/rhn-listicon-errata.gif" alt="" />Errata Event</li>
+ <li><img src="/img/rhn-listicon-preferences.gif" alt="" />Preferences Event</li>
+ <li><img src="/img/rhn-listicon-system.gif" alt="" />System Event</li>
+ </ul>
+</div>
diff --git a/web/include/network/components/legends/scout-config-legend.pxi b/web/include/network/components/legends/scout-config-legend.pxi
new file mode 100644
index 0000000..fd7d7a5
--- /dev/null
+++ b/web/include/network/components/legends/scout-config-legend.pxi
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<div class="sideleg">
+<h2>Scout Config Legend</h2>
+<ul>
+<li><img title="Scout is fully updated with the latest probe data"
+ alt="Scout is fully updated with the latest probe data" src="/img/configureScoutOK.gif" />Fully Updated</li>
+<li><img title="A Scout Config Push is required"
+ alt="A Scout Config Push is required" src="/img/configureScout.gif" />Push Required</li>
+<li><img title="The last Scout Config Push generated warnings."
+ alt="The last Scout Config Push generated warnings." src="/img/configureScoutWarning.gif" />Push had Warnings </li>
+<li><img title="The last Scout Config Push failed."
+ alt="The last Scout Config Push failed." src="/img/configureScoutError.gif" />Push Failed</li>
+<li><img title="The Scout Config Push is in progress"
+ alt="The Scout Config Push is in progress" src="/img/configureScoutPending.gif" />Push in Progress</li>
+</ul>
+</div>
diff --git a/web/include/network/components/legends/system-list-legend.pxi b/web/include/network/components/legends/system-list-legend.pxi
new file mode 100644
index 0000000..fd1d284
--- /dev/null
+++ b/web/include/network/components/legends/system-list-legend.pxi
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<pxt-passthrough>
+
+<pxt-use class="Sniglets::Users" />
+
+<div class="sideleg">
+ <h2>System Legend</h2>
+ <ul>
+ <li><img src="/img/icon_up2date.gif" alt="" />OK</li>
+ <li><img src="/img/icon_crit_update.gif" alt="" />Critical</li>
+ <li><img src="/img/icon_reg_update.gif" alt="" />Warning</li>
+ <li><img src="/img/icon_checkin.gif" alt="" />Unknown</li>
+<rhn-require acl="org_entitlement(sw_mgr_enterprise)">
+ <li><img src="/img/icon_locked.gif" alt="" />Locked</li>
+</rhn-require>
+<rhn-require acl="org_entitlement(rhn_provisioning)">
+ <li><img src="/img/icon_kickstart_session.gif" alt="" />Kickstarting</li>
+</rhn-require>
+ <li><img src="/img/icon_pending.gif" alt="" />Pending Actions</li>
+ <li><img src="/img/icon_unentitled.gif" alt="" />Unentitled</li>
+<rhn-require acl="org_entitlement(rhn_monitor)">
+ <li><img src="/img/icon_subicon_monitoring.gif" alt="" />Monitoring Status</li>
+</rhn-require>
+ </ul>
+</div>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/message_queues/local.pxi b/web/include/network/components/message_queues/local.pxi
new file mode 100644
index 0000000..cc3caf7
--- /dev/null
+++ b/web/include/network/components/message_queues/local.pxi
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-messages queue="local_alert">
+ <div class="local-alert">{messages}</div>
+</pxt-messages>
+<pxt-messages queue="local_info">
+ <div class="local-info">{messages}</div>
+</pxt-messages>
+</pxt-passthrough>
diff --git a/web/include/network/components/message_queues/site.pxi b/web/include/network/components/message_queues/site.pxi
new file mode 100644
index 0000000..77c6540
--- /dev/null
+++ b/web/include/network/components/message_queues/site.pxi
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-messages queue="site_info">
+ <div class="site-info">
+ {messages}
+ </div>
+</pxt-messages>
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/create_notification_method.pxi b/web/include/network/components/monitoring/create_notification_method.pxi
new file mode 100644
index 0000000..e9230ad
--- /dev/null
+++ b/web/include/network/components/monitoring/create_notification_method.pxi
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::ContactMethod" />
+
+<h2>Create Notification Method</h2>
+
+<pxt-formvar>
+
+<div class="page-summary">
+ <p>Create a notification method using the form provided.</p>
+</div>
+
+<pxt-include-late file="/network/components/message_queues/local.pxi" />
+
+
+ <pxt-form method="post">
+
+ <table class="details">
+
+ <tr>
+ <th>Method Name:</th>
+ <td><input type="text" size="30" name="method_name" value="" maxlength="20" /></td>
+ </tr>
+ <tr>
+ <th>Email:</th>
+ <td><input type="text" size="30" name="method_email" value="" maxlength="50" /></td>
+ </tr>
+ <tr>
+ <th>Message Format:</th>
+ <td>
+ <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="" />Short (Pager-Style) Messages
+ </td>
+ </tr>
+ </table>
+
+ <div align="right">
+ <hr />
+ <input type="hidden" name="pxt:trap" value="rhn:contact-method-create-cb" />
+ <input type="hidden" name="redirect_to" value="index.pxt?uid={formvar:uid}" />
+ <input type="submit" name="create_method" value="Create Method" />
+ <pxt-hidden name="uid" />
+ </div>
+
+ </pxt-form>
+</pxt-formvar>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/delete_notification_method.pxi b/web/include/network/components/monitoring/delete_notification_method.pxi
new file mode 100644
index 0000000..df76853
--- /dev/null
+++ b/web/include/network/components/monitoring/delete_notification_method.pxi
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::ContactMethod" />
+<pxt-use class="Sniglets::Lists" />
+
+<h2>Notification Method Deletion Confirmation</h2>
+
+<pxt-include-late file="/network/components/message_queues/local.pxi" />
+
+<rhn-if-method-dependencies value="true">
+ <div class="page-summary">
+ <p>The <strong><rhn-contact-method-name /></strong> Notification Method cannot be deleted due to the following dependencies:</p>
+ <p>Please note that only systems which you have permission to manage will be linked to from this page.</p>
+ </div>
+
+ <rhn-listview class="Sniglets::ListView::ProbeList" mode="probes_for_contact_method">
+ <column name="System" label="system_name" sort_by="1" align="left" width="35%">
+ <url>/rhn/systems/details/Overview.do?sid={column:system_id}</url>
+ </column>
+ <column name="Probe" label="probe_description" width="30%" align="left">
+ <url>/rhn/systems/details/probes/ProbeDetails.do?probe_id={column:probe_id}&sid={column:system_id}</url>
+ </column>
+ </rhn-listview>
+</rhn-if-method-dependencies>
+
+<rhn-if-method-dependencies value="false">
+ <div class="page-summary">
+ <p>Delete Notification Method: <strong><rhn-contact-method-name /></strong></p>
+ </div>
+ <div align="right">
+ <hr />
+ <pxt-form method="post">
+ <pxt-hidden name="cmid" />
+ <input type="hidden" name="success_redirect" value="index.pxt?uid={formvar:uid}" />
+ <input type="hidden" name="pxt:trap" value="rhn:contact-method-delete-cb" />
+ <input type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
+ </pxt-form>
+ </div>
+</rhn-if-method-dependencies>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/edit_notification_method.pxi b/web/include/network/components/monitoring/edit_notification_method.pxi
new file mode 100644
index 0000000..53dce07
--- /dev/null
+++ b/web/include/network/components/monitoring/edit_notification_method.pxi
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::ContactMethod" />
+
+<h2>Notification Method Details</h2>
+
+<pxt-formvar>
+
+<div class="toolbar"><rhn-deletion-link url="delete_confirm.pxt?cmid={formvar:cmid}" type="method" /></div>
+<div class="page-summary">
+ <p>Edit this notification method using the form provided.</p>
+</div>
+
+<pxt-include-late file="/network/components/message_queues/local.pxi" />
+
+ <pxt-form method="post">
+
+<rhn-contact-method-edit-form>
+
+ <table class="details">
+ <tr>
+ <th>Method Name:</th>
+ <td><input type="text" size="30" name="method_name" value="{method_name}" maxlength="20" /></td>
+ </tr>
+ <tr>
+ <th>Email:</th>
+ <td><input type="text" size="30" name="method_email" value="{method_email}" maxlength="50" /></td>
+ </tr>
+ <tr>
+ <th>Message Format:</th>
+ <td>
+ <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="{use_pager_type}" />Short (Pager-Style) Messages
+ </td>
+ </tr>
+ </table>
+
+ <div align="right">
+ <hr />
+ <input type="hidden" name="pxt:trap" value="rhn:contact-method-edit-cb" />
+ <input type="hidden" name="redirect_to" value="index.pxt?uid={uid}" />
+ <input type="submit" name="update_method" value="Update Method" />
+ <pxt-hidden name="uid" />
+ <pxt-hidden name="cmid" />
+ </div>
+
+</rhn-contact-method-edit-form>
+
+ </pxt-form>
+</pxt-formvar>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/notification_methods.pxi b/web/include/network/components/monitoring/notification_methods.pxi
new file mode 100644
index 0000000..9529a35
--- /dev/null
+++ b/web/include/network/components/monitoring/notification_methods.pxi
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Lists" />
+
+<h2>Monitoring Notification Methods</h2>
+
+<pxt-formvar>
+
+<div class="toolbar"><rhn-creation-link url="create.pxt?uid={formvar:uid}" type="method" /></div>
+
+<div class="page-summary">
+ <p>A list of methods available for notification of monitoring events.</p>
+</div>
+
+<rhn-listview class="Sniglets::ListView::ContactMethodList" mode="users_contact_methods">
+ <empty_list_message>No Notification Methods Available.</empty_list_message>
+
+ <column name="Method Name" label="method_name" sort_by="1" width="50%" align="left">
+ <url>edit.pxt?cmid={column:recid}</url>
+ </column>
+
+ <column name="Destination" label="method_target" sort_by="1" width="30%" align="left" />
+</rhn-listview>
+
+</pxt-formvar>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/schedule_action-interface.pxi b/web/include/network/components/schedule_action-interface.pxi
new file mode 100644
index 0000000..dece6b4
--- /dev/null
+++ b/web/include/network/components/schedule_action-interface.pxi
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<table class="schedule-action-interface" align="center">
+ <tr>
+ <td><input type="radio" name="schedule_time" value="asap" checked="1" /></td>
+ <th>Schedule action as soon as possible</th>
+ </tr>
+ <tr>
+ <td><input type="radio" name="schedule_time" value="at_entered_time" /></td>
+ <th>Schedule action for no sooner than:</th>
+ </tr>
+ <tr>
+ <th><img src="/img/rhn-icon-schedule.gif" alt="Date Selection" /></th>
+ <td>{date_selection}</td>
+ </tr>
+</table>
+
+<div align="right">
+<hr />
+{button}
+</div>
+</pxt-passthrough>
diff --git a/web/include/network/components/status_bar/main.pxi b/web/include/network/components/status_bar/main.pxi
new file mode 100644
index 0000000..cf8416a
--- /dev/null
+++ b/web/include/network/components/status_bar/main.pxi
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+ <pxt-use class="Sniglets::Users" />
+ <pxt-use class="Sniglets::Header" />
+ <pxt-use class="Sniglets::Search" />
+ <pxt-use class="Sniglets::Sets" />
+
+<div id="bar">
+
+<div id="systembar">
+<div id="systembarinner">
+<pxt-include file="/network/components/status_bar/ssm.pxi" />
+</div>
+</div>
+
+</div>
+<!-- close bar -->
+
+
+</pxt-passthrough>
diff --git a/web/include/network/components/status_bar/ssm.pxi b/web/include/network/components/status_bar/ssm.pxi
new file mode 100644
index 0000000..e1dea45
--- /dev/null
+++ b/web/include/network/components/status_bar/ssm.pxi
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::Lists" />
+<pxt-use class="Sniglets::HTML" />
+
+<div>
+<rhn-require acl="user_authenticated(); org_entitlement(sw_mgr_enterprise)">
+ <span id="header_selcount"><rhn-set-totals set="system_list" noun="system"/></span>
+
+ <a class="button" href="/rhn/ssm/index.do">Manage</a>
+
+<rhn-return-link default="/network">
+ <a class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
+</rhn-return-link>
+
+</rhn-require>
+</div>
+</pxt-passthrough>
diff --git a/web/include/network/components/system_groups/sgdc_header.pxi b/web/include/network/components/system_groups/sgdc_header.pxi
new file mode 100644
index 0000000..084fd23
--- /dev/null
+++ b/web/include/network/components/system_groups/sgdc_header.pxi
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+ <pxt-use class="Sniglets::HTML" />
+ <pxt-use class="Sniglets::Users" />
+ <pxt-use class="Sniglets::ServerGroup" />
+
+<pxt-formvar>
+
+ <rhn-toolbar base="h1"
+ img="/img/rhn-icon-system_group.gif"
+ alt="system group"
+ help-url="s1-sm-systems.jsp#s2-sm-system-group-list"
+ misc-url="/network/systems/ssm/work_with_group.pxt?sgid={formvar:sgid}&pxt_trap=rhn:work_with_group_cb"
+ misc-alt="work with group"
+ misc-img="/img/work_with_group.gif"
+ misc-text="work with group"
+ deletion-type="group"
+ deletion-url="delete_confirm.pxt?sgid={formvar:sgid}"
+ deletion-acl="user_role(system_group_admin)">
+ <rhn-server-group-name />
+ </rhn-toolbar>
+
+ <rhn-navi-nav prefix="system_group_details" depth="0" file="/nav/system_group_detail.xml" style="contentnav" />
+
+</pxt-formvar>
+</pxt-passthrough>
diff --git a/web/include/network/components/systems/reschedule_action_form.pxi b/web/include/network/components/systems/reschedule_action_form.pxi
new file mode 100644
index 0000000..94676d2
--- /dev/null
+++ b/web/include/network/components/systems/reschedule_action_form.pxi
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+
+ This history event was caused by a failed scheduled action.<br/>
+ <p>If you have corrected the problem, you may reschedule the action below.</p>
+ <pxt-form method="post">
+<pxt-formvar>
+ <pxt-hidden name="sid" />
+ <input type="hidden" name="aid" value="{formvar:hid}" />
+ <input type="hidden" name="success_redirect" value="/network/systems/details/history/pending.pxt" />
+ <input type="hidden" name="pxt:trap" value="rhn:reschedule_action_cb" />
+ <input type="submit" value="Reschedule" />
+</pxt-formvar>
+ </pxt-form>
+
+</pxt-passthrough>
\ No newline at end of file
diff --git a/web/include/network/components/systems/system_details_toolbar.pxi b/web/include/network/components/systems/system_details_toolbar.pxi
new file mode 100644
index 0000000..2d8957b
--- /dev/null
+++ b/web/include/network/components/systems/system_details_toolbar.pxi
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Servers" />
+<pxt-use class="Sniglets::Users" />
+<pxt-formvar>
+<!-- Regular system -->
+<rhn-require acl="not system_is_virtual_host(); not system_is_virtual()">
+ <rhn-toolbar base="h1" img="/img/rhn-icon-system.gif"
+ alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
+ deletion-type="system">
+ <rhn-server-name />
+ </rhn-toolbar>
+</rhn-require>
+<!-- virtual host -->
+<rhn-require acl="system_is_virtual_host()">
+ <rhn-toolbar base="h1" img="/img/virt-host.png"
+ alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
+ deletion-type="system">
+ <rhn-server-name />
+ </rhn-toolbar>
+</rhn-require>
+<!-- virtual guest -->
+<rhn-require acl="system_is_virtual()">
+ <rhn-toolbar base="h1" img="/img/virt-guest.png"
+ alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
+ deletion-type="system">
+ <rhn-server-name />
+ </rhn-toolbar>
+</rhn-require>
+</pxt-formvar>
+</pxt-passthrough>
commit 7d84874a639028f5d1bb57e69aae112a81392d62
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 22 16:08:03 2013 +0100
look for pxt includes outside of document root
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 5b43bc1..1828da4 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -279,3 +279,6 @@ web.smtp_server = localhost
# allow users to chat with spacewalk members on IRC via the web
web.chat_enabled = 0
+
+# Directory where to look for include files (pxt, pxi, txt)
+web.include_dir = /usr/share/spacewalk/web
diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index dc0b17c..d03c580 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.pm
@@ -531,7 +531,7 @@ sub include {
$params{-path} = $params{-file}
if exists $params{-file};
- my $data = PXT::ApacheHandler->_read_file($params{-path}, $self->document_root);
+ my $data = PXT::ApacheHandler->_read_file($params{-path}, PXT::Config->get('include_dir'));
return $data if $params{-raw};
diff --git a/web/modules/sniglets/Sniglets/Navi.pm b/web/modules/sniglets/Sniglets/Navi.pm
index 0dc94f8..5e23073 100644
--- a/web/modules/sniglets/Sniglets/Navi.pm
+++ b/web/modules/sniglets/Sniglets/Navi.pm
@@ -85,10 +85,10 @@ sub navi_nav {
my $file;
my $depth = $params{depth} || 0;
if ($params{file}) {
- $file = File::Spec->catfile($pxt->document_root, $pxt->derelative_path($params{file}));
+ $file = File::Spec->catfile(PXT::Config->get('include_dir'), $pxt->derelative_path($params{file}));
}
else {
- $file = File::Spec->catfile($pxt->document_root, $pxt->user ? "/nav/sitenav-authenticated.xml" : "/nav/sitenav.xml");
+ $file = File::Spec->catfile(PXT::Config->get('include_dir'), $pxt->user ? "/nav/sitenav-authenticated.xml" : "/nav/sitenav.xml");
}
my $tree = Sniglets::Navi->load_tree($file);
11 years, 2 months
7 commits - branding/spacewalk-branding.spec branding/zz-spacewalk-branding.conf rel-eng/packages spacewalk/config web/conf web/html web/include web/modules web/spacewalk-web.spec
by Michael Mraka
branding/spacewalk-branding.spec | 16
branding/zz-spacewalk-branding.conf | 7
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 21
spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf | 2
web/conf/rhn_web.conf | 3
web/html/formletters/forgot_accounts.xml | 20
web/html/formletters/forgot_password.xml | 20
web/html/nav/activation_key.xml | 38 -
web/html/nav/channel_detail.xml | 32 -
web/html/nav/duplicate_systems_tabs.xml | 14
web/html/nav/manage_channel.xml | 75 --
web/html/nav/package_detail.xml | 22
web/html/nav/sitenav-authenticated.xml | 269 ----------
web/html/nav/sitenav.xml | 42 -
web/html/nav/ssm.xml | 116 ----
web/html/nav/system_detail.xml | 195 -------
web/html/nav/system_group_detail.xml | 23
web/html/nav/user_detail.xml | 26
web/html/network/components/legends/errata-list-legend.pxi | 10
web/html/network/components/legends/event-status.pxi | 10
web/html/network/components/legends/event-type.pxi | 11
web/html/network/components/legends/scout-config-legend.pxi | 18
web/html/network/components/legends/system-list-legend.pxi | 28 -
web/html/network/components/message_queues/local.pxi | 9
web/html/network/components/message_queues/site.pxi | 8
web/html/network/components/monitoring/create_notification_method.pxi | 50 -
web/html/network/components/monitoring/delete_notification_method.pxi | 44 -
web/html/network/components/monitoring/edit_notification_method.pxi | 54 --
web/html/network/components/monitoring/notification_methods.pxi | 30 -
web/html/network/components/schedule_action-interface.pxi | 22
web/html/network/components/status_bar/main.pxi | 20
web/html/network/components/status_bar/ssm.pxi | 19
web/html/network/components/system_groups/sgdc_header.pxi | 26
web/html/network/components/systems/reschedule_action_form.pxi | 16
web/html/network/components/systems/system_details_toolbar.pxi | 36 -
web/include/Makefile | 20
web/include/formletters/forgot_accounts.xml | 20
web/include/formletters/forgot_password.xml | 20
web/include/nav/activation_key.xml | 38 +
web/include/nav/channel_detail.xml | 31 +
web/include/nav/duplicate_systems_tabs.xml | 14
web/include/nav/manage_channel.xml | 74 ++
web/include/nav/package_detail.xml | 22
web/include/nav/sitenav-authenticated.xml | 269 ++++++++++
web/include/nav/sitenav.xml | 42 +
web/include/nav/ssm.xml | 116 ++++
web/include/nav/system_detail.xml | 195 +++++++
web/include/nav/system_group_detail.xml | 23
web/include/nav/user_detail.xml | 26
web/include/network/components/legends/errata-list-legend.pxi | 10
web/include/network/components/legends/event-status.pxi | 10
web/include/network/components/legends/event-type.pxi | 11
web/include/network/components/legends/scout-config-legend.pxi | 17
web/include/network/components/legends/system-list-legend.pxi | 28 +
web/include/network/components/message_queues/local.pxi | 9
web/include/network/components/message_queues/site.pxi | 8
web/include/network/components/monitoring/create_notification_method.pxi | 50 +
web/include/network/components/monitoring/delete_notification_method.pxi | 44 +
web/include/network/components/monitoring/edit_notification_method.pxi | 54 ++
web/include/network/components/monitoring/notification_methods.pxi | 29 +
web/include/network/components/schedule_action-interface.pxi | 22
web/include/network/components/status_bar/main.pxi | 20
web/include/network/components/status_bar/ssm.pxi | 19
web/include/network/components/system_groups/sgdc_header.pxi | 26
web/include/network/components/systems/reschedule_action_form.pxi | 16
web/include/network/components/systems/system_details_toolbar.pxi | 35 +
web/modules/pxt/PXT/Request.pm | 2
web/modules/sniglets/Sniglets/Navi.pm | 4
web/spacewalk-web.spec | 8
70 files changed, 1339 insertions(+), 1347 deletions(-)
New commits:
commit 707c5aab04afe727e66c478136d852da8cfafb24
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 31 11:05:39 2013 +0100
Automatic commit of package [spacewalk-web] release [1.9.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index a171c55..b4ba24a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.9-1 web/
+1.9.10-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index fc935ea..894616a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.9
+Version: 1.9.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -255,6 +255,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Jan 31 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.10-1
+- moved template files out of document root
+- look for pxt includes outside of document root
+
* Mon Jan 28 2013 Jan Pazdziora 1.9.9-1
- With removal of TracerList, all_traces is not longer used, removing.
commit f0afa665eeef3cb1f1148a42484fce6598335bb5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 29 15:29:01 2013 +0100
RewriteLock is no longer valid in apache 2.4
diff --git a/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf b/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
index 0eb26ef..e7203ad 100644
--- a/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
+++ b/spacewalk/config/etc/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
@@ -3,7 +3,9 @@ KeepAlive On
MaxKeepAliveRequests 400
KeepAliveTimeout 15
RewriteEngine on
+<IfVersion == 2.2>
RewriteLock run/rhnccrewrite.lock
+</IfVersion>
RewriteMap KeyToSatId prg:/usr/share/rhn/satidmap.pl
RewriteRule ^/satconfig/(.*) /${KeyToSatId:$1?%{QUERY_STRING}} [PT]
#RewriteRule ^/satconfig/(.*) /$1 [PT]
commit 1dfd2ba21314d431345cbbf1a50064f48ef84a00
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 23 11:31:22 2013 +0100
removed no longer necessary directory definitions
diff --git a/branding/zz-spacewalk-branding.conf b/branding/zz-spacewalk-branding.conf
deleted file mode 100644
index fe3039c..0000000
--- a/branding/zz-spacewalk-branding.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<Directory "/var/www/html/templates/">
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 3bd884b..73385c6 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -290,13 +290,6 @@ PerlModule PXT::ApacheAuth
require acl user_role(monitoring_admin)
</Directory>
-<Directory "/var/www/html/network/components">
- AuthType Basic
- AuthName "RHN Org Admin Area"
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
-
<Directory "/var/www/html/network/software/channels">
AuthType Basic
AuthName "RHN Channel Area"
@@ -378,17 +371,3 @@ PerlModule PXT::ApacheAuth
PerlSetVar errata_context manage
</Directory>
-<Directory "/var/www/html/nav">
- AuthType Basic
- AuthName "RHN Org Admin Area"
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
-
-<Directory "/var/www/html/formletters">
- AuthType Basic
- AuthName "RHN Org Admin Area"
- PerlAuthenHandler PXT::ApacheAuth
- require no-access
-</Directory>
-
commit 9663c8cc1e754a11cb4371c98566ffe2b478830c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 23 14:31:21 2013 +0100
pack branding template files outside of document root
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 7e8bcac62..a24c402 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -27,11 +27,10 @@ jar -cf java-branding.jar -C java/code/src com
%install
rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -p -m 644 zz-spacewalk-branding.conf %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -d -m 755 %{buildroot}/%{_var}/www/html
-install -d -m 755 %{buildroot}/%{_var}/www/html/nav
+install -d -m 755 %{buildroot}%{_var}/www/html
install -d -m 755 %{buildroot}%{_datadir}/spacewalk
+install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web
+install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web/nav
install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/
%if 0%{?rhel} && 0%{?rhel} < 6
install -d -m 755 %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/
@@ -49,8 +48,8 @@ cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
# one in source:
cp -p img/favicon.ico %{buildroot}/%{_var}/www/html/
-cp -pR templates %{buildroot}/%{_var}/www/html/
-cp -pR styles %{buildroot}/%{_var}/www/html/nav/
+cp -pR templates %{buildroot}%{_datadir}/spacewalk/web/
+cp -pR styles %{buildroot}%{_datadir}/spacewalk/web/nav/
cp -pR setup %{buildroot}%{_datadir}/spacewalk/
cp -pR java-branding.jar %{buildroot}%{_datadir}/rhn/lib/
%if 0%{?rhel} && 0%{?rhel} < 6
@@ -69,16 +68,11 @@ rm -rf %{buildroot}
%files
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-branding.conf
%dir %{_var}/www/html/css
%{_var}/www/html/css/*
%dir /%{_var}/www/html/img
%{_var}/www/html/img/*
%{_var}/www/html/favicon.ico
-%dir /%{_var}/www/html/templates
-%{_var}/www/html/templates/*
-%dir /%{_var}/www/html/nav/styles
-%{_var}/www/html/nav/styles/*
%{_datadir}/spacewalk/
%{_datadir}/rhn/lib/java-branding.jar
%if 0%{?rhel} && 0%{?rhel} < 6
commit cc237c654e054ad587a94c1167127cb1ab93f664
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 23 11:31:22 2013 +0100
pack templates into rpm
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 8870e92..fc935ea 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -125,6 +125,7 @@ make -f Makefile.spacewalk-web PERLARGS="INSTALLDIRS=vendor" %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make -C modules install DESTDIR=$RPM_BUILD_ROOT PERLARGS="INSTALLDIRS=vendor" %{?_smp_mflags}
make -C html install PREFIX=$RPM_BUILD_ROOT
+make -C include install PREFIX=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -249,6 +250,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n spacewalk-html
%{_var}/www/html/*
+%{_datadir}/spacewalk/web
%doc LICENSE
# $Id$
commit ddcafa632dfcc01e4fc3e2e3c381936b81b6ccf4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 22 16:15:22 2013 +0100
moved template files out of document root
diff --git a/web/html/formletters/forgot_accounts.xml b/web/html/formletters/forgot_accounts.xml
deleted file mode 100644
index 175a5da..0000000
--- a/web/html/formletters/forgot_accounts.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<postal-letter subject="&product_name; Login Information">
-[ This is an automated email sent to <email-address /> at your request. ]
-
-You have requested a list of all <product-name /> logins associated
-with the email address <email-address />.
-
-Existing login(s):
-<account-list />
-
-You may reset the passwords for any of the above Red Hat logins at:
-
- https://<postal-template-replace label="hostname" default=" unknown hostname " />/help/forgot_password.pxt
-
-If you continue to have difficulties logging in, please contact
-your <product-name /> administrator for further assistance.
-If you did not request this email be sent, please disregard this message.
-
-Thank you for using <product-name />.
-<postal-template-replace label="email_footer"/>
-</postal-letter>
diff --git a/web/html/formletters/forgot_password.xml b/web/html/formletters/forgot_password.xml
deleted file mode 100644
index 51a22b4..0000000
--- a/web/html/formletters/forgot_password.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<postal-letter subject="&product_name; Password Reset">
-[ This is an automated email sent to <email-address /> at your request. ]
-
-Your <product-name /> password has been reset. To sign in, go to:
-
-https://<postal-template-replace label="hostname" default=" unknown hostname " />/
-
-And use the following username and password:
-
-Username: <username />
-Password: <password />
-
-Once you have logged in, you may then change your password.
-
-If you continue to have difficulties logging in, please contact
-your <product-name /> administrator for further assistance.
-
-Thank you for using <product-name />.
-<postal-template-replace label="email_footer"/>
-</postal-letter>
diff --git a/web/html/nav/activation_key.xml b/web/html/nav/activation_key.xml
deleted file mode 100644
index 69a3ca7..0000000
--- a/web/html/nav/activation_key.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="activation_key" invisible="1" title-depth="1" acl_mixins="RHN::Access::Token">
- <rhn-formvar name="tid" />
-
- <rhn-tab name="Details" url="/rhn/activationkeys/Edit.do" />
- <rhn-tab name="Child Channels" url="/rhn/activationkeys/channels/ChildChannels.do"/>
-
- <rhn-tab name="Packages"
- url="/rhn/activationkeys/packages/Packages.do"/>
- <rhn-tab name="Configuration"
- url="/rhn/activationkeys/configuration/List.do"
- acl="token_has_entitlement(provisioning_entitled)">
- <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
-
- <rhn-tab name="nav.sdc.config.list_unsubscribe_channels" url="/rhn/activationkeys/configuration/List.do">
- <rhn-tab url="/rhn/activationkeys/configuration/List.do"/>
- </rhn-tab>
- <rhn-tab name="nav.sdc.config.subscribe_channels" url="/rhn/activationkeys/configuration/Subscribe.do">
- <rhn-tab url="/rhn/activationkeys/configuration/Subscribe.do"/>
- </rhn-tab>
- <rhn-tab name="nav.sdc.config.rank_channels" url="/rhn/activationkeys/configuration/Rank.do">
- <rhn-tab url="/rhn/activationkeys/configuration/Rank.do"/>
- </rhn-tab>
-
- </rhn-tab>
-
-
- <rhn-tab name="Groups" url="/rhn/activationkeys/groups/List.do" >
- <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
- <rhn-tab name="List / Leave" url="/rhn/activationkeys/groups/List.do">
- <rhn-tab url="/rhn/activationkeys/groups/List.do"/>
- </rhn-tab>
- <rhn-tab name="Join" url="/rhn/activationkeys/groups/Add.do">
- <rhn-tab url="/rhn/activationkeys/groups/Add.do"/>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Activated Systems" url="/rhn/activationkeys/systems/List.do" />
-</rhn-navi-tree>
diff --git a/web/html/nav/channel_detail.xml b/web/html/nav/channel_detail.xml
deleted file mode 100644
index 6a0724a..0000000
--- a/web/html/nav/channel_detail.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="channel_detail" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
- <rhn-tab name="Details">
- <rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribers" acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()">
- <rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Managers" acl="org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()">
- <rhn-tab-url>/network/software/channels/managers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Errata" acl="channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/rhn/channels/ChannelErrata.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Packages">
- <rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Patches" acl="channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Patch Clusters" acl="channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/network/software/channels/patchsets.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribed Systems" on-click="Sniglets::Lists->navi_empty_set" node-id="systems_subscribed_to_channel">
- <rhn-tab-url>/rhn/channels/ChannelSubscribers.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Target Systems" acl="channel_subscribable()">
- <rhn-tab-url>/rhn/channels/TargetSystems.do</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
-
diff --git a/web/html/nav/duplicate_systems_tabs.xml b/web/html/nav/duplicate_systems_tabs.xml
deleted file mode 100644
index 8d710d6..0000000
--- a/web/html/nav/duplicate_systems_tabs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="duplicate_tabs" invisible="1" title-depth="1"
-formvar="inactive_count"
- acl_mixins="RHN::Access::Action">
- <rhn-tab name="duplicate.systems.nav.ips">
- <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="duplicate.systems.nav.hostname">
- <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="duplicate.systems.nav.mac_address">
- <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/nav/manage_channel.xml b/web/html/nav/manage_channel.xml
deleted file mode 100644
index 14807bc..0000000
--- a/web/html/nav/manage_channel.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="manage_channel" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
- <rhn-tab name="Details">
- <rhn-tab-url>/rhn/channels/manage/Edit.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/clone.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribers" acl="channel_exists();org_entitlement(sw_mgr_enterprise); org_channel_setting(not_globally_subscribable);user_can_admin_channel()">
- <rhn-tab-url>/network/software/channels/manage/subscribers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Organizations" acl="channel_exists(); channel_is_protected(); org_entitlement(sw_mgr_enterprise); user_role(org_admin)">
- <rhn-tab-url>/rhn/multiorg/channels/OrgList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Managers" acl="channel_exists();org_entitlement(sw_mgr_enterprise);user_role(channel_admin)">
- <rhn-tab-url>/network/software/channels/manage/managers.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Errata" acl="channel_exists();user_can_admin_channel();channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
- <rhn-tab-url>/rhn/channels/manage/errata/Errata.do</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_errata">
- <rhn-tab-url>/rhn/channels/manage/errata/ListRemove.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/errata/ConfirmRemove.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_errata">
- <rhn-tab-url>/rhn/channels/manage/errata/Add.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Clone" acl="channel_is_clone();user_role(channel_admin)" on-click="Sniglets::Lists->navi_empty_set" node-id="clone_channel_errata">
- <rhn-tab-url>/network/software/channels/manage/errata/clone.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/errata/clone_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Sync" acl="channel_is_clone();user_role(channel_admin);" node-id="sync_errata">
- <rhn-tab-url>/rhn/channels/manage/errata/SyncErrata.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/errata/ConfirmSyncPackages.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Packages" acl="channel_exists()">
- <rhn-tab-url>/rhn/channels/manage/ChannelPackageMenu.do</rhn-tab-url>
- <rhn-tab name="List / Remove" >
- <rhn-tab-url>/rhn/channels/manage/ChannelPackages.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/ChannelPackagesRemove.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
- <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAdd.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAddConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Compare" acl="channel_exists(); not channel_packaging_type(sysv-solaris)" url="/network/software/channels/manage/packages/compare/index.pxt">
- <rhn-tab-directory>/network/software/channels/manage/packages/compare</rhn-tab-directory>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Repositories" acl="channel_exists()">
- <rhn-tab-url>/rhn/channels/manage/Repositories.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Patches" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patches/index.pxt</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patches/patch_list.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patches/remove_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patches/add.pxt?view_channel=no_channels</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patches/add.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patches/add_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Patchsets" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patchsets/index.pxt</rhn-tab-url>
- <rhn-tab name="List/Remove" on-click="Sniglets::Lists->navi_empty_set" >
- <rhn-tab-url>/rhn/channels/manage/solaris/ListPatchSets.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
- <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt?view_channel=no_channels</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/manage/patchsets/add_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-</rhn-navi-tree>
-
diff --git a/web/html/nav/package_detail.xml b/web/html/nav/package_detail.xml
deleted file mode 100644
index e245bf2..0000000
--- a/web/html/nav/package_detail.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="package_detail" invisible="1" formvar="pid" title-depth="1" acl_mixins="RHN::Access::Package">
- <rhn-tab name="Details" url="/rhn/software/packages/Details.do">
- <rhn-tab name="Overview" url="/rhn/software/packages/Details.do"/>
- <rhn-tab name="Dependencies" url="/network/software/packages/dependencies.pxt"/>
- <rhn-tab name="Package Map" url="/network/software/packages/package_map.pxt" acl="package_type_capable(package_map)"/>
- <rhn-tab name="Change Log" url="/rhn/software/packages/ChangeLog.do" acl="package_type_capable(change_log)"/>
- <rhn-tab name="File List" url="/network/software/packages/file_list.pxt" acl="package_type_capable(file_list)"/>
- </rhn-tab>
- <rhn-tab name="New Versions" url="/network/software/packages/newer_versions.pxt"/>
- <rhn-tab name="Patches" url="/network/software/packages/patches_patching_package.pxt" acl="package_type_capable(solaris_patchable)"/>
- <rhn-tab name="Packages" url="/network/software/packages/patch_packages.pxt" acl="package_type_capable(solaris_patch)"/>
- <rhn-tab name="Patch Clusters" url="/network/software/packages/patch_patchsets.pxt" acl="package_type_capable(solaris_patch)"/>
- <rhn-tab name="Patches" url="/network/software/packages/patchset_patches.pxt" acl="package_type_capable(solaris_patchset)"/>
- <rhn-tab name="Patched Systems" url="/network/software/packages/system_list_for_patch.pxt" acl="package_type_capable(solaris_patch)"/>
- <rhn-tab name="Installed Systems" url="/network/software/packages/system_list.pxt" acl="not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)"/>
- <rhn-tab name="Installed Systems" url="/network/software/packages/system_list_for_patchset.pxt" acl="package_type_capable(solaris_patchset)"/>
- <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patch.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patch)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
- <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patchset.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
- <rhn-tab name="Target Systems"
- url="/network/software/packages/target_system_list.pxt" acl="org_entitlement(sw_mgr_enterprise);not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
-</rhn-navi-tree>
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
deleted file mode 100644
index 4d24d85..0000000
--- a/web/html/nav/sitenav-authenticated.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav" title-depth="0">
- <rhn-tab name="Overview" url="/rhn/YourRhn.do" active-image="tab-your_rhn-selected.gif" inactive-image="tab-your_rhn.gif">
- <rhn-tab name="Overview" url="/rhn/YourRhn.do"/>
- <rhn-tab name="Your Account" url="/rhn/account/UserDetails.do" >
- <rhn-tab name="Addresses">
- <rhn-tab-url>/rhn/account/Addresses.do</rhn-tab-url>
- <rhn-tab-url>/rhn/account/EditAddress.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Change Email" url="/rhn/account/ChangeEmail.do" />
- <rhn-tab name="Account Deactivation" url="/rhn/account/AccountDeactivation.do"/>
- </rhn-tab>
- <rhn-tab name="Your Preferences" url="/rhn/account/UserPreferences.do" />
- <rhn-tab name="Locale Preferences" url="/rhn/account/LocalePreferences.do" />
- <rhn-tab name="Subscription Management" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" >
- <rhn-tab name="System Entitlements" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" />
- <rhn-tab name="Software Channel Entitlements" url="/rhn/channels/software/Entitlements.do" acl="user_role(org_admin)" />
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Systems" url="/rhn/systems/Overview.do">
- <rhn-tab name="Overview" url="/rhn/systems/Overview.do" acl="org_entitlement(sw_mgr_enterprise)"/>
- <rhn-tab name="Systems" url="/rhn/systems/SystemList.do">
- <rhn-tab-directory>/rhn/systems/details</rhn-tab-directory>
- <rhn-tab-directory>/network/systems/details</rhn-tab-directory>
- <rhn-tab name="All" url="/rhn/systems/SystemList.do"/>
- <rhn-tab name="Virtual Systems" url="/rhn/systems/VirtualSystemsList.do"/>
- <rhn-tab name="Out of Date" url="/rhn/systems/OutOfDate.do"/>
- <rhn-tab name="Unentitled" url="/rhn/systems/Unentitled.do"/>
- <rhn-tab name="Ungrouped" url="/rhn/systems/Ungrouped.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
- <rhn-tab name="Inactive" url="/rhn/systems/Inactive.do"/>
- <rhn-tab name="Recently Registered" url="/rhn/systems/Registered.do"/>
- <rhn-tab name="Proxy" url="/rhn/systems/ProxyList.do" acl="org_channel_family(rhn-proxy) or not is_satellite(); user_role(org_admin)"/>
- <rhn-tab name="Duplicate Systems" url="/rhn/systems/DuplicateIPList.do">
- <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/DuplicateSystemsCompare.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Currency" url="/rhn/systems/SystemCurrency.do"/>
- </rhn-tab>
- <rhn-tab name="System Groups" acl="org_entitlement(sw_mgr_enterprise)">
- <rhn-tab-directory>/rhn/systems/groups</rhn-tab-directory>
- <rhn-tab-directory>/rhn/groups</rhn-tab-directory>
- <rhn-tab-directory>/network/systems/groups</rhn-tab-directory>
- <rhn-tab-url>/rhn/systems/SystemGroupList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Set Manager" url="/rhn/ssm/index.do" acl="org_entitlement(sw_mgr_enterprise)">
- <rhn-tab-directory>/network/systems/ssm</rhn-tab-directory>
- <rhn-tab name="Status" url="/rhn/ssm/ViewAllLog.do" acl="org_entitlement(sw_mgr_enterprise)"/>
- </rhn-tab>
- <rhn-tab name="Advanced Search" url="/rhn/systems/Search.do" acl="org_entitlement(sw_mgr_enterprise)" />
- <rhn-tab name="Activation Keys" acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)">
- <rhn-tab-url>/rhn/activationkeys/List.do</rhn-tab-url>
- <rhn-tab-url>/rhn/activationkeys/Edit.do</rhn-tab-url>
- <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
- <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
- <rhn-tab-directory>/rhn/activationkeys/systems</rhn-tab-directory>
- <rhn-tab-directory>/network/account/activation_keys</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Stored Profiles" acl="org_entitlement(sw_mgr_enterprise);">
- <rhn-tab-url>/rhn/profiles/List.do</rhn-tab-url>
- <rhn-tab-directory>/network/profiles</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Custom System Info" acl="org_entitlement(rhn_provisioning)">
- <rhn-tab-url>/rhn/systems/customdata/CustomDataList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Kickstart" url="/rhn/kickstart/KickstartOverview.do" acl="org_entitlement(rhn_provisioning); user_role(config_admin)">
- <rhn-tab name="Profiles" url="/rhn/kickstart/Kickstarts.do">
- <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Bare Metal" url="/rhn/kickstart/KickstartIpRanges.do" />
- <rhn-tab name="GPG and SSL Keys" url="/rhn/keys/CryptoKeysList.do">
- <rhn-tab-directory>/rhn/keys</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Distributions" url="/rhn/kickstart/ViewTrees.do" acl="user_role(org_admin)">
- <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
- <rhn-tab-url>/rhn/kickstart/TreeEdit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="File Preservation" url="/rhn/systems/provisioning/preservation/PreservationList.do" />
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif">
- <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
- <rhn-tab-directory>/rhn/errata</rhn-tab-directory>
- <rhn-tab name="Relevant" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
- <rhn-tab name="All" url="/rhn/errata/AllErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
- </rhn-tab>
- <rhn-tab name="Advanced Search" url="/rhn/errata/Search.do"/>
- <rhn-tab name="Manage Errata" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)">
- <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
- <rhn-tab name="Published" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)" />
- <rhn-tab name="Unpublished" url="/rhn/errata/manage/UnpublishedErrata.do" acl="user_role(channel_admin)" />
- </rhn-tab>
- <rhn-tab name="Clone Errata" url="/rhn/errata/manage/CloneErrata.do" acl="user_role(channel_admin)">
- <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Channels" url="/rhn/software/channels/All.do" active-image="tab-channels-selected.gif" inactive-image="tab-channels.gif">
- <rhn-tab name="Software Channels" url="/rhn/software/channels/All.do">
- <rhn-tab-directory>/rhn/channels</rhn-tab-directory>
- <rhn-tab-directory>/network/channels</rhn-tab-directory>
- <rhn-tab-directory>/network/software/channels</rhn-tab-directory>
- <rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/>
- <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/Vendor.do"/>
- <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/>
- <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/>
- <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/>
- <rhn-tab name="Retired Channels" url="/rhn/software/channels/Retired.do"/>
- </rhn-tab>
- <rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
- <rhn-tab-directory>/network/software/packages</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Manage Software Channels" acl="user_can_manage_channels()">
- <rhn-tab-directory>/network/software/channels/manage</rhn-tab-directory>
- <rhn-tab-url>/rhn/channels/manage/Manage.do</rhn-tab-url>
- <rhn-tab name="Manage Software Packages" acl="user_role(channel_admin)" node-id="manage_packages">
- <rhn-tab-directory>/rhn/software/manage/packages</rhn-tab-directory>
- <rhn-tab-url>/rhn/software/manage/packages/PackageList.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Audit" url="/rhn/audit/ListXccdf.do">
- <rhn-tab-directory>/rhn/audit</rhn-tab-directory>
- <rhn-tab name="OpenSCAP" url="/rhn/audit/ListXccdf.do">
- <rhn-tab name="All Scans" url="/rhn/audit/ListXccdf.do"/>
- <rhn-tab name="XCCDF Diff" url="/rhn/audit/scap/Diff.do">
- <rhn-tab-url>/rhn/audit/scap/DiffSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Advanced Search" url="/rhn/audit/scap/Search.do"/>
- </rhn-tab>
- <rhn-tab name="audit.nav.logreview" url="/rhn/audit/Overview.do" acl="not is_satellite()">
- <rhn-tab name="Overview" url="/rhn/audit/Overview.do" />
- <rhn-tab name="Reviews" url="/rhn/audit/Machine.do" />
- <rhn-tab name="Search" url="/rhn/audit/Search.do" />
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Configuration" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)">
- <rhn-tab-directory>/rhn/configuration</rhn-tab-directory>
- <rhn-tab name="Overview" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)" />
- <rhn-tab name="Configuration Channels" url="/rhn/configuration/GlobalConfigChannelList.do" acl="user_role(config_admin)" />
- <rhn-tab name="Configuration Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" >
- <rhn-tab-directory>/rhn/configuration/file</rhn-tab-directory>
- <rhn-tab name="Centrally-Managed Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" />
- <rhn-tab name="Locally-Managed Files" url="/rhn/configuration/file/LocalConfigFileList.do" acl="user_role(config_admin)" />
- </rhn-tab>
- <rhn-tab name="Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)">
- <rhn-tab-directory>/rhn/configuration/system</rhn-tab-directory>
- <rhn-tab name="Managed Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)" />
- <rhn-tab name="Target Systems" url="/rhn/configuration/system/TargetSystems.do" acl="user_role(config_admin)">
- <rhn-tab-url>/rhn/configuration/system/TargetSystemsSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirmSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/configuration/system/Summary.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Schedule" url="/rhn/schedule/PendingActions.do" active-image="tab-schedule-selected.gif" inactive-image="tab-schedule.gif">
- <rhn-tab name="Pending Actions" url="/rhn/schedule/PendingActions.do"/>
- <rhn-tab name="Failed Actions" url="/rhn/schedule/FailedActions.do"/>
- <rhn-tab name="Completed Actions" url="/rhn/schedule/CompletedActions.do"/>
- <rhn-tab name="Archived Actions" url="/rhn/schedule/ArchivedActions.do"/>
- </rhn-tab>
- <rhn-tab name="Users" url="/rhn/users/ActiveList.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)" active-image="tab-users-selected.gif" inactive-image="tab-users.gif">
- <rhn-tab name="User List" url="/rhn/users/ActiveList.do">
- <rhn-tab-directory>/network/users</rhn-tab-directory>
- <rhn-tab name="Active" url="/rhn/users/ActiveList.do"/>
- <rhn-tab name="Disabled" url="/rhn/users/DisabledList.do"/>
- <rhn-tab name="All" url="/rhn/users/UserList.do"/>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Monitoring" url="/rhn/monitoring/ProbeList.do" active-image="tab-monitoring-selected.gif" inactive-image="tab-monitoring.gif" acl="show_monitoring()">
- <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
- <rhn-tab name="Status" url="/rhn/monitoring/ProbeList.do">
- <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Scout Config Push" acl="show_monitoring();" url="/network/monitoring/scout/index.pxt" >
- <rhn-tab-url>/network/monitoring/scout/index.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Notification" url="/rhn/monitoring/config/notification/Methods.do">
- <rhn-tab-url>rhn/monitoring/config/notification/NotificationMethods.do</rhn-tab-url>
- <rhn-tab name="Filters" url="/rhn/monitoring/config/notification/ActiveFilters.do"/>
- </rhn-tab>
- <rhn-tab name="Probe Suites" url="/rhn/monitoring/config/ProbeSuites.do">
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteCreate.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteEdit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteListProbes.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeCreate.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeEdit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystems.do</rhn-tab-url>
- <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystemsEdit.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Admin" url="/rhn/admin/multiorg/Organizations.do" active-image="tab-tools-selected.gif" inactive-image="tab-tools.gif" acl="user_role(satellite_admin)">
- <rhn-tab name="Organizations" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Organizations.do">
- <rhn-tab-url>/rhn/admin/multiorg/OrgDetails.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgUsers.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/DeleteOrg.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgSystemSubscriptions.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgSoftwareSubscriptions.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgCreate.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/OrgConfigDetails.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscriptions" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/SoftwareEntitlements.do">
- <rhn-tab name="Software Channel Entitlements" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/multiorg/SoftwareEntitlements.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Entitlements" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/multiorg/SystemEntitlements.do</rhn-tab-url>
- <rhn-tab-url>/rhn/admin/multiorg/EntitlementOrgs.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Users" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Users.do">
- </rhn-tab>
- <rhn-tab acl="user_role(satellite_admin)" url="/rhn/admin/config/GeneralConfig.do">
- <rhn-tab-name><pxt-config var="product_name"/> Configuration</rhn-tab-name>
- <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
- <rhn-tab-url>/internal/satellite/config/restart_required.pxt</rhn-tab-url>
- <rhn-tab-url>/internal/satellite/config/restart_in_progress.pxt</rhn-tab-url>
- <rhn-tab name="General" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Monitoring" acl="show_monitoring(); user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/MonitoringConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Certificate" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/CertificateConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Bootstrap Script" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/BootstrapConfig.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Organizations" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/Orgs.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Restart" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/Restart.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Cobbler" acl="user_role(satellite_admin)">
- <rhn-tab-url>/rhn/admin/config/Cobbler.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Task Engine Status" acl="user_role(satellite_admin)" url="/rhn/admin/TaskStatus.do">
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Help" url="/rhn/help/index.do" active-image="tab-help-selected.gif" inactive-image="tab-help.gif">
- <rhn-tab-directory>/help</rhn-tab-directory>
- <rhn-tab name="Reference Guide" url="https://www.redhat.com/docs/manuals/satellite">
- <rhn-tab-directory>/rhn/help/reference/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Installation Guide" url="https://www.redhat.com/docs/manuals/satellite" >
- <rhn-tab-directory>/rhn/help/satellite/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Proxy Guide" url="https://www.redhat.com/docs/manuals/satellite">
- <rhn-tab-directory>/rhn/help/proxy/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Client Configuration" url="https://www.redhat.com/docs/manuals/satellite">
- <rhn-tab-directory>/rhn/help/client-config/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Channel Management" url="https://www.redhat.com/docs/manuals/satellite" >
- <rhn-tab-directory>/rhn/help/channel-mgmt/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Release Notes" url="https://www.redhat.com/docs/manuals/satellite" >
- <rhn-tab-directory>/rhn/help/release-notes/satellite/</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="API" url="/rhn/apidoc/index.jsp" />
- <rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
- </rhn-tab>
-
-</rhn-navi-tree>
diff --git a/web/html/nav/sitenav.xml b/web/html/nav/sitenav.xml
deleted file mode 100644
index 9775219..0000000
--- a/web/html/nav/sitenav.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav_unauth" title-depth="0">
- <rhn-tab name="Install" url="/rhn/newlogin/CreateFirstUser.do" acl="need_first_user()">
- </rhn-tab>
- <rhn-tab name="Sign In" url="/" active-image="tab-sign_in-selected.gif" inactive-image="tab-sign_in.gif">
- </rhn-tab>
-
- <rhn-tab name="About" url="/help/about.pxt" active-image="tab-about_rhn-selected.gif" inactive-image="tab-about_rhn.gif" >
- <rhn-tab name="About" url="/help/about.pxt" />
- <rhn-tab name="Help Desk" url="/rhn/help/index.do" />
- <rhn-tab name="Lookup Login/Password" url="/help/forgot_password.pxt" />
- <rhn-tab name="Release Notes" url="/rhn/help/dispatcher/release_notes">
- <rhn-tab-directory>/rhn/help/release-notes/satellite</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Reference Guide" url="/rhn/help/dispatcher/reference_guide">
- <rhn-tab-directory>/rhn/help/reference</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Installation Guide" url="/rhn/help/dispatcher/install_guide">
- <rhn-tab-directory>/rhn/help/satellite</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Proxy Guide" url="/rhn/help/dispatcher/proxy_guide">
- <rhn-tab-directory>/rhn/help/proxy</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Client Configuration" url="/rhn/help/dispatcher/client_config_guide">
- <rhn-tab-directory>/rhn/help/client-config</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="Channel Management" url="/rhn/help/dispatcher/channel_mgmt_guide">
- <rhn-tab-directory>/rhn/help/channel-mgmt</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="API" url="/rhn/apidoc/index.jsp">
- <rhn-tab name="Overview" url="/rhn/apidoc/index.jsp">
- <rhn-tab-directory>/rhn/apidoc</rhn-tab-directory>
- </rhn-tab>
- <rhn-tab name="FAQs" url="/rhn/apidoc/faqs.jsp" />
- <rhn-tab name="Sample Scripts" url="/rhn/apidoc/scripts.jsp" />
- </rhn-tab>
- <rhn-tab name="Search" url="/rhn/help/Search.do" />
- <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
-</rhn-tab>
-
-
-</rhn-navi-tree>
diff --git a/web/html/nav/ssm.xml b/web/html/nav/ssm.xml
deleted file mode 100644
index 12f464b..0000000
--- a/web/html/nav/ssm.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="ssm" invisible="1" title-depth="1">
- <rhn-tab name="Overview" url="/rhn/ssm/index.do" />
- <rhn-tab name="Systems">
- <rhn-tab-url>/rhn/systems/ssm/ListSystems.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Errata"
- on-click="Sniglets::Lists->navi_empty_set"
- node-id="system_errata_list">
- <rhn-tab-url>/network/systems/ssm/errata/index.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/errata/systems_affected.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/errata/apply_errata_confirm.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Packages">
-
- <rhn-tab-url>/rhn/ssm/Packages.do</rhn-tab-url>
-
- <rhn-tab name="Install">
- <rhn-tab-url>/rhn/ssm/PackageInstall.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Remove">
- <rhn-tab-url>/rhn/ssm/PackageRemove.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Upgrade">
- <rhn-tab-url>/rhn/ssm/PackageUpgrade.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Verify">
- <rhn-tab-url>/rhn/ssm/PackageVerify.do</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Patches" acl="global_config(enable_solaris_support)">
-
- <rhn-tab-url>/network/systems/ssm/patches/index.pxt</rhn-tab-url>
-
- <rhn-tab name="Install">
- <rhn-tab-url>/network/systems/ssm/patches/install.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patches/install_channel.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patches/install_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Remove">
- <rhn-tab-url>/network/systems/ssm/patches/remove.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patches/remove_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Patch Clusters" acl="global_config(enable_solaris_support)">
-
- <rhn-tab-url>/network/systems/ssm/patchsets/index.pxt</rhn-tab-url>
-
- <rhn-tab name="Install">
- <rhn-tab-url>/network/systems/ssm/patchsets/install.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patchsets/install_channel.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/patchsets/install_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Groups" acl="user_role(org_admin)">
- <rhn-tab-url>/network/systems/ssm/groups/index.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/groups/alter_membership_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/groups/create.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Channels">
- <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
- <rhn-tab name="Base Channels">
- <rhn-tab-url>/rhn/channel/ssm/BaseChannelSubscribe.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Child Channels">
- <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
- <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptionsConfirm.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Configuration" url="/rhn/systems/ssm/config/Deploy.do">
- <rhn-tab name="Deploy Files" url="/rhn/systems/ssm/config/Deploy.do" />
- <rhn-tab name="Compare Files" url="/rhn/systems/ssm/config/Diff.do" />
- <rhn-tab name="Subscribe to Channels" url="/rhn/systems/ssm/config/Subscribe.do" />
- <rhn-tab name="Unsubscribe from Channels" url="/rhn/systems/ssm/config/Unsubscribe.do" />
- <rhn-tab name="Enable Configuration" url="/rhn/systems/ssm/config/Enable.do" />
- </rhn-tab>
-
- <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do">
- <rhn-tab name="Kickstart" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do" >
- <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByProfile.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByIp.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Tag Systems" url="/network/systems/ssm/provisioning/tag_systems.pxt" />
- <rhn-tab name="Rollback" url="/network/systems/ssm/provisioning/rollback.pxt">
- <rhn-tab-url>/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Remote Command" url="/network/systems/ssm/provisioning/remote_command.pxt">
- <rhn-tab-url>/network/systems/ssm/provisioning/remote_command_conf.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Misc">
- <rhn-tab-url>/rhn/systems/ssm/misc/Index.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/HardwareRefresh.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/SoftwareRefresh.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/change_sys_pref_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/prof_conv_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/ssm/DeleteConfirm.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/reboot_systems_conf.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/misc/upgrade_slot.pxt</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/nav/system_detail.xml b/web/html/nav/system_detail.xml
deleted file mode 100644
index 46fb590..0000000
--- a/web/html/nav/system_detail.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="system_detail" invisible="1" title-depth="1" acl_mixins="RHN::Access::System">
- <rhn-formvar name="sid" />
- <rhn-tab name="Details" url="/rhn/systems/details/Overview.do">
- <rhn-tab name="Overview" url="/rhn/systems/details/Overview.do" />
- <rhn-tab name="Properties" url="/rhn/systems/details/Edit.do" />
- <rhn-tab name="Remote Command" acl="system_feature(ftr_remote_command)">
- <rhn-tab-url>/network/systems/details/remote_commands.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Connection" url="/network/systems/details/connection.pxt" acl="org_has_proxies()"/>
- <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt" acl="user_role(org_admin); system_feature(ftr_proxy_capable) or system_is_proxy(); org_channel_family(rhn-proxy) or system_is_proxy(); child_channel_candidate(rhn-proxy) or system_is_proxy(); org_entitlement(rhn_provisioning); not system_is_satellite(); not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)">
- <rhn-tab name="Activation" url="/network/systems/details/proxy.pxt" />
- <rhn-tab name="Systems Using Proxy" url="/network/systems/details/proxy-clients.pxt" acl="system_is_proxy()"/>
- </rhn-tab>
- <rhn-tab name="Reactivation" url="/network/systems/details/activation.pxt" acl="system_feature(ftr_agent_smith)"/>
- <rhn-tab name="Hardware">
- <rhn-tab-url>/rhn/systems/details/SystemHardware.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Migrate" acl="user_role(org_admin)" url="/rhn/systems/details/SystemMigrate.do" />
- <rhn-tab name="Notes">
- <rhn-tab-url>/rhn/systems/details/Notes.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/EditNote.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Custom Info" acl="system_feature(ftr_custom_info)">
- <rhn-tab-url>/rhn/systems/details/ListCustomData.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Software" url="/rhn/systems/details/packages/Packages.do">
-
- <rhn-tab name="Errata" acl="system_feature(ftr_errata_updates); not is_solaris()">
- <rhn-tab-url>/rhn/systems/details/ErrataList.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Patches" node-id="system_patch_list" acl="is_solaris()">
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_list">
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchListConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Install" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_available_list">
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstall.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstallConfirm.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Patch Clusters" on-click="Sniglets::Lists->navi_empty_set" node-id="solaris_patchset_list" acl="is_solaris()">
- <rhn-tab-url>/rhn/systems/details/packages/patchsets/PatchSetList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/patchsets/InstallPatchSet.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Packages" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/Packages.do</rhn-tab-url>
- <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list" acl="system_feature(ftr_package_remove)">
- <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/RemoveConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="List" acl="not system_feature(ftr_package_remove)">
- <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Upgrade" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_upgradable_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/UpgradableList.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Install" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_installable_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/InstallPackages.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/InstallConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Verify" acl="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_verifiable_package_list">
- <rhn-tab-url>/rhn/systems/details/packages/VerifyPackages.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/VerifyConfirm.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Profiles" acl="system_feature(ftr_profile_compare)" on-click="Sniglets::Lists->navi_empty_set" node-id="packages_for_system_sync">
- <rhn-tab-url>/rhn/systems/details/packages/profiles/ShowProfiles.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/profiles/Create.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareSystems.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareProfiles.do</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Software Channels" acl="system_feature(ftr_package_updates)">
- <rhn-tab-url>/rhn/systems/details/SystemChannels.do</rhn-tab-url>
- </rhn-tab>
-
- </rhn-tab>
-
- <rhn-tab name="Configuration" acl="system_feature(ftr_config)" url="/rhn/systems/details/configuration/Overview.do">
-
- <rhn-tab-directory>/rhn/systems/details/configuration</rhn-tab-directory>
-
- <rhn-tab name="Overview" url="/rhn/systems/details/configuration/Overview.do"/>
-
- <rhn-tab name="View/Modify Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do">
- <rhn-tab name="Centrally Managed Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do"/>
- <rhn-tab name="Locally Managed Files" url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do"/>
- <rhn-tab name="Sandbox Managed Files" url="/rhn/systems/details/configuration/ViewModifySandboxPaths.do"/>
- </rhn-tab>
-
- <rhn-tab name="Add Files" url="/rhn/systems/details/configuration/addfiles/UploadFile.do">
- <rhn-tab name="Upload File" url="/rhn/systems/details/configuration/addfiles/UploadFile.do"/>
- <rhn-tab name="Import Files" url="/rhn/systems/details/configuration/addfiles/ImportFile.do">
- <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirmSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Create File" url="/rhn/systems/details/configuration/addfiles/CreateFile.do"/>
- </rhn-tab>
-
- <rhn-tab name="Deploy Files" url="/rhn/systems/details/configuration/DeployFile.do">
- <rhn-tab-url>/rhn/systems/details/configuration/DeployFileSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirmSubmit.do</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Compare Files" url="/rhn/systems/details/configuration/DiffFile.do">
- <rhn-tab-url>/rhn/systems/details/configuration/DiffFileSubmit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirm.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirmSubmit.do</rhn-tab-url>
- </rhn-tab>
-
-
- <rhn-tab name="Manage Configuration Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
- <rhn-tab name="List/Unsubscribe from Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
- <rhn-tab-url>/rhn/systems/details/configuration/ConfigChannelListUnsubscribeSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Subscribe to Channels" url="/rhn/systems/details/configuration/SubscriptionsSetup.do">
- <rhn-tab-url>/rhn/systems/details/configuration/SubscriptionsSubmit.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="View/Modify Rankings" url="/rhn/systems/details/configuration/RankChannels.do"/>
- </rhn-tab>
- </rhn-tab>
-
- <rhn-tab name="Provisioning" acl="not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)" url="/rhn/systems/details/kickstart/ScheduleWizard.do">
-
- <rhn-tab name="Kickstart" url="/rhn/systems/details/kickstart/ScheduleWizard.do" acl="system_feature(ftr_kickstart); not is_solaris()" node-id="kickstart_details">
- <rhn-tab-directory>/rhn/systems/details/kickstart</rhn-tab-directory>
- <rhn-tab name="Session Status" url="/rhn/systems/details/kickstart/SessionStatus.do" acl="system_kickstart_session_exists()">
- <rhn-tab-url>/rhn/systems/details/kickstart/SessionCancel.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Schedule" url="/rhn/kickstart/ScheduleWizard.do"/>
- <rhn-tab name="kickstart.variable.nav" url="/rhn/systems/details/kickstart/Variables.do" acl="cobbler_system_record_exists()"/>
- </rhn-tab>
-
- <rhn-tab name="Snapshots" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/index.pxt" hide_all_children_unless_active="1">
- <rhn-tab name="Rollback" formvar="ss_id" url="/network/systems/details/history/snapshots/rollback.pxt" />
- <rhn-tab name="Groups" formvar="ss_id" url="/network/systems/details/history/snapshots/groups.pxt" />
- <rhn-tab name="Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/channels.pxt" />
- <rhn-tab name="Packages" formvar="ss_id" url="/network/systems/details/history/snapshots/packages.pxt">
- <rhn-tab-url>/network/systems/details/history/snapshots/unservable_packages.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Config Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/namespaces.pxt" />
- <rhn-tab name="Config Files" formvar="ss_id" url="/network/systems/details/history/snapshots/config.pxt" />
- <rhn-tab name="Snapshot Tags" formvar="ss_id" url="/network/systems/details/history/snapshots/snapshot_tags.pxt">
- <rhn-tab-url>/network/systems/details/history/snapshots/add_snapshot_tag.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
- <rhn-tab name="Snapshot Tags" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/system_tags.pxt" />
-
- </rhn-tab>
-
- <rhn-tab name="Monitoring" acl="show_monitoring(); system_feature(ftr_probes)">
- <rhn-tab-directory>/rhn/systems/details/probes</rhn-tab-directory>
- <rhn-tab-url>/rhn/systems/details/probes/ProbesList.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/probes/ProbeDetails.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/probes/ProbeEdit.do</rhn-tab-url>
- <rhn-tab-url>/rhn/systems/details/probes/ProbeDelete.do</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/probes/create.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/probes/delete_conf.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Groups" acl="system_feature(ftr_system_grouping); user_role(org_admin) or user_role(system_group_admin)">
- <rhn-tab-url>/rhn/systems/details/groups/ListRemove.do</rhn-tab-url>
- <rhn-tab name="List / Leave" url="/rhn/systems/details/groups/ListRemove.do"/>
- <rhn-tab name="Join" url="/rhn/systems/details/groups/Add.do"/>
- </rhn-tab>
-
- <rhn-tab name="Virtualization" acl="not system_is_virtual(); system_has_management_entitlement()">
- <rhn-tab-url>/rhn/systems/details/virtualization/VirtualGuestsList.do</rhn-tab-url>
- <rhn-tab name="Details" url="/rhn/systems/details/virtualization/VirtualGuestsList.do"/>
- <rhn-tab name="Provisioning" url="/rhn/systems/details/virtualization/ProvisionVirtualizationWizard.do" acl="system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)"/>
- </rhn-tab>
-
- <rhn-tab name="Groups" url="/rhn/systems/details/groups/ListRemove.do" acl="system_feature(ftr_system_grouping); not user_role(org_admin); not user_role(system_group_admin)"/>
-
- <rhn-tab name="Audit" url="/rhn/systems/details/audit/ListScap.do"/>
-
- <rhn-tab name="Events">
- <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/details/history/event.pxt</rhn-tab-url>
- <rhn-tab name="Pending">
- <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="History">
- <rhn-tab-url>/network/systems/details/history/history.pxt</rhn-tab-url>
- </rhn-tab>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/nav/system_group_detail.xml b/web/html/nav/system_group_detail.xml
deleted file mode 100644
index 2bba613..0000000
--- a/web/html/nav/system_group_detail.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="system_group_detail" invisible="1" formvar="sgid" title-depth="1">
- <rhn-tab name="Details">
- <rhn-tab-url>/network/systems/groups/details.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/groups/delete_confirm.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Systems">
- <rhn-tab-url>/rhn/groups/ListRemoveSystems.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Target Systems" acl="user_role(system_group_admin)">
- <rhn-tab-url>/rhn/groups/AddSystems.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Errata" on-click="Sniglets::Lists->navi_empty_set" node-id="system_group_errata_list">
- <rhn-tab-url>/network/systems/groups/errata_list.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/groups/systems_affected_by_errata.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url>
- </rhn-tab>
-
- <rhn-tab name="Admins" url="/network/systems/groups/admin_list.pxt" acl="user_role(system_group_admin)" />
-
- <rhn-tab name="Probes" url="/network/systems/groups/probe_list.pxt" acl="org_entitlement(rhn_monitor)" />
-
-</rhn-navi-tree>
diff --git a/web/html/nav/user_detail.xml b/web/html/nav/user_detail.xml
deleted file mode 100644
index 857c446..0000000
--- a/web/html/nav/user_detail.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="user_detail" invisible="1" formvar="uid" title-depth="1">
- <rhn-tab name="Details">
- <rhn-tab-url>/rhn/users/UserDetails.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="System Groups">
- <rhn-tab-url>/rhn/users/AssignedSystemGroups.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Systems">
- <rhn-tab-url>/rhn/users/SystemsAdmined.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Channel Permissions" acl="user_role(channel_admin)" url="/rhn/users/ChannelPerms.do">
- <rhn-tab name="Subscription" url="/rhn/users/ChannelPerms.do" />
- <rhn-tab name="Management" url="/rhn/users/ChannelManagementPerms.do" acl="org_role(channel_admin)"/>
- </rhn-tab>
- <rhn-tab name="Preferences">
- <rhn-tab-url>/rhn/users/UserPreferences.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Addresses">
- <rhn-tab-url>/rhn/users/Addresses.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="Notification Methods" acl="org_entitlement(rhn_monitor)">
- <rhn-tab-url>/network/users/details/contact_methods/index.pxt</rhn-tab-url>
- <rhn-tab-directory>/network/users/details/contact_methods</rhn-tab-directory>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/network/components/legends/errata-list-legend.pxi b/web/html/network/components/legends/errata-list-legend.pxi
deleted file mode 100644
index e2f17c4..0000000
--- a/web/html/network/components/legends/errata-list-legend.pxi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>Errata Legend</h2>
- <ul>
- <li><img src="/img/wrh-security.gif" alt="" />Security</li>
- <li><img src="/img/wrh-bug.gif" alt="" />Bug Fix</li>
- <li><img src="/img/wrh-product.gif" alt="" />Enhancement</li>
- </ul>
-</div>
diff --git a/web/html/network/components/legends/event-status.pxi b/web/html/network/components/legends/event-status.pxi
deleted file mode 100644
index 7666896..0000000
--- a/web/html/network/components/legends/event-status.pxi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>Event Status Legend</h2>
- <ul>
- <li><img src="/img/rhn-listicon-ok.gif" alt="" />Complete</li>
- <li><img src="/img/rhn-listicon-error.gif" alt="" />Failure</li>
- <li><img src="/img/rhn-listicon-activity.gif" alt="" />Activity Occuring</li>
- </ul>
-</div>
diff --git a/web/html/network/components/legends/event-type.pxi b/web/html/network/components/legends/event-type.pxi
deleted file mode 100644
index ce8506a..0000000
--- a/web/html/network/components/legends/event-type.pxi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>Event Type Legend</h2>
- <ul>
- <li><img src="/img/rhn-listicon-package.gif" alt="" />Package Event</li>
- <li><img src="/img/rhn-listicon-errata.gif" alt="" />Errata Event</li>
- <li><img src="/img/rhn-listicon-preferences.gif" alt="" />Preferences Event</li>
- <li><img src="/img/rhn-listicon-system.gif" alt="" />System Event</li>
- </ul>
-</div>
diff --git a/web/html/network/components/legends/scout-config-legend.pxi b/web/html/network/components/legends/scout-config-legend.pxi
deleted file mode 100644
index 7ec3c67..0000000
--- a/web/html/network/components/legends/scout-config-legend.pxi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<div class="sideleg">
-<h2>Scout Config Legend</h2>
-<ul>
-<li><img title="Scout is fully updated with the latest probe data"
- alt="Scout is fully updated with the latest probe data" src="/img/configureScoutOK.gif" />Fully Updated</li>
-<li><img title="A Scout Config Push is required"
- alt="A Scout Config Push is required" src="/img/configureScout.gif" />Push Required</li>
-<li><img title="The last Scout Config Push generated warnings."
- alt="The last Scout Config Push generated warnings." src="/img/configureScoutWarning.gif" />Push had Warnings </li>
-<li><img title="The last Scout Config Push failed."
- alt="The last Scout Config Push failed." src="/img/configureScoutError.gif" />Push Failed</li>
-<li><img title="The Scout Config Push is in progress"
- alt="The Scout Config Push is in progress" src="/img/configureScoutPending.gif" />Push in Progress</li>
-</ul>
-</div>
-
diff --git a/web/html/network/components/legends/system-list-legend.pxi b/web/html/network/components/legends/system-list-legend.pxi
deleted file mode 100644
index fd1d284..0000000
--- a/web/html/network/components/legends/system-list-legend.pxi
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<pxt-passthrough>
-
-<pxt-use class="Sniglets::Users" />
-
-<div class="sideleg">
- <h2>System Legend</h2>
- <ul>
- <li><img src="/img/icon_up2date.gif" alt="" />OK</li>
- <li><img src="/img/icon_crit_update.gif" alt="" />Critical</li>
- <li><img src="/img/icon_reg_update.gif" alt="" />Warning</li>
- <li><img src="/img/icon_checkin.gif" alt="" />Unknown</li>
-<rhn-require acl="org_entitlement(sw_mgr_enterprise)">
- <li><img src="/img/icon_locked.gif" alt="" />Locked</li>
-</rhn-require>
-<rhn-require acl="org_entitlement(rhn_provisioning)">
- <li><img src="/img/icon_kickstart_session.gif" alt="" />Kickstarting</li>
-</rhn-require>
- <li><img src="/img/icon_pending.gif" alt="" />Pending Actions</li>
- <li><img src="/img/icon_unentitled.gif" alt="" />Unentitled</li>
-<rhn-require acl="org_entitlement(rhn_monitor)">
- <li><img src="/img/icon_subicon_monitoring.gif" alt="" />Monitoring Status</li>
-</rhn-require>
- </ul>
-</div>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/message_queues/local.pxi b/web/html/network/components/message_queues/local.pxi
deleted file mode 100644
index cc3caf7..0000000
--- a/web/html/network/components/message_queues/local.pxi
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-messages queue="local_alert">
- <div class="local-alert">{messages}</div>
-</pxt-messages>
-<pxt-messages queue="local_info">
- <div class="local-info">{messages}</div>
-</pxt-messages>
-</pxt-passthrough>
diff --git a/web/html/network/components/message_queues/site.pxi b/web/html/network/components/message_queues/site.pxi
deleted file mode 100644
index 77c6540..0000000
--- a/web/html/network/components/message_queues/site.pxi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-messages queue="site_info">
- <div class="site-info">
- {messages}
- </div>
-</pxt-messages>
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/create_notification_method.pxi b/web/html/network/components/monitoring/create_notification_method.pxi
deleted file mode 100644
index e9230ad..0000000
--- a/web/html/network/components/monitoring/create_notification_method.pxi
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::ContactMethod" />
-
-<h2>Create Notification Method</h2>
-
-<pxt-formvar>
-
-<div class="page-summary">
- <p>Create a notification method using the form provided.</p>
-</div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-
- <pxt-form method="post">
-
- <table class="details">
-
- <tr>
- <th>Method Name:</th>
- <td><input type="text" size="30" name="method_name" value="" maxlength="20" /></td>
- </tr>
- <tr>
- <th>Email:</th>
- <td><input type="text" size="30" name="method_email" value="" maxlength="50" /></td>
- </tr>
- <tr>
- <th>Message Format:</th>
- <td>
- <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="" />Short (Pager-Style) Messages
- </td>
- </tr>
- </table>
-
- <div align="right">
- <hr />
- <input type="hidden" name="pxt:trap" value="rhn:contact-method-create-cb" />
- <input type="hidden" name="redirect_to" value="index.pxt?uid={formvar:uid}" />
- <input type="submit" name="create_method" value="Create Method" />
- <pxt-hidden name="uid" />
- </div>
-
- </pxt-form>
-</pxt-formvar>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/delete_notification_method.pxi b/web/html/network/components/monitoring/delete_notification_method.pxi
deleted file mode 100644
index df76853..0000000
--- a/web/html/network/components/monitoring/delete_notification_method.pxi
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::ContactMethod" />
-<pxt-use class="Sniglets::Lists" />
-
-<h2>Notification Method Deletion Confirmation</h2>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<rhn-if-method-dependencies value="true">
- <div class="page-summary">
- <p>The <strong><rhn-contact-method-name /></strong> Notification Method cannot be deleted due to the following dependencies:</p>
- <p>Please note that only systems which you have permission to manage will be linked to from this page.</p>
- </div>
-
- <rhn-listview class="Sniglets::ListView::ProbeList" mode="probes_for_contact_method">
- <column name="System" label="system_name" sort_by="1" align="left" width="35%">
- <url>/rhn/systems/details/Overview.do?sid={column:system_id}</url>
- </column>
- <column name="Probe" label="probe_description" width="30%" align="left">
- <url>/rhn/systems/details/probes/ProbeDetails.do?probe_id={column:probe_id}&sid={column:system_id}</url>
- </column>
- </rhn-listview>
-</rhn-if-method-dependencies>
-
-<rhn-if-method-dependencies value="false">
- <div class="page-summary">
- <p>Delete Notification Method: <strong><rhn-contact-method-name /></strong></p>
- </div>
- <div align="right">
- <hr />
- <pxt-form method="post">
- <pxt-hidden name="cmid" />
- <input type="hidden" name="success_redirect" value="index.pxt?uid={formvar:uid}" />
- <input type="hidden" name="pxt:trap" value="rhn:contact-method-delete-cb" />
- <input type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
- </pxt-form>
- </div>
-</rhn-if-method-dependencies>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/edit_notification_method.pxi b/web/html/network/components/monitoring/edit_notification_method.pxi
deleted file mode 100644
index 53dce07..0000000
--- a/web/html/network/components/monitoring/edit_notification_method.pxi
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::ContactMethod" />
-
-<h2>Notification Method Details</h2>
-
-<pxt-formvar>
-
-<div class="toolbar"><rhn-deletion-link url="delete_confirm.pxt?cmid={formvar:cmid}" type="method" /></div>
-<div class="page-summary">
- <p>Edit this notification method using the form provided.</p>
-</div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
- <pxt-form method="post">
-
-<rhn-contact-method-edit-form>
-
- <table class="details">
- <tr>
- <th>Method Name:</th>
- <td><input type="text" size="30" name="method_name" value="{method_name}" maxlength="20" /></td>
- </tr>
- <tr>
- <th>Email:</th>
- <td><input type="text" size="30" name="method_email" value="{method_email}" maxlength="50" /></td>
- </tr>
- <tr>
- <th>Message Format:</th>
- <td>
- <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="{use_pager_type}" />Short (Pager-Style) Messages
- </td>
- </tr>
- </table>
-
- <div align="right">
- <hr />
- <input type="hidden" name="pxt:trap" value="rhn:contact-method-edit-cb" />
- <input type="hidden" name="redirect_to" value="index.pxt?uid={uid}" />
- <input type="submit" name="update_method" value="Update Method" />
- <pxt-hidden name="uid" />
- <pxt-hidden name="cmid" />
- </div>
-
-</rhn-contact-method-edit-form>
-
- </pxt-form>
-</pxt-formvar>
-
-</pxt-passthrough>
diff --git a/web/html/network/components/monitoring/notification_methods.pxi b/web/html/network/components/monitoring/notification_methods.pxi
deleted file mode 100644
index ecaea0b..0000000
--- a/web/html/network/components/monitoring/notification_methods.pxi
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Lists" />
-
-<h2>Monitoring Notification Methods</h2>
-
-<pxt-formvar>
-
-<div class="toolbar"><rhn-creation-link url="create.pxt?uid={formvar:uid}" type="method" /></div>
-
-<div class="page-summary">
- <p>A list of methods available for notification of monitoring events.</p>
-</div>
-
-<rhn-listview class="Sniglets::ListView::ContactMethodList" mode="users_contact_methods">
- <empty_list_message>No Notification Methods Available.</empty_list_message>
-
- <column name="Method Name" label="method_name" sort_by="1" width="50%" align="left">
- <url>edit.pxt?cmid={column:recid}</url>
- </column>
-
- <column name="Destination" label="method_target" sort_by="1" width="30%" align="left" />
-</rhn-listview>
-
-</pxt-formvar>
-
-</pxt-passthrough>
-
diff --git a/web/html/network/components/schedule_action-interface.pxi b/web/html/network/components/schedule_action-interface.pxi
deleted file mode 100644
index dece6b4..0000000
--- a/web/html/network/components/schedule_action-interface.pxi
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<table class="schedule-action-interface" align="center">
- <tr>
- <td><input type="radio" name="schedule_time" value="asap" checked="1" /></td>
- <th>Schedule action as soon as possible</th>
- </tr>
- <tr>
- <td><input type="radio" name="schedule_time" value="at_entered_time" /></td>
- <th>Schedule action for no sooner than:</th>
- </tr>
- <tr>
- <th><img src="/img/rhn-icon-schedule.gif" alt="Date Selection" /></th>
- <td>{date_selection}</td>
- </tr>
-</table>
-
-<div align="right">
-<hr />
-{button}
-</div>
-</pxt-passthrough>
diff --git a/web/html/network/components/status_bar/main.pxi b/web/html/network/components/status_bar/main.pxi
deleted file mode 100644
index cf8416a..0000000
--- a/web/html/network/components/status_bar/main.pxi
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::Header" />
- <pxt-use class="Sniglets::Search" />
- <pxt-use class="Sniglets::Sets" />
-
-<div id="bar">
-
-<div id="systembar">
-<div id="systembarinner">
-<pxt-include file="/network/components/status_bar/ssm.pxi" />
-</div>
-</div>
-
-</div>
-<!-- close bar -->
-
-
-</pxt-passthrough>
diff --git a/web/html/network/components/status_bar/ssm.pxi b/web/html/network/components/status_bar/ssm.pxi
deleted file mode 100644
index 8ba51ad..0000000
--- a/web/html/network/components/status_bar/ssm.pxi
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::Lists" />
-<pxt-use class="Sniglets::HTML" />
-
-<div>
-<rhn-require acl="user_authenticated(); org_entitlement(sw_mgr_enterprise)">
- <span id="header_selcount"><rhn-set-totals set="system_list" noun="system"/></span>
-
- <a class="button" href="/rhn/ssm/index.do">Manage</a>
-
-<rhn-return-link default="/network">
- <a class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
-</rhn-return-link>
-
-</rhn-require>
-</div>
-</pxt-passthrough>
diff --git a/web/html/network/components/system_groups/sgdc_header.pxi b/web/html/network/components/system_groups/sgdc_header.pxi
deleted file mode 100644
index 084fd23..0000000
--- a/web/html/network/components/system_groups/sgdc_header.pxi
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::ServerGroup" />
-
-<pxt-formvar>
-
- <rhn-toolbar base="h1"
- img="/img/rhn-icon-system_group.gif"
- alt="system group"
- help-url="s1-sm-systems.jsp#s2-sm-system-group-list"
- misc-url="/network/systems/ssm/work_with_group.pxt?sgid={formvar:sgid}&pxt_trap=rhn:work_with_group_cb"
- misc-alt="work with group"
- misc-img="/img/work_with_group.gif"
- misc-text="work with group"
- deletion-type="group"
- deletion-url="delete_confirm.pxt?sgid={formvar:sgid}"
- deletion-acl="user_role(system_group_admin)">
- <rhn-server-group-name />
- </rhn-toolbar>
-
- <rhn-navi-nav prefix="system_group_details" depth="0" file="/nav/system_group_detail.xml" style="contentnav" />
-
-</pxt-formvar>
-</pxt-passthrough>
diff --git a/web/html/network/components/systems/reschedule_action_form.pxi b/web/html/network/components/systems/reschedule_action_form.pxi
deleted file mode 100644
index 94676d2..0000000
--- a/web/html/network/components/systems/reschedule_action_form.pxi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- This history event was caused by a failed scheduled action.<br/>
- <p>If you have corrected the problem, you may reschedule the action below.</p>
- <pxt-form method="post">
-<pxt-formvar>
- <pxt-hidden name="sid" />
- <input type="hidden" name="aid" value="{formvar:hid}" />
- <input type="hidden" name="success_redirect" value="/network/systems/details/history/pending.pxt" />
- <input type="hidden" name="pxt:trap" value="rhn:reschedule_action_cb" />
- <input type="submit" value="Reschedule" />
-</pxt-formvar>
- </pxt-form>
-
-</pxt-passthrough>
\ No newline at end of file
diff --git a/web/html/network/components/systems/system_details_toolbar.pxi b/web/html/network/components/systems/system_details_toolbar.pxi
deleted file mode 100644
index 0d54619..0000000
--- a/web/html/network/components/systems/system_details_toolbar.pxi
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<pxt-use class="Sniglets::HTML" />
-<pxt-use class="Sniglets::Servers" />
-<pxt-use class="Sniglets::Users" />
-<pxt-formvar>
-<!-- Regular system -->
-<rhn-require acl="not system_is_virtual_host(); not system_is_virtual()">
- <rhn-toolbar base="h1" img="/img/rhn-icon-system.gif"
- alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
- deletion-type="system">
- <rhn-server-name />
- </rhn-toolbar>
-</rhn-require>
-<!-- virtual host -->
-<rhn-require acl="system_is_virtual_host()">
- <rhn-toolbar base="h1" img="/img/virt-host.png"
- alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
- deletion-type="system">
- <rhn-server-name />
- </rhn-toolbar>
-</rhn-require>
-<!-- virtual guest -->
-<rhn-require acl="system_is_virtual()">
- <rhn-toolbar base="h1" img="/img/virt-guest.png"
- alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
- deletion-type="system">
- <rhn-server-name />
- </rhn-toolbar>
-</rhn-require>
-</pxt-formvar>
-</pxt-passthrough>
-
diff --git a/web/include/Makefile b/web/include/Makefile
new file mode 100644
index 0000000..2095184
--- /dev/null
+++ b/web/include/Makefile
@@ -0,0 +1,20 @@
+# Makefile for installing the html files for RHN
+#
+# $Id$
+
+TOP = ..
+
+# Project defines
+INSTALL_DEST = /usr/share/spacewalk/web
+
+# common stuff
+include $(TOP)/Makefile.defs
+
+# exclude these files from instalation
+NO_INSTALL = Makefile
+
+all::
+
+install:: $(PREFIX)/$(INSTALL_DEST)
+ tar cpf - $(addprefix --exclude ,$(NO_INSTALL)) . | \
+ tar vxf - -C $(PREFIX)$(INSTALL_DEST)
diff --git a/web/include/formletters/forgot_accounts.xml b/web/include/formletters/forgot_accounts.xml
new file mode 100644
index 0000000..175a5da
--- /dev/null
+++ b/web/include/formletters/forgot_accounts.xml
@@ -0,0 +1,20 @@
+<postal-letter subject="&product_name; Login Information">
+[ This is an automated email sent to <email-address /> at your request. ]
+
+You have requested a list of all <product-name /> logins associated
+with the email address <email-address />.
+
+Existing login(s):
+<account-list />
+
+You may reset the passwords for any of the above Red Hat logins at:
+
+ https://<postal-template-replace label="hostname" default=" unknown hostname " />/help/forgot_password.pxt
+
+If you continue to have difficulties logging in, please contact
+your <product-name /> administrator for further assistance.
+If you did not request this email be sent, please disregard this message.
+
+Thank you for using <product-name />.
+<postal-template-replace label="email_footer"/>
+</postal-letter>
diff --git a/web/include/formletters/forgot_password.xml b/web/include/formletters/forgot_password.xml
new file mode 100644
index 0000000..51a22b4
--- /dev/null
+++ b/web/include/formletters/forgot_password.xml
@@ -0,0 +1,20 @@
+<postal-letter subject="&product_name; Password Reset">
+[ This is an automated email sent to <email-address /> at your request. ]
+
+Your <product-name /> password has been reset. To sign in, go to:
+
+https://<postal-template-replace label="hostname" default=" unknown hostname " />/
+
+And use the following username and password:
+
+Username: <username />
+Password: <password />
+
+Once you have logged in, you may then change your password.
+
+If you continue to have difficulties logging in, please contact
+your <product-name /> administrator for further assistance.
+
+Thank you for using <product-name />.
+<postal-template-replace label="email_footer"/>
+</postal-letter>
diff --git a/web/include/nav/activation_key.xml b/web/include/nav/activation_key.xml
new file mode 100644
index 0000000..06f38ff
--- /dev/null
+++ b/web/include/nav/activation_key.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="activation_key" invisible="1" title-depth="1" acl_mixins="RHN::Access::Token">
+ <rhn-formvar name="tid" />
+
+ <rhn-tab name="Details" url="/rhn/activationkeys/Edit.do" />
+ <rhn-tab name="Child Channels" url="/rhn/activationkeys/channels/ChildChannels.do"/>
+
+ <rhn-tab name="Packages"
+ url="/rhn/activationkeys/packages/Packages.do"/>
+ <rhn-tab name="Configuration"
+ url="/rhn/activationkeys/configuration/List.do"
+ acl="token_has_entitlement(provisioning_entitled)">
+ <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
+
+ <rhn-tab name="nav.sdc.config.list_unsubscribe_channels" url="/rhn/activationkeys/configuration/List.do">
+ <rhn-tab url="/rhn/activationkeys/configuration/List.do"/>
+ </rhn-tab>
+ <rhn-tab name="nav.sdc.config.subscribe_channels" url="/rhn/activationkeys/configuration/Subscribe.do">
+ <rhn-tab url="/rhn/activationkeys/configuration/Subscribe.do"/>
+ </rhn-tab>
+ <rhn-tab name="nav.sdc.config.rank_channels" url="/rhn/activationkeys/configuration/Rank.do">
+ <rhn-tab url="/rhn/activationkeys/configuration/Rank.do"/>
+ </rhn-tab>
+
+ </rhn-tab>
+
+
+ <rhn-tab name="Groups" url="/rhn/activationkeys/groups/List.do" >
+ <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
+ <rhn-tab name="List / Leave" url="/rhn/activationkeys/groups/List.do">
+ <rhn-tab url="/rhn/activationkeys/groups/List.do"/>
+ </rhn-tab>
+ <rhn-tab name="Join" url="/rhn/activationkeys/groups/Add.do">
+ <rhn-tab url="/rhn/activationkeys/groups/Add.do"/>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Activated Systems" url="/rhn/activationkeys/systems/List.do" />
+</rhn-navi-tree>
diff --git a/web/include/nav/channel_detail.xml b/web/include/nav/channel_detail.xml
new file mode 100644
index 0000000..c0ee0c4
--- /dev/null
+++ b/web/include/nav/channel_detail.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="channel_detail" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribers" acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()">
+ <rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Managers" acl="org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()">
+ <rhn-tab-url>/network/software/channels/managers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Errata" acl="channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/rhn/channels/ChannelErrata.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Packages">
+ <rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Patches" acl="channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Patch Clusters" acl="channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/network/software/channels/patchsets.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribed Systems" on-click="Sniglets::Lists->navi_empty_set" node-id="systems_subscribed_to_channel">
+ <rhn-tab-url>/rhn/channels/ChannelSubscribers.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Target Systems" acl="channel_subscribable()">
+ <rhn-tab-url>/rhn/channels/TargetSystems.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/duplicate_systems_tabs.xml b/web/include/nav/duplicate_systems_tabs.xml
new file mode 100644
index 0000000..8d710d6
--- /dev/null
+++ b/web/include/nav/duplicate_systems_tabs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="duplicate_tabs" invisible="1" title-depth="1"
+formvar="inactive_count"
+ acl_mixins="RHN::Access::Action">
+ <rhn-tab name="duplicate.systems.nav.ips">
+ <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="duplicate.systems.nav.hostname">
+ <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="duplicate.systems.nav.mac_address">
+ <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/manage_channel.xml b/web/include/nav/manage_channel.xml
new file mode 100644
index 0000000..21f6b4c
--- /dev/null
+++ b/web/include/nav/manage_channel.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="manage_channel" invisible="1" formvar="cid" title-depth="1" acl_mixins="RHN::Access::Channel">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/rhn/channels/manage/Edit.do</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/clone.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribers" acl="channel_exists();org_entitlement(sw_mgr_enterprise); org_channel_setting(not_globally_subscribable);user_can_admin_channel()">
+ <rhn-tab-url>/network/software/channels/manage/subscribers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Organizations" acl="channel_exists(); channel_is_protected(); org_entitlement(sw_mgr_enterprise); user_role(org_admin)">
+ <rhn-tab-url>/rhn/multiorg/channels/OrgList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Managers" acl="channel_exists();org_entitlement(sw_mgr_enterprise);user_role(channel_admin)">
+ <rhn-tab-url>/network/software/channels/manage/managers.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Errata" acl="channel_exists();user_can_admin_channel();channel_type_capable(errata); not channel_packaging_type(sysv-solaris)">
+ <rhn-tab-url>/rhn/channels/manage/errata/Errata.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_errata">
+ <rhn-tab-url>/rhn/channels/manage/errata/ListRemove.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/errata/ConfirmRemove.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_errata">
+ <rhn-tab-url>/rhn/channels/manage/errata/Add.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Clone" acl="channel_is_clone();user_role(channel_admin)" on-click="Sniglets::Lists->navi_empty_set" node-id="clone_channel_errata">
+ <rhn-tab-url>/network/software/channels/manage/errata/clone.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/errata/clone_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Sync" acl="channel_is_clone();user_role(channel_admin);" node-id="sync_errata">
+ <rhn-tab-url>/rhn/channels/manage/errata/SyncErrata.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/errata/ConfirmSyncPackages.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Packages" acl="channel_exists()">
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackageMenu.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" >
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackages.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackagesRemove.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAdd.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channels/manage/ChannelPackagesAddConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Compare" acl="channel_exists(); not channel_packaging_type(sysv-solaris)" url="/network/software/channels/manage/packages/compare/index.pxt">
+ <rhn-tab-directory>/network/software/channels/manage/packages/compare</rhn-tab-directory>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Repositories" acl="channel_exists()">
+ <rhn-tab-url>/rhn/channels/manage/Repositories.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Patches" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patches/index.pxt</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patches/patch_list.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patches/remove_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patches/add.pxt?view_channel=no_channels</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patches/add.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patches/add_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Patchsets" acl="channel_exists();channel_packaging_type(sysv-solaris)" on-click="Sniglets::Lists->navi_empty_set" node-id="remove_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patchsets/index.pxt</rhn-tab-url>
+ <rhn-tab name="List/Remove" on-click="Sniglets::Lists->navi_empty_set" >
+ <rhn-tab-url>/rhn/channels/manage/solaris/ListPatchSets.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Add" on-click="Sniglets::Lists->navi_empty_set" node-id="add_channel_packages">
+ <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt?view_channel=no_channels</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patchsets/add.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/software/channels/manage/patchsets/add_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/package_detail.xml b/web/include/nav/package_detail.xml
new file mode 100644
index 0000000..e245bf2
--- /dev/null
+++ b/web/include/nav/package_detail.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="package_detail" invisible="1" formvar="pid" title-depth="1" acl_mixins="RHN::Access::Package">
+ <rhn-tab name="Details" url="/rhn/software/packages/Details.do">
+ <rhn-tab name="Overview" url="/rhn/software/packages/Details.do"/>
+ <rhn-tab name="Dependencies" url="/network/software/packages/dependencies.pxt"/>
+ <rhn-tab name="Package Map" url="/network/software/packages/package_map.pxt" acl="package_type_capable(package_map)"/>
+ <rhn-tab name="Change Log" url="/rhn/software/packages/ChangeLog.do" acl="package_type_capable(change_log)"/>
+ <rhn-tab name="File List" url="/network/software/packages/file_list.pxt" acl="package_type_capable(file_list)"/>
+ </rhn-tab>
+ <rhn-tab name="New Versions" url="/network/software/packages/newer_versions.pxt"/>
+ <rhn-tab name="Patches" url="/network/software/packages/patches_patching_package.pxt" acl="package_type_capable(solaris_patchable)"/>
+ <rhn-tab name="Packages" url="/network/software/packages/patch_packages.pxt" acl="package_type_capable(solaris_patch)"/>
+ <rhn-tab name="Patch Clusters" url="/network/software/packages/patch_patchsets.pxt" acl="package_type_capable(solaris_patch)"/>
+ <rhn-tab name="Patches" url="/network/software/packages/patchset_patches.pxt" acl="package_type_capable(solaris_patchset)"/>
+ <rhn-tab name="Patched Systems" url="/network/software/packages/system_list_for_patch.pxt" acl="package_type_capable(solaris_patch)"/>
+ <rhn-tab name="Installed Systems" url="/network/software/packages/system_list.pxt" acl="not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)"/>
+ <rhn-tab name="Installed Systems" url="/network/software/packages/system_list_for_patchset.pxt" acl="package_type_capable(solaris_patchset)"/>
+ <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patch.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patch)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
+ <rhn-tab name="Target Systems" url="/network/software/packages/target_system_list_for_patchset.pxt" acl="org_entitlement(sw_mgr_enterprise);package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
+ <rhn-tab name="Target Systems"
+ url="/network/software/packages/target_system_list.pxt" acl="org_entitlement(sw_mgr_enterprise);not package_type_capable(solaris_patch); not package_type_capable(solaris_patchset)" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_for_package"/>
+</rhn-navi-tree>
diff --git a/web/include/nav/sitenav-authenticated.xml b/web/include/nav/sitenav-authenticated.xml
new file mode 100644
index 0000000..5f8fa2c
--- /dev/null
+++ b/web/include/nav/sitenav-authenticated.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav" title-depth="0">
+ <rhn-tab name="Overview" url="/rhn/YourRhn.do" active-image="tab-your_rhn-selected.gif" inactive-image="tab-your_rhn.gif">
+ <rhn-tab name="Overview" url="/rhn/YourRhn.do"/>
+ <rhn-tab name="Your Account" url="/rhn/account/UserDetails.do" >
+ <rhn-tab name="Addresses">
+ <rhn-tab-url>/rhn/account/Addresses.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/account/EditAddress.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Change Email" url="/rhn/account/ChangeEmail.do" />
+ <rhn-tab name="Account Deactivation" url="/rhn/account/AccountDeactivation.do"/>
+ </rhn-tab>
+ <rhn-tab name="Your Preferences" url="/rhn/account/UserPreferences.do" />
+ <rhn-tab name="Locale Preferences" url="/rhn/account/LocalePreferences.do" />
+ <rhn-tab name="Subscription Management" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" >
+ <rhn-tab name="System Entitlements" url="/rhn/systems/SystemEntitlements.do" acl="user_role(org_admin)" />
+ <rhn-tab name="Software Channel Entitlements" url="/rhn/channels/software/Entitlements.do" acl="user_role(org_admin)" />
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Systems" url="/rhn/systems/Overview.do">
+ <rhn-tab name="Overview" url="/rhn/systems/Overview.do" acl="org_entitlement(sw_mgr_enterprise)"/>
+ <rhn-tab name="Systems" url="/rhn/systems/SystemList.do">
+ <rhn-tab-directory>/rhn/systems/details</rhn-tab-directory>
+ <rhn-tab-directory>/network/systems/details</rhn-tab-directory>
+ <rhn-tab name="All" url="/rhn/systems/SystemList.do"/>
+ <rhn-tab name="Virtual Systems" url="/rhn/systems/VirtualSystemsList.do"/>
+ <rhn-tab name="Out of Date" url="/rhn/systems/OutOfDate.do"/>
+ <rhn-tab name="Unentitled" url="/rhn/systems/Unentitled.do"/>
+ <rhn-tab name="Ungrouped" url="/rhn/systems/Ungrouped.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ <rhn-tab name="Inactive" url="/rhn/systems/Inactive.do"/>
+ <rhn-tab name="Recently Registered" url="/rhn/systems/Registered.do"/>
+ <rhn-tab name="Proxy" url="/rhn/systems/ProxyList.do" acl="org_channel_family(rhn-proxy) or not is_satellite(); user_role(org_admin)"/>
+ <rhn-tab name="Duplicate Systems" url="/rhn/systems/DuplicateIPList.do">
+ <rhn-tab-url>/rhn/systems/DuplicateIPList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateHostName.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateMacAddress.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/DuplicateSystemsCompare.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Currency" url="/rhn/systems/SystemCurrency.do"/>
+ </rhn-tab>
+ <rhn-tab name="System Groups" acl="org_entitlement(sw_mgr_enterprise)">
+ <rhn-tab-directory>/rhn/systems/groups</rhn-tab-directory>
+ <rhn-tab-directory>/rhn/groups</rhn-tab-directory>
+ <rhn-tab-directory>/network/systems/groups</rhn-tab-directory>
+ <rhn-tab-url>/rhn/systems/SystemGroupList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Set Manager" url="/rhn/ssm/index.do" acl="org_entitlement(sw_mgr_enterprise)">
+ <rhn-tab-directory>/network/systems/ssm</rhn-tab-directory>
+ <rhn-tab name="Status" url="/rhn/ssm/ViewAllLog.do" acl="org_entitlement(sw_mgr_enterprise)"/>
+ </rhn-tab>
+ <rhn-tab name="Advanced Search" url="/rhn/systems/Search.do" acl="org_entitlement(sw_mgr_enterprise)" />
+ <rhn-tab name="Activation Keys" acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)">
+ <rhn-tab-url>/rhn/activationkeys/List.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/activationkeys/Edit.do</rhn-tab-url>
+ <rhn-tab-directory>/rhn/activationkeys/configuration</rhn-tab-directory>
+ <rhn-tab-directory>/rhn/activationkeys/groups</rhn-tab-directory>
+ <rhn-tab-directory>/rhn/activationkeys/systems</rhn-tab-directory>
+ <rhn-tab-directory>/network/account/activation_keys</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Stored Profiles" acl="org_entitlement(sw_mgr_enterprise);">
+ <rhn-tab-url>/rhn/profiles/List.do</rhn-tab-url>
+ <rhn-tab-directory>/network/profiles</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Custom System Info" acl="org_entitlement(rhn_provisioning)">
+ <rhn-tab-url>/rhn/systems/customdata/CustomDataList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Kickstart" url="/rhn/kickstart/KickstartOverview.do" acl="org_entitlement(rhn_provisioning); user_role(config_admin)">
+ <rhn-tab name="Profiles" url="/rhn/kickstart/Kickstarts.do">
+ <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Bare Metal" url="/rhn/kickstart/KickstartIpRanges.do" />
+ <rhn-tab name="GPG and SSL Keys" url="/rhn/keys/CryptoKeysList.do">
+ <rhn-tab-directory>/rhn/keys</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Distributions" url="/rhn/kickstart/ViewTrees.do" acl="user_role(org_admin)">
+ <rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
+ <rhn-tab-url>/rhn/kickstart/TreeEdit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="File Preservation" url="/rhn/systems/provisioning/preservation/PreservationList.do" />
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif">
+ <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
+ <rhn-tab-directory>/rhn/errata</rhn-tab-directory>
+ <rhn-tab name="Relevant" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
+ <rhn-tab name="All" url="/rhn/errata/AllErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list" />
+ </rhn-tab>
+ <rhn-tab name="Advanced Search" url="/rhn/errata/Search.do"/>
+ <rhn-tab name="Manage Errata" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)">
+ <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
+ <rhn-tab name="Published" url="/rhn/errata/manage/PublishedErrata.do" acl="user_role(channel_admin)" />
+ <rhn-tab name="Unpublished" url="/rhn/errata/manage/UnpublishedErrata.do" acl="user_role(channel_admin)" />
+ </rhn-tab>
+ <rhn-tab name="Clone Errata" url="/rhn/errata/manage/CloneErrata.do" acl="user_role(channel_admin)">
+ <rhn-tab-directory>/rhn/errata/manage</rhn-tab-directory>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Channels" url="/rhn/software/channels/All.do" active-image="tab-channels-selected.gif" inactive-image="tab-channels.gif">
+ <rhn-tab name="Software Channels" url="/rhn/software/channels/All.do">
+ <rhn-tab-directory>/rhn/channels</rhn-tab-directory>
+ <rhn-tab-directory>/network/channels</rhn-tab-directory>
+ <rhn-tab-directory>/network/software/channels</rhn-tab-directory>
+ <rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/>
+ <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/Vendor.do"/>
+ <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/>
+ <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/>
+ <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/>
+ <rhn-tab name="Retired Channels" url="/rhn/software/channels/Retired.do"/>
+ </rhn-tab>
+ <rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
+ <rhn-tab-directory>/network/software/packages</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Manage Software Channels" acl="user_can_manage_channels()">
+ <rhn-tab-directory>/network/software/channels/manage</rhn-tab-directory>
+ <rhn-tab-url>/rhn/channels/manage/Manage.do</rhn-tab-url>
+ <rhn-tab name="Manage Software Packages" acl="user_role(channel_admin)" node-id="manage_packages">
+ <rhn-tab-directory>/rhn/software/manage/packages</rhn-tab-directory>
+ <rhn-tab-url>/rhn/software/manage/packages/PackageList.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Audit" url="/rhn/audit/ListXccdf.do">
+ <rhn-tab-directory>/rhn/audit</rhn-tab-directory>
+ <rhn-tab name="OpenSCAP" url="/rhn/audit/ListXccdf.do">
+ <rhn-tab name="All Scans" url="/rhn/audit/ListXccdf.do"/>
+ <rhn-tab name="XCCDF Diff" url="/rhn/audit/scap/Diff.do">
+ <rhn-tab-url>/rhn/audit/scap/DiffSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Advanced Search" url="/rhn/audit/scap/Search.do"/>
+ </rhn-tab>
+ <rhn-tab name="audit.nav.logreview" url="/rhn/audit/Overview.do" acl="not is_satellite()">
+ <rhn-tab name="Overview" url="/rhn/audit/Overview.do" />
+ <rhn-tab name="Reviews" url="/rhn/audit/Machine.do" />
+ <rhn-tab name="Search" url="/rhn/audit/Search.do" />
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Configuration" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)">
+ <rhn-tab-directory>/rhn/configuration</rhn-tab-directory>
+ <rhn-tab name="Overview" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)" />
+ <rhn-tab name="Configuration Channels" url="/rhn/configuration/GlobalConfigChannelList.do" acl="user_role(config_admin)" />
+ <rhn-tab name="Configuration Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" >
+ <rhn-tab-directory>/rhn/configuration/file</rhn-tab-directory>
+ <rhn-tab name="Centrally-Managed Files" url="/rhn/configuration/file/GlobalConfigFileList.do" acl="user_role(config_admin)" />
+ <rhn-tab name="Locally-Managed Files" url="/rhn/configuration/file/LocalConfigFileList.do" acl="user_role(config_admin)" />
+ </rhn-tab>
+ <rhn-tab name="Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)">
+ <rhn-tab-directory>/rhn/configuration/system</rhn-tab-directory>
+ <rhn-tab name="Managed Systems" url="/rhn/configuration/system/LocalConfigChannelList.do" acl="user_role(config_admin)" />
+ <rhn-tab name="Target Systems" url="/rhn/configuration/system/TargetSystems.do" acl="user_role(config_admin)">
+ <rhn-tab-url>/rhn/configuration/system/TargetSystemsSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/configuration/system/EnableSystemsConfirmSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/configuration/system/Summary.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Schedule" url="/rhn/schedule/PendingActions.do" active-image="tab-schedule-selected.gif" inactive-image="tab-schedule.gif">
+ <rhn-tab name="Pending Actions" url="/rhn/schedule/PendingActions.do"/>
+ <rhn-tab name="Failed Actions" url="/rhn/schedule/FailedActions.do"/>
+ <rhn-tab name="Completed Actions" url="/rhn/schedule/CompletedActions.do"/>
+ <rhn-tab name="Archived Actions" url="/rhn/schedule/ArchivedActions.do"/>
+ </rhn-tab>
+ <rhn-tab name="Users" url="/rhn/users/ActiveList.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)" active-image="tab-users-selected.gif" inactive-image="tab-users.gif">
+ <rhn-tab name="User List" url="/rhn/users/ActiveList.do">
+ <rhn-tab-directory>/network/users</rhn-tab-directory>
+ <rhn-tab name="Active" url="/rhn/users/ActiveList.do"/>
+ <rhn-tab name="Disabled" url="/rhn/users/DisabledList.do"/>
+ <rhn-tab name="All" url="/rhn/users/UserList.do"/>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Monitoring" url="/rhn/monitoring/ProbeList.do" active-image="tab-monitoring-selected.gif" inactive-image="tab-monitoring.gif" acl="show_monitoring()">
+ <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
+ <rhn-tab name="Status" url="/rhn/monitoring/ProbeList.do">
+ <rhn-tab-directory>/rhn/monitoring/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Scout Config Push" acl="show_monitoring();" url="/network/monitoring/scout/index.pxt" >
+ <rhn-tab-url>/network/monitoring/scout/index.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Notification" url="/rhn/monitoring/config/notification/Methods.do">
+ <rhn-tab-url>rhn/monitoring/config/notification/NotificationMethods.do</rhn-tab-url>
+ <rhn-tab name="Filters" url="/rhn/monitoring/config/notification/ActiveFilters.do"/>
+ </rhn-tab>
+ <rhn-tab name="Probe Suites" url="/rhn/monitoring/config/ProbeSuites.do">
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteCreate.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteEdit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteListProbes.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeCreate.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteProbeEdit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystems.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/monitoring/config/ProbeSuiteSystemsEdit.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Admin" url="/rhn/admin/multiorg/Organizations.do" active-image="tab-tools-selected.gif" inactive-image="tab-tools.gif" acl="user_role(satellite_admin)">
+ <rhn-tab name="Organizations" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Organizations.do">
+ <rhn-tab-url>/rhn/admin/multiorg/OrgDetails.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgUsers.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/DeleteOrg.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgSystemSubscriptions.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgSoftwareSubscriptions.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgCreate.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/OrgConfigDetails.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscriptions" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/SoftwareEntitlements.do">
+ <rhn-tab name="Software Channel Entitlements" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/multiorg/SoftwareEntitlements.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Entitlements" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/multiorg/SystemEntitlements.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/multiorg/EntitlementOrgs.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Users" acl="user_role(satellite_admin)" url="/rhn/admin/multiorg/Users.do">
+ </rhn-tab>
+ <rhn-tab acl="user_role(satellite_admin)" url="/rhn/admin/config/GeneralConfig.do">
+ <rhn-tab-name><pxt-config var="product_name"/> Configuration</rhn-tab-name>
+ <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
+ <rhn-tab-url>/internal/satellite/config/restart_required.pxt</rhn-tab-url>
+ <rhn-tab-url>/internal/satellite/config/restart_in_progress.pxt</rhn-tab-url>
+ <rhn-tab name="General" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/GeneralConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Monitoring" acl="show_monitoring(); user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/MonitoringConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Certificate" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/CertificateConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Bootstrap Script" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/BootstrapConfig.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Organizations" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/Orgs.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Restart" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/Restart.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Cobbler" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/config/Cobbler.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Task Engine Status" acl="user_role(satellite_admin)" url="/rhn/admin/TaskStatus.do">
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Help" url="/rhn/help/index.do" active-image="tab-help-selected.gif" inactive-image="tab-help.gif">
+ <rhn-tab-directory>/help</rhn-tab-directory>
+ <rhn-tab name="Reference Guide" url="https://www.redhat.com/docs/manuals/satellite">
+ <rhn-tab-directory>/rhn/help/reference/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Installation Guide" url="https://www.redhat.com/docs/manuals/satellite" >
+ <rhn-tab-directory>/rhn/help/satellite/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Proxy Guide" url="https://www.redhat.com/docs/manuals/satellite">
+ <rhn-tab-directory>/rhn/help/proxy/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Client Configuration" url="https://www.redhat.com/docs/manuals/satellite">
+ <rhn-tab-directory>/rhn/help/client-config/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Channel Management" url="https://www.redhat.com/docs/manuals/satellite" >
+ <rhn-tab-directory>/rhn/help/channel-mgmt/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Release Notes" url="https://www.redhat.com/docs/manuals/satellite" >
+ <rhn-tab-directory>/rhn/help/release-notes/satellite/</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="API" url="/rhn/apidoc/index.jsp" />
+ <rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
+ </rhn-tab>
+
+</rhn-navi-tree>
diff --git a/web/include/nav/sitenav.xml b/web/include/nav/sitenav.xml
new file mode 100644
index 0000000..9775219
--- /dev/null
+++ b/web/include/nav/sitenav.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rhn-navi-tree xmlns:xi="http://www.w3.org/2001/XInclude" label="sitenav_unauth" title-depth="0">
+ <rhn-tab name="Install" url="/rhn/newlogin/CreateFirstUser.do" acl="need_first_user()">
+ </rhn-tab>
+ <rhn-tab name="Sign In" url="/" active-image="tab-sign_in-selected.gif" inactive-image="tab-sign_in.gif">
+ </rhn-tab>
+
+ <rhn-tab name="About" url="/help/about.pxt" active-image="tab-about_rhn-selected.gif" inactive-image="tab-about_rhn.gif" >
+ <rhn-tab name="About" url="/help/about.pxt" />
+ <rhn-tab name="Help Desk" url="/rhn/help/index.do" />
+ <rhn-tab name="Lookup Login/Password" url="/help/forgot_password.pxt" />
+ <rhn-tab name="Release Notes" url="/rhn/help/dispatcher/release_notes">
+ <rhn-tab-directory>/rhn/help/release-notes/satellite</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Reference Guide" url="/rhn/help/dispatcher/reference_guide">
+ <rhn-tab-directory>/rhn/help/reference</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Installation Guide" url="/rhn/help/dispatcher/install_guide">
+ <rhn-tab-directory>/rhn/help/satellite</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Proxy Guide" url="/rhn/help/dispatcher/proxy_guide">
+ <rhn-tab-directory>/rhn/help/proxy</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Client Configuration" url="/rhn/help/dispatcher/client_config_guide">
+ <rhn-tab-directory>/rhn/help/client-config</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="Channel Management" url="/rhn/help/dispatcher/channel_mgmt_guide">
+ <rhn-tab-directory>/rhn/help/channel-mgmt</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="API" url="/rhn/apidoc/index.jsp">
+ <rhn-tab name="Overview" url="/rhn/apidoc/index.jsp">
+ <rhn-tab-directory>/rhn/apidoc</rhn-tab-directory>
+ </rhn-tab>
+ <rhn-tab name="FAQs" url="/rhn/apidoc/faqs.jsp" />
+ <rhn-tab name="Sample Scripts" url="/rhn/apidoc/scripts.jsp" />
+ </rhn-tab>
+ <rhn-tab name="Search" url="/rhn/help/Search.do" />
+ <rhn-tab name="Chat" url="/rhn/help/Chat.do" />
+</rhn-tab>
+
+
+</rhn-navi-tree>
diff --git a/web/include/nav/ssm.xml b/web/include/nav/ssm.xml
new file mode 100644
index 0000000..d3b0872
--- /dev/null
+++ b/web/include/nav/ssm.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="ssm" invisible="1" title-depth="1">
+ <rhn-tab name="Overview" url="/rhn/ssm/index.do" />
+ <rhn-tab name="Systems">
+ <rhn-tab-url>/rhn/systems/ssm/ListSystems.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Errata"
+ on-click="Sniglets::Lists->navi_empty_set"
+ node-id="system_errata_list">
+ <rhn-tab-url>/network/systems/ssm/errata/index.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/errata/systems_affected.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/errata/apply_errata_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Packages">
+
+ <rhn-tab-url>/rhn/ssm/Packages.do</rhn-tab-url>
+
+ <rhn-tab name="Install">
+ <rhn-tab-url>/rhn/ssm/PackageInstall.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Remove">
+ <rhn-tab-url>/rhn/ssm/PackageRemove.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Upgrade">
+ <rhn-tab-url>/rhn/ssm/PackageUpgrade.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Verify">
+ <rhn-tab-url>/rhn/ssm/PackageVerify.do</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Patches" acl="global_config(enable_solaris_support)">
+
+ <rhn-tab-url>/network/systems/ssm/patches/index.pxt</rhn-tab-url>
+
+ <rhn-tab name="Install">
+ <rhn-tab-url>/network/systems/ssm/patches/install.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patches/install_channel.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patches/install_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Remove">
+ <rhn-tab-url>/network/systems/ssm/patches/remove.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patches/remove_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Patch Clusters" acl="global_config(enable_solaris_support)">
+
+ <rhn-tab-url>/network/systems/ssm/patchsets/index.pxt</rhn-tab-url>
+
+ <rhn-tab name="Install">
+ <rhn-tab-url>/network/systems/ssm/patchsets/install.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patchsets/install_channel.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/patchsets/install_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Groups" acl="user_role(org_admin)">
+ <rhn-tab-url>/network/systems/ssm/groups/index.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/groups/alter_membership_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/groups/create.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Channels">
+ <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
+ <rhn-tab name="Base Channels">
+ <rhn-tab-url>/rhn/channel/ssm/BaseChannelSubscribe.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Child Channels">
+ <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptions.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/channel/ssm/ChildSubscriptionsConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Configuration" url="/rhn/systems/ssm/config/Deploy.do">
+ <rhn-tab name="Deploy Files" url="/rhn/systems/ssm/config/Deploy.do" />
+ <rhn-tab name="Compare Files" url="/rhn/systems/ssm/config/Diff.do" />
+ <rhn-tab name="Subscribe to Channels" url="/rhn/systems/ssm/config/Subscribe.do" />
+ <rhn-tab name="Unsubscribe from Channels" url="/rhn/systems/ssm/config/Unsubscribe.do" />
+ <rhn-tab name="Enable Configuration" url="/rhn/systems/ssm/config/Enable.do" />
+ </rhn-tab>
+
+ <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do">
+ <rhn-tab name="Kickstart" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do" >
+ <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByProfile.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByIp.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Tag Systems" url="/network/systems/ssm/provisioning/tag_systems.pxt" />
+ <rhn-tab name="Rollback" url="/network/systems/ssm/provisioning/rollback.pxt">
+ <rhn-tab-url>/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Remote Command" url="/network/systems/ssm/provisioning/remote_command.pxt">
+ <rhn-tab-url>/network/systems/ssm/provisioning/remote_command_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Misc">
+ <rhn-tab-url>/rhn/systems/ssm/misc/Index.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/HardwareRefresh.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/SoftwareRefresh.do</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/change_sys_pref_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/prof_conv_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/ssm/DeleteConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/reboot_systems_conf.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/ssm/misc/upgrade_slot.pxt</rhn-tab-url>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/system_detail.xml b/web/include/nav/system_detail.xml
new file mode 100644
index 0000000..57f93f7
--- /dev/null
+++ b/web/include/nav/system_detail.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="system_detail" invisible="1" title-depth="1" acl_mixins="RHN::Access::System">
+ <rhn-formvar name="sid" />
+ <rhn-tab name="Details" url="/rhn/systems/details/Overview.do">
+ <rhn-tab name="Overview" url="/rhn/systems/details/Overview.do" />
+ <rhn-tab name="Properties" url="/rhn/systems/details/Edit.do" />
+ <rhn-tab name="Remote Command" acl="system_feature(ftr_remote_command)">
+ <rhn-tab-url>/network/systems/details/remote_commands.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Connection" url="/network/systems/details/connection.pxt" acl="org_has_proxies()"/>
+ <rhn-tab name="Proxy" url="/network/systems/details/proxy.pxt" acl="user_role(org_admin); system_feature(ftr_proxy_capable) or system_is_proxy(); org_channel_family(rhn-proxy) or system_is_proxy(); child_channel_candidate(rhn-proxy) or system_is_proxy(); org_entitlement(rhn_provisioning); not system_is_satellite(); not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)">
+ <rhn-tab name="Activation" url="/network/systems/details/proxy.pxt" />
+ <rhn-tab name="Systems Using Proxy" url="/network/systems/details/proxy-clients.pxt" acl="system_is_proxy()"/>
+ </rhn-tab>
+ <rhn-tab name="Reactivation" url="/network/systems/details/activation.pxt" acl="system_feature(ftr_agent_smith)"/>
+ <rhn-tab name="Hardware">
+ <rhn-tab-url>/rhn/systems/details/SystemHardware.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Migrate" acl="user_role(org_admin)" url="/rhn/systems/details/SystemMigrate.do" />
+ <rhn-tab name="Notes">
+ <rhn-tab-url>/rhn/systems/details/Notes.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/EditNote.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Custom Info" acl="system_feature(ftr_custom_info)">
+ <rhn-tab-url>/rhn/systems/details/ListCustomData.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Software" url="/rhn/systems/details/packages/Packages.do">
+
+ <rhn-tab name="Errata" acl="system_feature(ftr_errata_updates); not is_solaris()">
+ <rhn-tab-url>/rhn/systems/details/ErrataList.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Patches" node-id="system_patch_list" acl="is_solaris()">
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_list">
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchListConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Install" on-click="Sniglets::Lists->navi_empty_set" node-id="system_patch_available_list">
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstall.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/patches/PatchInstallConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Patch Clusters" on-click="Sniglets::Lists->navi_empty_set" node-id="solaris_patchset_list" acl="is_solaris()">
+ <rhn-tab-url>/rhn/systems/details/packages/patchsets/PatchSetList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/patchsets/InstallPatchSet.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Packages" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/Packages.do</rhn-tab-url>
+ <rhn-tab name="List / Remove" on-click="Sniglets::Lists->navi_empty_set" node-id="system_package_list" acl="system_feature(ftr_package_remove)">
+ <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/RemoveConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="List" acl="not system_feature(ftr_package_remove)">
+ <rhn-tab-url>/rhn/systems/details/packages/PackageList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Upgrade" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_upgradable_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/UpgradableList.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Install" acl="system_feature(ftr_package_updates)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_installable_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/InstallPackages.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/InstallConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Verify" acl="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)" on-click="Sniglets::Lists->navi_empty_set" node-id="system_verifiable_package_list">
+ <rhn-tab-url>/rhn/systems/details/packages/VerifyPackages.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/VerifyConfirm.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Profiles" acl="system_feature(ftr_profile_compare)" on-click="Sniglets::Lists->navi_empty_set" node-id="packages_for_system_sync">
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/ShowProfiles.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/Create.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareSystems.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/packages/profiles/CompareProfiles.do</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Software Channels" acl="system_feature(ftr_package_updates)">
+ <rhn-tab-url>/rhn/systems/details/SystemChannels.do</rhn-tab-url>
+ </rhn-tab>
+
+ </rhn-tab>
+
+ <rhn-tab name="Configuration" acl="system_feature(ftr_config)" url="/rhn/systems/details/configuration/Overview.do">
+
+ <rhn-tab-directory>/rhn/systems/details/configuration</rhn-tab-directory>
+
+ <rhn-tab name="Overview" url="/rhn/systems/details/configuration/Overview.do"/>
+
+ <rhn-tab name="View/Modify Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do">
+ <rhn-tab name="Centrally Managed Files" url="/rhn/systems/details/configuration/ViewModifyCentralPaths.do"/>
+ <rhn-tab name="Locally Managed Files" url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do"/>
+ <rhn-tab name="Sandbox Managed Files" url="/rhn/systems/details/configuration/ViewModifySandboxPaths.do"/>
+ </rhn-tab>
+
+ <rhn-tab name="Add Files" url="/rhn/systems/details/configuration/addfiles/UploadFile.do">
+ <rhn-tab name="Upload File" url="/rhn/systems/details/configuration/addfiles/UploadFile.do"/>
+ <rhn-tab name="Import Files" url="/rhn/systems/details/configuration/addfiles/ImportFile.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/addfiles/ImportFileConfirmSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Create File" url="/rhn/systems/details/configuration/addfiles/CreateFile.do"/>
+ </rhn-tab>
+
+ <rhn-tab name="Deploy Files" url="/rhn/systems/details/configuration/DeployFile.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/DeployFileSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DeployFileConfirmSubmit.do</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Compare Files" url="/rhn/systems/details/configuration/DiffFile.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/DiffFileSubmit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirm.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/configuration/DiffFileConfirmSubmit.do</rhn-tab-url>
+ </rhn-tab>
+
+
+ <rhn-tab name="Manage Configuration Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
+ <rhn-tab name="List/Unsubscribe from Channels" url="/rhn/systems/details/configuration/ConfigChannelList.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/ConfigChannelListUnsubscribeSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Subscribe to Channels" url="/rhn/systems/details/configuration/SubscriptionsSetup.do">
+ <rhn-tab-url>/rhn/systems/details/configuration/SubscriptionsSubmit.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="View/Modify Rankings" url="/rhn/systems/details/configuration/RankChannels.do"/>
+ </rhn-tab>
+ </rhn-tab>
+
+ <rhn-tab name="Provisioning" acl="not is_solaris();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)" url="/rhn/systems/details/kickstart/ScheduleWizard.do">
+
+ <rhn-tab name="Kickstart" url="/rhn/systems/details/kickstart/ScheduleWizard.do" acl="system_feature(ftr_kickstart); not is_solaris()" node-id="kickstart_details">
+ <rhn-tab-directory>/rhn/systems/details/kickstart</rhn-tab-directory>
+ <rhn-tab name="Session Status" url="/rhn/systems/details/kickstart/SessionStatus.do" acl="system_kickstart_session_exists()">
+ <rhn-tab-url>/rhn/systems/details/kickstart/SessionCancel.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Schedule" url="/rhn/kickstart/ScheduleWizard.do"/>
+ <rhn-tab name="kickstart.variable.nav" url="/rhn/systems/details/kickstart/Variables.do" acl="cobbler_system_record_exists()"/>
+ </rhn-tab>
+
+ <rhn-tab name="Snapshots" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/index.pxt" hide_all_children_unless_active="1">
+ <rhn-tab name="Rollback" formvar="ss_id" url="/network/systems/details/history/snapshots/rollback.pxt" />
+ <rhn-tab name="Groups" formvar="ss_id" url="/network/systems/details/history/snapshots/groups.pxt" />
+ <rhn-tab name="Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/channels.pxt" />
+ <rhn-tab name="Packages" formvar="ss_id" url="/network/systems/details/history/snapshots/packages.pxt">
+ <rhn-tab-url>/network/systems/details/history/snapshots/unservable_packages.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Config Channels" formvar="ss_id" url="/network/systems/details/history/snapshots/namespaces.pxt" />
+ <rhn-tab name="Config Files" formvar="ss_id" url="/network/systems/details/history/snapshots/config.pxt" />
+ <rhn-tab name="Snapshot Tags" formvar="ss_id" url="/network/systems/details/history/snapshots/snapshot_tags.pxt">
+ <rhn-tab-url>/network/systems/details/history/snapshots/add_snapshot_tag.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+ <rhn-tab name="Snapshot Tags" acl="client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting); not is_solaris()" url="/network/systems/details/history/snapshots/system_tags.pxt" />
+
+ </rhn-tab>
+
+ <rhn-tab name="Monitoring" acl="show_monitoring(); system_feature(ftr_probes)">
+ <rhn-tab-directory>/rhn/systems/details/probes</rhn-tab-directory>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbesList.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbeDetails.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbeEdit.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/probes/ProbeDelete.do</rhn-tab-url>
+ <rhn-tab-url>/network/systems/details/probes/create.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/details/probes/delete_conf.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Groups" acl="system_feature(ftr_system_grouping); user_role(org_admin) or user_role(system_group_admin)">
+ <rhn-tab-url>/rhn/systems/details/groups/ListRemove.do</rhn-tab-url>
+ <rhn-tab name="List / Leave" url="/rhn/systems/details/groups/ListRemove.do"/>
+ <rhn-tab name="Join" url="/rhn/systems/details/groups/Add.do"/>
+ </rhn-tab>
+
+ <rhn-tab name="Virtualization" acl="not system_is_virtual(); system_has_management_entitlement()">
+ <rhn-tab-url>/rhn/systems/details/virtualization/VirtualGuestsList.do</rhn-tab-url>
+ <rhn-tab name="Details" url="/rhn/systems/details/virtualization/VirtualGuestsList.do"/>
+ <rhn-tab name="Provisioning" url="/rhn/systems/details/virtualization/ProvisionVirtualizationWizard.do" acl="system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)"/>
+ </rhn-tab>
+
+ <rhn-tab name="Groups" url="/rhn/systems/details/groups/ListRemove.do" acl="system_feature(ftr_system_grouping); not user_role(org_admin); not user_role(system_group_admin)"/>
+
+ <rhn-tab name="Audit" url="/rhn/systems/details/audit/ListScap.do"/>
+
+ <rhn-tab name="Events">
+ <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/details/history/event.pxt</rhn-tab-url>
+ <rhn-tab name="Pending">
+ <rhn-tab-url>/network/systems/details/history/pending.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="History">
+ <rhn-tab-url>/network/systems/details/history/history.pxt</rhn-tab-url>
+ </rhn-tab>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/nav/system_group_detail.xml b/web/include/nav/system_group_detail.xml
new file mode 100644
index 0000000..2bba613
--- /dev/null
+++ b/web/include/nav/system_group_detail.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="system_group_detail" invisible="1" formvar="sgid" title-depth="1">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/network/systems/groups/details.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/groups/delete_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Systems">
+ <rhn-tab-url>/rhn/groups/ListRemoveSystems.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Target Systems" acl="user_role(system_group_admin)">
+ <rhn-tab-url>/rhn/groups/AddSystems.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Errata" on-click="Sniglets::Lists->navi_empty_set" node-id="system_group_errata_list">
+ <rhn-tab-url>/network/systems/groups/errata_list.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/groups/systems_affected_by_errata.pxt</rhn-tab-url>
+ <rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url>
+ </rhn-tab>
+
+ <rhn-tab name="Admins" url="/network/systems/groups/admin_list.pxt" acl="user_role(system_group_admin)" />
+
+ <rhn-tab name="Probes" url="/network/systems/groups/probe_list.pxt" acl="org_entitlement(rhn_monitor)" />
+
+</rhn-navi-tree>
diff --git a/web/include/nav/user_detail.xml b/web/include/nav/user_detail.xml
new file mode 100644
index 0000000..857c446
--- /dev/null
+++ b/web/include/nav/user_detail.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<rhn-navi-tree label="user_detail" invisible="1" formvar="uid" title-depth="1">
+ <rhn-tab name="Details">
+ <rhn-tab-url>/rhn/users/UserDetails.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="System Groups">
+ <rhn-tab-url>/rhn/users/AssignedSystemGroups.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Systems">
+ <rhn-tab-url>/rhn/users/SystemsAdmined.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Channel Permissions" acl="user_role(channel_admin)" url="/rhn/users/ChannelPerms.do">
+ <rhn-tab name="Subscription" url="/rhn/users/ChannelPerms.do" />
+ <rhn-tab name="Management" url="/rhn/users/ChannelManagementPerms.do" acl="org_role(channel_admin)"/>
+ </rhn-tab>
+ <rhn-tab name="Preferences">
+ <rhn-tab-url>/rhn/users/UserPreferences.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Addresses">
+ <rhn-tab-url>/rhn/users/Addresses.do</rhn-tab-url>
+ </rhn-tab>
+ <rhn-tab name="Notification Methods" acl="org_entitlement(rhn_monitor)">
+ <rhn-tab-url>/network/users/details/contact_methods/index.pxt</rhn-tab-url>
+ <rhn-tab-directory>/network/users/details/contact_methods</rhn-tab-directory>
+ </rhn-tab>
+</rhn-navi-tree>
diff --git a/web/include/network/components/legends/errata-list-legend.pxi b/web/include/network/components/legends/errata-list-legend.pxi
new file mode 100644
index 0000000..e2f17c4
--- /dev/null
+++ b/web/include/network/components/legends/errata-list-legend.pxi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<div class="sideleg">
+ <h2>Errata Legend</h2>
+ <ul>
+ <li><img src="/img/wrh-security.gif" alt="" />Security</li>
+ <li><img src="/img/wrh-bug.gif" alt="" />Bug Fix</li>
+ <li><img src="/img/wrh-product.gif" alt="" />Enhancement</li>
+ </ul>
+</div>
diff --git a/web/include/network/components/legends/event-status.pxi b/web/include/network/components/legends/event-status.pxi
new file mode 100644
index 0000000..7666896
--- /dev/null
+++ b/web/include/network/components/legends/event-status.pxi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<div class="sideleg">
+ <h2>Event Status Legend</h2>
+ <ul>
+ <li><img src="/img/rhn-listicon-ok.gif" alt="" />Complete</li>
+ <li><img src="/img/rhn-listicon-error.gif" alt="" />Failure</li>
+ <li><img src="/img/rhn-listicon-activity.gif" alt="" />Activity Occuring</li>
+ </ul>
+</div>
diff --git a/web/include/network/components/legends/event-type.pxi b/web/include/network/components/legends/event-type.pxi
new file mode 100644
index 0000000..ce8506a
--- /dev/null
+++ b/web/include/network/components/legends/event-type.pxi
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<div class="sideleg">
+ <h2>Event Type Legend</h2>
+ <ul>
+ <li><img src="/img/rhn-listicon-package.gif" alt="" />Package Event</li>
+ <li><img src="/img/rhn-listicon-errata.gif" alt="" />Errata Event</li>
+ <li><img src="/img/rhn-listicon-preferences.gif" alt="" />Preferences Event</li>
+ <li><img src="/img/rhn-listicon-system.gif" alt="" />System Event</li>
+ </ul>
+</div>
diff --git a/web/include/network/components/legends/scout-config-legend.pxi b/web/include/network/components/legends/scout-config-legend.pxi
new file mode 100644
index 0000000..fd7d7a5
--- /dev/null
+++ b/web/include/network/components/legends/scout-config-legend.pxi
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<div class="sideleg">
+<h2>Scout Config Legend</h2>
+<ul>
+<li><img title="Scout is fully updated with the latest probe data"
+ alt="Scout is fully updated with the latest probe data" src="/img/configureScoutOK.gif" />Fully Updated</li>
+<li><img title="A Scout Config Push is required"
+ alt="A Scout Config Push is required" src="/img/configureScout.gif" />Push Required</li>
+<li><img title="The last Scout Config Push generated warnings."
+ alt="The last Scout Config Push generated warnings." src="/img/configureScoutWarning.gif" />Push had Warnings </li>
+<li><img title="The last Scout Config Push failed."
+ alt="The last Scout Config Push failed." src="/img/configureScoutError.gif" />Push Failed</li>
+<li><img title="The Scout Config Push is in progress"
+ alt="The Scout Config Push is in progress" src="/img/configureScoutPending.gif" />Push in Progress</li>
+</ul>
+</div>
diff --git a/web/include/network/components/legends/system-list-legend.pxi b/web/include/network/components/legends/system-list-legend.pxi
new file mode 100644
index 0000000..fd1d284
--- /dev/null
+++ b/web/include/network/components/legends/system-list-legend.pxi
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf8"?>
+
+<pxt-passthrough>
+
+<pxt-use class="Sniglets::Users" />
+
+<div class="sideleg">
+ <h2>System Legend</h2>
+ <ul>
+ <li><img src="/img/icon_up2date.gif" alt="" />OK</li>
+ <li><img src="/img/icon_crit_update.gif" alt="" />Critical</li>
+ <li><img src="/img/icon_reg_update.gif" alt="" />Warning</li>
+ <li><img src="/img/icon_checkin.gif" alt="" />Unknown</li>
+<rhn-require acl="org_entitlement(sw_mgr_enterprise)">
+ <li><img src="/img/icon_locked.gif" alt="" />Locked</li>
+</rhn-require>
+<rhn-require acl="org_entitlement(rhn_provisioning)">
+ <li><img src="/img/icon_kickstart_session.gif" alt="" />Kickstarting</li>
+</rhn-require>
+ <li><img src="/img/icon_pending.gif" alt="" />Pending Actions</li>
+ <li><img src="/img/icon_unentitled.gif" alt="" />Unentitled</li>
+<rhn-require acl="org_entitlement(rhn_monitor)">
+ <li><img src="/img/icon_subicon_monitoring.gif" alt="" />Monitoring Status</li>
+</rhn-require>
+ </ul>
+</div>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/message_queues/local.pxi b/web/include/network/components/message_queues/local.pxi
new file mode 100644
index 0000000..cc3caf7
--- /dev/null
+++ b/web/include/network/components/message_queues/local.pxi
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-messages queue="local_alert">
+ <div class="local-alert">{messages}</div>
+</pxt-messages>
+<pxt-messages queue="local_info">
+ <div class="local-info">{messages}</div>
+</pxt-messages>
+</pxt-passthrough>
diff --git a/web/include/network/components/message_queues/site.pxi b/web/include/network/components/message_queues/site.pxi
new file mode 100644
index 0000000..77c6540
--- /dev/null
+++ b/web/include/network/components/message_queues/site.pxi
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-messages queue="site_info">
+ <div class="site-info">
+ {messages}
+ </div>
+</pxt-messages>
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/create_notification_method.pxi b/web/include/network/components/monitoring/create_notification_method.pxi
new file mode 100644
index 0000000..e9230ad
--- /dev/null
+++ b/web/include/network/components/monitoring/create_notification_method.pxi
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::ContactMethod" />
+
+<h2>Create Notification Method</h2>
+
+<pxt-formvar>
+
+<div class="page-summary">
+ <p>Create a notification method using the form provided.</p>
+</div>
+
+<pxt-include-late file="/network/components/message_queues/local.pxi" />
+
+
+ <pxt-form method="post">
+
+ <table class="details">
+
+ <tr>
+ <th>Method Name:</th>
+ <td><input type="text" size="30" name="method_name" value="" maxlength="20" /></td>
+ </tr>
+ <tr>
+ <th>Email:</th>
+ <td><input type="text" size="30" name="method_email" value="" maxlength="50" /></td>
+ </tr>
+ <tr>
+ <th>Message Format:</th>
+ <td>
+ <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="" />Short (Pager-Style) Messages
+ </td>
+ </tr>
+ </table>
+
+ <div align="right">
+ <hr />
+ <input type="hidden" name="pxt:trap" value="rhn:contact-method-create-cb" />
+ <input type="hidden" name="redirect_to" value="index.pxt?uid={formvar:uid}" />
+ <input type="submit" name="create_method" value="Create Method" />
+ <pxt-hidden name="uid" />
+ </div>
+
+ </pxt-form>
+</pxt-formvar>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/delete_notification_method.pxi b/web/include/network/components/monitoring/delete_notification_method.pxi
new file mode 100644
index 0000000..df76853
--- /dev/null
+++ b/web/include/network/components/monitoring/delete_notification_method.pxi
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::ContactMethod" />
+<pxt-use class="Sniglets::Lists" />
+
+<h2>Notification Method Deletion Confirmation</h2>
+
+<pxt-include-late file="/network/components/message_queues/local.pxi" />
+
+<rhn-if-method-dependencies value="true">
+ <div class="page-summary">
+ <p>The <strong><rhn-contact-method-name /></strong> Notification Method cannot be deleted due to the following dependencies:</p>
+ <p>Please note that only systems which you have permission to manage will be linked to from this page.</p>
+ </div>
+
+ <rhn-listview class="Sniglets::ListView::ProbeList" mode="probes_for_contact_method">
+ <column name="System" label="system_name" sort_by="1" align="left" width="35%">
+ <url>/rhn/systems/details/Overview.do?sid={column:system_id}</url>
+ </column>
+ <column name="Probe" label="probe_description" width="30%" align="left">
+ <url>/rhn/systems/details/probes/ProbeDetails.do?probe_id={column:probe_id}&sid={column:system_id}</url>
+ </column>
+ </rhn-listview>
+</rhn-if-method-dependencies>
+
+<rhn-if-method-dependencies value="false">
+ <div class="page-summary">
+ <p>Delete Notification Method: <strong><rhn-contact-method-name /></strong></p>
+ </div>
+ <div align="right">
+ <hr />
+ <pxt-form method="post">
+ <pxt-hidden name="cmid" />
+ <input type="hidden" name="success_redirect" value="index.pxt?uid={formvar:uid}" />
+ <input type="hidden" name="pxt:trap" value="rhn:contact-method-delete-cb" />
+ <input type="submit" name="delete_cm_confirm" value="Confirm Deletion" />
+ </pxt-form>
+ </div>
+</rhn-if-method-dependencies>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/edit_notification_method.pxi b/web/include/network/components/monitoring/edit_notification_method.pxi
new file mode 100644
index 0000000..53dce07
--- /dev/null
+++ b/web/include/network/components/monitoring/edit_notification_method.pxi
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::ContactMethod" />
+
+<h2>Notification Method Details</h2>
+
+<pxt-formvar>
+
+<div class="toolbar"><rhn-deletion-link url="delete_confirm.pxt?cmid={formvar:cmid}" type="method" /></div>
+<div class="page-summary">
+ <p>Edit this notification method using the form provided.</p>
+</div>
+
+<pxt-include-late file="/network/components/message_queues/local.pxi" />
+
+ <pxt-form method="post">
+
+<rhn-contact-method-edit-form>
+
+ <table class="details">
+ <tr>
+ <th>Method Name:</th>
+ <td><input type="text" size="30" name="method_name" value="{method_name}" maxlength="20" /></td>
+ </tr>
+ <tr>
+ <th>Email:</th>
+ <td><input type="text" size="30" name="method_email" value="{method_email}" maxlength="50" /></td>
+ </tr>
+ <tr>
+ <th>Message Format:</th>
+ <td>
+ <rhn-checkable type="checkbox" name="use_pager_type" value="1" checked="{use_pager_type}" />Short (Pager-Style) Messages
+ </td>
+ </tr>
+ </table>
+
+ <div align="right">
+ <hr />
+ <input type="hidden" name="pxt:trap" value="rhn:contact-method-edit-cb" />
+ <input type="hidden" name="redirect_to" value="index.pxt?uid={uid}" />
+ <input type="submit" name="update_method" value="Update Method" />
+ <pxt-hidden name="uid" />
+ <pxt-hidden name="cmid" />
+ </div>
+
+</rhn-contact-method-edit-form>
+
+ </pxt-form>
+</pxt-formvar>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/monitoring/notification_methods.pxi b/web/include/network/components/monitoring/notification_methods.pxi
new file mode 100644
index 0000000..9529a35
--- /dev/null
+++ b/web/include/network/components/monitoring/notification_methods.pxi
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pxt-passthrough>
+<pxt-use class="Grail::Frame" />
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Lists" />
+
+<h2>Monitoring Notification Methods</h2>
+
+<pxt-formvar>
+
+<div class="toolbar"><rhn-creation-link url="create.pxt?uid={formvar:uid}" type="method" /></div>
+
+<div class="page-summary">
+ <p>A list of methods available for notification of monitoring events.</p>
+</div>
+
+<rhn-listview class="Sniglets::ListView::ContactMethodList" mode="users_contact_methods">
+ <empty_list_message>No Notification Methods Available.</empty_list_message>
+
+ <column name="Method Name" label="method_name" sort_by="1" width="50%" align="left">
+ <url>edit.pxt?cmid={column:recid}</url>
+ </column>
+
+ <column name="Destination" label="method_target" sort_by="1" width="30%" align="left" />
+</rhn-listview>
+
+</pxt-formvar>
+
+</pxt-passthrough>
diff --git a/web/include/network/components/schedule_action-interface.pxi b/web/include/network/components/schedule_action-interface.pxi
new file mode 100644
index 0000000..dece6b4
--- /dev/null
+++ b/web/include/network/components/schedule_action-interface.pxi
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<table class="schedule-action-interface" align="center">
+ <tr>
+ <td><input type="radio" name="schedule_time" value="asap" checked="1" /></td>
+ <th>Schedule action as soon as possible</th>
+ </tr>
+ <tr>
+ <td><input type="radio" name="schedule_time" value="at_entered_time" /></td>
+ <th>Schedule action for no sooner than:</th>
+ </tr>
+ <tr>
+ <th><img src="/img/rhn-icon-schedule.gif" alt="Date Selection" /></th>
+ <td>{date_selection}</td>
+ </tr>
+</table>
+
+<div align="right">
+<hr />
+{button}
+</div>
+</pxt-passthrough>
diff --git a/web/include/network/components/status_bar/main.pxi b/web/include/network/components/status_bar/main.pxi
new file mode 100644
index 0000000..cf8416a
--- /dev/null
+++ b/web/include/network/components/status_bar/main.pxi
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+ <pxt-use class="Sniglets::Users" />
+ <pxt-use class="Sniglets::Header" />
+ <pxt-use class="Sniglets::Search" />
+ <pxt-use class="Sniglets::Sets" />
+
+<div id="bar">
+
+<div id="systembar">
+<div id="systembarinner">
+<pxt-include file="/network/components/status_bar/ssm.pxi" />
+</div>
+</div>
+
+</div>
+<!-- close bar -->
+
+
+</pxt-passthrough>
diff --git a/web/include/network/components/status_bar/ssm.pxi b/web/include/network/components/status_bar/ssm.pxi
new file mode 100644
index 0000000..e1dea45
--- /dev/null
+++ b/web/include/network/components/status_bar/ssm.pxi
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-use class="Sniglets::Users" />
+<pxt-use class="Sniglets::Lists" />
+<pxt-use class="Sniglets::HTML" />
+
+<div>
+<rhn-require acl="user_authenticated(); org_entitlement(sw_mgr_enterprise)">
+ <span id="header_selcount"><rhn-set-totals set="system_list" noun="system"/></span>
+
+ <a class="button" href="/rhn/ssm/index.do">Manage</a>
+
+<rhn-return-link default="/network">
+ <a class="button" href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
+</rhn-return-link>
+
+</rhn-require>
+</div>
+</pxt-passthrough>
diff --git a/web/include/network/components/system_groups/sgdc_header.pxi b/web/include/network/components/system_groups/sgdc_header.pxi
new file mode 100644
index 0000000..084fd23
--- /dev/null
+++ b/web/include/network/components/system_groups/sgdc_header.pxi
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+ <pxt-use class="Sniglets::HTML" />
+ <pxt-use class="Sniglets::Users" />
+ <pxt-use class="Sniglets::ServerGroup" />
+
+<pxt-formvar>
+
+ <rhn-toolbar base="h1"
+ img="/img/rhn-icon-system_group.gif"
+ alt="system group"
+ help-url="s1-sm-systems.jsp#s2-sm-system-group-list"
+ misc-url="/network/systems/ssm/work_with_group.pxt?sgid={formvar:sgid}&pxt_trap=rhn:work_with_group_cb"
+ misc-alt="work with group"
+ misc-img="/img/work_with_group.gif"
+ misc-text="work with group"
+ deletion-type="group"
+ deletion-url="delete_confirm.pxt?sgid={formvar:sgid}"
+ deletion-acl="user_role(system_group_admin)">
+ <rhn-server-group-name />
+ </rhn-toolbar>
+
+ <rhn-navi-nav prefix="system_group_details" depth="0" file="/nav/system_group_detail.xml" style="contentnav" />
+
+</pxt-formvar>
+</pxt-passthrough>
diff --git a/web/include/network/components/systems/reschedule_action_form.pxi b/web/include/network/components/systems/reschedule_action_form.pxi
new file mode 100644
index 0000000..94676d2
--- /dev/null
+++ b/web/include/network/components/systems/reschedule_action_form.pxi
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+
+ This history event was caused by a failed scheduled action.<br/>
+ <p>If you have corrected the problem, you may reschedule the action below.</p>
+ <pxt-form method="post">
+<pxt-formvar>
+ <pxt-hidden name="sid" />
+ <input type="hidden" name="aid" value="{formvar:hid}" />
+ <input type="hidden" name="success_redirect" value="/network/systems/details/history/pending.pxt" />
+ <input type="hidden" name="pxt:trap" value="rhn:reschedule_action_cb" />
+ <input type="submit" value="Reschedule" />
+</pxt-formvar>
+ </pxt-form>
+
+</pxt-passthrough>
\ No newline at end of file
diff --git a/web/include/network/components/systems/system_details_toolbar.pxi b/web/include/network/components/systems/system_details_toolbar.pxi
new file mode 100644
index 0000000..2d8957b
--- /dev/null
+++ b/web/include/network/components/systems/system_details_toolbar.pxi
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf8"?>
+<pxt-passthrough>
+<pxt-use class="Sniglets::HTML" />
+<pxt-use class="Sniglets::Servers" />
+<pxt-use class="Sniglets::Users" />
+<pxt-formvar>
+<!-- Regular system -->
+<rhn-require acl="not system_is_virtual_host(); not system_is_virtual()">
+ <rhn-toolbar base="h1" img="/img/rhn-icon-system.gif"
+ alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
+ deletion-type="system">
+ <rhn-server-name />
+ </rhn-toolbar>
+</rhn-require>
+<!-- virtual host -->
+<rhn-require acl="system_is_virtual_host()">
+ <rhn-toolbar base="h1" img="/img/virt-host.png"
+ alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
+ deletion-type="system">
+ <rhn-server-name />
+ </rhn-toolbar>
+</rhn-require>
+<!-- virtual guest -->
+<rhn-require acl="system_is_virtual()">
+ <rhn-toolbar base="h1" img="/img/virt-guest.png"
+ alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
+ deletion-type="system">
+ <rhn-server-name />
+ </rhn-toolbar>
+</rhn-require>
+</pxt-formvar>
+</pxt-passthrough>
commit 7d84874a639028f5d1bb57e69aae112a81392d62
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 22 16:08:03 2013 +0100
look for pxt includes outside of document root
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 5b43bc1..1828da4 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -279,3 +279,6 @@ web.smtp_server = localhost
# allow users to chat with spacewalk members on IRC via the web
web.chat_enabled = 0
+
+# Directory where to look for include files (pxt, pxi, txt)
+web.include_dir = /usr/share/spacewalk/web
diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index dc0b17c..d03c580 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.pm
@@ -531,7 +531,7 @@ sub include {
$params{-path} = $params{-file}
if exists $params{-file};
- my $data = PXT::ApacheHandler->_read_file($params{-path}, $self->document_root);
+ my $data = PXT::ApacheHandler->_read_file($params{-path}, PXT::Config->get('include_dir'));
return $data if $params{-raw};
diff --git a/web/modules/sniglets/Sniglets/Navi.pm b/web/modules/sniglets/Sniglets/Navi.pm
index 0dc94f8..5e23073 100644
--- a/web/modules/sniglets/Sniglets/Navi.pm
+++ b/web/modules/sniglets/Sniglets/Navi.pm
@@ -85,10 +85,10 @@ sub navi_nav {
my $file;
my $depth = $params{depth} || 0;
if ($params{file}) {
- $file = File::Spec->catfile($pxt->document_root, $pxt->derelative_path($params{file}));
+ $file = File::Spec->catfile(PXT::Config->get('include_dir'), $pxt->derelative_path($params{file}));
}
else {
- $file = File::Spec->catfile($pxt->document_root, $pxt->user ? "/nav/sitenav-authenticated.xml" : "/nav/sitenav.xml");
+ $file = File::Spec->catfile(PXT::Config->get('include_dir'), $pxt->user ? "/nav/sitenav-authenticated.xml" : "/nav/sitenav.xml");
}
my $tree = Sniglets::Navi->load_tree($file);
11 years, 2 months
client/tools
by StephenHerr
client/tools/rhncfg/rhncfg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bec08806ac9fb3a7e03c8947769af382d9860195
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Jan 30 11:28:27 2013 -0500
856608 - moved rhncfg dependency on spacewalk-backend-libs to base package
All sub-packages now require it
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index e20fcb5..fe89ffe 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -17,6 +17,7 @@ BuildRequires: python
Requires: python
Requires: rhnlib
Requires: rhn-client-tools
+Requires: spacewalk-backend-libs >= 1.3.32-1
%if 0%{?suse_version}
# provide rhn directories and no selinux on suse
BuildRequires: rhn-client-tools
@@ -31,7 +32,6 @@ The base libraries and functions needed by all rhncfg-* packages.
Summary: Red Hat Network Configuration Client
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Requires: spacewalk-backend-libs >= 1.3.32-1
%description client
A command line interface to the client features of the RHN Configuration
11 years, 2 months
rel-eng/comps rel-eng/tito.props
by Michael Mraka
rel-eng/comps/comps-spacewalk-client-rhel5.xml | 1 -
rel-eng/tito.props | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a62aff4cbbfa971afaf8440e288bc991a53f6ddf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 30 15:14:53 2013 +0100
there's no abrt on RHEL5
diff --git a/rel-eng/comps/comps-spacewalk-client-rhel5.xml b/rel-eng/comps/comps-spacewalk-client-rhel5.xml
index 023b99f..b8d2c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-client-rhel5.xml
@@ -32,7 +32,6 @@
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
<packagereq type="default">spacewalk-oscap</packagereq>
- <packagereq type="default">spacewalk-abrt</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 53db252..e56f8c3 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -10,7 +10,7 @@ autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-night
[spacewalk-nightly-rhel5]
disttag = .el5
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm oracle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewalk python-hwdata spacewalk-oro-compat
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm oracle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewalk python-hwdata spacewalk-oro-compat spacewalk-abrt
[spacewalk-nightly-rhel6]
disttag = .el6
11 years, 2 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 438364435d666cd39295c7ffd7781b0e6e04a0ae
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 30 12:01:02 2013 +0100
correct the case
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 6c84d43..09559bc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -16250,7 +16250,7 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa
</context-group>
</trans-unit>
<trans-unit id="sdc.details.overview.crashes.application">
- <source>Application crashes</source>
+ <source>Application Crashes</source>
<context-group name="ctx">
<context context-type="sourcefile">/systems/details/Overview.do</context>
</context-group>
@@ -16262,13 +16262,13 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa
</context-group>
</trans-unit>
<trans-unit id="sdc.details.overview.crashes.lastreport">
- <source>Last report</source>
+ <source>Last Report</source>
<context-group name="ctx">
<context context-type="sourcefile">/systems/details/Overview.do</context>
</context-group>
</trans-unit>
<trans-unit id="sdc.details.overview.crashes.crashcount">
- <source>Crash count</source>
+ <source>Crash Count</source>
<context-group name="ctx">
<context context-type="sourcefile">/systems/details/Overview.do</context>
</context-group>
11 years, 2 months
Changes to 'refs/tags/quartz-1.8.4-4'
by Michael Mraka
Tag 'quartz-1.8.4-4' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-01-29 15:01 +0000
Tagging package [quartz] version [1.8.4-4] in directory [spec-tree/quartz/].
Changes since rhncfg-5.10.40-1:
Michael Mraka (2):
require minimal version of slf4j
Automatic commit of package [quartz] minor release [1.8.4-4].
---
rel-eng/packages/quartz | 2 +-
spec-tree/quartz/quartz.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
11 years, 2 months
2 commits - rel-eng/packages spec-tree/quartz
by Michael Mraka
rel-eng/packages/quartz | 2 +-
spec-tree/quartz/quartz.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 962316b6723258ef8f1e42e8981bdba8fb74ac27
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 29 16:01:49 2013 +0100
Automatic commit of package [quartz] minor release [1.8.4-4].
diff --git a/rel-eng/packages/quartz b/rel-eng/packages/quartz
index 1bea218..4c38c53 100644
--- a/rel-eng/packages/quartz
+++ b/rel-eng/packages/quartz
@@ -1 +1 @@
-1.8.4-3 spec-tree/quartz/
+1.8.4-4 spec-tree/quartz/
diff --git a/spec-tree/quartz/quartz.spec b/spec-tree/quartz/quartz.spec
index 00ed035..173449a 100644
--- a/spec-tree/quartz/quartz.spec
+++ b/spec-tree/quartz/quartz.spec
@@ -1,7 +1,7 @@
Name: quartz
Summary: Quartz Enterprise Job Scheduler
Version: 1.8.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Quartz Enterprise Job Scheduler
License: ASL 2.0
URL: http://www.quartz-scheduler.org/
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/%{name}-oracle-%{version}.jar
%changelog
+* Tue Jan 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-4
+- require at least slf4j-1.6
+
* Fri Jan 18 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-3
- rebased to newer version
commit 76e681af3350a8e83eb6d3fb6fbddfb837593cc7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 29 10:53:40 2013 +0100
require minimal version of slf4j
diff --git a/spec-tree/quartz/quartz.spec b/spec-tree/quartz/quartz.spec
index 0d82d43..00ed035 100644
--- a/spec-tree/quartz/quartz.spec
+++ b/spec-tree/quartz/quartz.spec
@@ -18,7 +18,7 @@ Requires: apache-commons-logging
Requires: jakarta-commons-logging
%endif
-Requires: slf4j
+Requires: slf4j > 1.6
%description
Quartz is a job scheduling system that can be integrated with, or used
@@ -31,7 +31,7 @@ Java components or EJBs.
Summary: Oracle JDBC driver delegate for %{name}
Group: Development/Libraries/Java
Requires: %{name}
-Requires: slf4j
+Requires: slf4j > 1.6
Requires: ojdbc14
Requires: quartz = %{version}
11 years, 2 months
Changes to 'refs/tags/rhncfg-5.10.40-1'
by StephenHerr
Tag 'rhncfg-5.10.40-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-01-29 00:02 +0000
Tagging package [rhncfg] version [5.10.40-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-1.9.54-1:
Neha Rawat (1):
903534 - Web UI config diff always shows 'binary files differ'
Stephen Herr (1):
Automatic commit of package [rhncfg] release [5.10.40-1].
---
client/tools/rhncfg/config_common/file_utils.py | 2 +-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 2 months
2 commits - client/tools rel-eng/packages
by StephenHerr
client/tools/rhncfg/config_common/file_utils.py | 2 +-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 09b2104210247ad1b845c708cbffea289caf5273
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jan 28 19:02:42 2013 -0500
Automatic commit of package [rhncfg] release [5.10.40-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index f49565c..e20fcb5 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.39
+Version: 5.10.40
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -112,6 +112,9 @@ fi
# $Id$
%changelog
+* Mon Jan 28 2013 Stephen Herr <sherr(a)redhat.com> 5.10.40-1
+- 903534 - Web UI config diff always shows 'binary files differ'
+
* Fri Nov 30 2012 Jan Pazdziora 5.10.39-1
- 879299 - statinfo needs to be defined even if file does not exist
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 1d273c0..3263ba1 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.39-1 client/tools/rhncfg/
+5.10.40-1 client/tools/rhncfg/
commit 2fc32eb0081d67a803731a301d960faa396ebd84
Author: Neha Rawat <nerawat(a)redhat.com>
Date: Mon Jan 28 18:58:31 2013 -0500
903534 - Web UI config diff always shows 'binary files differ'
diff --git a/client/tools/rhncfg/config_common/file_utils.py b/client/tools/rhncfg/config_common/file_utils.py
index 30dcce3..819c3e8 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -128,7 +128,7 @@ class FileProcessor:
else:
raise e
else:
- result = ''.join(diff(path, temp_file))
+ result = ''.join(diff(temp_file, path))
os.unlink(temp_file)
return sectx_result + result
11 years, 2 months