java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
web/html/nav/sitenav-authenticated.xml | 1
web/html/network/monitoring/notifications/.htaccess | 8 -
web/html/network/monitoring/notifications/contact_methods/.htaccess | 9 -
web/html/network/monitoring/notifications/contact_methods/header.pxi | 11 --
web/html/network/software/channels/manage/errata/add_confirm.pxt | 46 ----------
6 files changed, 76 deletions(-)
New commits:
commit b0f2cd7047dbccf5acd3f540d47ef28fd5b46aac
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 21:02:28 2009 +0100
manage/errata/add_confirm.pxt not referenced from anywhere, removing.
diff --git a/web/html/network/software/channels/manage/errata/add_confirm.pxt
b/web/html/network/software/channels/manage/errata/add_confirm.pxt
deleted file mode 100644
index 3322d54..0000000
--- a/web/html/network/software/channels/manage/errata/add_confirm.pxt
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Navi" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::ChannelEditor" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::Lists" />
-
- <grail-canvas-template base="/templates/c.pxt"
mode="main_canvas">
-
-<pxt-include
file="/network/software/channels/manage/manage_channels_header.pxi" />
-
- <div class="page-summary">
-
- <p>Click 'Confirm' below to add these errata to your channel.
Related packages will also be added to the channel.</p>
- </div>
-
- <h2>
- <img src="/img/rhn-icon-errata.gif" />
-Confirm Errata Addition
- </h2>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<rhn-listview class="Sniglets::ListView::ErrataList"
mode="in_set">
- <formvars>
- <var name="cid" />
- <var name="set_label"
type="literal">errata_to_add</var>
- </formvars>
-
- <column name="Type" label="advisory_icon" width="5%"
align="center" />
- <column name="Advisory" label="advisory_name"
align="center">
- <url>/rhn/errata/manage/Edit.do?eid={column:id}</url>
- </column>
- <column name="Synopsis" label="advisory_synopsis"
align="left" />
- <column name="Updated" label="advisory_last_updated"
align="center" />
-
- <empty_list_message>No Errata.</empty_list_message>
-
- <action name="Confirm" label="add_errata"
url="/network/software/channels/manage/errata/list.pxt" />
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
commit 6042fb4147353989abc788826ca63099bbb5acbf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 21:00:09 2009 +0100
/network/monitoring/notifications is not used anywhere, except
Sniglets/ListView/ContactMethodList.pm where it points to nonexistent (as of Satellite
5.3) URLs anyway, removing.
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index c8f25bd..a5eeede 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -197,7 +197,6 @@
<rhn-tab name="Scout Config Push" acl="show_monitoring();"
url="/network/monitoring/scout/index.pxt" />
<rhn-tab name="Notification" acl="show_monitoring()"
url="/rhn/monitoring/config/notification/Methods.do">
<rhn-tab-url>/rhn/monitoring/config/notification/NotificationMethods.do</rhn-tab-url>
-
<rhn-tab-directory>/network/monitoring/notifications/contact_methods</rhn-tab-directory>
<rhn-tab name="Filters" acl="show_monitoring()"
url="/rhn/monitoring/config/notification/ActiveFilters.do">
<rhn-tab-directory>/rhn/monitoring/config/notification</rhn-tab-directory>
</rhn-tab>
diff --git a/web/html/nav/sitenav-authenticated.xml
b/web/html/nav/sitenav-authenticated.xml
index 1102c14..e8ada19 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -163,7 +163,6 @@
</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-directory>/network/monitoring/notifications/contact_methods</rhn-tab-directory>
<rhn-tab name="Filters"
url="/rhn/monitoring/config/notification/ActiveFilters.do"/>
</rhn-tab>
<rhn-tab name="Probe Suites"
url="/rhn/monitoring/config/ProbeSuites.do">
diff --git a/web/html/network/monitoring/notifications/.htaccess
b/web/html/network/monitoring/notifications/.htaccess
deleted file mode 100644
index 5da75a8..0000000
--- a/web/html/network/monitoring/notifications/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
diff --git a/web/html/network/monitoring/notifications/contact_methods/.htaccess
b/web/html/network/monitoring/notifications/contact_methods/.htaccess
deleted file mode 100644
index b6960cf..0000000
--- a/web/html/network/monitoring/notifications/contact_methods/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
-PerlSetVar user_context monitoring_admin
commit 29421b0910bc2dacc409c3d2114025c95f40e4ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:57:56 2009 +0100
notifications/contact_methods/header.pxi not referenced from anywhere, removing.
diff --git a/web/html/network/monitoring/notifications/contact_methods/header.pxi
b/web/html/network/monitoring/notifications/contact_methods/header.pxi
deleted file mode 100644
index 69f64ab..0000000
--- a/web/html/network/monitoring/notifications/contact_methods/header.pxi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::HTML" />
-
-<pxt-formvar>
- <rhn-toolbar base="h1" img="/img/rhn-icon-users.gif"
help-url="">User: <rhn-user-login /></rhn-toolbar>
-</pxt-formvar>
-
-</pxt-passthrough>
Show replies by thread