java/code/webapp/WEB-INF/nav/ssm.xml | 7 +++++--
java/code/webapp/WEB-INF/struts-config.xml | 14 +++++++-------
web/html/nav/ssm.xml | 7 +++++--
web/html/network/systems/ssm/index.pxt | 2 +-
4 files changed, 18 insertions(+), 12 deletions(-)
New commits:
commit 79a6e7eeb3a0dc243005da1cdb31734ffe3b5f45
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Jul 1 18:48:58 2009 -0400
Fixed nav entries
diff --git a/java/code/webapp/WEB-INF/nav/ssm.xml b/java/code/webapp/WEB-INF/nav/ssm.xml
index 038c293..27d57b1 100644
--- a/java/code/webapp/WEB-INF/nav/ssm.xml
+++ b/java/code/webapp/WEB-INF/nav/ssm.xml
@@ -104,8 +104,11 @@
</rhn-tab>
</rhn-tab>
- <rhn-tab name="Provisioning"
acl="org_entitlement(rhn_provisioning)"
url="/network/systems/ssm/provisioning/kickstart.pxt">
- <rhn-tab name="Kickstart"
url="/network/systems/ssm/provisioning/kickstart.pxt" />
+ <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>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 3b41109..2e4399c 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -4604,7 +4604,7 @@
</action>
<!-- Kickstart Pages SSM -->
- <action path="/ssm/kickstart/KickstartableSystems"
+ <action path="/systems/ssm/kickstart/KickstartableSystems"
scope="request"
input="/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp"
type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKickstartableSystemsAction"
@@ -4613,13 +4613,13 @@
<forward name="default"
path="/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp"/>
<forward name="scheduleByIp"
- path="/ssm/kickstart/ScheduleByIp.do"
+ path="/systems/ssm/kickstart/ScheduleByIp.do"
redirect= "true"/>
<forward name="scheduleByProfile"
- path="/ssm/kickstart/ScheduleByProfile.do"
+ path="/systems/ssm/kickstart/ScheduleByProfile.do"
redirect= "true"/>
</action>
- <action path="/ssm/kickstart/ScheduleByProfile"
+ <action path="/systems/ssm/kickstart/ScheduleByProfile"
name ="datePickerForm"
scope="request"
input="/WEB-INF/pages/kickstart/ssm/schedule.jsp"
@@ -4630,10 +4630,10 @@
<forward name="default"
path="/WEB-INF/pages/kickstart/ssm/schedule.jsp"/>
<forward name="success" redirect= "true"
- path="/ssm/kickstart/KickstartableSystems.do"/>
+ path="/systems/ssm/kickstart/KickstartableSystems.do"/>
</action>
- <action path="/ssm/kickstart/ScheduleByIp"
+ <action path="/systems/ssm/kickstart/ScheduleByIp"
name ="datePickerForm"
scope="request"
input="/WEB-INF/pages/kickstart/ssm/schedule.jsp"
@@ -4644,7 +4644,7 @@
<forward name="default"
path="/WEB-INF/pages/kickstart/ssm/schedule.jsp"/>
<forward name="success" redirect= "true"
- path="/ssm/kickstart/KickstartableSystems.do"/>
+ path="/systems/ssm/kickstart/KickstartableSystems.do"/>
</action>
<!-- Kickstart Pages -->
diff --git a/web/html/nav/ssm.xml b/web/html/nav/ssm.xml
index 333a665..094e53e 100644
--- a/web/html/nav/ssm.xml
+++ b/web/html/nav/ssm.xml
@@ -89,8 +89,11 @@
<rhn-tab name="Enable Configuration"
url="/rhn/systems/ssm/config/Enable.do" />
</rhn-tab>
- <rhn-tab name="Provisioning"
acl="org_entitlement(rhn_provisioning)"
url="/network/systems/ssm/provisioning/kickstart.pxt">
- <rhn-tab name="Kickstart"
url="/network/systems/ssm/provisioning/kickstart.pxt" />
+ <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>
diff --git a/web/html/network/systems/ssm/index.pxt
b/web/html/network/systems/ssm/index.pxt
index a2650fe..bb8da81 100644
--- a/web/html/network/systems/ssm/index.pxt
+++ b/web/html/network/systems/ssm/index.pxt
@@ -102,7 +102,7 @@
alt="Provisioning" /></td>
<th>Provisioning:</th>
<td>
- <a
href="/network/systems/ssm/provisioning/kickstart.pxt">Kickstart</a>
systems <br />
+ <a
href="/rhn/systems/ssm/kickstart/KickstartableSystems.do">Kickstart</a>
systems <br />
<a
href="/network/systems/ssm/provisioning/tag_systems.pxt">Tag</a>
systems for <a
href="/network/systems/ssm/provisioning/rollback.pxt">snapshot
rollback</a><br />
Run <a
href="/network/systems/ssm/provisioning/remote_command.pxt">remote
commands</a><br />
</td>
Show replies by date