branding/templates/c.pxt | 10 - web/html/help/about.pxt | 2 web/html/network/errata/manage/errata_channel_intersection.pxt | 2 web/html/network/monitoring/scout/details.pxt | 2 web/html/network/monitoring/scout/index.pxt | 2 web/html/network/software/channels/manage/errata/clone.pxt | 2 web/html/network/software/channels/manage/errata/clone_confirm.pxt | 2 web/html/network/software/channels/manage/packages/compare/index.pxt | 2 web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt | 2 web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt | 2 web/html/network/software/channels/manage/patches/add_confirm.pxt | 2 web/html/network/software/channels/manage/patches/index.pxt | 2 web/html/network/software/channels/manage/patches/patch_list.pxt | 2 web/html/network/software/channels/manage/patches/remove_confirm.pxt | 2 web/html/network/software/channels/manage/patchsets/add_confirm.pxt | 2 web/html/network/software/channels/manage/patchsets/index.pxt | 2 web/html/network/software/channels/patches.pxt | 2 web/html/network/software/channels/patchsets.pxt | 2 web/html/network/software/channels/subscribers.pxt | 2 web/html/network/software/packages/dependencies.pxt | 2 web/html/network/software/packages/file_list.pxt | 2 web/html/network/software/packages/install_confirm.pxt | 2 web/html/network/software/packages/newer_versions.pxt | 2 web/html/network/software/packages/package_map.pxt | 2 web/html/network/software/packages/patch_packages.pxt | 2 web/html/network/software/packages/patch_patchsets.pxt | 2 web/html/network/software/packages/patches_patching_package.pxt | 2 web/html/network/software/packages/patchset_patches.pxt | 2 web/html/network/software/packages/system_list.pxt | 2 web/html/network/software/packages/system_list_for_patch.pxt | 2 web/html/network/software/packages/system_list_for_patchset.pxt | 2 web/html/network/software/packages/target_system_list.pxt | 2 web/html/network/software/packages/target_system_list_for_patch.pxt | 2 web/html/network/software/packages/target_system_list_for_patchset.pxt | 2 web/html/network/systems/details/connection.pxt | 2 web/html/network/systems/details/history/dependency_failures.pxt | 2 web/html/network/systems/details/history/event.pxt | 4 web/html/network/systems/details/history/history.pxt | 2 web/html/network/systems/details/history/package_event_results.pxt | 4 web/html/network/systems/details/history/pending.pxt | 2 web/html/network/systems/details/history/snapshots/channels.pxt | 2 web/html/network/systems/details/history/snapshots/config.pxt | 2 web/html/network/systems/details/history/snapshots/groups.pxt | 2 web/html/network/systems/details/history/snapshots/index.pxt | 2 web/html/network/systems/details/history/snapshots/namespaces.pxt | 2 web/html/network/systems/details/history/snapshots/packages.pxt | 2 web/html/network/systems/details/history/snapshots/remove_confirm.pxt | 2 web/html/network/systems/details/history/snapshots/rollback.pxt | 4 web/html/network/systems/details/history/snapshots/snapshot_tags.pxt | 2 web/html/network/systems/details/history/snapshots/system_tags.pxt | 2 web/html/network/systems/details/history/snapshots/unservable_packages.pxt | 2 web/html/network/systems/details/history/verify_results.pxt | 2 web/html/network/systems/details/proxy-clients.pxt | 2 web/html/network/systems/details/proxy.pxt | 2 web/html/network/systems/groups/apply_errata_confirm.pxt | 2 web/html/network/systems/groups/errata_list.pxt | 2 web/html/network/systems/groups/systems_affected_by_errata.pxt | 2 web/html/network/systems/ssm/errata/apply_errata_conf.pxt | 2 web/html/network/systems/ssm/errata/index.pxt | 2 web/html/network/systems/ssm/errata/systems_affected.pxt | 4 web/html/network/systems/ssm/groups/alter_membership_conf.pxt | 2 web/html/network/systems/ssm/groups/create.pxt | 4 web/html/network/systems/ssm/groups/index.pxt | 4 web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt | 2 web/html/network/systems/ssm/misc/choose_value_to_remove.pxt | 2 web/html/network/systems/ssm/misc/choose_value_to_set.pxt | 2 web/html/network/systems/ssm/misc/landing.pxt | 2 web/html/network/systems/ssm/misc/remove_value.pxt | 2 web/html/network/systems/ssm/misc/set_value.pxt | 2 web/html/network/systems/ssm/packages/index.pxt | 2 web/html/network/systems/ssm/packages/schedule_remote_command.pxt | 2 web/html/network/systems/ssm/packages/upload_answer_file.pxt | 4 web/html/network/systems/ssm/patches/index.pxt | 2 web/html/network/systems/ssm/patches/install.pxt | 2 web/html/network/systems/ssm/patches/install_channel.pxt | 2 web/html/network/systems/ssm/patches/install_conf.pxt | 2 web/html/network/systems/ssm/patches/remove.pxt | 2 web/html/network/systems/ssm/patches/remove_conf.pxt | 2 web/html/network/systems/ssm/patchsets/index.pxt | 2 web/html/network/systems/ssm/patchsets/install.pxt | 2 web/html/network/systems/ssm/patchsets/install_channel.pxt | 2 web/html/network/systems/ssm/patchsets/install_conf.pxt | 2 web/html/network/systems/ssm/provisioning/rollback.pxt | 4 web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt | 4 web/html/network/systems/ssm/provisioning/tag_systems.pxt | 4 web/html/network/systems/system_list | 2 web/include/network/components/legends/errata-list-legend.pxi | 7 web/include/network/components/legends/event-status.pxi | 7 web/include/network/components/legends/event-type.pxi | 9 - web/include/network/components/legends/system-list-legend.pxi | 19 +- web/include/network/components/system_groups/sgdc_header.pxi | 4 web/include/network/components/systems/system_details_toolbar.pxi | 12 - web/include/network/software/channels/manage/manage_channels_header.pxi | 2 web/include/network/users/details/header.pxi | 2 web/modules/pxt/PXT/HTML.pm | 71 ++++++++-- web/modules/sniglets/Sniglets/HTML.pm | 19 ++ web/modules/sniglets/Sniglets/ListView/ActionList.pm | 62 ++++---- web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 9 - web/modules/sniglets/Sniglets/ListView/PackageList.pm | 12 - web/modules/sniglets/Sniglets/ListView/SystemList.pm | 6 web/modules/sniglets/Sniglets/ServerGroup.pm | 6 web/modules/sniglets/Sniglets/Servers.pm | 16 +- 102 files changed, 267 insertions(+), 196 deletions(-)
New commits: commit 4bd66865ac1ea97255f5f178c40f14cac10fc6fd Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 10 15:48:45 2013 +0100
updated pxt pages to use <rhn-icon> tag
diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt index c1a89cc..ccfdcd2 100644 --- a/branding/templates/c.pxt +++ b/branding/templates/c.pxt @@ -35,16 +35,16 @@ <rhn-display-login> <ul class="nav nav-pills"> <li> - <a href="/rhn/account/UserDetails.do"><i class="fa fa-user"></i>[login]</a> + <a href="/rhn/account/UserDetails.do"><rhn-icon type="header-user"/>[login]</a> </li> <li class="hidden-sm hidden-xs hidden-md"> - <span class="spacewalk-header-non-link"><i class="fa fa-sitemap"></i>[org]</span> + <span class="spacewalk-header-non-link"><rhn-icon type="header-sitemap"/>[org]</span> </li> <li> - <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs"></i></a> + <a href="/rhn/account/UserPreferences.do"><rhn-icon type="header-preferences"/></a> </li> <li> - <a href="/rhn/Logout.do"><i class="fa fa-sign-out"></i></a> + <a href="/rhn/Logout.do"><rhn-icon type="header-signout"/></a> </li> </ul> </rhn-display-login> @@ -66,7 +66,7 @@ <div class="form-group"> <input type="hidden" name="submitted" value="true" /> <button type="submit" class="btn btn-info input-sm"> - <i class="fa fa-search"></i> + <rhn-icon type="header-search"/> </button> </div> </form> diff --git a/web/html/help/about.pxt b/web/html/help/about.pxt index 1863b96..7acb517 100644 --- a/web/html/help/about.pxt +++ b/web/html/help/about.pxt @@ -5,7 +5,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-<h1><i class="fa fa-info-circle text-primary" title="information"></i> About <pxt-config var="product_name"/></h1> +<h1><rhn-icon type="header-info" title="information"/> About <pxt-config var="product_name"/></h1>
<p> <pxt-config var="product_name"/> allows administrators to efficiently manage the systems on their diff --git a/web/html/network/errata/manage/errata_channel_intersection.pxt b/web/html/network/errata/manage/errata_channel_intersection.pxt index b90d16c..29bdf08 100644 --- a/web/html/network/errata/manage/errata_channel_intersection.pxt +++ b/web/html/network/errata/manage/errata_channel_intersection.pxt @@ -18,7 +18,7 @@ <p>The channel <strong>{channel_name}</strong> has the following packages in common with <strong><rhn-errata-advisory/></strong>. If the version of the package from the erratum is newer than the one in your channel, you will have the opportunity to update the channel when you publish this erratum.</p> </div>
- <h2><i class="fa spacewalk-icon-packages"></i> Packages</h2> + <h2><rhn-icon type="header-package"/> Packages</h2>
<pxt-include-late file="/network/components/message_queues/local.pxi" />
diff --git a/web/html/network/monitoring/scout/details.pxt b/web/html/network/monitoring/scout/details.pxt index ad9928a..1f2cd43 100644 --- a/web/html/network/monitoring/scout/details.pxt +++ b/web/html/network/monitoring/scout/details.pxt @@ -6,7 +6,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<pxt-formvar> - <rhn-toolbar base="h1" icon="spacewalk-icon-monitoring-status" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout" deletion-url="/rhn/systems/details/DeleteConfirm.do?scout_id={formvar:sid}" deletion-type="scout"> + <rhn-toolbar base="h1" icon="monitoring-status" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout" deletion-url="/rhn/systems/details/DeleteConfirm.do?scout_id={formvar:sid}" deletion-type="scout"> Scout Public Key Page </rhn-toolbar> </pxt-formvar> diff --git a/web/html/network/monitoring/scout/index.pxt b/web/html/network/monitoring/scout/index.pxt index 174a490..9cd74ae 100644 --- a/web/html/network/monitoring/scout/index.pxt +++ b/web/html/network/monitoring/scout/index.pxt @@ -10,7 +10,7 @@ </grail-canvas-replacement>
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - <rhn-toolbar base="h1" icon="fa-desktop" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout"> + <rhn-toolbar base="h1" icon="header-system" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout"> Update Scout Configuration </rhn-toolbar>
diff --git a/web/html/network/software/channels/manage/errata/clone.pxt b/web/html/network/software/channels/manage/errata/clone.pxt index 58345f9..9499bd7 100644 --- a/web/html/network/software/channels/manage/errata/clone.pxt +++ b/web/html/network/software/channels/manage/errata/clone.pxt @@ -19,7 +19,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="header-errata"/> Clone Errata </h2>
diff --git a/web/html/network/software/channels/manage/errata/clone_confirm.pxt b/web/html/network/software/channels/manage/errata/clone_confirm.pxt index 8a7844b..d43eee2 100644 --- a/web/html/network/software/channels/manage/errata/clone_confirm.pxt +++ b/web/html/network/software/channels/manage/errata/clone_confirm.pxt @@ -17,7 +17,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="header-errata"/> Clone Errata </h2>
diff --git a/web/html/network/software/channels/manage/packages/compare/index.pxt b/web/html/network/software/channels/manage/packages/compare/index.pxt index d889e9c..2ce2273 100644 --- a/web/html/network/software/channels/manage/packages/compare/index.pxt +++ b/web/html/network/software/channels/manage/packages/compare/index.pxt @@ -16,7 +16,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-packages" title="package"></i> + <rhn-icon type="header-package" title="package"/> Compare Packages </h2>
diff --git a/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt b/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt index 4650567..c89ed1c 100644 --- a/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt +++ b/web/html/network/software/channels/manage/packages/compare/sync_confirm.pxt @@ -16,7 +16,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn-icon type="event-type-package"/> Confirm Package Sync </h2>
diff --git a/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt b/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt index b831bd8..e2d849b 100644 --- a/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt +++ b/web/html/network/software/channels/manage/packages/compare/sync_prompt.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> Channel: {channel_name}</h1> + <h1><rhn-icon type="header-channel"/> Channel: {channel_name}</h1> </rhn-channel-details>
<rhn-navi-nav prefix="manage_channel" depth="0" file="/nav/manage_channel.xml" style="contentnav" /> diff --git a/web/html/network/software/channels/manage/patches/add_confirm.pxt b/web/html/network/software/channels/manage/patches/add_confirm.pxt index 4b05f03..a8b02c5 100644 --- a/web/html/network/software/channels/manage/patches/add_confirm.pxt +++ b/web/html/network/software/channels/manage/patches/add_confirm.pxt @@ -18,7 +18,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-patch-install"></i> + <rhn-icon type="header-errata-add"/> Confirm Patch Addition </h2>
diff --git a/web/html/network/software/channels/manage/patches/index.pxt b/web/html/network/software/channels/manage/patches/index.pxt index a328550..34c7967 100644 --- a/web/html/network/software/channels/manage/patches/index.pxt +++ b/web/html/network/software/channels/manage/patches/index.pxt @@ -11,7 +11,7 @@ <pxt-include file="/network/software/channels/manage/manage_channels_header.pxi" />
<h2> - <i class="fa spacewalk-icon-patches"></i> Patches + <rhn-icon type="event-type-errata"/> Patches </h2>
<pxt-formvar> diff --git a/web/html/network/software/channels/manage/patches/patch_list.pxt b/web/html/network/software/channels/manage/patches/patch_list.pxt index 6fd6b9a..d836b89 100644 --- a/web/html/network/software/channels/manage/patches/patch_list.pxt +++ b/web/html/network/software/channels/manage/patches/patch_list.pxt @@ -19,7 +19,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-patch-remove"></i> + <rhn-icon type="header-errata-del"/> List/Remove Channel Patches </h2>
diff --git a/web/html/network/software/channels/manage/patches/remove_confirm.pxt b/web/html/network/software/channels/manage/patches/remove_confirm.pxt index 37d3f89..dc26f63 100644 --- a/web/html/network/software/channels/manage/patches/remove_confirm.pxt +++ b/web/html/network/software/channels/manage/patches/remove_confirm.pxt @@ -17,7 +17,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-patch-remove"></i> + <rhn-icon type="header-errata-del"/> Confirm Patch Removal </h2>
diff --git a/web/html/network/software/channels/manage/patchsets/add_confirm.pxt b/web/html/network/software/channels/manage/patchsets/add_confirm.pxt index fbe9427..1433f70 100644 --- a/web/html/network/software/channels/manage/patchsets/add_confirm.pxt +++ b/web/html/network/software/channels/manage/patchsets/add_confirm.pxt @@ -17,7 +17,7 @@ </div>
<h2> - <i class="fa spacewalk-icon-patchset-install"></i> + <rhn-icon type="header-errata-set-add"/> Confirm Patchset Addition </h2>
diff --git a/web/html/network/software/channels/manage/patchsets/index.pxt b/web/html/network/software/channels/manage/patchsets/index.pxt index f852f62..59cfa93 100644 --- a/web/html/network/software/channels/manage/patchsets/index.pxt +++ b/web/html/network/software/channels/manage/patchsets/index.pxt @@ -11,7 +11,7 @@ <pxt-include file="/network/software/channels/manage/manage_channels_header.pxi" />
<h2> - <i class="fa spacewalk-icon-patch-set"></i> Patchsets + <rhn-icon type="header-errata-set"/> Patchsets </h2>
<pxt-formvar> diff --git a/web/html/network/software/channels/patches.pxt b/web/html/network/software/channels/patches.pxt index 2cc30e1..4a3e02a 100644 --- a/web/html/network/software/channels/patches.pxt +++ b/web/html/network/software/channels/patches.pxt @@ -10,7 +10,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> {channel_name}</h1> + <h1><rhn-icon type="header-channel"/> {channel_name}</h1> </rhn-channel-details>
<rhn-navi-nav prefix="channel_details" depth="0" file="/nav/channel_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/channels/patchsets.pxt b/web/html/network/software/channels/patchsets.pxt index 2474f58..c04dce6 100644 --- a/web/html/network/software/channels/patchsets.pxt +++ b/web/html/network/software/channels/patchsets.pxt @@ -10,7 +10,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> {channel_name}</h1> + <h1><rhn-icon type="header-channel"/> {channel_name}</h1> </rhn-channel-details>
<rhn-navi-nav prefix="channel_details" depth="0" file="/nav/channel_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/channels/subscribers.pxt b/web/html/network/software/channels/subscribers.pxt index f454c86..d1a14c6 100644 --- a/web/html/network/software/channels/subscribers.pxt +++ b/web/html/network/software/channels/subscribers.pxt @@ -10,7 +10,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-channel-details> - <h1><i class="fa spacewalk-icon-software-channels"></i> {channel_name} <rhn-help href="s1-sm-channels-packages.jsp#s3-sm-channel-details" /></h1> + <h1><rhn-icon type="header-channel"/> {channel_name} <rhn-help href="s1-sm-channels-packages.jsp#s3-sm-channel-details" /></h1>
<rhn-require acl_mixins="RHN::Access::Channel" acl="channel_eoled()"> <p class="local-alert">As of {channel_eol}, this channel has reached its end of life.</p> diff --git a/web/html/network/software/packages/dependencies.pxt b/web/html/network/software/packages/dependencies.pxt index a9ad16a..ff37b25 100644 --- a/web/html/network/software/packages/dependencies.pxt +++ b/web/html/network/software/packages/dependencies.pxt @@ -8,7 +8,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/file_list.pxt b/web/html/network/software/packages/file_list.pxt index bc34c54..56d0b1b 100644 --- a/web/html/network/software/packages/file_list.pxt +++ b/web/html/network/software/packages/file_list.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/install_confirm.pxt b/web/html/network/software/packages/install_confirm.pxt index 3bd55e5..e775959 100644 --- a/web/html/network/software/packages/install_confirm.pxt +++ b/web/html/network/software/packages/install_confirm.pxt @@ -9,7 +9,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/newer_versions.pxt b/web/html/network/software/packages/newer_versions.pxt index 64fb6ad..56748f9 100644 --- a/web/html/network/software/packages/newer_versions.pxt +++ b/web/html/network/software/packages/newer_versions.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/package_map.pxt b/web/html/network/software/packages/package_map.pxt index 90e53a1..58601a3 100644 --- a/web/html/network/software/packages/package_map.pxt +++ b/web/html/network/software/packages/package_map.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" />
diff --git a/web/html/network/software/packages/patch_packages.pxt b/web/html/network/software/packages/patch_packages.pxt index f302635..b92f049 100644 --- a/web/html/network/software/packages/patch_packages.pxt +++ b/web/html/network/software/packages/patch_packages.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" />
diff --git a/web/html/network/software/packages/patch_patchsets.pxt b/web/html/network/software/packages/patch_patchsets.pxt index 555a235..f781494 100644 --- a/web/html/network/software/packages/patch_patchsets.pxt +++ b/web/html/network/software/packages/patch_patchsets.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" />
diff --git a/web/html/network/software/packages/patches_patching_package.pxt b/web/html/network/software/packages/patches_patching_package.pxt index bab74ac..45358df 100644 --- a/web/html/network/software/packages/patches_patching_package.pxt +++ b/web/html/network/software/packages/patches_patching_package.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" />
diff --git a/web/html/network/software/packages/patchset_patches.pxt b/web/html/network/software/packages/patchset_patches.pxt index 48e6f11..0c755d3 100644 --- a/web/html/network/software/packages/patchset_patches.pxt +++ b/web/html/network/software/packages/patchset_patches.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" />
diff --git a/web/html/network/software/packages/system_list.pxt b/web/html/network/software/packages/system_list.pxt index 5e2ddb1..1533831 100644 --- a/web/html/network/software/packages/system_list.pxt +++ b/web/html/network/software/packages/system_list.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/system_list_for_patch.pxt b/web/html/network/software/packages/system_list_for_patch.pxt index bb483d2..062538c 100644 --- a/web/html/network/software/packages/system_list_for_patch.pxt +++ b/web/html/network/software/packages/system_list_for_patch.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/system_list_for_patchset.pxt b/web/html/network/software/packages/system_list_for_patchset.pxt index ca4d9ff..e502a5d 100644 --- a/web/html/network/software/packages/system_list_for_patchset.pxt +++ b/web/html/network/software/packages/system_list_for_patchset.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/target_system_list.pxt b/web/html/network/software/packages/target_system_list.pxt index 646438a..d0c6945 100644 --- a/web/html/network/software/packages/target_system_list.pxt +++ b/web/html/network/software/packages/target_system_list.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages" title="package"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="header-package" title="package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/target_system_list_for_patch.pxt b/web/html/network/software/packages/target_system_list_for_patch.pxt index 1884574..69ada08 100644 --- a/web/html/network/software/packages/target_system_list_for_patch.pxt +++ b/web/html/network/software/packages/target_system_list_for_patch.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/software/packages/target_system_list_for_patchset.pxt b/web/html/network/software/packages/target_system_list_for_patchset.pxt index 0ce321f..542ee9e 100644 --- a/web/html/network/software/packages/target_system_list_for_patchset.pxt +++ b/web/html/network/software/packages/target_system_list_for_patchset.pxt @@ -9,7 +9,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
<rhn-package-details> - <h1><i class="fa spacewalk-icon-packages"></i> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <h1><rhn-icon type="event-type-package"/> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> </rhn-package-details>
<rhn-navi-nav prefix="package_details" depth="0" file="/nav/package_detail.xml" style="contentnav" /> diff --git a/web/html/network/systems/details/connection.pxt b/web/html/network/systems/details/connection.pxt index 7d78786..45d781e 100644 --- a/web/html/network/systems/details/connection.pxt +++ b/web/html/network/systems/details/connection.pxt @@ -16,7 +16,7 @@
<pxt-include-late file="/network/components/message_queues/local.pxi"/>
- <h2><i class="fa spacewalk-icon-proxy"></i>Connection Path</h2> + <h2><rhn-icon type="header-proxy"/>Connection Path</h2>
<div class="page-summary"> <p> diff --git a/web/html/network/systems/details/history/dependency_failures.pxt b/web/html/network/systems/details/history/dependency_failures.pxt index ba3e6be..b832211 100644 --- a/web/html/network/systems/details/history/dependency_failures.pxt +++ b/web/html/network/systems/details/history/dependency_failures.pxt @@ -15,7 +15,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" />
<h2> - <i class="fa spacewalk-icon-packages" title="package"></i> + <rhn-icon type="header-package" title="package"/> Dependency Failures </h2>
diff --git a/web/html/network/systems/details/history/event.pxt b/web/html/network/systems/details/history/event.pxt index 249bd2d..760eb2c 100644 --- a/web/html/network/systems/details/history/event.pxt +++ b/web/html/network/systems/details/history/event.pxt @@ -16,7 +16,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" />
<h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history"/> System History Event </h2>
@@ -58,7 +58,7 @@
<pxt-formvar> <div class="up-arrow"> -<i class="fa fa-caret-up" title="Go up"></i> +<rhn-icon type="nav-up" title="Go up"/> <a href="/network/systems/details/history/history.pxt?sid={formvar:sid}">Return to history list for <rhn-server-name /></a></div> </pxt-formvar>
diff --git a/web/html/network/systems/details/history/history.pxt b/web/html/network/systems/details/history/history.pxt index 2018933..67e134f 100644 --- a/web/html/network/systems/details/history/history.pxt +++ b/web/html/network/systems/details/history/history.pxt @@ -25,7 +25,7 @@
<h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history" title="event"/> System History </h2>
diff --git a/web/html/network/systems/details/history/package_event_results.pxt b/web/html/network/systems/details/history/package_event_results.pxt index f861836..380f174 100644 --- a/web/html/network/systems/details/history/package_event_results.pxt +++ b/web/html/network/systems/details/history/package_event_results.pxt @@ -16,7 +16,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" />
<h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history" title="event"/> System History Event Results </h2>
@@ -56,7 +56,7 @@
<pxt-formvar> <div class="up-arrow"> -<i class="fa fa-caret-up" title="Go up"></i> +<rhn-icon type="nav-up" title="Go up"/> <a href="/network/systems/details/history/history.pxt?sid={formvar:sid}">Return to history list for <rhn-server-name /></a></div> </pxt-formvar>
diff --git a/web/html/network/systems/details/history/pending.pxt b/web/html/network/systems/details/history/pending.pxt index e9707ae..5d8d528 100644 --- a/web/html/network/systems/details/history/pending.pxt +++ b/web/html/network/systems/details/history/pending.pxt @@ -21,7 +21,7 @@
<h2> - <i class="fa fa-suitcase" title="event"></i> + <rhn-icon type="header-event-history" title="event"/> Pending Events </h2>
diff --git a/web/html/network/systems/details/history/snapshots/channels.pxt b/web/html/network/systems/details/history/snapshots/channels.pxt index d127306..a7ca998 100644 --- a/web/html/network/systems/details/history/snapshots/channels.pxt +++ b/web/html/network/systems/details/history/snapshots/channels.pxt @@ -21,7 +21,7 @@
<h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/config.pxt b/web/html/network/systems/details/history/snapshots/config.pxt index 6c1160d..39fd19e 100644 --- a/web/html/network/systems/details/history/snapshots/config.pxt +++ b/web/html/network/systems/details/history/snapshots/config.pxt @@ -21,7 +21,7 @@
<h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/groups.pxt b/web/html/network/systems/details/history/snapshots/groups.pxt index 08a2000..9489893 100644 --- a/web/html/network/systems/details/history/snapshots/groups.pxt +++ b/web/html/network/systems/details/history/snapshots/groups.pxt @@ -21,7 +21,7 @@
<h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/index.pxt b/web/html/network/systems/details/history/snapshots/index.pxt index 602f5f8..0df9532 100644 --- a/web/html/network/systems/details/history/snapshots/index.pxt +++ b/web/html/network/systems/details/history/snapshots/index.pxt @@ -18,7 +18,7 @@
<pxt-include-late file="/network/components/message_queues/local.pxi" />
-<h2><i class="fa fa-camera" title="snapshot"></i> System Snapshots</h2> +<h2><rhn-icon type="header-snapshot" title="snapshot"/> System Snapshots</h2>
<div class="page-summary"> diff --git a/web/html/network/systems/details/history/snapshots/namespaces.pxt b/web/html/network/systems/details/history/snapshots/namespaces.pxt index a09e6a6..4de8d2a 100644 --- a/web/html/network/systems/details/history/snapshots/namespaces.pxt +++ b/web/html/network/systems/details/history/snapshots/namespaces.pxt @@ -22,7 +22,7 @@
<h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/packages.pxt b/web/html/network/systems/details/history/snapshots/packages.pxt index 324e423..7ea5794 100644 --- a/web/html/network/systems/details/history/snapshots/packages.pxt +++ b/web/html/network/systems/details/history/snapshots/packages.pxt @@ -22,7 +22,7 @@
<h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/snapshots/remove_confirm.pxt b/web/html/network/systems/details/history/snapshots/remove_confirm.pxt index 3b2deb2..fe28aeb 100644 --- a/web/html/network/systems/details/history/snapshots/remove_confirm.pxt +++ b/web/html/network/systems/details/history/snapshots/remove_confirm.pxt @@ -17,7 +17,7 @@
<h2> - <i class="fa fa-camera"></i> + <rhn-icon type="header-snapshot"/> Confirm Snapshot Tag Removal </h2>
diff --git a/web/html/network/systems/details/history/snapshots/rollback.pxt b/web/html/network/systems/details/history/snapshots/rollback.pxt index 8e541cf..70440df 100644 --- a/web/html/network/systems/details/history/snapshots/rollback.pxt +++ b/web/html/network/systems/details/history/snapshots/rollback.pxt @@ -19,7 +19,7 @@
<rhn-snapshot-details> <h2> -<i class="fa spacewalk-icon-snapshot-rollback" title="rollback"></i> +<rhn-icon type="header-snapshot-rollback" title="rollback"/> Rollback to {snapshot_created} Snapshot</h2> @@ -79,7 +79,7 @@ and the following items will be changed to match the pre-snapshot values:
<pxt-formvar> <span class="up-arrow"> -<i class="fa fa-caret-up" title="Go up"></i> +<rhn-icon type="nav-up" title="Go up"/> <a href="/network/systems/details/history/snapshots/index.pxt?sid={formvar:sid}">Return to snapshot list</a></span> </pxt-formvar>
diff --git a/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt b/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt index 07d13ca..67a69fe 100644 --- a/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt +++ b/web/html/network/systems/details/history/snapshots/snapshot_tags.pxt @@ -21,7 +21,7 @@
<rhn-snapshot-details>
-<rhn-toolbar base="h2" icon="fa-camera" creation-url="/network/systems/details/history/snapshots/add_snapshot_tag.pxt?sid={formvar:sid}&ss_id={formvar:ss_id}" creation-type="snapshot tag"> +<rhn-toolbar base="h2" icon="header-snapshot" creation-url="/network/systems/details/history/snapshots/add_snapshot_tag.pxt?sid={formvar:sid}&ss_id={formvar:ss_id}" creation-type="snapshot tag"> {snapshot_created} Snapshot - Snapshot Tags </rhn-toolbar> diff --git a/web/html/network/systems/details/history/snapshots/system_tags.pxt b/web/html/network/systems/details/history/snapshots/system_tags.pxt index 412731c..341f7eb 100644 --- a/web/html/network/systems/details/history/snapshots/system_tags.pxt +++ b/web/html/network/systems/details/history/snapshots/system_tags.pxt @@ -18,7 +18,7 @@ <pxt-include-late file="/network/components/message_queues/local.pxi" />
- <rhn-toolbar base="h2" icon="fa-camera" creation-url="/network/systems/details/history/snapshots/add_system_tag.pxt?sid={formvar:sid}" creation-type="system tag"> + <rhn-toolbar base="h2" icon="header-snapshot" creation-url="/network/systems/details/history/snapshots/add_system_tag.pxt?sid={formvar:sid}" creation-type="system tag"> Snapshot Tags </rhn-toolbar>
diff --git a/web/html/network/systems/details/history/snapshots/unservable_packages.pxt b/web/html/network/systems/details/history/snapshots/unservable_packages.pxt index a6df288..7d08e79 100644 --- a/web/html/network/systems/details/history/snapshots/unservable_packages.pxt +++ b/web/html/network/systems/details/history/snapshots/unservable_packages.pxt @@ -20,7 +20,7 @@
<h2> -<i class="fa fa-camera"></i> +<rhn-icon type="header-snapshot"/> <rhn-snapshot-details> {snapshot_created} </rhn-snapshot-details> diff --git a/web/html/network/systems/details/history/verify_results.pxt b/web/html/network/systems/details/history/verify_results.pxt index 726df40..78dc467 100644 --- a/web/html/network/systems/details/history/verify_results.pxt +++ b/web/html/network/systems/details/history/verify_results.pxt @@ -15,7 +15,7 @@ <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" />
<h2> - <i class="fa spacewalk-icon-packages" title="package"></i> + <rhn-icon type="header-package" title="package"/> Package Verification Results </h2>
diff --git a/web/html/network/systems/details/proxy-clients.pxt b/web/html/network/systems/details/proxy-clients.pxt index 4fd6e18..70ba069 100644 --- a/web/html/network/systems/details/proxy-clients.pxt +++ b/web/html/network/systems/details/proxy-clients.pxt @@ -16,7 +16,7 @@
<pxt-include-late file="/network/components/message_queues/local.pxi"/>
- <h2><i class="fa spacewalk-icon-proxy"></i>Proxy Clients</h2> + <h2><rhn-icon type="header-proxy"/>Proxy Clients</h2>
<rhn-listview class="Sniglets::ListView::SystemList" mode="clients_through_proxy" alphabar_column="name"> <formvars> diff --git a/web/html/network/systems/details/proxy.pxt b/web/html/network/systems/details/proxy.pxt index fe5a2c9..def7730 100644 --- a/web/html/network/systems/details/proxy.pxt +++ b/web/html/network/systems/details/proxy.pxt @@ -15,7 +15,7 @@
<pxt-include-late file="/network/components/message_queues/local.pxi"/>
- <h2><i class="fa spacewalk-icon-proxy"></i>Proxy</h2> + <h2><rhn-icon type="header-proxy"/>Proxy</h2>
<rhn-proxy-entitlement-form> <div class="page-summary"> diff --git a/web/html/network/systems/groups/apply_errata_confirm.pxt b/web/html/network/systems/groups/apply_errata_confirm.pxt index 2b58446..b55cca6 100644 --- a/web/html/network/systems/groups/apply_errata_confirm.pxt +++ b/web/html/network/systems/groups/apply_errata_confirm.pxt @@ -12,7 +12,7 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" />
<h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="event-type-errata"/> Confirm Errata Update: <rhn-errata-advisory /> - <rhn-errata-name /> </h2>
diff --git a/web/html/network/systems/groups/errata_list.pxt b/web/html/network/systems/groups/errata_list.pxt index 80c9ff8..4c45484 100644 --- a/web/html/network/systems/groups/errata_list.pxt +++ b/web/html/network/systems/groups/errata_list.pxt @@ -15,7 +15,7 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" />
<h2> - <i class="fa spacewalk-icon-patches" title="erratum"></i> + <rhn-icon type="header-errata" title="erratum"/> Relevant Errata </h2>
diff --git a/web/html/network/systems/groups/systems_affected_by_errata.pxt b/web/html/network/systems/groups/systems_affected_by_errata.pxt index e2bf05f..88514f3 100644 --- a/web/html/network/systems/groups/systems_affected_by_errata.pxt +++ b/web/html/network/systems/groups/systems_affected_by_errata.pxt @@ -13,7 +13,7 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" />
<h2> - <i class="fa spacewalk-icon-patches"></i> + <rhn-icon type="event-type-errata"/> Systems Affected By: <rhn-errata-advisory /> - <rhn-errata-name /> </h2>
diff --git a/web/html/network/systems/ssm/errata/apply_errata_conf.pxt b/web/html/network/systems/ssm/errata/apply_errata_conf.pxt index be580fb..6db9016 100644 --- a/web/html/network/systems/ssm/errata/apply_errata_conf.pxt +++ b/web/html/network/systems/ssm/errata/apply_errata_conf.pxt @@ -7,7 +7,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/errata/index.pxt b/web/html/network/systems/ssm/errata/index.pxt index eae7b33..47847b3 100644 --- a/web/html/network/systems/ssm/errata/index.pxt +++ b/web/html/network/systems/ssm/errata/index.pxt @@ -10,7 +10,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
diff --git a/web/html/network/systems/ssm/errata/systems_affected.pxt b/web/html/network/systems/ssm/errata/systems_affected.pxt index 92c8cd7..fd85c75 100644 --- a/web/html/network/systems/ssm/errata/systems_affected.pxt +++ b/web/html/network/systems/ssm/errata/systems_affected.pxt @@ -8,14 +8,14 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
<rhn-errata-details> -<h2><i class="fa fa-desktop"></i> +<h2><rhn-icon type="header-system"/> Selected systems affected by {errata_advisory_name}</h2> </rhn-errata-details>
diff --git a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt index 5ab9393..583b485 100644 --- a/web/html/network/systems/ssm/groups/alter_membership_conf.pxt +++ b/web/html/network/systems/ssm/groups/alter_membership_conf.pxt @@ -8,7 +8,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
diff --git a/web/html/network/systems/ssm/groups/create.pxt b/web/html/network/systems/ssm/groups/create.pxt index dbdbfef..ba148f9 100644 --- a/web/html/network/systems/ssm/groups/create.pxt +++ b/web/html/network/systems/ssm/groups/create.pxt @@ -6,12 +6,12 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
<rhn-toolbar base="h2" - icon="fa-desktop" + icon="header-system" help-url="s1-sm-systems.jsp#s3-sm-system-group-creation"> Create a System Group </rhn-toolbar> diff --git a/web/html/network/systems/ssm/groups/index.pxt b/web/html/network/systems/ssm/groups/index.pxt index d193526..0754d9b 100644 --- a/web/html/network/systems/ssm/groups/index.pxt +++ b/web/html/network/systems/ssm/groups/index.pxt @@ -7,12 +7,12 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
- <rhn-toolbar base="h2" icon="spacewalk-icon-system-groups" creation-url="/network/systems/ssm/groups/create.pxt" creation-type="group"> + <rhn-toolbar base="h2" icon="header-system-groups" creation-url="/network/systems/ssm/groups/create.pxt" creation-type="group"> Alter Group Membership </rhn-toolbar>
diff --git a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt index 2a5df61..6349438 100644 --- a/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt +++ b/web/html/network/systems/ssm/misc/change_sys_pref_conf.pxt @@ -6,7 +6,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
diff --git a/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt b/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt index 30b0f3e..2c100a4 100644 --- a/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt +++ b/web/html/network/systems/ssm/misc/choose_value_to_remove.pxt @@ -8,7 +8,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/choose_value_to_set.pxt b/web/html/network/systems/ssm/misc/choose_value_to_set.pxt index d0c84cf..30c0596 100644 --- a/web/html/network/systems/ssm/misc/choose_value_to_set.pxt +++ b/web/html/network/systems/ssm/misc/choose_value_to_set.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/landing.pxt b/web/html/network/systems/ssm/misc/landing.pxt index a925e12..26cf2ae 100644 --- a/web/html/network/systems/ssm/misc/landing.pxt +++ b/web/html/network/systems/ssm/misc/landing.pxt @@ -5,7 +5,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/remove_value.pxt b/web/html/network/systems/ssm/misc/remove_value.pxt index 131b340..b8f8bfb 100644 --- a/web/html/network/systems/ssm/misc/remove_value.pxt +++ b/web/html/network/systems/ssm/misc/remove_value.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <pxt-formvar>
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/misc/set_value.pxt b/web/html/network/systems/ssm/misc/set_value.pxt index a3cff35..7f456c8 100644 --- a/web/html/network/systems/ssm/misc/set_value.pxt +++ b/web/html/network/systems/ssm/misc/set_value.pxt @@ -7,7 +7,7 @@ <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> <pxt-formvar>
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/packages/index.pxt b/web/html/network/systems/ssm/packages/index.pxt index b5bfbe2..04f685a 100644 --- a/web/html/network/systems/ssm/packages/index.pxt +++ b/web/html/network/systems/ssm/packages/index.pxt @@ -5,7 +5,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/packages/schedule_remote_command.pxt b/web/html/network/systems/ssm/packages/schedule_remote_command.pxt index 29cecad..e7fe222 100644 --- a/web/html/network/systems/ssm/packages/schedule_remote_command.pxt +++ b/web/html/network/systems/ssm/packages/schedule_remote_command.pxt @@ -7,7 +7,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
diff --git a/web/html/network/systems/ssm/packages/upload_answer_file.pxt b/web/html/network/systems/ssm/packages/upload_answer_file.pxt index a150d59..cc4f229 100644 --- a/web/html/network/systems/ssm/packages/upload_answer_file.pxt +++ b/web/html/network/systems/ssm/packages/upload_answer_file.pxt @@ -7,12 +7,12 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
<h2> - <i class="fa spacewalk-icon-packages"></i> + <rhn-icon type="event-type-package"/> Upload Answer File </h2>
diff --git a/web/html/network/systems/ssm/patches/index.pxt b/web/html/network/systems/ssm/patches/index.pxt index 273a19b..6993493 100644 --- a/web/html/network/systems/ssm/patches/index.pxt +++ b/web/html/network/systems/ssm/patches/index.pxt @@ -5,7 +5,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/patches/install.pxt b/web/html/network/systems/ssm/patches/install.pxt index fd1b5ef..8d36e76 100644 --- a/web/html/network/systems/ssm/patches/install.pxt +++ b/web/html/network/systems/ssm/patches/install.pxt @@ -6,7 +6,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
diff --git a/web/html/network/systems/ssm/patches/install_channel.pxt b/web/html/network/systems/ssm/patches/install_channel.pxt index 98b303b..04ced7e 100644 --- a/web/html/network/systems/ssm/patches/install_channel.pxt +++ b/web/html/network/systems/ssm/patches/install_channel.pxt @@ -7,7 +7,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
diff --git a/web/html/network/systems/ssm/patches/install_conf.pxt b/web/html/network/systems/ssm/patches/install_conf.pxt index d00796e..965acad 100644 --- a/web/html/network/systems/ssm/patches/install_conf.pxt +++ b/web/html/network/systems/ssm/patches/install_conf.pxt @@ -9,7 +9,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
diff --git a/web/html/network/systems/ssm/patches/remove.pxt b/web/html/network/systems/ssm/patches/remove.pxt index 2ef8f3e..e10ee94 100644 --- a/web/html/network/systems/ssm/patches/remove.pxt +++ b/web/html/network/systems/ssm/patches/remove.pxt @@ -6,7 +6,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
diff --git a/web/html/network/systems/ssm/patches/remove_conf.pxt b/web/html/network/systems/ssm/patches/remove_conf.pxt index b5f40b7..ac52370 100644 --- a/web/html/network/systems/ssm/patches/remove_conf.pxt +++ b/web/html/network/systems/ssm/patches/remove_conf.pxt @@ -9,7 +9,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
diff --git a/web/html/network/systems/ssm/patchsets/index.pxt b/web/html/network/systems/ssm/patchsets/index.pxt index 01da917..fb4529d 100644 --- a/web/html/network/systems/ssm/patchsets/index.pxt +++ b/web/html/network/systems/ssm/patchsets/index.pxt @@ -5,7 +5,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> diff --git a/web/html/network/systems/ssm/patchsets/install.pxt b/web/html/network/systems/ssm/patchsets/install.pxt index c5983e3..4359778 100644 --- a/web/html/network/systems/ssm/patchsets/install.pxt +++ b/web/html/network/systems/ssm/patchsets/install.pxt @@ -6,7 +6,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
diff --git a/web/html/network/systems/ssm/patchsets/install_channel.pxt b/web/html/network/systems/ssm/patchsets/install_channel.pxt index 9f3b761..6819d12 100644 --- a/web/html/network/systems/ssm/patchsets/install_channel.pxt +++ b/web/html/network/systems/ssm/patchsets/install_channel.pxt @@ -7,7 +7,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
diff --git a/web/html/network/systems/ssm/patchsets/install_conf.pxt b/web/html/network/systems/ssm/patchsets/install_conf.pxt index 94fa16e..aed5d82 100644 --- a/web/html/network/systems/ssm/patchsets/install_conf.pxt +++ b/web/html/network/systems/ssm/patchsets/install_conf.pxt @@ -9,7 +9,7 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
diff --git a/web/html/network/systems/ssm/provisioning/rollback.pxt b/web/html/network/systems/ssm/provisioning/rollback.pxt index 855ca68..41e48c8 100644 --- a/web/html/network/systems/ssm/provisioning/rollback.pxt +++ b/web/html/network/systems/ssm/provisioning/rollback.pxt @@ -7,12 +7,12 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
<h2> -<i class="fa spacewalk-icon-snapshot-rollback" title="rollback"></i> +<rhn-icon type="header-snapshot-rollback" title="rollback"/> Rollback to Snapshot Tag </h2>
diff --git a/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt b/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt index 609c610..658f5b1 100644 --- a/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt +++ b/web/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt @@ -8,13 +8,13 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
<rhn-snapshot-tag-details> <h2> -<i class="fa spacewalk-icon-snapshot-rollback"></i> +<rhn-icon type="header-snapshot-rollback"/> Rollback to Snapshot Tag: {tag_name}</h2>
<pxt-include-late file="/network/components/message_queues/local.pxi" /> diff --git a/web/html/network/systems/ssm/provisioning/tag_systems.pxt b/web/html/network/systems/ssm/provisioning/tag_systems.pxt index e29d94f..52c2791 100644 --- a/web/html/network/systems/ssm/provisioning/tag_systems.pxt +++ b/web/html/network/systems/ssm/provisioning/tag_systems.pxt @@ -8,12 +8,12 @@
<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1><i class="fa spacewalk-icon-system-groups" title="system set"></i> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <h1><rhn-icon type="header-system-groups" title="system set"/> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
<rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" />
<h2> -<i class="fa fa-camera" title="snapshot"></i> +<rhn-icon type="header-snapshot" title="snapshot"/> Tag Systems </h2>
diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list index d473a9f..717a5df 100644 --- a/web/html/network/systems/system_list +++ b/web/html/network/systems/system_list @@ -14,7 +14,7 @@ <pxt-formvar> <rhn-pathinfo-list-mode type="system"> <div class="spacewalk-toolbar-h1"><div class="spacewalk-toolbar"></div> - <h1><i class="fa fa-desktop"></i> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1> + <h1><rhn-icon type="header-system"/> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1> </div> <rhn-listview class="Sniglets::ListView::SystemList" mode="{pinfo_list_mode}" alphabar_column="name"> <formvars> diff --git a/web/include/network/components/legends/errata-list-legend.pxi b/web/include/network/components/legends/errata-list-legend.pxi index de36a24..49e87d6 100644 --- a/web/include/network/components/legends/errata-list-legend.pxi +++ b/web/include/network/components/legends/errata-list-legend.pxi @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> +<pxt-use class="Sniglets::HTML" />
<div class="sideleg"> <h2>Errata Legend</h2> <ul> - <li><i class="fa fa-shield fa-1-5x"></i>Security</li> - <li><i class="fa fa-bug fa-1-5x"></i>Bug Fix</li> - <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i>Enhancement</li> + <li><rhn-icon type="errata-security"/>Security</li> + <li><rhn-icon type="errata-bugfix"/>Bug Fix</li> + <li><rhn-icon type="errata-enhance"/>Enhancement</li> </ul> </div> diff --git a/web/include/network/components/legends/event-status.pxi b/web/include/network/components/legends/event-status.pxi index 1b98ff5..bf7fc7f 100644 --- a/web/include/network/components/legends/event-status.pxi +++ b/web/include/network/components/legends/event-status.pxi @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> +<pxt-use class="Sniglets::HTML" />
<div class="sideleg"> <h2>Event Status Legend</h2> <ul> - <li><i class="fa fa-check-circle-o fa-1-5x text-success"></i>Complete</li> - <li><i class="fa fa-times-circle-o fa-1-5x text-danger"></i>Failure</li> - <li><i class="fa fa-exchange fa-1-5x text-info"></i>Activity Occuring</li> + <li><rhn-icon type="action-ok"/>Complete</li> + <li><rhn-icon type="action-failed"/>Failure</li> + <li><rhn-icon type="action-running"/>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 index df25bf4..2d1fd1c 100644 --- a/web/include/network/components/legends/event-type.pxi +++ b/web/include/network/components/legends/event-type.pxi @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> +<pxt-use class="Sniglets::HTML" />
<div class="sideleg"> <h2>Event Type Legend</h2> <ul> - <li><i class="fa spacewalk-icon-packages"></i>Package Event</li> - <li><i class="fa spacewalk-icon-patches"></i>Errata Event</li> - <li><i class="fa fa-cog"></i>Preferences Event</li> - <li><i class="fa fa-desktop"></i>System Event</li> + <li><rhn-icon type="event-type-package"/>Package Event</li> + <li><rhn-icon type="event-type-errata"/>Errata Event</li> + <li><rhn-icon type="event-type-preferences"/>Preferences Event</li> + <li><rhn-icon type="event-type-system"/>System Event</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 index 2c59157..50f2a96 100644 --- a/web/include/network/components/legends/system-list-legend.pxi +++ b/web/include/network/components/legends/system-list-legend.pxi @@ -3,24 +3,25 @@ <pxt-passthrough>
<pxt-use class="Sniglets::Users" /> +<pxt-use class="Sniglets::HTML" />
<div class="sideleg"> <h4>System Legend</h4> <ul> - <li><i class="fa fa-check-circle fa-1-5x text-success"></i>OK</li> - <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>Critical</li> - <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i></i>Warning</li> - <li><i class="spacewalk-icon-unknown-system"></i>Unknown</li> + <li><rhn-icon type="system-ok"/>OK</li> + <li><rhn-icon type="system-crit"/>Critical</li> + <li><rhn-icon type="system-warn"/>Warning</li> + <li><rhn-icon type="system-unknown"/>Unknown</li> <rhn-require acl="org_entitlement(sw_mgr_enterprise)"> - <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i></i>Locked</li> + <li><rhn-icon type="system-locked"/>Locked</li> </rhn-require> <rhn-require acl="org_entitlement(rhn_provisioning)"> - <li><i class="fa fa-rocket fa-1-5x"></i>Kickstarting</li> + <li><rhn-icon type="system-kickstarting"/>Kickstarting</li> </rhn-require> - <li><i class="fa fa-clock-o fa-1-5x"></i>Pending Actions</li> - <li><i class="fa fa-1-5x spacewalk-icon-Unentitled"></i>Unentitled</li> + <li><rhn-icon type="action-pending"/>Pending Actions</li> + <li><rhn-icon type="system-unentitled"/>Unentitled</li> <rhn-require acl="org_entitlement(rhn_monitor)"> - <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i>Monitoring Status</li> + <li><rhn-icon type="monitoring-status"/>Monitoring Status</li> </rhn-require> </ul> </div> diff --git a/web/include/network/components/system_groups/sgdc_header.pxi b/web/include/network/components/system_groups/sgdc_header.pxi index 3265f40..1e72df5 100644 --- a/web/include/network/components/system_groups/sgdc_header.pxi +++ b/web/include/network/components/system_groups/sgdc_header.pxi @@ -7,12 +7,12 @@ <pxt-formvar>
<rhn-toolbar base="h1" - icon="fa spacewalk-icon-system-groups" + icon="header-system-groups" 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-icon="fa spacewalk-icon-system-groups" + misc-icon="header-system-groups" misc-text="work with group" deletion-type="group" deletion-url="delete_confirm.pxt?sgid={formvar:sgid}" diff --git a/web/include/network/components/systems/system_details_toolbar.pxi b/web/include/network/components/systems/system_details_toolbar.pxi index 428e951..cd1f3cc 100644 --- a/web/include/network/components/systems/system_details_toolbar.pxi +++ b/web/include/network/components/systems/system_details_toolbar.pxi @@ -6,8 +6,8 @@ <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" + <rhn-toolbar base="h1" icon="header-system-physical" + 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 /> @@ -15,8 +15,8 @@ </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" + <rhn-toolbar base="h1" icon="header-system-virt-host" + 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 /> @@ -24,8 +24,8 @@ </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" + <rhn-toolbar base="h1" icon="header-system-virt-guest" + 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 /> diff --git a/web/include/network/software/channels/manage/manage_channels_header.pxi b/web/include/network/software/channels/manage/manage_channels_header.pxi index 00a4044..fdf84e3 100644 --- a/web/include/network/software/channels/manage/manage_channels_header.pxi +++ b/web/include/network/software/channels/manage/manage_channels_header.pxi @@ -5,7 +5,7 @@ <pxt-use class="Sniglets::Navi" />
<rhn-channel-details> - <rhn-toolbar base="h1" img="/img/rhn-icon-channels.gif" help-url="sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp" help-guide="getting-started" deletion-type="software channel" deletion-url="/rhn/channels/manage/Delete.do?cid={channel_id}" deletion-acl="user_role(channel_admin); formvar_exists(cid)"> + <rhn-toolbar base="h1" icon="header-channel" help-url="sect-Getting_Started_Guide-Channel_Management-Creating_and_Managing_Custom_Channels-Removing_Software_Packages.jsp" help-guide="getting-started" deletion-type="software channel" deletion-url="/rhn/channels/manage/Delete.do?cid={channel_id}" deletion-acl="user_role(channel_admin); formvar_exists(cid)"> Software Channel: {channel_name} </rhn-toolbar> </rhn-channel-details> diff --git a/web/include/network/users/details/header.pxi b/web/include/network/users/details/header.pxi index de0ade0..e469ccc 100644 --- a/web/include/network/users/details/header.pxi +++ b/web/include/network/users/details/header.pxi @@ -5,7 +5,7 @@ <pxt-use class="Sniglets::HTML" />
<pxt-formvar> - <rhn-toolbar base="h1" img="/img/rhn-icon-users.gif" help-url="s1-sm-users.jsp#s2-sm-user-active" deletion-url="/rhn/users/DeleteUser.do?uid={formvar:uid}" deletion-type="user" deletion-acl="user_role(org_admin)"><rhn-user-login /></rhn-toolbar> + <rhn-toolbar base="h1" icon="header-user" help-url="s1-sm-users.jsp#s2-sm-user-active" deletion-url="/rhn/users/DeleteUser.do?uid={formvar:uid}" deletion-type="user" deletion-acl="user_role(org_admin)"><rhn-user-login /></rhn-toolbar>
</pxt-formvar>
commit 42946b2fad86195c68b60cfdd8f11b8aa9b684dd Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 10 15:45:48 2013 +0100
updated perl modules to use PXT::HTML->icon()
diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm index 68f52d0..e5a15ce 100644 --- a/web/modules/pxt/PXT/HTML.pm +++ b/web/modules/pxt/PXT/HTML.pm @@ -509,35 +509,58 @@ sub img { }
my %rhn_icons = ( - "item-add" => "fa fa-plus", - "item-del" => "fa fa-trash-o", - "system-ok" => "fa fa-check-circle fa-1-5x text-success", - "system-crit" => "fa fa-exclamation-circle fa-1-5x text-danger", - "system-warn" => "fa fa-exclamation-triangle fa-1-5x text-warning", - "system-unknown" => "fa fa-1-5x spacewalk-icon-unknown-system", - "system-locked" => "fa fa-1-5x spacewalk-icon-locked-system", - "system-kickstarting" => "fa fa-rocket fa-1-5x", - "system-unentitled" => "fa fa-1-5x spacewalk-icon-Unentitled", - "system-virt-host" => "fa fa-1-5x spacewalk-icon-virtual-host", - "system-virt-guest" => "fa fa-1-5x spacewalk-icon-virtual-guest", - "system-physical" => "fa fa-desktop fa-1-5x", - "action-pending" => "fa fa-clock-o fa-1-5x", - "action-ok" => "fa fa-check-circle-o fa-1-5x text-success", "action-failed" => "fa fa-times-circle-o fa-1-5x text-danger", + "action-ok" => "fa fa-check-circle-o fa-1-5x text-success", + "action-pending" => "fa fa-clock-o fa-1-5x", "action-running" => "fa fa-exchange fa-1-5x text-info", - "event-type-package" => "fa spacewalk-icon-packages", + "errata-bugfix" => "fa fa-bug fa-1-5x", + "errata-enhance" => "fa fa-1-5x spacewalk-icon-enhancement", + "errata-security" => "fa fa-shield fa-1-5x", "event-type-errata" => "fa spacewalk-icon-patches", + "event-type-package" => "fa spacewalk-icon-packages", "event-type-preferences" => "fa fa-cog", "event-type-system" => "fa fa-desktop", - "errata-security" => "fa fa-shield fa-1-5x", - "errata-bugfix" => "fa fa-bug fa-1-5x", - "errata-enhance" => "fa fa-1-5x spacewalk-icon-enhancement", - "monitoring-status" => "fa fa-1-5x spacewalk-icon-monitoring-status", - "monitoring-ok" => "fa fa-1-5x spacewalk-icon-health text-success", - "monitoring-warn" => "fa fa-1-5x spacewalk-icon-health text-warning", + "header-channel" => "fa spacewalk-icon-software-channels", + "header-errata" => "fa spacewalk-icon-patches", + "header-errata-add" => "fa spacewalk-icon-patch-install", + "header-errata-del" => "fa spacewalk-icon-patch-remove", + "header-errata-set" => "fa spacewalk-icon-patch-set", + "header-errata-set-add" => "fa pacewalk-icon-patchset-install", + "header-event-history" => "fa fa-suitcase", + "header-info" => "fa fa-info-circle text-primary", + "header-package" => "fa spacewalk-icon-packages", + "header-preferences" => "fa fa-cogs", + "header-proxy" => "fa spacewalk-icon-proxy", + "header-search" => "fa fa-search", + "header-signout" => "fa fa-sign-out", + "header-sitemap" => "fa fa-sitemap", + "header-snapshot" => "fa fa-camera", + "header-snapshot-rollback" => "fa spacewalk-icon-snapshot-rollback", + "header-system" => "fa fa-desktop", + "header-system-groups" => "fa spacewalk-icon-system-groups", + "header-system-physical" => "fa fa-desktop", + "header-system-virt-guest" => "fa spacewalk-icon-virtual-guest", + "header-system-virt-host" => "fa spacewalk-icon-virtual-host", + "header-user" => "fa fa-user", + "item-add" => "fa fa-plus", + "item-del" => "fa fa-trash-o", "monitoring-crit" => "fa fa-1-5x spacewalk-icon-health text-danger", - "monitoring-unknown" => "fa fa-1-5x spacewalk-icon-health-unknown", + "monitoring-ok" => "fa fa-1-5x spacewalk-icon-health text-success", "monitoring-pending" => "fa fa-1-5x spacewalk-icon-health-pending", + "monitoring-status" => "fa fa-1-5x spacewalk-icon-monitoring-status", + "monitoring-unknown" => "fa fa-1-5x spacewalk-icon-health-unknown", + "monitoring-warn" => "fa fa-1-5x spacewalk-icon-health text-warning", + "nav-up" => "fa fa-caret-up", + "system-crit" => "fa fa-exclamation-circle fa-1-5x text-danger", + "system-kickstarting" => "fa fa-rocket fa-1-5x", + "system-locked" => "fa fa-1-5x spacewalk-icon-locked-system", + "system-ok" => "fa fa-check-circle fa-1-5x text-success", + "system-physical" => "fa fa-desktop fa-1-5x", + "system-unentitled" => "fa fa-1-5x spacewalk-icon-Unentitled", + "system-unknown" => "fa fa-1-5x spacewalk-icon-unknown-system", + "system-virt-guest" => "fa fa-1-5x spacewalk-icon-virtual-guest", + "system-virt-host" => "fa fa-1-5x spacewalk-icon-virtual-host", + "system-warn" => "fa fa-exclamation-triangle fa-1-5x text-warning", );
sub icon { diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 4691527..a5eb8c1 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -91,7 +91,7 @@ sub toolbar { }
if (defined $params{icon}) { - $icon= sprintf(qq{<i class="$params{icon}"></i>}); + $icon = PXT::HTML->icon(-type => $params{icon}); }
if (defined $params{'help-url'}) { @@ -135,14 +135,16 @@ sub creation_link { my $pxt = shift; my %params = @_;
- return qq{<a href="$params{url}"><i class="fa fa-plus"></i>create new $params{type}</a>}; + my $icon = PXT::HTML->icon(-type => "item-add"); + return qq{<a href="$params{url}">${icon}create new $params{type}</a>}; }
sub deletion_link { my $pxt = shift; my %params = @_;
- return qq{<a href="$params{url}"><i class="fa fa-trash-o"></i>delete $params{type}</a>}; + my $icon = PXT::HTML->icon(-type => "item-del"); + return qq{<a href="$params{url}">${icon}delete $params{type}</a>}; }
sub misc_link { @@ -150,7 +152,8 @@ sub misc_link { my %params = @_;
if (defined $params{icon}) { - return qq{<a href="$params{url}"><i class="$params{icon}"></i>$params{text}</a>}; + my $icon = PXT::HTML->icon(-type => $params{icon}); + return qq{<a href="$params{url}">${icon}$params{text}</a>}; } else { return qq{<a href="$params{url}"><img src="$params{img}" alt="$params{'alt'}" title="$params{'alt'}" />$params{text}</a>}; diff --git a/web/modules/sniglets/Sniglets/ListView/ActionList.pm b/web/modules/sniglets/Sniglets/ListView/ActionList.pm index bee505f..44271b8 100644 --- a/web/modules/sniglets/Sniglets/ListView/ActionList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ActionList.pm @@ -70,27 +70,28 @@ sub _register_modes { }
-my %history_type_icons = ('packages.refresh_list' => 'spacewalk-icon-packages', - 'packages.delta' => 'spacewalk-icon-packages', - 'packages.update' => 'spacewalk-icon-packages', - 'packages.remove' => 'spacewalk-icon-packages', - 'packages.runTransaction' => 'spacewalk-icon-packages', - 'up2date_config.get' => 'fa-cog', - 'up2date_config.update' => 'fa-cog', - 'rollback.config' => 'fa-cog', - 'rollback.listTransactions' => 'spacewalk-icon-packages', # bad icon for this - 'errata.update' => 'spacewalk-icon-patches', - 'hardware.refresh_list' => 'fa-desktop', # bad icon for this - 'reboot.reboot' => 'fa-desktop', # bad icon for this - 'configfiles.upload' => 'fa-desktop', - 'configfiles.deploy' => 'fa-desktop', - 'configfiles.verify' => 'fa-desktop', - 'configfiles.diff' => 'fa-desktop', - ); - -my %history_status_icons = ('Completed' => 'fa-check-circle-o fa-1-5x text-success', - 'Failed' => 'fa-times-circle-o fa-1-5x text-danger', - 'Picked Up' => 'fa-exchange fa-1-5x text-info', +my %history_type_icons = ( + 'packages.refresh_list' => 'event-type-package', + 'packages.delta' => 'event-type-package', + 'packages.update' => 'event-type-package', + 'packages.remove' => 'event-type-package', + 'packages.runTransaction' => 'event-type-package', + 'up2date_config.get' => 'event-type-preferences', + 'up2date_config.update' => 'event-type-preferences', + 'rollback.config' => 'event-type-preferences', + 'rollback.listTransactions' => 'event-type-package', # bad icon for this + 'errata.update' => 'event-type-errata', + 'hardware.refresh_list' => 'event-type-system', # bad icon for this + 'reboot.reboot' => 'event-type-system', # bad icon for this + 'configfiles.upload' => 'event-type-system', + 'configfiles.deploy' => 'event-type-system', + 'configfiles.verify' => 'event-type-system', + 'configfiles.diff' => 'event-type-system', + ); + +my %history_status_icons = ('Completed' => 'actions-ok', + 'Failed' => 'actions-failed', + 'Picked Up' => 'actions-running', );
sub system_history_provider { @@ -117,24 +118,25 @@ sub system_history_provider { if (defined $event->{HISTORY_TYPE}) {
if ($history_type_icons{$event->{HISTORY_TYPE}}) { - $event->{HISTORY_TYPE} = sprintf(qq{<i class="fa %s" title="%s"></i>}, - $history_type_icons{$event->{HISTORY_TYPE}}, - $event->{HISTORY_TYPE_NAME}); + $event->{HISTORY_TYPE} = PXT::HTML->icon( + -type => $history_type_icons{$event->{HISTORY_TYPE}}, + -title => $event->{HISTORY_TYPE_NAME}); } else { PXT::Debug->log(2,"no icon for scheduled action type?! type: " . $event->{HISTORY_TYPE}); - $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; + $event->{HISTORY_TYPE} = PXT::HTML->icon(-type => "event-type-system", + -title => "System Event"); } } else { - $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; + $event->{HISTORY_TYPE} = PXT::HTML->icon(-type => "event-type-system", + -title => "System Event"); }
if (defined $event->{HISTORY_STATUS}) { - - $event->{HISTORY_STATUS} = sprintf(qq{<i class="fa %s" title="%s"></i>}, - $history_status_icons{$event->{HISTORY_STATUS}}, - $event->{HISTORY_STATUS}); + $event->{HISTORY_STATUS} = PXT::HTML->icon( + -type => $history_status_icons{$event->{HISTORY_STATUS}}, + -title => $event->{HISTORY_STATUS}); } else { $event->{HISTORY_STATUS} = '<span class="no-details">(n/a)</span>'; diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm index 0adce0e..d5119d6 100644 --- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm @@ -24,6 +24,7 @@ use RHN::Server; use RHN::Channel; use RHN::ChannelEditor; use RHN::SearchTypes; +use PXT::HTML; use PXT::Utils; use RHN::Exception qw/throw/;
@@ -170,11 +171,11 @@ sub row_callback { my $row = shift; my $pxt = shift;
- my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', - 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', - 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>'); + my %adv_icon = ('Bug Fix Advisory' => 'errata-bugfix', + 'Product Enhancement Advisory' => 'errata-enhance', + 'Security Advisory' => 'errata-security'); if (exists $row->{ADVISORY_TYPE}) { - $row->{ADVISORY_ICON} = $adv_icon{$row->{ADVISORY_TYPE}}; + $row->{ADVISORY_ICON} = PXT::HTML->icon(-type => $adv_icon{$row->{ADVISORY_TYPE}}); }
if (exists $row->{ADVISORY_LAST_UPDATED}) { diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm index 2f83964..fe4da05 100644 --- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm +++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm @@ -26,6 +26,7 @@ use RHN::ErrataTmp; use RHN::DataSource::Package; use RHN::DataSource; use RHN::DataSource::Simple; +use PXT::HTML; use PXT::Utils; use RHN::Scheduler; use RHN::Manifest; @@ -1382,9 +1383,9 @@ sub package_install_remote_command_cb { return 1; }
-my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', - 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', - 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>'); +my %adv_icon = ('Bug Fix Advisory' => 'errata-bugfix', + 'Product Enhancement Advisory' => 'errata-enhance', + 'Security Advisory' => 'errata-security');
sub system_upgradable_package_provider { my $self = shift; @@ -1458,7 +1459,8 @@ sub system_upgradable_package_provider { foreach my $adv (@{$row->{ERRATA_ADVISORY}}) { my $adv_id = shift @{$row->{ERRATA_ID}}; my $adv_type = shift @adv_types; - push @errata, sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv); + push @errata, sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', + PXT::HTML->icon(-type => $adv_icon{$adv_type}), $adv_id, $adv); }
$row->{RELATED_ERRATA} = join("<br />\n", @errata); @@ -1480,7 +1482,7 @@ sub obsoleting_packages_provider { my $adv_type = $row->{ADVISORY_TYPE}; my $adv_id = $row->{ERRATA_ID};
- $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv) : ''; + $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', PXT::HTML->icon(-type => $adv_icon{$adv_type}), $adv_id, $adv) : ''; }
return (%ret); diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm index 13a382c..718b9df 100644 --- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm +++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm @@ -567,14 +567,14 @@ sub row_callback {
my $icon_data = Sniglets::Servers::system_status_info($pxt->user, $row);
- my $image = PXT::HTML->icon(-class => $icon_data->{icon}, + my $image = PXT::HTML->icon(-type => $icon_data->{icon}, -title => $icon_data->{status_str});
$row->{ADVISORY_ICON} = PXT::HTML->link($icon_data->{link}, $image);
my $locked_data = Sniglets::Servers::system_locked_info($pxt->user, $row); if ($locked_data->{link}) { - my $locked_image = PXT::HTML->icon(-class => $locked_data->{icon}, + my $locked_image = PXT::HTML->icon(-type => $locked_data->{icon}, -title => $locked_data->{status_str});
$row->{ADVISORY_ICON} .= PXT::HTML->link($locked_data->{link}, $locked_image); @@ -586,7 +586,7 @@ sub row_callback { if (defined $row->{MONITORING_STATUS}) { my $icon_data = Sniglets::Servers::system_monitoring_info($pxt->user, $row);
- my $image = PXT::HTML->icon(-class => $icon_data->{icon}, + my $image = PXT::HTML->icon(-type => $icon_data->{icon}, -title => $icon_data->{status_str});
$row->{MONITORING_ICON} = PXT::HTML->link($icon_data->{system_link}, $image); diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm index a59b55b..1155fb1 100644 --- a/web/modules/sniglets/Sniglets/ServerGroup.pm +++ b/web/modules/sniglets/Sniglets/ServerGroup.pm @@ -64,20 +64,20 @@ sub system_group_status_interface {
if (not ($counts->{SECURITY_ERRATA} or $counts->{BUG_ERRATA} or $counts->{ENHANCEMENT_ERRATA})) {
- $subst->{icon} = '<i class="fa fa-check-circle fa-1-5x text-success"></i>'; + $subst->{icon} = PXT::HTML->icon(-type => 'system-ok'); $subst->{status_str} = 'No applicable errata'; $subst->{status_class} = 'system-status-up-to-date'; } elsif ($counts->{SECURITY_ERRATA}) {
- $subst->{icon} = '<i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>'; + $subst->{icon} = PXT::HTML->icon(-type => 'system-crit'); $subst->{status_str} = $counts->{SECURITY_ERRATA} . ' critical updates available'; $subst->{message} = "(<a href="/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "">more info</a>)";; $subst->{status_class} = 'system-status-critical-updates'; } else {
- $subst->{icon} = '<i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i>'; + $subst->{icon} = PXT::HTML->icon(-type => 'system-warn'); $subst->{status_str} = ' updates available'; $subst->{message} = "(<a href="/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "">more info</a>)"; $subst->{status_class} = 'system-status-updates'; diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 8b4d249..16259fd 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -218,7 +218,7 @@ sub system_status_info { $ret->{$_} = '' foreach (qw/image status_str status_class message link/);
if (not $data->{IS_ENTITLED}) { - $ret->{icon} = 'fa fa-1-5x spacewalk-icon-Unentitled'; + $ret->{icon} = 'system-unentitled'; $ret->{status_str} = 'System not entitled'; $ret->{status_class} = 'system-status-unentitled';
@@ -228,7 +228,7 @@ sub system_status_info { } } elsif ($data->{LAST_CHECKIN_DAYS_AGO} > PXT::Config->get('system_checkin_threshold')) { - $ret->{icon} = 'spacewalk-icon-unknown-system'; + $ret->{icon} = 'system-unknown'; $ret->{status_str} = 'System not checking in with R H N'; $ret->{status_class} = 'system-status-awol'; $ret->{message} = 'more info'; @@ -236,40 +236,40 @@ sub system_status_info { -href => 's1-sm-systems.html#S3-SM-SYSTEM-LIST-INACT'); } elsif ($data->{KICKSTART_SESSION_ID}) { - $ret->{icon} = 'fa fa-rocket fa-1-5x'; + $ret->{icon} = 'system-kickstarting'; $ret->{status_str} = 'Kickstart in progress'; $ret->{status_class} = 'system-status-kickstart'; $ret->{message} = 'view progress'; $ret->{link} = "/rhn/systems/details/kickstart/SessionStatus.do?sid=${sid}"; } elsif (not ($errata_count or $data->{OUTDATED_PACKAGES}) and not $package_actions_count) { - $ret->{icon} = 'fa fa-check-circle fa-1-5x text-success'; + $ret->{icon} = 'system-ok'; $ret->{status_str} = 'System is up to date'; $ret->{status_class} = 'system-status-up-to-date'; } elsif ($errata_count and not RHN::Server->unscheduled_errata($sid, $user->id)) { - $ret->{icon} = 'fa fa-clock-o fa-1-5x'; + $ret->{icon} = 'action-pending'; $ret->{status_str} = 'All updates scheduled'; $ret->{status_class} = 'system-status-updates-scheduled'; $ret->{message} = 'view actions'; $ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}"; } elsif ($actions_count) { - $ret->{icon} = 'fa fa-clock-o fa-1-5x'; + $ret->{icon} = 'action-pending'; $ret->{status_class} = 'system-status-updates-scheduled'; $ret->{status_str} = 'Actions scheduled'; $ret->{message} = 'view actions'; $ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}"; } elsif ($data->{SECURITY_ERRATA}) { - $ret->{icon} = 'fa fa-exclamation-circle fa-1-5x text-danger'; + $ret->{icon} = 'system-crit'; $ret->{status_str} = 'Critical updates available'; $ret->{status_class} = 'system-status-critical-updates'; $ret->{message} = 'update now'; $ret->{link} = "/rhn/systems/details/ErrataConfirm.do?all=true&sid=${sid}"; } elsif ($data->{OUTDATED_PACKAGES}) { - $ret->{icon} = 'fa fa-exclamation-triangle fa-1-5x text-warning'; + $ret->{icon} = 'system-warn'; $ret->{status_str} = 'Updates available'; $ret->{status_class} = 'system-status-updates'; $ret->{message} = "more info";
commit ff6d0d5ecc9c49d265d3a44dbdec7179e673b740 Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 10 13:05:48 2013 +0100
bootstrap tuning: reimplemented icon tag in pxt
diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm index 19b72c0..68f52d0 100644 --- a/web/modules/pxt/PXT/HTML.pm +++ b/web/modules/pxt/PXT/HTML.pm @@ -508,22 +508,50 @@ sub img { return qq{<img $inner_str />}; }
+my %rhn_icons = ( + "item-add" => "fa fa-plus", + "item-del" => "fa fa-trash-o", + "system-ok" => "fa fa-check-circle fa-1-5x text-success", + "system-crit" => "fa fa-exclamation-circle fa-1-5x text-danger", + "system-warn" => "fa fa-exclamation-triangle fa-1-5x text-warning", + "system-unknown" => "fa fa-1-5x spacewalk-icon-unknown-system", + "system-locked" => "fa fa-1-5x spacewalk-icon-locked-system", + "system-kickstarting" => "fa fa-rocket fa-1-5x", + "system-unentitled" => "fa fa-1-5x spacewalk-icon-Unentitled", + "system-virt-host" => "fa fa-1-5x spacewalk-icon-virtual-host", + "system-virt-guest" => "fa fa-1-5x spacewalk-icon-virtual-guest", + "system-physical" => "fa fa-desktop fa-1-5x", + "action-pending" => "fa fa-clock-o fa-1-5x", + "action-ok" => "fa fa-check-circle-o fa-1-5x text-success", + "action-failed" => "fa fa-times-circle-o fa-1-5x text-danger", + "action-running" => "fa fa-exchange fa-1-5x text-info", + "event-type-package" => "fa spacewalk-icon-packages", + "event-type-errata" => "fa spacewalk-icon-patches", + "event-type-preferences" => "fa fa-cog", + "event-type-system" => "fa fa-desktop", + "errata-security" => "fa fa-shield fa-1-5x", + "errata-bugfix" => "fa fa-bug fa-1-5x", + "errata-enhance" => "fa fa-1-5x spacewalk-icon-enhancement", + "monitoring-status" => "fa fa-1-5x spacewalk-icon-monitoring-status", + "monitoring-ok" => "fa fa-1-5x spacewalk-icon-health text-success", + "monitoring-warn" => "fa fa-1-5x spacewalk-icon-health text-warning", + "monitoring-crit" => "fa fa-1-5x spacewalk-icon-health text-danger", + "monitoring-unknown" => "fa fa-1-5x spacewalk-icon-health-unknown", + "monitoring-pending" => "fa fa-1-5x spacewalk-icon-health-pending", + ); + sub icon { my $class = shift; my %params = @_;
- if (not exists $params{-class}) { - die "classless icon"; - } + die "empty icon type" if not exists $params{-type}; + die qq{unknown icon type: "$params{-type}".} if not exists $rhn_icons{$params{-type}};
- my @inner; - for my $attr (qw/class title/) { - next unless exists $params{"-$attr"}; - push @inner, sprintf(qq{$attr="$params{-$attr}"}); - } + my $icon = qq{<i class="$rhn_icons{$params{-type}}"}; + $icon .= qq{ title="$params{-title}"}; + $icon .= qq{></i>};
- my $inner_str = join(" ", @inner); - return qq{<i $inner_str></i>}; + return $icon; }
1; diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 28f9b29..4691527 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -42,6 +42,7 @@ sub register_tags { $pxt->register_tag("rhn-refresh-redirect", &rhn_refresh_redirect); $pxt->register_tag("rhn-autorefresh-widget", &rhn_autorefresh_widget); $pxt->register_tag("rhn-return-link", &return_link); + $pxt->register_tag("rhn-icon", &rhn_icon); }
@@ -334,4 +335,11 @@ sub return_link { return PXT::Utils->perform_substitutions($params{__block__}, %subst); }
+sub rhn_icon { + my $pxt = shift; + my %params = validate(@_, {'type' => 1, 'title' => 0}); + + %params = map {("-$_" => $params{$_})} keys %params; + return PXT::HTML->icon(%params); +} 1;
spacewalk-commits@lists.fedorahosted.org