spacewalk-commits November 2013

spacewalk-commits@lists.fedorahosted.org

9 participants
202 discussions

spacecmd/src
by Milan Zazrivec 08 Nov '13

08 Nov '13

spacecmd/src/lib/system.py | 1 + 1 file changed, 1 insertion(+) New commits: commit ad5f2714428c7f6011a9ce60b90af0e767fed866 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Nov 8 15:35:35 2013 +0100 835979 - system_runscript: convert date/time to iso-8601 This is to fix the following error (returned from server): ERROR: com.redhat.rhn.common.translation.TranslationException: Could not find translator for class java.lang.String to class java.util.Date diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py index 91d5787..433d18b 100644 --- a/spacecmd/src/lib/system.py +++ b/spacecmd/src/lib/system.py @@ -365,6 +365,7 @@ def do_system_runscript(self, args): else: options.timeout = int(options.timeout) if not options.start_time: options.start_time = parse_time_input('now') + options.start_time = parse_time_input(options.start_time) if not options.file: logging.error('A script file is required')

1 0

java/code
by Tomas Lestach 08 Nov '13

08 Nov '13

java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 57 +--------- 1 file changed, 6 insertions(+), 51 deletions(-) New commits: commit e5c58e1ab97c5c3f67fb9b30984872b897e9220a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Nov 8 14:20:26 2013 +0100 1021552 - point to channel architecture listing API in channel.software.create APIs diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index 18b6685..abdeb26 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -653,23 +653,8 @@ public class ChannelSoftwareHandler extends BaseHandler { * @xmlrpc.param #param_desc("string", "name", "name of the new channel") * @xmlrpc.param #param_desc("string", "summary" "summary of the channel") * @xmlrpc.param #param_desc("string", "archLabel", - * "the label of the architecture the channel corresponds to") - * #options() - * #item_desc ("channel-ia32", "For 32 bit channel architecture") - * #item_desc ("channel-ia64", "For 64 bit channel architecture") - * #item_desc ("channel-sparc", "For Sparc channel architecture") - * #item_desc ("channel-alpha", "For Alpha channel architecture") - * #item_desc ("channel-s390", "For s390 channel architecture") - * #item_desc ("channel-s390x", "For s390x channel architecture") - * #item_desc ("channel-iSeries", "For i-Series channel architecture") - * #item_desc ("channel-pSeries", "For p-Series channel architecture") - * #item_desc ("channel-x86_64", "For x86_64 channel architecture") - * #item_desc ("channel-ppc", "For PPC channel architecture") - * #item_desc ("channel-sparc-sun-solaris", - * "For Sparc Solaris channel architecture") - * #item_desc ("channel-i386-sun-solaris", - * "For i386 Solaris channel architecture") - * #options_end() + * "the label of the architecture the channel corresponds to, + * see channel.software.listArches API for complete listing") * @xmlrpc.param #param_desc("string", "parentLabel", "label of the parent of this * channel, an empty string if it does not have one") * @xmlrpc.param #param_desc("string", "checksumType", "checksum type for this channel, @@ -739,23 +724,8 @@ public class ChannelSoftwareHandler extends BaseHandler { * @xmlrpc.param #param_desc("string", "name", "name of the new channel") * @xmlrpc.param #param_desc("string", "summary" "summary of the channel") * @xmlrpc.param #param_desc("string", "archLabel", - * "the label of the architecture the channel corresponds to") - * #options() - * #item_desc ("channel-ia32", "For 32 bit channel architecture") - * #item_desc ("channel-ia64", "For 64 bit channel architecture") - * #item_desc ("channel-sparc", "For Sparc channel architecture") - * #item_desc ("channel-alpha", "For Alpha channel architecture") - * #item_desc ("channel-s390", "For s390 channel architecture") - * #item_desc ("channel-s390x", "For s390x channel architecture") - * #item_desc ("channel-iSeries", "For i-Series channel architecture") - * #item_desc ("channel-pSeries", "For p-Series channel architecture") - * #item_desc ("channel-x86_64", "For x86_64 channel architecture") - * #item_desc ("channel-ppc", "For PPC channel architecture") - * #item_desc ("channel-sparc-sun-solaris", - * "For Sparc Solaris channel architecture") - * #item_desc ("channel-i386-sun-solaris", - * "For i386 Solaris channel architecture") - * #options_end() + * "the label of the architecture the channel corresponds to, + * see channel.software.listArches API for complete listing") * @xmlrpc.param #param_desc("string", "parentLabel", "label of the parent of this * channel, an empty string if it does not have one") * @xmlrpc.param #param_desc("string", "checksumType", "checksum type for this channel, @@ -803,23 +773,8 @@ public class ChannelSoftwareHandler extends BaseHandler { * @xmlrpc.param #param_desc("string", "name", "name of the new channel") * @xmlrpc.param #param_desc("string", "summary" "summary of the channel") * @xmlrpc.param #param_desc("string", "archLabel", - * "the label of the architecture the channel corresponds to") - * #options() - * #item_desc ("channel-ia32", "For 32 bit channel architecture") - * #item_desc ("channel-ia64", "For 64 bit channel architecture") - * #item_desc ("channel-sparc", "For Sparc channel architecture") - * #item_desc ("channel-alpha", "For Alpha channel architecture") - * #item_desc ("channel-s390", "For s390 channel architecture") - * #item_desc ("channel-s390x", "For s390x channel architecture") - * #item_desc ("channel-iSeries", "For i-Series channel architecture") - * #item_desc ("channel-pSeries", "For p-Series channel architecture") - * #item_desc ("channel-x86_64", "For x86_64 channel architecture") - * #item_desc ("channel-ppc", "For PPC channel architecture") - * #item_desc ("channel-sparc-sun-solaris", - * "For Sparc Solaris channel architecture") - * #item_desc ("channel-i386-sun-solaris", - * "For i386 Solaris channel architecture") - * #options_end() + * "the label of the architecture the channel corresponds to, + * see channel.software.listArches API for complete listing") * @xmlrpc.param #param_desc("string", "parentLabel", "label of the parent of this * channel, an empty string if it does not have one") * @xmlrpc.returntype int - 1 if the creation operation succeeded, 0 otherwise

1 0

Branch 'bootstrap-css' - 36 commits - branding/css branding/fonts java/code web/html
by Silvio Moioli 07 Nov '13

07 Nov '13

branding/css/mixins.less | 13 branding/css/responsive-rules.less | 126 ++ branding/css/spacewalk.less | 406 -------- branding/css/theme.less | 456 +++++++++- branding/fonts/font-spacewalk/css/spacewalk-font.css | 216 +++- branding/fonts/font-spacewalk/font/spacewalk-icon.dev.svg | 45 branding/fonts/font-spacewalk/font/spacewalk-icon.eot |binary branding/fonts/font-spacewalk/font/spacewalk-icon.svg | 102 +- branding/fonts/font-spacewalk/font/spacewalk-icon.ttf |binary branding/fonts/font-spacewalk/font/spacewalk-icon.woff |binary java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java | 8 java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java | 87 + java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java | 13 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 130 +- java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java | 52 - java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java | 20 java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 62 - java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java | 15 java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 37 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java | 18 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld | 5 java/code/webapp/WEB-INF/decorators/layout_equals.jsp | 4 java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp | 2 java/code/webapp/WEB-INF/includes/footer.jsp | 2 java/code/webapp/WEB-INF/includes/header.jsp | 39 java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 2 java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 2 java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 35 java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 2 java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 4 java/code/webapp/WEB-INF/pages/admin/catalina.jsp | 2 java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp | 2 java/code/webapp/WEB-INF/pages/admin/channelperms.jsp | 4 java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp | 2 java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 23 java/code/webapp/WEB-INF/pages/admin/config/restart.jsp | 2 java/code/webapp/WEB-INF/pages/admin/disableself.jsp | 39 java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp | 40 java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 11 java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 5 java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp | 16 java/code/webapp/WEB-INF/pages/admin/iss/master.jsp | 16 java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp | 8 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 17 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 232 ++--- java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 59 - java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp | 133 +- java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 118 +- java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 20 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp | 306 +++--- java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 6 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 12 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp | 2 java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 2 java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp | 46 - java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 4 java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp | 45 java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp | 4 java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp | 48 - java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp | 21 java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 13 java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp | 2 java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 2 java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2 java/code/webapp/WEB-INF/pages/audit/machine.jsp | 2 java/code/webapp/WEB-INF/pages/audit/overview.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp | 2 java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 315 +++--- java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp | 2 java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp | 2 java/code/webapp/WEB-INF/pages/channel/all.jsp | 2 java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp | 2 java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 6 java/code/webapp/WEB-INF/pages/channel/custom.jsp | 2 java/code/webapp/WEB-INF/pages/channel/entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 14 java/code/webapp/WEB-INF/pages/channel/manage/add.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 15 java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 17 java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 10 java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 12 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 12 java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp | 6 java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 4 java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/channel/popular.jsp | 4 java/code/webapp/WEB-INF/pages/channel/retired.jsp | 2 java/code/webapp/WEB-INF/pages/channel/shared.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 2 java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 6 java/code/webapp/WEB-INF/pages/channel/vendor.jsp | 2 java/code/webapp/WEB-INF/pages/common/errors/404.jsp | 5 java/code/webapp/WEB-INF/pages/common/errors/500.jsp | 5 java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp | 4 java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp | 4 java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp | 4 java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp | 4 java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp | 5 java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp | 5 java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp | 5 java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp | 5 java/code/webapp/WEB-INF/pages/common/errors/permission.jsp | 5 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 14 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf | 62 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf | 46 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf | 195 ++-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf | 207 ++-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 10 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 3 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 9 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 9 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 3 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 18 java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf | 3 java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf | 3 java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 14 java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf | 9 java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 12 java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 9 java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 11 java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf | 3 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 3 java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf | 15 java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf | 15 java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 12 java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf | 20 java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf | 20 java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf | 23 java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp | 4 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 6 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 10 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 6 java/code/webapp/WEB-INF/pages/common/loading/loading.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp | 21 java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp | 92 +- java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 5 java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp | 49 - java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 7 java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 5 java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp | 24 java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp | 9 java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp | 27 java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 62 - java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp | 11 java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 5 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 5 java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 14 java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp | 7 java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 7 java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 19 java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 10 java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 7 java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 9 java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 7 java/code/webapp/WEB-INF/pages/credentials/delete.jsp | 91 + java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 2 java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp | 4 java/code/webapp/WEB-INF/pages/errata/addchannels.jsp | 4 java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp | 4 java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 4 java/code/webapp/WEB-INF/pages/errata/all.jsp | 4 java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp | 4 java/code/webapp/WEB-INF/pages/errata/create.jsp | 2 java/code/webapp/WEB-INF/pages/errata/delete.jsp | 4 java/code/webapp/WEB-INF/pages/errata/details.jsp | 2 java/code/webapp/WEB-INF/pages/errata/edit.jsp | 4 java/code/webapp/WEB-INF/pages/errata/editchannels.jsp | 4 java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp | 2 java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 20 java/code/webapp/WEB-INF/pages/errata/notify.jsp | 4 java/code/webapp/WEB-INF/pages/errata/packagepush.jsp | 4 java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 4 java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 6 java/code/webapp/WEB-INF/pages/errata/packages/list.jsp | 6 java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp | 7 java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp | 6 java/code/webapp/WEB-INF/pages/errata/published.jsp | 4 java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 4 java/code/webapp/WEB-INF/pages/errata/unpublished.jsp | 4 java/code/webapp/WEB-INF/pages/groups/create.jsp | 6 java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 2 java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 2 java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keyedit.jsp | 2 java/code/webapp/WEB-INF/pages/keys/keys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp | 5 java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 12 java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 21 java/code/webapp/WEB-INF/pages/kickstart/locale.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 7 java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/download.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp | 5 java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 5 java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp | 2 java/code/webapp/WEB-INF/pages/profiles/delete.jsp | 2 java/code/webapp/WEB-INF/pages/profiles/list.jsp | 2 java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/software/downloads/download.jsp | 2 java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 6 java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 6 java/code/webapp/WEB-INF/pages/ssm/packages.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 14 java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 6 java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 6 java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp | 4 java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 20 java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 4 java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp | 4 java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 10 java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 2 java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp | 4 java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp | 4 java/code/webapp/WEB-INF/pages/systems/crashes.jsp | 5 java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp | 4 java/code/webapp/WEB-INF/pages/systems/crashnote.jsp | 10 java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp | 5 java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp | 14 java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 4 java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp | 6 java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp | 6 java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/audit/listscap.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 12 java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/kickstart/variables.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 7 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 6 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 5 java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 5 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 4 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 8 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 5 java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 5 java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 17 java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 2 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 2 java/code/webapp/WEB-INF/pages/systems/errata.jsp | 17 java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 16 java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/grouplist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/overview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 6 java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp | 2 java/code/webapp/WEB-INF/pages/systems/probes/probedelete.jsp | 2 java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp | 2 java/code/webapp/WEB-INF/pages/systems/proxylist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 6 java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 12 java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp | 2 java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp | 4 java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 18 java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 4 java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp | 2 java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp | 2 java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp | 4 java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 4 java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp | 2 java/code/webapp/WEB-INF/pages/yourrhn.jsp | 23 web/html/help/about.pxt | 2 web/html/javascript/spacewalk-essentials.js | 41 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/probe_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 572 files changed, 3256 insertions(+), 3103 deletions(-) New commits: commit a88a193275ce5c24fa014e7c4be1b5b5d8a6be70 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Nov 7 15:58:46 2013 +0100 Port images to font iconts (FontAwesome) diff --git a/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp b/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp index 7f0b6a5..4fcdb25 100644 --- a/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp +++ b/java/code/webapp/WEB-INF/includes/advertisements/chat-advertisement.jsp @@ -1,4 +1,4 @@ <br/> <a href="http://webchat.freenode.net?channels=#spacewalk" target="_blank"> - <img src="/img/chat.png" alt=""/> + <i class="fa fa-comment text-primary" title=""></i> </a> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp index 5fb82d6..a186edb 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp @@ -17,16 +17,13 @@ <rhn:listdisplay button="deleteconfirm.jsp.confirm"> <rhn:column header="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rhn:column> <rhn:column header="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp index 22c5b03..824396f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp @@ -46,8 +46,7 @@ <th><bean:message key="syncprofile.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" - title="<bean:message key='syncprofile.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index d45109a..eedde45 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -27,27 +27,19 @@ <rl:column bound="false" headerkey="iss.slave.isEnabled" sortattr="enabled"> <c:if test="${current.enabled == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key='iss.slave.enabled'/>" - title="<bean:message key='iss.slave.enabled'/>" /> + <i class="fa fa-check text-success" title="<bean:message key='iss.slave.enabled'/>"></i> </c:if> <c:if test="${current.enabled != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key='iss.slave.disabled'/>" - title="<bean:message key='iss.slave.disabled'/>" /> + <i class="fa fa-circle-o" title="<bean:message key='iss.slave.disabled'/>"></i> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs"> <c:if test="${current.allowAllOrgs == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key='iss.slave.all'/>" - title="<bean:message key='iss.slave.all'/>" /> + <i class="fa fa-check text-success" title="<bean:message key='iss.slave.all'/>"></i> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key='iss.slave.notAll'/>" - title="<bean:message key='iss.slave.notAll'/>" /> + <i class="fa fa-circle-o" title="<bean:message key='iss.slave.notAll'/>"></i> </c:if> </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp index 661248f..6dc1be0 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -39,27 +39,19 @@ <rl:column bound="false" headerkey="iss.slave.isEnabled" sortattr="enabled" styleclass="center" headerclass="center"> <c:if test="${current.enabled == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key='iss.slave.enabled'/>" - title="<bean:message key='iss.slave.enabled'/>" /> + <i class="fa fa-check text-success" title="<bean:message key='iss.slave.enabled'/>"></i> </c:if> <c:if test="${current.enabled != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key='iss.slave.disabled'/>" - title="<bean:message key='iss.slave.disabled'/>" /> + <i class="fa fa-circle-o" title="<bean:message key='iss.slave.disabled'/>"></i> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs" styleclass="center" headerclass="center"> <c:if test="${current.allowAllOrgs == 'Y'}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key='iss.slave.all'/>" - title="<bean:message key='iss.slave.all'/>" /> + <i class="fa fa-check text-success" title="<bean:message key='iss.slave.all'/>"></i> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key='iss.slave.notAll'/>" - title="<bean:message key='iss.slave.notAll'/>" /> + <i class="fa fa-circle-o" title="<bean:message key='iss.slave.notAll'/>"></i> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.num-orgs-allowed" diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp index 15da84b..49033a5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -32,14 +32,10 @@ <rl:column bound="false" headerkey="iss.master.isDefault" styleclass="center" headerclass="center"> <c:if test="${current.defaultMaster}"> - <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key='iss.master.isDefault'/>" - title="<bean:message key='iss.master.isDefault'/>" /> + <i class="fa fa-check text-success" title="<bean:message key='iss.master.isDefault'/>"></i> </c:if> <c:if test="${not current.defaultMaster}"> - <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key='iss.master.notDefault'/>" - title="<bean:message key='iss.master.notDefault'/>" /> + <i class="fa fa-circle-o" title="<bean:message key='iss.master.notDefault'/>"></i> </c:if> </rl:column> <rl:column headerkey="iss.num.master.orgs" styleclass="center" headerclass="center"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index afb3576..27b3b25 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@ -32,24 +32,19 @@ <rhn:set value="${current.id}" /> <rhn:column header="probesuitesystems.jsp.state"> <c:if test="${current.status == 'UNKNOWN'}"> - <img src="/img/rhn-mon-unknown.gif" title="<bean:message key='monitoring.status.unknown'/>" - alt="<bean:message key='monitoring.status.unknown'/>"/> + <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='monitoring.status.unknown'/>"></i> </c:if> <c:if test="${current.status == 'OK'}"> - <img src="/img/rhn-mon-ok.gif" title="<bean:message key='monitoring.status.ok'/>" - alt="<bean:message key='monitoring.status.ok'/>"/> + <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='monitoring.status.ok'/>"></i> </c:if> <c:if test="${current.status == 'WARNING'}"> - <img src="/img/rhn-mon-warning.gif" title="<bean:message key='monitoring.status.warn'/>" - alt="<bean:message key='monitoring.status.warn'/>"/> + <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='monitoring.status.warn'/>"></i> </c:if> <c:if test="${current.status == 'PENDING'}"> - <img src="/img/rhn-mon-pending.gif" title="<bean:message key='monitoring.status.pending'/>" - alt="<bean:message key='monitoring.status.pending'/>"/> + <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='monitoring.status.pending'/>"></i> </c:if> <c:if test="${current.status == 'CRITICAL'}"> - <img src="/img/rhn-mon-down.gif" title="<bean:message key='monitoring.status.critical'/>" - alt="<bean:message key='monitoring.status.critical'/>"/> + <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='monitoring.status.critical'/>"></i> </c:if> </rhn:column> <rhn:column header="probesuitesystems.jsp.system"> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp index 0e00ef2..b058788 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp @@ -86,7 +86,7 @@ attr="orgAdmin"> <c:choose> <c:when test="${current.orgAdmin == 1}"> - <img src="/img/rhn-listicon-checked_immutable.gif"> + <i class="fa fa-check"></i> </c:when> <c:otherwise> <img src="/img/rhn-listicon-unchecked_immutable.gif"> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp index f177f47..d403955 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp @@ -67,7 +67,7 @@ attr="orgAdmin"> <c:choose> <c:when test="${current.orgAdmin == 1}"> - <img src="/img/rhn-listicon-checked_immutable.gif"> + <i class="fa fa-check"></i> </c:when> <c:otherwise> <img src="/img/rhn-listicon-unchecked_immutable.gif"> @@ -81,12 +81,12 @@ <c:choose> <c:when test="${current.satAdmin == 1}"> <a href="/rhn/admin/multiorg/ToggleSatAdmin.do?uid=${current.id}"> - <img src="/img/rhn-listicon-ok.gif"> + <i class="fa fa-check text-success"></i> </a> </c:when> <c:otherwise> <a href="/rhn/admin/multiorg/ToggleSatAdmin.do?uid=${current.id}"> - <img src="/img/rhn-listicon-unchecked.gif"> + <i class="fa fa-circle-o"></i> </a> </c:otherwise> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp index c94d6e6..39be475 100755 --- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp @@ -15,7 +15,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <BR> <h2> - <img src="/img/rhn-icon-system.gif" alt="system" /> + <i class="fa fa-desktop" title="system"></i> <bean:message key="channeltarget.confirm.jsp.header1"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp index a96458c..f6291af 100644 --- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp @@ -29,19 +29,13 @@ headerkey="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - alt="<bean:message key='erratalist.jsp.securityadvisory' />" - title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - alt="<bean:message key='erratalist.jsp.bugadvisory' />" - title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - alt="<bean:message key='erratalist.jsp.productenhancementadvisory' />" - title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp index 250abbe..cd22ec1 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <img src="/img/rhn-icon-errata.gif" alt="erratum" /> <bean:message key="header.jsp.errata.add"/> + <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata.add"/> </h2> <table class="details"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index 1d19d08..9d25e72 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -94,16 +94,13 @@ styleclass="center" headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - alt="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - alt="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 54be12e..3a36eb3 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -116,16 +116,13 @@ styleclass="center" headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - alt="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - alt="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index 35e3976..38ce5b8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -28,7 +28,7 @@ <rhn:csrf /> <input type="hidden" name="cid" value="${cid}"> <bean:message key="channel.jsp.package.addmessage"/> -<h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="channel.jsp.package.addtitle"/></h2> +<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="channel.jsp.package.addtitle"/></h2> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp index 76ca2c8..7d4e0a8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> -<h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="repos.jsp.channel.repos"/></h2> +<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="repos.jsp.channel.repos"/></h2> <rl:listset name="packageSet"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp index 3217200..5274cfe 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> <h2> - <img src="/img/rhn-icon-packages.gif" /> + <i class="fa spacewalk-icon-packages"></i> <bean:message key="channel.jsp.package.add.confirm.title"/> </h2> <bean:message key="channel.jsp.package.add.confirm.msg"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index b9ecd38..d44bc0e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -24,19 +24,19 @@ <h2>Errata Summary:</h2> <table class="details"> <tr> - <th><img src="/img/wrh-bug.gif" alt="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <th><i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> Bug Fix Advisory: </th> <td>${bug_count}</td> </tr> <tr> - <th><img src="/img/wrh-product.gif" alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <th><i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> Product Enhancement Advisory: </th> <td>${enhance_count}</td> </tr> <tr> - <th><img src="/img/wrh-security.gif" alt="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <th><i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> Security Advisory: </th> <td>${secure_count}</td> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp index 5f14e50..f4d2987 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <img src="/img/rhn-icon-errata.gif" alt="erratum" /> <bean:message key="header.jsp.errata"/> + <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata"/> </h2> <bean:message key="channel.jsp.errata.remove.confirmmessage"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp index d8dbe13..c85aaf9 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp @@ -17,7 +17,7 @@ <br/> <h2> - <img src="/img/rhn-icon-packages.gif" /> + <i class="fa spacewalk-icon-packages"></i> <bean:message key="confirmprivate.jsp.title"/> </h2> <p><bean:message key="confirmprotected.jsp.confirmmsg"/></p> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp index 54b9a28..9ee03e8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> <h2> - <img src="/img/rhn-icon-packages.gif" /> + <i class="fa spacewalk-icon-packages"></i> Confirm Package Removal </h2> <bean:message key="channel.jsp.package.remove"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp index 87576ed..09aed22 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp @@ -11,10 +11,10 @@ </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" +<rhn:toolbar base="h1" icon="fa-retweet" creationUrl="DistChannelMapEdit.do" creationType="distchannelmap" - imgAlt="info.alt.img"> + iconAlt="info.alt.img"> <bean:message key="Distribution Channel Mapping"/> </rhn:toolbar> @@ -69,10 +69,10 @@ > <c:choose> <c:when test="${current.org != null}"> - <img src="/img/rhn-listicon-checked.gif"> + <i class="fa fa-check text-success"></i> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-unchecked.gif"> + <i class="fa fa-circle-o"></i> </c:otherwise> </c:choose> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp index 2b163ea..a2ec909 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp @@ -5,7 +5,7 @@ <html:html > <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-retweet" iconAlt="info.alt.img"> <bean:message key="distchannelmap.jsp.delete"/> </rhn:toolbar> <h2><bean:message key="distchannelmap.jsp.delete"/></h2> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp index ba1418e..5faf499 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp @@ -7,13 +7,13 @@ <body> <c:choose> <c:when test="${empty dcm}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img"> + <rhn:toolbar base="h1" icon="fa-retweet" iconAlt="info.alt.img"> <bean:message key="distchannelmap.jsp.create"/> </rhn:toolbar> <h2><bean:message key="distchannelmap.jsp.create"/></h2> </c:when> <c:otherwise> - <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img" + <rhn:toolbar base="h1" icon="fa-retweet" iconAlt="info.alt.img" deletionUrl="DistChannelMapDelete.do?dcm=${dcm}" deletionType="distchannelmap"> <bean:message key="distchannelmap.jsp.update"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp index 1d5f6c7..c73f58a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <img src="/img/rhn-icon-errata.gif" alt="erratum" /> <bean:message key="header.jsp.errata"/> + <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata"/> </h2> <ul> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp index 60fd151..4711637 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> -<h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="header.jsp.errata.sync.packagepush"/></h2> +<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="header.jsp.errata.sync.packagepush"/></h2> <bean:message key="channel.jsp.errata.sync.packages.message"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp index 94b8369..2e2bf43 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -12,7 +12,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <img src="/img/rhn-icon-errata.gif" alt="erratum" /> <bean:message key="header.jsp.errata.sync"/> + <i class="fa spacewalk-icon-patches" title="erratum"></i> <bean:message key="header.jsp.errata.sync"/> </h2> <bean:message key="channel.jsp.errata.sync.message"/> @@ -42,13 +42,13 @@ headerclass="thin-column" sortattr="advisoryType"> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <img src="/img/wrh-product.gif" alt="Product Enhancement Advisory" title="Product Enhancement Advisory" /> + <i class="fa spacewalk-icon-enhancement" title="Product Enhancement Advisory"></i> </c:if> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <img src="/img/wrh-security.gif" alt="Security Advisory" title="Security Advisory" /> + <i class="fa fa-lock" title="Security Advisory"></i> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <img src="/img/wrh-bug.gif" alt="Bug Fix Advisory" title="Bug Fix Advisory" /> + <i class="fa fa-bug" title="Bug Fix Advisory"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp index 2dbef1b..7d9a1ec 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp @@ -21,7 +21,7 @@ </div> <h2> - <img src="/img/rhn-icon-patchset.gif" /> + <i class="fa spacewalk-icon-patch-set"></i> <bean:message key="channel.manage.patchset.title"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp index c025e7e..0086bf3 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> -<h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="channel.jsp.package.list"/></h2> +<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="channel.jsp.package.list"/></h2> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp index 564762e..dec517a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <h2> - <img src="/img/rhn-icon-packages.gif" alt="package" /> Packages + <i class="fa spacewalk-icon-packages" title="package"></i> Packages </h2> <ul> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp index ae4eda5..89e358f 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> <BR> -<h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="repos.jsp.channel.repos"/></h2> +<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="repos.jsp.channel.repos"/></h2> <rl:listset name="packageSet"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp index 3639018..693edf6 100755 --- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp @@ -15,7 +15,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> <BR> <h2> - <img src="/img/rhn-icon-system.gif" alt="system" /> + <i class="fa fa-desktop" title="system"></i> <bean:message key="channeltarget.jsp.header1"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp index 2ccca13..d33b193 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp @@ -11,8 +11,7 @@ <c:set var="escapedUrl" value="${fn:escapeXml(errorUrl)}"/> <h1> - <img src="/img/rhn-icon-warning.gif" - alt="<bean:message key='500.jsp.imgAlt' />" /> + <i class="fa fa-warning text-warning" title="<bean:message key='500.jsp.imgAlt' />"></i> <bean:message key="404.jsp.title"/> </h1> <p><bean:message key="404.jsp.summary" arg0="${escapedUrl}"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp index ff9b15b..9c0bd92 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp @@ -6,8 +6,7 @@ <page:applyDecorator name="layout_c"> <body> <h1> - <img src="/img/rhn-icon-warning.gif" - alt="<bean:message key='500.jsp.imgAlt' />" /> + <i class="fa fa-warning text-warning" title="<bean:message key='500.jsp.imgAlt' />"></i> <bean:message key="500.jsp.title"/> </h1> <p><bean:message key="500.jsp.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp index b685e5e..2c97f17 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp @@ -6,7 +6,7 @@ <rhn:require acl="user_authenticated()"> -<h1><img src="/img/rhn-icon-warning.gif"/><bean:message key="badcsvaction.jsp.title"/></h1> +<h1><i class="fa fa-warning text-warning"></i><bean:message key="badcsvaction.jsp.title"/></h1> <p><bean:message key="badcsvaction.jsp.summary"/></p> <ol> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp index d4e245a..e2296e0 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp @@ -4,7 +4,7 @@ <html> <body> -<h1><img src="/img/rhn-icon-warning.gif"/><bean:message key="baddownload.jsp.title"/></h1> +<h1><i class="fa fa-warning text-warning"></i><bean:message key="baddownload.jsp.title"/></h1> <p><bean:message key="baddownload.jsp.summary"/></p> <ol> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp index c52094f..fde7d24 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp @@ -6,7 +6,7 @@ <rhn:require acl="user_authenticated()"> -<h1><img src="/img/rhn-icon-warning.gif"/><bean:message key="badparam.jsp.title"/></h1> +<h1><i class="fa fa-warning text-warning"></i><bean:message key="badparam.jsp.title"/></h1> <p><bean:message key="badparam.jsp.summary"/></p> <ol> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp index 570b862..a640b0c 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp @@ -4,7 +4,7 @@ <html> <body> -<h1><img src="/img/rhn-icon-warning.gif"/><bean:message key="login.jsp.error.header"/></h1> +<h1><i class="fa fa-warning text-warning"></i><bean:message key="login.jsp.error.header"/></h1> <p><bean:message key="login.jsp.error.message"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp index b105e3b..9ad6f69 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp @@ -7,8 +7,7 @@ <rhn:require acl="user_authenticated()"> <h1> - <img src="/img/rhn-icon-warning.gif" - alt="<bean:message key='error.common.errorAlt' />" /> + <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> ${error.localizedTitle} </h1> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp index cc37f61..f687af6 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp @@ -7,8 +7,7 @@ <rhn:require acl="user_authenticated()"> <h1> - <img src="/img/rhn-icon-warning.gif" - alt="${rhn:localize('error.common.errorAlt')}" /> + <i class="fa fa-warning text-warning" title="${rhn:localize('error.common.errorAlt')}"></i> <bean:message key="missing_capabilities.jsp.header"/> </h1> <p><bean:message key="missing_capabilities.jsp.title"/></p> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp index 4a76f72..dac3c5f 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp @@ -5,8 +5,7 @@ <body> <h1> - <img src="/img/rhn-icon-warning.gif" - alt="<bean:message key='error.common.errorAlt' />" /> + <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> <bean:message key="unknown.kickstart" />: </h1> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp index 95018cf..cf7f712 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp @@ -5,8 +5,7 @@ <body> <h1> - <img src="/img/rhn-icon-warning.gif" - alt="<bean:message key='error.common.errorAlt' />" /> + <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> <bean:message key="unknown.package" />: </h1> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp index ef7284a..28e31f5 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp @@ -5,8 +5,7 @@ <body> <h1> - <img src="/img/rhn-icon-warning.gif" - alt="<bean:message key='error.common.errorAlt' />" /> + <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> ${error.localizedTitle} </h1> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf index 19b821c..a919f63 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf @@ -14,7 +14,7 @@ <div class="page-summary"> - <h2><img src="/img/rhn-icon-system_group.gif" alt="system group" /> + <h2><i class="fa spacewalk-icon-system-groups" title="system group"></i> <bean:message key="${param.title_key}"/> </h2> <p> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf index 3ee4ffa..db3c3f2 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf @@ -7,8 +7,8 @@ <c:choose> <c:when test='${channel != null}'> <c:if test="${channel.globalChannel}"> - <rhn:toolbar base="h1" img="/img/rhn-config_central.gif" - imgAlt="config.common.globalAlt" + <rhn:toolbar base="h1" icon="spacewalk-icon-channels-config" + iconAlt="config.common.globalAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details" deletionUrl="/rhn/configuration/DeleteChannel.do?ccid=${ccid}" deletionType="configchannel" deletionAcl="user_role(config_admin)"> @@ -16,8 +16,8 @@ </rhn:toolbar> </c:if> <c:if test="${channel.localChannel}"> - <rhn:toolbar base="h1" img="/img/rhn-config_system.gif" - imgAlt="config.common.localAlt" + <rhn:toolbar base="h1" icon="spacewalk-icon-config-system" + iconAlt="config.common.localAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details" deletionUrl="/rhn/configuration/DeleteChannel.do?ccid=${ccid}" deletionType="configchannel" deletionAcl="user_role(config_admin)"> @@ -25,8 +25,8 @@ </rhn:toolbar> </c:if> <c:if test="${channel.sandboxChannel}"> - <rhn:toolbar base="h1" img="/img/rhn-config_sandbox.gif" - imgAlt="config.common.sandboxAlt" + <rhn:toolbar base="h1" icon="spacewalk-icon-sandbox" + iconAlt="config.common.sandboxAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details" deletionUrl="/rhn/configuration/DeleteChannel.do?ccid=${ccid}" deletionType="configchannel" deletionAcl="user_role(config_admin)"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf index e7607b7..2d4c3d4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf @@ -49,7 +49,7 @@ <c:choose> <c:when test="${summary.numSystems > 0}"> <td> - <img alt='<bean:message key="system.common.systemAlt" />' src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="system.common.systemAlt" />"></i> <a href="/rhn/systems/details/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}"> <c:out value="${summary.mostRecentSystem.name}" /> </a><br /> @@ -68,13 +68,13 @@ <c:when test="${summary.numFiles + summary.numDirs + summary.numSymlinks > 0}"> <c:choose> <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.directory}"> - <img alt='<bean:message key="config.common.dirAlt" />' src="/img/rhn-listicon-cfg_folder.gif" /> + <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i> </c:when> <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.symlink}"> - <img alt='<bean:message key="config.common.symlinkAlt" />' src="/img/rhn-listicon-cfg_symlink.gif" /> + <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.fileAlt" />' src="/img/rhn-listicon-cfg_file.gif" /> + <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i> </c:otherwise> </c:choose> <a href="/rhn/configuration/file/FileDetails.do?cfid=${summary.mostRecentMod.configFile.id}"> @@ -88,8 +88,7 @@ <rhn:require acl="user_role(org_admin)"> <a href="/rhn/users/UserDetails.do?uid=${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.id}"> </rhn:require> - <img src="/img/rhn-listicon-user.gif" - alt="<bean:message key='user.common.userAlt' />" /> + <i class="fa fa-user" title="<bean:message key='user.common.userAlt' />"></i> <c:out value="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.login}" /> <rhn:require acl="user_role(org_admin)"> </a> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf index 2978a74..7cca90d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf @@ -8,20 +8,16 @@ <rhn:column header="summary.jsp.status"> <c:if test="${current.success}"> - <img title='<bean:message key="summary.jsp.okAlt" />' - alt='<bean:message key="summary.jsp.okAlt" />' - src="/img/rhn-listicon-ok.gif" /> + <i class="fa fa-check text-success" title="<bean:message key="summary.jsp.okAlt" />"></i> </c:if> <c:if test="${!current.success}"> - <img title='<bean:message key="summary.jsp.errorAlt" />' - alt='<bean:message key="summary.jsp.errorAlt" />' - src="/img/rhn-listicon-error.gif" /> + <i class="fa fa-times-circle text-danger" title="<bean:message key="summary.jsp.errorAlt" />"></i> </c:if> </rhn:column> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img alt="" src="/img/rhn-listicon-system.gif"> ${current.name} + <i class="fa fa-desktop" title=""></i> ${current.name} </rhn:column> <rhn:column header="summary.jsp.error"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp index 41fd8eb..a962600 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp @@ -25,13 +25,13 @@ url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> <c:choose> <c:when test="${requestScope.type == 'central'}"> - <img alt='<bean:message key="config.common.globalAlt" />' src="/img/rhn-listicon-channel.gif" /> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> </c:when> <c:when test="${requestScope.type == 'local'}"> - <img alt='<bean:message key="config.common.localAlt" />' src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.sandboxAlt" />' src="/img/rhn-listicon-sandbox.png" /> + <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> </c:otherwise> </c:choose> ${current.nameDisplay} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf index 0210360..e60da63 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf @@ -51,8 +51,7 @@ </tr> <tr> <th> - <img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='deploy.jsp.selection'/>" - title="<bean:message key='deploy.jsp.selection'/>"/> + <i class="fa spacewalk-icon-schedule" title="<bean:message key='deploy.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf index 9151f12..2b2af09 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf @@ -10,13 +10,13 @@ <td> <c:choose> <c:when test="${channel.configChannelType.label == 'normal'}"> - <img alt='<bean:message key="config.common.globalAlt" />' src="/img/rhn-listicon-channel.gif" /> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> </c:when> <c:when test="${channel.configChannelType.label == 'local_override'}"> - <img alt='<bean:message key="config.common.localAlt" />' src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.sandboxAlt" />' src="/img/rhn-listicon-sandbox.png" /> + <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> </c:otherwise> </c:choose> @@ -49,8 +49,7 @@ * the login of the user --%> <c:set var="beanarg" scope="request"> - <img alt="<bean:message key='user.common.userAlt' />" - src="/img/rhn-listicon-user.gif" /> + <i class="fa fa-user" title="<bean:message key='user.common.userAlt' />"></i> <rhn:require acl="user_role(org_admin)"> <a href="/rhn/users/UserDetails.do?uid=${lastUserId}"> </rhn:require> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp index f52d0ec..b025fc7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp @@ -23,16 +23,13 @@ <a href="/rhn/configuration/ChannelOverview.do?ccid=${mychan.id}"> <c:choose> <c:when test="${mychan.configChannelType.label == 'server_import'}"> - <img alt='<bean:message key="config.common.sandboxAlt" />' - src="/img/rhn-listicon-sandbox.png" /> + <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> </c:when> <c:when test="${mychan.configChannelType.label == 'local_override'}"> - <img alt='<bean:message key="config.common.localAlt" />' - src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.globalAlt" />' - src="/img/rhn-listicon-channel.gif" /> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> </c:otherwise> </c:choose> ${mychan.name} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf index 872d66e..4f5eb68 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf @@ -23,8 +23,7 @@ <th><bean:message key="sdcconfigconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" - title="<bean:message key='syncprofile.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf index 23382b0..f2e9fc4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf @@ -5,16 +5,13 @@ <rhn:column header="sdcconfigfiles.jsp.filename"> <c:choose> <c:when test="${current.configFileType == 'file'}"> - <img alt='<bean:message key="config.common.fileAlt" />' - src="/img/rhn-listicon-cfg_file.gif"> ${current.path} + <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i> ${current.path} </c:when> <c:when test="${current.configFileType == 'directory'}"> - <img alt='<bean:message key="config.common.dirAlt" />' - src="/img/rhn-listicon-cfg_folder.gif"> ${current.path} + <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i> ${current.path} </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.symlinkAlt" />' - src="/img/rhn-listicon-cfg_symlink.gif"> ${current.path} + <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i> ${current.path} </c:otherwise> </c:choose> </rhn:column> @@ -28,16 +25,13 @@ url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> <c:choose> <c:when test="${current.configChannelType == 'normal'}"> - <img alt='<bean:message key="config.common.globalAlt" />' - src="/img/rhn-listicon-channel.gif"> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> </c:when> <c:when test="${current.configChannelType == 'local_override'}"> - <img alt='<bean:message key="config.common.localAlt" />' - src="/img/rhn-listicon-system.gif"> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.sandboxAlt" />' - src="/img/rhn-listicon-sandbox.png"> + <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> </c:otherwise> </c:choose> ${current.channelNameDisplay} diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf index 7a31d3e..333248c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf @@ -6,8 +6,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf index ccff613..9c06e51 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf @@ -9,8 +9,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="ssmdiff.jsp.filename"> - <img src="/img/rhn-listicon-cfg_file.gif" - alt="<bean:message key='config.common.fileAlt' />" /> + <i class="fa fa-file-text-o" title="<bean:message key='config.common.fileAlt' />"></i> ${current.path} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf index cad05bc..912e00b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf @@ -4,8 +4,8 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <c:if test="${errata.securityAdvisory}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-security.gif" - imgAlt="errata-legend.jsp.security" + <rhn:toolbar base="h1" icon="fa-lock" + iconAlt="errata-legend.jsp.security" helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s3-sm-errata-details"> <c:if test="${empty errata}"> <decorator:getProperty property="meta.name" /> @@ -16,8 +16,8 @@ </rhn:toolbar> </c:if> <c:if test="${errata.bugFix}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-bug.gif" - imgAlt="errata-legend.jsp.bugfix" + <rhn:toolbar base="h1" icon="fa-bug" + iconAlt="errata-legend.jsp.bugfix" helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp"> <c:if test="${empty errata}"> <decorator:getProperty property="meta.name" /> @@ -28,8 +28,8 @@ </rhn:toolbar> </c:if> <c:if test="${errata.productEnhancement}"> - <rhn:toolbar base="h1" img="/img/rhn-icon-enhancement.gif" - imgAlt="errata-legend.jsp.enhancement" + <rhn:toolbar base="h1" icon=" spacewalk-icon-enhancement" + iconAlt="errata-legend.jsp.enhancement" helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp"> <c:if test="${empty errata}"> <decorator:getProperty property="meta.name" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf index 214db84..0f9248d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf @@ -2,16 +2,13 @@ <rhn:listdisplay button="deleteconfirm.jsp.confirm"> <rhn:column header="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rhn:column> <rhn:column header="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf index e5e83a6..5dccb7a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf @@ -12,19 +12,13 @@ <rl:column headerkey="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - alt="<bean:message key='erratalist.jsp.securityadvisory'/>" - title="<bean:message key='erratalist.jsp.securityadvisory'/>"/> + <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - alt="<bean:message key='erratalist.jsp.bugadvisory'/>" - title="<bean:message key='erratalist.jsp.bugadvisory'/>"/> + <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" - title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"/> + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> </rl:column> <rl:column headerkey="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf index a7052c1..3d82a6c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf @@ -8,16 +8,13 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: left;"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - alt="<bean:message key='erratalist.jsp.securityadvisory'/>"/> + <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - alt="<bean:message key='erratalist.jsp.bugadvisory'/>"/> + <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"/> + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> </rl:column> <rl:column headerkey="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index 57ae989..e106537 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -9,8 +9,7 @@ <div class="toolbar"> <span class="toolbar"> <a href="/network/systems/ssm/work_with_group.pxt?sgid=${systemgroup.id}&pxt_trap=rhn:work_with_group_cb"> - <img src="/img/work_with_group.gif" alt="<bean:message key='toolbar.work.with.group'/>" - title="<bean:message key='toolbar.work.with.group'/>" /> + <i class="fa spacewalk-icon-system-groups" title="<bean:message key='toolbar.work.with.group'/>"></i> <bean:message key="toolbar.work.with.group"/> </a> <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> @@ -21,7 +20,7 @@ </span> </div> - <img src="/img/rhn-icon-system_group.gif" alt="system groups" /> + <i class="fa spacewalk-icon-system-groups" title="system groups"></i> <c:if test="${empty systemgroup}"> <decorator:getProperty property="meta.name" /> @@ -30,7 +29,7 @@ ${fn:escapeXml(systemgroup.name)} </c:if> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list" target="_new" class="help-title"> - <img src="/img/rhn-icon-help.gif" alt="<bean:message key='toolbar.jsp.helpicon.alt'/>" /> + <i class="fa fa-question-circle" title="<bean:message key='toolbar.jsp.helpicon.alt'/>"></i> </a> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf index 5a91025..0ea82a5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf @@ -17,7 +17,7 @@ </rhn:require> <h2> - <img src="/img/rhn-icon-system.gif" alt="system" /> + <i class="fa fa-desktop" title="system"></i> <bean:message key="${param.title_key}"/> </h2> <p> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index cbbadb4..3bb1823 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -50,7 +50,7 @@ function enableBondStaticIpAddress() { <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<h2><img src="/img/icon_kickstart_session-medium.gif" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> +<h2><i class="fa fa-rocket"></i><bean:message key="kickstart.schedule.heading4.jsp" /></h2> <c:set var="form" value="${kickstartScheduleWizardForm.map}"/> <html:form method="POST" action="${actionUrl}"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf index a2c8cb2..4b09c3f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf @@ -18,10 +18,10 @@ <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortable="true" sortattr="cobbler"> <c:choose> <c:when test="${current.cobbler}"> - <img src="/img/rhn-listicon-error.gif"> + <i class="fa fa-times-circle text-danger"></i> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-checked.gif"> + <i class="fa fa-check text-success"></i> </c:otherwise> </c:choose> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf index c58a942..7cb945d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf @@ -15,8 +15,7 @@ function clearChecked(radioGroup) { <c:if test="${not empty proxies}"> <h2> - <img src="/img/rhn-icon-proxy.gif" - alt="<bean:message key='system.common.proxyAlt' />" /> + <i class="fa spacewalk-icon-proxy" title="<bean:message key='system.common.proxyAlt' />"></i> <bean:message key="kickstart.schedule.heading.proxy.jsp"/> </h2> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf index f6e7ed7..8515370 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf @@ -3,8 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <h2> - <img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key='system.common.scheduleAlt' />" /> + <i class="fa spacewalk-icon-schedule" title="<bean:message key='system.common.scheduleAlt' />"></i> <bean:message key="kickstart.schedule.heading3.jsp" /> </h2> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf index 0729494..416b329 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf @@ -1,7 +1,7 @@ <rhn:toolbar base="h1" icon="spacewalk-icon-packages" imgAlt="package.jsp.alt"> - <c:out value="${package_name}" escapeXml="true"/><a href="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" target="_new" class="help-title"><img src="/img/rhn-icon-help.gif" alt="Help Icon" /></a> + <c:out value="${package_name}" escapeXml="true"/><a href="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp" target="_new" class="help-title"><i class="fa fa-question-circle" title="Help Icon"></i></a> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf index 4c94a47..b628c70 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column-new.jspf @@ -5,23 +5,18 @@ headerkey="probedetails.jsp.state" headerclass="thin-column"> <c:if test="${current.stateString == 'UNKNOWN'}"> - <img src="/img/rhn-mon-unknown.gif" title="<bean:message key='monitoring.status.unknown'/>" - alt="<bean:message key='monitoring.status.unknown'/>"/> + <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='monitoring.status.unknown'/>"></i> </c:if> <c:if test="${current.stateString == 'OK'}"> - <img src="/img/rhn-mon-ok.gif" title="<bean:message key='monitoring.status.ok'/>" - alt="<bean:message key='monitoring.status.ok'/>"/> + <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='monitoring.status.ok'/>"></i> </c:if> <c:if test="${current.stateString == 'WARNING'}"> - <img src="/img/rhn-mon-warning.gif" title="<bean:message key='monitoring.status.warn'/>" - alt="<bean:message key='monitoring.status.warn'/>"/> + <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='monitoring.status.warn'/>"></i> </c:if> <c:if test="${current.stateString == 'PENDING'}"> - <img src="/img/rhn-mon-pending.gif" title="<bean:message key='monitoring.status.pending'/>" - alt="<bean:message key='monitoring.status.pending'/>"/> + <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='monitoring.status.pending'/>"></i> </c:if> <c:if test="${current.stateString == 'CRITICAL'}"> - <img src="/img/rhn-mon-down.gif" title="<bean:message key='monitoring.status.critical'/>" - alt="<bean:message key='monitoring.status.critical'/>"/> + <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='monitoring.status.critical'/>"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf index f5685fd..a0733be 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf @@ -1,22 +1,17 @@ <rhn:column header="probedetails.jsp.state"> <c:if test="${current.stateString == 'UNKNOWN'}"> - <img src="/img/rhn-mon-unknown.gif" title="<bean:message key='monitoring.status.unknown'/>" - alt="<bean:message key='monitoring.status.unknown'/>"/> + <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='monitoring.status.unknown'/>"></i> </c:if> <c:if test="${current.stateString == 'OK'}"> - <img src="/img/rhn-mon-ok.gif" title="<bean:message key='monitoring.status.ok'/>" - alt="<bean:message key='monitoring.status.ok'/>"/> + <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='monitoring.status.ok'/>"></i> </c:if> <c:if test="${current.stateString == 'WARNING'}"> - <img src="/img/rhn-mon-warning.gif" title="<bean:message key='monitoring.status.warn'/>" - alt="<bean:message key='monitoring.status.warn'/>"/> + <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='monitoring.status.warn'/>"></i> </c:if> <c:if test="${current.stateString == 'PENDING'}"> - <img src="/img/rhn-mon-pending.gif" title="<bean:message key='monitoring.status.pending'/>" - alt="<bean:message key='monitoring.status.pending'/>"/> + <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='monitoring.status.pending'/>"></i> </c:if> <c:if test="${current.stateString == 'CRITICAL'}"> - <img src="/img/rhn-mon-down.gif" title="<bean:message key='monitoring.status.critical'/>" - alt="<bean:message key='monitoring.status.critical'/>"/> + <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='monitoring.status.critical'/>"></i> </c:if> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf index 874bf8f..bc9b6fc 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/scheduledactions/action-header.jspf @@ -1,5 +1,5 @@ -<rhn:toolbar base="h1" img="/img/rhn-icon-schedule_computer.gif" - imgAlt="action.common.scheduleAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-schedule-computer" + iconAlt="action.common.scheduleAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-actions.jsp"> ${requestScope.actionname} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf index a1d7e05..bd73bd0 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf @@ -32,19 +32,13 @@ <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> - <img src="/img/icon_crit_update.gif" border="0" - alt="<bean:message key='grouplist.jsp.security'/>" - title="<bean:message key='grouplist.jsp.security'/>" /> + <i class="fa fa-exclamation-circle text-danger" title="<bean:message key='grouplist.jsp.security'/>"></i> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> - <img src="/img/icon_reg_update.gif" border="0" - alt="<bean:message key='grouplist.jsp.updates'/>" - title="<bean:message key='grouplist.jsp.updates'/>" /> + <i class="fa fa-warning text-warning" title="<bean:message key='grouplist.jsp.updates'/>"></i> </c:when> <c:otherwise> - <img src="/img/icon_up2date.gif" border="0" - alt="<bean:message key='grouplist.jsp.noerrata'/>" - title="<bean:message key='grouplist.jsp.noerrata'/>" /> + <i class="fa fa-check-square-o text-primary" title="<bean:message key='grouplist.jsp.noerrata'/>"></i> </c:otherwise> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf index 6734272..d353a79 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf @@ -10,29 +10,19 @@ <c:out value="<a href=\"/network/systems/groups/probe_list.pxt?sgid=${current.id}\">" escapeXml="false" /> <c:if test="${current.monitoringStatus == 'CRITICAL'}"> - <img src="/img/rhn-mon-down.gif" - alt="<bean:message key='systemlist.jsp.probecritical'/>" - title="<bean:message key='systemlist.jsp.probecritical'/>" /> + <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='systemlist.jsp.probecritical'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'WARNING'}"> - <img src="/img/rhn-mon-warning.gif" - alt="<bean:message key='systemlist.jsp.probewarning'/>" - title="<bean:message key='systemlist.jsp.probewarning'/>" /> + <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='systemlist.jsp.probewarning'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'UNKNOWN'}"> - <img src="/img/rhn-mon-unknown.gif" - alt="<bean:message key='systemlist.jsp.probeunknown'/>" - title="<bean:message key='systemlist.jsp.probeunknown'/>" /> + <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'PENDING'}"> - <img src="/img/rhn-mon-pending.gif" - alt="<bean:message key='systemlist.jsp.probepending'/>" - title="<bean:message key='systemlist.jsp.probepending'/>" /> + <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='systemlist.jsp.probepending'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'OK'}"> - <img src="/img/rhn-mon-ok.gif" - alt="<bean:message key='systemlist.jsp.probeok'/>" - title="<bean:message key='systemlist.jsp.probeok'/>" /> + <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='systemlist.jsp.probeok'/>"></i> </c:if> <c:out value="</a>" escapeXml="false"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf index 78eada0..0ea08b1 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf @@ -13,29 +13,19 @@ <c:out value="<a href=\"/rhn/systems/details/probes/ProbesList.do?sid=${current.id}\">" escapeXml="false"/> <c:if test="${current.monitoringStatus == 'CRITICAL'}"> - <img src="/img/rhn-mon-down.gif" - alt="<bean:message key='systemlist.jsp.probecritical'/>" - title="<bean:message key='systemlist.jsp.probecritical'/>" /> + <i class="fa spacewalk-icon-monitoring-down" title="<bean:message key='systemlist.jsp.probecritical'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'WARNING'}"> - <img src="/img/rhn-mon-warning.gif" - alt="<bean:message key='systemlist.jsp.probewarning'/>" - title="<bean:message key='systemlist.jsp.probewarning'/>" /> + <i class="fa spacewalk-icon-monitoring-warning" title="<bean:message key='systemlist.jsp.probewarning'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'UNKNOWN'}"> - <img src="/img/rhn-mon-unknown.gif" - alt="<bean:message key='systemlist.jsp.probeunknown'/>" - title="<bean:message key='systemlist.jsp.probeunknown'/>" /> + <i class="fa spacewalk-icon-monitoring-unknown" title="<bean:message key='systemlist.jsp.probeunknown'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'PENDING'}"> - <img src="/img/rhn-mon-pending.gif" - alt="<bean:message key='systemlist.jsp.probepending'/>" - title="<bean:message key='systemlist.jsp.probepending'/>" /> + <i class="fa spacewalk-icon-monitoring-pending" title="<bean:message key='systemlist.jsp.probepending'/>"></i> </c:if> <c:if test="${current.monitoringStatus == 'OK'}"> - <img src="/img/rhn-mon-ok.gif" - alt="<bean:message key='systemlist.jsp.probeok'/>" - title="<bean:message key='systemlist.jsp.probeok'/>" /> + <i class="fa spacewalk-icon-monitoring-ok" title="<bean:message key='systemlist.jsp.probeok'/>"></i> </c:if> <c:out value="</a>" escapeXml="false"/> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf index 7b25993..ba1d606 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf @@ -1,13 +1,13 @@ <c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" /> <c:choose> <c:when test="${current.virtualGuest && empty nosystemicons}"> - <img src="/img/rhn-listicon-virtguest.gif" alt="<bean:message key='systemlist.jsp.virtguest'/>" /> + <i class="fa spacewalk-icon-virtual-guest" title="<bean:message key='systemlist.jsp.virtguest'/>"></i> </c:when> <c:when test="${current.virtualHost && empty nosystemicons}"> - <img src="/img/rhn-listicon-virthost.gif" alt="<bean:message key='systemlist.jsp.virthost'/>" /> + <i class="fa spacewalk-icon-virtual-host" title="<bean:message key='systemlist.jsp.virthost'/>"></i> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-system.gif" alt="<bean:message key='systemlist.jsp.nonvirt'/>" /> + <i class="fa fa-desktop" title="<bean:message key='systemlist.jsp.nonvirt'/>"></i> </c:otherwise> </c:choose> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp index 1450b64..4451d25 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp @@ -14,7 +14,7 @@ description="yourrhn.jsp.relevanterrata.description"> <rhn:column header="yourrhn.jsp.securityerrata"> - <img src="/img/wrh-security.gif" alt="<bean:message key='errata-legend.jsp.security'/>"/> + <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i> <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp index a5fcc52..78e0eb7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp @@ -17,7 +17,7 @@ reflinkkey="yourrhn.jsp.allcriticalprobes" reflinkkeyarg0="${requestScope.criticalReflinkkeyarg0}"> <rl:column headerkey="yourrhn.jsp.criticalprobes"> - <img src="/img/rhn-mon-down.gif"/> + <i class="fa spacewalk-icon-monitoring-down"></i> <c:out value="${current.description}"/> </rl:column> <rl:column headerkey="yourrhn.jsp.systems"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp index b66edb3..0d3829a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp @@ -17,7 +17,7 @@ reflinkkey="yourrhn.jsp.allwarningprobes" reflinkkeyarg0="${requestScope.warningReflinkkeyarg0}"> <rl:column headerkey="yourrhn.jsp.warningprobes"> - <img src="/img/rhn-mon-warning.gif"/> + <i class="fa spacewalk-icon-monitoring-warning"></i> <c:out value="${current.description}"/> </rl:column> <rl:column headerkey="yourrhn.jsp.systems"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index f79c566..6b34395 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -32,17 +32,17 @@ <rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata" headerclass="row-2 text-align: center;"> - <img src="/img/wrh-security.gif" alt="<bean:message key='errata-legend.jsp.security'/>" />${current.securityErrata} + <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>${current.securityErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata" headerclass="row-2 text-align: center;"> - <img src="/img/wrh-bug.gif" alt="<bean:message key='errata-legend.jsp.bugfix'/>" />${current.bugErrata} + <i class="fa fa-bug" title="<bean:message key='errata-legend.jsp.bugfix'/>"></i>${current.bugErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata" headerclass="row-2 text-align: center;"> - <img src="/img/rhn-icon-enhancement.gif" alt="<bean:message key='errata-legend.jsp.enhancement'/>" />${current.enhancementErrata} + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='errata-legend.jsp.enhancement'/>"></i>${current.enhancementErrata} </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp index d5eaff3..15a99bd 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp @@ -55,7 +55,7 @@ > <c:choose> <c:when test="${current.creatorName != null}"> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>" /> + <i class="fa fa-user" title="<bean:message key='yourrhn.jsp.user.alt'/>"></i> <c:out value="${current.creatorName}"/> </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp index e0ff440..911beba 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp @@ -17,13 +17,13 @@ <rhn:column header="schedulesync.jsp.action"> <c:choose> <c:when test="${current.actionStatusId == 0 || current.actionStatusId == 1}"> - <img src="/img/rhn-listicon-pending.gif" title="<bean:message key='yourrhn.jsp.actions.pending'/>" alt="<bean:message key='yourrhn.jsp.actions.pending'/>" /> + <i class="fa fa-clock-o" title="<bean:message key='yourrhn.jsp.actions.pending'/>"></i> </c:when> <c:when test="${current.actionStatusId == 2}"> - <img src="/img/rhn-listicon-ok.gif" title="<bean:message key='yourrhn.jsp.actions.completed'/>" alt="<bean:message key='yourrhn.jsp.actions.completed'/>" /> + <i class="fa fa-check text-success" title="<bean:message key='yourrhn.jsp.actions.completed'/>"></i> </c:when> <c:when test="${current.actionStatusId == 3}"> - <img src="/img/rhn-listicon-error.gif" title="<bean:message key='yourrhn.jsp.actions.failed'/>" alt="<bean:message key='yourrhn.jsp.actions.failed'/>" /> + <i class="fa fa-times-circle text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i> </c:when> <c:otherwise> <i class="spacewalk-icon-unknown-system" title="<bean:message key='yourrhn.jsp.actions.unknown'/>"></i> @@ -36,7 +36,7 @@ style="text-align: center;"> <c:choose> <c:when test="${current.userName != ''}"> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>" /> + <i class="fa fa-user" title="<bean:message key='yourrhn.jsp.user.alt'/>"></i> ${current.userName} </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp index 6a7a33a..500230c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp @@ -8,8 +8,8 @@ <html> <body> - <rhn:toolbar base="h1" img="/img/rhn-config_central.gif" - imgAlt="config.common.globalAlt" + <rhn:toolbar base="h1" icon="spacewalk-icon-channels-config" + iconAlt="config.common.globalAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-channels"> <bean:message key="channelOverview.jsp.newToolbar" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp index 518b47d..be1ac0f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp @@ -33,8 +33,7 @@ sortable="true" sortattr="name"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${current.name} </a> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index 2afc6a7..9fb1308 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -61,7 +61,7 @@ styleclass="list" emptykey="deployconfirm.jsp.noSystems" width="100%" filter="com.redhat.rhn.frontend.action.configuration.ConfigSystemFilter" > <rl:column headerkey="system.common.systemName" sortable="true" sortattr="name"> - <img alt='<bean:message key="system.common.systemAlt"/>' src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="system.common.systemAlt"/>"></i> <a href="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}"> ${fn:escapeXml(current.name)} </a> @@ -82,8 +82,7 @@ <th><bean:message key="deployconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" - title="<bean:message key='syncprofile.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp index a3a31ea..250fea1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -30,8 +30,7 @@ <rhn:column header="system.common.systemName"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> <c:out value="${current.name}" /> </a> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp index e0c23d9..51f6f30 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp @@ -26,17 +26,17 @@ <rhn:column header="comparechannel.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> <c:if test="${current.type == 'normal'}"> - <img alt='<bean:message key="config.common.globalAlt" />' src="/img/rhn-listicon-channel.gif" /> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.name} </c:if> <c:if test="${current.type == 'local_override'}"> - <img alt='<bean:message key="config.common.localAlt" />' src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> ${current.name} </c:if> <c:if test="${current.type == 'server_import'}"> - <img alt='<bean:message key="config.common.sandboxAlt" />' src="/img/rhn-listicon-sandbox.png" /> + <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> ${current.name} </c:if> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp index 15205d2..4a2c974 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp @@ -36,16 +36,13 @@ url="/rhn/configuration/file/FileDetails.do?cfid=${current.configFileId}&crid=${current.configRevisionId}"> <c:choose> <c:when test="${current.configFileType == 'file'}"> - <img alt='<bean:message key="config.common.fileAlt" />' - src="/img/rhn-listicon-cfg_file.gif" /> + <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i> </c:when> <c:when test="${current.configFileType == 'directory'}"> - <img alt='<bean:message key="config.common.dirAlt" />' - src="/img/rhn-listicon-cfg_folder.gif" /> + <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.symlinkAlt" />' - src="/img/rhn-listicon-cfg_symlink.gif" /> + <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i> </c:otherwise> </c:choose> <bean:message key="comparecopy.jsp.revnum" arg0="${current.configRevision}" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp index 9458231..1fa2d73 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp @@ -29,7 +29,7 @@ <rhn:column header="configsystemfilter.name" url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do?sid=${current.id}"> - <img alt='<bean:message key="config.common.localAlt" />' src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> ${fn:escapeXml(current.name)} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp index 47abfe4..00672a9 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp @@ -28,7 +28,7 @@ <rhn:column header="copysandbox.jsp.channel" url="/rhn/systems/details/configuration/ViewModifySandboxPaths.do?sid=${current.id}"> - <img alt='<bean:message key="config.common.sandboxAlt" />' src="/img/rhn-listicon-sandbox.png" /> + <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> ${fn:escapeXml(current.name)} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp index 9d2bc6b..36f2499 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -45,9 +45,7 @@ <th><bean:message key="deploy.jsp.usedate" /></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" - alt='<bean:message key="deploy.jsp.selection"/>' - title='<bean:message key="deploy.jsp.selection"/>' /></th> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key="deploy.jsp.selection"/>"></i></th> <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp" flush=""> <jsp:param name="widget" value="date" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp index acab346..0272e62 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp @@ -27,8 +27,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> <c:out value="${current.name}" /> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index 914e4fd..291e18c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -118,8 +118,7 @@ <rhn:column header="configoverview.jsp.scheduledBy" url="/rhn/users/UserDetails.do?uid=${current.scheduledById}" renderUrl="${requestScope.is_admin}"> - <img alt='<bean:message key="user.common.userAlt" />' - src="/img/rhn-listicon-user.gif" /> + <i class="fa fa-user" title="<bean:message key="user.common.userAlt" />"></i> ${fn:escapeXml(current.scheduledByName)} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp index 48be617..77cad50 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp @@ -30,7 +30,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="sdc.configlist.jsp.name" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <img alt='<bean:message key="config.common.globalAlt" />' src="/img/rhn-listicon-channel.gif" /> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp index 0925778..535c858 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -41,18 +41,15 @@ <i><bean:message key="sdcimportconfirm.jsp.new" /></i> </c:when> <c:when test="${current.configChannelType == 'normal'}"> - <img alt='<bean:message key="config.common.globalAlt" />' - src="/img/rhn-listicon-channel.gif"> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.channelNameDisplay} </c:when> <c:when test="${current.configChannelType == 'local_override'}"> - <img alt='<bean:message key="config.common.localAlt" />' - src="/img/rhn-listicon-system.gif"> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> ${current.channelNameDisplay} </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.sandboxAlt" />' - src="/img/rhn-listicon-sandbox.png"> + <i class="fa spacewalk-icon-sandbox" title="<bean:message key="config.common.sandboxAlt" />"></i> ${current.channelNameDisplay} </c:otherwise> </c:choose> @@ -73,8 +70,7 @@ <th><bean:message key="sdcimportconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" - title="<bean:message key='syncprofile.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp index 4b745e3..fb9f05d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp @@ -33,7 +33,7 @@ <rhn:set value="${current.id}"/> <rhn:column header="sdc.config.subscriptions.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <img alt='<bean:message key="config.common.globalAlt" />' src="/img/rhn-listicon-channel.gif"> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp index 5e3977b..3a7679c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp @@ -9,7 +9,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="ssmchannelsystems.jsp.header" /> </h2> @@ -33,8 +33,7 @@ <rhn:listdisplay filterBy="ssmchannelsystems.jsp.system"> <rhn:column header="ssmchannelsystems.jsp.system" url="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp index 8d270b5..e08a440 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="ssmdeploy.jsp.header" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp index bf49932..83740b5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="deployconfirm.jsp.header" /> </h2> @@ -41,8 +41,7 @@ <th><bean:message key="deployconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" - title="<bean:message key='syncprofile.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp index b414f7b..0e89eec 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="ssmdiff.jsp.header" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp index 126e249..6569cc7 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="diffconfirm.jsp.header" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp index 8dc64a1..f8b1f73 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="difffiles.jsp.header" /> </h2> @@ -32,18 +32,15 @@ <rhn:column header="difffiles.jsp.filename"> <c:choose> <c:when test="${current.configFileType == 'file'}"> - <img alt='<bean:message key="config.common.fileAlt" />' - src="/img/rhn-listicon-cfg_file.gif" /> + <i class="fa fa-file-text-o" title="<bean:message key="config.common.fileAlt" />"></i> <c:out value="${current.path}" /> </c:when> <c:when test="${current.configFileType == 'directory'}"> - <img alt='<bean:message key="config.common.dirAlt" />' - src="/img/rhn-listicon-cfg_folder.gif" /> + <i class="fa fa-folder-open-o" title="<bean:message key="config.common.dirAlt" />"></i> <c:out value="${current.path}" /> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.symlinkAlt" />' - src="/img/rhn-listicon-cfg_symlink.gif" /> + <i class="fa spacewalk-icon-listicon-cfg-symlink" title="<bean:message key="config.common.symlinkAlt" />"></i> </c:otherwise> </c:choose> </rhn:column> @@ -56,14 +53,12 @@ <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> <c:if test="${current.configChannelType == 'normal'}"> - <img alt='<bean:message key="config.common.globalAlt" />' - src="/img/rhn-listicon-channel.gif" /> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.channelNameDisplay} </c:if> <c:if test="${current.configChannelType == 'local_override'}"> - <img alt='<bean:message key="config.common.localAlt" />' - src="/img/rhn-listicon-system.gif" /> + <i class="fa fa-desktop" title="<bean:message key="config.common.localAlt" />"></i> ${current.channelNameDisplay} </c:if> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp index 3284a16..e549fb3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp @@ -9,14 +9,13 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="diffsystems.jsp.header" /> </h2> <div class="page-summary"> <c:set var="beanarg" scope="request"> - <img src="/img/rhn-listicon-cfg_file.gif" - alt="<bean:message key='config.common.fileAlt' />" /> + <i class="fa fa-file-text-o" title="<bean:message key='config.common.fileAlt' />"></i> ${fn:escapeXml(requestScope.filepath)} </c:set> <p> @@ -32,8 +31,7 @@ <rhn:listdisplay filterBy="system.common.systemName"> <rhn:column header="system.common.systemName" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${fn:escapeXml(current.name)} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp index 6129132..8f4eb75 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp @@ -9,7 +9,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="ssmenable.jsp.header"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp index 9fbc03b..6c195e1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp @@ -9,7 +9,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_files.gif" alt='<bean:message key="ssmdiff.jsp.imgAlt" />' /> + <i class="fa spacewalk-icon-manage-configuration-files" title="<bean:message key="ssmdiff.jsp.imgAlt" />"></i> <bean:message key="summary.jsp.toolbar"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 90a7ded..f5304c9 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -12,7 +12,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_channels.gif" alt='<bean:message key="config.common.channelsAlt" />' /> + <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i> <bean:message key="ssm.config.rank.jsp.header" /> </h2> <h3><bean:message key="ssm.config.rank.jsp.step"/></h3> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp index 8f3114a..a4d288b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp @@ -9,7 +9,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_channels.gif" alt='<bean:message key="config.common.channelsAlt" />' /> + <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i> <bean:message key="ssm.config.subscribe.jsp.header"/> </h2> <h3><bean:message key="ssm.config.subscribe.jsp.step"/></h3> @@ -32,7 +32,7 @@ <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <img alt="<bean:message key='config.common.globalAlt' />" src="/img/rhn-listicon-channel.gif" /> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key='config.common.globalAlt' />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp index e33d888..e0faae5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp @@ -11,7 +11,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_channels.gif" alt='<bean:message key="config.common.channelsAlt" />' /> + <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i> <bean:message key="ssm.config.subscribeconfirm.jsp.header"/> </h2> <h3><bean:message key="ssm.config.subscribeconfirm.jsp.step"/></h3> @@ -47,8 +47,7 @@ headerkey="system.common.systemName" attr="name"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${current.name} </a> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp index 5ab98da..e3560b5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_channels.gif" alt='<bean:message key="config.common.channelsAlt" />' /> + <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i> <bean:message key="ssmsystemchannels.jsp.header" /> </h2> @@ -16,8 +16,7 @@ <p> <c:set var="beanarg" scope="request"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${system.id}" - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${system.name} </a> </c:set> @@ -35,7 +34,7 @@ <rhn:listdisplay filterBy="config.common.configChannel"> <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <img alt='<bean:message key="config.common.globalAlt" />' src="/img/rhn-listicon-channel.gif"> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp index 5f2c3be..afc17fe 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp @@ -9,7 +9,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_channels.gif" alt='<bean:message key="config.common.channelsAlt" />' /> + <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i> <bean:message key="unsubscribe.jsp.header"/> </h2> @@ -29,7 +29,7 @@ <rhn:column header="config.common.configChannel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <img alt='<bean:message key="config.common.globalAlt" />' src="/img/rhn-listicon-channel.gif"> + <i class="fa spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp index 7be7205..fdc80f6 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp @@ -9,7 +9,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/rhn-config_channels.gif" alt='<bean:message key="config.common.channelsAlt" />' /> + <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i> <bean:message key="unsubscribeconfirm.jsp.header"/> </h2> @@ -33,8 +33,7 @@ button="unsubscribeconfirm.jsp.confirm"> <rhn:column header="unsubscribeconfirm.jsp.system" url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp index 0315913..ff70981 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp"> <bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp index 4c9b080..86f84d7 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp"> <bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp index 6bd17b2..412a91f 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp"> <bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index f26d948..be260e5 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/errata/errata-header.jspf" %> <h2> - <img src="/img/rhn-icon-system.gif" alt="<bean:message key='system.common.systemAlt' />" /> + <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> <bean:message key="affectedsystems.jsp.header"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp b/java/code/webapp/WEB-INF/pages/errata/all.jsp index 7db2cf8..912d2db 100644 --- a/java/code/webapp/WEB-INF/pages/errata/all.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-all-errata"> <bean:message key="erratalist.jsp.allerrata"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp index 36a1486..348b7d4 100644 --- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp @@ -6,7 +6,7 @@ <html:html > <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Cloning_Errata.jsp"> <bean:message key="cloneerrata.jsp.erratamanagement"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp b/java/code/webapp/WEB-INF/pages/errata/create.jsp index 2dd440c..5280ffa 100644 --- a/java/code/webapp/WEB-INF/pages/errata/create.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/create.jsp @@ -8,7 +8,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" + <rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Creating_and_Editing_Errata.jsp"> <bean:message key="erratalist.jsp.erratamgmt"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp index 257d71a..3d26805 100644 --- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Creating_and_Editing_Errata.jsp"> <bean:message key="errata.edit.toolbar"/> <c:out value="${errata.advisory}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp b/java/code/webapp/WEB-INF/pages/errata/edit.jsp index b1a26c9..5120acc 100644 --- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" + <rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp" deletionUrl="/rhn/errata/manage/Delete.do?eid=${param.eid}" deletionType="errata"> diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp index 7d7b825..c96c8bf 100644 --- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"> <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 1aaafc7..85629db 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -76,22 +76,19 @@ <td> <div class="checkbox"> <html:checkbox property="errata_type_bug"> - <img src="/img/wrh-bug.gif" - title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug"></i> <bean:message key="erratalist.jsp.bugadvisory"/> </html:checkbox> </div> <div class="checkbox"> <html:checkbox property="errata_type_security"> - <img src="/img/wrh-security.gif" - title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock"></i> <bean:message key="erratalist.jsp.securityadvisory"/> </html:checkbox> </div> <div class="checkbox"> <html:checkbox property="errata_type_enhancement"> - <img src="/img/wrh-product.gif" - title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement"></i> <bean:message key="erratalist.jsp.productenhancementadvisory"/> </html:checkbox> </div> @@ -170,16 +167,13 @@ <rl:column bound="false" sortable="true" sortattr="securityAdvisory" headerkey="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/webapp/WEB-INF/pages/errata/notify.jsp index 163db82..f60f03c 100644 --- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp" deletionUrl="/rhn/errata/Delete.do?eid=${param.eid}" deletionType="errata"> diff --git a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp index 93d558b..e45d7d2 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp"> <bean:message key="errata.publish.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp index d79a801..8141bfe 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp @@ -21,7 +21,7 @@ </script> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"> <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp index 81f3540..6b4caf5 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"> <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> @@ -18,7 +18,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><img src="/img/rhn-icon-packages.gif"> + <h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="errata.edit.packages.confirm.confirmpackageaddition"/></h2> <p><bean:message key="errata.edit.packages.confirm.instructions"/></p> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp index fbc0aa7..a97e5a3 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"> <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> @@ -17,7 +17,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><img src="/img/rhn-icon-packages.gif" alt="<bean:message key='errata.common.packageAlt' />" /> + <h2><i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> <bean:message key="errata.edit.packages.list.erratapackages"/></h2> <p><bean:message key="errata.edit.packages.list.instructions"/></p> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp index d0da53d..6484f9c 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"> <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> @@ -18,8 +18,7 @@ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> <h2> - <img src="/img/rhn-icon-packages.gif" - alt="<bean:message key='errata.common.packageAlt' />" /> + <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> <bean:message key="errata.edit.packages.erratapackages"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp index e2da3a7..3097ecd 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Managed_Errata_Details.jsp"> <bean:message key="errata.edit.toolbar"/> <c:out value="${advisory}" /> </rhn:toolbar> @@ -17,7 +17,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/manage_errata.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><img src="/img/rhn-icon-packages.gif"> + <h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="errata.edit.packages.confirm.confirmpackageremoval"/></h2> <p><bean:message key="errata.edit.packages.confirm.remove.instructions"/></p> diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/code/webapp/WEB-INF/pages/errata/published.jsp index af67a54..8b44c61 100644 --- a/java/code/webapp/WEB-INF/pages/errata/published.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp#channel-mgmt-Manage_Errata-Published_Errata" creationUrl="/rhn/errata/manage/Create.do" creationType="erratum"> diff --git a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp index 0f7872c..8216f91 100644 --- a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp @@ -10,7 +10,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-applicable-errata"> <bean:message key="erratalist.jsp.relevanterrata"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp index 3498598..5b1256c 100644 --- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp @@ -9,7 +9,7 @@ <meta name="page-decorator" content="none" /> </head> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.common.errataAlt" +<rhn:toolbar base="h1" icon="spacewalk-icon-patches" iconAlt="errata.common.errataAlt" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management.jsp#channel-mgmt-Manage_Errata-Unpublished_Errata" creationUrl="/rhn/errata/manage/Create.do" creationType="erratum"> diff --git a/java/code/webapp/WEB-INF/pages/groups/create.jsp b/java/code/webapp/WEB-INF/pages/groups/create.jsp index a33a736..7cac37d 100644 --- a/java/code/webapp/WEB-INF/pages/groups/create.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/create.jsp @@ -6,10 +6,10 @@ <html> <body> <h1> - <img src="/img/rhn-icon-system_group.gif" alt="system group" /> + <i class="fa spacewalk-icon-system-groups" title="system group"></i> <bean:message key="systemgroup.create.header"/> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-group-creation" target="_new" class="help-title"> - <img src="/img/rhn-icon-help.gif" alt="Help Icon" /> + <i class="fa fa-question-circle" title="Help Icon"></i> </a> </h1> <p><bean:message key="systemgroup.create.summary"/></p> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp index 25b2a3f..aa6d9ce 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp @@ -24,8 +24,7 @@ <c:choose> <c:when test="${invalid_channel}"> <tr><td> - <img src="/img/rhn-listicon-alert.gif" - alt="<bean:message key='error.common.errorAlt' />" /> + <i class="fa fa-warning text-warning" title="<bean:message key='error.common.errorAlt' />"></i> <bean:message key="kickstartdownload.jsp.invalidchannel"/> </td></tr> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 0f19a85..d62e141 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -51,12 +51,10 @@ </rl:column> <rl:column bound="false" headerkey="kickstart.jsp.active" sortattr="active"> <c:if test="${current.active}"> - <img src="/img/rhn-listicon-ok.gif" alt="<bean:message key='kickstart.jsp.active'/>" - title="<bean:message key='kickstart.jsp.active'/>"/> + <i class="fa fa-check text-success" title="<bean:message key='kickstart.jsp.active'/>"></i> </c:if> <c:if test="${not current.active}"> - <img src="/img/rhn-listicon-error.gif" alt="<bean:message key='kickstart.jsp.inactive'/>" - title="<bean:message key='kickstart.jsp.inactive'/>"/> + <i class="fa fa-times-circle text-danger" title="<bean:message key='kickstart.jsp.inactive'/>"></i> </c:if> </rl:column> <rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel"> @@ -65,10 +63,10 @@ <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler"> <c:choose> <c:when test="${current.cobbler}"> - <img src="/img/rhn-listicon-error.gif"> + <i class="fa fa-times-circle text-danger"></i> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-checked.gif"> + <i class="fa fa-check text-success"></i> </c:otherwise> </c:choose> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index d930aab..bb788f2 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -10,8 +10,8 @@ <rhn:toolbar base="h1" miscIcon="fa-plus" miscText="kickstart.kickstartable_distro_create_new.jsp" miscUrl="TreeCreate.do" - img="/img/rhn-kickstart_profile.gif" - imgAlt="kickstarts.alt.img"> + icon="fa-rocket" + iconAlt="kickstarts.alt.img"> <bean:message key="kickstart.kickstartable_distributions.jsp" /> </rhn:toolbar> @@ -40,10 +40,10 @@ <rl:column headertext="${rhn:localize('kickstart.distro.is-valid.jsp')}?*" sortattr="valid"> <c:choose> <c:when test="${current.valid}"> - <img src="/img/rhn-listicon-checked.gif"> + <i class="fa fa-check text-success"></i> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-error.gif"> + <i class="fa fa-times-circle text-danger"></i> </c:otherwise> </c:choose> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 1e93ef8..155b454 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -10,8 +10,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2> - <img src="/img/icon_kickstart_session-medium.gif" - alt="<bean:message key='system.common.kickstartAlt' />" /> + <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2> @@ -54,7 +53,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> <br/> -<h2><img src="/img/icon_kickstart_session-medium.gif" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> +<h2><i class="fa fa-rocket"></i><bean:message key="kickstart.schedule.heading4.jsp" /></h2> <table class="details"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> <tr> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp index c7aca35..2b294e2 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/fifth.jsp @@ -28,8 +28,7 @@ function setContinue() { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <br /> <h2> - <img src="/img/icon_kickstart_session-medium.gif" - alt="<bean:message key='system.common.kickstartAlt' />" /> + <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index d2836be..d42aab3 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -27,8 +27,7 @@ function setStep(stepName) { <br /> <h2> - <img src="/img/icon_kickstart_session-medium.gif" - alt="<bean:message key='system.common.kickstartAlt' />" /> + <i class="fa fa-rocket" title="<bean:message key='system.common.kickstartAlt' />"></i> <bean:message key="kickstart.schedule.heading1.jsp" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp index 4b368ad..74b0b53 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp @@ -56,9 +56,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key='confirm.jsp.selection'/>" - title="<bean:message key='confirm.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp index 906411c..6ca55b4 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp @@ -65,9 +65,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key='confirm.jsp.selection'/>" - title="<bean:message key='confirm.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp index 9591a53..50b43af 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp @@ -53,19 +53,13 @@ <rl:column headerkey="ssm.package.upgrade.select.advisory" bound="false"> <c:if test="${not empty current.advisory}"> <c:if test="${current.advisoryType == 'Security Advisory'}"> - <img src="/img/wrh-security.gif" - alt="<bean:message key='erratalist.jsp.securityadvisory' />" - title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i> </c:if> <c:if test="${current.advisoryType == 'Bug Fix Advisory'}"> - <img src="/img/wrh-bug.gif" - alt="<bean:message key='erratalist.jsp.bugadvisory' />" - title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i> </c:if> <c:if test="${current.advisoryType == 'Product Enhancement Advisory'}"> - <img src="/img/wrh-product.gif" - alt="<bean:message key='erratalist.jsp.productenhancementadvisory' />" - title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i> </c:if> <a href="/rhn/errata/details/Details.do?eid=${current.advisoryId}">${current.advisory}</a><br/> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp index 31b1765..355b8d0 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp @@ -70,9 +70,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key='confirm.jsp.selection'/>" - title="<bean:message key='confirm.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp index 9a527bf..f7b7ec5 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp @@ -65,9 +65,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key='confirm.jsp.selection'/>" - title="<bean:message key='confirm.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index 7faa6a9..7e6fd25 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -24,21 +24,20 @@ </tr> <tr> - <td><img src="/img/rhn-icon-errata.gif" alt="Errata" /></td> + <td><i class="fa spacewalk-icon-patches" title="Errata"></i></td> <th><b><bean:message key="ssm.overview.errata"/></b></th> <td><bean:message key="ssm.overview.errata.schedule"/></td> </tr> <tr> - <td><img src="/img/rhn-icon-packages.gif" alt="<bean:message key='ssm.overview.packages'/>" /></td> + <td><i class="fa spacewalk-icon-packages" title="<bean:message key='ssm.overview.packages'/>"></i></td> <th><b><bean:message key="ssm.overview.packages"/></b></th> <td><bean:message key="ssm.overview.packages.upgrade"/></td> </tr> <rhn:require acl="is(enable_solaris_support)"> <tr> - <td><img src="/img/rhn-icon-patch.gif" - alt="<bean:message key='ssm.overview.patches'/>"/></td> + <td><i class="fa spacewalk-icon-patches" title="<bean:message key='ssm.overview.patches'/>"></i></td> <th><bean:message key="ssm.overview.patches"/>:</th> <td> <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> @@ -47,8 +46,7 @@ </tr> <tr> - <td><img src="/img/rhn-icon-patchset.gif" - alt="<bean:message key='ssm.overview.patch.clusters'/>"/></td> + <td><i class="fa spacewalk-icon-patch-set" title="<bean:message key='ssm.overview.patch.clusters'/>"></i></td> <th><bean:message key="ssm.overview.patch.clusters"/>:</th> <td> <bean:message key="ssm.overview.patch.clusters.install"/><br /> </td> @@ -57,14 +55,14 @@ <rhn:require acl="user_role(org_admin)"> <tr> - <td><img src="/img/rhn-icon-system_group.gif" alt="<bean:message key='ssm.overview.groups'/>" /></td> + <td><i class="fa spacewalk-icon-system-groups" title="<bean:message key='ssm.overview.groups'/>"></i></td> <th><b><bean:message key="ssm.overview.groups"/></b></th> <td><bean:message key="ssm.overview.groups.create"/></td> </tr> </rhn:require> <tr> - <td><img src="/img/rhn-icon-channels.gif" alt="<bean:message key='ssm.overview.channels'/>" /></td> + <td><i class="fa spacewalk-icon-software-channels" title="<bean:message key='ssm.overview.channels'/>"></i></td> <th><b><bean:message key="ssm.overview.channels"/></b></th> <td> <p> @@ -80,7 +78,7 @@ <rhn:require acl="org_entitlement(rhn_provisioning)"> <tr> - <td><img src="/img/rhn-kickstart_profile.gif" alt="<bean:message key='ssm.overview.provisioning'/>" /></td> + <td><i class="fa fa-rocket" title="<bean:message key='ssm.overview.provisioning'/>"></i></td> <th><b><bean:message key="ssm.overview.provisioning"/></b></th> <td> <p> @@ -93,7 +91,7 @@ </rhn:require> <tr> - <td><img src="/img/rhn-icon-form.gif" alt="<bean:message key='ssm.overview.misc'/>" /></td> + <td><i class="fa fa-suitcase" title="<bean:message key='ssm.overview.misc'/>"></i></td> <th><b><bean:message key="ssm.overview.misc"/>:</b></th> <td> <p> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp index 89d383e..ca39ac7 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/lock-unlock-system.jsp @@ -49,7 +49,7 @@ <rl:column headerkey="systemlist.jsp.system" bound="false" sortattr="name" sortable="true"> <c:choose> <c:when test="${current.locked > 0}"> - <img src="/img/icon_locked.gif"/> + <i class="fa fa-lock"></i> <a href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.name}</a> </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp index cf509b6..60938bb 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp @@ -39,13 +39,13 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp index c30064f..50b45c3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashdelete.jsp @@ -11,7 +11,7 @@ <br/> - <rhn:toolbar base="h2" img="/img/rhn-icon-bug-ex.gif" imgAlt="info.alt.img"> + <rhn:toolbar base="h2" icon="spacewalk-icon-bug-ex" iconAlt="info.alt.img"> ${fn:escapeXml(crash.crash)} </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp b/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp index 496f992..dbc1998 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashdetail.jsp @@ -12,7 +12,7 @@ <br/> - <rhn:toolbar base="h2" img="/img/rhn-icon-bug-ex.gif" imgAlt="info.alt.img" + <rhn:toolbar base="h2" icon="spacewalk-icon-bug-ex" iconAlt="info.alt.img" deletionUrl="SoftwareCrashDelete.do?crid=${crid}&sid=${sid}" deletionType="crash"> ${fn:escapeXml(crash.crash)} diff --git a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp index 396a4bd..ea6f37c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashes.jsp @@ -14,8 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-bug-ex.gif" - alt="<bean:message key='crashes.jsp.crashes' />" /> + <i class="fa spacewalk-icon-bug-ex" title="<bean:message key='crashes.jsp.crashes' />"></i> <bean:message key="crashes.jsp.crashes"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp b/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp index e823d42..7e2e4a8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashfiles.jsp @@ -12,7 +12,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <br/> - <rhn:toolbar base="h2" img="/img/rhn-icon-bug-ex.gif" imgAlt="info.alt.img" + <rhn:toolbar base="h2" icon="spacewalk-icon-bug-ex" iconAlt="info.alt.img" deletionUrl="SoftwareCrashDelete.do?crid=${crid}&sid=${sid}" deletionType="crash"> ${fn:escapeXml(crash.crash)} diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index dbee549..0bc1d94 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -30,9 +30,7 @@ </span> </div> - <img src="/img/rhn-icon-bug-ex.gif" - alt="<bean:message key='info.alt.img'/>" - title="<bean:message key='info.alt.img'/>"/> + <i class="fa spacewalk-icon-bug-ex" title="<bean:message key='info.alt.img'/>"></i> ${fn:escapeXml(crash.crash)} </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp index 30e7c51..967e738 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotedelete.jsp @@ -19,8 +19,7 @@ </a> </span> </div> - <img src="/img/rhn-icon-bug-ex.gif" - alt="<bean:message key="info.alt.img"/>" + <i class="fa spacewalk-icon-bug-ex" title="<bean:message key="></i>" title="<bean:message key="info.alt.img"/>"/> ${fn:escapeXml(crash.crash)} </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp index 69408a8..5ecf46e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp @@ -15,24 +15,18 @@ <div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/details/EditCrashNote.do?crid=${crid}&sid=${sid}"> - <img src="/img/action-add.gif" - alt="<bean:message key='toolbar.create.crashnote'/>" - title="<bean:message key='toolbar.create.crashnote'/>" /> + <i class="fa fa-plus-circle text-success" title="<bean:message key='toolbar.create.crashnote'/>"></i> <bean:message key="toolbar.create.crashnote"/> </a> | <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> - <img src="/img/action-del.gif" - alt="<bean:message key='toolbar.delete.crash'/>" - title="<bean:message key='toolbar.delete.crash'/>" /> + <i class="fa fa-minus-circle text-danger" title="<bean:message key='toolbar.delete.crash'/>"></i> <bean:message key="toolbar.delete.crash"/> </a> </span> </div> - <img src="/img/rhn-icon-bug-ex.gif" - alt="<bean:message key='info.alt.img'/>" - title="<bean:message key='info.alt.img'/>"/> + <i class="fa spacewalk-icon-bug-ex" title="<bean:message key='info.alt.img'/>"></i> ${fn:escapeXml(crash.crash)} </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp index 441a62d..7f134e0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp @@ -9,11 +9,11 @@ <div> <div class="toolbar-h1"> <div class="toolbar"></div> - <img src="/img/rhn-icon-keyring.gif" alt="" /> + <i class="fa fa-key" title=""></i> <h2><bean:message key="system.jsp.customkey.createtitle"/></h2> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_new" class="help-title"> - <img src="/img/rhn-icon-help.gif" alt="Help Icon" /> + <i class="fa fa-question-circle" title="Help Icon"></i> </a> </div> <p> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index 7b93903..6f67b37 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -12,12 +12,12 @@ <div class="toolbar-h1"> <div class="toolbar"></div> - <img src="/img/rhn-icon-keyring.gif" alt="" /> + <i class="fa fa-key" title=""></i> <bean:message key="system.jsp.customkey.deletetitle"/> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_new" class="help-title"> - <img src="/img/rhn-icon-help.gif" alt="Help Icon" /> + <i class="fa fa-question-circle" title="Help Icon"></i> </a> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp index bbee57d..caf6f58 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp @@ -17,11 +17,11 @@ <div class="toolbar-h1"><div class="toolbar"> <span class="toolbar"> <a href="/rhn/systems/customdata/CreateCustomKey.do"> - <img src="/img/action-add.gif" alt="create new key" title="add new key" /> + <i class="fa fa-plus-circle text-success" title="create new key"></i> <bean:message key="system.jsp.customkey.createlink"/> </a> </span> - </div><img src="/img/rhn-icon-keyring.gif" alt="keyring" /> + </div><i class="fa fa-key" title="keyring"></i> <bean:message key="system.jsp.customkey.title"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp index be87032..aa49270 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp @@ -13,7 +13,7 @@ <i class="fa fa-trash-o" title="delete key"></i>delete key</a> </span> </div> - <img src="/img/rhn-icon-keyring.gif" alt="" /> + <i class="fa fa-key" title=""></i> <bean:message key="system.jsp.customkey.updatetitle"/> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_new" class="help-title"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp index 2ad8557..7e86d15 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp @@ -26,7 +26,7 @@ <rl:column headerkey="system.audit.xccdfdeleteconfirm.jsp.deletable"> <c:choose> <c:when test="${current.deletable}"> - <img src="/img/rhn-listicon-checked_immutable.gif"> + <i class="fa fa-check"></i> </c:when> <c:otherwise> <img src="/img/rhn-listicon-unchecked_immutable.gif"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp index 66521ad..9e38d98 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/extra-packages-list.jsp @@ -15,7 +15,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-package_extra.gif" /> + <i class="fa spacewalk-icon-package-extra"></i> <bean:message key="packagelist.jsp.extrapackages" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp index a06adfc..251d38d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp @@ -11,7 +11,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-packages.gif" /> + <i class="fa spacewalk-icon-packages"></i> <bean:message key="${requestScope.header}" /> </h2> <rhn:systemtimemessage server="${requestScope.system}" /> @@ -53,8 +53,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='confirm.jsp.selection'/>" - title="<bean:message key='confirm.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp index 8304a9f..8aef6ac 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp @@ -12,8 +12,7 @@ <rhn:require acl="not system_feature(ftr_package_remove)"> <h2> - <img src="/img/rhn-icon-package_del.gif" - alt="<bean:message key='errata.common.deletepackageAlt' />" /> + <i class="fa spacewalk-icon-package-delete" title="<bean:message key='errata.common.deletepackageAlt' />"></i> <bean:message key="packagelist.jsp.installedpackages" /> </h2> <div class="page-summary"> @@ -24,8 +23,7 @@ </rhn:require> <rhn:require acl="system_feature(ftr_package_remove)"> <h2> - <img src="/img/rhn-icon-package_del.gif" - alt="<bean:message key='errata.common.deletepackageAlt' />" /> + <i class="fa spacewalk-icon-package-delete" title="<bean:message key='errata.common.deletepackageAlt' />"></i> <bean:message key="packagelist.jsp.removablepackages" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf index a11015f..1c1183e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf @@ -10,8 +10,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-package_add.gif" - alt="<bean:message key='${alt}'/>" /> + <i class="fa spacewalk-icon-package-add" title="<bean:message key='${alt}'/>"></i> <bean:message key="${pack_header}" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp index 7c4229f..8471a89 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp @@ -13,8 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-packages.gif" - alt="<bean:message key='errata.common.packageAlt' />" /> + <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> <bean:message key="packagesindex.jsp.header"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp index a98ec07..ffb9ff2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp @@ -11,7 +11,7 @@ <rhn:require acl="is_solaris()"> <h2> - <img src="/img/rhn-icon-package_del.gif" /> + <i class="fa spacewalk-icon-package-delete"></i> <bean:message key="packagelist.jsp.confirmpatch" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp index d9bcd7f..5d2195d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp @@ -11,7 +11,7 @@ <rhn:require acl="is_solaris()"> <h2> - <img src="/img/rhn-icon-package_add.gif" /> + <i class="fa spacewalk-icon-package-add"></i> <bean:message key="packagelist.jsp.installablepatches" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp index 4e4ddfb..c287034 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp @@ -11,7 +11,7 @@ <rhn:require acl="is_solaris()"> <h2> - <img src="/img/rhn-icon-package_add.gif" /> + <i class="fa spacewalk-icon-package-add"></i> <bean:message key="packagelist.jsp.confirmpatchinstall" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp index 282172d..6a1eabf 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp @@ -11,7 +11,7 @@ <rhn:require acl="is_solaris()"> <h2> - <img src="/img/rhn-icon-package_del.gif" /> + <i class="fa spacewalk-icon-package-delete"></i> <bean:message key="packagelist.jsp.removablepatches" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp index f3274c8..08472c6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp @@ -10,7 +10,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-package_del.gif" /> + <i class="fa spacewalk-icon-package-delete"></i> <bean:message key="install_patchset.jsp.header" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp index b688ca2..311f861 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp @@ -10,7 +10,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-package_del.gif" /> + <i class="fa spacewalk-icon-package-delete"></i> <bean:message key="patchsetlist.jsp.patchsets" /> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp index dff44a7..c0fbcac 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp @@ -11,7 +11,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<h2><img src="/img/rhn-icon-packages.gif" /> +<h2><i class="fa spacewalk-icon-packages"></i> <bean:message key="compare.jsp.compareto" arg0="${fn:escapeXml(requestScope.systemname)}" /> </h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp index c1c295e..b0c4ad1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp @@ -10,8 +10,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-packages.gif" - alt="<bean:message key='errata.common.packageAlt' />" /> + <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> <bean:message key="profile.jsp.comparetostoredprofile"/> </h2> @@ -36,8 +35,7 @@ </p> </div> <h2> - <img src="/img/rhn-icon-packages.gif" - alt="<bean:message key='errata.common.packageAlt' />" /> + <i class="fa spacewalk-icon-packages" title="<bean:message key='errata.common.packageAlt' />"></i> <bean:message key="profile.jsp.comparetosystem"/> </h2> <div class="page-summary"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp index 37d96a7..5490e28 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp @@ -51,8 +51,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='confirm.jsp.selection'/>" - title="<bean:message key='confirm.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp index de08136..fbbaeee 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp @@ -52,8 +52,7 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='confirm.jsp.selection'/>" - title="<bean:message key='confirm.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='confirm.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp index fbe6a1b..9cce589 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -11,8 +11,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-package-upgrade.gif" - alt="<bean:message key='errata.common.upgradepackageAlt' />" /> + <i class="fa spacewalk-icon-package-upgrade" title="<bean:message key='errata.common.upgradepackageAlt' />"></i> <bean:message key="upgradable.jsp.header" /> </h2> <div class="page-summary"> @@ -54,19 +53,13 @@ <c:forEach items="${current.errata}" var="errata"> <c:if test="${not empty errata.advisory}"> <c:if test="${errata.type == 'Security Advisory'}"> - <img src="/img/wrh-security.gif" - alt="<bean:message key='erratalist.jsp.securityadvisory' />" - title="<bean:message key='erratalist.jsp.securityadvisory' />" /> + <i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory' />"></i> </c:if> <c:if test="${errata.type == 'Bug Fix Advisory'}"> - <img src="/img/wrh-bug.gif" - alt="<bean:message key='erratalist.jsp.bugadvisory' />" - title="<bean:message key='erratalist.jsp.bugadvisory' />" /> + <i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i> </c:if> <c:if test="${errata.type == 'Product Enhancement Advisory'}"> - <img src="/img/wrh-product.gif" - alt="<bean:message key='erratalist.jsp.productenhancementadvisory' />" - title="<bean:message key='erratalist.jsp.productenhancementadvisory' />" /> + <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i> </c:if> <a href="/rhn/errata/details/Details.do?eid=${errata.id}">${errata.advisory}</a><br/> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp index a7c593e..2dc7f87 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/images/images.jsp @@ -16,7 +16,7 @@ <c:when test="${requestScope.loadAsync == true}"> <div id="images-content"> <div style="padding: 1em;"> - <img src="/img/spinner.gif" style="vertical-align: middle;" /> + <i class="fa fa-spinner fa-spin"></i> <span style="padding-left: 0.3em;">Loading ...</span> </div> <script type="text/javascript"> diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp index 5817a54..e3ad492 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp @@ -25,8 +25,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-errata.gif" - alt="<bean:message key='errata.common.errataAlt' />" /> + <i class="fa spacewalk-icon-patches" title="<bean:message key='errata.common.errataAlt' />"></i> <bean:message key="errata.jsp.header"/> </h2> @@ -69,8 +68,7 @@ <c:if test="${requestScope.showApplyErrata == 'false'}"> <rl:column headerkey="emptyspace.jsp" styleclass="text-align: center;"> - <img src="/img/icon_pending.gif" - title="<bean:message key='errata.jsp.scheduled'/>" /> + <i class="fa fa-clock-o"></i> </rl:column> </c:if> @@ -84,16 +82,13 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp index 08e2a44..d234ea6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> -<h2><img src="/img/rhn-icon-errata.gif" /><bean:message key="errataconfirm.jsp.header"/></h2> +<h2><i class="fa spacewalk-icon-patches"></i><bean:message key="errataconfirm.jsp.header"/></h2> <rhn:systemtimemessage server="${system}" /> @@ -31,16 +31,13 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" - title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> + <i class="fa fa-lock"></i> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" - title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> + <i class="fa fa-bug"></i> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" - title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> + <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rl:column> @@ -68,8 +65,7 @@ <th><bean:message key="syncprofile.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" - title="<bean:message key='syncprofile.jsp.selection'/>"/> + <th><i class="fa spacewalk-icon-schedule" title="<bean:message key='syncprofile.jsp.selection'/>"></i> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp index d3583b2..cbfd33f 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -14,7 +14,7 @@ <c:if test="${is_suite_probe}"> <rhn:toolbar base="h2" icon="fa-desktop" miscAlt="probedetails.jsp.editsuiteprobe" - miscImg="action-clone.gif" + miscIcon="fa-copy" miscUrl="/rhn/monitoring/config/ProbeSuiteProbeEdit.do?suite_id=${probe.templateProbe.probeSuite.id}&probe_id=${probe.templateProbe.id}" miscText="probedetails.jsp.editsuiteprobe" creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}" @@ -27,7 +27,7 @@ deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}" deletionType="probe" miscAlt="probedetails.jsp.editthisprobe" - miscImg="action-clone.gif" + miscIcon="fa-copy" miscUrl="ProbeEdit.do?probe_id=${probe.id}&sid=${system.id}" miscText="probedetails.jsp.editthisprobe" creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}" @@ -126,7 +126,7 @@ <c:if test="${requestScope.show_graph}"> <h2><bean:message key="probedetails.jsp.graph"/></h2> <img src="/rhn/systems/details/probes/ProbeGraph.do?${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"/> - <br><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><img src="/img/csv-16.png" alt=""><bean:message key="listdisplay.csv"/></a> + <br><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><i class="fa spacewalk-icon-download-csv text-primary" title=""></i><bean:message key="listdisplay.csv"/></a> </c:if> <c:if test="${requestScope.show_log}"> <h2><bean:message key="probedetails.jsp.eventlog"/></h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index 86c31cf..dd82fbb 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -90,7 +90,7 @@ sortattr="nameOfUserWhoRegisteredSystem" > <c:choose> <c:when test="${current.creatorName != null}"> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>" /> + <i class="fa fa-user" title="<bean:message key='yourrhn.jsp.user.alt'/>"></i> <c:out value="${current.creatorName}"/> </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp index 61f2f38..e166205 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp @@ -8,7 +8,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-channels.gif" alt="channel"/> + <i class="fa spacewalk-icon-software-channels" title="channel"></i> <bean:message key="sdc.channels.edit.header2"/> </h2> <html:form method="post" action="/systems/details/SystemChannels.do?sid=${system.id}"> @@ -101,7 +101,7 @@ <rhn:require acl="not system_is_proxy(); not system_is_satellite()" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> <h2> - <img src="/img/rhn-icon-channels.gif" /> + <i class="fa spacewalk-icon-software-channels"></i> <bean:message key="sdc.channels.edit.base_software_channel"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp index 531e562..0cb6be2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-channels.gif" alt="channel"/> + <i class="fa spacewalk-icon-software-channels" title="channel"></i> <bean:message key="sdc.channels.confirmNewBase.header.confirm"/> </h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp index 5327979..a180509 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp @@ -10,7 +10,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <div class="toolbar-h2"> - <img src="/img/rhn-icon-info.gif" alt="" /> + <i class="fa fa-info-circle text-primary" title=""></i> <bean:message key="system.jsp.customkey.updatetitle"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp index f95803a..9df91d8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp @@ -13,7 +13,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <div class="toolbar-h2"> <div class="toolbar"></div> - <img src="/img/rhn-icon-warning.gif" alt="" /> + <i class="fa fa-warning text-warning" title=""></i> <bean:message key="system.jsp.customdata.deletetitle"/> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp index f38bbcd..934be9d 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp @@ -7,7 +7,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2> - <img src="/img/rhn-icon-note.gif" alt="" /><bean:message key="sdc.details.notes.delete.header"/> + <i class="fa spacewalk-icon-note-pin" title=""></i><bean:message key="sdc.details.notes.delete.header"/> </h2> <div class="page-summary"> <p><bean:message key="sdc.details.notes.delete.confirm"/></p> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp index 6ae927c..0f0f405 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp @@ -8,13 +8,13 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <c:choose> <c:when test="${empty param.nid}"> - <rhn:toolbar base="h2" img="/img/rhn-icon-note.gif"> + <rhn:toolbar base="h2" icon="spacewalk-icon-note-pin"> <bean:message key="sdc.details.notes.header"/> </rhn:toolbar> <c:set var="urlParam" scope="request" value="sid=${system.id}"/> </c:when> <c:otherwise> - <rhn:toolbar base="h2" img="/img/rhn-icon-note.gif" + <rhn:toolbar base="h2" icon="spacewalk-icon-note-pin" deletionUrl="/rhn/systems/details/DeleteNote.do?sid=${system.id}&nid=${n.id}" deletionType="note"> <bean:message key="sdc.details.notes.header"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index aecbe9e..e6e4011 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -55,7 +55,7 @@ <c:if test="${rebootRequired}"> <div class="systeminfo"> <div class="systeminfo-full"> - <img src="/img/restart.png"/><bean:message key="sdc.details.overview.requires_reboot"/> + <i class="fa fa-refresh text-primary"></i><bean:message key="sdc.details.overview.requires_reboot"/> <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> </div> </div> @@ -66,10 +66,10 @@ <div class="col-md-6"> <c:choose> <c:when test="${probeList[0].state == 'CRITICAL'}"> - <img src="/img/rhn-mon-down.gif"/> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> </c:when> <c:otherwise> - <img src="/img/rhn-mon-warning.gif"/> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> </c:otherwise> </c:choose> </div> @@ -77,10 +77,10 @@ <c:forEach items="${probeList}" var="probe"> <c:choose> <c:when test="${probe.state == 'CRITICAL'}"> - <img src="/img/rhn-mini_icon-critical.gif"/> + <i class="fa fa-circle text-danger"></i> </c:when> <c:otherwise> - <img src="/img/rhn-mini_icon-warning.gif"/> + <i class="fa fa-warning text-warning"></i> </c:otherwise> </c:choose> <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp index a9747a8..a1e9631 100644 --- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp @@ -12,7 +12,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-bug-ex.gif"> + <rhn:toolbar base="h1" icon="spacewalk-icon-bug-ex"> <bean:message key="software.crashes.overview"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp index 942bb62..dd56d64 100644 --- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashuuiddetails.jsp @@ -12,7 +12,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" img="/img/rhn-icon-bug-ex.gif"> + <rhn:toolbar base="h1" icon="spacewalk-icon-bug-ex"> <bean:message key="software.crashes"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp index 699988e..d943e86 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp @@ -37,7 +37,7 @@ bound="false" headerkey="systemlist.jsp.system" sortattr="name" > - <img src="/img/rhn-listicon-system.gif" alt="<bean:message key='systemlist.jsp.nonvirt'/>" /> + <i class="fa fa-desktop" title="<bean:message key='systemlist.jsp.nonvirt'/>"></i> <c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" /> <c:choose> <c:when test="${empty current.name}"> @@ -64,10 +64,10 @@ </c:choose> <c:choose> <c:when test="${current.critical >= 10}"> - <img height="10%" width="10%" src="/img/icon_crit_update.gif"/> + <i class="fa fa-exclamation-circle text-danger"></i> </c:when> <c:when test="${current.critical >= 5}"> - <img height="10%" width="10%" src="/img/rhn-icon-warning.gif"/> + <i class="fa fa-warning text-warning"></i> </c:when> </c:choose> </rl:column> @@ -86,10 +86,10 @@ </c:choose> <c:choose> <c:when test="${current.important >= 15}"> - <img height="10%" width="10%" src="/img/icon_crit_update.gif"/> + <i class="fa fa-exclamation-circle text-danger"></i> </c:when> <c:when test="${current.important >= 10}"> - <img height="10%" width="10%" src="/img/rhn-icon-warning.gif"/> + <i class="fa fa-warning text-warning"></i> </c:when> </c:choose> </rl:column> @@ -108,10 +108,10 @@ </c:choose> <c:choose> <c:when test="${current.moderate >= 20}"> - <img height="10%" width="10%" src="/img/icon_crit_update.gif"/> + <i class="fa fa-exclamation-circle text-danger"></i> </c:when> <c:when test="${current.moderate >= 15}"> - <img height="10%" width="10%" src="/img/rhn-icon-warning.gif"/> + <i class="fa fa-warning text-warning"></i> </c:when> </c:choose> </rl:column> @@ -130,10 +130,10 @@ </c:choose> <c:choose> <c:when test="${current.low >= 25}"> - <img height="10%" width="10%" src="/img/icon_crit_update.gif"/> + <i class="fa fa-exclamation-circle text-danger"></i> </c:when> <c:when test="${current.low >= 20}"> - <img height="10%" width="10%" src="/img/rhn-icon-warning.gif"/> + <i class="fa fa-warning text-warning"></i> </c:when> </c:choose> </rl:column> diff --git a/web/html/help/about.pxt b/web/html/help/about.pxt index 8dcf323..e50b63c 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><img src="/img/rhn-icon-info.gif" alt="information" /> About <pxt-config var="product_name"/></h1> +<h1><i class="fa fa-info-circle text-primary" title="information"></i> 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 0780014..e4ad9b5 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><img src="/img/rhn-icon-packages.gif" /> Packages</h2> + <h2><i class="fa spacewalk-icon-packages"></i> 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 64e93d3..ad9928a 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" img="/img/monitoring_icon.gif" 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="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"> 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 b2289be..174a490 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" img="/img/rhn-icon-system.gif" help-url="s1-sm-monitor.jsp#s2-sm-monitor-scout"> + <rhn-toolbar base="h1" icon="fa-desktop" 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 29d5e8d..58345f9 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> - <img src="/img/rhn-icon-errata.gif" /> + <i class="fa spacewalk-icon-patches"></i> 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 d29d344..8a7844b 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> - <img src="/img/rhn-icon-errata.gif" /> + <i class="fa spacewalk-icon-patches"></i> 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 a504132..d889e9c 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> - <img src="/img/rhn-icon-packages.gif" alt="package" /> + <i class="fa spacewalk-icon-packages" title="package"></i> 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 46b8c33..4650567 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> - <img src="/img/rhn-icon-packages.gif" /> + <i class="fa spacewalk-icon-packages"></i> 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 33a871f..b831bd8 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><img src="/img/rhn-icon-channels.gif" /> Channel: {channel_name}</h1> + <h1><i class="fa spacewalk-icon-software-channels"></i> 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 f1c8316..4b05f03 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> - <img src="/img/rhn-icon-path_install.gif" /> + <i class="fa spacewalk-icon-patch-install"></i> 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 eb6236b..a328550 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> - <img src="/img/rhn-icon-patch.gif" /> Patches + <i class="fa spacewalk-icon-patches"></i> 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 010e1ea..6fd6b9a 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> - <img src="/img/rhn-icon-patch_remove.gif" /> + <i class="fa spacewalk-icon-patch-remove"></i> 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 cbdcf8d..37d3f89 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> - <img src="/img/rhn-icon-patch_remove.gif" /> + <i class="fa spacewalk-icon-patch-remove"></i> 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 5b837b9..fbe9427 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> - <img src="/img/rhn-icon-patchset_install.gif" /> + <i class="fa spacewalk-icon-patchset-install"></i> 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 ca87970..f852f62 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> - <img src="/img/rhn-icon-patchset.gif" /> Patchsets + <i class="fa spacewalk-icon-patch-set"></i> Patchsets </h2> <pxt-formvar> diff --git a/web/html/network/software/channels/patches.pxt b/web/html/network/software/channels/patches.pxt index 07aca16..2cc30e1 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><img src="/img/rhn-icon-channels.gif" /> {channel_name}</h1> + <h1><i class="fa spacewalk-icon-software-channels"></i> {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 258cdd1..2474f58 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><img src="/img/rhn-icon-channels.gif" /> {channel_name}</h1> + <h1><i class="fa spacewalk-icon-software-channels"></i> {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 add27fb..f454c86 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><img src="/img/rhn-icon-channels.gif" /> {channel_name} <rhn-help href="s1-sm-channels-packages.jsp#s3-sm-channel-details" /></h1> + <h1><i class="fa spacewalk-icon-software-channels"></i> {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 0a7464b..4df561c 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><img src="/img/rhn-icon-packages.gif" alt="package" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 616fda1..bc34c54 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><img src="/img/rhn-icon-packages.gif" alt="package" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 da61582..3bd55e5 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 4d11099..64fb6ad 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><img src="/img/rhn-icon-packages.gif" alt="package" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 b650060..90e53a1 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> <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 b78e141..f302635 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> <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 db86074..555a235 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> <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 dca0a4a..bab74ac 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> <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 5236fa3..48e6f11 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> <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 59a9b4c..5e2ddb1 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><img src="/img/rhn-icon-packages.gif" alt="package" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 c940d2f..bb483d2 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 99d4646..ca4d9ff 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 1012854..646438a 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><img src="/img/rhn-icon-packages.gif" alt="package" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 c749163..1884574 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 c991a02..0ce321f 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><img src="/img/rhn-icon-packages.gif" /> {package_nvre}.{package_arch_label}.{package_arch_type_label} <rhn-help href="s1-sm-channels-packages.jsp" /></h1> + <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> </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 df5e637..7d78786 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><img src="/img/rhn-icon-proxy.gif"/>Connection Path</h2> + <h2><i class="fa spacewalk-icon-proxy"></i>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 aed1842..ba3e6be 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> - <img src="/img/rhn-icon-packages.gif" alt="package" /> + <i class="fa spacewalk-icon-packages" title="package"></i> Dependency Failures </h2> diff --git a/web/html/network/systems/details/history/event.pxt b/web/html/network/systems/details/history/event.pxt index 337eaae..249bd2d 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> - <img src="/img/rhn-icon-form.gif" alt="event" /> + <i class="fa fa-suitcase" title="event"></i> System History Event </h2> @@ -58,7 +58,7 @@ <pxt-formvar> <div class="up-arrow"> -<img src="/img/rhn-go-up.gif" alt="Go up" /> +<i class="fa fa-caret-up" title="Go up"></i> <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 08df689..2018933 100644 --- a/web/html/network/systems/details/history/history.pxt +++ b/web/html/network/systems/details/history/history.pxt @@ -25,7 +25,7 @@ <h2> - <img src="/img/rhn-icon-form.gif" alt="event" /> + <i class="fa fa-suitcase" title="event"></i> 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 a11ccd7..f861836 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> - <img src="/img/rhn-icon-form.gif" alt="event" /> + <i class="fa fa-suitcase" title="event"></i> System History Event Results </h2> @@ -56,7 +56,7 @@ <pxt-formvar> <div class="up-arrow"> -<img src="/img/rhn-go-up.gif" alt="Go up" /> +<i class="fa fa-caret-up" title="Go up"></i> <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 329c5c4..e9707ae 100644 --- a/web/html/network/systems/details/history/pending.pxt +++ b/web/html/network/systems/details/history/pending.pxt @@ -21,7 +21,7 @@ <h2> - <img src="/img/rhn-icon-form.gif" alt="event" /> + <i class="fa fa-suitcase" title="event"></i> 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 fb4f065..d127306 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> -<img src="/img/rhn-snapshot.gif" alt="snapshot" /> +<i class="fa fa-camera" title="snapshot"></i> <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 71dba3a..6c1160d 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> -<img src="/img/rhn-snapshot.gif" alt="snapshot" /> +<i class="fa fa-camera" title="snapshot"></i> <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 ad9350e..08a2000 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> -<img src="/img/rhn-snapshot.gif" alt="snapshot" /> +<i class="fa fa-camera" title="snapshot"></i> <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 213bd36..602f5f8 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><img src="/img/rhn-snapshot.gif" alt="snapshot" /> System Snapshots</h2> +<h2><i class="fa fa-camera" title="snapshot"></i> 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 cc24873..a09e6a6 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> -<img src="/img/rhn-snapshot.gif" alt="snapshot" /> +<i class="fa fa-camera" title="snapshot"></i> <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 2d5b421..324e423 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> -<img src="/img/rhn-snapshot.gif" alt="snapshot" /> +<i class="fa fa-camera" title="snapshot"></i> <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 26c3ef7..3b2deb2 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> - <img src="/img/rhn-snapshot.gif" /> + <i class="fa fa-camera"></i> 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 c822581..8e541cf 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> -<img src="/img/rhn-rollback.gif" alt="rollback" /> +<i class="fa spacewalk-icon-snapshot-rollback" title="rollback"></i> 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"> -<img src="/img/rhn-go-up.gif" alt="Go up" /> +<i class="fa fa-caret-up" title="Go up"></i> <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 28ec196..07d13ca 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" img="/img/rhn-snapshot.gif" 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="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"> {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 7c31f48..412731c 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" img="/img/rhn-snapshot.gif" creation-url="/network/systems/details/history/snapshots/add_system_tag.pxt?sid={formvar:sid}" creation-type="system tag"> + <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"> 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 0019185..a6df288 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> -<img src="/img/rhn-snapshot.gif" /> +<i class="fa fa-camera"></i> <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 986c472..726df40 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> - <img src="/img/rhn-icon-packages.gif" alt="package" /> + <i class="fa spacewalk-icon-packages" title="package"></i> 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 91d818c..4fd6e18 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><img src="/img/rhn-icon-proxy.gif"/>Proxy Clients</h2> + <h2><i class="fa spacewalk-icon-proxy"></i>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 a2ac538..fe5a2c9 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><img src="/img/rhn-icon-proxy.gif"/>Proxy</h2> + <h2><i class="fa spacewalk-icon-proxy"></i>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 3ade4e5..7a92ca3 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> - <img src="/img/rhn-icon-errata.gif" /> + <i class="fa spacewalk-icon-patches"></i> 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 06436ea..80c9ff8 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> - <img src="/img/rhn-icon-errata.gif" alt="erratum" /> + <i class="fa spacewalk-icon-patches" title="erratum"></i> Relevant Errata </h2> diff --git a/web/html/network/systems/groups/probe_list.pxt b/web/html/network/systems/groups/probe_list.pxt index 2e5efb0..2432ae3 100644 --- a/web/html/network/systems/groups/probe_list.pxt +++ b/web/html/network/systems/groups/probe_list.pxt @@ -8,7 +8,7 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" /> - <rhn-toolbar base="h2" img="/img/rhn-icon-system_group.gif"> + <rhn-toolbar base="h2" icon="spacewalk-icon-system-groups"> Probe Status </rhn-toolbar> 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 b99fa87..e2bf05f 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> - <img src="/img/rhn-icon-errata.gif" /> + <i class="fa spacewalk-icon-patches"></i> 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 49c0672..be580fb 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 6c99a3e..eae7b33 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 a1ef6be..92c8cd7 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <rhn-errata-details> -<h2><img src="/img/rhn-icon-system.gif" /> +<h2><i class="fa fa-desktop"></i> 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 9f9842d..5ab9393 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 2f385b0..dbdbfef 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <rhn-toolbar base="h2" - img="/img/rhn-icon-system.gif" + icon="fa-desktop" 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 ab16dfa..84eb854 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> - <rhn-toolbar base="h2" img="/img/rhn-icon-system_group.gif" creation-url="/network/systems/ssm/groups/create.pxt" creation-type="group"> + <rhn-toolbar base="h2" icon="spacewalk-icon-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 2745fc3..2a5df61 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 3b6dd04..30b0f3e 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 fe85973..d0c84cf 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 0a8fd2d..a925e12 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 ab29516..131b340 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 957c3fe..a3cff35 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 85fa6b7..b5bfbe2 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 85bb571..29cecad 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 f226492..a150d59 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/> <h2> - <img src="/img/rhn-icon-packages.gif" /> + <i class="fa spacewalk-icon-packages"></i> 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 3f6bb74..273a19b 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 399ad80..fd1b5ef 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 0bbcae8..98b303b 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 91ef116..d00796e 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 c4a3f76..2ef8f3e 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 d716e4f..b5f40b7 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 d4ea904..01da917 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 c46c9da..c5983e3 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 51277f0..9f3b761 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 136cdaa..94fa16e 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <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 59b7ca5..855ca68 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <h2> -<img src="/img/rhn-rollback.gif" alt="rollback" /> +<i class="fa spacewalk-icon-snapshot-rollback" title="rollback"></i> 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 bbb0793..609c610 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <rhn-snapshot-tag-details> <h2> -<img src="/img/rhn-rollback.gif" /> +<i class="fa spacewalk-icon-snapshot-rollback"></i> 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 e1ff7f7..e29d94f 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><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> + <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> <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> <h2> -<img src="/img/rhn-snapshot.gif" alt="snapshot" /> +<i class="fa fa-camera" title="snapshot"></i> Tag Systems </h2> commit fbc36d56bbc5f1d891f4f43cb05dd7d066a3e924 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Nov 7 12:33:35 2013 +0100 Use alternate quotes. HTML parsers choke on nested quotes without escaping. Also, Since Tomcat 5.x this should not work without org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING set to false. (For some reason it does, but we should not rely on it) diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index d5fd900..88b4553 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -11,11 +11,11 @@ <div class="spacewalk-header-container"> <div id="logo" class="spacewalk-logo"> - <a href="<bean:message key="layout.jsp.vendor.website"/>" title="<bean:message key="layout.jsp.vendor.title"/>"> - <img src="/img/logo_vendor.png" alt="<bean:message key="layout.jsp.vendor.name"/>" id="rhLogo" /> + <a href="<bean:message key='layout.jsp.vendor.website'/>" title="<bean:message key='layout.jsp.vendor.title'/>"> + <img src="/img/logo_vendor.png" alt="<bean:message key='layout.jsp.vendor.name'/>" id="rhLogo" /> </a> <a href="/" title="<bean:message key="layout.jsp.productname"/> homepage"> - <img src="/img/logo_product.png" alt="<bean:message key="layout.jsp.productname"/>" id="rhnLogo" accesskey="2"/> + <img src="/img/logo_product.png" alt="<bean:message key='layout.jsp.productname'/>" id="rhnLogo" accesskey="2"/> </a> </div> <div class="spacewalk-header-links"> @@ -54,7 +54,7 @@ </select> </div> <div class="form-group"> - <input type="search" class="form-control input-sm" name="search_string" maxlength="40" size="20" accesskey="4" autofocus="autofocus" placeholder="<bean:message key="button.search" />" /> + <input type="search" class="form-control input-sm" name="search_string" maxlength="40" size="20" accesskey="4" autofocus="autofocus" placeholder="<bean:message key='button.search'/>" /> </div> <div class="form-group"> <input type="hidden" name="submitted" value="true" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp index 3fef569..3a98f1e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp @@ -21,7 +21,7 @@ </div> <div class="text-right"> <input type="submit" name="dispatch" - value="<bean:message key="bunch.edit.jsp.button-schedule"/>" /> + value="<bean:message key='bunch.edit.jsp.button-schedule'/>" /> <rhn:csrf/> <rhn:submitted/> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp index 48f76cc..f7f4503 100644 --- a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp @@ -14,7 +14,7 @@ <p> -(<span class="ok-explanation"><i class="icon-ok" title="<bean:message key="channelperms.jsp.permGranted.short"/>"></i></span> +(<span class="ok-explanation"><i class="icon-ok" title="<bean:message key='channelperms.jsp.permGranted.short'/>"></i></span> <bean:message key="channelperms.jsp.permGranted" />) </p> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp index 8b80c41..5fb82d6 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp @@ -18,15 +18,15 @@ <rhn:column header="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rhn:column> <rhn:column header="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp index 3205727..22c5b03 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp @@ -46,8 +46,8 @@ <th><bean:message key="syncprofile.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="syncprofile.jsp.selection"/>" - title="<bean:message key="syncprofile.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" + title="<bean:message key='syncprofile.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp index 22da2b4..d45109a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp @@ -28,26 +28,26 @@ sortattr="enabled"> <c:if test="${current.enabled == 'Y'}"> <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.enabled"/>" - title="<bean:message key="iss.slave.enabled"/>" /> + alt="<bean:message key='iss.slave.enabled'/>" + title="<bean:message key='iss.slave.enabled'/>" /> </c:if> <c:if test="${current.enabled != 'Y'}"> <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.disabled"/>" - title="<bean:message key="iss.slave.disabled"/>" /> + alt="<bean:message key='iss.slave.disabled'/>" + title="<bean:message key='iss.slave.disabled'/>" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs"> <c:if test="${current.allowAllOrgs == 'Y'}"> <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.all"/>" - title="<bean:message key="iss.slave.all"/>" /> + alt="<bean:message key='iss.slave.all'/>" + title="<bean:message key='iss.slave.all'/>" /> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.notAll"/>" - title="<bean:message key="iss.slave.notAll"/>" /> + alt="<bean:message key='iss.slave.notAll'/>" + title="<bean:message key='iss.slave.notAll'/>" /> </c:if> </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp index e59ec9a..661248f 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp @@ -40,26 +40,26 @@ sortattr="enabled" styleclass="center" headerclass="center"> <c:if test="${current.enabled == 'Y'}"> <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.enabled"/>" - title="<bean:message key="iss.slave.enabled"/>" /> + alt="<bean:message key='iss.slave.enabled'/>" + title="<bean:message key='iss.slave.enabled'/>" /> </c:if> <c:if test="${current.enabled != 'Y'}"> <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.disabled"/>" - title="<bean:message key="iss.slave.disabled"/>" /> + alt="<bean:message key='iss.slave.disabled'/>" + title="<bean:message key='iss.slave.disabled'/>" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.toAll" sortattr="allOrgs" styleclass="center" headerclass="center"> <c:if test="${current.allowAllOrgs == 'Y'}"> <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.slave.all"/>" - title="<bean:message key="iss.slave.all"/>" /> + alt="<bean:message key='iss.slave.all'/>" + title="<bean:message key='iss.slave.all'/>" /> </c:if> <c:if test="${current.allowAllOrgs != 'Y'}"> <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.slave.notAll"/>" - title="<bean:message key="iss.slave.notAll"/>" /> + alt="<bean:message key='iss.slave.notAll'/>" + title="<bean:message key='iss.slave.notAll'/>" /> </c:if> </rl:column> <rl:column bound="false" headerkey="iss.slave.num-orgs-allowed" diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp index e0bccb4..15da84b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp @@ -33,13 +33,13 @@ styleclass="center" headerclass="center"> <c:if test="${current.defaultMaster}"> <img src="/img/rhn-listicon-checked.gif" - alt="<bean:message key="iss.master.isDefault"/>" - title="<bean:message key="iss.master.isDefault"/>" /> + alt="<bean:message key='iss.master.isDefault'/>" + title="<bean:message key='iss.master.isDefault'/>" /> </c:if> <c:if test="${not current.defaultMaster}"> <img src="/img/rhn-listicon-unchecked.gif" - alt="<bean:message key="iss.master.notDefault"/>" - title="<bean:message key="iss.master.notDefault"/>" /> + alt="<bean:message key='iss.master.notDefault'/>" + title="<bean:message key='iss.master.notDefault'/>" /> </c:if> </rl:column> <rl:column headerkey="iss.num.master.orgs" styleclass="center" headerclass="center"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf index c002568..6220cf4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filter-form.jspf @@ -69,7 +69,7 @@ function showDestination() { </html:select> </td> </tr> - <tr id="destination" title="<bean:message key="filter-form.jspf.destination_help"/>"> + <tr id="destination" title="<bean:message key='filter-form.jspf.destination_help'/>"> <th> <label for="destination"><bean:message key="filter-form.jspf.destination"/></label> </th> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index 26d8070..3b405d9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -60,7 +60,7 @@ </rl:list> <div class="row"> <div class="col-md-6 text-left"> - <input type="submit" class="btn btn-success" name="dispatch" value="<bean:message key="disabledlist.jsp.reactivate"/>" /> + <input type="submit" class="btn btn-success" name="dispatch" value="<bean:message key='disabledlist.jsp.reactivate'/>" /> </div> <div class="col-md-6 text-right"> <rl:csv dataset="pageList" diff --git a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp index 847784d..3e0d905 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp @@ -14,7 +14,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %> <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" class="btn btn-success" value="<bean:message key="message.Update" />"> + <button type="submit" class="btn btn-success" value="<bean:message key='message.Update'/>"> <bean:message key="message.Update" /> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp index 50e29cd..2e1c931 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -42,7 +42,7 @@ <div class="text-right"> <hr /> - <input type="submit" name="dispatch" value="<bean:message key="userconfirm.jsp.confirm" />" /> + <input type="submit" name="dispatch" value="<bean:message key='userconfirm.jsp.confirm'/>" /> </div> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp index aecebe3..c94d6e6 100755 --- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp @@ -49,7 +49,7 @@ <rhn:submitted/> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="ssmchildsubs.jsp.subscribe"/>" </input> + <input type="submit" name="dispatch" value="<bean:message key='ssmchildsubs.jsp.subscribe'/>" </input> </p> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index e123b17..1d19d08 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -67,7 +67,7 @@ </td> <td> - <input type="submit" name="dispatch" value="<bean:message key="frontend.actions.channels.manager.add.viewErrata"/>"> + <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewErrata'/>"> </td> </tr> </c:if> @@ -95,15 +95,15 @@ headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - alt="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + alt="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - alt="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + alt="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - alt="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rl:column> @@ -133,7 +133,7 @@ </c:when> </c:choose> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="frontend.actions.channels.manager.add.submit"/>" + <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.submit'/>" <c:choose> <c:when test="${empty pageList}">disabled</c:when> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 537e6a7..54be12e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -59,7 +59,7 @@ </td> <td> - <input type="submit" name="dispatch" value="<bean:message key="frontend.actions.channels.manager.add.viewChannels"/>"> + <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewChannels'/>"> </td> </tr> @@ -89,7 +89,7 @@ </td> <td> - <input type="submit" name="dispatch" value="<bean:message key="frontend.actions.channels.manager.add.viewErrata"/>"> + <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.viewErrata'/>"> </td> </tr> </c:if> @@ -117,15 +117,15 @@ headerclass="thin-column"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - alt="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + alt="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - alt="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + alt="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - alt="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rl:column> @@ -156,7 +156,7 @@ </c:choose> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="frontend.actions.channels.manager.add.submit"/>" + <input type="submit" name="dispatch" value="<bean:message key='frontend.actions.channels.manager.add.submit'/>" <c:choose> <c:when test="${empty pageList}">disabled</c:when> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index 0822156..35e3976 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -77,7 +77,7 @@ <p align="right"> - <input type="submit" name="confirm" value="<bean:message key="channel.jsp.package.addconfirmbutton"/>" + <input type="submit" name="confirm" value="<bean:message key='channel.jsp.package.addconfirmbutton'/>" <c:choose> <c:when test="${empty pageList}">disabled</c:when> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp index 55ca604..76ca2c8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp @@ -43,7 +43,7 @@ <div class="text-right"> <hr /> <input type="submit" name="dispatch" - value="<bean:message key="repos.jsp.update.channel"/>" /> + value="<bean:message key='repos.jsp.update.channel'/>" /> </div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp index 95e738d..3217200 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp @@ -67,7 +67,7 @@ exportColumns="id, nvrea, summary, provider" /> <div class="text-right"> <hr /> - <input type="submit" name="confirm" value="<bean:message key="channel.jsp.package.addbutton"/>" /> + <input type="submit" name="confirm" value="<bean:message key='channel.jsp.package.addbutton'/>" /> </div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 40fd461..b9ecd38 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -24,19 +24,19 @@ <h2>Errata Summary:</h2> <table class="details"> <tr> - <th><img src="/img/wrh-bug.gif" alt="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + <th><img src="/img/wrh-bug.gif" alt="<bean:message key='erratalist.jsp.bugadvisory'/>" /> Bug Fix Advisory: </th> <td>${bug_count}</td> </tr> <tr> - <th><img src="/img/wrh-product.gif" alt="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + <th><img src="/img/wrh-product.gif" alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> Product Enhancement Advisory: </th> <td>${enhance_count}</td> </tr> <tr> - <th><img src="/img/wrh-security.gif" alt="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + <th><img src="/img/wrh-security.gif" alt="<bean:message key='erratalist.jsp.securityadvisory'/>" /> Security Advisory: </th> <td>${secure_count}</td> @@ -90,7 +90,7 @@ <hr /> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="Clone Errata"/>" + <input type="submit" name="dispatch" value="<bean:message key='Clone Errata'/>" <c:choose> <c:when test="${totalSize < 1}">disabled</c:when> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp index be0aebe..5f14e50 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp @@ -66,7 +66,7 @@ </rl:list> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="channel.jsp.errata.confirmremove"/>"> + <input type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.confirmremove'/>"> </p> <rhn:submitted/> <input type="hidden" name="cid" value="${cid}"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp index 4e07584..54b9a28 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp @@ -70,7 +70,7 @@ exportColumns="id, nvrea, summary, provider" /> <div class="text-right"> <hr /> - <input type="submit" name="confirm" value="<bean:message key="channel.jsp.package.confirmbutton"/>" /> + <input type="submit" name="confirm" value="<bean:message key='channel.jsp.package.confirmbutton'/>" /> </div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp index 9e3b1da..87576ed 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp @@ -81,7 +81,7 @@ <div class="text-right"> <hr /> <input type="submit" name="dispatch" - value="<bean:message key="distchannelmap.jsp.update"/>" /> + value="<bean:message key='distchannelmap.jsp.update'/>" /> </div> <rhn:submitted/> --> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp index d30e671..60fd151 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -61,7 +61,7 @@ <div class="text-right"> <hr /> <input type="submit" name="dispatch" - value="<bean:message key="confirm"/>" /> + value="<bean:message key='confirm'/>" /> </div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp index 41d5d90..30ac37c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp @@ -97,7 +97,7 @@ </rl:list> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="channel.jsp.errata.remove"/>" + <input type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.remove'/>" <c:choose> <c:when test="${empty errata_data}">disabled</c:when> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp index ddde5e5..94b8369 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -89,7 +89,7 @@ <rhn:tooltip key="channel.jsp.errata.sync.note"/> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="header.jsp.errata.sync"/>"> + <input type="submit" name="dispatch" value="<bean:message key='header.jsp.errata.sync'/>"> </p> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp index b435103..2dbef1b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp @@ -58,7 +58,7 @@ </rl:list> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="channel.manage.patchset.delete"/>" > + <input type="submit" name="dispatch" value="<bean:message key='channel.manage.patchset.delete'/>" > </p> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp index 2409e54..c025e7e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp @@ -71,7 +71,7 @@ <div class="text-right"> <hr /> <input type="submit" name="confirm" - value="<bean:message key="channel.jsp.package.removebutton"/>" /> + value="<bean:message key='channel.jsp.package.removebutton'/>" /> </div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp index ae4a938..ef6e568 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp @@ -80,7 +80,7 @@ exportColumns="id, nvrea, summary, provider" /> <div class="text-right"> <hr /> - <input type="submit" name="confirm" value="<bean:message key="channel.jsp.manage.package.delete"/>" /> + <input type="submit" name="confirm" value="<bean:message key='channel.jsp.manage.package.delete'/>" /> </div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp index 923350e..cc76ce2 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp @@ -83,7 +83,7 @@ </rl:list> <div class="text-right"> - <input type="submit" class="btn btn-default" name="confirm" value="<bean:message key="channel.jsp.manage.package.confirmbutton"/>" + <input type="submit" class="btn btn-default" name="confirm" value="<bean:message key='channel.jsp.manage.package.confirmbutton'/>" <c:choose> <c:when test="${empty pageList}">disabled</c:when> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp b/java/code/webapp/WEB-INF/pages/channel/popular.jsp index de5e089..4cd3baa 100644 --- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp @@ -48,7 +48,7 @@ function showFiltered() { </c:forEach> </select> <bean:message key="channels.popular.jsp.label2" /> - <INPUT type="submit" class="btn btn-default" value="<bean:message key="channels.popular.jsp.button" />"> + <INPUT type="submit" class="btn btn-default" value="<bean:message key='channels.popular.jsp.button'/>"> </td> </table> <br/> diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp index ecf2716..3639018 100755 --- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp @@ -73,7 +73,7 @@ <rhn:submitted/> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="confirm"/>" </input> + <input type="submit" name="dispatch" value="<bean:message key='confirm'/>" </input> </p> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf index 3212f7b..bc9d69b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/admin/channelperms_list.jspf @@ -2,10 +2,10 @@ <rhn:listdisplay filterBy="channelperms.jsp.channelname" button="channelperms.jsp.submitpermissions"> <rhn:column header="channelperms.jsp.permission" width="5%"> <c:if test="${userIsChannelAdmin}"> - <i class="icon-ok" title="<bean:message key="channelperms.jsp.permAdmin"/>"></i> + <i class="icon-ok" title="<bean:message key='channelperms.jsp.permAdmin'/>"></i> </c:if> <c:if test="${current.globallySubscribable and not (userIsChannelAdmin)}"> - <i class="icon-ok" title="<bean:message key="channelperms.jsp.permGlobal"/>"></i> + <i class="icon-ok" title="<bean:message key='channelperms.jsp.permGlobal'/>"></i> </c:if> <c:if test="${not (userIsChannelAdmin or current.globallySubscribable)}"> <html:multibox property="selectedChannels">${current.id}</html:multibox> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf index 6fa1f3d..1fffb39 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf @@ -3,12 +3,12 @@ <c:when test="${not empty current.comparableId}"> <a href="/rhn/audit/scap/DiffSubmit.do?first=${current.comparableId}&second=${current.xid}&view=changed"> <img src="/img/rhn-listicon-${current.diffIcon}.gif" - alt="<bean:message key="scapdiff.jsp.i.${current.diffIcon}"/>" - title="<bean:message key="scapdiff.jsp.i.${current.diffIcon}"/>"/></a> + alt="<bean:message key='scapdiff.jsp.i.${current.diffIcon}'/>" + title="<bean:message key='scapdiff.jsp.i.${current.diffIcon}'/>"/></a> </c:when> <c:otherwise> <i class="spacewalk-icon-unknown-system" - title="<bean:message key="system.audit.xccdfdetails.jsp.nodiff"/>"/></i> + title="<bean:message key='system.audit.xccdfdetails.jsp.nodiff'/>"/></i> </c:otherwise> </c:choose>  diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf index 9a02d5a..2fcfa67 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf @@ -44,12 +44,12 @@ exportColumns="xid,testResult,completed,pass,fail,error,unknown,notapplicable,notchecked,notselected,informational,fixed,sum"/> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="system.audit.listscap.jsp.diffbut"/>" + <input type="submit" name="dispatch" value="<bean:message key='system.audit.listscap.jsp.diffbut'/>" <c:choose> <c:when test="${empty pageList}">disabled</c:when> </c:choose> >   - <input type="submit" name="dispatch" value="<bean:message key="system.audit.listscap.jsp.removebut"/>" + <input type="submit" name="dispatch" value="<bean:message key='system.audit.listscap.jsp.removebut'/>" <c:choose> <c:when test="${empty pageList}">disabled</c:when> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf index 9fade55..b13ea41 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf @@ -23,7 +23,7 @@ </select> </div> <div class="col-md-7 text-left"> - <input type="submit" name="view" class="btn btn-default" value="<bean:message key="channel.jsp.package.viewpackages"/>"> + <input type="submit" name="view" class="btn btn-default" value="<bean:message key='channel.jsp.package.viewpackages'/>"> </div> </div> <hr/> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf index e2289d3..0210360 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf @@ -51,8 +51,8 @@ </tr> <tr> <th> - <img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="deploy.jsp.selection"/>" - title="<bean:message key="deploy.jsp.selection"/>"/> + <img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='deploy.jsp.selection'/>" + title="<bean:message key='deploy.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf index f4125fb..872d66e 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf @@ -23,8 +23,8 @@ <th><bean:message key="sdcconfigconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="syncprofile.jsp.selection"/>" - title="<bean:message key="syncprofile.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" + title="<bean:message key='syncprofile.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf index 25f00c4..214db84 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf @@ -3,15 +3,15 @@ <rhn:column header="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rhn:column> <rhn:column header="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf index 41fcb11..a7052c1 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf @@ -9,15 +9,15 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: left;"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - alt="<bean:message key="erratalist.jsp.securityadvisory"/>"/> + alt="<bean:message key='erratalist.jsp.securityadvisory'/>"/> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - alt="<bean:message key="erratalist.jsp.bugadvisory"/>"/> + alt="<bean:message key='erratalist.jsp.bugadvisory'/>"/> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - alt="<bean:message key="erratalist.jsp.productenhancementadvisory"/>"/> + alt="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"/> </c:if> </rl:column> <rl:column headerkey="erratalist.jsp.advisory"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index f8a06bc..57ae989 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -9,12 +9,12 @@ <div class="toolbar"> <span class="toolbar"> <a href="/network/systems/ssm/work_with_group.pxt?sgid=${systemgroup.id}&pxt_trap=rhn:work_with_group_cb"> - <img src="/img/work_with_group.gif" alt="<bean:message key="toolbar.work.with.group"/>" - title="<bean:message key="toolbar.work.with.group"/>" /> + <img src="/img/work_with_group.gif" alt="<bean:message key='toolbar.work.with.group'/>" + title="<bean:message key='toolbar.work.with.group'/>" /> <bean:message key="toolbar.work.with.group"/> </a> <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> - <i class="icon-trash" title="<bean:message key="toolbar.delete.systemgroup"/>" ></i> + <i class="icon-trash" title="<bean:message key='toolbar.delete.systemgroup'/>" ></i> <bean:message key="toolbar.delete.systemgroup"/> </a> @@ -30,7 +30,7 @@ ${fn:escapeXml(systemgroup.name)} </c:if> <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list" target="_new" class="help-title"> - <img src="/img/rhn-icon-help.gif" alt="<bean:message key="toolbar.jsp.helpicon.alt"/>" /> + <img src="/img/rhn-icon-help.gif" alt="<bean:message key='toolbar.jsp.helpicon.alt'/>" /> </a> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index 8d20f40..cbbadb4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -82,8 +82,8 @@ function enableBondStaticIpAddress() { <table width="100%"> <tr> <td align="right"> - <input type="button" value="<bean:message key="kickstart.schedule.button3.jsp" />" onclick="setStep('first');moveNext();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');moveNext();" /> + <input type="button" value="<bean:message key='kickstart.schedule.button3.jsp'/>" onclick="setStep('first');moveNext();" /> + <input type="button" value="<bean:message key='kickstart.schedule.button2.jsp'/>" onclick="setStep('third');moveNext();" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf index 3a603b7..571507c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf @@ -47,11 +47,11 @@ <td align="right"> <c:if test="${not empty regularKS}"> <input type="button" - value="<bean:message key="kickstart.schedule.button0.jsp" />" + value="<bean:message key='kickstart.schedule.button0.jsp'/>" onclick="setStep('fourth');this.form.submit();" /> </c:if> - <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> + <input type="button" value="<bean:message key='kickstart.schedule.button1.jsp'/>" onclick="setStep('second');this.form.submit();" /> + <input type="button" value="<bean:message key='kickstart.schedule.button2.jsp'/>" onclick="setStep('third');this.form.submit();" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf index 379b555..516434a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/manage/managers.jspf @@ -55,7 +55,7 @@ <div class="text-right"> <hr /> <input type="submit" name="confirm" - value="<bean:message key="message.Update"/>" /> + value="<bean:message key='message.Update'/>" /> </div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf index 5620509..a1d7e05 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf @@ -33,18 +33,18 @@ <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> <img src="/img/icon_crit_update.gif" border="0" - alt="<bean:message key="grouplist.jsp.security"/>" - title="<bean:message key="grouplist.jsp.security"/>" /> + alt="<bean:message key='grouplist.jsp.security'/>" + title="<bean:message key='grouplist.jsp.security'/>" /> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> <img src="/img/icon_reg_update.gif" border="0" - alt="<bean:message key="grouplist.jsp.updates"/>" - title="<bean:message key="grouplist.jsp.updates"/>" /> + alt="<bean:message key='grouplist.jsp.updates'/>" + title="<bean:message key='grouplist.jsp.updates'/>" /> </c:when> <c:otherwise> <img src="/img/icon_up2date.gif" border="0" - alt="<bean:message key="grouplist.jsp.noerrata"/>" - title="<bean:message key="grouplist.jsp.noerrata"/>" /> + alt="<bean:message key='grouplist.jsp.noerrata'/>" + title="<bean:message key='grouplist.jsp.noerrata'/>" /> </c:otherwise> </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf index 556b23b..6734272 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_groups.jspf @@ -11,28 +11,28 @@ <c:if test="${current.monitoringStatus == 'CRITICAL'}"> <img src="/img/rhn-mon-down.gif" - alt="<bean:message key="systemlist.jsp.probecritical"/>" - title="<bean:message key="systemlist.jsp.probecritical"/>" /> + alt="<bean:message key='systemlist.jsp.probecritical'/>" + title="<bean:message key='systemlist.jsp.probecritical'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'WARNING'}"> <img src="/img/rhn-mon-warning.gif" - alt="<bean:message key="systemlist.jsp.probewarning"/>" - title="<bean:message key="systemlist.jsp.probewarning"/>" /> + alt="<bean:message key='systemlist.jsp.probewarning'/>" + title="<bean:message key='systemlist.jsp.probewarning'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'UNKNOWN'}"> <img src="/img/rhn-mon-unknown.gif" - alt="<bean:message key="systemlist.jsp.probeunknown"/>" - title="<bean:message key="systemlist.jsp.probeunknown"/>" /> + alt="<bean:message key='systemlist.jsp.probeunknown'/>" + title="<bean:message key='systemlist.jsp.probeunknown'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'PENDING'}"> <img src="/img/rhn-mon-pending.gif" - alt="<bean:message key="systemlist.jsp.probepending"/>" - title="<bean:message key="systemlist.jsp.probepending"/>" /> + alt="<bean:message key='systemlist.jsp.probepending'/>" + title="<bean:message key='systemlist.jsp.probepending'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'OK'}"> <img src="/img/rhn-mon-ok.gif" - alt="<bean:message key="systemlist.jsp.probeok"/>" - title="<bean:message key="systemlist.jsp.probeok"/>" /> + alt="<bean:message key='systemlist.jsp.probeok'/>" + title="<bean:message key='systemlist.jsp.probeok'/>" /> </c:if> <c:out value="</a>" escapeXml="false"/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf index d00d073..78eada0 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf @@ -14,28 +14,28 @@ <c:if test="${current.monitoringStatus == 'CRITICAL'}"> <img src="/img/rhn-mon-down.gif" - alt="<bean:message key="systemlist.jsp.probecritical"/>" - title="<bean:message key="systemlist.jsp.probecritical"/>" /> + alt="<bean:message key='systemlist.jsp.probecritical'/>" + title="<bean:message key='systemlist.jsp.probecritical'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'WARNING'}"> <img src="/img/rhn-mon-warning.gif" - alt="<bean:message key="systemlist.jsp.probewarning"/>" - title="<bean:message key="systemlist.jsp.probewarning"/>" /> + alt="<bean:message key='systemlist.jsp.probewarning'/>" + title="<bean:message key='systemlist.jsp.probewarning'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'UNKNOWN'}"> <img src="/img/rhn-mon-unknown.gif" - alt="<bean:message key="systemlist.jsp.probeunknown"/>" - title="<bean:message key="systemlist.jsp.probeunknown"/>" /> + alt="<bean:message key='systemlist.jsp.probeunknown'/>" + title="<bean:message key='systemlist.jsp.probeunknown'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'PENDING'}"> <img src="/img/rhn-mon-pending.gif" - alt="<bean:message key="systemlist.jsp.probepending"/>" - title="<bean:message key="systemlist.jsp.probepending"/>" /> + alt="<bean:message key='systemlist.jsp.probepending'/>" + title="<bean:message key='systemlist.jsp.probepending'/>" /> </c:if> <c:if test="${current.monitoringStatus == 'OK'}"> <img src="/img/rhn-mon-ok.gif" - alt="<bean:message key="systemlist.jsp.probeok"/>" - title="<bean:message key="systemlist.jsp.probeok"/>" /> + alt="<bean:message key='systemlist.jsp.probeok'/>" + title="<bean:message key='systemlist.jsp.probeok'/>" /> </c:if> <c:out value="</a>" escapeXml="false"/> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf index 7e2ddb9..7b25993 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf @@ -1,13 +1,13 @@ <c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" /> <c:choose> <c:when test="${current.virtualGuest && empty nosystemicons}"> - <img src="/img/rhn-listicon-virtguest.gif" alt="<bean:message key="systemlist.jsp.virtguest"/>" /> + <img src="/img/rhn-listicon-virtguest.gif" alt="<bean:message key='systemlist.jsp.virtguest'/>" /> </c:when> <c:when test="${current.virtualHost && empty nosystemicons}"> - <img src="/img/rhn-listicon-virthost.gif" alt="<bean:message key="systemlist.jsp.virthost"/>" /> + <img src="/img/rhn-listicon-virthost.gif" alt="<bean:message key='systemlist.jsp.virthost'/>" /> </c:when> <c:otherwise> - <img src="/img/rhn-listicon-system.gif" alt="<bean:message key="systemlist.jsp.nonvirt"/>" /> + <img src="/img/rhn-listicon-system.gif" alt="<bean:message key='systemlist.jsp.nonvirt'/>" /> </c:otherwise> </c:choose> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp index 1e43354..1450b64 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp @@ -14,7 +14,7 @@ description="yourrhn.jsp.relevanterrata.description"> <rhn:column header="yourrhn.jsp.securityerrata"> - <img src="/img/wrh-security.gif" alt="<bean:message key="errata-legend.jsp.security"/>"/> + <img src="/img/wrh-security.gif" alt="<bean:message key='errata-legend.jsp.security'/>"/> <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a> </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index 28f048c..f79c566 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -32,17 +32,17 @@ <rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata" headerclass="row-2 text-align: center;"> - <img src="/img/wrh-security.gif" alt="<bean:message key="errata-legend.jsp.security"/>" />${current.securityErrata} + <img src="/img/wrh-security.gif" alt="<bean:message key='errata-legend.jsp.security'/>" />${current.securityErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata" headerclass="row-2 text-align: center;"> - <img src="/img/wrh-bug.gif" alt="<bean:message key="errata-legend.jsp.bugfix"/>" />${current.bugErrata} + <img src="/img/wrh-bug.gif" alt="<bean:message key='errata-legend.jsp.bugfix'/>" />${current.bugErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata" headerclass="row-2 text-align: center;"> - <img src="/img/rhn-icon-enhancement.gif" alt="<bean:message key="errata-legend.jsp.enhancement"/>" />${current.enhancementErrata} + <img src="/img/rhn-icon-enhancement.gif" alt="<bean:message key='errata-legend.jsp.enhancement'/>" />${current.enhancementErrata} </rl:column> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp index b3ff6db..d5eaff3 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp @@ -55,7 +55,7 @@ > <c:choose> <c:when test="${current.creatorName != null}"> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />" /> + <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>" /> <c:out value="${current.creatorName}"/> </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp index e873955..e0ff440 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp @@ -17,16 +17,16 @@ <rhn:column header="schedulesync.jsp.action"> <c:choose> <c:when test="${current.actionStatusId == 0 || current.actionStatusId == 1}"> - <img src="/img/rhn-listicon-pending.gif" title="<bean:message key="yourrhn.jsp.actions.pending" />" alt="<bean:message key="yourrhn.jsp.actions.pending" />" /> + <img src="/img/rhn-listicon-pending.gif" title="<bean:message key='yourrhn.jsp.actions.pending'/>" alt="<bean:message key='yourrhn.jsp.actions.pending'/>" /> </c:when> <c:when test="${current.actionStatusId == 2}"> - <img src="/img/rhn-listicon-ok.gif" title="<bean:message key="yourrhn.jsp.actions.completed" />" alt="<bean:message key="yourrhn.jsp.actions.completed" />" /> + <img src="/img/rhn-listicon-ok.gif" title="<bean:message key='yourrhn.jsp.actions.completed'/>" alt="<bean:message key='yourrhn.jsp.actions.completed'/>" /> </c:when> <c:when test="${current.actionStatusId == 3}"> - <img src="/img/rhn-listicon-error.gif" title="<bean:message key="yourrhn.jsp.actions.failed" />" alt="<bean:message key="yourrhn.jsp.actions.failed" />" /> + <img src="/img/rhn-listicon-error.gif" title="<bean:message key='yourrhn.jsp.actions.failed'/>" alt="<bean:message key='yourrhn.jsp.actions.failed'/>" /> </c:when> <c:otherwise> - <i class="spacewalk-icon-unknown-system" title="<bean:message key="yourrhn.jsp.actions.unknown" />"></i> + <i class="spacewalk-icon-unknown-system" title="<bean:message key='yourrhn.jsp.actions.unknown'/>"></i> </c:otherwise> </c:choose> <a href="/rhn/schedule/ActionDetails.do?aid=${current.id}"><c:out value="${current.actionName}" /></a> @@ -36,7 +36,7 @@ style="text-align: center;"> <c:choose> <c:when test="${current.userName != ''}"> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />" /> + <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>" /> ${current.userName} </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp index 5e34b94..70a35c2 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp @@ -18,13 +18,13 @@ <a href="/network/systems/groups/errata_list.pxt?sgid=${current.id}"> <c:choose> <c:when test="${current.mostSevereErrata == 'Security Advisory'}"> - <i class="fa fa-exclamation-triangle fa-1-5x text-danger" title="<bean:message key="grouplist.jsp.security"/>"></i> + <i class="fa fa-exclamation-triangle fa-1-5x text-danger" title="<bean:message key='grouplist.jsp.security'/>"></i> </c:when> <c:when test="${current.mostSevereErrata == 'Bug Fix Advisory' or current.mostSevereErrata == 'Product Enhancement Advisory'}"> - <i class="fa fa-exclamation-circle fa-1-5x text-warning" title="<bean:message key="grouplist.jsp.updates"/>"></i> + <i class="fa fa-exclamation-circle fa-1-5x text-warning" title="<bean:message key='grouplist.jsp.updates'/>"></i> </c:when> <c:otherwise> - <i class="fa fa-check-circle fa-1-5x text-success" title="<bean:message key="grouplist.jsp.noerrata"/>"></i> + <i class="fa fa-check-circle fa-1-5x text-success" title="<bean:message key='grouplist.jsp.noerrata'/>"></i> </c:otherwise> </c:choose> </a> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index b825bae..2afc6a7 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -82,8 +82,8 @@ <th><bean:message key="deployconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="syncprofile.jsp.selection"/>" - title="<bean:message key="syncprofile.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" + title="<bean:message key='syncprofile.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp index 41aead1..103e930 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp @@ -29,7 +29,7 @@ <rhn:listdisplay filterBy="globalconfiglist.jsp.name"> <rhn:column header="globalconfiglist.jsp.name" url="/rhn/configuration/ChannelOverview.do?ccid=${current.id}"> - <i class="spacewalk-icon-software-channels" title="<bean:message key="config.common.globalAlt" />"></i> + <i class="spacewalk-icon-software-channels" title="<bean:message key='config.common.globalAlt'/>"></i> ${current.name} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp index bbfdb39..0925778 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -73,8 +73,8 @@ <th><bean:message key="sdcimportconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="syncprofile.jsp.selection"/>" - title="<bean:message key="syncprofile.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" + title="<bean:message key='syncprofile.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp index 9b8e855..bf49932 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp @@ -41,8 +41,8 @@ <th><bean:message key="deployconfirm.jsp.usedate"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="syncprofile.jsp.selection"/>" - title="<bean:message key="syncprofile.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" + title="<bean:message key='syncprofile.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index a58affe..1aaafc7 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -77,21 +77,21 @@ <div class="checkbox"> <html:checkbox property="errata_type_bug"> <img src="/img/wrh-bug.gif" - title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> <bean:message key="erratalist.jsp.bugadvisory"/> </html:checkbox> </div> <div class="checkbox"> <html:checkbox property="errata_type_security"> <img src="/img/wrh-security.gif" - title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> <bean:message key="erratalist.jsp.securityadvisory"/> </html:checkbox> </div> <div class="checkbox"> <html:checkbox property="errata_type_enhancement"> <img src="/img/wrh-product.gif" - title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> <bean:message key="erratalist.jsp.productenhancementadvisory"/> </html:checkbox> </div> @@ -171,15 +171,15 @@ headerkey="erratalist.jsp.type"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/groups/create.jsp b/java/code/webapp/WEB-INF/pages/groups/create.jsp index cc8824d..a33a736 100644 --- a/java/code/webapp/WEB-INF/pages/groups/create.jsp +++ b/java/code/webapp/WEB-INF/pages/groups/create.jsp @@ -52,7 +52,7 @@ <hr /> <input type="hidden" name="pxt:trap" value="rhn:server_group_create_cb" /> <input type="hidden" name="redirect_to" value="/rhn/systems/SystemGroupList.do" /> - <input type="submit" name="make_group" value="<bean:message key="systemgroup.create.creategroup" />" /> + <input type="submit" name="make_group" value="<bean:message key='systemgroup.create.creategroup'/>" /> --%> <div class="form-group"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp b/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp index f77688c..6cc122b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp @@ -45,7 +45,7 @@ </tr> <tr> <td align="right"> - <input type="submit" value="<bean:message key="kickstart.edit.pkgs.submit.jsp.label" />" /> + <input type="submit" value="<bean:message key='kickstart.edit.pkgs.submit.jsp.label'/>" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp index a7d4f7b..c107d0a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp @@ -74,7 +74,7 @@ </tr> <tr> - <td align="right" colspan="3"><input type="submit" value="<bean:message key="kickstartoptions.jsp.updatekickstart"/>"/></td> + <td align="right" colspan="3"><input type="submit" value="<bean:message key='kickstartoptions.jsp.updatekickstart'/>"/></td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 8e84c6a..0f19a85 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -51,12 +51,12 @@ </rl:column> <rl:column bound="false" headerkey="kickstart.jsp.active" sortattr="active"> <c:if test="${current.active}"> - <img src="/img/rhn-listicon-ok.gif" alt="<bean:message key="kickstart.jsp.active"/>" - title="<bean:message key="kickstart.jsp.active"/>"/> + <img src="/img/rhn-listicon-ok.gif" alt="<bean:message key='kickstart.jsp.active'/>" + title="<bean:message key='kickstart.jsp.active'/>"/> </c:if> <c:if test="${not current.active}"> - <img src="/img/rhn-listicon-error.gif" alt="<bean:message key="kickstart.jsp.inactive"/>" - title="<bean:message key="kickstart.jsp.inactive"/>"/> + <img src="/img/rhn-listicon-error.gif" alt="<bean:message key='kickstart.jsp.inactive'/>" + title="<bean:message key='kickstart.jsp.inactive'/>"/> </c:if> </rl:column> <rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp index ac1bcc3..5e1102f 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp @@ -108,7 +108,7 @@ boolean staticIfDisabled = Boolean.valueOf( </tr> <tr> <td align="right" colspan="2"> - <input type="submit" value="<bean:message key="kickstart.systemdetails.edit.submit.jsp.label" />" /> + <input type="submit" value="<bean:message key='kickstart.systemdetails.edit.submit.jsp.label'/>" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp index 3ad250a..376ff7b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp @@ -132,7 +132,7 @@ function clickNewestTree() { <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> - <input type="button" value="<bean:message key="wizard.jsp.next.step" />" onclick="moveNext();" class="btn btn-default"/> + <input type="button" value="<bean:message key='wizard.jsp.next.step'/>" onclick="moveNext();" class="btn btn-default"/> </div> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp index 49af161..f265b13 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp @@ -79,9 +79,9 @@ function movePrevious() { </tr> <tr> <td colspan="2" align="right"> - <input type="button" value="<bean:message key="wizard.jsp.previous.step" />" onclick="movePrevious();" /> + <input type="button" value="<bean:message key='wizard.jsp.previous.step'/>" onclick="movePrevious();" />    - <input type="button" value="<bean:message key="wizard.jsp.next.step" />" onclick="moveNext();" /> + <input type="button" value="<bean:message key='wizard.jsp.next.step'/>" onclick="moveNext();" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp index 91839e3..8f6b024 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp @@ -61,9 +61,9 @@ function movePrevious() { </tr> <tr> <td colspan="2" align="right"> - <input type="button" value="<bean:message key="wizard.jsp.previous.step" />" onclick="movePrevious();" /> + <input type="button" value="<bean:message key='wizard.jsp.previous.step'/>" onclick="movePrevious();" />    - <input type="submit" value="<bean:message key="wizard.jsp.finish.step" />" onclick="moveNext();" /> + <input type="submit" value="<bean:message key='wizard.jsp.finish.step'/>" onclick="moveNext();" /> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp index 5db7b41..4b368ad 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp @@ -57,8 +57,8 @@ </tr> <tr> <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key="confirm.jsp.selection"/>" - title="<bean:message key="confirm.jsp.selection"/>"/> + alt="<bean:message key='confirm.jsp.selection'/>" + title="<bean:message key='confirm.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp index f1feb0b..906411c 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp @@ -66,8 +66,8 @@ </tr> <tr> <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key="confirm.jsp.selection"/>" - title="<bean:message key="confirm.jsp.selection"/>"/> + alt="<bean:message key='confirm.jsp.selection'/>" + title="<bean:message key='confirm.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp index 889023e..31b1765 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp @@ -71,8 +71,8 @@ </tr> <tr> <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key="confirm.jsp.selection"/>" - title="<bean:message key="confirm.jsp.selection"/>"/> + alt="<bean:message key='confirm.jsp.selection'/>" + title="<bean:message key='confirm.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp index e6b982c..9a527bf 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp @@ -66,8 +66,8 @@ </tr> <tr> <th><img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key="confirm.jsp.selection"/>" - title="<bean:message key="confirm.jsp.selection"/>"/> + alt="<bean:message key='confirm.jsp.selection'/>" + title="<bean:message key='confirm.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp index a487f57..ae1213f 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp @@ -61,7 +61,7 @@ </table> <html:hidden property="submitted" value="true"/> <div class="text-right"><hr> - <input type="submit" name="schedule_remote_command" value="<bean:message key="ssm.operations.provisioning.remotecommand.form.submit" />"> + <input type="submit" name="schedule_remote_command" value="<bean:message key='ssm.operations.provisioning.remotecommand.form.submit'/>"> <input type="hidden" name="use_date" value="true" /> </div> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index 3ee1707..7faa6a9 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -30,7 +30,7 @@ </tr> <tr> - <td><img src="/img/rhn-icon-packages.gif" alt="<bean:message key="ssm.overview.packages"/>" /></td> + <td><img src="/img/rhn-icon-packages.gif" alt="<bean:message key='ssm.overview.packages'/>" /></td> <th><b><bean:message key="ssm.overview.packages"/></b></th> <td><bean:message key="ssm.overview.packages.upgrade"/></td> </tr> @@ -38,7 +38,7 @@ <rhn:require acl="is(enable_solaris_support)"> <tr> <td><img src="/img/rhn-icon-patch.gif" - alt="<bean:message key="ssm.overview.patches"/>"/></td> + alt="<bean:message key='ssm.overview.patches'/>"/></td> <th><bean:message key="ssm.overview.patches"/>:</th> <td> <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> @@ -48,7 +48,7 @@ <tr> <td><img src="/img/rhn-icon-patchset.gif" - alt="<bean:message key="ssm.overview.patch.clusters"/>"/></td> + alt="<bean:message key='ssm.overview.patch.clusters'/>"/></td> <th><bean:message key="ssm.overview.patch.clusters"/>:</th> <td> <bean:message key="ssm.overview.patch.clusters.install"/><br /> </td> @@ -57,14 +57,14 @@ <rhn:require acl="user_role(org_admin)"> <tr> - <td><img src="/img/rhn-icon-system_group.gif" alt="<bean:message key="ssm.overview.groups"/>" /></td> + <td><img src="/img/rhn-icon-system_group.gif" alt="<bean:message key='ssm.overview.groups'/>" /></td> <th><b><bean:message key="ssm.overview.groups"/></b></th> <td><bean:message key="ssm.overview.groups.create"/></td> </tr> </rhn:require> <tr> - <td><img src="/img/rhn-icon-channels.gif" alt="<bean:message key="ssm.overview.channels"/>" /></td> + <td><img src="/img/rhn-icon-channels.gif" alt="<bean:message key='ssm.overview.channels'/>" /></td> <th><b><bean:message key="ssm.overview.channels"/></b></th> <td> <p> @@ -80,7 +80,7 @@ <rhn:require acl="org_entitlement(rhn_provisioning)"> <tr> - <td><img src="/img/rhn-kickstart_profile.gif" alt="<bean:message key="ssm.overview.provisioning"/>" /></td> + <td><img src="/img/rhn-kickstart_profile.gif" alt="<bean:message key='ssm.overview.provisioning'/>" /></td> <th><b><bean:message key="ssm.overview.provisioning"/></b></th> <td> <p> @@ -93,7 +93,7 @@ </rhn:require> <tr> - <td><img src="/img/rhn-icon-form.gif" alt="<bean:message key="ssm.overview.misc"/>" /></td> + <td><img src="/img/rhn-icon-form.gif" alt="<bean:message key='ssm.overview.misc'/>" /></td> <th><b><bean:message key="ssm.overview.misc"/>:</b></th> <td> <p> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp index cacee13..3df38cf 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp @@ -72,7 +72,7 @@ <div class="text-right"> <hr /> - <input type="submit" name="sscd_change_system_prefs" value="<bean:message key="ssm.misc.index.syspref.changepreferences"/>" /> + <input type="submit" name="sscd_change_system_prefs" value="<bean:message key='ssm.misc.index.syspref.changepreferences'/>" /> <input type="hidden" name="do_nothing_redir" value="landing.pxt" /> <input type="hidden" name="pxt:trap" value="rhn:ssm_change_system_prefs_cb" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp index 1ac0908..cf509b6 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp @@ -39,13 +39,13 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false"> <c:if test="${current.securityAdvisory}"> - <img src="/img/wrh-security.gif" title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + <img src="/img/wrh-security.gif" title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> - <img src="/img/wrh-bug.gif" title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + <img src="/img/wrh-bug.gif" title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> - <img src="/img/wrh-product.gif" title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + <img src="/img/wrh-product.gif" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rl:column> @@ -144,7 +144,7 @@ <rhn:csrf /> <div class="text-right"> <hr/> - <input type="submit" name="back" value="<bean:message key="ssm.errata.serverlist.return"/>" /> + <input type="submit" name="back" value="<bean:message key='ssm.errata.serverlist.return'/>" /> </div> </html:form> </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp index e77380e..dbee549 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnote.jsp @@ -16,7 +16,7 @@ <c:when test="${not empty param.cnid}"> <a href="/rhn/systems/details/DeleteCrashNote.do?sid=${sid}&crid=${crid}&cnid=${cnid}"> <i class="fa fa-trash-o" - title="<bean:message key="toolbar.delete.note"/>" ></i> + title="<bean:message key='toolbar.delete.note'/>" ></i> <bean:message key="toolbar.delete.note"/> </a> | @@ -24,15 +24,15 @@ </c:choose> <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> <i class="fa fa-trash-o" - title="<bean:message key="toolbar.delete.crash"/>" ></i> + title="<bean:message key='toolbar.delete.crash'/>" ></i> <bean:message key="toolbar.delete.crash"/> </a> </span> </div> <img src="/img/rhn-icon-bug-ex.gif" - alt="<bean:message key="info.alt.img"/>" - title="<bean:message key="info.alt.img"/>"/> + alt="<bean:message key='info.alt.img'/>" + title="<bean:message key='info.alt.img'/>"/> ${fn:escapeXml(crash.crash)} </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp index ad298aa..69408a8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/crashnotes.jsp @@ -16,23 +16,23 @@ <span class="toolbar"> <a href="/rhn/systems/details/EditCrashNote.do?crid=${crid}&sid=${sid}"> <img src="/img/action-add.gif" - alt="<bean:message key="toolbar.create.crashnote"/>" - title="<bean:message key="toolbar.create.crashnote"/>" /> + alt="<bean:message key='toolbar.create.crashnote'/>" + title="<bean:message key='toolbar.create.crashnote'/>" /> <bean:message key="toolbar.create.crashnote"/> </a> | <a href="/rhn/systems/details/SoftwareCrashDelete.do?crid=${crid}&sid=${sid}"> <img src="/img/action-del.gif" - alt="<bean:message key="toolbar.delete.crash"/>" - title="<bean:message key="toolbar.delete.crash"/>" /> + alt="<bean:message key='toolbar.delete.crash'/>" + title="<bean:message key='toolbar.delete.crash'/>" /> <bean:message key="toolbar.delete.crash"/> </a> </span> </div> <img src="/img/rhn-icon-bug-ex.gif" - alt="<bean:message key="info.alt.img"/>" - title="<bean:message key="info.alt.img"/>"/> + alt="<bean:message key='info.alt.img'/>" + title="<bean:message key='info.alt.img'/>"/> ${fn:escapeXml(crash.crash)} </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp index 6661cbc..2ad8557 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdeleteconfirm.jsp @@ -36,7 +36,7 @@ </rl:list> <p align="right"> - <input type="submit" name="dispatch" value="<bean:message key="confirm.jsp.confirm"/>"> + <input type="submit" name="dispatch" value="<bean:message key='confirm.jsp.confirm'/>"> </p> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp index 9ee143f..3fbc911 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp @@ -17,8 +17,8 @@ <c:when test="${not empty testResult.comparableId}"> <a href="/rhn/audit/scap/DiffSubmit.do?first=${testResult.comparableId}&second=${testResult.id}&view=changed"> <img src="/img/rhn-listicon-${testResult.diffIcon}.gif" - alt="<bean:message key="scapdiff.jsp.i.${testResult.diffIcon}"/>" - title="<bean:message key="scapdiff.jsp.i.${testResult.diffIcon}"/>"/> + alt="<bean:message key='scapdiff.jsp.i.${testResult.diffIcon}'/>" + title="<bean:message key='scapdiff.jsp.i.${testResult.diffIcon}'/>"/> <bean:message key="system.audit.xccdfdetails.jsp.diff"/> </a> </c:when> @@ -31,14 +31,14 @@ <c:if test="${testResult.deletable}"> <a href="/rhn/systems/details/audit/XccdfDeleteConfirm.do?sid=${param.sid}&xid=${testResult.id}"> <i class="fa fa-trash-o" - title="<bean:message key="system.audit.xccdfdelete"/>"></i> + title="<bean:message key='system.audit.xccdfdelete'/>"></i> <bean:message key="system.audit.xccdfdelete"/> </a> | </c:if> <a href="/rhn/systems/details/audit/ScheduleXccdf.do?sid=${param.sid}&path=${testResult.scapActionDetails.path}&params=${testResult.scapActionDetails.parametersContents}"> - <img src="/img/restart.png" alt="<bean:message key="system.audit.xccdfdetails.jsp.reschedule"/>"/> + <img src="/img/restart.png" alt="<bean:message key='system.audit.xccdfdetails.jsp.reschedule'/>"/> <bean:message key="system.audit.xccdfdetails.jsp.reschedule"/> </a> </div> @@ -62,7 +62,7 @@ <tr> <th><bean:message key="configoverview.jsp.scheduledBy"/>:</th> <td> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />"/> + <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>"/> <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${testResult.scapActionDetails.parentAction.id}"> <c:out value="${testResult.scapActionDetails.parentAction.schedulerUser.login}"/> </a> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp index 5511eb4..a06adfc 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp @@ -53,8 +53,8 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="confirm.jsp.selection"/>" - title="<bean:message key="confirm.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='confirm.jsp.selection'/>" + title="<bean:message key='confirm.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp index c16aeab..37d96a7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp @@ -51,8 +51,8 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="confirm.jsp.selection"/>" - title="<bean:message key="confirm.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='confirm.jsp.selection'/>" + title="<bean:message key='confirm.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp index 62a7ff4..de08136 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp @@ -52,8 +52,8 @@ <th><bean:message key="confirm.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="confirm.jsp.selection"/>" - title="<bean:message key="confirm.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='confirm.jsp.selection'/>" + title="<bean:message key='confirm.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp index e90ffd1..5817a54 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp @@ -70,7 +70,7 @@ <c:if test="${requestScope.showApplyErrata == 'false'}"> <rl:column headerkey="emptyspace.jsp" styleclass="text-align: center;"> <img src="/img/icon_pending.gif" - title="<bean:message key="errata.jsp.scheduled"/>" /> + title="<bean:message key='errata.jsp.scheduled'/>" /> </rl:column> </c:if> @@ -85,15 +85,15 @@ bound="false"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp index 3940be9..08e2a44 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp @@ -32,15 +32,15 @@ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;"> <c:if test="${current.securityAdvisory}"> <img src="/img/wrh-security.gif" - title="<bean:message key="erratalist.jsp.securityadvisory"/>" /> + title="<bean:message key='erratalist.jsp.securityadvisory'/>" /> </c:if> <c:if test="${current.bugFix}"> <img src="/img/wrh-bug.gif" - title="<bean:message key="erratalist.jsp.bugadvisory"/>" /> + title="<bean:message key='erratalist.jsp.bugadvisory'/>" /> </c:if> <c:if test="${current.productEnhancement}"> <img src="/img/wrh-product.gif" - title="<bean:message key="erratalist.jsp.productenhancementadvisory"/>" /> + title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>" /> </c:if> </rl:column> @@ -68,8 +68,8 @@ <th><bean:message key="syncprofile.jsp.than"/></th> </tr> <tr> - <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key="syncprofile.jsp.selection"/>" - title="<bean:message key="syncprofile.jsp.selection"/>"/> + <th><img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='syncprofile.jsp.selection'/>" + title="<bean:message key='syncprofile.jsp.selection'/>"/> </th> <td> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index 750301f..86c31cf 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -90,7 +90,7 @@ sortattr="nameOfUserWhoRegisteredSystem" > <c:choose> <c:when test="${current.creatorName != null}"> - <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />" /> + <img src="/img/rhn-listicon-user.gif" alt="<bean:message key='yourrhn.jsp.user.alt'/>" /> <c:out value="${current.creatorName}"/> </c:when> <c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp index ca170a2..5568381 100644 --- a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp @@ -79,7 +79,7 @@ <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> <button type="submit" name="schedule" class="btn btn-success" - value="<bean:message key="ssm.operations.provisioning.remotecommand.form.submit" />"> + value="<bean:message key='ssm.operations.provisioning.remotecommand.form.submit'/>"> <bean:message key="ssm.operations.provisioning.remotecommand.form.submit" /> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp index 649d3a7..699988e 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp @@ -37,7 +37,7 @@ bound="false" headerkey="systemlist.jsp.system" sortattr="name" > - <img src="/img/rhn-listicon-system.gif" alt="<bean:message key="systemlist.jsp.nonvirt"/>" /> + <img src="/img/rhn-listicon-system.gif" alt="<bean:message key='systemlist.jsp.nonvirt'/>" /> <c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" /> <c:choose> <c:when test="${empty current.name}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp index a58938e..d8e55a2 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp @@ -42,7 +42,7 @@ <div class="col-lg-6"> <select name="view_mode" id="fieldtosearch" class="form-control"> <c:forEach items="${optGroupsKeys}" var="key"> - <optgroup label="<bean:message key="${key}"/>"> + <optgroup label="<bean:message key='${key}'/>"> <c:forEach items="${optGroupsMap[key]}" var="option"> <c:choose> <c:when test="${view_mode == option['value']}"> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp index 9a0f118..b2857a4 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp @@ -29,7 +29,7 @@ <div class="col-lg-offset-3 col-lg-6"> <button type="submit" class="btn btn-success" - value="<bean:message key="button.update"/>"> + value="<bean:message key='button.update'/>"> <bean:message key="button.update"/> </button> </div> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp index c96d593..ea2d14f 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp @@ -36,7 +36,7 @@ <div class="col-lg-offset-3 col-lg-6"> <button type="submit" class="btn btn-success" - value="<bean:message key="message.Update"/>" + value="<bean:message key='message.Update'/>" <c:if test="${empty mailableAddress}">disabled="disabled"</c:if> > <bean:message key="message.Update"/> </button> commit 7ac1b314a7cac95a577d0907e9d9c54066e5133a Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 6 22:49:40 2013 +0100 To avoid losing the image alternate, add iconAlt. For the miscImg, as it is called miscAlt, we will use the same attribute for the miscIcon, for name consistency. diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index 95e7833..f9f7dfe 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -35,6 +35,7 @@ import com.redhat.rhn.manager.acl.AclManager; * <ul> * <li>base - base html tag for wrapping the toolbar. * <li>icon - name of the icon (css class) to be displayed to the left of the page title + * <li>iconAlt - alternate text for the icon. Don't use it if the icon decorates text. * <li>img - img url which is displayed to the left of the page title. * <li>altImg - alt text for the img * <li>helpUrl - link to the help pages. @@ -71,6 +72,7 @@ public class ToolbarTag extends TagSupport { private String img; private String imgAlt; private String icon; + private String iconAlt; private String helpUrl; private String aclMixins; private String miscImg; @@ -184,6 +186,21 @@ public class ToolbarTag extends TagSupport { } /** + * @return Returns the localization key that will resolve to the alt text of the icon. + */ + public String getIconAlt() { + return iconAlt; + } + + /** + * @param iconAltIn Sets the localization key that will resolve + * to the alt text of the icon + */ + public void setIconAlt(String iconAltIn) { + this.iconAlt = iconAltIn; + } + + /** * Sets the image location which is displayed. * @param imgurl the location of the image. */ @@ -657,6 +674,10 @@ public class ToolbarTag extends TagSupport { if (assertNotEmpty(iconName)) { HtmlTag i = new HtmlTag("i"); i.setAttribute("class", "fa " + iconName); + // Research should be done if would't be better to + // use a sr-only div (Screeen-Reader only) instead of + // title. + i.setAttribute("title", alt); a.addBody(i.renderOpenTag()); a.addBody(i.renderCloseTag()); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld index 02b7d29..0014d89 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld @@ -272,6 +272,11 @@ <required>false</required> <rtexprvalue>true</rtexprvalue> </attribute> + <attribute> + <name>iconAlt</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> </tag> <tag> commit 32914e3e5cfc5291a0a80eb1b3974b81b473b95c Author: cyntss <csanchez(a)suse.com> Date: Wed Nov 6 16:29:34 2013 +0100 Jumbotron replaced for Panel diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp index c2cf7ff..f3ed444 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp @@ -9,13 +9,12 @@ <bean:message key="disableself.jsp.account_deactivation" /> </rhn:toolbar> <form method="post" name="rhn_list" action="/rhn/account/AccountDeactivationSubmit.do"> - <div class="jumbotron"> - <div class="container"> + <div class="panel panel-default"> + <div class="panel-body"> <p><bean:message key="disableself.jsp.message" /></p> <rhn:csrf /> - <br/> <p> - <html:submit styleClass="btn btn-danger btn-lg"> + <html:submit styleClass="btn btn-danger"> <bean:message key="disableself.jsp.deactivate"/> </html:submit> </p> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp index 6bf759b..ba3b0ff 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp @@ -9,11 +9,10 @@ <bean:message key="disableselfconfirm.jsp.warning_question" /> </rhn:toolbar> <form method="POST" name="rhn_list" action="/rhn/account/AccountDeactivationConfirm.do"> - <div class="jumbotron"> - <div class="container"> + <div class="panel panel-default"> + <div class="panel-body"> <p><bean:message key="disableselfconfirm.jsp.warning" /></p> - <br/> - <html:submit styleClass="btn btn-danger btn-lg"> + <html:submit styleClass="btn btn-danger"> <bean:message key="disableself.jsp.deactivate"/> </html:submit> <html:hidden property="submitted" value="true" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp index 17918a5..79551fc 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp @@ -9,14 +9,15 @@ <c:out escapeXml="true" value="${targetuser.login}" /> </rhn:toolbar> <form method="POST" action="/rhn/users/DeleteUserSubmit.do?uid=${param.uid}"> - <div class="jumbotron"> - <div class="container"> + <div class="panel panel-default"> + <div class="panel-heading"> <h2><bean:message key="deleteuser.jsp.confirm"/></h2> + </div> + <div class="panel-body"> <p><bean:message key="deleteuser.jsp.body"/></p> - <br/> <p> <rhn:csrf /> - <html:submit styleClass="btn btn-danger btn-lg"> + <html:submit styleClass="btn btn-danger"> <bean:message key="deleteuser.jsp.delete"/> </html:submit> </p> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp index da79d8f..41430a4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp @@ -9,13 +9,14 @@ <c:out escapeXml="true" value="${targetuser.login}" /> </rhn:toolbar> <form method="POST" action="/rhn/users/DisableUserSubmit.do?uid=${param.uid}"> - <div class="jumbotron"> - <div class="container"> + <div class="panel panel-default"> + <div class="panel-heading"> <h2><bean:message key="disableuser.jsp.confirm"/></h2> + </div> + <div class="panel-body"> <p><bean:message key="disableuser.jsp.body"/></p> - <br/> <rhn:csrf /> - <html:submit styleClass="btn btn-danger btn-lg"> + <html:submit styleClass="btn btn-danger"> <bean:message key="disableuser.jsp.disable"/> </html:submit> </div> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp index e3cc864..6804d1b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp @@ -9,16 +9,20 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> <form method="POST" action="/rhn/users/EnableUserSubmit.do?uid=${param.uid}"> - <div class="jumbotron"> - <h2><bean:message key="enableuser.jsp.confirm"/></h2> - <p><bean:message key="enableuser.jsp.body"/></p> - <rhn:csrf /> - <br/> - <p> - <html:submit styleClass="btn btn-success btn-lg"> - <bean:message key="enableuser.jsp.enable"/> - </html:submit> - </p> + <div class="panel panel-default"> + <div class="panel-heading"> + <h2><bean:message key="enableuser.jsp.confirm"/></h2> + </div> + <div class="panel-body"> + <p><bean:message key="enableuser.jsp.body"/></p> + <rhn:csrf /> + <br/> + <p> + <html:submit styleClass="btn btn-success"> + <bean:message key="enableuser.jsp.enable"/> + </html:submit> + </p> + </div> </div> </form> </body> commit cc7afdb9e238a7f582b1e85585c834a846c4500e Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 6 12:47:53 2013 +0100 uniqueList is lazy and starts as null, use the getter which does the lazy initialization. diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 2f86da0..8d76f54 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -408,14 +408,14 @@ public class ListTag extends BodyTagSupport { // print the hidden fields after the list widget is printed // but before the form of the listset is closed. ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, - ListTagUtil.makeFilterSearchParentLabel(uniqueName), + ListTagUtil.makeFilterSearchParentLabel(getUniqueName()), searchParent)); ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, - ListTagUtil.makeFilterSearchChildLabel(uniqueName), + ListTagUtil.makeFilterSearchChildLabel(getUniqueName()), searchChild)); ListTagUtil.write(pageContext, String.format(HIDDEN_TEXT, - ListTagUtil.makeParentIsAnElementLabel(uniqueName), + ListTagUtil.makeParentIsAnElementLabel(getUniqueName()), parentIsElement)); // here decorators should insert other e.g hidden input fields @@ -850,7 +850,7 @@ public class ListTag extends BodyTagSupport { manip.setAlphaColumn(alphaBarColumn); manip.filter(filter, pageContext); if (!StringUtils.isBlank(ListTagHelper. - getFilterValue(pageContext.getRequest(), uniqueName))) { + getFilterValue(pageContext.getRequest(), getUniqueName()))) { LocalizationService ls = LocalizationService.getInstance(); ListTagUtil.write(pageContext, "<div class=\"site-info\">"); @@ -894,7 +894,7 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, ls.getMessage( "listtag.all_items_in_filter", ListTagHelper.getFilterValue(pageContext.getRequest(), - uniqueName))); + getUniqueName()))); } ListTagUtil.write(pageContext, "</div>"); commit 5becee1dd1465deb47dcca3bc96145b7f8eed08d Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 6 12:46:42 2013 +0100 This is the reason decorators could not find the ListCommand. Using the wrong Id. No need to initialize with a initial command. Fixes crash: List with Decorators diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 0cfa5a4..2f86da0 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -99,12 +99,6 @@ public class ListTag extends BodyTagSupport { private boolean searchParent = true; private boolean searchChild; - @Override - public void setPageContext(PageContext ctx) { - super.setPageContext(ctx); - ListTagUtil.setCurrentCommand(ctx, getUniqueName(), ListCommand.ENUMERATE); - } - /** * @param searchParentIn The searchParent to set. */ @@ -836,7 +830,7 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, ""); String listId = (getStyleId() != null) ? getStyleId() : getUniqueName(); - ListTagUtil.setCurrentCommand(pageContext, listId, + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), ListCommand.ENUMERATE); for (ListDecorator dec : getDecorators()) { commit 63b6df94a4cce2a7961040ec765fb37c573abb64 Author: Bo Maryniuk <bo(a)suse.de> Date: Wed Nov 6 12:35:37 2013 +0100 Check style fixes diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java index ce94bb1..69bf42f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java @@ -36,12 +36,14 @@ import com.redhat.rhn.frontend.dto.SystemOverviewComparator; public class RendererHelper { private static final String FULL_TABLE_HEADER = - "<div class=\"spacewalk-full-table panel panel-default\"><div class=\"panel-heading\"><h3 class=\"panel-title\">"; + "<div class=\"spacewalk-full-table panel panel-default\">" + + "<div class=\"panel-heading\"><h3 class=\"panel-title\">"; private static final String FULL_TABLE_FOOTER = "</div></div>"; - private static final String HALF_TABLE_HEADER = - "<div class=\"spacewalk-half-table panel panel-default\"><div class=\"panel-heading\"><h3 class=\"panel-title\">"; + private static final String HALF_TABLE_HEADER = + "<div class=\"spacewalk-half-table panel panel-default\">" + + "<div class=\"panel-heading\"><h3 class=\"panel-title\">"; private static final String HALF_TABLE_FOOTER = "</div></div>"; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java index 91b70d3..e18f537 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java @@ -103,9 +103,10 @@ public class DWRItemSelector { Boolean systemsRelated = RhnSetDecl.SYSTEMS.getLabel().equals(setLabel); if (systemsRelated) { StringBuffer headerMessage = new StringBuffer(); - headerMessage.append("<span id='spacewalk-set-system_list-counter' class='badge'>"); - headerMessage.append(Integer.toString(setSize)); - headerMessage.append("</span>"); + headerMessage.append("<span id='spacewalk-set-system_list-counter'") + .append(" class='badge'>") + .append(Integer.toString(setSize)) + .append("</span>"); if (setSize == 1) { headerMessage.append(ls.getMessage("header.jsp.singleSystemSelected")); } @@ -124,9 +125,9 @@ public class DWRItemSelector { paginationMessage = ls.getMessage("message.numselected", Integer.toString(setSize)); } - responseText.append("\"pagination\":\""). - append(paginationMessage). - append("\""); + responseText.append("\"pagination\":\"") + .append(paginationMessage) + .append("\""); return "({" + responseText.toString() + "})"; } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 705458b..d9c7a60 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -495,7 +495,8 @@ public class ListDisplayTag extends ListDisplayTagBase { buf.append(addButtonTo(buf, RequestContext.DISPATCH, UPDATE_LIST_KEY, "update_list_key_id").render()); buf.append(" "); - buf.append(addButtonTo(buf, RequestContext.DISPATCH, SELECT_ALL_KEY).render()); + buf.append(addButtonTo(buf, + RequestContext.DISPATCH, SELECT_ALL_KEY).render()); if (numItemsChecked > 0) { buf.append(" "); @@ -626,16 +627,18 @@ public class ListDisplayTag extends ListDisplayTagBase { if (getButton() != null && AclManager.hasAcl(getButtonAcl(), (HttpServletRequest) pageContext.getRequest(), getMixins())) { - out.println("<button class=\"btn btn-default\" type=\"submit\" name=\"dispatch\">" + - LocalizationService.getInstance().getMessage(getButton()) + - "</button>"); + out.println("<button class=\"btn btn-default\"" + + " type=\"submit\" name=\"dispatch\">" + + LocalizationService.getInstance().getMessage(getButton()) + + "</button>"); } if (getButton2() != null && AclManager.hasAcl(getButton2Acl(), (HttpServletRequest) pageContext.getRequest(), getMixins())) { - out.println("<button class=\"btn btn-default\" type=\"submit\" name=\"dispatch\">" + - LocalizationService.getInstance().getMessage(getButton2()) + - "</button>"); + out.println("<button class=\"btn btn-default\"" + + " type=\"submit\" name=\"dispatch\">" + + LocalizationService.getInstance().getMessage(getButton2()) + + "</button>"); } out.println("</div>"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java index 8ccdafc..55c677a 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTagBase.java @@ -1,3 +1,18 @@ +/** + * Copyright (c) 2009--2011 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + package com.redhat.rhn.frontend.taglibs; import java.io.IOException; @@ -19,6 +34,11 @@ import com.redhat.rhn.common.util.ExportWriter; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.struts.RequestContext; +/** + * Base class for ListDisplayTag implementation. + * + * @author bo + */ public class ListDisplayTagBase extends BodyTagSupport { public static final String FILTER_DISPATCH = "filter.dispatch"; @@ -77,7 +97,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Returns the title message key. - * + * * @return Returns the title. */ public String getTitle() { @@ -86,7 +106,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Sets the title message key. - * + * * @param titleIn * The title to set. */ @@ -96,7 +116,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Sets the type of the list - * + * * @param stringIn * desired alignment for the list */ @@ -106,7 +126,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Gets the type of the list - * + * * @return String alignment of the list */ public String getType() { @@ -115,7 +135,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Set the header of the filter on which to filter - * + * * @param filterByIn * The filterBy to set. */ @@ -141,7 +161,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Method to fetch a new ExportWriter instance. Override if desired to use * different instance. Currently creates a new CSVWriter instance. - * + * * @return new instance of an ExportWriter */ protected ExportWriter createExportWriter() { @@ -165,7 +185,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Get the number of the column that is being rendered at this moment. (0 == * The first column) - * + * * @return int the column number **/ public int getColumnCount() { @@ -174,7 +194,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Get the number of columns in the list. - * + * * @return int the number of columns **/ public int getNumberOfColumns() { @@ -183,7 +203,7 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Set the number of columns in the list. - * + * * @param num * number of columns i nthe list **/ @@ -193,10 +213,10 @@ public class ListDisplayTagBase extends BodyTagSupport { /** * Set the column # that is being rendered at this moment - * + * * Used when 'colspan' is used for an element to skip over the intervening * columns. - * + * * @param columnCountIn * The column count to set. **/ @@ -221,8 +241,8 @@ public class ListDisplayTagBase extends BodyTagSupport { protected void setupPageList() throws JspTagException { ListTag listTag = (ListTag) findAncestorWithClass(this, ListTag.class); if (listTag == null) { - throw new JspTagException("Tag nesting error: " - + "listDisplay must be nested in a list tag"); + throw new JspTagException("Tag nesting error: " + + "listDisplay must be nested in a list tag"); } pageList = listTag.getPageList(); iterator = pageList.iterator(); @@ -246,9 +266,9 @@ public class ListDisplayTagBase extends BodyTagSupport { } renderHeadExtraAddons(headAddons); - int headContentLength = headFilterContent.getBuffer().length() - + titleContent.getBuffer().length() - + headAddons.getBuffer().length(); + int headContentLength = headFilterContent.getBuffer().length() + + titleContent.getBuffer().length() + + headAddons.getBuffer().length(); if (headContentLength > 0) { out.println("<div class=\"panel-heading\">"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java index 281a854..32c030e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java @@ -53,18 +53,16 @@ public class SystemSetDisplayTag extends TagSupport { if (rs != null) { size = rs.size(); } + StringBuilder result = new StringBuilder(); - result.append("<span id=\"spacewalk-set-system_list-counter\" class=\"badge\">"); - result.append(Integer.toString(size)); - result.append("</span>"); - String msgKey; - if (size == 1) { - msgKey = "header.jsp.singleSystemSelected"; - } - else { - msgKey = "header.jsp.systemsSelected"; - } - result.append(LocalizationService.getInstance().getMessage(msgKey)); + result.append("<span id=\"spacewalk-set-system_list-counter\" ") + .append("class=\"badge\">") + .append(Integer.toString(size)) + .append("</span>") + .append(LocalizationService.getInstance() + .getMessage(size == 1 ? + "header.jsp.singleSystemSelected" : + "header.jsp.systemsSelected")); out.println(result); return EVAL_PAGE; } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index ca9cbac..95e7833 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -646,15 +646,15 @@ public class ToolbarTag extends TagSupport { HtmlTag a = new HtmlTag("a"); a.setAttribute("href", url); - if(assertNotEmpty(imgName)) { - HtmlTag imgTag = new HtmlTag("img"); - imgTag.setAttribute("src", "/img/" + imgName); - imgTag.setAttribute("alt", alt); - imgTag.setAttribute("title", alt); - a.addBody(imgTag); + if (assertNotEmpty(imgName)) { + HtmlTag imgTag = new HtmlTag("img"); + imgTag.setAttribute("src", "/img/" + imgName); + imgTag.setAttribute("alt", alt); + imgTag.setAttribute("title", alt); + a.addBody(imgTag); } - if(assertNotEmpty(iconName)) { + if (assertNotEmpty(iconName)) { HtmlTag i = new HtmlTag("i"); i.setAttribute("class", "fa " + iconName); a.addBody(i.renderOpenTag()); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java index 76b5112..6572d0a 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java @@ -148,13 +148,14 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase { super.renderHeadExtraAddons(out); LocalizationService ls = LocalizationService.getInstance(); if (getType().equals("treeview")) { - out.append("<div class=\"spacewalk-list-channel-show-hide\">" - + - "<a class=\"spacewalk-list-channel-show-all\" href=\"javascript:showAllRows();\" style=\"cursor: pointer;\">" + - ls.getMessage("channels.overview.showall") + - "</a>  |  " + - "<a class=\"spacewalk-list-channel-hide-all\" href=\"javascript:hideAllRows();\" style=\"cursor: pointer;\">" + - ls.getMessage("channels.overview.hideall") + "</a></div>"); + out.append("<div class=\"spacewalk-list-channel-show-hide\">" + + "<a class=\"spacewalk-list-channel-show-all\"" + + " href=\"javascript:showAllRows();\" style=\"cursor: pointer;\">" + + ls.getMessage("channels.overview.showall") + + "</a>  |  " + + "<a class=\"spacewalk-list-channel-hide-all\"" + + " href=\"javascript:hideAllRows();\" style=\"cursor: pointer;\">" + + ls.getMessage("channels.overview.hideall") + "</a></div>"); } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java index cb5099c..a9851ca 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/AlphaBarHelper.java @@ -83,7 +83,7 @@ public class AlphaBarHelper { */ public void writeAlphaBar(PageContext pageContext, Set<Character> activeChars, String listName) throws JspException { - + ListTagUtil.write(pageContext, "<ul class=\"spacewalk-alphabar pagination pagination-sm\">"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 8be912f..0cfa5a4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -490,7 +490,7 @@ public class ListTag extends BodyTagSupport { } } pageContext.popBody(); - + int topContentLength = topAddonsContent.getBuffer().length() + topAlphaBarContent.getBuffer().length() + topPaginationContent.getBuffer().length() + diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java index af145f4..e3e55e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ListDecorator.java @@ -77,7 +77,7 @@ public interface ListDecorator { /** * Use this hook to insert content before the top pagination - * + * * @throws JspException * exception */ @@ -85,7 +85,7 @@ public interface ListDecorator { /** * With this hook one can insert content before the list - * + * * @throws JspException * exception */ @@ -93,7 +93,7 @@ public interface ListDecorator { /** * With this hook one can insert content in the heading - * + * * @throws JspException * exception */ @@ -101,7 +101,7 @@ public interface ListDecorator { /** * With this hook one can insert content in the footer - * + * * @throws JspException * exception */ @@ -109,7 +109,7 @@ public interface ListDecorator { /** * With this hook one can insert content after the list - * + * * @throws JspException * exception */ @@ -117,7 +117,7 @@ public interface ListDecorator { /** * With this hook one can insert extra addons in the before the list - * + * * @throws JspException * something bad happened */ @@ -125,7 +125,7 @@ public interface ListDecorator { /** * With this hook one can insert extra addons in the heading - * + * * @throws JspException * something bad happened */ @@ -133,7 +133,7 @@ public interface ListDecorator { /** * With this hook one can insert extra addons in the footer - * + * * @throws JspException * something bad happened */ @@ -141,7 +141,7 @@ public interface ListDecorator { /** * With this hook one can insert extra addons after the list - * + * * @throws JspException * something bad happened */ diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java index b5e6a4e..08d4425 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java @@ -115,7 +115,7 @@ public class PageSizeDecorator extends BaseListDecorator { HtmlTag select = new HtmlTag("Select"); select.setAttribute("name", makePageSizeLabel(listName)); select.setAttribute("onChange", makeOnChangeScript()); - select.setAttribute("class","display-number"); + select.setAttribute("class", "display-number"); for (int size : PAGE_SIZE) { HtmlTag option = new HtmlTag("option"); commit 6862793d5a413b8b2d41b0d69f5ed8246a8131a2 Author: cyntss <csanchez(a)suse.com> Date: Tue Nov 5 17:10:02 2013 +0100 Font updated diff --git a/branding/fonts/font-spacewalk/css/spacewalk-font.css b/branding/fonts/font-spacewalk/css/spacewalk-font.css index c3d4d30..9b3c5ba 100644 --- a/branding/fonts/font-spacewalk/css/spacewalk-font.css +++ b/branding/fonts/font-spacewalk/css/spacewalk-font.css @@ -128,9 +128,6 @@ .spacewalk-icon-manage-configuration-files:before { content: "\e622"; } -.spacewalk-icon-schedule2:before { - content: "\e623"; -} .spacewalk-icon-clone-patches:before { content: "\e624"; } @@ -176,9 +173,6 @@ .spacewalk-icon-organization-trust:before { content: "\e632"; } -.spacewalk-icon-unknown-system:before { - content: "\e633"; -} .spacewalk-icon-virtual-guest:before { content: "\e634"; } @@ -197,3 +191,6 @@ .spacewalk-icon-virtual-host:before { content: "\e639"; } +.spacewalk-icon-unknown-system:before { + content: "\e633"; +} diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.eot b/branding/fonts/font-spacewalk/font/spacewalk-icon.eot index ea12ace..796441c 100755 Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.eot and b/branding/fonts/font-spacewalk/font/spacewalk-icon.eot differ diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.svg b/branding/fonts/font-spacewalk/font/spacewalk-icon.svg index 46d5e33..d99c454 100755 --- a/branding/fonts/font-spacewalk/font/spacewalk-icon.svg +++ b/branding/fonts/font-spacewalk/font/spacewalk-icon.svg @@ -42,7 +42,6 @@ <glyph unicode="" d="M510 958.875c-281.665 0-510-228.335-510-510 0-22.673 1.507-44.984 4.375-66.875 2.193 4.532 4.453 8.009 5.875 10l0.25 0.375c9.717 13.361 21.684 25.891 37.563 41.625 7.939 7.867 16.090 15.519 24.688 22.375 4.299 3.428 8.584 6.64 14.375 10 5.791 3.36 11.622 8.875 30.75 8.875 17.755 0 30.043-6.938 38.625-13.375l0.313-0.188 0.313-0.25 7.75-6c1.22 6.502 2.658 13.116 4.438 19.875 0.011 0.045 0.051 0.080 0.063 0.125 0.056 0.211 0.069 0.414 0.125 0.625h0.063c6.86 25.867 32.257 46.375 60.188 46.375h77.625c5.401 0 10.7-0.706 15.813-2 28.796 75.1 101.58 128.438 186.813 128.438 110.457 0 200-89.543 200-200 0-84.589-52.545-156.889-126.75-186.125 2.088-6.384 3.188-13.131 3.188-20.063v-77.625c0-15.769-4.929-26.967-12.5-37.188s-19.343-20.408-37.5-23.813l-0.875-0.188-0.813-0.125-16.188-2.438c1.813-2.219 3.447-4.356 5.313-6.625 0.214-0.261 0.41-0.488 0.625-0.75l-0.063-0.063c8.337-9.975 14.813-22.678 14.813-40 0-12.907-6.444-28.269-13.188-37.438l0.188-0.188c-0.525-0 .699-1.329-1.482-1.875-2.188-0.068-0.088-0.119-0.225-0.188-0.313-8.87-11.437-20.255-23.658-35.063-38.375-7.919-7.87-16.040-15.492-24.625-22.375-4.292-3.442-8.583-6.743-14.375-10.125-0.196-0.114-0.429-0.256-0.625-0.375 19.85-2.347 40.018-3.625 60.5-3.625 281.665 0 510 228.335 510 510 0 281.665-228.335 510-510 510zM510 600.312c-70.334 0-129.471-47.941-146.5-112.938 2.421-5.261 4.161-11.018 5.063-17.25h0.125l0.25-1.688 2.125-13.938 10.188 7.688 0.125-0.188c12.323 9.899 25.614 13.25 37.938 13.25 1.067 0 2.092-0.077 3.125-0.125 11.285 37.699 46.195 65.188 87.563 65.188 50.495 0 91.438-40.943 91.438-91.438 0-41.027-27.030-75.734-64.25-87.313 0.216-2.18 0.313-4.271 0.313-6.25 0-14.103-6.637-29.18-12-36.688l-0.25-0.313-0.188-0.313c-3.087-4.177-5.536-7.265-8.563-11.188l17.938-2.75 0.563-0.125 0.563-0.063c3.234-0.571 6.343-1.385 9.313-2.375 66.819 15.754 116.563 75.748 116.563 147.375 0 83.632-67.806 151.438-151.438 151.438zM229.75 473.125c-6.295 0-11.164-4.155-12.563-9.75-5.595-20.98 2-7.74-43.731-10.188-65.063-10.841-3.497-21.671-8.067-31.813-13.313l-48.25 37.438c-2.798 2.098-5.915 3.5-9.063 3.5-11.89 0-59.107-51.085-67.5-62.625-1.749-2.448-3.188-4.853-3.188-8 0-3.147 1.402-5.99 3.5-8.438 12.939-15.737 25.548-31.464 37.438-48.25-5.595-10.491-10.128-20.935-13.625-32.125l-65.063-9.813c-5.246-1.049-9.438-7.379-9.438-12.625v-77.625c0-5.945 4.18-11.513 10.125-12.563l64-9.438c3.497-11.89 8.43-23.435 14.375-34.625-11.89-16.436-24.86-31.851-36.75-47.938-1.749-2.448-2.813-4.853-2.813-8 0-2.798 0.751-5.615 2.5-8.063 14.687-20.283 39.153-41.964 57.688-58.75 2.448-2.448 5.603-3.875 8.75-3.875 3.147 0 6.24 1.089 8.688 3.188l49.313 37.375c10.141-5.246 20.659-9.44 31.5-12.938l9.813-64.313c0.699-5.945 6.268-10.5 12.563-10.5h77.625c6.295 0 11.226 4.217 12.625 9.813 5.595 20.982 7.677 43.668 10.125 65 10.841 3.497 21.671 8.067 31.813 13.313l48.25-37.75c2.798-1.749 5.978-3.188 9.125-3.188 11.89 0 59.107 51.435 67.5 62.625 2.098 2.448 3.125 4.915 3.125 8.063 0 3.147-1.402 6.24-3.5 8.688-12.939 15.737-25.548 31.177-37.438 48.313 5.595 10.141 9.841 20.622 13.688 31.813l64.688 9.75c5.595 1.049 9.75 7.379 9.75 12.625v77.625c0 5.945-4.18 11.513-10.125 12.563l-64 9.813c-3.497 11.54-8.368 23.060-14.313 34.25 11.89 16.436 24.798 31.851 36.688 47.938 1.749 2.448 2.813 4.915 2.813 8.063 0 2.798-0.689 5.589-2.438 7.688-14.687 20.632-39.153 42.302-57.688 59.438-2.448 2.098-5.603 3.5-8.75 3.5-3.147 0-6.339-1.027-8.438-3.125l-49.625-37.438c-10.141 5.246-20.659 9.44-31.5 12.938l-9.75 64.313c-0.699 5.945-6.33 10.5-12.625 10.5h-77.625zM268.563 294.125c49.308 0 89.563-40.255 89.563-89.563s-40.255-89.5-89.563-89.5c-49.308 0-89.5 40.192-89.5 89.5 0 49.308 40.192 89.563 89.5 89.563zM268.563 244.812c-22.502 0-40.188-17.686-40.188-40.188s17.686-40.25 40.188-40.25c22.502 0 40.25 17.748 40.25 40.25 0 22.502-17.748 40.188-40.25 40.188z" /> <glyph unicode="" d="M74.063 956.062c-19.457 0-35.125-21.011-35.125-47.063v-94.5h134.313v94.5c0 26.052-15.606 47.063-35.063 47.063h-64.125zM374.5 956.062c-19.457 0-35.125-21.011-35.125-47.063v-403h134.188c0.043 0.040 0.082 0.085 0.125 0.125v402.875c0 26.052-15.606 47.063-35.063 47.063h-64.125zM674.938 956.062c-19.457 0-35.125-21.011-35.125-47.063v-166h134.313v166c0 26.052-15.606 47.063-35.063 47.063h-64.125zM35.063 779.25c-19.457 0-35.063-21.011-35.063-47.063v-263.313c0-26.052 15.606-47.063 35.063-47.063h142.063c19.457 0 35.125 21.011 35.125 47.063v263.313c0 26.052-15.668 47.063-35.125 47.063h-142.063zM34.875 707.75h142.438v-21.5h-142.438v21.5zM635.938 707.75c-19.457 0-35.063-20.948-35.063-47v-104c15.662 24.321 43.503 41.438 73.438 41.438h83.938c20.164 0 39.537-6.703 54.875-18.813v81.375c0 26.052-15.668 47-35.125 47h-142.063zM635.75 636.25h142.438v-21.5h-142.438v21.5zM34.875 621.25h142.438v-21.563h-142.438v21.563zM34.875 534.687h142.438v-21.5h-142.438v21.5zM674.313 5 25.062c-6.803 0-12.051-4.578-13.563-10.625-6.047-22.678-8.354-47.194-11-70.25-11.717-3.78-23.414-8.706-34.375-14.375l-52.188 40.438c-3.024 2.268-6.411 3.75-9.813 3.75-12.851 0-63.866-55.152-72.938-67.625-1.89-2.646-3.375-5.286-3.375-8.688 0-3.402 1.482-6.417 3.75-9.063 13.985-17.008 27.587-34.045 40.438-52.188-6.047-11.339-10.97-22.655-14.75-34.75l-70.313-10.625c-5.669-1.134-10.188-7.893-10.188-13.563v-83.938c0-6.425 4.512-12.491 10.938-13.625l69.188-10.188c3.78-12.851 9.075-25.343 15.5-37.438-12.851-17.764-26.837-34.364-39.688-51.75-1.89-2.646-3-5.286-3-8.688 0-3.024 0.735-6.042 2.625-8.688 15.874-21.922 42.343-45.358 62.375-63.5 2.646-2.646 6.036-4.187 9.438-4.187 3.402 0 6.792 1.17 9.438 3.437l53.313 40.438c10.961-5.669 22.283-10.22 34-14l10.625-69.563c0.756-6.425 6.759-11.312 13.563-11.312h83.938c6.803 0 12.051 4.515 13.563 10.562 6.047 22.678 8.354 47.257 11 70.313 11.717 3.78 23.414 8.706 34.375 14.375l52.188-40.813c3.024-1.89 6.411-3.437 9.813-3.437 12.851 0 63.866 55 .593 72.938 67.688 2.268 2.646 3.375 5.286 3.375 8.688 0 3.402-1.482 6.792-3.75 9.438-13.985 17.008-27.587 33.667-40.438 52.188 6.047 10.961 10.592 22.28 14.75 34.375l69.938 10.563c6.047 1.134 10.563 7.956 10.563 13.625v83.875c0 6.425-4.575 12.491-11 13.625l-69.125 10.563c-3.78 12.473-9.075 24.968-15.5 37.063 12.851 17.764 26.837 34.426 39.688 51.813 1.89 2.646 3 5.286 3 8.688 0 3.024-0.735 6.045-2.625 8.313-15.874 22.3-42.343 45.73-62.375 64.25-2.646 2.268-6.036 3.75-9.438 3.75-3.402 0-6.795-1.107-9.063-3.375l-53.688-40.438c-10.961 5.669-22.283 10.22-34 14l-10.625 69.5c-0.756 6.425-6.759 11.375-13.563 11.375h-83.938zM335.5 470.75c-19.457 0-35.063-21.011-35.063-47.063v-263.313c0-26.052 15.606-47 35.063-47h69.938c-33.134 13.606-52.563 45.472-52.563 80.188v11.125h-17.563v21.5h17.563v51.25c0 4.934 0.315 9.522 0.938 13.813h-18.5v21.5h24.813c2.629 5.701 5.88 10.963 9.563 16.063 8.874 12.288 21.91 25.142 43.188 31.688-2.548 5.236-4.823 11.007-6.438 17.25h-71.125v21.5h68.625c0.507 24.321 12.526 43.361 17 49.625l0.375 0.5c5.712 7.854 11.32 14.66 17.375 21.375h-103.188zM38.938 386.562v-403.563c0-26.052 15.668-47 35.125-47h64.125c19.457 0 35.063 20.948 35.063 47v403.563h-134.313zM716.25 331.5c53.292 0 96.813-43.458 96.813-96.75s-43.52-96.75-96.813-96.75c-53.292 0-96.75 43.458-96.75 96.75 0 53.292 43.458 96.75 96.75 96.75zM716.25 258.375c-13.519 0-23.625-10.106-23.625-23.625s10.106-23.563 23.625-23.563c13.519 0 23.625 10.044 23.625 23.563 0 13.519-10.106 23.625-23.625 23.625zM339.375 78.062v-95.063c0-26.052 15.668-47 35.125-47h64.125c15.104 0 27.84 12.658 32.813 30.5-15.844 14.589-33.52 32.2-49.125 53.75l-0.125 0.188-0.125 0.25c-11.849 16.588-16.313 35.972-16.313 51.188 0 2.060 0.18 4.114 0.375 6.188h-66.75z" /> <glyph unicode="" d="M273.688 951.437c-33.519 0-60.75-27.231-60.75-60.75v-370c5.404 1.596 11.056 2.5 16.813 2.5h64.125v347.313h323.813v-263.125c0-33.519 27.231-60.688 60.75-60.688h263.063v-485.75h-402c0.246-2.283 0.438-4.601 0.438-7.063 0-13.068-6.55-28.614-13.375-37.875l0.25-0.188c-0.527-0.702-1.328-1.48-1.875-2.188-0.068-0.088-0.119-0.225-0.188-0.313-7.839-10.11-17.7-20.887-30-33.313h467c33.519 0 60.75 27.168 60.75 60.688v566.688c0 33.519-19.6 80.35-43 103.75l-197.375 197.313c-23.4 23.4-70.168 43-103.688 43h-404.75zM698.688 865.437c10.751-3.795 21.51-9.51 25.938-13.938l197.938-197.938c4.427-4.427 10.080-15.186 13.875-25.938h-237.75v237.813zM229.75 473.125c-6.295 0-11.164-4.155-12.563-9.75-5.595-20.982-7.74-43.731-10.188-65.063-10.841-3.497-21.671-8.067-31.813-13.313l-48.25 37.438c-2.798 2.098-5.915 3.5-9.063 3.5-11.89 0-59.107-51.085-67.5-62.625-1.749-2.448-3.188-4.853-3.188-8 0-3.147 1.402-5.99 3.5-8.438 12.939-15.737 25.548-31.464 37.438-48.25-5.595-10.491-10.128 -20.935-13.625-32.125l-65.063-9.813c-5.246-1.049-9.438-7.379-9.438-12.625v-77.625c0-5.945 4.18-11.513 10.125-12.563l64-9.438c3.497-11.89 8.43-23.435 14.375-34.625-11.89-16.436-24.86-31.851-36.75-47.938-1.749-2.448-2.813-4.853-2.813-8 0-2.798 0.751-5.615 2.5-8.063 14.687-20.283 39.153-41.964 57.688-58.75 2.448-2.448 5.603-3.875 8.75-3.875 3.147 0 6.24 1.089 8.688 3.188l49.313 37.375c10.141-5.246 20.659-9.44 31.5-12.938l9.813-64.313c0.699-5.945 6.268-10.5 12.563-10.5h77.625c6.295 0 11.226 4.217 12.625 9.813 5.595 20.982 7.677 43.668 10.125 65 10.841 3.497 21.671 8.067 31.813 13.313l48.25-37.75c2.798-1.749 5.978-3.188 9.125-3.188 11.89 0 59.107 51.435 67.5 62.625 2.098 2.448 3.125 4.915 3.125 8.063 0 3.147-1.402 6.24-3.5 8.688-12.939 15.737-25.548 31.177-37.438 48.313 5.595 10.141 9.841 20.622 13.688 31.813l64.688 9.75c5.595 1.049 9.75 7.379 9.75 12.625v77.625c0 5.945-4.18 11.513-10.125 12.563l-64 9.813c-3.497 11.54-8.368 23.060-14.313 34.25 11.89 16.436 24.798 31.851 36.688 47 .938 1.749 2.448 2.813 4.915 2.813 8.063 0 2.798-0.689 5.589-2.438 7.688-14.687 20.632-39.153 42.302-57.688 59.438-2.448 2.098-5.603 3.5-8.75 3.5-3.147 0-6.339-1.027-8.438-3.125l-49.625-37.438c-10.141 5.246-20.659 9.44-31.5 12.938l-9.75 64.313c-0.699 5.945-6.33 10.5-12.625 10.5h-77.625zM453.563 465.687c2.478-1.648 4.81-3.373 7-5.25l0.75-0.625 0.688-0.625c17.199-15.901 42.155-37.161 62.125-64.188 0.045-0.061 0.080-0.127 0.125-0.188 0.719-0.976 1.545-1.821 2.25-2.813l-0.25-0.188c1.709-2.338 3.219-4.718 4.5-7.063h309.563c11.384 0 20.25 8.866 20.25 20.25v40.5c0 11.384-8.866 20.188-20.25 20.188h-386.75zM539.125 303.812c29.88-6.9 48-32.732 48-61.125v-19.813h253.188c11.384 0 20.25 8.866 20.25 20.25v40.438c0 11.384-8.866 20.25-20.25 20.25h-301.188zM268.563 294.125c49.308 0 89.563-40.255 89.563-89.563s-40.255-89.5-89.563-89.5c-49.308 0-89.5 40.192-89.5 89.5 0 49.308 40.192 89.563 89.5 89.563z" /> -<glyph unicode="" d="M223.442 951.232c-45.411 0-82.562-37.151-82.562-82.562v-49.55h-66.023c-36.123 0-66.089-29.901-66.089-66.023v-660.56c0-36.123 29.966-66.023 66.089-66.023h491.22c-14.446 20.139-26.248 42.322-34.856 66.023h-76.566v148.651h65.694c2.298 11.271 5.327 22.29 8.961 33.012h-74.655v165.124h165.124v-37.492c10.434 8.194 21.438 15.638 33.012 22.271v15.221h30.903c32.407 13.488 67.937 20.888 105.228 20.888 27.297 0 53.661-3.97 78.542-11.399v304.286c0 36.123-29.901 66.023-66.023 66.023h-66.089v49.55c0 45.411-37.151 82.562-82.562 82.562h-33.012c-45.411 0-82.562-37.151-82.562-82.562v-49.55h-198.201v49.55c0 45.411-37.151 82.562-82.562 82.562h-33.012zM223.442 885.143h33.012c8.773 0 16.539-7.7 16.539-16.473v-148.651c0-8.773-7.766-16.473-16.539-16.473h-33.012c-8.773 0-16.539 7.7-16.539 16.473v148.651c0 8.773 7.766 16.473 16.539 16.473zM619.778 885.143h33.012c8.773 0 16.539-7.7 16.539-16.473v-148.651c0-8.773-7.766-16.473-16.539-16.473h-33.012c-8.773 0-16.539 7.7-16.539 16.473v148.651c0 8.773 7.766 16.473 16.539 16.473zM74.857 620.985h148.585v-148.651h-148.585v148.651zM256.453 620.985h165.124v-148.651h-165.124v148.651zM454.654 620.985h165.124v-148.651h-165.124v148.651zM652.789 620.985h148.651v-148.651h-148.651v148.651zM74.857 439.323h148.585v-165.124h-148.585v165.124zM256.453 439.323h165.124v-165.124h-165.124v165.124zM788.921 415.075c-126.386 0-228.906-102.587-228.906-228.972 0-126.386 102.521-228.906 228.906-228.906 126.386 0 228.906 102.521 228.906 228.906 0 126.386-102.521 228.972-228.906 228.972zM784.77 348.261c1.389 0.035 2.754 0 4.151 0 89.424 0 162.158-72.735 162.158-162.158 0-89.424-72.735-162.159-162.158-162.159-89.424 0-162.158 72.735-162.158 162.159 0 88.027 70.508 159.935 158.007 162.158zM798.475 300.621c-5.365 0-9.554-4.189-9.554-9.554v-104.965h-66.748c-5.365 0-9.554-4.123-9.554-9.488v-19.108c0-5.365 4.189-9.554 9.554-9.554h95.345c5.365 0 9.554 4.189 9.554 9.554v133.562c0 5.365-4.189 9.554-9.554 9.554h-19.043zM74.857 241.188h14 8.585v-148.651h-148.585v148.651zM256.453 241.188h165.124v-148.651h-165.124v148.651z" /> <glyph unicode="" d="M553.438 957.687c-31.069-0.319-63.38-13.345-88.625-38.625l-88-88.125 162.438-162.25 88 88.188c47.52 47.587 51.672 120.012 9.25 162.375l-9.313 9.25c-19.885 19.857-46.337 29.469-73.75 29.188zM344.313 798.437l-185.313-185.625 162.438-162.188 185.313 185.563-162.438 162.25zM878.938 779.437c-39.322-0.403-80.174-16.941-112.125-48.938l-111.375-111.563 205.563-205.313 111.438 111.625c60.144 60.228 65.317 151.883 11.625 205.5l-11.75 11.688c-25.168 25.133-58.679 37.356-93.375 37zM338.188 751.937c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.745 8.747-22.992 0-31.75-8.745-8.757-22.93-8.767-31.688 0-8.758 8.746-8.808 22.993-0.063 31.75 4.373 4.379 10.124 6.561 15.875 6.563zM388 702.187c5.751 0.006 11.559-2.139 15.938-6.5 8.758-8.746 8.684-22.993-0.063-31.75-8.745-8.758-22.867-8.768-31.625 0-8.746 8.734-8.836 22.927-0.125 31.688 4.373 4.379 10.124 6.556 15.875 6.563zM282.25 695.875c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8 .758-22.93-8.785-31.688-0.063-8.758 8.745-8.808 22.93-0.063 31.688v0.063c4.373 4.379 10.124 6.561 15.875 6.563zM436 654.25c5.739 0.016 11.496-2.126 15.875-6.5 8.758-8.745 8.684-22.93-0.063-31.688-8.745-8.758-22.867-8.767-31.625 0-8.758 8.745-8.807 22.867-0.063 31.625 4.373 4.379 10.136 6.547 15.875 6.563zM332.063 646.125c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8.757-22.93-8.767-31.688 0-8.758 8.746-8.808 22.93-0.063 31.688 4.373 4.379 10.124 6.561 15.875 6.563zM226.25 639.875c5.751 0.006 11.559-2.201 15.938-6.563 8.758-8.745 8.685-22.93-0.063-31.688-8.745-8.757-22.867-8.785-31.625-0.063-8.758 8.746-8.87 22.93-0.125 31.688 4.373 4.379 10.124 6.618 15.875 6.625zM380.063 598.25c5.739 0.016 11.434-2.189 15.813-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8.757-22.93-8.785-31.688-0.063-8.758 8.746-8.744 22.93 0 31.688 4.373 4.379 10.136 6.609 15.875 6.625zM276.125 590.125c5.751 0.001 11.496-2.241 15.875-6.625 8.758-8.746 8.685-22.93-0.063-31.6 88-8.745-8.758-22.867-8.785-31.625-0.063-8.758 8.745-8.808 22.992-0.063 31.75 4.373 4.379 10.124 6.624 15.875 6.625zM614.313 577.812l-136.75-136.938c10.954-3.684 21.212-8.931 30.438-15.438 1.067 5.224 3.575 10.194 7.625 14.25v0.063c5.534 5.542 12.846 8.311 20.125 8.313s14.52-2.764 20.063-8.313c11.084-11.069 11.070-29.041 0-40.125-3.538-3.543-7.76-5.906-12.25-7.188l27.938-27.938c1.264 4.482 3.662 8.72 7.188 12.25 5.534 5.542 12.846 8.311 20.125 8.313 7.279 0.002 14.52-2.764 20.063-8.313 11.084-11.069 11.070-29.041 0-40.125-3.557-3.562-7.796-5.976-12.313-7.25l25.688-25.625c1.268 4.495 3.647 8.767 7.188 12.313v0.063c5.534 5.542 12.799 8.293 20.063 8.313s14.52-2.714 20.063-8.25c11.084-11.069 11.070-29.041 0-40.125-3.587-3.592-7.878-5.982-12.438-7.25l24.625-24.625 128.188 128.313-205.625 205.313zM324.063 542.187c5.739 0.016 11.496-2.126 15.875-6.5 8.758-8.745 8.684-22.992-0.063-31.75-8.745-8.757-22.867-8.785-31.625-0.063-8.758 8.746-8.744 22.93 0 31.688 4.373 4.379 10.073 6.609 1 5.813 6.625zM168.938 538c3.885-11.584 5.563-23.321 5.563-34.563 0-20.381-2.096-28.36-2-24.438l-0.063-0.5c-0.978-13.36-1.563-25.919-1.563-37.75 0-68.022 10.894-76.887 28.125-88 4.033-2.601 9.774-5.152 17.125-7.563l72.875 72.938-120.063 119.875zM606.563 519c7.279 0.002 14.583-2.764 20.125-8.313 11.084-11.068 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.096-40.063 0-11.084 11.069-11.131 29.041-0.063 40.125 5.534 5.542 12.784 8.311 20.063 8.313zM69.625 516.125c-5.076 0-7.65-2.562-10.188-6.188-5.439-7.614-9.387-19.223-13.375-27.563-20.666-46.409-46.063-112.74-46.063-163.5 0-40.608 3.96-82.318 19.188-120.75 50.397-125.087 198.327-146.125 317.25-146.125h81.25v-92.812c0-12.69 10.498-23.188 23.188-23.188 6.164 0 11.962 2.524 16.313 6.875l185.625 185.625c4.351 4.351 6.938 10.149 6.938 16.313s-2.587 11.962-6.938 16.313l-185.625 185.688c-4.351 4.351-10.149 6.875-16.313 6.875-12.69 0-23.188-10.498-23.188-23.188v-92.813h-81.25c-156.268 0-258.875 30.054-258.875 203 0 14.865 0.725 29. 76 1.813 44.625 0.363 5.801 1.813 12.324 1.813 18.125 0 6.889-4.311 12.688-11.563 12.688zM669.625 456c7.279 0.008 14.583-2.73 20.125-8.25 11.084-11.069 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.097-40.063 0-11.073 11.058-11.098 28.975-0.063 40.063 5.534 5.542 12.784 8.304 20.063 8.313zM730.375 395.375c7.264 0.020 14.52-2.714 20.063-8.25 11.084-11.068 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.096-40.063 0-11.073 11.057-11.034 28.913 0 40 5.534 5.542 12.799 8.355 20.063 8.375z" /> <glyph unicode="" d="M510.464 956.992c-281.96 0-510.464-228.504-510.464-510.464 0-281.925 228.504-510.528 510.464-510.528 281.96 0 510.464 228.602 510.464 510.528 0 281.96-228.504 510.464-510.464 510.464zM377.412 740.695c12.768-1.834 285.282-42.285 399.914-109.159 14.214-8.289 21.276-16.969 30.024-26.105 31.674-32.767 73.645-169.124 78.125-197.271l-1.707-2.908c-1.658-0.635-5.679-3.383-10.935-7.016-26.595-18.764-89.209-62.601-169.523-55.37-72.201 6.419-166.344 47.678-279.883 122.559 4.903-11.816 28.629-67.716 32.615-77.24l1.517-1.896c16.401-8.43 174.247-88.94 252.514-87.353 63.101 1.199 130.826 32.066 157.703 48.291 2.751 1.658 5.979 3.407 8.659 1.643 2.187-1.869 1.851-5.519 1.075-8.975-1.658-7.76-5.333-21.89-7.838-28.38l-2.149-5.562c-3.245-8.218-5.957-16.026-11.883-20.859-15.837-14.32-41.274-25.873-81.095-43.297-61.443-26.701-161.113-43.791-253.842-43.297-33.226 0.882-65.224 4.466-93.547 7.711-85.004 9.594-146.825 16.494-160.863-58.846-83.488 79.855-135.707 192.154-1 35.707 316.733 0 95.409 30.623 183.644 82.296 255.422 83.488-19.011 145.826-39.287 160.358-44.119 0.141 6.243 1.327 62.828 1.327 62.828l0.822 1.959 2.023 0.506zM676.131 625.342c-29.009-0.361-56.447-11.285-77.809-31.225-22.68-21.233-35.842-49.986-36.724-81.095-2.257-64.229 48.083-118.343 112.383-120.6 31.039-1.058 60.606 10.019 83.497 31.288 22.715 21.092 35.714 49.978 36.913 81.159 2.257 64.088-48.358 118.118-112.446 120.41-1.947 0.071-3.881 0.087-5.815 0.063zM676.953 591.146c1.347 0.018 2.69-0.014 4.045-0.063 44.865-1.587 80.028-39.426 78.441-84.256-0.705-21.621-9.818-41.729-25.725-56.508-15.837-14.849-36.452-22.527-58.214-21.68-44.865 1.587-80.028 39.334-78.441 84.129 0.564 21.692 9.747 41.757 25.725 56.571 14.847 13.822 33.966 21.54 54.169 21.807zM694.272 550.188c-19.964 0-36.155-10.764-36.155-23.956 0-13.262 16.191-23.956 36.155-23.956 19.893 0 35.965 10.694 35.965 23.956 0 13.192-16.072 23.956-35.965 23.956zM625.545 1086.061v0z" /> <glyph unicode="" d="M604.101 811.165h-189.14v88.12h189.14v-88.12zM927.651 582.955h-286.179v68.426h286.179v-68.426zM927.651 487.349h-286.179v34.239h286.179v-34.239zM927.651 416.216h-286.179v34.293h286.179v-34.293zM927.651 86.403h-286.179v51.439h286.179v-51.439zM552.238 125.207c0-23.251-19.058-42.308-42.256-42.308h-381.358c-23.198 0-42.203 19.058-42.203 42.308v498.675c0 23.251 19.005 42.202 42.203 42.202h381.358c23.198 0 42.256-18.951 42.256-42.202v-498.675zM641.472 380.331h190.733v-34.133h-190.733v34.133zM907.213 758.983h-795.524c-61.684 0-111.69-49.952-111.69-111.637v-539.55c0-61.79 50.006-111.796 111.69-111.796h795.524c61.684 0 111.689 50.005 111.689 111.796v539.55c0 61.684-50.006 111.637-111.689 111.637M319.090 344.287c-36.309 0-69.327 13.165-95.817 34.293-33.655-27.763-55.632-69.381-55.632-116.414v-141.629h303.005v141.629c0 47.033-21.977 88.651-55.738 116.414-26.437-21.128-59.401-34.293-95.818-34.293M319.090 381.074c65.029 0 117.901 52.766 117.901 117.794 0 64.97 5-52.872 117.847-117.901 117.847-64.974 0-117.847-52.872-117.847-117.847 0-65.028 52.872-117.794 117.847-117.794" /> diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf b/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf index 4e75ac2..8d2aa30 100755 Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf and b/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf differ diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.woff b/branding/fonts/font-spacewalk/font/spacewalk-icon.woff index c17e0bc..8d81d0e 100755 Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.woff and b/branding/fonts/font-spacewalk/font/spacewalk-icon.woff differ commit a53cf000e5f62718b20fb4e9728c94efe7d8cf71 Author: cyntss <csanchez(a)suse.com> Date: Tue Nov 5 16:47:12 2013 +0100 1 class modified to give more margin and 1 icon replaced diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp index 17bb2df..634e72a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp @@ -230,7 +230,7 @@ </div> <rhn:csrf /> - <div class="text-right margin-bottom-md"> + <div class="text-right margin-bottom-sm"> <html:submit property="update_interface" styleClass="btn btn-default"> <bean:message key="sdc.details.edit.update"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp b/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp index 2ed2d57..fca2382 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp @@ -5,7 +5,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-preferences.gif" +<rhn:toolbar base="h1" icon="fa-globe" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-yourrhn-locale"> <bean:message key="Locale Preferences"/> </rhn:toolbar> commit 1367f09dfd51a07b78546ae73e2f01a6dedd42c7 Author: cyntss <csanchez(a)suse.com> Date: Tue Nov 5 16:45:51 2013 +0100 classes for margin added diff --git a/branding/css/theme.less b/branding/css/theme.less index b8696b8..72ec7f7 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -492,13 +492,34 @@ h1 .fa-stack { border-radius: 4px } -//Margins to elements +/* Margins to elements */ +//margins bottom .margin-bottom-xs { margin-bottom: .5em; } -.margin-bottom-md { +.margin-bottom-sm { margin-bottom: 1em; } +.margin-bottom-md { + margin-bottom: 2em; +} +.margin-bottom-lg { + margin-bottom: 3em; +} +//margins top +.margin-top-xs { + margin-top: .5em; +} +.margin-top-sm { + margin-top: 1em; +} +.margin-top-md { + margin-top: 2em; +} +.margin-top-lg { + margin-top: 3em; +} + /* adding margin to the icons in fontawesome */ i[class~="fa"], @@ -617,12 +638,15 @@ h1, h2, h3, h4, h5, h6 { } /* btn with margin top and bottom */ -.btn.spacewalk-btn-margin-vertical{ +.btn.spacewalk-btn-margin-vertical { margin: 1em 0 } - +//tabs - adding a margin to all tabs +ul.nav.nav-tabs { + margin-bottom: .2em +} //tabs - adding a margin button to the last UL -ul.nav.nav-tabs:last-child{ +ul.nav.nav-tabs:last-child { margin-bottom: 1.5em } /* login form */ commit a4432372bb0f2c51721bc8fc8f8511be5fdcce41 Author: cyntss <csanchez(a)suse.com> Date: Tue Nov 5 16:45:16 2013 +0100 Panels and tag Small added diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp index 6b80952..b1ddbee 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp @@ -46,131 +46,137 @@ function modifyUploadCheckbox(checkbox) { <rhn:dialogmenu mindepth="0" maxdepth="2" definition="/WEB-INF/nav/org_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <form method="post" + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="orgconfig.jsp.header"/></h4> + </div> + <div class="panel-body"> + <p><bean:message key="orgconfig.jsp.description"/></p> + <hr> + <form method="post" class="form-horizontal" action="/rhn/admin/multiorg/OrgConfigDetails.do"> - <rhn:csrf /> - <rhn:submitted/> - <input type="hidden" name="oid" value="${param.oid}"/> - <h2><bean:message key="orgconfig.jsp.header"/></h2> - <p><bean:message key="orgconfig.jsp.description"/></p> - - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label> - <input type="checkbox" name="staging_content_enabled" - value="enabled" id="staging_content_enabled" - <c:if test = "${org.orgConfig.stagingContentEnabled}"> - checked="checked" - </c:if>/> - <bean:message key="org-config.staging-content.jsp"/> - </label> + <rhn:csrf /> + <rhn:submitted/> + <input type="hidden" name="oid" value="${param.oid}"/> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label> + <input type="checkbox" name="staging_content_enabled" + value="enabled" id="staging_content_enabled" + <c:if test = "${org.orgConfig.stagingContentEnabled}"> + checked="checked" + </c:if>/> + <bean:message key="org-config.staging-content.jsp"/> + </label> + </div> </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label> - <input type="checkbox" - name="crash_reporting_enabled" - value="enabled" - id="crash_reporting_enabled" - onChange="modifyUploadCheckbox(this)" - <c:if test = "${org.orgConfig.crashReportingEnabled}"> - checked="checked" - </c:if>/> - <bean:message key="org-config.crash-reporting.jsp"/> - </label> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label> + <input type="checkbox" + name="crash_reporting_enabled" + value="enabled" + id="crash_reporting_enabled" + onChange="modifyUploadCheckbox(this)" + <c:if test = "${org.orgConfig.crashReportingEnabled}"> + checked="checked" + </c:if>/> + <bean:message key="org-config.crash-reporting.jsp"/> + </label> + </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label> + <input type="checkbox" + name="crashfile_upload_enabled" + value="enabled" + id="crashfile_upload_enabled" + <c:if test = "${not org.orgConfig.crashReportingEnabled}"> + disabled="true" + </c:if> + <c:if test = "${org.orgConfig.crashfileUploadEnabled}"> + checked="checked" + </c:if>/> + <bean:message key="org-config.crashfile-upload.jsp"/> + </label> + </div> </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label> - <input type="checkbox" - name="crashfile_upload_enabled" - value="enabled" - id="crashfile_upload_enabled" - <c:if test = "${not org.orgConfig.crashReportingEnabled}"> - disabled="true" - </c:if> - <c:if test = "${org.orgConfig.crashfileUploadEnabled}"> - checked="checked" - </c:if>/> - <bean:message key="org-config.crashfile-upload.jsp"/> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="org-config.crashfile-sizelimit.jsp"/>: </label> + <div class="col-lg-2"> + <input type="number" + class="form-control" + name="crashfile_sizelimit" + value="${org.orgConfig.crashFileSizelimit}" + id="crashfile_sizelimit" /> + </div> </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="org-config.crashfile-sizelimit.jsp"/>: - </label> - <div class="col-lg-2"> - <input type="number" - class="form-control" - name="crashfile_sizelimit" - value="${org.orgConfig.crashFileSizelimit}" - id="crashfile_sizelimit" /> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label> + <input type="checkbox" + name="scapfile_upload_enabled" + value="enabled" + id="scapfile_upload_enabled" + <c:if test = "${org.orgConfig.scapfileUploadEnabled}"> + checked="checked" + </c:if>/> + <bean:message key="org-config.scapfile-upload.jsp"/> + </label> + </div> </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label> - <input type="checkbox" - name="scapfile_upload_enabled" - value="enabled" - id="scapfile_upload_enabled" - <c:if test = "${org.orgConfig.scapfileUploadEnabled}"> - checked="checked" - </c:if>/> - <bean:message key="org-config.scapfile-upload.jsp"/> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="org-config.scapfile-sizelimit.jsp"/>: </label> + <div class="col-lg-2"> + <input type="number" + class="form-control" + name="scapfile_sizelimit" + value="${org.orgConfig.scapFileSizelimit}" + id="scapfile_sizelimit" /> + </div> </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="org-config.scapfile-sizelimit.jsp"/>: - </label> - <div class="col-lg-2"> - <input type="number" - class="form-control" - name="scapfile_sizelimit" - value="${org.orgConfig.scapFileSizelimit}" - id="scapfile_sizelimit" /> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <label> + <input type="checkbox" + name="scap_retention_set" + value="on" + id="scap_retention_set" + onChange="modifyTrVisibility('tr_scap_retention')" + <c:if test = "${org.orgConfig.scapRetentionPeriodDays != null}"> + checked="checked" + </c:if>/> + <bean:message key="org-config.scap-retention"/> + </label> + </div> </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <label> - <input type="checkbox" - name="scap_retention_set" - value="on" - id="scap_retention_set" - onChange="modifyTrVisibility('tr_scap_retention')" - <c:if test = "${org.orgConfig.scapRetentionPeriodDays != null}"> - checked="checked" - </c:if>/> - <bean:message key="org-config.scap-retention"/> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="org-config.scap-retention-period"/>: </label> + <div class="col-lg-2"> + <input type="number" + class="form-control" + name="scap_retention_period" + value="${org.orgConfig.scapRetentionPeriodDays == null ? 90 : org.orgConfig.scapRetentionPeriodDays}" + id="scap_retention_period" /> + </div> </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="org-config.scap-retention-period"/>: - </label> - <div class="col-lg-2"> - <input type="number" - class="form-control" - name="scap_retention_period" - value="${org.orgConfig.scapRetentionPeriodDays == null ? 90 : org.orgConfig.scapRetentionPeriodDays}" - id="scap_retention_period" /> - </div> - </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <html:submit styleClass="btn btn-success"> - <bean:message key="orgdetails.jsp.submit"/> - </html:submit> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="orgdetails.jsp.submit"/> + </html:submit> + </div> </div> - </div> - </form> + </form> + </div> + </div> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp index 0d58d185a2..e907916 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp @@ -6,26 +6,31 @@ <html:html> <head> <script type="text/javascript" language="JavaScript"> -function setOrgClicked(target) { - document.forms[0].orgClicked.value=target; - alert(target); -}; + function setOrgClicked(target) { + document.forms[0].orgClicked.value=target; + alert(target); + }; </script> </head> <body> - <rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" - miscUrl="${url}" - miscAcl="user_role(org_admin)" - miscText="${text}" - miscImg="${img}" - miscAlt="${text}" - imgAlt="users.jsp.imgAlt"> - <c:out value="${entname}"/> - </rhn:toolbar> - <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/systemEntitlementOrgs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <h2><bean:message key="entitlementorgs.miniheader"/></h2> - <p><bean:message key="entitlementorgs.description" arg0="${enthuman}"/></p> - <rl:listset name="entitlementSet"> + <rhn:toolbar base="h1" icon="spacewalk-icon-software-channels" + miscUrl="${url}" + miscAcl="user_role(org_admin)" + miscText="${text}" + miscImg="${img}" + miscAlt="${text}" + imgAlt="users.jsp.imgAlt"> + <c:out value="${entname}"/> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/systemEntitlementOrgs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="entitlementorgs.miniheader"/></h4> + </div> + <div class="panel-body"> + <p><bean:message key="entitlementorgs.description" arg0="${enthuman}"/></p> + <rl:listset name="entitlementSet"> <rhn:csrf />  <html:hidden property="submitted" value="true"/> @@ -75,11 +80,20 @@ function setOrgClicked(target) { </rl:column> </rl:list> </rl:listset> - <span class="help-block"> + <p> + <small> <bean:message key="entitlementorgs.tip"/> - </span> - <h2><bean:message key="entitlementorgs.usage"/></h2> - <div class="form-horizontal"> + </small> + </p> + </div> + </div> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="entitlementorgs.usage"/></h4> + </div> + <div class="panel-body"> + <div class="form-horizontal"> <div class="form-group"> <label class="col-lg-3 control-label"> <bean:message key="entitlementorgs.total_allocated"/>: @@ -115,6 +129,7 @@ function setOrgClicked(target) { </div> </div> </div> + </div> + </div> </body> </html:html> - diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp index dc833c5..94cd5d4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp @@ -40,65 +40,73 @@ styleClass="form-horizontal"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - <h2><bean:message key="orgdetails.jsp.header"/></h2> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="org.name.jsp"/>: - </label> - <c:choose> - <c:when test="${param.oid != 1}"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="orgdetails.jsp.header"/></h4> + </div> + <div class="panel-body"> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="org.name.jsp"/>: + </label> + <c:choose> + <c:when test="${param.oid != 1}"> + <div class="col-lg-6"> + <html:text property="orgName" styleClass="form-control" maxlength="128" size="40" /> + <span class="help-block"><strong>Tip:</strong>Between 3 and 128 characters</span> + </div> + </c:when> + <c:otherwise> + <span class=""><bean:write name="orgDetailsForm" property="orgName"/></td> + </c:otherwise> + </c:choose> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="org.id.jsp"/>:</label> <div class="col-lg-6"> - <html:text property="orgName" styleClass="form-control" maxlength="128" size="40" /> - <span class="help-block"><strong>Tip:</strong>Between 3 and 128 characters</span> + <bean:write name="orgDetailsForm" property="id"/> </div> - </c:when> - <c:otherwise> - <span class=""><bean:write name="orgDetailsForm" property="orgName"/></td> - </c:otherwise> - </c:choose> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="org.id.jsp"/>:</label> - <div class="col-lg-6"> - <bean:write name="orgDetailsForm" property="id"/> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="org.active.users.jsp"/>: - </label> - <div class="col-lg-6"> - <a class="btn btn-default" href="/rhn/admin/multiorg/OrgUsers.do?oid=${param.oid}"><bean:write name="orgDetailsForm" property="users"/></a> - </div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="org.systems.jsp"/>:</label> - <div class="col-lg-6"><bean:write name="orgDetailsForm" property="systems"/></div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="org.system.groups.jsp"/>:</label> - <div class="col-lg-6"><bean:write name="orgDetailsForm" property="groups"/></div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="org.actkeys.jsp"/>:</label> - <div class="col-lg-6"><bean:write name="orgDetailsForm" property="actkeys"/></div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="org.kickstart.profiles.jsp"/>:</label> - <div class="col-lg-6"><bean:write name="orgDetailsForm" property="ksprofiles"/></div> - </div> - <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="org.config.channels.jsp"/>:</label> - <div class="col-lg-6"><bean:write name="orgDetailsForm" property="cfgchannels"/></div> - </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="org.active.users.jsp"/>: + </label> + <div class="col-lg-6"> + <a class="btn btn-default btn-sm" href="/rhn/admin/multiorg/OrgUsers.do?oid=${param.oid}"><i class="fa fa-group"></i><bean:write name="orgDetailsForm" property="users"/></a> + </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="org.systems.jsp"/>:</label> + <div class="col-lg-6"><bean:write name="orgDetailsForm" property="systems"/></div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="org.system.groups.jsp"/>:</label> + <div class="col-lg-6"><bean:write name="orgDetailsForm" property="groups"/></div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="org.actkeys.jsp"/>:</label> + <div class="col-lg-6"><bean:write name="orgDetailsForm" property="actkeys"/></div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="org.kickstart.profiles.jsp"/>:</label> + <div class="col-lg-6"><bean:write name="orgDetailsForm" property="ksprofiles"/></div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label"><bean:message key="org.config.channels.jsp"/>:</label> + <div class="col-lg-6"><bean:write name="orgDetailsForm" property="cfgchannels"/></div> + </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <html:submit styleClass="btn btn-success"> - <bean:message key="orgdetails.jsp.submit"/> - </html:submit> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <html:submit styleClass="btn btn-success"> + <bean:message key="orgdetails.jsp.submit"/> + </html:submit> + </div> + </div> </div> </div> + + </html:form> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp index 4898f7f..01a00c1 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp @@ -37,10 +37,8 @@ <h2><bean:message key="orgsoftwaresubs.jsp.header2"/></h2> -<bean:message key="orgsoftwaresubs.jsp.description" arg0="${org.name}"/> +<p class="margin-bottom-md"><bean:message key="orgsoftwaresubs.jsp.description" arg0="${org.name}"/></p> - -<div> <rl:listset name="entitlementSet"> <rhn:csrf /> <rhn:submitted/> @@ -81,9 +79,8 @@ <c:when test="${param.oid != 1}"> <input name="${current.key}" value="${requestScope.subscriptions[current.key]}" type="text" size = "13" onkeydown="return blockEnter(event)"> - <br> - <span class="small-text"><bean:message key="orgsystemsubs.jsp.possible_vals" - arg0="0" arg1="${current.maxAvailable}"/></span> + <p><small><bean:message key="orgsystemsubs.jsp.possible_vals" + arg0="0" arg1="${current.maxAvailable}"/></small></p> </c:when> <c:otherwise> ${current.maxAvailable} @@ -118,9 +115,9 @@ <c:when test="${param.oid != 1}"> <input name="${current.flexKey}" value="${requestScope.subscriptions[current.flexKey]}" type="text" size = "13" onkeydown="return blockEnter(event)"> - <br> - <span class="small-text"><bean:message key="orgsystemsubs.jsp.possible_vals" - arg0="0" arg1="${current.maxAvailableFlex}"/></span> + + <p><small><bean:message key="orgsystemsubs.jsp.possible_vals" + arg0="0" arg1="${current.maxAvailableFlex}"/></small></p> </c:when> <c:otherwise> ${current.maxAvailableFlex} @@ -133,15 +130,14 @@ <rl:csv dataset="pageList" name="entitlement" exportColumns="name,currentMembers,maxMembers,maxAvailable,currentFlex,maxFlex,maxAvailableFlex" /> -<p><rhn:tooltip>*-<bean:message key = "Used/Allotted.tip"/></rhn:tooltip></p> +<p><small><rhn:tooltip>*-<bean:message key = "Used/Allotted.tip"/></rhn:tooltip></small></p> <c:if test="${param.oid != 1}"> <div class="text-right"> <hr/> - <input type="submit" name="dispatch" value="${rhn:localize('orgdetails.jsp.submit')}"/> + <input type="submit" name="dispatch" class="btn btn-default" value="${rhn:localize('orgdetails.jsp.submit')}"/> </div> </c:if> </rl:listset> -</div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp index be0c3ca..96f8b7d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp @@ -42,157 +42,159 @@ <rhn:csrf /> <html:hidden property="submitted" value="true"/> <html:hidden property="oid" value="${param.oid}"/> - <table class="table table-striped" cellpadding="0" cellspacing="0" width="100%"> - <thead> - <tr> - <th><bean:message key="orgsystemsubs.jsp.ent_name"/></th> - <th><bean:message key="orgsystemsubs.jsp.total"/></th> - <th><bean:message key="orgsystemsubs.jsp.usage"/></th> - <th><bean:message key="orgsystemsubs.jsp.proposed_total"/></th> - </tr> - </thead> - <tbody> - <tr> - <td> - <strong><bean:message key="enterprise_entitled"/> <bean:message key="orgsystemsubs.jsp.base"/></strong> - <span class="help-block"><bean:message key="orgsystemsubs.jsp.man_tip"/></span> - </td> - <td> - ${enterprise_entitled.maxEntitlements} - </td> - <td> - ${enterprise_entitled.currentEntitlements} - </td> - <td> - <c:choose> - <c:when test="${param.oid != 1}"> - <html:text property="enterprise_entitled" - styleClass="form-control" - onkeydown="return blockEnter(event)"/> - <span class="help-block"><bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${enterprise_entitled.upperRange}"/></span> - </c:when> - <c:otherwise> - <bean:write name="orgSystemSubscriptionsForm" property="enterprise_entitled"/> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <td> - <strong><bean:message key="monitoring_entitled"/> <bean:message key="orgsystemsubs.jsp.add_on"/></strong> - <span class="help-block"><bean:message key="orgsystemsubs.jsp.mon_tip"/></span> - </td> - <td> - ${monitoring_entitled.maxEntitlements} - </td> - <td> - ${monitoring_entitled.currentEntitlements} - </td> - <td> - <c:choose> - <c:when test="${param.oid != 1}"> - <html:text property="monitoring_entitled" - styleClass="form-control" - onkeydown="return blockEnter(event)"/> - <span class="help-block"> - <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${monitoring_entitled.upperRange}"/> - </span> - </c:when> - <c:otherwise> - <bean:write name="orgSystemSubscriptionsForm" property="monitoring_entitled"/> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <td> - <strong><bean:message key="provisioning_entitled"/> <bean:message key="orgsystemsubs.jsp.add_on"/></strong> - <span class="help-block"> - <bean:message key="orgsystemsubs.jsp.provis_tip"/> - </span> - </td> - <td> - ${provisioning_entitled.maxEntitlements} - </td> - <td> - ${provisioning_entitled.currentEntitlements} - </td> - <td> - <c:choose> - <c:when test="${param.oid != 1}"> - <html:text property="provisioning_entitled" - styleClass="form-control" - onkeydown="return blockEnter(event)"/> - <span class="help-block"> - <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${provisioning_entitled.upperRange}"/> - </span> - </c:when> - <c:otherwise> - <bean:write name="orgSystemSubscriptionsForm" property="provisioning_entitled"/> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <td> - <strong><bean:message key="virtualization_host"/> <bean:message key="orgsystemsubs.jsp.add_on"/></strong> - <span class="help-block"> - <bean:message key="orgsystemsubs.jsp.virt_tip"/> - </span> - </td> - <td> - ${virtualization_host.maxEntitlements} - </td> - <td> - ${virtualization_host.currentEntitlements} - </td> - <td> - <c:choose> - <c:when test="${param.oid != 1}"> - <html:text property="virtualization_host" - styleClass="form-control" - onkeydown="return blockEnter(event)"/> - <span class="help-block"> - <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${virtualization_host.upperRange}"/> - </span> - </c:when> - <c:otherwise> - <bean:write name="orgSystemSubscriptionsForm" property="virtualization_host"/> - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <td> - <strong> - <bean:message key="virtualization_host_platform"/> <bean:message key="orgsystemsubs.jsp.add_on"/> - </strong> - <span class="help-block"><bean:message key="orgsystemsubs.jsp.virt_plat_tip"/></span> - </td> - <td> - ${virtualization_host_platform.maxEntitlements} - </td> - <td> - ${virtualization_host_platform.currentEntitlements} - </td> - <td> - <c:choose> - <c:when test="${param.oid != 1}"> - <html:text property="virtualization_host_platform" - styleClass="form-control" - onkeydown="return blockEnter(event)"/> - <span class="help-block"> - <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${virtualization_host_platform.upperRange}"/> - </span> - </c:when> - <c:otherwise> - <bean:write name="orgSystemSubscriptionsForm" property="virtualization_host_platform"/> - </c:otherwise> - </c:choose> - </td> - </tr> - </tbody> - </table> + <div class="panel panel-default margin-top-md"> + <table class="table table-striped" cellpadding="0" cellspacing="0" width="100%"> + <thead> + <tr> + <th><bean:message key="orgsystemsubs.jsp.ent_name"/></th> + <th><bean:message key="orgsystemsubs.jsp.total"/></th> + <th><bean:message key="orgsystemsubs.jsp.usage"/></th> + <th><bean:message key="orgsystemsubs.jsp.proposed_total"/></th> + </tr> + </thead> + <tbody> + <tr> + <td> + <strong><bean:message key="enterprise_entitled"/> <bean:message key="orgsystemsubs.jsp.base"/></strong> + <span class="help-block"><bean:message key="orgsystemsubs.jsp.man_tip"/></span> + </td> + <td> + ${enterprise_entitled.maxEntitlements} + </td> + <td> + ${enterprise_entitled.currentEntitlements} + </td> + <td> + <c:choose> + <c:when test="${param.oid != 1}"> + <html:text property="enterprise_entitled" + styleClass="form-control" + onkeydown="return blockEnter(event)"/> + <span class="help-block"><bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${enterprise_entitled.upperRange}"/></span> + </c:when> + <c:otherwise> + <bean:write name="orgSystemSubscriptionsForm" property="enterprise_entitled"/> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td> + <strong><bean:message key="monitoring_entitled"/> <bean:message key="orgsystemsubs.jsp.add_on"/></strong> + <span class="help-block"><bean:message key="orgsystemsubs.jsp.mon_tip"/></span> + </td> + <td> + ${monitoring_entitled.maxEntitlements} + </td> + <td> + ${monitoring_entitled.currentEntitlements} + </td> + <td> + <c:choose> + <c:when test="${param.oid != 1}"> + <html:text property="monitoring_entitled" + styleClass="form-control" + onkeydown="return blockEnter(event)"/> + <span class="help-block"> + <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${monitoring_entitled.upperRange}"/> + </span> + </c:when> + <c:otherwise> + <bean:write name="orgSystemSubscriptionsForm" property="monitoring_entitled"/> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td> + <strong><bean:message key="provisioning_entitled"/> <bean:message key="orgsystemsubs.jsp.add_on"/></strong> + <span class="help-block"> + <bean:message key="orgsystemsubs.jsp.provis_tip"/> + </span> + </td> + <td> + ${provisioning_entitled.maxEntitlements} + </td> + <td> + ${provisioning_entitled.currentEntitlements} + </td> + <td> + <c:choose> + <c:when test="${param.oid != 1}"> + <html:text property="provisioning_entitled" + styleClass="form-control" + onkeydown="return blockEnter(event)"/> + <span class="help-block"> + <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${provisioning_entitled.upperRange}"/> + </span> + </c:when> + <c:otherwise> + <bean:write name="orgSystemSubscriptionsForm" property="provisioning_entitled"/> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td> + <strong><bean:message key="virtualization_host"/> <bean:message key="orgsystemsubs.jsp.add_on"/></strong> + <span class="help-block"> + <bean:message key="orgsystemsubs.jsp.virt_tip"/> + </span> + </td> + <td> + ${virtualization_host.maxEntitlements} + </td> + <td> + ${virtualization_host.currentEntitlements} + </td> + <td> + <c:choose> + <c:when test="${param.oid != 1}"> + <html:text property="virtualization_host" + styleClass="form-control" + onkeydown="return blockEnter(event)"/> + <span class="help-block"> + <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${virtualization_host.upperRange}"/> + </span> + </c:when> + <c:otherwise> + <bean:write name="orgSystemSubscriptionsForm" property="virtualization_host"/> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td> + <strong> + <bean:message key="virtualization_host_platform"/> <bean:message key="orgsystemsubs.jsp.add_on"/> + </strong> + <span class="help-block"><bean:message key="orgsystemsubs.jsp.virt_plat_tip"/></span> + </td> + <td> + ${virtualization_host_platform.maxEntitlements} + </td> + <td> + ${virtualization_host_platform.currentEntitlements} + </td> + <td> + <c:choose> + <c:when test="${param.oid != 1}"> + <html:text property="virtualization_host_platform" + styleClass="form-control" + onkeydown="return blockEnter(event)"/> + <span class="help-block"> + <bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${virtualization_host_platform.upperRange}"/> + </span> + </c:when> + <c:otherwise> + <bean:write name="orgSystemSubscriptionsForm" property="virtualization_host_platform"/> + </c:otherwise> + </c:choose> + </td> + </tr> + </tbody> + </table> + </div> <c:if test="${param.oid != 1}"> <div class="form-group"> <div class="col-lg-10"> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp index 875b3de..7db66c7 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp @@ -18,9 +18,7 @@ <bean:message key="softwareentitlements.header"/> </rhn:toolbar> -<bean:message key="softwareentitlements.description"/> - - +<p class="margin-bottom-md"><bean:message key="softwareentitlements.description"/></p> <c:choose> <c:when test = "${orgCount > 1}"> @@ -33,8 +31,6 @@ </c:otherwise> </c:choose> - - <rl:listset name="entitlementSet"> <rhn:csrf /> <rhn:submitted /> @@ -110,7 +106,7 @@ </rl:list> </rl:listset> -<rhn:tooltip typeKey="Tip">*-<bean:message key = "Available/Total.tip"/></rhn:tooltip> -<rhn:tooltip typeKey="Tip">**-<bean:message key = "Used/Allotted.tip"/></rhn:tooltip> +<rhn:tooltip><small>*-<bean:message key = "Available/Total.tip"/></small></rhn:tooltip> +<rhn:tooltip><small>**-<bean:message key = "Used/Allotted.tip"/></small></rhn:tooltip> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp index 331ca9b..9a6e673 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -7,14 +7,15 @@ <html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> - <div class="panel panel-default"> - <html:form action="/users/UserDetailsSubmit?uid=${user.id}" styleClass="form-horizontal"> + <html:form action="/users/UserDetailsSubmit?uid=${user.id}" styleClass="form-horizontal"> + <div class="panel panel-default"> <rhn:csrf /> <div class="panel-heading"> <h4><bean:message key="userdetails.jsp.header"/></h4> - <p><bean:message key="userdetails.jsp.summary"/></p> </div> <div class="panel-body"> + <p><bean:message key="userdetails.jsp.summary"/></p> + <hr/> <%@ include file="/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf"%> <div class="form-group"> <label class="col-lg-3 control-label"><bean:message key="userdetails.jsp.adminRoles"/>:</label> @@ -85,7 +86,7 @@ </div> </div> </div> - </html:form> - </div> + </div> + </html:form> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf index f2d8cc2..41a4bb4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf @@ -2,23 +2,28 @@ <div class="panel panel-default"> <div class="panel-heading"> - <h5 class="panel-title"><bean:message key="preferences.jsp.tz"/></h5> + <h4><bean:message key="preferences.jsp.tz"/></h4> </div> <div class="panel-body"> <p><bean:message key="preferences.jsp.datestimes"/></p> - <div class="preference"><bean:message key="preferences.jsp.displaytimesas"/> - <html:select property="timezone"> - <html:options collection="timezones" - property="value" - labelProperty="display" /> - </html:select> + <div class="row-0"> + <div class="col-md-2"> + <bean:message key="preferences.jsp.displaytimesas"/> + </div> + <div class="col-md-4"> + <html:select styleClass="form-control" property="timezone"> + <html:options collection="timezones" + property="value" + labelProperty="display" /> + </html:select> + </div> </div> </div> </div> <div class="panel panel-default"> <div class="panel-heading"> - <h5 class="panel-title"><bean:message key="preferences.jsp.lang" /></h5> + <h4><bean:message key="preferences.jsp.lang" /></h4> </div> <div class="panel-body"> <p><bean:message key="preferences.jsp.langs" /></p> @@ -68,8 +73,6 @@ </div> </div> - - <hr/> <div class="text-right"> <rhn:submit valueKey="preferences.jsp.submitvalue"/> diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp index da61fa3..3bb8146 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp @@ -12,45 +12,45 @@ <p><bean:message key="credentials.jsp.delete.summary" /></p> <form method="post" action="/rhn/account/DeleteCredentials.do"> - <div class="jumbotron"> - <div class="container"> + <div class="panel panel-default"> + <div class="panel-heading"> <h2><bean:message key="credentials.jsp.susestudio" /></h2> - <div class="row"> - <div class="col-lg-2"> + </div> + <div class="panel-body"> + <div class="row-0"> + <div class="col-sm-2"> <bean:message key="credentials.jsp.username" /> </div> - <div class="col-lg-6"> + <div class="col-sm-6"> <strong><c:out value="${creds.username}" /></strong> </div> </div> - <div class="row"> - <div class="col-lg-2"> + <div class="row-0"> + <div class="col-sm-2"> <bean:message key="credentials.jsp.apikey" /> </div> - <div class="col-lg-6"> + <div class="col-sm-6"> <strong><c:out value="${creds.password}" /></strong> </div> </div> - <div class="row"> - <div class="col-lg-2"> + <div class="row-0"> + <div class="col-sm-2"> <strong> <bean:message key="credentials.jsp.url" /> </strong> </div> - <div class="col-lg-6"> + <div class="col-sm-6"> <a href="${creds.url}"> <c:out value="${creds.url}" /> </a> </div> </div> - <br/> <rhn:csrf /> - <p> - <rhn:submitted /> - <html:submit property="dispatch" styleClass="btn btn-danger btn-lg"> - <bean:message key="credentials.jsp.delete.dispatch" /> - </html:submit> - </p> + <rhn:submitted /> + <hr/> + <html:submit property="dispatch" styleClass="btn btn-danger"> + <bean:message key="credentials.jsp.delete.dispatch" /> + </html:submit> </div> </div> </form> commit dc1977c3b1a2d09d484b58f9c754cc9d3e5f603a Author: cyntss <csanchez(a)suse.com> Date: Tue Nov 5 16:41:36 2013 +0100 icons changed diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp index 56e3893..c8cde87 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -21,7 +21,7 @@ <p><bean:message key="general.jsp.org.summary3"/></p> <table class="table"> <tr> - <td><img src="/img/rhn-icon-org.gif"/></td> + <td><i class="fa fa-sitemap fa-3x"></i></td> <td><bean:message key="general.jsp.org.tbl.header1"/>:</td> <td> <p> @@ -33,7 +33,7 @@ </td> </tr> <tr> - <td><img src="/img/rhn-icon-channels.gif"/></td> + <td><i class="fa fa-list-alt fa-3x"></i></td> <td><bean:message key="general.jsp.org.tbl.header2"/>:</td> <td> <p> @@ -45,7 +45,7 @@ </td> </tr> <tr> - <td><img src="/img/rhn-icon-users.gif"/></td> + <td><i class="fa fa-group fa-3x"></i></td> <td><bean:message key="general.jsp.org.tbl.header3"/>:</td> <td> <p> @@ -56,12 +56,17 @@ </p> </td> </tr> + <tr> + <td colspan="3"> + <p> + <small> + <bean:message key="general.jsp.org.summary4"/><a href="/rhn/help/reference/index.jsp"> + <bean:message key="general.jsp.org.tbl.link4"/></a>. + </small> + </p> + </td> + </tr> </table> - <hr> - <p> - <bean:message key="general.jsp.org.summary4"/><a href="/rhn/help/reference/index.jsp"> - <bean:message key="general.jsp.org.tbl.link4"/></a>. - </p> </div> </div> commit eb53ba4a617529b9c4340256ed1c176ba031c26c Author: cyntss <csanchez(a)suse.com> Date: Tue Nov 5 16:40:29 2013 +0100 class added to main menu to make it responsible diff --git a/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java b/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java index f5b740e..3a7c060 100644 --- a/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/nav/TopnavRenderer.java @@ -48,7 +48,7 @@ public class TopnavRenderer extends Renderable { return; } ulTag = new HtmlTag("ul"); - ulTag.setAttribute("class", "nav navbar-nav"); + ulTag.setAttribute("class", "nav navbar-nav collapse main-menu-hor"); sb.append(ulTag.renderOpenTag()); } commit 1ae35f786a309322671f595fe96efd6101f2ee9d Author: cyntss <csanchez(a)suse.com> Date: Tue Nov 5 16:38:04 2013 +0100 new icons in Spacewalk font diff --git a/branding/fonts/font-spacewalk/css/spacewalk-font.css b/branding/fonts/font-spacewalk/css/spacewalk-font.css index 318bfc6..c3d4d30 100644 --- a/branding/fonts/font-spacewalk/css/spacewalk-font.css +++ b/branding/fonts/font-spacewalk/css/spacewalk-font.css @@ -9,126 +9,191 @@ font-style: normal; } -/* Use the following CSS code if you want to use data attributes for inserting your icons */ -[data-icon]:before { +[class*="spacewalk-icon-"] { font-family: 'spacewalk-icon'; - content: attr(data-icon); speak: none; + font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; line-height: 1; + + /* Better Font Rendering =========== */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -/* Use the following CSS code if you want to have a class per icon */ -/* -Instead of a list of all class selectors, -you can use the generic selector below, but it's slower: -[class*="spacewalk-icon-"] { -*/ -.spacewalk-icon-virtual-host, .spacewalk-icon-virtual-guest, .spacewalk-icon-manage-autoinstallations, .spacewalk-icon-locked-system, .spacewalk-icon-inactive-systems, .spacewalk-icon-unknown-system, .spacewalk-icon-health, .spacewalk-icon-Unentitled, .spacewalk-icon-system-groups, .spacewalk-icon-health-unknown, .spacewalk-icon-software-crashes, .spacewalk-icon-health-pending, .spacewalk-icon-enhancement, .spacewalk-icon-software-channels, .spacewalk-icon-Software-Channel-Management, .spacewalk-icon-download-csv, .spacewalk-icon-custom-system-info, .spacewalk-icon-register-system, .spacewalk-icon-patches, .spacewalk-icon-configure-suse-manager, .spacewalk-icon-autoinstalling, .spacewalk-icon-clone-patches, .spacewalk-icon-autoinstallations, .spacewalk-icon-organization-trust, .spacewalk-icon-package-search, .spacewalk-icon-packages, .spacewalk-icon-monitoring-status, .spacewalk-icon-manage-software-packages, .spacewalk-icon-manage-patches, .spacewalk-icon-manage-entitlement s-subscriptions, .spacewalk-icon-manage-configuration-files { - font-family: 'spacewalk-icon'; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - -webkit-font-smoothing: antialiased; +.spacewalk-icon-snapshot-rollback:before { + content: "\e600"; } -.spacewalk-icon-virtual-host:before { - content: "\e000"; +.spacewalk-icon-package-delete:before { + content: "\e601"; } -.spacewalk-icon-virtual-guest:before { - content: "\e001"; +.spacewalk-icon-config-system:before { + content: "\e602"; } -.spacewalk-icon-manage-autoinstallations:before { - content: "\e002"; +.spacewalk-icon-channels:before { + content: "\e603"; } -.spacewalk-icon-locked-system:before { - content: "\e003"; +.spacewalk-icon-package-add:before { + content: "\e604"; } -.spacewalk-icon-inactive-systems:before { - content: "\e004"; +.spacewalk-icon-schedule:before { + content: "\e605"; } -.spacewalk-icon-unknown-system:before { - content: "\e005"; +.spacewalk-icon-schedule-computer:before { + content: "\e606"; } -.spacewalk-icon-health:before { - content: "\e006"; +.spacewalk-icon-note-pin:before { + content: "\e607"; } -.spacewalk-icon-Unentitled:before { - content: "\e007"; +.spacewalk-icon-channels-config:before { + content: "\e608"; } -.spacewalk-icon-system-groups:before { - content: "\e008"; +.spacewalk-icon-bug-ex:before { + content: "\e609"; } -.spacewalk-icon-health-unknown:before { - content: "\e009"; +.spacewalk-icon-monitoring-warning:before { + content: "\e60a"; } -.spacewalk-icon-software-crashes:before { - content: "\e00a"; +.spacewalk-icon-sandbox:before { + content: "\e60b"; } -.spacewalk-icon-health-pending:before { - content: "\e00b"; +.spacewalk-icon-proxy:before { + content: "\e60c"; } -.spacewalk-icon-enhancement:before { - content: "\e00c"; +.spacewalk-icon-monitoring-unknown:before { + content: "\e60d"; } -.spacewalk-icon-software-channels:before { - content: "\e00d"; +.spacewalk-icon-patchset-install:before { + content: "\e60e"; } -.spacewalk-icon-Software-Channel-Management:before { - content: "\e00e"; +.spacewalk-icon-monitoring-pending:before { + content: "\e60f"; } -.spacewalk-icon-download-csv:before { - content: "\e00f"; +.spacewalk-icon-patch-set:before { + content: "\e610"; } -.spacewalk-icon-custom-system-info:before { - content: "\e010"; +.spacewalk-icon-monitoring-ok:before { + content: "\e611"; } -.spacewalk-icon-register-system:before { - content: "\e011"; +.spacewalk-icon-patch-remove:before { + content: "\e612"; +} +.spacewalk-icon-monitoring-down:before { + content: "\e613"; +} +.spacewalk-icon-package-upgrade:before { + content: "\e614"; +} +.spacewalk-icon-patch-install:before { + content: "\e615"; +} +.spacewalk-icon-listicon-cfg-symlink:before { + content: "\e616"; +} +.spacewalk-icon-go-button:before { + content: "\e617"; +} +.spacewalk-icon-folder-config:before { + content: "\e618"; +} +.spacewalk-icon-package-extra:before { + content: "\e619"; } .spacewalk-icon-patches:before { - content: "\e012"; + content: "\e61a"; } -.spacewalk-icon-configure-suse-manager:before { - content: "\e013"; +.spacewalk-icon-register-system:before { + content: "\e61b"; +} +.spacewalk-icon-inactive-systems:before { + content: "\e61c"; +} +.spacewalk-icon-locked-system:before { + content: "\e61d"; +} +.spacewalk-icon-autoinstallations:before { + content: "\e61e"; } .spacewalk-icon-autoinstalling:before { - content: "\e014"; + content: "\e61f"; +} +.spacewalk-icon-manage-autoinstallations:before { + content: "\e620"; +} +.spacewalk-icon-Software-Channel-Management:before { + content: "\e621"; +} +.spacewalk-icon-manage-configuration-files:before { + content: "\e622"; +} +.spacewalk-icon-schedule2:before { + content: "\e623"; } .spacewalk-icon-clone-patches:before { - content: "\e015"; + content: "\e624"; } -.spacewalk-icon-autoinstallations:before { - content: "\e017"; +.spacewalk-icon-configure-suse-manager:before { + content: "\e625"; } -.spacewalk-icon-organization-trust:before { - content: "\e018"; +.spacewalk-icon-manage-entitlements-subscriptions:before { + content: "\e626"; } -.spacewalk-icon-package-search:before { - content: "\e016"; +.spacewalk-icon-software-channels:before { + content: "\e627"; } -.spacewalk-icon-packages:before { - content: "\e019"; +.spacewalk-icon-software-crashes:before { + content: "\e628"; } -.spacewalk-icon-monitoring-status:before { - content: "\e01a"; +.spacewalk-icon-manage-patches:before { + content: "\e629"; +} +.spacewalk-icon-custom-system-info:before { + content: "\e62a"; +} +.spacewalk-icon-download-csv:before { + content: "\e62b"; } .spacewalk-icon-manage-software-packages:before { - content: "\e01b"; + content: "\e62c"; } -.spacewalk-icon-manage-patches:before { - content: "\e01c"; +.spacewalk-icon-monitoring-status:before { + content: "\e62d"; } -.spacewalk-icon-manage-entitlements-subscriptions:before { - content: "\e01d"; +.spacewalk-icon-system-groups:before { + content: "\e62e"; } -.spacewalk-icon-manage-configuration-files:before { - content: "\e01e"; +.spacewalk-icon-Unentitled:before { + content: "\e62f"; +} +.spacewalk-icon-enhancement:before { + content: "\e630"; +} +.spacewalk-icon-health-pending:before { + content: "\e631"; +} +.spacewalk-icon-organization-trust:before { + content: "\e632"; +} +.spacewalk-icon-unknown-system:before { + content: "\e633"; +} +.spacewalk-icon-virtual-guest:before { + content: "\e634"; +} +.spacewalk-icon-package-search:before { + content: "\e635"; +} +.spacewalk-icon-health-unknown:before { + content: "\e636"; +} +.spacewalk-icon-health:before { + content: "\e637"; +} +.spacewalk-icon-packages:before { + content: "\e638"; +} +.spacewalk-icon-virtual-host:before { + content: "\e639"; } - diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.dev.svg b/branding/fonts/font-spacewalk/font/spacewalk-icon.dev.svg deleted file mode 100644 index 34ddc09..0000000 --- a/branding/fonts/font-spacewalk/font/spacewalk-icon.dev.svg +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<svg xmlns="http://www.w3.org/2000/svg"> -<metadata> -This is a custom SVG font generated by IcoMoon. -<iconset grid="16"></iconset> -</metadata> -<defs> -<font id="spacewalk-icon" horiz-adv-x="512" > -<font-face units-per-em="512" ascent="480" descent="-32" /> -<missing-glyph horiz-adv-x="512" /> -<glyph class="hidden" unicode="" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" /> -<glyph unicode="" d="M 125.59,469.404 m0,0,c -9.225,0 -16.63-7.719 -16.63-17.309 l 0-212.022 c 24.251,23.906 58.467,38.835 96.322,38.835 49.233,0 92.317-25.197 115.373-62.738 9.853,4.6 20.966,7.165 32.631,7.165 10.366,0 20.258-2.038 29.236-5.706 l 0,234.467 c 0,9.591 -7.405,17.309 -16.63,17.309 l -240.302,0 z m 35.083-61.407 163.377,0 c 8.122,0 14.65-7.167 14.65-16.073 0-8.906 -6.528-16.073 -14.65-16.073 l -163.377,0 c -8.122,0 -14.65,7.167 -14.65,16.073 0,8.906 6.528,16.073 14.65,16.073 z m 0-72.502 163.377,0 c 8.122,0 14.65-7.167 14.65-16.073 0-8.906 -6.528-16.105 -14.65-16.105 l -163.377,0 c -8.122,0 -14.65,7.199 -14.65,16.105 0,8.906 6.528,16.073 14.65,16.073 z m 44.609-84.137 c -1.067,0 -2.116-0.034 -3.175-0.063 -0.624-0.018 -1.233-0.036 -1.855-0.063 -0.1-0.004 -0.215,0.005 -0.314,0 -0.388-0.018 -0.776-0.041 -1.163-0.063 -0.542-0.031 -1.095-0.056 -1.635-0.095 -0.836-0.060 -1.684-0.143 -2.515-0.222 -0.672-0.064 -1.344-0.115 -2.012-0.19 -0.969-0.109 -1.9-0.246 -2 .861-0.38 -0.1-0.014 -0.183-0.017 -0.283-0.032 -0.268-0.038 -0.55-0.087 -0.817-0.127 -1.126-0.169 -2.25-0.369 -3.364-0.571 -1.294-0.235 -2.591-0.482 -3.867-0.761 -1.042-0.228 -2.052-0.472 -3.081-0.729 -0.232-0.058 -0.492-0.099 -0.723-0.159 -1.093-0.281 -2.191-0.606 -3.269-0.919 -0.155-0.045 -0.317-0.081 -0.472-0.127 -0.655-0.193 -1.268-0.397 -1.918-0.602 -0.68-0.215 -1.369-0.406 -2.043-0.634 -0.123-0.042 -0.255-0.085 -0.377-0.127 -0.989-0.338 -1.949-0.713 -2.924-1.078 -1.187-0.445 -2.388-0.911 -3.552-1.395 -0.968-0.402 -1.94-0.807 -2.892-1.236 -0.74-0.334 -1.471-0.697 -2.201-1.046 -0.75-0.359 -1.493-0.702 -2.232-1.078 -0.221-0.112 -0.44-0.203 -0.66-0.317 -0.51-0.264 -1.004-0.553 -1.509-0.824 -0.249-0.134 -0.475-0.276 -0.723-0.412 -1.081-0.593 -2.151-1.211 -3.207-1.839 -0.042-0.025 -0.115-0.038 -0.157-0.063 -0.921-0.549 -1.835-1.105 -2.735-1.68 -0.454-0.29 -0.872-0.591 -1.32-0.888 -0.245-0.162 -0.511-0.343 -0.754-0.507 -0.458-0.309 -0.899-0.603 -1.352-0.919 -0.058-0.040 -0.13 1-0.086 -0.189-0.127 -0.257-0.18 -0.499-0.357 -0.754-0.539 -0.609-0.435 -1.194-0.884 -1.792-1.331 -0.132-0.098 -0.278-0.186 -0.409-0.285 -0.94-0.71 -1.854-1.448 -2.766-2.187 -0.019-0.015 -0.076-0.017 -0.094-0.032 -0.931-0.756 -1.834-1.56 -2.735-2.346 -0.925-0.807 -1.843-1.603 -2.735-2.441 -0.898-0.843 -1.776-1.694 -2.641-2.568 -1.641-1.659 -3.231-3.372 -4.747-5.136 -0.211-0.246 -0.42-0.513 -0.629-0.761 -0.584-0.694 -1.133-1.351 -1.698-2.061 -0.058-0.073 -0.131-0.149 -0.189-0.222 -2.265-2.863 -4.332-5.876 -6.256-8.972 -1.279-2.059 -2.496-4.156 -3.615-6.309 -3.456-6.648 -6.139-13.74 -7.922-21.145 50.711-2.663 90.947-41.25 90.947-88.48 0-3.060 -0.173-6.087 -0.503-9.067 -5.007,44.638 -46.102,79.445 -96.039,79.445 -3.289,0 -6.571-0.104 -9.84-0.349 -0.084-0.011 -0.168-0.021 -0.251-0.032 C 38.458,150.899 0,112.405 0,65.839 c 0-51.020 46.138-92.379 103.081-92.379 1.565,0 3.136,0.033 4.684,0.095 2.093-0.147 4.245-0.222 6.445-0.222 l 309.306,0 c 6.872,0 12.376,0.848 16.787,2.473 39.85 6,8.398 69.852,45.483 69.852,89.907 0,46.421 -32.793,84.759 -75.322,90.794 -1.146,0.040 -2.302,0.063 -3.458,0.063 -45.080,0 -82.49-30.469 -89.689-70.473 -0.013,0.589 -0.032,1.183 -0.032,1.775 0,34.639 22.401,64.415 54.48,77.479 -2.374,7.947 -7.17,14.929 -13.612,20.194 -0.012,0.010 -0.019,0.022 -0.032,0.032 -0.966,0.788 -1.981,1.542 -3.018,2.251 -0.52,0.355 -1.067,0.68 -1.603,1.014 -0.5,0.311 -0.995,0.627 -1.509,0.919 -0.043,0.025 -0.082,0.039 -0.126,0.063 -1.119,0.632 -2.245,1.235 -3.427,1.775 -0.067,0.031 -0.153,0.065 -0.22,0.095 -0.527,0.238 -1.065,0.447 -1.603,0.666 -0.125,0.051 -0.252,0.109 -0.377,0.159 -0.479,0.19 -0.927,0.396 -1.415,0.571 -0.188,0.067 -0.377,0.125 -0.566,0.19 -0.428,0.147 -0.886,0.277 -1.32,0.412 -0.625,0.194 -1.249,0.371 -1.886,0.539 -0.327,0.086 -0.676,0.174 -1.006,0.254 -0.291,0.070 -0.587,0.126 -0.88,0.19 -0.033,0.006 -0.062,0.026 -0.094,0.032 -0.076,0.017 -0.175,0.015 -0.251,0.032 -0.032,0.007 -0.062,0.025 -0.094,0.032 -0.092,0.015 -0.191,0.017 -0 .283,0.032 -2.593,0.421 -5.265,0.666 -7.985,0.666 -25.795,0 -46.715-19.781 -46.715-44.192 0-9.701 3.298-18.674 8.897-25.964 -10.349,8.108 -16.944,20.372 -16.944,34.080 0,7.709 2.086,14.964 5.753,21.272 l -4.495,10.24 c -15.607,35.577 -52.544,60.456 -96.039,60.456 z" data-tags="virtual-host" /> -<glyph unicode="" d="M 212.75,476.969 C 197.915,476.969 185.781,464.835 185.781,450 L 185.781,273.469 C 185.946,273.495 185.874,273.491 186.156,273.531 C 186.778,273.62 187.060,273.656 187.094,273.656 C 187.867,273.77 188.779,273.897 189.969,274.031 C 191.211,274.172 192.023,274.214 192.406,274.25 C 193.179,274.323 194.188,274.441 195.438,274.531 L 195.469,274.531 C 196.418,274.6 197.056,274.636 197.406,274.656 C 197.414,274.657 197.429,274.656 197.438,274.656 C 197.783,274.676 198.239,274.694 198.75,274.719 C 199.154,274.739 198.565,274.706 198.844,274.719 C 199.355,274.741 199.617,274.752 199.656,274.75 C 200.3,274.78 200.923,274.798 201.438,274.812 C 202.43,274.84 203.718,274.875 205.281,274.875 C 240.111,274.875 271.889,261.551 295.031,239.625 L 304.438,239.625 C 304.438,236.621 304.001,233.749 303.281,231.031 C 309.152,224.287 314.295,216.942 318.563,209.031 C 329.259,215.316 341.682,218.969 354.813,218.969 C 358.943,218.969 362.872,218.599 366.563,218 C 364.311 ,218.367 364.433,218.4 367,217.969 L 367.469,217.875 C 367.479,217.873 367.491,217.877 367.5,217.875 C 367.532,217.869 367.69,217.832 367.781,217.812 C 367.913,217.784 367.903,217.781 368.188,217.719 C 368.38,217.677 368.194,217.748 368.469,217.687 L 368.469,217.656 L 368.563,217.656 C 368.414,217.689 368.917,217.587 369.813,217.375 C 369.858,217.365 369.895,217.353 369.938,217.344 C 369.993,217.332 370.043,217.323 370.094,217.312 C 370.522,217.208 370.961,217.095 371.438,216.969 C 372.341,216.73 373.291,216.463 374.281,216.156 C 374.361,216.132 375.009,215.956 376.25,215.531 L 376.281,215.531 C 375.983,215.634 376.282,215.509 377.094,215.219 C 377.121,215.209 377.096,215.229 377.125,215.219 C 378.811,214.614 379.534,214.262 379.25,214.375 L 379.281,214.375 C 380.158,214.027 380.341,213.954 379.844,214.156 C 380.168,214.025 380.969,213.703 382.25,213.125 C 382.296,213.104 382.253,213.121 382.313,213.094 C 382.409,213.051 382.434,213.058 382.563,213 C 382.575,212.994 382.558, 212.971 382.563,212.969 C 382.573,212.966 382.591,212.968 382.594,212.969 C 384.636,212.033 386.365,211.112 387.781,210.312 C 387.886,210.253 387.85,210.286 387.969,210.219 L 387.969,210.187 L 388,210.187 C 389.181,209.515 389.916,209.040 390.281,208.812 C 390.545,208.648 391.38,208.165 392.719,207.25 C 394.247,206.206 395.761,205.085 397.25,203.875 C 397.28,203.851 397.314,203.837 397.344,203.812 C 397.361,203.798 397.35,203.784 397.344,203.781 C 397.338,203.785 397.357,203.792 397.406,203.75 C 397.511,203.662 397.513,203.672 397.5,203.687 C 397.603,203.597 397.734,203.467 397.875,203.344 L 397.844,203.312 C 398.537,202.735 399.207,202.136 399.875,201.531 C 400.932,203.197 401.563,205.157 401.563,207.25 C 401.563,213.15 390.75,225.295 390.75,239.625 L 482.469,239.625 C 497.304,239.625 509.438,251.758 509.438,266.594 L 509.438,450 C 509.438,464.835 497.304,476.969 482.469,476.969 L 212.75,476.969 z M 212.75,455.406 L 482.469,455.406 C 485.335,455.406 487.875,452.866 487.875, 450 L 487.875,309.75 C 487.875,306.884 485.335,304.344 482.469,304.344 L 212.75,304.344 C 209.884,304.344 207.344,306.884 207.344,309.75 L 207.344,450 C 207.344,452.866 209.884,455.406 212.75,455.406 z M 205.281,251.344 C 204.214,251.344 203.153,251.311 202.094,251.281 C 201.469,251.264 200.871,251.247 200.25,251.219 C 200.15,251.215 200.037,251.224 199.938,251.219 C 199.549,251.201 199.168,251.179 198.781,251.156 C 198.24,251.125 197.664,251.101 197.125,251.062 C 196.289,251.002 195.456,250.922 194.625,250.844 C 193.953,250.78 193.293,250.732 192.625,250.656 C 191.656,250.547 190.71,250.415 189.75,250.281 C 189.65,250.267 189.569,250.264 189.469,250.25 C 189.201,250.212 188.924,250.165 188.656,250.125 C 187.53,249.956 186.395,249.765 185.281,249.562 C 183.988,249.328 182.682,249.060 181.406,248.781 C 180.364,248.553 179.373,248.319 178.344,248.062 C 178.112,248.005 177.856,247.966 177.625,247.906 C 176.532,247.626 175.422,247.282 174.344,246.969 C 174.189,246.924 174.030,24 6.889 173.875,246.844 C 173.22,246.65 172.618,246.455 171.969,246.25 C 171.288,246.035 170.58,245.853 169.906,245.625 C 169.783,245.583 169.654,245.542 169.531,245.5 C 168.542,245.162 167.6,244.771 166.625,244.406 C 165.438,243.962 164.227,243.515 163.063,243.031 C 162.094,242.629 161.108,242.21 160.156,241.781 C 159.417,241.448 158.698,241.099 157.969,240.75 C 157.219,240.391 156.489,240.032 155.75,239.656 C 155.529,239.544 155.282,239.458 155.063,239.344 C 154.552,239.080 154.067,238.803 153.563,238.531 C 153.314,238.397 153.091,238.23 152.844,238.094 C 151.763,237.501 150.68,236.909 149.625,236.281 C 149.583,236.256 149.511,236.244 149.469,236.219 C 148.548,235.669 147.65,235.107 146.75,234.531 C 146.296,234.241 145.886,233.922 145.438,233.625 C 145.193,233.463 144.931,233.289 144.688,233.125 C 144.229,232.816 143.765,232.535 143.313,232.219 C 143.255,232.179 143.183,232.134 143.125,232.094 C 142.868,231.914 142.63,231.714 142.375,231.531 C 141.766,231.096 141.192,230.666 140.594,230.219 C 140.462,230.12 140.319,230.037 140.188,229.937 C 139.247,229.227 138.319,228.49 137.406,227.75 C 137.388,227.735 137.331,227.734 137.313,227.719 C 136.382,226.963 135.495,226.161 134.594,225.375 C 133.669,224.568 132.736,223.744 131.844,222.906 C 130.946,222.063 130.083,221.217 129.219,220.344 C 127.577,218.685 125.984,216.983 124.469,215.219 C 124.257,214.972 124.053,214.717 123.844,214.469 C 123.259,213.775 122.689,213.115 122.125,212.406 C 122.067,212.333 121.995,212.261 121.938,212.187 C 119.673,209.325 117.611,206.314 115.688,203.219 C 114.408,201.16 113.182,199.059 112.063,196.906 C 108.607,190.259 105.94,183.156 104.156,175.75 C 154.867,173.087 195.094,134.511 195.094,87.281 C 195.094,84.222 194.923,81.167 194.594,78.187 C 189.587,122.825 148.5,157.656 98.563,157.656 C 95.273,157.656 91.988,157.557 88.719,157.312 C 88.635,157.302 88.552,157.292 88.469,157.281 C 38.464,150.913 0,112.41 0,65.844 C 0,14.823 46.151-26.531 103.094-26.531 C 104.659-26.531 106.202-26.5 107.75-26.438 C 109.843-26.584 112.020-26.656 114.219-26.656 L 423.531-26.656 C 430.403-26.656 435.902-25.813 440.313-24.188 C 480.168-15.79 510.156,21.295 510.156,65.719 C 510.156,112.139 477.373,150.464 434.844,156.5 C 433.698,156.54 432.531,156.562 431.375,156.562 C 386.295,156.562 348.886,126.098 341.688,86.094 C 341.675,86.683 341.656,87.283 341.656,87.875 C 341.656,122.514 364.047,152.279 396.125,165.344 C 393.751,173.291 388.973,180.266 382.531,185.531 C 382.519,185.541 382.512,185.553 382.5,185.562 C 381.534,186.351 380.506,187.104 379.469,187.812 C 378.949,188.167 378.411,188.51 377.875,188.844 C 377.375,189.155 376.889,189.457 376.375,189.75 C 376.332,189.775 376.293,189.788 376.25,189.812 C 375.131,190.445 373.994,191.054 372.813,191.594 C 372.746,191.624 372.661,191.657 372.594,191.687 C 372.067,191.925 371.539,192.156 371,192.375 C 370.875,192.426 370.719,192.481 370.594,192.531 C 370.115,192.721 369.675,192.919 369.188,193.094 C 369,193.161 368.81 4,193.216 368.625,193.281 C 368.197,193.428 367.747,193.553 367.313,193.687 C 366.688,193.881 366.043,194.051 365.406,194.219 C 365.079,194.305 364.736,194.42 364.406,194.5 C 364.115,194.57 363.825,194.623 363.531,194.687 C 363.499,194.693 363.47,194.713 363.438,194.719 C 363.361,194.736 363.264,194.733 363.188,194.75 C 363.155,194.757 363.126,194.774 363.094,194.781 C 363.002,194.797 362.905,194.798 362.813,194.812 C 360.219,195.233 357.533,195.469 354.813,195.469 C 329.017,195.469 308.125,175.693 308.125,151.281 C 308.125,141.58 311.401,132.602 317,125.312 C 306.651,133.42 300.063,145.699 300.063,159.406 C 300.063,167.115 302.145,174.348 305.813,180.656 L 301.313,190.906 C 285.705,226.483 248.777,251.344 205.281,251.344 z " data-tags="virtual-guest" /> -<glyph unicode="" d="M 255,479.437 C 114.167,479.437 0,365.27 0,224.437 C 0,213.101 0.754,201.945 2.188,191 C 3.284,193.266 4.414,195.004 5.125,196 L 5.188,196.094 L 5.25,196.187 C 10.109,202.868 16.092,209.133 24.031,217 C 28.001,220.933 32.076,224.76 36.375,228.187 C 38.524,229.901 40.667,231.508 43.563,233.187 C 46.458,234.867 49.374,237.625 58.938,237.625 C 67.815,237.625 73.959,234.156 78.25,230.937 L 78.406,230.844 L 78.563,230.719 L 82.438,227.719 C 83.048,230.97 83.766,234.277 84.656,237.656 C 84.662,237.679 84.682,237.696 84.688,237.719 C 84.715,237.824 84.722,237.926 84.75,238.031 L 84.781,238.031 C 88.211,250.965 100.91,261.219 114.875,261.219 L 153.688,261.219 C 156.388,261.219 159.037,260.866 161.594,260.219 C 175.992,297.769 212.384,324.437 255,324.437 C 310.228,324.437 355,279.666 355,224.437 C 355,182.143 328.728,145.993 291.625,131.375 C 292.669,128.183 293.219,124.809 293.219,121.344 L 293.219,82.531 C 293.219,74.647 290.754,69.048 286.969,63.937 C 283.183,58.827 277.297,53.733 268.219,52.031 L 267.781,51.937 L 267.375,51.875 L 259.281,50.656 C 260.188,49.547 261.005,48.478 261.938,47.344 C 262.045,47.213 262.142,47.1 262.25,46.969 L 262.219,46.937 C 266.387,41.95 269.625,35.599 269.625,26.937 C 269.625,20.484 266.403,12.803 263.031,8.219 L 263.125,8.125 C 262.863,7.775 262.46,7.384 262.188,7.031 C 262.154,6.987 262.128,6.919 262.094,6.875 C 257.659,1.157 251.966-4.954 244.563-12.313 C 240.603-16.248 236.542-20.058 232.25-23.5 C 230.104-25.221 227.959-26.872 225.063-28.563 C 224.965-28.62 224.848-28.691 224.75-28.75 C 234.675-29.924 244.759-30.563 255-30.563 C 395.833-30.563 510,83.605 510,224.437 C 510,365.27 395.833,479.437 255,479.437 z M 255,300.156 C 219.833,300.156 190.264,276.186 181.75,243.687 C 182.961,241.057 183.83,238.179 184.281,235.062 L 184.344,235.062 L 184.469,234.219 L 185.531,227.25 L 190.625,231.094 L 190.688,231 C 196.849,235.949 203.494,237.625 209.656,237.625 C 210.19,237.625 210.702,237.586 211. 219,237.562 C 216.861,256.412 234.316,270.156 255,270.156 C 280.247,270.156 300.719,249.685 300.719,224.437 C 300.719,203.924 287.204,186.57 268.594,180.781 C 268.702,179.691 268.75,178.646 268.75,177.656 C 268.75,170.605 265.431,163.066 262.75,159.312 L 262.625,159.156 L 262.531,159 C 260.988,156.911 259.763,155.367 258.25,153.406 L 267.219,152.031 L 267.5,151.969 L 267.781,151.937 C 269.398,151.652 270.953,151.245 272.438,150.75 C 305.847,158.627 330.719,188.624 330.719,224.437 C 330.719,266.253 296.816,300.156 255,300.156 z M 114.875,236.562 C 111.728,236.562 109.293,234.485 108.594,231.687 C 105.796,221.196 104.724,209.822 103.5,199.156 C 98.080,197.408 92.664,195.123 87.594,192.5 L 63.469,211.219 C 62.070,212.268 60.511,212.969 58.938,212.969 C 52.993,212.969 29.384,187.426 25.188,181.656 C 24.313,180.432 23.594,179.23 23.594,177.656 C 23.594,176.083 24.295,174.661 25.344,173.437 C 31.813,165.569 38.118,157.705 44.063,149.312 C 41.265,144.067 38.999,138.845 37.25,133.25 L 4.719,128.344 C 2.096,127.819 0,124.654 0,122.031 L 0,83.219 C 0,80.246 2.090,77.462 5.063,76.937 L 37.063,72.219 C 38.811,66.274 41.278,60.501 44.25,54.906 C 38.305,46.688 31.82,38.981 25.875,30.937 C 25.001,29.714 24.469,28.511 24.469,26.937 C 24.469,25.539 24.844,24.13 25.719,22.906 C 33.062,12.765 45.295,1.924 54.563-6.469 C 55.786-7.693 57.364-8.406 58.938-8.406 C 60.511-8.406 62.057-7.862 63.281-6.813 L 87.938,11.875 C 93.008,9.252 98.267,7.155 103.688,5.406 L 108.594-26.75 C 108.943-29.722 111.728-32 114.875-32 L 153.688-32 C 156.835-32 159.301-29.891 160-27.094 C 162.798-16.603 163.839-5.26 165.063,5.406 C 170.483,7.155 175.898,9.44 180.969,12.062 L 205.094-6.813 C 206.493-7.687 208.083-8.406 209.656-8.406 C 215.601-8.406 239.21,17.311 243.406,22.906 C 244.455,24.13 244.969,25.364 244.969,26.937 C 244.969,28.511 244.268,30.057 243.219,31.281 C 236.749,39.15 230.445,46.87 224.5,55.437 C 227.298,60.508 229.42,65.749 231.344,71.344 L 263.688,76.219 C 266.485,76.743 2 68.563,79.908 268.563,82.531 L 268.563,121.344 C 268.563,124.316 266.472,127.1 263.5,127.625 L 231.5,132.531 C 229.751,138.301 227.316,144.061 224.344,149.656 C 230.289,157.874 236.743,165.582 242.688,173.625 C 243.562,174.849 244.094,176.083 244.094,177.656 C 244.094,179.055 243.749,180.451 242.875,181.5 C 235.531,191.816 223.298,202.651 214.031,211.219 C 212.807,212.268 211.23,212.969 209.656,212.969 C 208.083,212.969 206.487,212.455 205.438,211.406 L 180.625,192.687 C 175.554,195.31 170.295,197.408 164.875,199.156 L 160,231.312 C 159.65,234.285 156.835,236.562 153.688,236.562 L 114.875,236.562 z M 134.281,147.062 C 158.935,147.062 179.063,126.935 179.063,102.281 C 179.063,77.627 158.935,57.531 134.281,57.531 C 109.627,57.531 89.531,77.627 89.531,102.281 C 89.531,126.935 109.627,147.062 134.281,147.062 z M 134.281,122.406 C 123.030,122.406 114.188,113.563 114.188,102.312 C 114.188,91.062 123.030,82.187 134.281,82.187 C 145.532,82.187 154.406,91.062 154.406,102.312 C 154.40 6,113.563 145.532,122.406 134.281,122.406 z " data-tags="manage-autoinstallations" /> -<glyph unicode="" d="M 217.695,305.708 m0,0,0,28.728 c 0,21.097 17.207,38.304 38.304,38.304 21.097,0 38.304-17.207 38.304-38.304 l 0-28.728 -76.609,0 m 124.49-14.364 c 0,7.93 -6.434,14.364 -14.364,14.364 l -4.788,0 0,28.728 c 0,36.808 -30.225,67.033 -67.033,67.033 -36.808,0 -67.033-30.225 -67.033-67.033 l 0-28.728 -4.788,0 c -7.93,0 -14.364-6.434 -14.364-14.364 l 0-86.185 c 0-7.93 6.434-14.364 14.364-14.364 l 143.642,0 c 7.93,0 14.364,6.434 14.364,14.364 l 0,86.185 m 135.682-108.906 c 0-4.533 -4-8.533 -8.533-8.533 l -426.667,0 c -4.533,0 -8.533,4 -8.533,8.533 l 0,221.867 c 0,4.533 4,8.533 8.533,8.533 l 426.667,0 c 4.533,0 8.533-4 8.533-8.533 l 0-221.867 m 34.133,221.867 c 0,23.467 -19.2,42.667 -42.667,42.667 l -426.667,0 c -23.467,0 -42.667-19.2 -42.667-42.667 l 0-290.133 c 0-23.467 19.2-42.667 42.667-42.667 l 145.067,0 c 0-23.2 -17.067-41.333 -17.067-51.2 0-9.333 7.733-17.067 17.067-17.067 l 136.533,0 c 9.333,0 17.067,7.733 17.067,17.067 0,9.333 -17.067,28.533 -17. 067,51.2 l 145.067,0 c 23.467,0 42.667,19.2 42.667,42.667 l 0,290.133" data-tags="locked-system" /> -<glyph unicode="" d="M 256,392.010 m0,0,c -56.017,0 -101.438-45.42 -101.438-101.438 0-56.017 45.42-101.438 101.438-101.438 56.017,0 101.438,45.42 101.438,101.438 0,56.017 -45.42,101.438 -101.438,101.438 z m -54.75-78.406 109.5,0 0-46.063 -109.5,0 0,46.063 z M 477.866,178.629 c 0-4.533 -4-8.533 -8.533-8.533 l -426.667,0 c -4.533,0 -8.533,4 -8.533,8.533 l 0,221.867 c 0,4.533 4,8.533 8.533,8.533 l 426.667,0 c 4.533,0 8.533-4 8.533-8.533 l 0-221.867 m 34.133,221.867 c 0,23.467 -19.2,42.667 -42.667,42.667 l -426.667,0 c -23.467,0 -42.667-19.2 -42.667-42.667 l 0-290.133 c 0-23.467 19.2-42.667 42.667-42.667 l 145.067,0 c 0-23.2 -17.067-41.333 -17.067-51.2 0-9.333 7.733-17.067 17.067-17.067 l 136.533,0 c 9.333,0 17.067,7.733 17.067,17.067 0,9.333 -17.067,28.533 -17.067,51.2 l 145.067,0 c 23.467,0 42.667,19.2 42.667,42.667 l 0,290.133" data-tags="inactive-systems" /> -<glyph unicode="" d="M 279.441,251.889 m0,0,-55.846,0 0,5.585 c 0,9.504 1.078,17.195 3.233,23.073 2.155,5.976 5.34,11.414 9.553,16.313 4.311,4.899 13.912,13.52 28.805,25.865 7.936,6.466 11.904,12.394 11.904,17.783 0,5.388 -1.617,9.552 -4.85,12.492 -3.135,3.037 -7.936,4.556 -14.402,4.556 -6.956,0 -12.737-2.303 -17.342-6.907 -4.507-4.605 -7.397-12.639 -8.671-24.102 l -57.022,7.054 c 1.96,20.967 9.553,37.818 22.779,50.555 13.325,12.835 33.703,19.252 61.137,19.252 21.358,0 38.602-4.458 51.731-13.374 17.831-12.051 26.747-28.119 26.747-48.204 0-8.328 -2.303-16.362 -6.907-24.102 -4.605-7.74 -14.011-17.195 -28.217-28.364 -9.896-7.838 -16.166-14.158 -18.811-18.958 -2.547-4.703 -3.821-10.875 -3.821-18.517 m -57.756-14.843 59.814,0 0-52.76 -59.814,0 0,52.76 m 256.182-54.607 c 0-4.533 -4-8.533 -8.533-8.533 l -426.667,0 c -4.533,0 -8.533,4 -8.533,8.533 l 0,221.867 c 0,4.533 4,8.533 8.533,8.533 l 426.667,0 c 4.533,0 8.533-4 8.533-8.533 l 0-221.867 m 34.133,221.867 c 0,23.467 -19. 2,42.667 -42.667,42.667 l -426.667,0 c -23.467,0 -42.667-19.2 -42.667-42.667 l 0-290.133 c 0-23.467 19.2-42.667 42.667-42.667 l 145.067,0 c 0-23.2 -17.067-41.333 -17.067-51.2 0-9.333 7.733-17.067 17.067-17.067 l 136.533,0 c 9.333,0 17.067,7.733 17.067,17.067 0,9.333 -17.067,28.533 -17.067,51.2 l 145.067,0 c 23.467,0 42.667,19.2 42.667,42.667 l 0,290.133" data-tags="unknown-system" /> -<glyph unicode="" d="M 256.435,479.091 m0,0,c -16.641,0 -30.117-14 -30.117-31.289 0-17.289 13.476-31.316 30.117-31.316 16.641,0 30.142,14.027 30.142,31.316 0,17.289 -13.501,31.289 -30.142,31.289 z m -51.564-32.027 c -11.236,0 -20.281-9.397 -20.281-21.070 l 0-78.25 c 0-11.673 9.045-21.070 20.281-21.070 l 100.821,0 c 11.236,0 20.281,9.397 20.281,21.070 l 0,78.25 c 0,11.673 -9.045,21.070 -20.281,21.070 l -4.082,0 c -0.38-25.593 -20.451-46.223 -45.176-46.223 -24.724,0 -44.796,20.63 -45.176,46.223 l -6.388,0 z m -94.61-48.567 c -9.119,0 -16.453-5.898 -16.453-13.222 l 0-402.626 c 0-7.324 7.333-13.222 16.453-13.222 l 286.34,0 c 9.119,0 16.453,5.898 16.453,13.222 l 0,402.626 c 0,7.323 -7.333,13.222 -16.453,13.222 l -46.012,0 0-46.565 4.589,0 c 6.23,0 11.256-5.522 11.256-12.379 l 0-311.181 c 0-6.856 -5.026-12.379 -11.256-12.379 l -203.493,0 c -6.23,0 -11.256,5.522 -11.256,12.379 l 0,311.181 c 0,6.856 5.026,12.379 11.256,12.379 l 8.29,0 0,46.565 -49.713,0 z m 144.602-120.548 a9.018,9.369 180 0 1 -9.050-7.375 l -18.912-90.023 -11.129,36.267 a9.018,9.369 180 0 1 -16.782,1.054 l -11.636-26.469 -24.971,0.026 0-18.726 30.751-0.026 a9.018,9.369 180 0 1 8.214,5.478 l 4.335,9.85 14.247-46.46 a9.018,9.369 180 0 1 17.391,0.843 l 15.464,73.561 18.684-135.060 a9.018,9.369 180 0 1 17.644-1.106 l 24.21,92.999 29.154,0.026 0,18.726 -36.049,0 a9.018,9.369 180 0 1 -8.721-6.927 l -14.602-56.073 -19.571,141.381 a9.018,9.369 180 0 1 -8.67,8.033 z" data-tags="health" /> -<glyph unicode="" d="M 357.105,477.971 m0,0,c -83.763,0 -151.613-67.85 -151.613-151.613 0-83.763 67.85-151.613 151.613-151.613 83.763,0 151.613,67.85 151.613,151.613 0,83.763 -67.85,151.613 -151.613,151.613 z m -115.527-129.31 230.803,0 0-44.607 -230.803,0 0,44.607 z M 28.568,265.963 C 12.816,265.963 0,253.147 0,237.395 L 0,42.679 C 0,26.927 12.816,13.86 28.568,13.86 l 97.233,0 c 0-15.573 -11.277-27.709 -11.277-34.332 C 114.524-26.737 119.536-32 125.801-32 l 91.72,0 c 6.265,0 11.528,5.263 11.528,11.528 0,6.265 -11.528,19.117 -11.528,34.332 l 97.483,0 c 15.752,0 28.568,13.067 28.568,28.819 l 0,105.753 c -7.724,0.577 -15.386,1.478 -22.805,3.007 l 0-63.151 c 0-3.043 -2.721-5.513 -5.764-5.513 l -286.436,0 c -3.043,0 -5.764,2.47 -5.764,5.513 l 0,149.107 c 0,3.043 2.721,5.764 5.764,5.764 l 170.659,0 c -3.877,7.336 -7.185,14.908 -10.024,22.805 l -160.635,0 z" data-tags="Unentitled" /> -<glyph unicode="" d="M 23.16,414.391 C 10.425,414.391 0,403.966 0,391.232 l 0-157.428 c 0-12.735 10.425-23.16 23.16-23.16 l 78.727,0 c 0-12.59 -9.274-22.442 -9.274-27.797 0-5.065 4.209-9.248 9.274-9.248 l 63.909,0 0-77.173 c 0-15.741 12.885-28.626 28.626-28.626 l 97.301,0 c 0-15.562 -11.45-27.733 -11.45-34.351 0-6.261 5.19-11.45 11.45-11.45 l 91.576,0 c 6.261,0 11.45,5.19 11.45,11.45 0,6.261 -11.45,19.147 -11.45,34.351 l 97.327,0 c 15.741,0 28.6,12.885 28.6,28.626 l 0,194.602 c 0,15.741 -12.859,28.626 -28.6,28.626 l -202.763,0 0,71.577 c 0,12.735 -10.425,23.16 -23.16,23.16 l -231.544,0 z m 0-18.522 231.544,0 c 2.46,0 4.637-2.177 4.637-4.637 l 0-71.577 -64.919,0 c -15.741,0 -28.626-12.885 -28.626-28.626 l 0-24.818 -142.636,0 c -2.46,0 -4.637,2.177 -4.637,4.637 l 0,120.383 c 0,2.46 2.177,4.637 4.637,4.637 z m 171.262-99.115 286.205,0 c 3.041,0 5.725-2.684 5.725-5.725 l 0-148.827 c 0-3.041 -2.684-5.699 -5.725-5.699 l -286.205,0 c -3.041,0 -5.725,2.658 -5.725,5.699 l 0,1 48.827 c 0,3.041 2.684,5.725 5.725,5.725 z" data-tags="system-groups" /> -<glyph unicode="" d="M 258.625,477.656 m0,0,c -16.641,0 -30.125-13.992 -30.125-31.281 0-17.289 13.484-31.313 30.125-31.313 16.641,0 30.156,14.024 30.156,31.313 0,17.289 -13.515,31.281 -30.156,31.281 z m -52.594-32.031 c -10.745-0.562 -19.25-9.754 -19.25-21.063 l 0-78.25 c 0-11.673 9.046-21.063 20.281-21.063 l 100.813,0 c 11.236,0 20.281,9.39 20.281,21.063 l 0,78.25 c 0,11.673 -9.046,21.063 -20.281,21.063 l -4.063,0 c -0.38-25.593 -20.463-46.219 -45.188-46.219 -24.724,0 -44.776,20.626 -45.156,46.219 l -6.406,0 c -0.351,0 -0.685,0.018 -1.031,0 z m -93.563-48.563 C 103.349,397.062 96,391.167 96,383.844 l 0-402.625 c 0-7.324 7.349-13.219 16.469-13.219 l 286.313,0 c 9.119,0 16.469,5.895 16.469,13.219 l 0,402.625 c 0,7.323 -7.349,13.219 -16.469,13.219 l -46,0 0-46.563 4.594,0 c 6.23,0 11.25-5.519 11.25-12.375 l 0-311.188 c 0-6.856 -5.020-12.375 -11.25-12.375 l -203.5,0 c -6.23,0 -11.25,5.519 -11.25,12.375 l 0,311.188 c 0,6.856 5.020,12.375 11.25,12.375 l 8.281,0 0,46.563 -49.688,0 z m 136.875-112.969 c -9.078,0 -18.521-0.954 -28.281-2.906 -9.761-1.952 -20.533-4.994 -32.344-9.094 l 0-45.969 c 9.956,6.442 19.512,11.279 28.688,14.5 9.175,3.318 17.719,4.969 25.625,4.969 8.394,0 14.94-1.94 19.625-5.844 4.685-3.807 7.031-9.136 7.031-15.969 0-4.49 -1.333-8.979 -3.969-13.469 -2.538-4.49 -6.593-9.268 -12.156-14.344 l -9.344-8.5 c -10.346-9.566 -17.154-17.472 -20.375-23.719 -3.221-6.149 -4.813-13.215 -4.813-21.219 l 0-7.188 52.844,0 0,6.594 c 0,4.392 1.013,8.388 3.063,12 2.050,3.709 6.394,8.604 13.031,14.656 l 9.375,8.344 c 9.175,8.687 15.662,16.797 19.469,24.313 3.807,7.613 5.719,16.184 5.719,25.75 0,18.643 -6.256,32.805 -18.75,42.469 -12.494,9.761 -30.621,14.625 -54.438,14.625 z m -30.313-170.406 0-52.125 52.844,0 0,52.125 -52.844,0 z" data-tags="health-unknown" /> -<glyph unicode="" d="M 272.406,475.875 m0,0,-94.281-239.219 80.375-0.375 -53.063-204.875 L 351,286.594 l -72.094-0.281 86.063,187.875 -92.563,1.688 z m -42.594-25.969 c -0.988-0.124 -1.984-0.239 -2.969-0.375 -0.971-0.134 -1.936-0.291 -2.906-0.438 -0.79-0.118 -1.586-0.249 -2.375-0.375 -0.514-0.083 -1.017-0.164 -1.531-0.25 -0.327-0.054 -0.642-0.101 -0.969-0.156 -1.279-0.22 -2.596-0.446 -3.875-0.688 -2.314-0.436 -4.627-0.9 -6.938-1.406 -0.198-0.043 -0.364-0.081 -0.563-0.125 -0.327-0.072 -0.674-0.145 -1-0.219 -0.997-0.226 -2.003-0.449 -3-0.688 -0.021-0.005 -0.010-0.026 -0.031-0.031 -2.36-0.563 -4.748-1.178 -7.094-1.813 -2.6-0.703 -5.201-1.458 -7.781-2.25 -0.137-0.042 -0.269-0.083 -0.406-0.125 -15.387-4.751 -30.373-11.076 -44.75-18.969 -0.938-0.515 -1.88-1.003 -2.813-1.531 -0.019-0.011 -0.044-0.021 -0.063-0.031 -0.044-0.025 -0.081-0.069 -0.125-0.094 -0.682-0.387 -1.347-0.794 -2.031-1.188 -0.15-0.086 -0.319-0.163 -0.469-0.25 -0.891-0.515 -1.778-1.035 -2.656-1.563 -0.667-0 .401 -1.339-0.785 -2-1.188 -0.201-0.123 -0.393-0.283 -0.594-0.406 -0.668-0.409 -1.333-0.797 -2-1.219 -0.728-0.46 -1.438-0.905 -2.156-1.375 -0.198-0.127 -0.396-0.278 -0.594-0.406 -0.011-0.008 -0.020-0.024 -0.031-0.031 -0.15-0.098 -0.287-0.183 -0.438-0.281 -0.267-0.17 -0.552-0.329 -0.813-0.5 -0.141-0.093 -0.265-0.188 -0.406-0.281 -1.092-0.721 -2.204-1.451 -3.281-2.188 -0.018-0.012 -0.044-0.019 -0.063-0.031 -0.431-0.295 -0.853-0.578 -1.281-0.875 -0.19-0.132 -0.373-0.305 -0.563-0.438 -0.432-0.302 -0.855-0.602 -1.281-0.906 -0.935-0.661 -1.858-1.327 -2.781-2 -0.086-0.063 -0.195-0.124 -0.281-0.188 -0.498-0.364 -0.974-0.726 -1.469-1.094 -0.749-0.557 -1.478-1.123 -2.219-1.688 -0.050-0.038 -0.106-0.086 -0.156-0.125 -2.414-1.841 -4.825-3.703 -7.156-5.625 -0.076-0.063 -0.143-0.125 -0.219-0.188 -1.174-0.97 -2.316-1.978 -3.469-2.969 -1.187-1.020 -2.367-2.022 -3.531-3.063 -1.065-0.952 -2.141-1.906 -3.188-2.875 -1.258-1.164 -2.489-2.343 -3.719-3.531 -0.768-0.742 -1.524-1.498 -2.281-2.25 -0. 312-0.309 -0.659-0.626 -0.969-0.938 -0.098-0.099 -0.183-0.182 -0.281-0.281 -0.941-0.948 -1.858-1.913 -2.781-2.875 -0.951-0.99 -1.88-1.995 -2.813-3 -1.094-1.18 -2.213-2.363 -3.281-3.563 -0.275-0.309 -0.508-0.627 -0.781-0.938 -0.945-1.071 -1.888-2.163 -2.813-3.25 -0.486-0.572 -0.988-1.143 -1.469-1.719 -0.274-0.329 -0.54-0.639 -0.813-0.969 -0.851-1.031 -1.698-2.081 -2.531-3.125 -0.912-1.143 -1.797-2.28 -2.688-3.438 -0.443-0.576 -0.875-1.17 -1.313-1.75 -0.441-0.585 -0.908-1.161 -1.344-1.75 -0.143-0.194 -0.263-0.369 -0.406-0.563 -0.393-0.534 -0.799-1.057 -1.188-1.594 -0.43-0.589 -0.858-1.187 -1.281-1.781 -0.214-0.302 -0.443-0.603 -0.656-0.906 -0.263-0.373 -0.49-0.751 -0.75-1.125 -0.706-1.016 -1.434-2.038 -2.125-3.063 -0.152-0.226 -0.286-0.461 -0.438-0.688 -0.183-0.273 -0.349-0.538 -0.531-0.813 -0.201-0.304 -0.394-0.632 -0.594-0.938 -0.643-0.98 -1.312-1.955 -1.938-2.938 -0.25-0.394 -0.471-0.761 -0.719-1.156 -1.995-3.174 -3.888-6.412 -5.719-9.656 -0.111-0.197 -0.233-0.397 -0.344-0. 594 -0.82-1.462 -1.651-2.931 -2.438-4.406 -0.127-0.238 -0.249-0.48 -0.375-0.719 -0.817-1.544 -1.594-3.098 -2.375-4.656 -0.857-1.71 -1.686-3.43 -2.5-5.156 -0.818-1.734 -1.632-3.47 -2.406-5.219 -0.775-1.751 -1.518-3.516 -2.25-5.281 -0.354-0.855 -0.687-1.704 -1.031-2.563 -0.295-0.732 -0.619-1.453 -0.906-2.188 -0.111-0.285 -0.202-0.589 -0.313-0.875 -0.392-1.014 -0.778-2.012 -1.156-3.031 -0.416-1.121 -0.819-2.279 -1.219-3.406 -0.335-0.944 -0.677-1.864 -1-2.813 -0.065-0.19 -0.123-0.372 -0.188-0.563 -0.155-0.461 -0.284-0.914 -0.438-1.375 -0.314-0.948 -0.666-1.891 -0.969-2.844 -0.205-0.639 -0.395-1.297 -0.594-1.938 -0.49-1.585 -0.949-3.186 -1.406-4.781 -0.015-0.051 -0.048-0.074 -0.063-0.125 -0.265-0.933 -0.523-1.887 -0.781-2.813 -0.095-0.347 -0.188-0.684 -0.281-1.031 -0.159-0.582 -0.317-1.162 -0.469-1.75 -0.119-0.46 -0.23-0.914 -0.344-1.375 -0.119-0.482 -0.229-0.987 -0.344-1.469 -0.231-0.935 -0.467-1.874 -0.688-2.813 -0.265-1.13 -0.532-2.272 -0.781-3.406 -0.032-0.147 -0.062-0.291 -0 .094-0.438 -0.356-1.632 -0.709-3.266 -1.031-4.906 -0.012-0.059 -0.020-0.097 -0.031-0.156 -0.091-0.465 -0.16-0.942 -0.25-1.406 -0.061-0.325 -0.127-0.644 -0.188-0.969 -0.169-0.888 -0.345-1.794 -0.5-2.688 -0.073-0.427 -0.148-0.823 -0.219-1.25 -0.058-0.343 -0.102-0.718 -0.156-1.063 -0.498-3.043 -0.931-6.090 -1.313-9.156 -0.030-0.238 -0.065-0.481 -0.094-0.719 -0.034-0.276 -0.061-0.536 -0.094-0.813 -0.194-1.645 -0.371-3.318 -0.531-4.969 -0.128-1.316 -0.237-2.618 -0.344-3.938 -0.207-2.573 -0.375-5.135 -0.5-7.719 -0.007-0.148 0.007-0.29 0-0.438 -0.057-1.223 -0.118-2.462 -0.156-3.688 -0.041-1.324 -0.074-2.643 -0.094-3.969 -0.013-0.901 -0.028-1.786 -0.031-2.688 -0.002-0.425 -0.001-0.856 0-1.281 0.003-1.321 0.007-2.646 0.031-3.969 0.025-1.337 0.078-2.662 0.125-4 0.046-1.322 0.088-2.677 0.156-4 0.047-0.918 0.098-1.832 0.156-2.75 0.026-0.414 0.065-0.835 0.094-1.25 0.091-1.334 0.199-2.666 0.313-4 0.306-3.587 0.655-7.161 1.125-10.75 0.003-0.021 -0.003-0.041 0-0.063 0.006-0.050 0.025-0.106 0.031-0.156 0.044-0.335 0.111-0.664 0.156-1 0.012-0.088 0.019-0.161 0.031-0.25 0.211-1.541 0.446-3.085 0.688-4.625 0.163-1.036 0.323-2.089 0.5-3.125 0.123-0.737 0.21-1.478 0.344-2.219 0.197-1.093 0.444-2.157 0.656-3.25 0.016-0.080 0.047-0.17 0.063-0.25 0.076-0.404 0.14-0.82 0.219-1.219 0.033-0.166 0.060-0.303 0.094-0.469 0.262-1.304 0.498-2.61 0.781-3.906 0.111-0.51 0.261-1.054 0.375-1.563 0.051-0.225 0.073-0.431 0.125-0.656 0.398-1.744 0.846-3.458 1.281-5.188 0.245-0.972 0.525-1.939 0.781-2.906 0.328-1.241 0.653-2.485 1-3.719 0.347-1.231 0.697-2.464 1.063-3.688 2.564-8.587 5.593-16.97 9.063-25.125 4.613-10.842 9.981-21.321 16.063-31.281 0.126-0.206 0.249-0.357 0.375-0.563 0.528-0.864 1.058-1.708 1.594-2.563 0.204-0.325 0.388-0.645 0.594-0.969 0.199-0.312 0.424-0.657 0.625-0.969 0.545-0.849 1.101-1.663 1.656-2.5 0.378-0.57 0.743-1.15 1.125-1.719 0.152-0.226 0.316-0.462 0.469-0.688 0.080-0.118 0.17-0.257 0.25-0.375 0.127-0.188 0.247-0.375 0.375-0.563 0.426-0.62 0.88-1.227 1.3 13-1.844 0.421-0.601 0.827-1.218 1.25-1.813 2.299-3.23 4.716-6.379 7.156-9.469 1.793-2.271 3.602-4.493 5.469-6.688 0.939-1.104 1.887-2.197 2.844-3.281 0.949-1.075 1.909-2.163 2.875-3.219 0.014-0.016 0.017-0.047 0.031-0.063 0.959-1.047 1.931-2.034 2.906-3.063 1.972-2.079 3.993-4.155 6.031-6.156 2.044-2.007 4.112-3.947 6.219-5.875 0.947-0.866 1.884-1.743 2.844-2.594 0.105-0.093 0.207-0.188 0.313-0.281 0.793-0.701 1.605-1.404 2.406-2.094 0.273-0.235 0.57-0.454 0.844-0.688 1.083-0.922 2.152-1.848 3.25-2.75 1.605-1.329 3.203-2.658 4.844-3.937 1.529-1.193 3.038-2.377 4.594-3.531 1.562-1.158 3.163-2.256 4.75-3.375 0.625-0.441 1.271-0.875 1.906-1.313 0.452-0.311 0.895-0.632 1.344-0.938 1.427-0.976 2.833-1.96 4.281-2.906 1.433-0.936 2.889-1.844 4.344-2.75 0.368-0.228 0.724-0.461 1.094-0.688 1.474-0.907 2.974-1.78 4.469-2.656 1.673-0.981 3.333-1.965 5.031-2.906 1.695-0.94 3.406-1.85 5.125-2.75 8-4.187 16.256-7.929 24.75-11.219 l 9.156,35.906 24.5,111.469 c -0.583,0.398 -1.144,0.838 -1 .719,1.25 -0.449,0.322 -0.9,0.639 -1.344,0.969 -0.108,0.081 -0.205,0.17 -0.313,0.25 -0.141,0.106 -0.297,0.206 -0.438,0.313 -0.506,0.38 -1.002,0.763 -1.5,1.156 -0.055,0.044 -0.132,0.081 -0.188,0.125 -0.468,0.372 -0.913,0.775 -1.375,1.156 -0.258,0.213 -0.525,0.44 -0.781,0.656 -0.374,0.317 -0.756,0.615 -1.125,0.938 -0.611,0.532 -1.214,1.046 -1.813,1.594 -0.531,0.489 -1.042,0.999 -1.563,1.5 -0.025,0.024 -0.069,0.007 -0.094,0.031 -0.517,0.499 -0.994,1.052 -1.5,1.563 -0.383,0.385 -0.78,0.764 -1.156,1.156 -0.106,0.111 -0.238,0.201 -0.344,0.313 -0.591,0.622 -1.143,1.267 -1.719,1.906 -0.675,0.752 -1.318,1.509 -1.969,2.281 -0.316,0.375 -0.658,0.745 -0.969,1.125 -0.26,0.318 -0.494,0.615 -0.75,0.938 -0.114,0.144 -0.23,0.324 -0.344,0.469 -0.579,0.737 -1.16,1.461 -1.719,2.219 -0.464,0.627 -0.894,1.236 -1.344,1.875 -0.122,0.174 -0.254,0.387 -0.375,0.563 -0.319,0.459 -0.627,0.91 -0.938,1.375 -0.425,0.639 -0.871,1.286 -1.281,1.938 -0.004,0.007 0.004,0.024 0,0.031 -0.492,0.781 -0.935,1.576 -1 .406,2.375 -0.044,0.074 -0.111,0.117 -0.156,0.188 -0.28,0.478 -0.571,0.984 -0.844,1.469 -0.078,0.139 -0.141,0.267 -0.219,0.406 -0.181,0.326 -0.354,0.64 -0.531,0.969 -0.181,0.335 -0.354,0.694 -0.531,1.031 -0.072,0.138 -0.147,0.268 -0.219,0.406 -0.231,0.446 -0.461,0.888 -0.688,1.344 -0.227,0.456 -0.467,0.914 -0.688,1.375 -0.123,0.255 -0.222,0.528 -0.344,0.781 -0.147,0.313 -0.294,0.622 -0.438,0.938 -0.191,0.419 -0.377,0.832 -0.563,1.25 -0.166,0.379 -0.316,0.751 -0.469,1.125 -0.154,0.365 -0.317,0.724 -0.469,1.094 -0.328,0.804 -0.659,1.625 -0.969,2.438 -0.052,0.136 -0.106,0.27 -0.156,0.406 -0.041,0.109 -0.085,0.235 -0.125,0.344 -0.080,0.218 -0.14,0.407 -0.219,0.625 -0.053,0.147 -0.104,0.322 -0.156,0.469 -0.266,0.751 -0.535,1.497 -0.781,2.25 -0.055,0.169 -0.102,0.331 -0.156,0.5 -0.007,0.021 0.003,0.044 0,0.063 -0.010,0.030 -0.022,0.064 -0.031,0.094 -0.352,1.114 -0.69,2.22 -1,3.344 -0.004,0.013 0.004,0.050 0,0.063 -0.313,1.137 -0.636,2.292 -0.906,3.438 -0.245,1.041 -0.478,2.046 -0. 688,3.094 -0.022,0.109 -0.041,0.235 -0.063,0.344 -0.005,0.021 -0.027,0.041 -0.031,0.063 -0.010,0.049 0.009,0.076 0,0.125 -0.015,0.079 -0.016,0.171 -0.031,0.25 -0.192,1 -0.37,1.997 -0.531,3 -0.017,0.105 -0.046,0.207 -0.063,0.313 -0.008,0.050 -0.024,0.106 -0.031,0.156 -0.155,1.017 -0.282,2.045 -0.406,3.063 -0.263,2.172 -0.42,4.324 -0.531,6.5 l -0.469,0 -26.313,0.125 9.219,24.656 82.156,220.125 z m 141.75-25.406 -50.5-108.344 48.844,0.188 32.688,0.125 -16.906-28 L 352,232.687 c 0.005-0.019 -0.005-0.044 0-0.063 0.085-0.348 0.168-0.682 0.25-1.031 0.042-0.178 0.085-0.353 0.125-0.531 0.132-0.581 0.253-1.165 0.375-1.75 0.002-0.009 -0.002-0.022 0-0.031 0.106-0.512 0.215-1.018 0.313-1.531 0.051-0.266 0.108-0.546 0.156-0.813 0.1-0.554 0.191-1.101 0.281-1.656 0.037-0.228 0.089-0.459 0.125-0.688 0.040-0.255 0.087-0.495 0.125-0.75 0.078-0.532 0.118-1.090 0.188-1.625 0.075-0.577 0.154-1.169 0.219-1.75 0.007-0.059 0.025-0.097 0.031-0.156 0.017-0.158 0.046-0.311 0.063-0.469 0.070-0.668 0.132 -1.331 0.188-2 0.011-0.139 0.020-0.267 0.031-0.406 0.119-1.522 0.203-3.052 0.25-4.594 0.003-0.089 -0.002-0.192 0-0.281 0.021-0.743 0.028-1.476 0.031-2.219 0-0.079 0-0.171 0-0.25 0.001-0.753 -0.015-1.497 -0.031-2.25 -0.001-0.050 0.001-0.076 0-0.125 -0.018-0.782 -0.056-1.562 -0.094-2.344 -0.001-0.020 0.001-0.043 0-0.063 -0.019-0.396 -0.070-0.792 -0.094-1.188 -0.024-0.396 -0.002-0.792 -0.031-1.188 -0.001-0.020 0.001-0.043 0-0.063 -0.038-0.524 -0.078-1.041 -0.125-1.563 -0.022-0.246 -0.038-0.504 -0.063-0.75 -0.017-0.188 -0.045-0.375 -0.063-0.563 -0.036-0.347 -0.085-0.685 -0.125-1.031 -0.029-0.247 -0.063-0.503 -0.094-0.75 -0.115-0.861 -0.245-1.705 -0.375-2.563 -0.174-1.151 -0.377-2.292 -0.594-3.438 -0.217-1.145 -0.459-2.299 -0.719-3.438 -0.254-1.117 -0.486-2.235 -0.781-3.344 -0.006-0.021 -0.026-0.041 -0.031-0.063 -0.124-0.462 -0.275-0.916 -0.406-1.375 -0.073-0.258 -0.112-0.524 -0.188-0.781 -0.089-0.304 -0.189-0.604 -0.281-0.906 -0.124-0.409 -0.247-0.818 -0.375-1.219 -0.051-0.159 - 0.104-0.31 -0.156-0.469 -0.052-0.159 -0.104-0.341 -0.156-0.5 -0.133-0.397 -0.27-0.76 -0.406-1.156 -0.048-0.138 -0.108-0.299 -0.156-0.438 -0.315-0.901 -0.626-1.763 -0.969-2.656 -0.067-0.174 -0.151-0.358 -0.219-0.531 -0.172-0.439 -0.353-0.908 -0.531-1.344 -0.040-0.099 -0.053-0.183 -0.094-0.281 -0.048-0.119 -0.107-0.256 -0.156-0.375 -0.243-0.582 -0.496-1.174 -0.75-1.75 -0.052-0.117 -0.104-0.227 -0.156-0.344 -0.256-0.573 -0.514-1.121 -0.781-1.688 -0.060-0.127 -0.127-0.248 -0.188-0.375 -0.264-0.554 -0.538-1.139 -0.813-1.688 -0.064-0.127 -0.092-0.248 -0.156-0.375 -0.277-0.547 -0.588-1.084 -0.875-1.625 -0.068-0.129 -0.119-0.246 -0.188-0.375 -0.287-0.535 -0.578-1.096 -0.875-1.625 -0.077-0.138 -0.172-0.268 -0.25-0.406 -0.293-0.515 -0.573-1.022 -0.875-1.531 -0.087-0.148 -0.193-0.29 -0.281-0.438 -0.298-0.496 -0.599-1.010 -0.906-1.5 -0.092-0.148 -0.157-0.29 -0.25-0.438 -1.513-2.388 -3.161-4.7 -4.875-6.938 -4.847-6.325 -10.459-12.041 -16.719-16.969 -0.206-0.162 -0.418-0.309 -0.625-0.469 -1.032-0.799 -2.060-1.587 -3.125-2.344 -0.156-0.111 -0.343-0.202 -0.5-0.313 -0.489-0.341 -0.972-0.667 -1.469-1 -0.129-0.087 -0.246-0.195 -0.375-0.281 -0.529-0.35 -1.087-0.691 -1.625-1.031 -0.334-0.213 -0.663-0.416 -1-0.625 -0.338-0.208 -0.658-0.421 -1-0.625 -0.061-0.037 -0.126-0.088 -0.188-0.125 -0.624-0.371 -1.24-0.735 -1.875-1.094 -0.673-0.383 -1.379-0.758 -2.063-1.125 -0.020-0.010 -0.043-0.021 -0.063-0.031 -1.419-0.755 -2.842-1.467 -4.313-2.156 -1.47-0.689 -2.98-1.348 -4.5-1.969 -4.351-1.776 -8.787-3.214 -13.219-4.313 l -67.094-111.031 -17.625-30.656 c 3.287-0.871 6.566-1.704 9.906-2.438 1.894-0.416 3.778-0.785 5.688-1.156 1.89-0.368 3.813-0.739 5.719-1.063 0.156-0.026 0.312-0.036 0.469-0.062 1.37-0.23 2.747-0.45 4.125-0.656 0.712-0.108 1.416-0.177 2.125-0.281 1.232-0.181 2.446-0.373 3.688-0.531 7.776-0.989 15.644-1.593 23.531-1.813 2.366-0.066 4.721-0.098 7.094-0.094 0.247,0 0.503,0 0.75,0 0.258,0.001 0.523,0 0.781,0 1.047,0.010 2.077,0.041 3.125,0.062 1.026,0.021 2.067, 0.029 3.094,0.062 0.287,0.010 0.556,0.020 0.844,0.031 0.997,0.036 2.002,0.076 3,0.125 0.81,0.040 1.627,0.077 2.438,0.125 0.82,0.049 1.648,0.13 2.469,0.188 0.949,0.066 1.894,0.141 2.844,0.219 0.364,0.030 0.729,0.031 1.094,0.062 3.563,0.307 7.123,0.687 10.688,1.156 0.089,0.012 0.192,0.019 0.281,0.031 0.296,0.039 0.579,0.084 0.875,0.125 1.582,0.216 3.168,0.471 4.75,0.719 1.052,0.165 2.103,0.329 3.156,0.5 0.069,0.012 0.15,0.019 0.219,0.031 0.66,0.108 1.341,0.194 2,0.313 1.096,0.195 2.159,0.415 3.25,0.625 0.645,0.125 1.293,0.275 1.938,0.406 0.169,0.034 0.331,0.090 0.5,0.125 1.136,0.229 2.278,0.41 3.406,0.656 0.734,0.162 1.485,0.331 2.219,0.5 0.758,0.173 1.501,0.381 2.25,0.563 0.974,0.236 1.96,0.473 2.938,0.719 18.099,4.553 35.35,11.155 51.563,19.531 0.217,0.111 0.44,0.232 0.656,0.344 1.030,0.536 2.072,1.074 3.094,1.625 0.231,0.124 0.457,0.251 0.688,0.375 1,0.543 2.009,1.069 3,1.625 0.247,0.138 0.472,0.299 0.719,0.438 0.197,0.111 0.398,0.201 0.594,0.313 1.038,0.588 2.067,1.211 3.0 94,1.813 28.612,16.766 52.762,38.815 71.688,64.375 0.28,0.378 0.566,0.745 0.844,1.125 0.877,1.193 1.71,2.388 2.563,3.594 0.034,0.049 0.060,0.107 0.094,0.156 0.303,0.43 0.604,0.85 0.906,1.281 0.673,0.959 1.348,1.908 2,2.875 0.107,0.158 0.238,0.373 0.344,0.531 0.045,0.068 0.048,0.12 0.094,0.188 0.64,0.955 1.257,1.917 1.875,2.875 0.387,0.596 0.775,1.182 1.156,1.781 0.313,0.491 0.629,1.007 0.938,1.5 0.691,1.103 1.36,2.201 2.031,3.313 0.671,1.112 1.348,2.224 2,3.344 0.247,0.425 0.474,0.855 0.719,1.281 0.402,0.7 0.793,1.391 1.188,2.094 1.271,2.269 2.526,4.544 3.719,6.844 0.114,0.22 0.23,0.436 0.344,0.656 0.48,0.934 0.97,1.874 1.438,2.813 0.073,0.146 0.115,0.292 0.188,0.438 0.43,0.867 0.862,1.753 1.281,2.625 0.105,0.218 0.239,0.437 0.344,0.656 0.074,0.156 0.113,0.313 0.188,0.469 0.837,1.76 1.673,3.529 2.469,5.313 0.119,0.266 0.226,0.515 0.344,0.781 0.052,0.118 0.105,0.257 0.156,0.375 0.435,0.988 0.86,1.973 1.281,2.969 0.088,0.209 0.162,0.384 0.25,0.594 1.305,3.105 2.541,6.268 3.719 ,9.438 0.194,0.524 0.403,1.037 0.594,1.563 0.219,0.603 0.442,1.207 0.656,1.813 0.007,0.021 0.024,0.042 0.031,0.063 1.037,2.926 2.012,5.899 2.938,8.875 0.576,1.851 1.124,3.693 1.656,5.563 1.058,3.715 2.024,7.464 2.906,11.25 0.23,0.978 0.437,1.957 0.656,2.938 0.020,0.089 0.043,0.192 0.063,0.281 0.046,0.209 0.080,0.416 0.125,0.625 0.22,1.008 0.444,2.023 0.656,3.031 0.138,0.682 0.274,1.348 0.406,2.031 0.123,0.63 0.259,1.273 0.375,1.906 0.075,0.404 0.115,0.814 0.188,1.219 0.116,0.653 0.262,1.286 0.375,1.938 0.039,0.223 0.087,0.433 0.125,0.656 0.034,0.203 0.060,0.422 0.094,0.625 0.182,1.086 0.343,2.162 0.5,3.25 0.013,0.088 0.019,0.193 0.031,0.281 0.080,0.534 0.173,1.058 0.25,1.594 0.117,0.801 0.204,1.607 0.313,2.406 0.021,0.158 0.042,0.311 0.063,0.469 0.128,0.957 0.289,1.911 0.406,2.875 0.234,1.924 0.469,3.881 0.656,5.813 2.035,20.954 1.324,42.315 -2.313,63.625 -0.326,1.911 -0.689,3.841 -1.063,5.75 -0.029,0.148 -0.065,0.29 -0.094,0.438 -0.157,0.802 -0.304,1.607 -0.469,2.406 -0.111 ,0.555 -0.227,1.103 -0.344,1.656 -0.083,0.394 -0.163,0.795 -0.25,1.188 -0.001,0.008 -0.030-0.009 -0.031,0 -0.206,0.944 -0.41,1.892 -0.625,2.844 -0.114,0.504 -0.225,1.002 -0.344,1.5 -0.013,0.056 -0.049,0.1 -0.063,0.156 -0.021,0.089 -0.041,0.161 -0.063,0.25 -0.438,1.827 -0.896,3.658 -1.375,5.469 -0.266,1.003 -0.534,2.002 -0.813,3 -0.069,0.248 -0.149,0.471 -0.219,0.719 -0.078,0.278 -0.14,0.566 -0.219,0.844 -0.275,0.96 -0.589,1.92 -0.875,2.875 -0.37,1.235 -0.736,2.492 -1.125,3.719 -0.394,1.242 -0.805,2.454 -1.219,3.688 -0.159,0.475 -0.307,0.964 -0.469,1.438 -0.257,0.751 -0.486,1.502 -0.75,2.25 -0.056,0.159 -0.131,0.309 -0.188,0.469 -0.377,1.059 -0.765,2.104 -1.156,3.156 -0.454,1.221 -0.933,2.444 -1.406,3.656 -0.473,1.212 -0.946,2.423 -1.438,3.625 -0.278,0.68 -0.56,1.353 -0.844,2.031 -0.053,0.127 -0.071,0.279 -0.125,0.406 -0.468,1.112 -0.983,2.206 -1.469,3.313 -0.544,1.239 -1.091,2.456 -1.656,3.688 -0.559,1.218 -1.138,2.446 -1.719,3.656 -1.735,3.62 -3.574,7.203 -5.5,10.75 -0.171, 0.314 -0.328,0.656 -0.5,0.969 -0.476,0.867 -0.951,1.7 -1.438,2.563 -1.459,2.582 -2.97,5.149 -4.531,7.688 -0.086,0.14 -0.195,0.267 -0.281,0.406 -0.778,1.26 -1.572,2.533 -2.375,3.781 -0.924,1.436 -1.855,2.861 -2.813,4.281 -0.020,0.029 -0.043,0.064 -0.063,0.094 -0.106,0.158 -0.237,0.342 -0.344,0.5 -3.804,5.606 -7.861,11.098 -12.188,16.438 -0.182,0.225 -0.349,0.432 -0.531,0.656 -0.582,0.713 -1.19,1.448 -1.781,2.156 -0.281,0.337 -0.53,0.665 -0.813,1 -0.499,0.591 -1.025,1.163 -1.531,1.75 -0.796,0.925 -1.594,1.835 -2.406,2.75 -0.483,0.545 -0.95,1.085 -1.438,1.625 -0.323,0.357 -0.643,0.707 -0.969,1.063 -0.599,0.655 -1.207,1.321 -1.813,1.969 -0.219,0.234 -0.436,0.485 -0.656,0.719 -0.723,0.767 -1.456,1.525 -2.188,2.281 -0.106,0.11 -0.237,0.203 -0.344,0.313 -0.713,0.734 -1.403,1.463 -2.125,2.188 -0.128,0.129 -0.247,0.278 -0.375,0.406 l -0.063,0.063 c -0.834,0.834 -1.689,1.619 -2.531,2.438 -0.632,0.613 -1.268,1.238 -1.906,1.844 -0.233,0.222 -0.453,0.435 -0.688,0.656 -0.524,0.493 -1.066, 1.012 -1.594,1.5 -0.353,0.328 -0.708,0.644 -1.063,0.969 -0.388,0.355 -0.766,0.711 -1.156,1.063 -0.501,0.453 -0.996,0.896 -1.5,1.344 -3.812,3.392 -7.719,6.641 -11.688,9.75 -7.030,5.507 -14.289,10.537 -21.75,15.156 -5.081,3.145 -10.25,6.081 -15.5,8.813 z M 188.25,204.906 c 0.025-0.385 0.061-0.772 0.094-1.156 0.152-1.773 0.369-3.509 0.656-5.281 0.201-1.237 0.451-2.484 0.719-3.719 0.008-0.035 0.024-0.059 0.031-0.094 0.105-0.483 0.165-0.955 0.281-1.438 0.070-0.295 0.145-0.613 0.219-0.906 0.054-0.212 0.1-0.444 0.156-0.656 0.013-0.051 0.049-0.073 0.063-0.125 0.229-0.868 0.459-1.74 0.719-2.594 0.007-0.023 0.017-0.046 0.031-0.063 0.009-0.010 0.027-0.017 0.031-0.031 0.015-0.048 0.016-0.077 0.031-0.125 0.004-0.012 0.028-0.020 0.031-0.031 0.131-0.424 0.262-0.857 0.406-1.281 0.108-0.335 0.228-0.665 0.344-1 0.077-0.218 0.141-0.439 0.219-0.656 0.116-0.333 0.222-0.674 0.344-1 0.169-0.45 0.344-0.902 0.531-1.344 0.028-0.070 0.066-0.149 0.094-0.219 0.059-0.139 0.099-0.266 0.156-0.406 0.029-0.0 70 0.065-0.149 0.094-0.219 0.107-0.284 0.226-0.569 0.344-0.844 0.651-1.528 1.341-2.997 2.094-4.469 0.138-0.271 0.297-0.512 0.438-0.781 0.025-0.047 0.038-0.109 0.063-0.156 0.033-0.063 0.060-0.124 0.094-0.188 0.178-0.334 0.351-0.665 0.531-1 0.159-0.29 0.337-0.556 0.5-0.844 0.104-0.185 0.205-0.379 0.313-0.563 0.009-0.004 0.023-0.028 0.031-0.031 0.145-0.249 0.29-0.503 0.438-0.75 0.237-0.398 0.474-0.796 0.719-1.188 0.112-0.178 0.2-0.386 0.313-0.563 0.032-0.050 0.093-0.106 0.125-0.156 0.038-0.059 0.087-0.097 0.125-0.156 0.466-0.721 0.916-1.455 1.406-2.156 0.134-0.192 0.271-0.373 0.406-0.563 0.433-0.605 0.863-1.221 1.313-1.813 0.055-0.072 0.133-0.116 0.188-0.188 0.155-0.202 0.312-0.394 0.469-0.594 0.664-0.846 1.333-1.691 2.031-2.5 0.698-0.808 1.426-1.603 2.156-2.375 0.651-0.688 1.294-1.339 1.969-2 0.169-0.166 0.329-0.336 0.5-0.5 0.125-0.12 0.28-0.255 0.406-0.375 0.103-0.098 0.209-0.184 0.313-0.281 0.039-0.036 0.055-0.089 0.094-0.125 0.306-0.286 0.62-0.567 0.938-0.844 l 8.063,36.75 c -0.327,0.797 -0.626,1.566 -0.906,2.375 -0.14,0.405 -0.278,0.811 -0.406,1.219 -0.037,0.118 -0.089,0.257 -0.125,0.375 -0.017,0.055 -0.015,0.101 -0.031,0.156 -0.319,1.063 -0.608,2.138 -0.844,3.219 -0.122,0.558 -0.213,1.126 -0.313,1.688 -0.146,0.822 -0.271,1.644 -0.375,2.469 l -28.625,0.094 z m 142.344-7.656 -26.625-44.063 c 0.338,0.264 0.667,0.544 1,0.813 0.814,0.656 1.625,1.312 2.406,2 0.786,0.693 1.56,1.433 2.313,2.156 1.523,1.465 2.997,2.98 4.375,4.563 0.694,0.797 1.344,1.613 2,2.438 0.64,0.805 1.271,1.577 1.875,2.406 0.013,0.018 0.019,0.045 0.031,0.063 0.618,0.85 1.234,1.75 1.813,2.625 0.424,0.64 0.847,1.253 1.25,1.906 0.008,0.004 -0.009,0.027 0,0.031 0.030,0.049 0.033,0.107 0.063,0.156 0.264,0.43 0.526,0.877 0.781,1.313 0.025,0.043 0.067,0.083 0.094,0.125 0.093,0.146 0.194,0.285 0.281,0.438 0.112,0.196 0.202,0.397 0.313,0.594 0.16,0.285 0.311,0.557 0.469,0.844 0.032,0.058 0.062,0.129 0.094,0.188 0.168,0.307 0.339,0.598 0.5,0.906 0.029,0.055 0.065,0.132 0.094,0.188 0.148, 0.285 0.266,0.59 0.406,0.875 0.113,0.229 0.265,0.426 0.375,0.656 0.143,0.293 0.267,0.611 0.406,0.906 0.045,0.096 0.081,0.185 0.125,0.281 0.355,0.763 0.703,1.535 1.031,2.313 0.005,0.012 0.026,0.019 0.031,0.031 0.133,0.315 0.247,0.652 0.375,0.969 0.090,0.222 0.194,0.433 0.281,0.656 0.247,0.628 0.458,1.27 0.688,1.906 0.008,0.021 0.022,0.042 0.031,0.063 0.018,0.050 0.045,0.106 0.063,0.156 0.037,0.104 0.088,0.208 0.125,0.313 0.153,0.435 0.291,0.878 0.438,1.313 0.017,0.050 0.046,0.106 0.063,0.156 0.112,0.334 0.238,0.661 0.344,1 0.005,0.012 -0.004,0.050 0,0.063 0.004,0.013 -0.004,0.019 0,0.031 0.009,0.030 0.022,0.064 0.031,0.094 0.278,0.902 0.507,1.802 0.75,2.719 0.003,0.008 0.029,0.023 0.031,0.031 0.139,0.525 0.279,1.035 0.406,1.563 0.104,0.433 0.185,0.877 0.281,1.313 0.213,0.962 0.42,1.93 0.594,2.906 z" data-tags="software-crashes" /> -<glyph unicode="" d="M 260.625,477.656 m0,0,c -16.641,0 -30.125-13.992 -30.125-31.281 0-17.289 13.484-31.313 30.125-31.313 16.641,0 30.125,14.024 30.125,31.313 0,17.289 -13.484,31.281 -30.125,31.281 z m -51.563-32.031 c -11.236,0 -20.281-9.39 -20.281-21.063 l 0-78.25 c 0-11.673 9.046-21.063 20.281-21.063 l 100.813,0 c 11.236,0 20.281,9.39 20.281,21.063 l 0,78.25 c 0,11.673 -9.046,21.063 -20.281,21.063 l -4.094,0 c -0.38-25.593 -20.432-46.219 -45.156-46.219 -24.724,0 -44.808,20.626 -45.188,46.219 l -6.375,0 z m -94.625-48.563 C 105.318,397.062 98,391.167 98,383.844 l 0-402.625 c 0-7.324 7.318-13.219 16.438-13.219 l 286.344,0 c 9.119,0 16.469,5.895 16.469,13.219 l 0,402.625 c 0,7.323 -7.349,13.219 -16.469,13.219 l -46,0 0-46.563 4.563,0 c 6.23,0 11.281-5.519 11.281-12.375 l 0-311.188 c 0-6.856 -5.051-12.375 -11.281-12.375 l -203.469,0 c -6.23,0 -11.25,5.519 -11.25,12.375 l 0,311.188 c 0,6.856 5.020,12.375 11.25,12.375 l 8.281,0 0,46.563 -49.719,0 z m 147.125-189.656 c -11.536,0 -20.875-9.008 -20.875-20.125 0-11.117 9.339-20.125 20.875-20.125 11.536,0 20.906,9.008 20.906,20.125 0,11.117 -9.37,20.125 -20.906,20.125 z m 28.844-9.594 c 1.293-3.279 2-6.815 2-10.531 0-3.001 -0.485-5.894 -1.344-8.625 l 44.969,0 c 7.202,0 13,4.283 13,9.594 0,5.31 -5.798,9.563 -13,9.563 l -45.625,0 z m -47.5-34.219 -31.594-86.438 c -2.393-6.546 -0.104-13.236 5.094-15 5.198-1.764 11.295,2.079 13.688,8.625 l 31.719,86.781 c -0.087-0.001 -0.163,0 -0.25,0 -7.008,0 -13.478,2.236 -18.656,6.031 z" data-tags="health-pending" /> -<glyph unicode="" d="M 66,478.281 C 62.676,478.281 60,475.605 60,472.281 L 60,275.781 L 200.813,275.781 L 200.813,359.125 C 200.813,371.224 211.057,381.469 223.156,381.469 L 351.438,381.469 L 351.438,472.281 C 351.438,475.605 348.762,478.281 345.438,478.281 L 66,478.281 z M 225.156,363.125 C 221.832,363.125 219.156,360.449 219.156,357.125 L 219.156,273.75 L 284.031,273.75 C 296.13,273.75 306.375,263.505 306.375,251.406 L 306.375,71.687 L 504.594,71.687 C 507.918,71.687 510.594,74.364 510.594,77.687 L 510.594,357.125 C 510.594,360.449 507.918,363.125 504.594,363.125 L 225.156,363.125 z M 6,259.437 C 2.676,259.437 0,256.762 0,253.437 L 0-26 C 0-29.324 2.676-32 6-32 L 285.438-32 C 288.762-32 291.438-29.324 291.438-26 L 291.438,253.437 C 291.438,256.762 288.762,259.437 285.438,259.437 L 6,259.437 z M 124.281,186.844 L 167.125,186.844 C 168.394,186.184 169.281,184.835 169.281,183.25 L 169.281,138.312 L 212.5,138.437 C 214.652,138.445 216.399,136.644 216.406,134.406 L 216. 531,93.469 C 216.538,91.231 214.777,89.413 212.625,89.406 L 169.281,89.281 L 169.281,44.187 C 169.281,41.95 167.558,40.156 165.406,40.156 L 126,40.156 C 123.848,40.156 122.125,41.95 122.125,44.187 L 122.125,89.094 L 78.906,88.969 C 76.754,88.962 75.038,90.762 75.031,93 L 74.906,133.969 C 74.9,136.206 76.629,137.993 78.781,138 L 122.125,138.125 L 122.125,183.25 C 122.125,184.835 123.012,186.184 124.281,186.844 z " data-tags="enhancement" /> -<glyph unicode="" d="M 86.76,478.023 m0,0,c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-47.261 67.159,0 0,47.261 c 0,13.026 -7.818,23.513 -17.546,23.513 l -32.066,0 z m 150.218,0 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-201.505 67.159,0 0,201.505 c 0,13.026 -7.818,23.513 -17.546,23.513 l -32.066,0 z m 150.218,0 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-83 67.159,0 0,83 c 0,13.026 -7.818,23.513 -17.546,23.513 l -32.066,0 z M 67.274,389.615 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-131.672 c 0-13.026 7.818-23.513 17.546-23.513 l 71.038,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,131.672 c 0,13.026 -7.818,23.513 -17.546,23.513 l -71.038,0 z m -0.088-35.74 71.215,0 0-10.757 -71.215,0 0,10.757 z m 300.524,0 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-131.672 c 0-13.026 7.818-23.513 17.546-23.513 l 71.038,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,131.672 c 0,13.026 -7.818,23.513 -17.546,23.513 l -71.038,0 z m -0.088-35.74 71.215,0 0-10.757 -71.215,0 0,10.757 z m -300.436-7.524 71.215,0 0-10.757 -71.215,0 0,10.757 z m 300.436-35.74 71.215,0 0-10.757 -71.215,0 0,10.757 z m -300.436-7.524 71.215,0 0-10.757 -71.215,0 0,10.757 z m 150.306-31.977 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-131.672 c 0-13.026 7.818-23.513 17.546-23.513 l 71.038,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,131.672 c 0,13.026 -7.818,23.513 -17.546,23.513 l -71.038,0 z m 150.13-3.762 71.215,0 0-10.757 -71.215,0 0,10.757 z m -150.218-31.978 71.215,0 0-10.757 -71.215,0 0,10.757 z m -148.19-6.348 0-201.77 c 0-13.026 7.818-23.513 17.546-23.513 l 32.066,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,201.77 -67.159,0 z m 300.436-35.74 0-166.030 c 0-13.026 7.818-23.513 17.546-23.513 l 32.066,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,166.030 -67.159,0 z m -152.246-1.176 71.215,0 0-10.757 -71.215,0 0,10.757 z m 0-43.264 71.215,0 0-10.757 -71.215,0 0,10.757 z m 2.028-74.066 0-47.525 c 0-13.026 7.818-23.513 17.546-23.513 l 32.066,0 c 9.728,0 17.546,10.487 17.546,23.51 3 l 0,47.525 -67.159,0 z" data-tags="software-channels" /> -<glyph unicode="" d="M 37.031,478.031 m0,0,c -9.728,0 -17.563-10.505 -17.563-23.531 l 0-47.25 67.156,0 0,47.25 c 0,13.026 -7.803,23.531 -17.531,23.531 l -32.063,0 z m 150.219,0 c -9.728,0 -17.563-10.505 -17.563-23.531 l 0-201.5 67.094,0 c 0.021,0.020 0.041,0.042 0.063,0.063 l 0,201.438 c 0,13.026 -7.803,23.531 -17.531,23.531 l -32.063,0 z m 150.219,0 c -9.728,0 -17.563-10.505 -17.563-23.531 l 0-83 67.156,0 0,83 c 0,13.026 -7.803,23.531 -17.531,23.531 l -32.063,0 z M 17.531,389.625 C 7.803,389.625 0,379.119 0,366.094 l 0-131.656 c 0-13.026 7.803-23.531 17.531-23.531 l 71.031,0 c 9.728,0 17.563,10.505 17.563,23.531 l 0,131.656 c 0,13.026 -7.834,23.531 -17.563,23.531 l -71.031,0 z m -0.094-35.75 71.219,0 0-10.75 -71.219,0 0,10.75 z m 300.531,0 c -9.728,0 -17.531-10.474 -17.531-23.5 l 0-52 c 7.831,12.16 21.751,20.719 36.719,20.719 l 41.969,0 c 10.082,0 19.769-3.351 27.438-9.406 l 0,40.688 c 0,13.026 -7.834,23.5 -17.563,23.5 l -71.031,0 z m -0.094-35.75 71.219,0 0-10.75 -71.219,0 0,10.75 z m -300.438-7.5 71.219,0 0-10.781 -71.219,0 0,10.781 z m 0-43.281 71.219,0 0-10.75 -71.219,0 0,10.75 z m 319.719-4.813 c -3.402,0 -6.025-2.289 -6.781-5.313 -3.024-11.339 -4.177-23.597 -5.5-35.125 -5.858-1.89 -11.707-4.353 -17.188-7.188 l -26.094,20.219 c -1.512,1.134 -3.205,1.875 -4.906,1.875 -6.425,0 -31.933-27.576 -36.469-33.813 -0.945-1.323 -1.688-2.643 -1.688-4.344 0-1.701 0.741-3.208 1.875-4.531 6.992-8.504 13.793-17.023 20.219-26.094 -3.024-5.669 -5.485-11.328 -7.375-17.375 l -35.156-5.313 C 215.259,144.964 213,141.585 213,138.75 l 0-41.969 c 0-3.213 2.256-6.246 5.469-6.813 l 34.594-5.094 c 1.89-6.425 4.537-12.671 7.75-18.719 -6.425-8.882 -13.418-17.182 -19.844-25.875 -0.945-1.323 -1.5-2.643 -1.5-4.344 0-1.512 0.368-3.021 1.313-4.344 7.937-10.961 21.172-22.679 31.188-31.75 1.323-1.323 3.018-2.094 4.719-2.094 1.701,0 3.396,0.585 4.719,1.719 l 26.656,20.219 c 5.48-2.835 11.142-5.11 17-7 l 5.313-34.781 c 0.378-3.213 3.38-5.656 6.781-5.656 l 41.969,0 c 3 .402,0 6.025,2.258 6.781,5.281 3.024,11.339 4.177,23.628 5.5,35.156 5.858,1.89 11.707,4.353 17.188,7.188 l 26.094-20.406 c 1.512-0.945 3.205-1.719 4.906-1.719 6.425,0 31.933,27.796 36.469,33.844 1.134,1.323 1.688,2.643 1.688,4.344 0,1.701 -0.741,3.396 -1.875,4.719 -6.992,8.504 -13.793,16.834 -20.219,26.094 3.024,5.48 5.296,11.14 7.375,17.188 L 498,89.219 c 3.024,0.567 5.281,3.978 5.281,6.813 l 0,41.938 c 0,3.213 -2.287,6.246 -5.5,6.813 l -34.563,5.281 c -1.89,6.236 -4.537,12.484 -7.75,18.531 6.425,8.882 13.418,17.213 19.844,25.906 0.945,1.323 1.5,2.643 1.5,4.344 0,1.512 -0.368,3.022 -1.313,4.156 -7.937,11.15 -21.172,22.865 -31.188,32.125 -1.323,1.134 -3.018,1.875 -4.719,1.875 -1.701,0 -3.397-0.554 -4.531-1.688 l -26.844-20.219 c -5.48,2.835 -11.142,5.11 -17,7 l -5.313,34.75 c -0.378,3.213 -3.38,5.688 -6.781,5.688 l -41.969,0 z M 167.75,235.375 c -9.728,0 -17.531-10.505 -17.531-23.531 l 0-131.656 c 0-13.026 7.803-23.5 17.531-23.5 l 34.969,0 C 186.152,63.49 176.438,79.423 176. 438,96.781 l 0,5.563 -8.781,0 0,10.75 8.781,0 0,25.625 c 0,2.467 0.158,4.761 0.469,6.906 l -9.25,0 0,10.75 12.406,0 c 1.314,2.851 2.94,5.482 4.781,8.031 4.437,6.144 10.955,12.571 21.594,15.844 -1.274,2.618 -2.412,5.504 -3.219,8.625 l -35.563,0 0,10.75 34.313,0 c 0.254,12.161 6.263,21.68 8.5,24.813 l 0.094,0.125 0.094,0.125 c 2.856,3.927 5.66,7.33 8.688,10.688 l -51.594,0 z m -148.281-42.094 0-201.781 c 0-13.026 7.834-23.5 17.563-23.5 l 32.063,0 c 9.728,0 17.531,10.474 17.531,23.5 l 0,201.781 -67.156,0 z M 358.125,165.75 c 26.646,0 48.406-21.729 48.406-48.375 0-26.646 -21.76-48.375 -48.406-48.375 -26.646,0 -48.375,21.729 -48.375,48.375 0,26.646 21.729,48.375 48.375,48.375 z m 0-36.563 c -6.759,0 -11.813-5.053 -11.813-11.813 0-6.759 5.053-11.781 11.813-11.781 6.759,0 11.813,5.022 11.813,11.781 0,6.759 -5.053,11.813 -11.813,11.813 z m -188.438-90.156 0-47.531 c 0-13.026 7.834-23.5 17.563-23.5 l 32.063,0 c 7.552,0 13.92,6.329 16.406,15.25 -7.922,7.295 -16.76,16.1 -24.563,26.875 l -0.063,0.094 -0.063,0.125 c -5.924,8.294 -8.156,17.986 -8.156,25.594 0,1.030 0.090,2.057 0.188,3.094 l -33.375,0 z" data-tags="Software-Channel-Management" /> -<glyph unicode="" d="M 74.063,479.219 C 56.364,479.219 42,464.921 42,447.281 L 42-0.031 C 42-17.671 56.364-32 74.063-32 L 437.375-32 C 455.074-32 469.438-17.671 469.438-0.031 L 469.438,282.687 L 286.656,282.687 C 272.478,285.786 261.875,298.424 261.875,313.531 C 261.875,369.556 262.536,424.285 262,479.219 L 74.063,479.219 z M 303.313,477.094 L 303.313,323.125 L 464.406,323.125 C 460.212,334.621 453.822,345.702 446.75,352.75 L 342.531,456.562 C 333.517,465.547 317.959,473.466 303.313,477.094 z M 85,344.844 L 132.438,344.844 L 163.406,303.5 L 197.563,344.844 L 227.594,344.844 L 177.656,284.156 L 238.219,202.844 L 190.656,202.844 L 152.625,254 L 110.438,202.844 L 80.438,202.844 L 138.531,273.219 L 85,344.844 z M 82.063,164.437 L 429.406,164.437 L 429.406,142.219 L 82.063,142.219 L 82.063,164.437 z M 195.906,107.125 C 200.434,107.125 204.772,106.639 208.938,105.625 C 213.103,104.611 217.098,103.086 220.938,101.094 L 220.938,84.312 C 217.061,86.957 213.267,88.893 209.5,90 .125 C 205.733,91.357 201.76,91.969 197.594,91.969 C 190.131,91.969 184.243,89.594 179.969,84.812 C 175.694,80.031 173.562,73.435 173.563,65.031 C 173.562,56.663 175.694,50.094 179.969,45.312 C 184.243,40.531 190.131,38.125 197.594,38.125 C 201.76,38.125 205.733,38.737 209.5,39.969 C 213.267,41.2 217.061,43.137 220.938,45.781 L 220.938,29 C 217.098,27.008 213.103,25.514 208.938,24.5 C 204.772,23.486 200.434,22.969 195.906,22.969 C 182.394,22.969 171.678,26.747 163.781,34.281 C 155.884,41.852 151.938,52.099 151.938,65.031 C 151.938,78 155.884,88.246 163.781,95.781 C 171.678,103.352 182.394,107.125 195.906,107.125 z M 268.594,107.125 C 273.049,107.125 277.635,106.782 282.344,106.094 C 287.053,105.442 291.933,104.465 296.969,103.125 L 296.969,85.937 C 292.513,87.93 288.176,89.423 283.938,90.437 C 279.699,91.452 275.674,91.969 271.906,91.969 C 266.907,91.969 263.235,91.283 260.844,89.906 C 258.453,88.53 257.25,86.398 257.25,83.5 C 257.25,81.326 258.031,79.607 259.625,78.375 C 26 1.255,77.18 264.199,76.151 268.438,75.281 L 277.344,73.5 C 286.364,71.689 292.79,68.945 296.594,65.25 C 300.397,61.555 302.281,56.279 302.281,49.469 C 302.281,40.521 299.637,33.883 294.313,29.5 C 289.024,25.153 280.904,22.969 270,22.969 C 264.856,22.969 259.711,23.459 254.531,24.437 C 249.351,25.416 244.18,26.861 239,28.781 L 239,46.437 C 244.18,43.684 249.182,41.6 254,40.187 C 258.854,38.811 263.508,38.125 268,38.125 C 272.564,38.125 276.073,38.885 278.5,40.406 C 280.927,41.928 282.125,44.112 282.125,46.937 C 282.125,49.473 281.291,51.405 279.625,52.781 C 277.995,54.158 274.739,55.413 269.813,56.5 L 261.688,58.281 C 253.573,60.020 247.642,62.79 243.875,66.594 C 240.144,70.397 238.281,75.521 238.281,81.969 C 238.281,90.047 240.877,96.278 246.094,100.625 C 251.31,104.972 258.813,107.125 268.594,107.125 z M 311.031,105.656 L 332.063,105.656 L 353.594,45.781 L 375.063,105.656 L 396.063,105.656 L 366.031,24.531 L 341.094,24.531 L 311.031,105.656 z M 115.375,45.562 L 134.938,45.5 62 L 134.938,24.531 L 115.375,24.531 L 115.375,45.562 z " data-tags="download-csv" /> -<glyph unicode="" d="M 361.329,431.537 m0,0,c -3.033,0 -5.405-2.022 -6.079-4.719 -2.696-10.111 -3.705-21.085 -4.885-31.364 -5.224-1.685 -10.434-3.856 -15.321-6.384 l -23.26,18.014 c -1.348,1.011 -2.869,1.693 -4.385,1.693 -5.73,0 -28.486-24.61 -32.53-30.171 -0.843-1.18 -1.499-2.341 -1.499-3.858 0-1.517 0.654-2.873 1.665-4.052 6.235-7.583 12.312-15.171 18.041-23.26 -2.696-5.056 -4.893-10.123 -6.578-15.516 l -31.337-4.719 c -2.528-0.506 -4.552-3.523 -4.552-6.051 l 0-37.415 c 0-2.865 2.020-5.573 4.885-6.079 l 30.837-4.524 c 1.685-5.73 4.046-11.317 6.911-16.709 -5.73-7.92 -11.951-15.313 -17.681-23.065 -0.843-1.18 -1.36-2.369 -1.36-3.886 0-1.348 0.351-2.706 1.194-3.886 7.078-9.774 18.852-20.222 27.784-28.311 1.18-1.18 2.702-1.832 4.219-1.832 1.517,0 3.039,0.488 4.219,1.499 l 23.759,18.041 c 4.887-2.528 9.931-4.56 15.155-6.245 l 4.719-31.004 c 0.337-2.865 3.045-5.052 6.079-5.052 l 37.415,0 c 3.033,0 5.377,2.022 6.051,4.719 2.696,10.111 3.733,21.057 4.913,31.337 5.224,1.685 10.434,3.884 15.321,6.412 l 23.26-18.208 c 1.348-0.843 2.869-1.499 4.385-1.499 5.73,0 28.486,24.751 32.53,30.143 1.011,1.18 1.499,2.369 1.499,3.886 0,1.517 -0.682,3.039 -1.693,4.219 -6.235,7.583 -12.284,15.002 -18.014,23.26 2.696,4.887 4.724,9.929 6.578,15.321 l 31.17,4.719 c 2.696,0.506 4.719,3.551 4.719,6.079 l 0,37.415 c 0,2.865 -2.020,5.545 -4.885,6.051 l -30.837,4.719 c -1.685,5.561 -4.046,11.122 -6.911,16.515 5.73,7.92 11.951,15.341 17.681,23.093 0.843,1.18 1.36,2.369 1.36,3.886 0,1.348 -0.351,2.68 -1.194,3.692 -7.078,9.943 -18.852,20.387 -27.784,28.644 -1.18,1.011 -2.702,1.693 -4.219,1.693 -1.517,0 -3.041-0.515 -4.052-1.527 l -23.926-18.014 c -4.887,2.528 -9.959,4.532 -15.183,6.217 l -4.719,31.031 c -0.337,2.865 -3.017,5.052 -6.051,5.052 l -37.415,0 z M 107.833,385.49 C 48.267,385.49 0,337.195 0,277.629 c 0-59.565 48.267-107.833 107.833-107.833 7.318,0 14.464,0.721 21.372,2.109 l 213.667-152.881 c 5.122-3.665 11.088-4.18 14.489-0.555 l 27.118,28.922 c 3.4,3.624 -1.09 0,8.158 -2.831,14.211 l -12.74,44.326 -38.859,2.859 -2.193,40.913 -39.247-0.749 -3.858,39.691 -38.914-3.553 8.133,51.904 -37.471-3.497 -6.523,9.382 c 3.71,10.906 5.718,22.59 5.718,34.751 0,59.565 -48.295,107.86 -107.86,107.86 z m -15.46-34.778 c 25.928,0 46.936-21.007 46.936-46.936 0-25.928 -21.007-46.936 -46.936-46.936 -25.928,0 -46.963,21.007 -46.963,46.936 0,25.928 21.035,46.936 46.963,46.936 z m 287.664-5.468 c 23.761,0 43.133-19.372 43.133-43.133 0-23.761 -19.372-43.133 -43.133-43.133 -23.761,0 -43.133,19.372 -43.133,43.133 0,23.761 19.372,43.133 43.133,43.133 z" data-tags="custom-system-info" /> -<glyph unicode="" d="M 367.188,480.094 C 287.688,480.094 223.25,415.625 223.25,336.125 C 223.25,256.625 287.688,192.187 367.188,192.187 C 446.687,192.187 511.125,256.625 511.125,336.125 C 511.125,415.625 446.687,480.094 367.188,480.094 z M 351.031,405.437 L 383.375,405.437 C 386.103,405.437 388.313,403.228 388.313,400.5 L 388.313,357.25 L 431.563,357.25 C 434.29,357.25 436.469,355.040 436.469,352.312 L 436.469,319.969 C 436.469,317.241 434.29,315.031 431.563,315.031 L 388.313,315.031 L 388.313,271.781 C 388.313,269.053 386.103,266.844 383.375,266.844 L 351.031,266.844 C 348.303,266.844 346.094,269.053 346.094,271.781 L 346.094,315.031 L 302.813,315.031 C 300.085,315.031 297.906,317.241 297.906,319.969 L 297.906,352.312 C 297.906,355.040 300.085,357.25 302.813,357.25 L 346.094,357.25 L 346.094,400.5 C 346.094,403.228 348.303,405.437 351.031,405.437 z M 35.813,340.437 C 16.116,340.437 0,324.322 0,304.625 L 0,61.125 C 0,41.428 16.116,25.312 35.813,25.312 L 157.563,25.31 2 C 157.563,5.84 143.25-9.406 143.25-17.688 C 143.25-25.521 149.729-32 157.563-32 L 272.188-32 C 280.021-32 286.5-25.521 286.5-17.688 C 286.5-9.854 272.188,6.287 272.188,25.312 L 393.938,25.312 C 413.634,25.312 429.75,41.428 429.75,61.125 L 429.75,167.281 C 420.531,163.865 410.954,161.16 401.094,159.281 L 401.094,118.406 C 401.094,114.601 397.743,111.25 393.938,111.25 L 35.813,111.25 C 32.007,111.25 28.656,114.601 28.656,118.406 L 28.656,304.625 C 28.656,308.43 32.007,311.781 35.813,311.781 L 188.781,311.781 C 187.703,319.75 187.156,327.861 187.156,336.125 C 187.156,337.564 187.185,339.007 187.219,340.437 L 35.813,340.437 z " data-tags="register-system" /> -<glyph unicode="" d="M 424.011,478.557 m0,0,c -23.803-0.244 -48.529-10.235 -67.87-29.604 l -67.496-67.559 124.46-124.211 67.434,67.496 c 36.407,36.458 39.606,91.942 7.105,124.398 l -7.105,7.105 c -15.235,15.214 -35.525,22.59 -56.528,22.374 z M 42.902,392.987 c -15.399,0 -27.796-12.398 -27.796-27.796 l 0-207.725 30.040,29.978 0,156.682 c 0,9.022 7.013,16.439 15.955,17.326 0.596,0.059 1.133,0 1.745,0 l 155.622,0 31.598,31.536 -207.164,0 z M 263.84,356.528 121.804,214.305 246.264,90.032 388.237,232.254 263.84,356.528 z m -4.737-35.587 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.709 -17.534-6.717 -24.244,0 -6.71,6.7 -6.762,17.597 -0.062,24.306 3.35,3.355 7.747,5.047 12.153,5.048 z m 235.77-23.371 -30.102-29.978 0-156.682 c 0-9.022 -7.013-16.502 -15.955-17.388 -0.596-0.059 -1.133,0 -1.745,0 l -155.56,0 -31.598-31.473 207.164,0 c 15.399,0 27.796,12.398 27.796,27.796 l 0,207.725 z m -197.566-14.771 c 4.406,0.006 8.798-1.645 12.153-4.986 6.71 -6.7 6.639-17.597 -0.062-24.306 -6.7-6.71 -17.534-6.717 -24.244,0 -6.698,6.689 -6.728,17.531 -0.062,24.244 3.35,3.355 7.809,5.043 12.215,5.048 z m -81.083-4.799 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.701-17.597 0-24.306 -6.7-6.71 -17.534-6.683 -24.244,0 -6.71,6.7 -6.763,17.534 -0.062,24.244 l 0,0.062 c 3.35,3.355 7.747,5.047 12.153,5.048 z m 117.792-31.91 c 4.397,0.012 8.798-1.635 12.153-4.986 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.71 -17.534-6.717 -24.244,0 -6.71,6.7 -6.762,17.534 -0.062,24.244 l 0.062,0 c 3.35,3.355 7.694,5.036 12.091,5.048 z m -79.587-6.232 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.639-17.534 -0.062-24.244 -6.7-6.709 -17.534-6.717 -24.244,0 -6.71,6.7 -6.763,17.534 -0.062,24.244 3.35,3.355 7.809,5.047 12.215,5.048 z m -81.083-4.799 c 4.406,0.006 8.798-1.645 12.153-4.986 6.71-6.7 6.702-17.596 0-24.306 -6.7-6.709 -17.534-6.745 -24.244-0.062 -6.71,6.7 -6.763,17.597 -0.062,24.306 3.35,3.355 7.747,5.043 12.153,5.048 z m 117.792-31.91 c 4.397,0.0 12 8.798-1.635 12.153-4.986 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.709 -17.534-6.682 -24.244,0 -6.71,6.7 -6.699,17.534 0,24.244 3.35,3.355 7.694,5.036 12.091,5.048 z m -79.587-6.232 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.701-17.534 0-24.244 -6.7-6.71 -17.597-6.745 -24.306-0.062 -6.71,6.7 -6.762,17.596 -0.062,24.306 3.35,3.355 7.809,5.047 12.215,5.048 z m -114.613-7.479 -67.434-67.559 c -36.407-36.458 -39.544-91.942 -7.043-124.398 l 7.105-7.105 c 32.501-32.456 87.991-29.229 124.398,7.229 L 221.397,65.165 96.937,189.438 z m 151.322-29.23 c 4.397,0.012 8.798-1.635 12.153-4.986 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.709 -17.534-6.682 -24.244,0 -6.71,6.7 -6.699,17.534 0,24.244 3.35,3.355 7.694,5.036 12.091,5.048 z" data-tags="patches" /> -<glyph unicode="" d="M 312.772,543.030 312.807,543.065 312.772,543.030 zM 255.232,478.496 C 114.252,478.496 0,364.244 0,223.264 c 0-140.963 114.252-255.264 255.232-255.264 140.98,0 255.232,114.301 255.232,255.264 0,140.98 -114.252,255.232 -255.232,255.232 z m -66.526-108.148 c 6.384-0.917 142.641-21.142 199.957-54.58 7.107-4.144 10.638-8.485 15.012-13.052 15.837-16.384 36.823-84.562 39.062-98.635 l -0.853-1.454 c -0.829-0.317 -2.84-1.692 -5.467-3.508 -13.297-9.382 -44.605-31.3 -84.761-27.685 -36.1,3.21 -83.172,23.839 -139.942,61.28 2.451-5.908 14.315-33.858 16.308-38.62 l 0.758-0.948 c 8.201-4.215 87.123-44.47 126.257-43.676 31.55,0.6 65.413,16.033 78.851,24.145 1.376,0.829 2.989,1.703 4.33,0.822 1.093-0.935 0.925-2.759 0.537-4.488 -0.829-3.88 -2.667-10.945 -3.919-14.19 l -1.075-2.781 c -1.623-4.109 -2.979-8.013 -5.942-10.429 -7.918-7.16 -20.637-12.937 -40.548-21.649 -30.721-13.35 -80.556-21.895 -126.921-21.649 -16.613,0.441 -32.612,2.233 -46.774,3.856 -42.502,4.797 -73.413,8.247 -80.432-29.423 -41.744,39.927 -67.853,96.077 -67.853,158.367 0,47.705 15.312,91.822 41.148,127.711 41.744-9.506 72.913-19.643 80.179-22.059 0.070,3.122 0.664,31.414 0.664,31.414 l 0.411,0.98 1.011,0.253 z m 149.359-57.677 c -14.504-0.18 -28.224-5.643 -38.904-15.612 -11.34-10.617 -17.921-24.993 -18.362-40.548 -1.129-32.115 24.042-59.171 56.192-60.3 15.519-0.529 30.303,5.010 41.749,15.644 11.357,10.546 17.857,24.989 18.457,40.579 1.129,32.044 -24.179,59.059 -56.223,60.205 -0.973,0.036 -1.941,0.044 -2.908,0.032 z m 0.411-17.098 c 0.673,0.009 1.345-0.007 2.023-0.032 22.433-0.794 40.014-19.713 39.22-42.128 -0.353-10.811 -4.909-20.864 -12.863-28.254 -7.918-7.425 -18.226-11.263 -29.107-10.84 -22.433,0.794 -40.014,19.667 -39.22,42.065 0.282,10.846 4.874,20.878 12.863,28.285 7.424,6.911 16.983,10.77 27.084,10.903 z m 8.659-20.479 c -9.982,0 -18.077-5.382 -18.077-11.978 0-6.631 8.096-11.978 18.077-11.978 9.947,0 17.983,5.347 17.983,11.978 0,6.596 -8.036,11.978 -17.983,11 .978 z" data-tags="configure-suse-manager" /> -<glyph unicode="" d="M 256,480 C 114.615,480 0,365.385 0,224 C 0,82.615 114.615-32 256-32 C 289.151-32 320.831-25.689 349.906-14.219 L 264,68.656 L 263.781,68.844 L 263.594,69.062 C 258.893,73.868 252.482,82.464 257,95.094 C 259.259,101.408 264.702,106.249 269.375,108.375 C 274.048,110.501 278.076,110.866 281.781,110.844 L 281.844,110.844 L 281.875,110.844 C 288.466,110.768 294.944,110.763 301.469,110.719 L 301.469,134.562 C 287.81,127.582 272.347,123.656 256,123.656 C 200.719,123.656 155.656,168.719 155.656,224 C 155.656,279.281 200.719,324.344 256,324.344 C 311.281,324.344 356.344,279.281 356.344,224 C 356.344,222.936 356.314,221.869 356.281,220.812 L 434.563,220.812 C 449.794,220.812 462.688,207.919 462.688,192.687 L 462.688,110.875 C 468.582,110.895 474.645,110.932 480.375,110.937 C 480.406,110.938 480.438,110.937 480.469,110.937 C 482.175,110.947 483.854,110.955 485.656,110.781 C 502.517,144.917 512,183.351 512,224 C 512,365.385 397.385,480 256,480 z M 256,300.8 44 C 213.434,300.844 179.156,266.566 179.156,224 C 179.156,181.434 213.434,147.187 256,147.187 C 273.043,147.187 288.757,152.684 301.469,162 L 301.469,192.687 C 301.469,207.919 314.363,220.812 329.594,220.812 L 332.75,220.812 C 332.793,221.868 332.813,222.934 332.813,224 C 332.813,266.566 298.566,300.844 256,300.844 z M 256,267.906 C 280.257,267.906 299.906,248.257 299.906,224 C 299.906,199.743 280.257,180.094 256,180.094 C 231.743,180.094 212.094,199.743 212.094,224 C 212.094,248.257 231.743,267.906 256,267.906 z M 338.938,189.312 C 335.261,189.312 332.313,186.364 332.313,182.687 L 332.313,89.062 C 321.536,89.107 310.676,89.185 299.656,89.312 C 294.012,89.346 293.595,86.003 296.563,82.969 L 372.75,9.469 C 377.518,4.403 386.484,4.113 391.156,9.062 L 466.094,82.312 C 471.088,87.333 470.157,89.42 462.656,89.375 C 452.672,89.365 442.209,89.328 431.656,89.281 L 431.656,182.687 C 431.656,186.364 428.676,189.312 425,189.312 L 338.938,189.312 z " data-tags="autoinstalling" /> -<glyph unicode="" d="M 276.719,478.844 C 261.184,478.684 245.029,472.171 232.406,459.531 L 188.406,415.469 L 269.625,334.344 L 313.625,378.437 C 337.385,402.231 339.461,438.444 318.25,459.625 L 313.594,464.25 C 303.651,474.179 290.425,478.984 276.719,478.844 z M 172.156,399.219 L 79.5,306.406 L 160.719,225.312 L 253.375,318.094 L 172.156,399.219 z M 439.469,389.719 C 419.808,389.517 399.382,381.248 383.406,365.25 L 327.719,309.469 L 430.5,206.812 L 486.219,262.625 C 516.291,292.739 518.877,338.567 492.031,365.375 L 486.156,371.219 C 473.572,383.785 456.817,389.897 439.469,389.719 z M 169.094,375.969 C 171.969,375.969 174.842,374.879 177.031,372.687 C 181.41,368.315 181.405,361.191 177.031,356.812 C 172.659,352.434 165.566,352.429 161.188,356.812 C 156.809,361.185 156.784,368.309 161.156,372.687 C 163.343,374.877 166.218,375.968 169.094,375.969 z M 194,351.094 C 196.876,351.097 199.779,350.024 201.969,347.844 C 206.348,343.471 206.311,336.347 201.938,331.969 C 197.565 ,327.59 190.504,327.585 186.125,331.969 C 181.752,336.336 181.707,343.432 186.063,347.812 C 188.249,350.002 191.124,351.090 194,351.094 z M 141.125,347.937 C 144.001,347.938 146.873,346.848 149.063,344.656 C 153.441,340.283 153.436,333.191 149.063,328.812 C 144.69,324.434 137.598,324.42 133.219,328.781 C 128.84,333.154 128.815,340.246 133.188,344.625 L 133.188,344.656 C 135.374,346.846 138.249,347.937 141.125,347.937 z M 218,327.125 C 220.87,327.133 223.748,326.062 225.938,323.875 C 230.316,319.502 230.28,312.41 225.906,308.031 C 221.534,303.652 214.473,303.648 210.094,308.031 C 205.715,312.404 205.69,319.465 210.063,323.844 C 212.249,326.033 215.13,327.117 218,327.125 z M 166.031,323.062 C 168.907,323.063 171.779,321.973 173.969,319.781 C 178.348,315.408 178.342,308.316 173.969,303.937 C 169.596,299.559 162.504,299.554 158.125,303.937 C 153.746,308.31 153.721,315.403 158.094,319.781 C 160.28,321.971 163.156,323.062 166.031,323.062 z M 113.125,319.937 C 116.001,319.94 118.90 4,318.837 121.094,316.656 C 125.473,312.284 125.436,305.191 121.063,300.812 C 116.69,296.434 109.629,296.42 105.25,300.781 C 100.871,305.154 100.815,312.246 105.188,316.625 C 107.374,318.814 110.249,319.934 113.125,319.937 z M 190.031,299.125 C 192.901,299.133 195.748,298.031 197.938,295.844 C 202.316,291.471 202.311,284.379 197.938,280 C 193.565,275.621 186.473,275.608 182.094,279.969 C 177.715,284.342 177.722,291.434 182.094,295.812 C 184.28,298.002 187.162,299.117 190.031,299.125 z M 138.063,295.062 C 140.938,295.063 143.811,293.942 146,291.75 C 150.379,287.377 150.342,280.285 145.969,275.906 C 141.596,271.527 134.535,271.514 130.156,275.875 C 125.777,280.248 125.752,287.371 130.125,291.75 C 132.311,293.939 135.187,295.062 138.063,295.062 z M 307.156,288.906 L 238.781,220.437 C 244.258,218.596 249.387,215.972 254,212.719 C 254.533,215.331 255.788,217.816 257.813,219.844 L 257.813,219.875 C 260.58,222.646 264.236,224.030 267.875,224.031 C 271.514,224.032 275.135,222.649 27 7.906,219.875 C 283.448,214.341 283.441,205.354 277.906,199.812 C 276.137,198.041 274.026,196.86 271.781,196.219 L 285.75,182.25 C 286.382,184.491 287.581,186.61 289.344,188.375 C 292.111,191.146 295.767,192.53 299.406,192.531 C 303.046,192.532 306.666,191.149 309.438,188.375 C 314.98,182.841 314.973,173.855 309.438,168.312 C 307.659,166.531 305.54,165.324 303.281,164.687 L 316.125,151.875 C 316.759,154.123 317.949,156.259 319.719,158.031 L 319.719,158.062 C 322.486,160.833 326.118,162.209 329.75,162.219 C 333.382,162.229 337.010,160.862 339.781,158.094 C 345.323,152.559 345.316,143.573 339.781,138.031 C 337.988,136.235 335.842,135.040 333.563,134.406 L 345.875,122.094 L 409.969,186.25 L 307.156,288.906 z M 162.031,271.094 C 164.901,271.102 167.779,270.031 169.969,267.844 C 174.348,263.471 174.311,256.348 169.938,251.969 C 165.565,247.59 158.504,247.576 154.125,251.937 C 149.746,256.31 149.753,263.402 154.125,267.781 C 156.311,269.971 159.162,271.086 162.031,271.094 z M 84.4 69,269 C 86.411,263.208 87.25,257.339 87.25,251.719 C 87.25,241.528 86.202,237.539 86.25,239.5 L 86.219,239.25 C 85.73,232.57 85.438,226.291 85.438,220.375 C 85.438,186.364 90.885,181.931 99.5,176.375 C 101.516,175.075 104.387,173.799 108.063,172.594 L 144.5,209.062 L 84.469,269 z M 303.281,259.5 C 306.921,259.501 310.573,258.118 313.344,255.344 C 318.886,249.81 318.848,240.823 313.313,235.281 C 307.778,229.739 298.823,229.733 293.281,235.281 C 287.739,240.816 287.716,249.802 293.25,255.344 C 296.017,258.115 299.642,259.499 303.281,259.5 z M 34.813,258.062 C 32.275,258.062 30.988,256.782 29.719,254.969 C 26.999,251.162 25.025,245.357 23.031,241.187 C 12.698,217.983 0,184.817 0,159.437 C 0,139.134 1.98,118.279 9.594,99.062 C 34.792,36.519 108.757,26 168.219,26 L 208.844,26 L 208.844-20.406 C 208.844-26.751 214.093-32 220.438-32 C 223.519-32 226.418-30.738 228.594-28.563 L 321.406,64.25 C 323.582,66.425 324.875,69.324 324.875,72.406 C 324.875,75.488 323.582,78.387 321.406,80.5 62 L 228.594,173.406 C 226.418,175.582 223.519,176.844 220.438,176.844 C 214.093,176.844 208.844,171.595 208.844,165.25 L 208.844,118.844 L 168.219,118.844 C 90.085,118.844 38.781,133.871 38.781,220.344 C 38.781,227.776 39.144,235.224 39.688,242.656 C 39.869,245.557 40.594,248.818 40.594,251.719 C 40.594,255.163 38.438,258.062 34.813,258.062 z M 334.813,228 C 338.452,228.004 342.104,226.635 344.875,223.875 C 350.417,218.341 350.379,209.354 344.844,203.812 C 339.309,198.27 330.355,198.264 324.813,203.812 C 319.276,209.341 319.263,218.3 324.781,223.844 C 327.548,226.615 331.173,227.996 334.813,228 z M 365.188,197.687 C 368.819,197.697 372.448,196.33 375.219,193.562 C 380.761,188.028 380.723,179.042 375.188,173.5 C 369.653,167.958 360.698,167.952 355.156,173.5 C 349.62,179.029 349.639,187.957 355.156,193.5 C 357.923,196.271 361.556,197.678 365.188,197.687 z " data-tags="clone-patches" /> -<glyph unicode="" d="M 257.313,478.031 C 213.183,478.414 168.982,467.415 129.469,445.031 C 129.449,445.020 129.426,445.011 129.406,445 C 129.36,444.974 129.327,444.932 129.281,444.906 C 127.469,443.877 125.636,442.827 123.844,441.75 C 122.216,440.772 120.61,439.799 119,438.781 C 118.010,438.156 117.046,437.516 116.063,436.875 C 115.631,436.595 115.179,436.313 114.75,436.031 C 114.601,435.933 114.461,435.849 114.313,435.75 C 113.142,434.977 111.967,434.196 110.813,433.406 C 110.358,433.095 109.889,432.782 109.438,432.469 C 109.238,432.329 109.043,432.171 108.844,432.031 C 107.297,430.952 105.799,429.86 104.281,428.75 C 93.574,420.915 83.58,412.339 74.375,403.094 C 65.611,394.291 57.54,384.888 50.219,375 C 50.068,374.796 49.932,374.611 49.781,374.406 C 48.905,373.222 48.040,372.040 47.188,370.844 C 46.961,370.525 46.725,370.195 46.5,369.875 C 45.469,368.414 44.466,366.947 43.469,365.469 C 43.309,365.23 43.159,364.989 43,364.75 C 41.908,363.12 40.832,361.462 39.781,359. 812 C 28.664,342.351 19.919,323.82 13.469,304.687 C 12.162,300.813 10.927,296.921 9.813,293 C 9.253,291.033 8.699,289.102 8.188,287.125 C 7.674,285.14 7.215,283.15 6.75,281.156 C 6.437,279.813 6.135,278.441 5.844,277.094 C 5.456,275.313 5.069,273.54 4.719,271.75 C 4.372,269.979 4.028,268.217 3.719,266.437 C 3.641,265.987 3.575,265.544 3.5,265.094 C 3.198,263.294 2.951,261.464 2.688,259.656 C 2.392,257.633 2.091,255.626 1.844,253.594 C 1.597,251.565 1.385,249.536 1.188,247.5 C -0.958,225.409 -0.24,202.841 3.594,180.375 C 3.938,178.36 4.325,176.357 4.719,174.344 C 5.109,172.351 5.498,170.365 5.938,168.375 C 5.973,168.212 6.026,168.038 6.063,167.875 C 6.381,166.446 6.718,165.022 7.063,163.594 C 7.545,161.574 8.030,159.573 8.563,157.562 C 14.061,136.791 22.267,116.581 33.094,97.469 C 33.131,97.403 33.15,97.347 33.188,97.281 C 34.217,95.469 35.267,93.667 36.344,91.875 C 37.322,90.247 38.295,88.61 39.313,87 C 39.937,86.006 40.581,85.045 41.219,84.062 C 41.597,83.482 41.96,82.89 42 .344,82.312 C 43.116,81.142 43.898,79.967 44.688,78.812 C 45.137,78.159 45.607,77.494 46.063,76.844 C 47.142,75.297 48.233,73.799 49.344,72.281 C 63.836,52.478 80.937,35.189 99.938,20.656 C 169.454-32.514 264.489-48.488 351.375-13.031 C 396.198,5.26 433.029,34.836 459.875,71.094 C 460.17,71.492 460.457,71.881 460.75,72.281 C 461.674,73.539 462.57,74.792 463.469,76.062 C 463.505,76.114 463.526,76.167 463.563,76.219 C 464.594,77.68 465.628,79.147 466.625,80.625 C 466.738,80.791 466.857,80.989 466.969,81.156 C 467.016,81.228 467.046,81.304 467.094,81.375 C 468.186,83.005 469.231,84.632 470.281,86.281 C 481.399,103.742 490.174,122.274 496.625,141.406 C 497.931,145.281 499.166,149.173 500.281,153.094 C 500.84,155.060 501.364,157.023 501.875,159 C 502.388,160.985 502.879,162.975 503.344,164.969 C 503.608,166.093 503.876,167.215 504.125,168.344 C 504.173,168.564 504.202,168.779 504.25,169 C 504.638,170.78 505.025,172.554 505.375,174.344 C 505.721,176.115 506.035,177.908 506.344,179 .687 C 506.385,179.923 506.46,180.139 506.5,180.375 C 506.536,180.589 506.558,180.817 506.594,181.031 C 506.896,182.831 507.142,184.63 507.406,186.437 C 507.702,188.461 507.972,190.468 508.219,192.5 C 508.465,194.528 508.708,196.588 508.906,198.625 C 511.052,220.716 510.334,243.252 506.5,265.719 C 506.156,267.734 505.769,269.737 505.375,271.75 C 504.985,273.742 504.596,275.76 504.156,277.75 C 504.155,277.758 504.127,277.741 504.125,277.75 C 503.792,279.273 503.455,280.826 503.094,282.344 C 503.080,282.403 503.046,282.441 503.031,282.5 C 502.549,284.52 502.032,286.521 501.5,288.531 C 490.365,330.592 468.325,370.393 435.344,403.375 C 386.128,452.591 321.81,477.471 257.313,478.031 z M 157.438,420.844 L 210.688,343.5 C 193.59,337.593 177.524,327.806 163.875,314.156 C 150.496,300.778 140.813,285.090 134.875,268.375 L 57.406,321.031 C 67.608,342.042 81.461,361.711 98.906,379.156 C 116.469,396.719 136.265,410.621 157.438,420.844 z M 256.125,323.062 C 281.357,322.793 306.496,313.004 325.75,293.75 C 347.166,272.334 356.829,243.633 354.75,215.625 C 354.742,215.522 354.758,215.416 354.75,215.312 C 354.715,214.864 354.666,214.417 354.625,213.969 C 354.555,213.196 354.494,212.428 354.406,211.656 C 354.4,211.605 354.381,211.552 354.375,211.5 C 354.24,210.333 354.051,209.162 353.875,208 C 353.691,206.786 353.479,205.583 353.25,204.375 C 353.021,203.167 352.773,201.95 352.5,200.75 C 352.232,199.573 351.967,198.419 351.656,197.25 C 351.65,197.228 351.631,197.21 351.625,197.187 C 351.494,196.701 351.357,196.203 351.219,195.719 C 351.142,195.447 351.079,195.178 351,194.906 C 350.781,194.162 350.549,193.395 350.313,192.656 C 350.259,192.488 350.211,192.324 350.156,192.156 C 349.966,191.57 349.763,190.989 349.563,190.406 C 349.512,190.26 349.457,190.114 349.406,189.969 C 349.074,189.019 348.736,188.098 348.375,187.156 C 348.305,186.973 348.228,186.776 348.156,186.594 C 347.975,186.131 347.782,185.647 347.594,185.187 C 347.5,184.958 347.408,184.729 347.313,184.5 C 3 37.42,160.809 318.49,140.934 292.844,130.469 C 242.508,109.928 185.121,133.393 163.438,182.906 C 163.093,183.692 162.795,184.451 162.469,185.25 C 162.065,186.24 161.651,187.255 161.281,188.25 C 161.153,188.595 161.030,188.936 160.906,189.281 C 160.506,190.4 160.109,191.527 159.75,192.656 C 159.731,192.714 159.737,192.754 159.719,192.812 C 159.348,193.987 158.983,195.159 158.656,196.344 C 158.652,196.357 158.66,196.393 158.656,196.406 C 158.326,197.605 158.003,198.824 157.719,200.031 C 157.46,201.129 157.221,202.208 157,203.312 C 156.978,203.423 156.959,203.546 156.938,203.656 C 156.933,203.679 156.911,203.696 156.906,203.719 C 156.896,203.77 156.885,203.824 156.875,203.875 C 156.651,205.014 156.464,206.141 156.281,207.281 C 156.264,207.392 156.236,207.514 156.219,207.625 C 156.042,208.75 155.918,209.875 155.781,211 C 155.336,214.681 155.099,218.36 155.063,222.062 C 155.038,224.531 155.093,227.004 155.25,229.469 C 155.329,230.701 155.438,231.927 155.563,233.156 C 155.687,234. 386 155.83,235.619 156,236.844 C 156.116,237.685 156.268,238.505 156.406,239.344 C 156.5,239.911 156.584,240.497 156.688,241.062 C 156.879,242.101 157.089,243.125 157.313,244.156 C 157.331,244.244 157.325,244.319 157.344,244.406 C 157.433,244.811 157.531,245.221 157.625,245.625 C 157.828,246.505 158.054,247.375 158.281,248.25 C 158.553,249.288 158.821,250.316 159.125,251.344 C 159.158,251.455 159.186,251.576 159.219,251.687 C 159.25,251.791 159.281,251.897 159.313,252 C 161.784,260.147 165.307,267.976 169.75,275.25 C 170.992,277.283 172.301,279.275 173.688,281.219 C 173.73,281.279 173.77,281.315 173.813,281.375 C 174.377,282.159 174.973,282.948 175.563,283.719 C 175.761,283.979 175.924,284.242 176.125,284.5 C 176.446,284.911 176.797,285.311 177.125,285.719 C 177.727,286.465 178.342,287.205 178.969,287.937 C 179.657,288.743 180.375,289.555 181.094,290.344 C 181.542,290.837 181.979,291.327 182.438,291.812 C 182.947,292.35 183.445,292.878 183.969,293.406 C 184.085,293.524 184.2 27,293.633 184.344,293.75 C 184.888,294.294 185.447,294.846 186,295.375 C 205.583,314.093 230.893,323.332 256.125,323.062 z M 254.438,298.75 C 239.205,298.624 224.003,293.947 211.063,284.687 C 210.802,284.502 210.539,284.313 210.281,284.125 C 210.095,283.988 209.904,283.857 209.719,283.719 C 208.916,283.12 208.118,282.502 207.344,281.875 C 207.312,281.849 207.313,281.808 207.281,281.781 C 207.233,281.742 207.173,281.696 207.125,281.656 C 206.468,281.119 205.824,280.588 205.188,280.031 C 204.733,279.633 204.259,279.223 203.813,278.812 C 203.264,278.308 202.756,277.774 202.219,277.25 C 201.937,276.976 201.62,276.716 201.344,276.437 C 200.109,275.195 198.952,273.912 197.813,272.594 C 196.343,270.9 194.95,269.162 193.656,267.375 C 193.527,267.196 193.378,267.024 193.25,266.844 C 193.214,266.793 193.192,266.739 193.156,266.687 C 192.593,265.888 192.031,265.070 191.5,264.25 C 190.936,263.382 190.4,262.51 189.875,261.625 C 189.827,261.543 189.767,261.457 189.719,261.375 C 187.696,2 57.934 185.995,254.374 184.563,250.719 C 184.508,250.58 184.46,250.421 184.406,250.281 C 184.386,250.229 184.364,250.209 184.344,250.156 C 184.009,249.284 183.677,248.385 183.375,247.5 C 183.132,246.788 182.908,246.093 182.688,245.375 C 182.601,245.096 182.521,244.811 182.438,244.531 C 182.414,244.451 182.399,244.362 182.375,244.281 C 182.107,243.366 181.859,242.457 181.625,241.531 C 181.605,241.45 181.583,241.393 181.563,241.312 C 181.331,240.385 181.102,239.437 180.906,238.5 C 180.808,238.028 180.745,237.567 180.656,237.094 C 180.551,236.538 180.437,235.964 180.344,235.406 C 180.339,235.377 180.349,235.341 180.344,235.312 C 180.178,234.313 180.032,233.32 179.906,232.312 C 179.904,232.298 179.908,232.264 179.906,232.25 C 179.843,231.743 179.803,231.259 179.75,230.75 C 179.699,230.246 179.604,229.755 179.563,229.25 C 179.56,229.236 179.564,229.202 179.563,229.187 C 179.482,228.186 179.416,227.191 179.375,226.187 C 179.373,226.143 179.377,226.107 179.375,226.062 C 179.335,225 .051 179.343,224.012 179.344,223 C 179.344,222.963 179.313,222.943 179.313,222.906 C 179.315,221.962 179.338,221.037 179.375,220.094 C 179.403,219.381 179.452,218.651 179.5,217.937 C 179.528,217.525 179.559,217.131 179.594,216.719 C 179.598,216.667 179.589,216.614 179.594,216.562 C 179.667,215.709 179.773,214.851 179.875,214 C 179.997,212.992 180.118,211.977 180.281,210.969 C 180.405,210.208 180.571,209.448 180.719,208.687 C 180.822,208.15 180.916,207.598 181.031,207.062 C 181.039,207.026 181.054,207.005 181.063,206.969 C 181.28,205.964 181.523,204.965 181.781,203.969 C 181.808,203.865 181.816,203.76 181.844,203.656 C 182.106,202.662 182.384,201.672 182.688,200.687 C 183.009,199.643 183.382,198.595 183.75,197.562 C 184.072,196.66 184.393,195.767 184.75,194.875 C 184.809,194.728 184.878,194.584 184.938,194.437 C 184.968,194.363 185.001,194.293 185.031,194.219 C 185.494,193.093 185.98,191.982 186.5,190.875 C 187.013,189.782 187.556,188.698 188.125,187.625 C 188.16,187.558 188. 183,187.504 188.219,187.437 C 188.675,186.582 189.133,185.716 189.625,184.875 C 189.634,184.871 189.647,184.847 189.656,184.844 C 208.349,152.766 248.294,138.507 283.656,152.937 C 299.1,159.24 311.337,170.062 319.469,183.25 C 319.477,183.254 319.46,183.277 319.469,183.281 C 319.779,183.785 320.077,184.302 320.375,184.812 C 320.495,185.018 320.632,185.2 320.75,185.406 C 320.868,185.613 320.978,185.824 321.094,186.031 C 321.477,186.714 321.859,187.402 322.219,188.094 C 322.249,188.152 322.282,188.223 322.313,188.281 C 322.753,189.134 323.156,189.979 323.563,190.844 C 323.981,191.734 324.368,192.66 324.75,193.562 C 324.763,193.593 324.8,193.595 324.813,193.625 C 324.952,193.957 325.084,194.291 325.219,194.625 C 325.313,194.859 325.408,195.109 325.5,195.344 C 325.764,196.013 326.006,196.667 326.25,197.344 C 326.277,197.419 326.317,197.488 326.344,197.562 C 326.383,197.672 326.43,197.796 326.469,197.906 C 326.774,198.771 327.070,199.624 327.344,200.5 C 327.349,200.513 327.34,200. 549 327.344,200.562 C 327.348,200.576 327.34,200.58 327.344,200.594 C 327.648,201.571 327.923,202.573 328.188,203.562 C 328.19,203.57 328.216,203.585 328.219,203.594 C 328.366,204.148 328.491,204.693 328.625,205.25 C 328.736,205.705 328.835,206.168 328.938,206.625 C 329.165,207.645 329.377,208.658 329.563,209.687 C 329.746,210.705 329.889,211.724 330.031,212.75 C 330.457,215.83 330.708,218.958 330.75,222.094 C 330.764,223.128 330.748,224.15 330.719,225.187 C 330.691,226.162 330.659,227.148 330.594,228.125 C 330.59,228.184 330.598,228.222 330.594,228.281 C 330.59,228.333 330.566,228.386 330.563,228.437 C 330.492,229.418 330.391,230.393 330.281,231.375 C 330.225,231.88 330.192,232.401 330.125,232.906 C 330.11,232.92 330.109,232.923 330.094,232.937 C 328.004,248.896 320.855,264.333 308.594,276.594 C 293.652,291.536 274.022,298.912 254.438,298.75 z M 255.031,268.781 C 266.734,268.787 278.444,264.306 287.375,255.375 C 295.182,247.568 299.554,237.632 300.531,227.437 C 300.575,226. 977 300.626,226.524 300.656,226.062 C 300.666,225.91 300.679,225.746 300.688,225.594 C 300.712,225.156 300.738,224.719 300.75,224.281 C 300.755,224.105 300.747,223.926 300.75,223.75 C 300.756,223.332 300.755,222.918 300.75,222.5 C 300.748,222.315 300.755,222.123 300.75,221.937 C 300.74,221.527 300.708,221.129 300.688,220.719 C 300.667,220.32 300.625,219.898 300.594,219.5 C 300.579,219.307 300.58,219.13 300.563,218.937 C 300.544,218.732 300.553,218.518 300.531,218.312 C 300.514,218.142 300.457,217.983 300.438,217.812 C 300.388,217.383 300.343,216.959 300.281,216.531 C 300.195,215.935 300.11,215.342 300,214.75 C 299.933,214.387 299.857,214.018 299.781,213.656 C 299.733,213.427 299.677,213.197 299.625,212.969 C 299.36,211.797 299.043,210.645 298.688,209.5 C 298.51,208.927 298.325,208.377 298.125,207.812 C 298.002,207.463 297.882,207.097 297.75,206.75 C 297.666,206.53 297.587,206.312 297.5,206.094 C 297.057,204.981 296.56,203.919 296.031,202.844 C 295.86,202.496 295.712,202.126 295.531,201.781 C 290.706,192.564 282.702,184.959 272.313,180.719 C 250.46,171.801 225.707,181.007 214.781,201.344 C 214.789,201.351 214.805,201.368 214.813,201.375 C 214.521,201.916 214.237,202.45 213.969,203 C 213.867,203.208 213.754,203.416 213.656,203.625 C 213.519,203.917 213.381,204.204 213.25,204.5 C 213.214,204.581 213.192,204.669 213.156,204.75 C 212.682,205.837 212.261,206.949 211.875,208.062 C 211.727,208.49 211.572,208.913 211.438,209.344 C 211.398,209.468 211.351,209.594 211.313,209.719 C 211.295,209.777 211.299,209.848 211.281,209.906 C 210.945,211.027 210.655,212.142 210.406,213.281 C 210.278,213.869 210.167,214.471 210.063,215.062 C 209.643,217.429 209.389,219.823 209.344,222.219 C 209.333,222.766 209.303,223.327 209.313,223.875 C 209.313,223.926 209.343,223.98 209.344,224.031 C 209.355,224.593 209.374,225.127 209.406,225.687 C 209.408,225.725 209.404,225.775 209.406,225.812 C 209.44,226.373 209.477,226.941 209.531,227.5 C 209.535,227.537 209.559,227.557 209. 563,227.594 C 209.618,228.153 209.674,228.724 209.75,229.281 C 209.755,229.319 209.776,229.369 209.781,229.406 C 209.856,229.949 209.936,230.491 210.031,231.031 C 210.040,231.082 210.053,231.137 210.063,231.187 C 210.159,231.728 210.259,232.244 210.375,232.781 C 210.386,232.833 210.395,232.886 210.406,232.937 C 210.509,233.406 210.632,233.878 210.75,234.344 C 210.769,234.417 210.762,234.49 210.781,234.562 C 210.928,235.132 211.112,235.686 211.281,236.25 C 211.299,236.308 211.295,236.349 211.313,236.406 C 211.468,236.917 211.639,237.431 211.813,237.937 C 211.835,238.003 211.852,238.091 211.875,238.156 C 212.047,238.65 212.248,239.137 212.438,239.625 C 212.653,240.179 212.857,240.705 213.094,241.25 C 213.134,241.343 213.178,241.438 213.219,241.531 C 213.42,241.986 213.627,242.457 213.844,242.906 C 213.892,243.007 213.951,243.118 214,243.219 C 214.212,243.65 214.43,244.074 214.656,244.5 C 214.935,245.025 215.232,245.517 215.531,246.031 C 215.607,246.161 215.673,246.309 215.75,2 46.437 C 215.979,246.822 216.228,247.215 216.469,247.594 C 216.788,248.097 217.13,248.572 217.469,249.062 C 217.808,249.553 218.141,250.022 218.5,250.5 C 218.859,250.978 219.216,251.442 219.594,251.906 C 219.972,252.371 220.384,252.862 220.781,253.312 C 221.074,253.644 221.354,253.957 221.656,254.281 C 222.003,254.651 222.358,255.014 222.719,255.375 C 223.277,255.933 223.827,256.477 224.406,257 C 224.908,257.453 225.452,257.886 225.969,258.312 C 234.387,265.274 244.705,268.776 255.031,268.781 z M 375.469,178.5 L 452.813,125.406 C 442.593,104.258 428.702,84.421 411.156,66.875 C 393.76,49.479 374.132,35.693 353.188,25.5 L 300.844,103.062 C 317.39,109.014 332.929,118.617 346.188,131.875 C 359.794,145.482 369.556,161.463 375.469,178.5 z " data-tags="autoinstallations" /> -<glyph unicode="" d="M 255.75,480 m0,0,c -81.845,0 -148.202-66.357 -148.202-148.202 0-81.845 66.357-148.202 148.202-148.202 81.845,0 148.174,66.357 148.174,148.202 0,81.845 -66.329,148.202 -148.174,148.202 z m 0-37.788 c 60.981,0 110.414-49.433 110.414-110.414 0-60.981 -49.433-110.414 -110.414-110.414 -60.981,0 -110.414,49.433 -110.414,110.414 0,60.981 49.433,110.414 110.414,110.414 z m 0-16.195 c -52.039,0 -94.247-42.18 -94.247-94.219 0-52.039 42.208-94.219 94.247-94.219 52.039,0 94.219,42.18 94.219,94.219 0,52.039 -42.18,94.219 -94.219,94.219 z m -86.706-225.642 -96.779-167.624 69.677-5.259 40.932-58.602 72.626,125.774 73.127-126.664 40.932,58.602 69.677,5.259 -97.169,168.264 c -24.783-16.282 -54.418-25.767 -86.289-25.767 -32.045,0 -61.864,9.572 -86.734,26.017 z" data-tags="organization-trust" /> -<glyph unicode="" d="M 164.844,408.685 0,343.998 l 76.094-56.875 164.844,64.688 -76.094,56.875 z m 178.594,0 -76.094-56.875 164.781-64.688 76.094,56.875 -164.781,64.688 z m -87.531-64.688 0-0.094 -164.594-64.594 -0.5-8.094 c 0.441-59.383 0.5-118.772 0.5-178.156 l 164.594-64.625 0-0.063 0.125,0.063 0.125-0.063 0,0.063 164.563,64.625 c -0.547,59.553 0.754,119.084 1.75,178.625 l -0.125,7.094 -166.188,65.125 0,0.094 -0.125-0.094 -0.125,0.094 z m -6.063-51.094 c 46.023,0 83.281-37.289 83.281-83.313 0-16.8 -5.073-33.345 -14.656-47.188 l 40.563-40.594 c 2.721-2.721 4.375-6.634 4.375-10.656 0-8.282 -6.843-15.125 -15.125-15.125 -4.023,0 -7.935,1.661 -10.656,4.5 l -40.594,40.469 c -13.843-9.583 -30.387-14.688 -47.188-14.688 -46.023,0 -83.313,37.258 -83.313,83.281 0,46.023 37.289,83.313 83.313,83.313 z m 0-30.281 c -29.223,0 -53-23.808 -53-53.031 0-29.223 23.777-53 53-53 29.223,0 53,23.777 53,53 0,29.223 -23.777,53.031 -53,53.031 z" data-tags="package-search" /> -<glyph unicode="" d="M 164.845,348.294 0,283.609 76.092,226.74 240.937,291.425 164.845,348.294 z m 178.577,0 -76.092-56.869 164.786-64.685 76.092,56.869 -164.786,64.685 z m -87.505-64.685 0-0.067 -164.607-64.618 164.726-64.618 164.667,64.618 -164.548,64.618 0,0.067 -0.119-0.067 -0.119,0.067 z m 180.004-68.997 -157.177-64.685 76.092-56.869 L 512.013,157.742 435.921,214.611 z M 79.896,210.299 3.805,153.43 157.236,93.057 233.328,149.926 79.896,210.299 z m 176.14-56.128 -11.354-8.557 -11.473-8.557 0.119-0.067 -76.092-56.869 -65.926,25.874 0-73.31 164.607-64.618 0-0.067 0.119,0.067 0.119-0.067 0,0.067 164.548,64.618 0,73.31 -65.867-25.874 -76.092,56.869 0.178,0.067 -22.887,17.115 z" data-tags="packages" /> -<glyph unicode="" d="M 42.656,446.969 C 19.19,446.969 0,427.779 0,404.312 L 0,114.156 C 0,90.69 19.19,71.5 42.656,71.5 L 187.719,71.5 C 187.719,48.3 170.656,30.179 170.656,20.312 C 170.656,10.979 178.385,3.25 187.719,3.25 L 324.281,3.25 C 333.615,3.25 341.344,10.979 341.344,20.312 C 341.344,29.646 324.281,48.833 324.281,71.5 L 469.344,71.5 C 492.81,71.5 512,90.69 512,114.156 L 512,404.312 C 512,427.779 492.81,446.969 469.344,446.969 L 42.656,446.969 z M 42.656,412.844 L 469.344,412.844 C 473.877,412.844 477.875,408.846 477.875,404.312 L 477.875,182.437 C 477.875,177.904 473.877,173.906 469.344,173.906 L 42.656,173.906 C 38.123,173.906 34.125,177.904 34.125,182.437 L 34.125,404.312 C 34.125,408.846 38.123,412.844 42.656,412.844 z M 190.5,399.25 L 100.344,233.812 L 45.438,233.812 L 45.438,195.187 L 118.75,195.187 L 118.75,195.5 L 119.219,195.031 L 189.344,326.875 L 262.156,194.406 L 262.156,194.219 L 262.25,194.219 L 262.406,193.937 L 262.688,194.219 L 318.75,194.219 L 318.75,195.625 L 356.781,274.156 L 395.156,194.906 L 395.531,195.187 L 468.563,195.187 L 468.563,233.812 L 412.531,233.812 L 357.188,339.312 L 356.875,340.344 L 356.781,340.125 L 356.656,340.344 L 356.344,339.312 L 300.531,232.844 L 281.188,232.844 L 191.094,398.156 L 191.063,398.094 L 190.5,399.25 z " data-tags="monitoring-status" /> -<glyph unicode="" d="M 164.844,416.312 0,351.625 l 76.094-56.875 164.844,64.688 -76.094,56.875 z m 178.594,0 -76.094-56.875 164.781-64.688 76.094,56.875 -164.781,64.688 z m -87.531-64.688 0-0.094 -164.594-64.594 -0.5-8.094 c 0.441-59.383 0.5-118.772 0.5-178.156 l 164.594-64.625 0-0.062 0.125,0.062 0.125-0.062 0,0.062 164.563,64.625 c -0.547,59.553 0.754,119.084 1.75,178.625 l -0.125,7.094 -166.188,65.125 0,0.094 -0.125-0.094 -0.125,0.094 z m -16.25-55.75 28.906,0 c 2.344,0 4.427-1.693 4.688-3.906 l 3.656-23.969 c 4.036-1.302 7.943-2.859 11.719-4.813 l 18.5,13.938 c 0.781,0.781 1.953,1.156 3.125,1.156 1.172,0 2.339-0.5 3.25-1.281 6.901-6.38 16-14.474 21.469-22.156 0.651-0.781 0.938-1.802 0.938-2.844 0-1.172 -0.411-2.089 -1.063-3 -4.427-5.99 -9.229-11.724 -13.656-17.844 2.214-4.167 4.042-8.453 5.344-12.75 l 23.813-3.656 c 2.214-0.391 3.781-2.474 3.781-4.688 l 0-28.906 c 0-1.953 -1.573-4.297 -3.656-4.688 l -24.094-3.656 c -1.432-4.167 -2.979-8.068 -5.063-11.844 4.427-6. 38 9.12-12.109 13.938-17.969 0.781-0.911 1.281-2.078 1.281-3.25 0-1.172 -0.375-2.089 -1.156-3 -3.125-4.167 -20.698-23.313 -25.125-23.313 -1.172,0 -2.365,0.536 -3.406,1.188 L 288.875,128.687 c -3.776-1.953 -7.807-3.635 -11.844-4.938 -0.911-7.943 -1.698-16.406 -3.781-24.219 -0.521-2.083 -2.344-3.656 -4.688-3.656 l -28.906,0 c -2.344,0 -4.427,1.693 -4.688,3.906 l -3.625,23.969 c -4.036,1.302 -7.943,2.859 -11.719,4.813 l -18.375-13.938 c -0.911-0.781 -2.078-1.188 -3.25-1.188 -1.172,0 -2.339,0.526 -3.25,1.438 -6.901,6.25 -16.031,14.323 -21.5,21.875 -0.651,0.911 -0.906,1.958 -0.906,3 0,1.172 0.411,2.089 1.063,3 4.427,5.99 9.229,11.724 13.656,17.844 -2.214,4.167 -4.042,8.448 -5.344,12.875 l -23.813,3.531 c -2.214,0.391 -3.781,2.474 -3.781,4.688 l 0,28.906 c 0,1.953 1.547,4.297 3.5,4.688 l 24.219,3.625 c 1.302,4.167 3.010,8.094 5.094,12 -4.427,6.25 -9.12,12.109 -13.938,17.969 -0.781,0.911 -1.313,1.953 -1.313,3.125 0,1.172 0.536,2.089 1.188,3 3.125,4.297 20.698,23.281 25.125,23.281 1 .172,0 2.333-0.5 3.375-1.281 l 17.969-13.938 c 3.776,1.953 7.839,3.635 11.875,4.938 0.911,7.943 1.667,16.406 3.75,24.219 0.521,2.083 2.344,3.656 4.688,3.656 z m 14.469-66.656 c -18.359,0 -33.344-14.984 -33.344-33.344 0-18.359 14.984-33.344 33.344-33.344 18.359,0 33.344,14.984 33.344,33.344 0,18.359 -14.984,33.344 -33.344,33.344 z" data-tags="manage-software-packages" /> -<glyph unicode="" d="M 424,478.562 C 400.197,478.318 375.498,468.337 356.156,448.969 L 288.656,381.406 L 401.938,268.312 C 408.311,268.146 414.504,266.762 420.188,264.281 L 480.531,324.687 C 516.938,361.146 520.158,416.638 487.656,449.094 L 480.531,456.187 C 465.296,471.401 445.003,478.778 424,478.562 z M 42.906,393 C 27.508,393 15.094,380.586 15.094,365.187 L 15.094,157.469 L 45.156,187.437 L 45.156,344.125 C 45.156,353.147 52.152,360.551 61.094,361.437 C 61.69,361.497 62.231,361.437 62.844,361.437 L 218.469,361.437 L 250.063,393 L 42.906,393 z M 263.844,356.531 L 121.813,214.312 L 211.688,124.531 C 212.916,132.62 216.058,138.758 220.25,144.562 C 223.813,149.495 228.649,154.608 235.656,158.406 C 234.641,162.1 233.906,166.027 233.906,170.312 C 233.906,184.038 240.74,194.83 243.094,198.125 A41.204,41.204 180 0 0 243.281,198.406 C 245.459,201.401 247.486,203.893 249.5,206.25 C 246.859,207.038 244.37,208.471 242.281,210.562 C 235.572,217.263 235.518,228.103 242.219,234. 812 C 245.569,238.167 250.031,239.843 254.438,239.844 C 258.844,239.845 263.239,238.171 266.594,234.812 C 268.633,232.776 270.053,230.351 270.844,227.781 C 272.66,229.405 274.538,231.042 276.563,232.656 C 279.055,234.644 281.649,236.631 285.625,238.937 C 289.601,241.244 293.727,245.594 309.188,245.594 C 314.030,245.594 318.125,244.775 321.906,243.719 C 328.558,255.225 340.126,264.13 353.281,267.187 L 263.844,356.531 z M 259.094,320.937 C 263.5,320.938 267.895,319.265 271.25,315.906 C 277.96,309.206 277.951,298.304 271.25,291.594 C 264.55,284.884 253.71,284.877 247,291.594 C 240.29,298.294 240.237,309.197 246.938,315.906 C 250.288,319.261 254.688,320.937 259.094,320.937 z M 494.875,297.562 L 464.781,267.594 L 464.781,244.531 C 473.362,242.713 480.091,238.713 485.625,233.969 A41.204,41.204 180 0 0 486.781,232.937 C 489.129,230.767 491.899,228.291 494.875,225.562 L 494.875,297.562 z M 297.313,282.812 C 301.719,282.819 306.114,281.154 309.469,277.812 C 316.178,271.112 316.107,26 0.209 309.406,253.5 C 302.706,246.79 291.866,246.783 285.156,253.5 C 278.458,260.189 278.428,271.037 285.094,277.75 C 288.444,281.105 292.906,282.807 297.313,282.812 z M 216.219,278 C 220.625,278.001 225.020,276.296 228.375,272.937 C 235.085,266.237 235.076,255.366 228.375,248.656 C 221.675,241.946 210.835,241.974 204.125,248.656 C 197.415,255.356 197.362,266.165 204.063,272.875 L 204.063,272.937 C 207.413,276.292 211.813,277.999 216.219,278 z M 173.344,235.062 C 177.75,235.069 182.145,233.404 185.5,230.062 C 192.21,223.362 192.202,212.491 185.5,205.781 C 178.8,199.072 167.96,199.036 161.25,205.719 C 154.54,212.419 154.487,223.291 161.188,230 C 164.538,233.355 168.938,235.057 173.344,235.062 z M 363.156,227.156 C 360.119,227.156 357.769,225.106 357.094,222.406 C 354.394,212.283 353.368,201.323 352.188,191.031 C 346.957,189.344 341.736,187.156 336.844,184.625 L 313.563,202.687 C 312.213,203.7 310.706,204.375 309.188,204.375 C 303.451,204.375 280.674,179.724 276.625,174.156 C 275.781,172.975 275.094,171.8 275.094,170.281 C 275.094,168.763 275.769,167.431 276.781,166.25 C 283.024,158.658 289.107,151.067 294.844,142.969 C 292.144,137.907 289.937,132.836 288.25,127.437 L 256.875,122.719 C 254.344,122.213 252.313,119.156 252.313,116.625 L 252.313,79.187 C 252.313,76.319 254.351,73.6 257.219,73.094 L 288.094,68.562 C 289.781,62.826 292.132,57.243 295,51.844 C 289.264,43.914 283.018,36.511 277.281,28.75 C 276.438,27.569 275.938,26.362 275.938,24.844 C 275.938,23.494 276.281,22.15 277.125,20.969 C 284.211,11.183 296.027,0.723 304.969-7.375 C 306.15-8.556 307.669-9.219 309.188-9.219 C 310.706-9.219 312.194-8.731 313.375-7.719 L 337.188,10.344 C 342.080,7.813 347.145,5.781 352.375,4.094 L 357.094-26.938 C 357.431-29.806 360.119-32 363.156-32 L 400.625-32 C 403.662-32 406.013-29.981 406.688-27.281 C 409.387-17.158 410.413-6.198 411.594,4.094 C 416.824,5.781 422.045,8.001 426.938,10.531 L 450.219-7.719 C 451.568-8.562 453.075-9.219 454.594-9.219 C 460.33-9. 219 483.107,15.57 487.156,20.969 C 488.169,22.15 488.688,23.325 488.688,24.844 C 488.688,26.362 488.012,27.882 487,29.062 C 480.758,36.655 474.674,44.077 468.938,52.344 C 471.637,57.236 473.675,62.32 475.531,67.719 L 506.75,72.437 C 509.449,72.944 511.469,75.969 511.469,78.5 L 511.469,115.969 C 511.469,118.837 509.431,121.525 506.563,122.031 L 475.688,126.75 C 474,132.318 471.649,137.882 468.781,143.281 C 474.518,151.211 480.764,158.645 486.5,166.406 C 487.344,167.587 487.844,168.763 487.844,170.281 C 487.844,171.631 487.5,172.988 486.656,174 C 479.57,183.954 467.754,194.42 458.813,202.687 C 457.632,203.7 456.112,204.375 454.594,204.375 C 453.075,204.375 451.575,203.856 450.563,202.844 L 426.594,184.812 C 421.701,187.343 416.636,189.344 411.406,191.031 L 406.688,222.094 C 406.35,224.962 403.662,227.156 400.625,227.156 L 363.156,227.156 z M 211.563,196.906 C 215.969,196.907 220.364,195.234 223.719,191.875 C 230.428,185.175 230.42,174.334 223.719,167.625 C 217.019,160.915 206. 116,160.88 199.406,167.562 C 192.697,174.263 192.644,185.165 199.344,191.875 C 202.694,195.23 207.156,196.905 211.563,196.906 z M 96.938,189.437 L 29.5,121.875 C -6.907,85.417 -10.033,29.925 22.469-2.531 L 29.563-9.625 C 62.064-42.081 117.562-38.864 153.969-2.406 L 215.406,59.156 C 213.126,64.159 211.728,69.6 211.281,75.25 L 96.938,189.437 z M 381.875,140.75 C 405.664,140.75 425.094,121.351 425.094,97.562 C 425.094,73.774 405.664,54.375 381.875,54.375 C 358.086,54.375 338.688,73.774 338.688,97.562 C 338.688,121.351 358.086,140.75 381.875,140.75 z " data-tags="manage-patches" /> -<glyph unicode="" d="M 302.051,405.582 m0,0,-94.57,0 0,44.060 94.57,0 0-44.060 z m 161.775-114.105 -143.089,0 0,34.213 143.089,0 0-34.213 z m 0-47.803 -143.089,0 0,17.12 143.089,0 0-17.12 z m 0-35.567 -143.089,0 0,17.146 143.089,0 0-17.146 z m 0-164.907 -143.089,0 0,25.719 143.089,0 0-25.719 z M 276.119,62.603 c 0-11.625 -9.529-21.154 -21.128-21.154 l -190.679,0 c -11.599,0 -21.101,9.529 -21.101,21.154 l 0,249.338 c 0,11.626 9.502,21.101 21.101,21.101 l 190.679,0 c 11.599,0 21.128-9.476 21.128-21.101 l 0-249.338 z m 44.617,127.562 95.366,0 0-17.067 -95.366,0 0,17.067 z m 132.871,189.326 -397.762,0 C 25.003,379.491 0,354.515 0,323.673 l 0-269.775 c 0-30.895 25.003-55.898 55.845-55.898 l 397.762,0 c 30.842,0 55.845,25.003 55.845,55.898 l 0,269.775 c 0,30.842 -25.003,55.818 -55.845,55.818 m -294.062-207.348 c -18.155,0 -34.664,6.582 -47.908,17.146 -16.828-13.882 -27.816-34.691 -27.816-58.207 l 0-70.815 151.503,0 0,70.815 c 0,23.516 -10.988,44.326 -27.869,58.207 -13.218 -10.564 -29.701-17.146 -47.909-17.146 m 0,18.394 c 32.514,0 58.95,26.383 58.95,58.897 0,32.488 -26.436,58.924 -58.95,58.924 -32.487,0 -58.924-26.436 -58.924-58.924 0-32.514 26.436-58.897 58.924-58.897" data-tags="manage-entitlements-subscriptions" /> -<glyph unicode="" d="M 136.844,475.719 C 120.084,475.719 106.469,462.103 106.469,445.344 L 106.469,260.344 C 109.171,261.142 111.997,261.594 114.875,261.594 L 146.938,261.594 L 146.938,435.25 L 308.844,435.25 L 308.844,303.687 C 308.844,286.928 322.459,273.344 339.219,273.344 L 470.75,273.344 L 470.75,30.469 L 269.75,30.469 C 269.873,29.327 269.969,28.168 269.969,26.937 C 269.969,20.403 266.694,12.631 263.281,8 L 263.406,7.906 C 263.143,7.555 262.742,7.166 262.469,6.812 C 262.435,6.768 262.409,6.7 262.375,6.656 C 258.456,1.601 253.525-3.787 247.375-10 L 480.875-10 C 497.635-10 511.25,3.584 511.25,20.344 L 511.25,303.687 C 511.25,320.447 501.45,343.862 489.75,355.562 L 391.063,454.219 C 379.362,465.919 355.978,475.719 339.219,475.719 L 136.844,475.719 z M 349.344,432.719 C 354.719,430.821 360.099,427.964 362.313,425.75 L 461.281,326.781 C 463.495,324.568 466.321,319.188 468.219,313.812 L 349.344,313.812 L 349.344,432.719 z M 114.875,236.562 C 111.728,236.562 109.293,2 34.485 108.594,231.687 C 105.796,221.196 104.724,209.822 103.5,199.156 C 98.080,197.408 92.664,195.123 87.594,192.5 L 63.469,211.219 C 62.070,212.268 60.511,212.969 58.938,212.969 C 52.993,212.969 29.384,187.426 25.188,181.656 C 24.313,180.432 23.594,179.23 23.594,177.656 C 23.594,176.083 24.295,174.661 25.344,173.437 C 31.813,165.569 38.118,157.705 44.063,149.312 C 41.265,144.067 38.999,138.845 37.25,133.25 L 4.719,128.344 C 2.096,127.819 0,124.654 0,122.031 L 0,83.219 C 0,80.246 2.090,77.462 5.063,76.937 L 37.063,72.219 C 38.811,66.274 41.278,60.501 44.25,54.906 C 38.305,46.688 31.82,38.981 25.875,30.937 C 25.001,29.714 24.469,28.511 24.469,26.937 C 24.469,25.539 24.844,24.13 25.719,22.906 C 33.062,12.765 45.295,1.924 54.563-6.469 C 55.786-7.693 57.364-8.406 58.938-8.406 C 60.511-8.406 62.057-7.862 63.281-6.813 L 87.938,11.875 C 93.008,9.252 98.267,7.155 103.688,5.406 L 108.594-26.75 C 108.943-29.722 111.728-32 114.875-32 L 153.688-32 C 156.835-32 159.301-29.891 160-27.094 C 162.798-16.603 163.839-5.26 165.063,5.406 C 170.483,7.155 175.898,9.44 180.969,12.062 L 205.094-6.813 C 206.493-7.687 208.083-8.406 209.656-8.406 C 215.601-8.406 239.21,17.311 243.406,22.906 C 244.455,24.13 244.969,25.364 244.969,26.937 C 244.969,28.511 244.268,30.057 243.219,31.281 C 236.749,39.15 230.445,46.87 224.5,55.437 C 227.298,60.508 229.42,65.749 231.344,71.344 L 263.688,76.219 C 266.485,76.743 268.563,79.908 268.563,82.531 L 268.563,121.344 C 268.563,124.316 266.472,127.1 263.5,127.625 L 231.5,132.531 C 229.751,138.301 227.316,144.061 224.344,149.656 C 230.289,157.874 236.743,165.582 242.688,173.625 C 243.562,174.849 244.094,176.083 244.094,177.656 C 244.094,179.055 243.749,180.451 242.875,181.5 C 235.531,191.816 223.298,202.651 214.031,211.219 C 212.807,212.268 211.23,212.969 209.656,212.969 C 208.083,212.969 206.487,212.455 205.438,211.406 L 180.625,192.687 C 175.554,195.31 170.295,197.408 164.875,199.156 L 160,231.312 C 159.65,234.285 156.835,236.562 153.688, 236.562 L 114.875,236.562 z M 226.781,232.844 C 228.020,232.020 229.186,231.157 230.281,230.219 L 230.656,229.906 L 231,229.594 C 239.599,221.643 252.077,211.013 262.063,197.5 C 262.085,197.47 262.103,197.437 262.125,197.406 C 262.485,196.918 262.897,196.496 263.25,196 L 263.125,195.906 C 263.98,194.737 264.735,193.547 265.375,192.375 L 420.156,192.375 C 425.848,192.375 430.281,196.808 430.281,202.5 L 430.281,222.75 C 430.281,228.442 425.848,232.844 420.156,232.844 L 226.781,232.844 z M 269.563,151.906 C 284.503,148.456 293.563,135.54 293.563,121.344 L 293.563,111.437 L 420.156,111.437 C 425.848,111.437 430.281,115.871 430.281,121.562 L 430.281,141.781 C 430.281,147.473 425.848,151.906 420.156,151.906 L 269.563,151.906 z M 134.281,147.062 C 158.935,147.062 179.063,126.935 179.063,102.281 C 179.063,77.627 158.935,57.531 134.281,57.531 C 109.627,57.531 89.531,77.627 89.531,102.281 C 89.531,126.935 109.627,147.062 134.281,147.062 z " data-tags="manage-configuration-files" /> -<glyph unicode=" " horiz-adv-x="256" /> -</font></defs></svg> \ No newline at end of file diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.eot b/branding/fonts/font-spacewalk/font/spacewalk-icon.eot old mode 100644 new mode 100755 index b09936c..ea12ace Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.eot and b/branding/fonts/font-spacewalk/font/spacewalk-icon.eot differ diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.svg b/branding/fonts/font-spacewalk/font/spacewalk-icon.svg old mode 100644 new mode 100755 index 2f93533..46d5e33 --- a/branding/fonts/font-spacewalk/font/spacewalk-icon.svg +++ b/branding/fonts/font-spacewalk/font/spacewalk-icon.svg @@ -1,45 +1,68 @@ <?xml version="1.0" standalone="no"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > <svg xmlns="http://www.w3.org/2000/svg"> -<metadata> -This is a custom SVG font generated by IcoMoon. -<iconset grid="16"></iconset> -</metadata> +<metadata>Generated by IcoMoon</metadata> <defs> -<font id="spacewalk-icon" horiz-adv-x="512" > -<font-face units-per-em="512" ascent="480" descent="-32" /> -<missing-glyph horiz-adv-x="512" /> -<glyph class="hidden" unicode="" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" /> -<glyph unicode="" d="M 125.59,469.404 m0,0,c -9.225,0 -16.63-7.719 -16.63-17.309 l 0-212.022 c 24.251,23.906 58.467,38.835 96.322,38.835 49.233,0 92.317-25.197 115.373-62.738 9.853,4.6 20.966,7.165 32.631,7.165 10.366,0 20.258-2.038 29.236-5.706 l 0,234.467 c 0,9.591 -7.405,17.309 -16.63,17.309 l -240.302,0 z m 35.083-61.407 163.377,0 c 8.122,0 14.65-7.167 14.65-16.073 0-8.906 -6.528-16.073 -14.65-16.073 l -163.377,0 c -8.122,0 -14.65,7.167 -14.65,16.073 0,8.906 6.528,16.073 14.65,16.073 z m 0-72.502 163.377,0 c 8.122,0 14.65-7.167 14.65-16.073 0-8.906 -6.528-16.105 -14.65-16.105 l -163.377,0 c -8.122,0 -14.65,7.199 -14.65,16.105 0,8.906 6.528,16.073 14.65,16.073 z m 44.609-84.137 c -1.067,0 -2.116-0.034 -3.175-0.063 -0.624-0.018 -1.233-0.036 -1.855-0.063 -0.1-0.004 -0.215,0.005 -0.314,0 -0.388-0.018 -0.776-0.041 -1.163-0.063 -0.542-0.031 -1.095-0.056 -1.635-0.095 -0.836-0.060 -1.684-0.143 -2.515-0.222 -0.672-0.064 -1.344-0.115 -2.012-0.19 -0.969-0.109 -1.9-0.246 -2 .861-0.38 -0.1-0.014 -0.183-0.017 -0.283-0.032 -0.268-0.038 -0.55-0.087 -0.817-0.127 -1.126-0.169 -2.25-0.369 -3.364-0.571 -1.294-0.235 -2.591-0.482 -3.867-0.761 -1.042-0.228 -2.052-0.472 -3.081-0.729 -0.232-0.058 -0.492-0.099 -0.723-0.159 -1.093-0.281 -2.191-0.606 -3.269-0.919 -0.155-0.045 -0.317-0.081 -0.472-0.127 -0.655-0.193 -1.268-0.397 -1.918-0.602 -0.68-0.215 -1.369-0.406 -2.043-0.634 -0.123-0.042 -0.255-0.085 -0.377-0.127 -0.989-0.338 -1.949-0.713 -2.924-1.078 -1.187-0.445 -2.388-0.911 -3.552-1.395 -0.968-0.402 -1.94-0.807 -2.892-1.236 -0.74-0.334 -1.471-0.697 -2.201-1.046 -0.75-0.359 -1.493-0.702 -2.232-1.078 -0.221-0.112 -0.44-0.203 -0.66-0.317 -0.51-0.264 -1.004-0.553 -1.509-0.824 -0.249-0.134 -0.475-0.276 -0.723-0.412 -1.081-0.593 -2.151-1.211 -3.207-1.839 -0.042-0.025 -0.115-0.038 -0.157-0.063 -0.921-0.549 -1.835-1.105 -2.735-1.68 -0.454-0.29 -0.872-0.591 -1.32-0.888 -0.245-0.162 -0.511-0.343 -0.754-0.507 -0.458-0.309 -0.899-0.603 -1.352-0.919 -0.058-0.040 -0.13 1-0.086 -0.189-0.127 -0.257-0.18 -0.499-0.357 -0.754-0.539 -0.609-0.435 -1.194-0.884 -1.792-1.331 -0.132-0.098 -0.278-0.186 -0.409-0.285 -0.94-0.71 -1.854-1.448 -2.766-2.187 -0.019-0.015 -0.076-0.017 -0.094-0.032 -0.931-0.756 -1.834-1.56 -2.735-2.346 -0.925-0.807 -1.843-1.603 -2.735-2.441 -0.898-0.843 -1.776-1.694 -2.641-2.568 -1.641-1.659 -3.231-3.372 -4.747-5.136 -0.211-0.246 -0.42-0.513 -0.629-0.761 -0.584-0.694 -1.133-1.351 -1.698-2.061 -0.058-0.073 -0.131-0.149 -0.189-0.222 -2.265-2.863 -4.332-5.876 -6.256-8.972 -1.279-2.059 -2.496-4.156 -3.615-6.309 -3.456-6.648 -6.139-13.74 -7.922-21.145 50.711-2.663 90.947-41.25 90.947-88.48 0-3.060 -0.173-6.087 -0.503-9.067 -5.007,44.638 -46.102,79.445 -96.039,79.445 -3.289,0 -6.571-0.104 -9.84-0.349 -0.084-0.011 -0.168-0.021 -0.251-0.032 C 38.458,150.899 0,112.405 0,65.839 c 0-51.020 46.138-92.379 103.081-92.379 1.565,0 3.136,0.033 4.684,0.095 2.093-0.147 4.245-0.222 6.445-0.222 l 309.306,0 c 6.872,0 12.376,0.848 16.787,2.473 39.85 6,8.398 69.852,45.483 69.852,89.907 0,46.421 -32.793,84.759 -75.322,90.794 -1.146,0.040 -2.302,0.063 -3.458,0.063 -45.080,0 -82.49-30.469 -89.689-70.473 -0.013,0.589 -0.032,1.183 -0.032,1.775 0,34.639 22.401,64.415 54.48,77.479 -2.374,7.947 -7.17,14.929 -13.612,20.194 -0.012,0.010 -0.019,0.022 -0.032,0.032 -0.966,0.788 -1.981,1.542 -3.018,2.251 -0.52,0.355 -1.067,0.68 -1.603,1.014 -0.5,0.311 -0.995,0.627 -1.509,0.919 -0.043,0.025 -0.082,0.039 -0.126,0.063 -1.119,0.632 -2.245,1.235 -3.427,1.775 -0.067,0.031 -0.153,0.065 -0.22,0.095 -0.527,0.238 -1.065,0.447 -1.603,0.666 -0.125,0.051 -0.252,0.109 -0.377,0.159 -0.479,0.19 -0.927,0.396 -1.415,0.571 -0.188,0.067 -0.377,0.125 -0.566,0.19 -0.428,0.147 -0.886,0.277 -1.32,0.412 -0.625,0.194 -1.249,0.371 -1.886,0.539 -0.327,0.086 -0.676,0.174 -1.006,0.254 -0.291,0.070 -0.587,0.126 -0.88,0.19 -0.033,0.006 -0.062,0.026 -0.094,0.032 -0.076,0.017 -0.175,0.015 -0.251,0.032 -0.032,0.007 -0.062,0.025 -0.094,0.032 -0.092,0.015 -0.191,0.017 -0 .283,0.032 -2.593,0.421 -5.265,0.666 -7.985,0.666 -25.795,0 -46.715-19.781 -46.715-44.192 0-9.701 3.298-18.674 8.897-25.964 -10.349,8.108 -16.944,20.372 -16.944,34.080 0,7.709 2.086,14.964 5.753,21.272 l -4.495,10.24 c -15.607,35.577 -52.544,60.456 -96.039,60.456 z" /> -<glyph unicode="" d="M 212.75,476.969 C 197.915,476.969 185.781,464.835 185.781,450 L 185.781,273.469 C 185.946,273.495 185.874,273.491 186.156,273.531 C 186.778,273.62 187.060,273.656 187.094,273.656 C 187.867,273.77 188.779,273.897 189.969,274.031 C 191.211,274.172 192.023,274.214 192.406,274.25 C 193.179,274.323 194.188,274.441 195.438,274.531 L 195.469,274.531 C 196.418,274.6 197.056,274.636 197.406,274.656 C 197.414,274.657 197.429,274.656 197.438,274.656 C 197.783,274.676 198.239,274.694 198.75,274.719 C 199.154,274.739 198.565,274.706 198.844,274.719 C 199.355,274.741 199.617,274.752 199.656,274.75 C 200.3,274.78 200.923,274.798 201.438,274.812 C 202.43,274.84 203.718,274.875 205.281,274.875 C 240.111,274.875 271.889,261.551 295.031,239.625 L 304.438,239.625 C 304.438,236.621 304.001,233.749 303.281,231.031 C 309.152,224.287 314.295,216.942 318.563,209.031 C 329.259,215.316 341.682,218.969 354.813,218.969 C 358.943,218.969 362.872,218.599 366.563,218 C 364.311 ,218.367 364.433,218.4 367,217.969 L 367.469,217.875 C 367.479,217.873 367.491,217.877 367.5,217.875 C 367.532,217.869 367.69,217.832 367.781,217.812 C 367.913,217.784 367.903,217.781 368.188,217.719 C 368.38,217.677 368.194,217.748 368.469,217.687 L 368.469,217.656 L 368.563,217.656 C 368.414,217.689 368.917,217.587 369.813,217.375 C 369.858,217.365 369.895,217.353 369.938,217.344 C 369.993,217.332 370.043,217.323 370.094,217.312 C 370.522,217.208 370.961,217.095 371.438,216.969 C 372.341,216.73 373.291,216.463 374.281,216.156 C 374.361,216.132 375.009,215.956 376.25,215.531 L 376.281,215.531 C 375.983,215.634 376.282,215.509 377.094,215.219 C 377.121,215.209 377.096,215.229 377.125,215.219 C 378.811,214.614 379.534,214.262 379.25,214.375 L 379.281,214.375 C 380.158,214.027 380.341,213.954 379.844,214.156 C 380.168,214.025 380.969,213.703 382.25,213.125 C 382.296,213.104 382.253,213.121 382.313,213.094 C 382.409,213.051 382.434,213.058 382.563,213 C 382.575,212.994 382.558, 212.971 382.563,212.969 C 382.573,212.966 382.591,212.968 382.594,212.969 C 384.636,212.033 386.365,211.112 387.781,210.312 C 387.886,210.253 387.85,210.286 387.969,210.219 L 387.969,210.187 L 388,210.187 C 389.181,209.515 389.916,209.040 390.281,208.812 C 390.545,208.648 391.38,208.165 392.719,207.25 C 394.247,206.206 395.761,205.085 397.25,203.875 C 397.28,203.851 397.314,203.837 397.344,203.812 C 397.361,203.798 397.35,203.784 397.344,203.781 C 397.338,203.785 397.357,203.792 397.406,203.75 C 397.511,203.662 397.513,203.672 397.5,203.687 C 397.603,203.597 397.734,203.467 397.875,203.344 L 397.844,203.312 C 398.537,202.735 399.207,202.136 399.875,201.531 C 400.932,203.197 401.563,205.157 401.563,207.25 C 401.563,213.15 390.75,225.295 390.75,239.625 L 482.469,239.625 C 497.304,239.625 509.438,251.758 509.438,266.594 L 509.438,450 C 509.438,464.835 497.304,476.969 482.469,476.969 L 212.75,476.969 z M 212.75,455.406 L 482.469,455.406 C 485.335,455.406 487.875,452.866 487.875, 450 L 487.875,309.75 C 487.875,306.884 485.335,304.344 482.469,304.344 L 212.75,304.344 C 209.884,304.344 207.344,306.884 207.344,309.75 L 207.344,450 C 207.344,452.866 209.884,455.406 212.75,455.406 z M 205.281,251.344 C 204.214,251.344 203.153,251.311 202.094,251.281 C 201.469,251.264 200.871,251.247 200.25,251.219 C 200.15,251.215 200.037,251.224 199.938,251.219 C 199.549,251.201 199.168,251.179 198.781,251.156 C 198.24,251.125 197.664,251.101 197.125,251.062 C 196.289,251.002 195.456,250.922 194.625,250.844 C 193.953,250.78 193.293,250.732 192.625,250.656 C 191.656,250.547 190.71,250.415 189.75,250.281 C 189.65,250.267 189.569,250.264 189.469,250.25 C 189.201,250.212 188.924,250.165 188.656,250.125 C 187.53,249.956 186.395,249.765 185.281,249.562 C 183.988,249.328 182.682,249.060 181.406,248.781 C 180.364,248.553 179.373,248.319 178.344,248.062 C 178.112,248.005 177.856,247.966 177.625,247.906 C 176.532,247.626 175.422,247.282 174.344,246.969 C 174.189,246.924 174.030,24 6.889 173.875,246.844 C 173.22,246.65 172.618,246.455 171.969,246.25 C 171.288,246.035 170.58,245.853 169.906,245.625 C 169.783,245.583 169.654,245.542 169.531,245.5 C 168.542,245.162 167.6,244.771 166.625,244.406 C 165.438,243.962 164.227,243.515 163.063,243.031 C 162.094,242.629 161.108,242.21 160.156,241.781 C 159.417,241.448 158.698,241.099 157.969,240.75 C 157.219,240.391 156.489,240.032 155.75,239.656 C 155.529,239.544 155.282,239.458 155.063,239.344 C 154.552,239.080 154.067,238.803 153.563,238.531 C 153.314,238.397 153.091,238.23 152.844,238.094 C 151.763,237.501 150.68,236.909 149.625,236.281 C 149.583,236.256 149.511,236.244 149.469,236.219 C 148.548,235.669 147.65,235.107 146.75,234.531 C 146.296,234.241 145.886,233.922 145.438,233.625 C 145.193,233.463 144.931,233.289 144.688,233.125 C 144.229,232.816 143.765,232.535 143.313,232.219 C 143.255,232.179 143.183,232.134 143.125,232.094 C 142.868,231.914 142.63,231.714 142.375,231.531 C 141.766,231.096 141.192,230.666 140.594,230.219 C 140.462,230.12 140.319,230.037 140.188,229.937 C 139.247,229.227 138.319,228.49 137.406,227.75 C 137.388,227.735 137.331,227.734 137.313,227.719 C 136.382,226.963 135.495,226.161 134.594,225.375 C 133.669,224.568 132.736,223.744 131.844,222.906 C 130.946,222.063 130.083,221.217 129.219,220.344 C 127.577,218.685 125.984,216.983 124.469,215.219 C 124.257,214.972 124.053,214.717 123.844,214.469 C 123.259,213.775 122.689,213.115 122.125,212.406 C 122.067,212.333 121.995,212.261 121.938,212.187 C 119.673,209.325 117.611,206.314 115.688,203.219 C 114.408,201.16 113.182,199.059 112.063,196.906 C 108.607,190.259 105.94,183.156 104.156,175.75 C 154.867,173.087 195.094,134.511 195.094,87.281 C 195.094,84.222 194.923,81.167 194.594,78.187 C 189.587,122.825 148.5,157.656 98.563,157.656 C 95.273,157.656 91.988,157.557 88.719,157.312 C 88.635,157.302 88.552,157.292 88.469,157.281 C 38.464,150.913 0,112.41 0,65.844 C 0,14.823 46.151-26.531 103.094-26.531 C 104.659-26.531 106.202-26.5 107.75-26.438 C 109.843-26.584 112.020-26.656 114.219-26.656 L 423.531-26.656 C 430.403-26.656 435.902-25.813 440.313-24.188 C 480.168-15.79 510.156,21.295 510.156,65.719 C 510.156,112.139 477.373,150.464 434.844,156.5 C 433.698,156.54 432.531,156.562 431.375,156.562 C 386.295,156.562 348.886,126.098 341.688,86.094 C 341.675,86.683 341.656,87.283 341.656,87.875 C 341.656,122.514 364.047,152.279 396.125,165.344 C 393.751,173.291 388.973,180.266 382.531,185.531 C 382.519,185.541 382.512,185.553 382.5,185.562 C 381.534,186.351 380.506,187.104 379.469,187.812 C 378.949,188.167 378.411,188.51 377.875,188.844 C 377.375,189.155 376.889,189.457 376.375,189.75 C 376.332,189.775 376.293,189.788 376.25,189.812 C 375.131,190.445 373.994,191.054 372.813,191.594 C 372.746,191.624 372.661,191.657 372.594,191.687 C 372.067,191.925 371.539,192.156 371,192.375 C 370.875,192.426 370.719,192.481 370.594,192.531 C 370.115,192.721 369.675,192.919 369.188,193.094 C 369,193.161 368.81 4,193.216 368.625,193.281 C 368.197,193.428 367.747,193.553 367.313,193.687 C 366.688,193.881 366.043,194.051 365.406,194.219 C 365.079,194.305 364.736,194.42 364.406,194.5 C 364.115,194.57 363.825,194.623 363.531,194.687 C 363.499,194.693 363.47,194.713 363.438,194.719 C 363.361,194.736 363.264,194.733 363.188,194.75 C 363.155,194.757 363.126,194.774 363.094,194.781 C 363.002,194.797 362.905,194.798 362.813,194.812 C 360.219,195.233 357.533,195.469 354.813,195.469 C 329.017,195.469 308.125,175.693 308.125,151.281 C 308.125,141.58 311.401,132.602 317,125.312 C 306.651,133.42 300.063,145.699 300.063,159.406 C 300.063,167.115 302.145,174.348 305.813,180.656 L 301.313,190.906 C 285.705,226.483 248.777,251.344 205.281,251.344 z " /> -<glyph unicode="" d="M 255,479.437 C 114.167,479.437 0,365.27 0,224.437 C 0,213.101 0.754,201.945 2.188,191 C 3.284,193.266 4.414,195.004 5.125,196 L 5.188,196.094 L 5.25,196.187 C 10.109,202.868 16.092,209.133 24.031,217 C 28.001,220.933 32.076,224.76 36.375,228.187 C 38.524,229.901 40.667,231.508 43.563,233.187 C 46.458,234.867 49.374,237.625 58.938,237.625 C 67.815,237.625 73.959,234.156 78.25,230.937 L 78.406,230.844 L 78.563,230.719 L 82.438,227.719 C 83.048,230.97 83.766,234.277 84.656,237.656 C 84.662,237.679 84.682,237.696 84.688,237.719 C 84.715,237.824 84.722,237.926 84.75,238.031 L 84.781,238.031 C 88.211,250.965 100.91,261.219 114.875,261.219 L 153.688,261.219 C 156.388,261.219 159.037,260.866 161.594,260.219 C 175.992,297.769 212.384,324.437 255,324.437 C 310.228,324.437 355,279.666 355,224.437 C 355,182.143 328.728,145.993 291.625,131.375 C 292.669,128.183 293.219,124.809 293.219,121.344 L 293.219,82.531 C 293.219,74.647 290.754,69.048 286.969,63.937 C 283.183,58.827 277.297,53.733 268.219,52.031 L 267.781,51.937 L 267.375,51.875 L 259.281,50.656 C 260.188,49.547 261.005,48.478 261.938,47.344 C 262.045,47.213 262.142,47.1 262.25,46.969 L 262.219,46.937 C 266.387,41.95 269.625,35.599 269.625,26.937 C 269.625,20.484 266.403,12.803 263.031,8.219 L 263.125,8.125 C 262.863,7.775 262.46,7.384 262.188,7.031 C 262.154,6.987 262.128,6.919 262.094,6.875 C 257.659,1.157 251.966-4.954 244.563-12.313 C 240.603-16.248 236.542-20.058 232.25-23.5 C 230.104-25.221 227.959-26.872 225.063-28.563 C 224.965-28.62 224.848-28.691 224.75-28.75 C 234.675-29.924 244.759-30.563 255-30.563 C 395.833-30.563 510,83.605 510,224.437 C 510,365.27 395.833,479.437 255,479.437 z M 255,300.156 C 219.833,300.156 190.264,276.186 181.75,243.687 C 182.961,241.057 183.83,238.179 184.281,235.062 L 184.344,235.062 L 184.469,234.219 L 185.531,227.25 L 190.625,231.094 L 190.688,231 C 196.849,235.949 203.494,237.625 209.656,237.625 C 210.19,237.625 210.702,237.586 211. 219,237.562 C 216.861,256.412 234.316,270.156 255,270.156 C 280.247,270.156 300.719,249.685 300.719,224.437 C 300.719,203.924 287.204,186.57 268.594,180.781 C 268.702,179.691 268.75,178.646 268.75,177.656 C 268.75,170.605 265.431,163.066 262.75,159.312 L 262.625,159.156 L 262.531,159 C 260.988,156.911 259.763,155.367 258.25,153.406 L 267.219,152.031 L 267.5,151.969 L 267.781,151.937 C 269.398,151.652 270.953,151.245 272.438,150.75 C 305.847,158.627 330.719,188.624 330.719,224.437 C 330.719,266.253 296.816,300.156 255,300.156 z M 114.875,236.562 C 111.728,236.562 109.293,234.485 108.594,231.687 C 105.796,221.196 104.724,209.822 103.5,199.156 C 98.080,197.408 92.664,195.123 87.594,192.5 L 63.469,211.219 C 62.070,212.268 60.511,212.969 58.938,212.969 C 52.993,212.969 29.384,187.426 25.188,181.656 C 24.313,180.432 23.594,179.23 23.594,177.656 C 23.594,176.083 24.295,174.661 25.344,173.437 C 31.813,165.569 38.118,157.705 44.063,149.312 C 41.265,144.067 38.999,138.845 37.25,133.25 L 4.719,128.344 C 2.096,127.819 0,124.654 0,122.031 L 0,83.219 C 0,80.246 2.090,77.462 5.063,76.937 L 37.063,72.219 C 38.811,66.274 41.278,60.501 44.25,54.906 C 38.305,46.688 31.82,38.981 25.875,30.937 C 25.001,29.714 24.469,28.511 24.469,26.937 C 24.469,25.539 24.844,24.13 25.719,22.906 C 33.062,12.765 45.295,1.924 54.563-6.469 C 55.786-7.693 57.364-8.406 58.938-8.406 C 60.511-8.406 62.057-7.862 63.281-6.813 L 87.938,11.875 C 93.008,9.252 98.267,7.155 103.688,5.406 L 108.594-26.75 C 108.943-29.722 111.728-32 114.875-32 L 153.688-32 C 156.835-32 159.301-29.891 160-27.094 C 162.798-16.603 163.839-5.26 165.063,5.406 C 170.483,7.155 175.898,9.44 180.969,12.062 L 205.094-6.813 C 206.493-7.687 208.083-8.406 209.656-8.406 C 215.601-8.406 239.21,17.311 243.406,22.906 C 244.455,24.13 244.969,25.364 244.969,26.937 C 244.969,28.511 244.268,30.057 243.219,31.281 C 236.749,39.15 230.445,46.87 224.5,55.437 C 227.298,60.508 229.42,65.749 231.344,71.344 L 263.688,76.219 C 266.485,76.743 2 68.563,79.908 268.563,82.531 L 268.563,121.344 C 268.563,124.316 266.472,127.1 263.5,127.625 L 231.5,132.531 C 229.751,138.301 227.316,144.061 224.344,149.656 C 230.289,157.874 236.743,165.582 242.688,173.625 C 243.562,174.849 244.094,176.083 244.094,177.656 C 244.094,179.055 243.749,180.451 242.875,181.5 C 235.531,191.816 223.298,202.651 214.031,211.219 C 212.807,212.268 211.23,212.969 209.656,212.969 C 208.083,212.969 206.487,212.455 205.438,211.406 L 180.625,192.687 C 175.554,195.31 170.295,197.408 164.875,199.156 L 160,231.312 C 159.65,234.285 156.835,236.562 153.688,236.562 L 114.875,236.562 z M 134.281,147.062 C 158.935,147.062 179.063,126.935 179.063,102.281 C 179.063,77.627 158.935,57.531 134.281,57.531 C 109.627,57.531 89.531,77.627 89.531,102.281 C 89.531,126.935 109.627,147.062 134.281,147.062 z M 134.281,122.406 C 123.030,122.406 114.188,113.563 114.188,102.312 C 114.188,91.062 123.030,82.187 134.281,82.187 C 145.532,82.187 154.406,91.062 154.406,102.312 C 154.40 6,113.563 145.532,122.406 134.281,122.406 z " /> -<glyph unicode="" d="M 217.695,305.708 m0,0,0,28.728 c 0,21.097 17.207,38.304 38.304,38.304 21.097,0 38.304-17.207 38.304-38.304 l 0-28.728 -76.609,0 m 124.49-14.364 c 0,7.93 -6.434,14.364 -14.364,14.364 l -4.788,0 0,28.728 c 0,36.808 -30.225,67.033 -67.033,67.033 -36.808,0 -67.033-30.225 -67.033-67.033 l 0-28.728 -4.788,0 c -7.93,0 -14.364-6.434 -14.364-14.364 l 0-86.185 c 0-7.93 6.434-14.364 14.364-14.364 l 143.642,0 c 7.93,0 14.364,6.434 14.364,14.364 l 0,86.185 m 135.682-108.906 c 0-4.533 -4-8.533 -8.533-8.533 l -426.667,0 c -4.533,0 -8.533,4 -8.533,8.533 l 0,221.867 c 0,4.533 4,8.533 8.533,8.533 l 426.667,0 c 4.533,0 8.533-4 8.533-8.533 l 0-221.867 m 34.133,221.867 c 0,23.467 -19.2,42.667 -42.667,42.667 l -426.667,0 c -23.467,0 -42.667-19.2 -42.667-42.667 l 0-290.133 c 0-23.467 19.2-42.667 42.667-42.667 l 145.067,0 c 0-23.2 -17.067-41.333 -17.067-51.2 0-9.333 7.733-17.067 17.067-17.067 l 136.533,0 c 9.333,0 17.067,7.733 17.067,17.067 0,9.333 -17.067,28.533 -17. 067,51.2 l 145.067,0 c 23.467,0 42.667,19.2 42.667,42.667 l 0,290.133" /> -<glyph unicode="" d="M 256,392.010 m0,0,c -56.017,0 -101.438-45.42 -101.438-101.438 0-56.017 45.42-101.438 101.438-101.438 56.017,0 101.438,45.42 101.438,101.438 0,56.017 -45.42,101.438 -101.438,101.438 z m -54.75-78.406 109.5,0 0-46.063 -109.5,0 0,46.063 z M 477.866,178.629 c 0-4.533 -4-8.533 -8.533-8.533 l -426.667,0 c -4.533,0 -8.533,4 -8.533,8.533 l 0,221.867 c 0,4.533 4,8.533 8.533,8.533 l 426.667,0 c 4.533,0 8.533-4 8.533-8.533 l 0-221.867 m 34.133,221.867 c 0,23.467 -19.2,42.667 -42.667,42.667 l -426.667,0 c -23.467,0 -42.667-19.2 -42.667-42.667 l 0-290.133 c 0-23.467 19.2-42.667 42.667-42.667 l 145.067,0 c 0-23.2 -17.067-41.333 -17.067-51.2 0-9.333 7.733-17.067 17.067-17.067 l 136.533,0 c 9.333,0 17.067,7.733 17.067,17.067 0,9.333 -17.067,28.533 -17.067,51.2 l 145.067,0 c 23.467,0 42.667,19.2 42.667,42.667 l 0,290.133" /> -<glyph unicode="" d="M 279.441,251.889 m0,0,-55.846,0 0,5.585 c 0,9.504 1.078,17.195 3.233,23.073 2.155,5.976 5.34,11.414 9.553,16.313 4.311,4.899 13.912,13.52 28.805,25.865 7.936,6.466 11.904,12.394 11.904,17.783 0,5.388 -1.617,9.552 -4.85,12.492 -3.135,3.037 -7.936,4.556 -14.402,4.556 -6.956,0 -12.737-2.303 -17.342-6.907 -4.507-4.605 -7.397-12.639 -8.671-24.102 l -57.022,7.054 c 1.96,20.967 9.553,37.818 22.779,50.555 13.325,12.835 33.703,19.252 61.137,19.252 21.358,0 38.602-4.458 51.731-13.374 17.831-12.051 26.747-28.119 26.747-48.204 0-8.328 -2.303-16.362 -6.907-24.102 -4.605-7.74 -14.011-17.195 -28.217-28.364 -9.896-7.838 -16.166-14.158 -18.811-18.958 -2.547-4.703 -3.821-10.875 -3.821-18.517 m -57.756-14.843 59.814,0 0-52.76 -59.814,0 0,52.76 m 256.182-54.607 c 0-4.533 -4-8.533 -8.533-8.533 l -426.667,0 c -4.533,0 -8.533,4 -8.533,8.533 l 0,221.867 c 0,4.533 4,8.533 8.533,8.533 l 426.667,0 c 4.533,0 8.533-4 8.533-8.533 l 0-221.867 m 34.133,221.867 c 0,23.467 -19. 2,42.667 -42.667,42.667 l -426.667,0 c -23.467,0 -42.667-19.2 -42.667-42.667 l 0-290.133 c 0-23.467 19.2-42.667 42.667-42.667 l 145.067,0 c 0-23.2 -17.067-41.333 -17.067-51.2 0-9.333 7.733-17.067 17.067-17.067 l 136.533,0 c 9.333,0 17.067,7.733 17.067,17.067 0,9.333 -17.067,28.533 -17.067,51.2 l 145.067,0 c 23.467,0 42.667,19.2 42.667,42.667 l 0,290.133" /> -<glyph unicode="" d="M 256.435,479.091 m0,0,c -16.641,0 -30.117-14 -30.117-31.289 0-17.289 13.476-31.316 30.117-31.316 16.641,0 30.142,14.027 30.142,31.316 0,17.289 -13.501,31.289 -30.142,31.289 z m -51.564-32.027 c -11.236,0 -20.281-9.397 -20.281-21.070 l 0-78.25 c 0-11.673 9.045-21.070 20.281-21.070 l 100.821,0 c 11.236,0 20.281,9.397 20.281,21.070 l 0,78.25 c 0,11.673 -9.045,21.070 -20.281,21.070 l -4.082,0 c -0.38-25.593 -20.451-46.223 -45.176-46.223 -24.724,0 -44.796,20.63 -45.176,46.223 l -6.388,0 z m -94.61-48.567 c -9.119,0 -16.453-5.898 -16.453-13.222 l 0-402.626 c 0-7.324 7.333-13.222 16.453-13.222 l 286.34,0 c 9.119,0 16.453,5.898 16.453,13.222 l 0,402.626 c 0,7.323 -7.333,13.222 -16.453,13.222 l -46.012,0 0-46.565 4.589,0 c 6.23,0 11.256-5.522 11.256-12.379 l 0-311.181 c 0-6.856 -5.026-12.379 -11.256-12.379 l -203.493,0 c -6.23,0 -11.256,5.522 -11.256,12.379 l 0,311.181 c 0,6.856 5.026,12.379 11.256,12.379 l 8.29,0 0,46.565 -49.713,0 z m 144.602-120.548 a9.018,9.369 180 0 1 -9.050-7.375 l -18.912-90.023 -11.129,36.267 a9.018,9.369 180 0 1 -16.782,1.054 l -11.636-26.469 -24.971,0.026 0-18.726 30.751-0.026 a9.018,9.369 180 0 1 8.214,5.478 l 4.335,9.85 14.247-46.46 a9.018,9.369 180 0 1 17.391,0.843 l 15.464,73.561 18.684-135.060 a9.018,9.369 180 0 1 17.644-1.106 l 24.21,92.999 29.154,0.026 0,18.726 -36.049,0 a9.018,9.369 180 0 1 -8.721-6.927 l -14.602-56.073 -19.571,141.381 a9.018,9.369 180 0 1 -8.67,8.033 z" /> -<glyph unicode="" d="M 357.105,477.971 m0,0,c -83.763,0 -151.613-67.85 -151.613-151.613 0-83.763 67.85-151.613 151.613-151.613 83.763,0 151.613,67.85 151.613,151.613 0,83.763 -67.85,151.613 -151.613,151.613 z m -115.527-129.31 230.803,0 0-44.607 -230.803,0 0,44.607 z M 28.568,265.963 C 12.816,265.963 0,253.147 0,237.395 L 0,42.679 C 0,26.927 12.816,13.86 28.568,13.86 l 97.233,0 c 0-15.573 -11.277-27.709 -11.277-34.332 C 114.524-26.737 119.536-32 125.801-32 l 91.72,0 c 6.265,0 11.528,5.263 11.528,11.528 0,6.265 -11.528,19.117 -11.528,34.332 l 97.483,0 c 15.752,0 28.568,13.067 28.568,28.819 l 0,105.753 c -7.724,0.577 -15.386,1.478 -22.805,3.007 l 0-63.151 c 0-3.043 -2.721-5.513 -5.764-5.513 l -286.436,0 c -3.043,0 -5.764,2.47 -5.764,5.513 l 0,149.107 c 0,3.043 2.721,5.764 5.764,5.764 l 170.659,0 c -3.877,7.336 -7.185,14.908 -10.024,22.805 l -160.635,0 z" /> -<glyph unicode="" d="M 23.16,414.391 C 10.425,414.391 0,403.966 0,391.232 l 0-157.428 c 0-12.735 10.425-23.16 23.16-23.16 l 78.727,0 c 0-12.59 -9.274-22.442 -9.274-27.797 0-5.065 4.209-9.248 9.274-9.248 l 63.909,0 0-77.173 c 0-15.741 12.885-28.626 28.626-28.626 l 97.301,0 c 0-15.562 -11.45-27.733 -11.45-34.351 0-6.261 5.19-11.45 11.45-11.45 l 91.576,0 c 6.261,0 11.45,5.19 11.45,11.45 0,6.261 -11.45,19.147 -11.45,34.351 l 97.327,0 c 15.741,0 28.6,12.885 28.6,28.626 l 0,194.602 c 0,15.741 -12.859,28.626 -28.6,28.626 l -202.763,0 0,71.577 c 0,12.735 -10.425,23.16 -23.16,23.16 l -231.544,0 z m 0-18.522 231.544,0 c 2.46,0 4.637-2.177 4.637-4.637 l 0-71.577 -64.919,0 c -15.741,0 -28.626-12.885 -28.626-28.626 l 0-24.818 -142.636,0 c -2.46,0 -4.637,2.177 -4.637,4.637 l 0,120.383 c 0,2.46 2.177,4.637 4.637,4.637 z m 171.262-99.115 286.205,0 c 3.041,0 5.725-2.684 5.725-5.725 l 0-148.827 c 0-3.041 -2.684-5.699 -5.725-5.699 l -286.205,0 c -3.041,0 -5.725,2.658 -5.725,5.699 l 0,1 48.827 c 0,3.041 2.684,5.725 5.725,5.725 z" /> -<glyph unicode="" d="M 258.625,477.656 m0,0,c -16.641,0 -30.125-13.992 -30.125-31.281 0-17.289 13.484-31.313 30.125-31.313 16.641,0 30.156,14.024 30.156,31.313 0,17.289 -13.515,31.281 -30.156,31.281 z m -52.594-32.031 c -10.745-0.562 -19.25-9.754 -19.25-21.063 l 0-78.25 c 0-11.673 9.046-21.063 20.281-21.063 l 100.813,0 c 11.236,0 20.281,9.39 20.281,21.063 l 0,78.25 c 0,11.673 -9.046,21.063 -20.281,21.063 l -4.063,0 c -0.38-25.593 -20.463-46.219 -45.188-46.219 -24.724,0 -44.776,20.626 -45.156,46.219 l -6.406,0 c -0.351,0 -0.685,0.018 -1.031,0 z m -93.563-48.563 C 103.349,397.062 96,391.167 96,383.844 l 0-402.625 c 0-7.324 7.349-13.219 16.469-13.219 l 286.313,0 c 9.119,0 16.469,5.895 16.469,13.219 l 0,402.625 c 0,7.323 -7.349,13.219 -16.469,13.219 l -46,0 0-46.563 4.594,0 c 6.23,0 11.25-5.519 11.25-12.375 l 0-311.188 c 0-6.856 -5.020-12.375 -11.25-12.375 l -203.5,0 c -6.23,0 -11.25,5.519 -11.25,12.375 l 0,311.188 c 0,6.856 5.020,12.375 11.25,12.375 l 8.281,0 0,46.563 -49.688,0 z m 136.875-112.969 c -9.078,0 -18.521-0.954 -28.281-2.906 -9.761-1.952 -20.533-4.994 -32.344-9.094 l 0-45.969 c 9.956,6.442 19.512,11.279 28.688,14.5 9.175,3.318 17.719,4.969 25.625,4.969 8.394,0 14.94-1.94 19.625-5.844 4.685-3.807 7.031-9.136 7.031-15.969 0-4.49 -1.333-8.979 -3.969-13.469 -2.538-4.49 -6.593-9.268 -12.156-14.344 l -9.344-8.5 c -10.346-9.566 -17.154-17.472 -20.375-23.719 -3.221-6.149 -4.813-13.215 -4.813-21.219 l 0-7.188 52.844,0 0,6.594 c 0,4.392 1.013,8.388 3.063,12 2.050,3.709 6.394,8.604 13.031,14.656 l 9.375,8.344 c 9.175,8.687 15.662,16.797 19.469,24.313 3.807,7.613 5.719,16.184 5.719,25.75 0,18.643 -6.256,32.805 -18.75,42.469 -12.494,9.761 -30.621,14.625 -54.438,14.625 z m -30.313-170.406 0-52.125 52.844,0 0,52.125 -52.844,0 z" /> -<glyph unicode="" d="M 272.406,475.875 m0,0,-94.281-239.219 80.375-0.375 -53.063-204.875 L 351,286.594 l -72.094-0.281 86.063,187.875 -92.563,1.688 z m -42.594-25.969 c -0.988-0.124 -1.984-0.239 -2.969-0.375 -0.971-0.134 -1.936-0.291 -2.906-0.438 -0.79-0.118 -1.586-0.249 -2.375-0.375 -0.514-0.083 -1.017-0.164 -1.531-0.25 -0.327-0.054 -0.642-0.101 -0.969-0.156 -1.279-0.22 -2.596-0.446 -3.875-0.688 -2.314-0.436 -4.627-0.9 -6.938-1.406 -0.198-0.043 -0.364-0.081 -0.563-0.125 -0.327-0.072 -0.674-0.145 -1-0.219 -0.997-0.226 -2.003-0.449 -3-0.688 -0.021-0.005 -0.010-0.026 -0.031-0.031 -2.36-0.563 -4.748-1.178 -7.094-1.813 -2.6-0.703 -5.201-1.458 -7.781-2.25 -0.137-0.042 -0.269-0.083 -0.406-0.125 -15.387-4.751 -30.373-11.076 -44.75-18.969 -0.938-0.515 -1.88-1.003 -2.813-1.531 -0.019-0.011 -0.044-0.021 -0.063-0.031 -0.044-0.025 -0.081-0.069 -0.125-0.094 -0.682-0.387 -1.347-0.794 -2.031-1.188 -0.15-0.086 -0.319-0.163 -0.469-0.25 -0.891-0.515 -1.778-1.035 -2.656-1.563 -0.667-0 .401 -1.339-0.785 -2-1.188 -0.201-0.123 -0.393-0.283 -0.594-0.406 -0.668-0.409 -1.333-0.797 -2-1.219 -0.728-0.46 -1.438-0.905 -2.156-1.375 -0.198-0.127 -0.396-0.278 -0.594-0.406 -0.011-0.008 -0.020-0.024 -0.031-0.031 -0.15-0.098 -0.287-0.183 -0.438-0.281 -0.267-0.17 -0.552-0.329 -0.813-0.5 -0.141-0.093 -0.265-0.188 -0.406-0.281 -1.092-0.721 -2.204-1.451 -3.281-2.188 -0.018-0.012 -0.044-0.019 -0.063-0.031 -0.431-0.295 -0.853-0.578 -1.281-0.875 -0.19-0.132 -0.373-0.305 -0.563-0.438 -0.432-0.302 -0.855-0.602 -1.281-0.906 -0.935-0.661 -1.858-1.327 -2.781-2 -0.086-0.063 -0.195-0.124 -0.281-0.188 -0.498-0.364 -0.974-0.726 -1.469-1.094 -0.749-0.557 -1.478-1.123 -2.219-1.688 -0.050-0.038 -0.106-0.086 -0.156-0.125 -2.414-1.841 -4.825-3.703 -7.156-5.625 -0.076-0.063 -0.143-0.125 -0.219-0.188 -1.174-0.97 -2.316-1.978 -3.469-2.969 -1.187-1.020 -2.367-2.022 -3.531-3.063 -1.065-0.952 -2.141-1.906 -3.188-2.875 -1.258-1.164 -2.489-2.343 -3.719-3.531 -0.768-0.742 -1.524-1.498 -2.281-2.25 -0. 312-0.309 -0.659-0.626 -0.969-0.938 -0.098-0.099 -0.183-0.182 -0.281-0.281 -0.941-0.948 -1.858-1.913 -2.781-2.875 -0.951-0.99 -1.88-1.995 -2.813-3 -1.094-1.18 -2.213-2.363 -3.281-3.563 -0.275-0.309 -0.508-0.627 -0.781-0.938 -0.945-1.071 -1.888-2.163 -2.813-3.25 -0.486-0.572 -0.988-1.143 -1.469-1.719 -0.274-0.329 -0.54-0.639 -0.813-0.969 -0.851-1.031 -1.698-2.081 -2.531-3.125 -0.912-1.143 -1.797-2.28 -2.688-3.438 -0.443-0.576 -0.875-1.17 -1.313-1.75 -0.441-0.585 -0.908-1.161 -1.344-1.75 -0.143-0.194 -0.263-0.369 -0.406-0.563 -0.393-0.534 -0.799-1.057 -1.188-1.594 -0.43-0.589 -0.858-1.187 -1.281-1.781 -0.214-0.302 -0.443-0.603 -0.656-0.906 -0.263-0.373 -0.49-0.751 -0.75-1.125 -0.706-1.016 -1.434-2.038 -2.125-3.063 -0.152-0.226 -0.286-0.461 -0.438-0.688 -0.183-0.273 -0.349-0.538 -0.531-0.813 -0.201-0.304 -0.394-0.632 -0.594-0.938 -0.643-0.98 -1.312-1.955 -1.938-2.938 -0.25-0.394 -0.471-0.761 -0.719-1.156 -1.995-3.174 -3.888-6.412 -5.719-9.656 -0.111-0.197 -0.233-0.397 -0.344-0. 594 -0.82-1.462 -1.651-2.931 -2.438-4.406 -0.127-0.238 -0.249-0.48 -0.375-0.719 -0.817-1.544 -1.594-3.098 -2.375-4.656 -0.857-1.71 -1.686-3.43 -2.5-5.156 -0.818-1.734 -1.632-3.47 -2.406-5.219 -0.775-1.751 -1.518-3.516 -2.25-5.281 -0.354-0.855 -0.687-1.704 -1.031-2.563 -0.295-0.732 -0.619-1.453 -0.906-2.188 -0.111-0.285 -0.202-0.589 -0.313-0.875 -0.392-1.014 -0.778-2.012 -1.156-3.031 -0.416-1.121 -0.819-2.279 -1.219-3.406 -0.335-0.944 -0.677-1.864 -1-2.813 -0.065-0.19 -0.123-0.372 -0.188-0.563 -0.155-0.461 -0.284-0.914 -0.438-1.375 -0.314-0.948 -0.666-1.891 -0.969-2.844 -0.205-0.639 -0.395-1.297 -0.594-1.938 -0.49-1.585 -0.949-3.186 -1.406-4.781 -0.015-0.051 -0.048-0.074 -0.063-0.125 -0.265-0.933 -0.523-1.887 -0.781-2.813 -0.095-0.347 -0.188-0.684 -0.281-1.031 -0.159-0.582 -0.317-1.162 -0.469-1.75 -0.119-0.46 -0.23-0.914 -0.344-1.375 -0.119-0.482 -0.229-0.987 -0.344-1.469 -0.231-0.935 -0.467-1.874 -0.688-2.813 -0.265-1.13 -0.532-2.272 -0.781-3.406 -0.032-0.147 -0.062-0.291 -0 .094-0.438 -0.356-1.632 -0.709-3.266 -1.031-4.906 -0.012-0.059 -0.020-0.097 -0.031-0.156 -0.091-0.465 -0.16-0.942 -0.25-1.406 -0.061-0.325 -0.127-0.644 -0.188-0.969 -0.169-0.888 -0.345-1.794 -0.5-2.688 -0.073-0.427 -0.148-0.823 -0.219-1.25 -0.058-0.343 -0.102-0.718 -0.156-1.063 -0.498-3.043 -0.931-6.090 -1.313-9.156 -0.030-0.238 -0.065-0.481 -0.094-0.719 -0.034-0.276 -0.061-0.536 -0.094-0.813 -0.194-1.645 -0.371-3.318 -0.531-4.969 -0.128-1.316 -0.237-2.618 -0.344-3.938 -0.207-2.573 -0.375-5.135 -0.5-7.719 -0.007-0.148 0.007-0.29 0-0.438 -0.057-1.223 -0.118-2.462 -0.156-3.688 -0.041-1.324 -0.074-2.643 -0.094-3.969 -0.013-0.901 -0.028-1.786 -0.031-2.688 -0.002-0.425 -0.001-0.856 0-1.281 0.003-1.321 0.007-2.646 0.031-3.969 0.025-1.337 0.078-2.662 0.125-4 0.046-1.322 0.088-2.677 0.156-4 0.047-0.918 0.098-1.832 0.156-2.75 0.026-0.414 0.065-0.835 0.094-1.25 0.091-1.334 0.199-2.666 0.313-4 0.306-3.587 0.655-7.161 1.125-10.75 0.003-0.021 -0.003-0.041 0-0.063 0.006-0.050 0.025-0.106 0.031-0.156 0.044-0.335 0.111-0.664 0.156-1 0.012-0.088 0.019-0.161 0.031-0.25 0.211-1.541 0.446-3.085 0.688-4.625 0.163-1.036 0.323-2.089 0.5-3.125 0.123-0.737 0.21-1.478 0.344-2.219 0.197-1.093 0.444-2.157 0.656-3.25 0.016-0.080 0.047-0.17 0.063-0.25 0.076-0.404 0.14-0.82 0.219-1.219 0.033-0.166 0.060-0.303 0.094-0.469 0.262-1.304 0.498-2.61 0.781-3.906 0.111-0.51 0.261-1.054 0.375-1.563 0.051-0.225 0.073-0.431 0.125-0.656 0.398-1.744 0.846-3.458 1.281-5.188 0.245-0.972 0.525-1.939 0.781-2.906 0.328-1.241 0.653-2.485 1-3.719 0.347-1.231 0.697-2.464 1.063-3.688 2.564-8.587 5.593-16.97 9.063-25.125 4.613-10.842 9.981-21.321 16.063-31.281 0.126-0.206 0.249-0.357 0.375-0.563 0.528-0.864 1.058-1.708 1.594-2.563 0.204-0.325 0.388-0.645 0.594-0.969 0.199-0.312 0.424-0.657 0.625-0.969 0.545-0.849 1.101-1.663 1.656-2.5 0.378-0.57 0.743-1.15 1.125-1.719 0.152-0.226 0.316-0.462 0.469-0.688 0.080-0.118 0.17-0.257 0.25-0.375 0.127-0.188 0.247-0.375 0.375-0.563 0.426-0.62 0.88-1.227 1.3 13-1.844 0.421-0.601 0.827-1.218 1.25-1.813 2.299-3.23 4.716-6.379 7.156-9.469 1.793-2.271 3.602-4.493 5.469-6.688 0.939-1.104 1.887-2.197 2.844-3.281 0.949-1.075 1.909-2.163 2.875-3.219 0.014-0.016 0.017-0.047 0.031-0.063 0.959-1.047 1.931-2.034 2.906-3.063 1.972-2.079 3.993-4.155 6.031-6.156 2.044-2.007 4.112-3.947 6.219-5.875 0.947-0.866 1.884-1.743 2.844-2.594 0.105-0.093 0.207-0.188 0.313-0.281 0.793-0.701 1.605-1.404 2.406-2.094 0.273-0.235 0.57-0.454 0.844-0.688 1.083-0.922 2.152-1.848 3.25-2.75 1.605-1.329 3.203-2.658 4.844-3.937 1.529-1.193 3.038-2.377 4.594-3.531 1.562-1.158 3.163-2.256 4.75-3.375 0.625-0.441 1.271-0.875 1.906-1.313 0.452-0.311 0.895-0.632 1.344-0.938 1.427-0.976 2.833-1.96 4.281-2.906 1.433-0.936 2.889-1.844 4.344-2.75 0.368-0.228 0.724-0.461 1.094-0.688 1.474-0.907 2.974-1.78 4.469-2.656 1.673-0.981 3.333-1.965 5.031-2.906 1.695-0.94 3.406-1.85 5.125-2.75 8-4.187 16.256-7.929 24.75-11.219 l 9.156,35.906 24.5,111.469 c -0.583,0.398 -1.144,0.838 -1 .719,1.25 -0.449,0.322 -0.9,0.639 -1.344,0.969 -0.108,0.081 -0.205,0.17 -0.313,0.25 -0.141,0.106 -0.297,0.206 -0.438,0.313 -0.506,0.38 -1.002,0.763 -1.5,1.156 -0.055,0.044 -0.132,0.081 -0.188,0.125 -0.468,0.372 -0.913,0.775 -1.375,1.156 -0.258,0.213 -0.525,0.44 -0.781,0.656 -0.374,0.317 -0.756,0.615 -1.125,0.938 -0.611,0.532 -1.214,1.046 -1.813,1.594 -0.531,0.489 -1.042,0.999 -1.563,1.5 -0.025,0.024 -0.069,0.007 -0.094,0.031 -0.517,0.499 -0.994,1.052 -1.5,1.563 -0.383,0.385 -0.78,0.764 -1.156,1.156 -0.106,0.111 -0.238,0.201 -0.344,0.313 -0.591,0.622 -1.143,1.267 -1.719,1.906 -0.675,0.752 -1.318,1.509 -1.969,2.281 -0.316,0.375 -0.658,0.745 -0.969,1.125 -0.26,0.318 -0.494,0.615 -0.75,0.938 -0.114,0.144 -0.23,0.324 -0.344,0.469 -0.579,0.737 -1.16,1.461 -1.719,2.219 -0.464,0.627 -0.894,1.236 -1.344,1.875 -0.122,0.174 -0.254,0.387 -0.375,0.563 -0.319,0.459 -0.627,0.91 -0.938,1.375 -0.425,0.639 -0.871,1.286 -1.281,1.938 -0.004,0.007 0.004,0.024 0,0.031 -0.492,0.781 -0.935,1.576 -1 .406,2.375 -0.044,0.074 -0.111,0.117 -0.156,0.188 -0.28,0.478 -0.571,0.984 -0.844,1.469 -0.078,0.139 -0.141,0.267 -0.219,0.406 -0.181,0.326 -0.354,0.64 -0.531,0.969 -0.181,0.335 -0.354,0.694 -0.531,1.031 -0.072,0.138 -0.147,0.268 -0.219,0.406 -0.231,0.446 -0.461,0.888 -0.688,1.344 -0.227,0.456 -0.467,0.914 -0.688,1.375 -0.123,0.255 -0.222,0.528 -0.344,0.781 -0.147,0.313 -0.294,0.622 -0.438,0.938 -0.191,0.419 -0.377,0.832 -0.563,1.25 -0.166,0.379 -0.316,0.751 -0.469,1.125 -0.154,0.365 -0.317,0.724 -0.469,1.094 -0.328,0.804 -0.659,1.625 -0.969,2.438 -0.052,0.136 -0.106,0.27 -0.156,0.406 -0.041,0.109 -0.085,0.235 -0.125,0.344 -0.080,0.218 -0.14,0.407 -0.219,0.625 -0.053,0.147 -0.104,0.322 -0.156,0.469 -0.266,0.751 -0.535,1.497 -0.781,2.25 -0.055,0.169 -0.102,0.331 -0.156,0.5 -0.007,0.021 0.003,0.044 0,0.063 -0.010,0.030 -0.022,0.064 -0.031,0.094 -0.352,1.114 -0.69,2.22 -1,3.344 -0.004,0.013 0.004,0.050 0,0.063 -0.313,1.137 -0.636,2.292 -0.906,3.438 -0.245,1.041 -0.478,2.046 -0. 688,3.094 -0.022,0.109 -0.041,0.235 -0.063,0.344 -0.005,0.021 -0.027,0.041 -0.031,0.063 -0.010,0.049 0.009,0.076 0,0.125 -0.015,0.079 -0.016,0.171 -0.031,0.25 -0.192,1 -0.37,1.997 -0.531,3 -0.017,0.105 -0.046,0.207 -0.063,0.313 -0.008,0.050 -0.024,0.106 -0.031,0.156 -0.155,1.017 -0.282,2.045 -0.406,3.063 -0.263,2.172 -0.42,4.324 -0.531,6.5 l -0.469,0 -26.313,0.125 9.219,24.656 82.156,220.125 z m 141.75-25.406 -50.5-108.344 48.844,0.188 32.688,0.125 -16.906-28 L 352,232.687 c 0.005-0.019 -0.005-0.044 0-0.063 0.085-0.348 0.168-0.682 0.25-1.031 0.042-0.178 0.085-0.353 0.125-0.531 0.132-0.581 0.253-1.165 0.375-1.75 0.002-0.009 -0.002-0.022 0-0.031 0.106-0.512 0.215-1.018 0.313-1.531 0.051-0.266 0.108-0.546 0.156-0.813 0.1-0.554 0.191-1.101 0.281-1.656 0.037-0.228 0.089-0.459 0.125-0.688 0.040-0.255 0.087-0.495 0.125-0.75 0.078-0.532 0.118-1.090 0.188-1.625 0.075-0.577 0.154-1.169 0.219-1.75 0.007-0.059 0.025-0.097 0.031-0.156 0.017-0.158 0.046-0.311 0.063-0.469 0.070-0.668 0.132 -1.331 0.188-2 0.011-0.139 0.020-0.267 0.031-0.406 0.119-1.522 0.203-3.052 0.25-4.594 0.003-0.089 -0.002-0.192 0-0.281 0.021-0.743 0.028-1.476 0.031-2.219 0-0.079 0-0.171 0-0.25 0.001-0.753 -0.015-1.497 -0.031-2.25 -0.001-0.050 0.001-0.076 0-0.125 -0.018-0.782 -0.056-1.562 -0.094-2.344 -0.001-0.020 0.001-0.043 0-0.063 -0.019-0.396 -0.070-0.792 -0.094-1.188 -0.024-0.396 -0.002-0.792 -0.031-1.188 -0.001-0.020 0.001-0.043 0-0.063 -0.038-0.524 -0.078-1.041 -0.125-1.563 -0.022-0.246 -0.038-0.504 -0.063-0.75 -0.017-0.188 -0.045-0.375 -0.063-0.563 -0.036-0.347 -0.085-0.685 -0.125-1.031 -0.029-0.247 -0.063-0.503 -0.094-0.75 -0.115-0.861 -0.245-1.705 -0.375-2.563 -0.174-1.151 -0.377-2.292 -0.594-3.438 -0.217-1.145 -0.459-2.299 -0.719-3.438 -0.254-1.117 -0.486-2.235 -0.781-3.344 -0.006-0.021 -0.026-0.041 -0.031-0.063 -0.124-0.462 -0.275-0.916 -0.406-1.375 -0.073-0.258 -0.112-0.524 -0.188-0.781 -0.089-0.304 -0.189-0.604 -0.281-0.906 -0.124-0.409 -0.247-0.818 -0.375-1.219 -0.051-0.159 - 0.104-0.31 -0.156-0.469 -0.052-0.159 -0.104-0.341 -0.156-0.5 -0.133-0.397 -0.27-0.76 -0.406-1.156 -0.048-0.138 -0.108-0.299 -0.156-0.438 -0.315-0.901 -0.626-1.763 -0.969-2.656 -0.067-0.174 -0.151-0.358 -0.219-0.531 -0.172-0.439 -0.353-0.908 -0.531-1.344 -0.040-0.099 -0.053-0.183 -0.094-0.281 -0.048-0.119 -0.107-0.256 -0.156-0.375 -0.243-0.582 -0.496-1.174 -0.75-1.75 -0.052-0.117 -0.104-0.227 -0.156-0.344 -0.256-0.573 -0.514-1.121 -0.781-1.688 -0.060-0.127 -0.127-0.248 -0.188-0.375 -0.264-0.554 -0.538-1.139 -0.813-1.688 -0.064-0.127 -0.092-0.248 -0.156-0.375 -0.277-0.547 -0.588-1.084 -0.875-1.625 -0.068-0.129 -0.119-0.246 -0.188-0.375 -0.287-0.535 -0.578-1.096 -0.875-1.625 -0.077-0.138 -0.172-0.268 -0.25-0.406 -0.293-0.515 -0.573-1.022 -0.875-1.531 -0.087-0.148 -0.193-0.29 -0.281-0.438 -0.298-0.496 -0.599-1.010 -0.906-1.5 -0.092-0.148 -0.157-0.29 -0.25-0.438 -1.513-2.388 -3.161-4.7 -4.875-6.938 -4.847-6.325 -10.459-12.041 -16.719-16.969 -0.206-0.162 -0.418-0.309 -0.625-0.469 -1.032-0.799 -2.060-1.587 -3.125-2.344 -0.156-0.111 -0.343-0.202 -0.5-0.313 -0.489-0.341 -0.972-0.667 -1.469-1 -0.129-0.087 -0.246-0.195 -0.375-0.281 -0.529-0.35 -1.087-0.691 -1.625-1.031 -0.334-0.213 -0.663-0.416 -1-0.625 -0.338-0.208 -0.658-0.421 -1-0.625 -0.061-0.037 -0.126-0.088 -0.188-0.125 -0.624-0.371 -1.24-0.735 -1.875-1.094 -0.673-0.383 -1.379-0.758 -2.063-1.125 -0.020-0.010 -0.043-0.021 -0.063-0.031 -1.419-0.755 -2.842-1.467 -4.313-2.156 -1.47-0.689 -2.98-1.348 -4.5-1.969 -4.351-1.776 -8.787-3.214 -13.219-4.313 l -67.094-111.031 -17.625-30.656 c 3.287-0.871 6.566-1.704 9.906-2.438 1.894-0.416 3.778-0.785 5.688-1.156 1.89-0.368 3.813-0.739 5.719-1.063 0.156-0.026 0.312-0.036 0.469-0.062 1.37-0.23 2.747-0.45 4.125-0.656 0.712-0.108 1.416-0.177 2.125-0.281 1.232-0.181 2.446-0.373 3.688-0.531 7.776-0.989 15.644-1.593 23.531-1.813 2.366-0.066 4.721-0.098 7.094-0.094 0.247,0 0.503,0 0.75,0 0.258,0.001 0.523,0 0.781,0 1.047,0.010 2.077,0.041 3.125,0.062 1.026,0.021 2.067, 0.029 3.094,0.062 0.287,0.010 0.556,0.020 0.844,0.031 0.997,0.036 2.002,0.076 3,0.125 0.81,0.040 1.627,0.077 2.438,0.125 0.82,0.049 1.648,0.13 2.469,0.188 0.949,0.066 1.894,0.141 2.844,0.219 0.364,0.030 0.729,0.031 1.094,0.062 3.563,0.307 7.123,0.687 10.688,1.156 0.089,0.012 0.192,0.019 0.281,0.031 0.296,0.039 0.579,0.084 0.875,0.125 1.582,0.216 3.168,0.471 4.75,0.719 1.052,0.165 2.103,0.329 3.156,0.5 0.069,0.012 0.15,0.019 0.219,0.031 0.66,0.108 1.341,0.194 2,0.313 1.096,0.195 2.159,0.415 3.25,0.625 0.645,0.125 1.293,0.275 1.938,0.406 0.169,0.034 0.331,0.090 0.5,0.125 1.136,0.229 2.278,0.41 3.406,0.656 0.734,0.162 1.485,0.331 2.219,0.5 0.758,0.173 1.501,0.381 2.25,0.563 0.974,0.236 1.96,0.473 2.938,0.719 18.099,4.553 35.35,11.155 51.563,19.531 0.217,0.111 0.44,0.232 0.656,0.344 1.030,0.536 2.072,1.074 3.094,1.625 0.231,0.124 0.457,0.251 0.688,0.375 1,0.543 2.009,1.069 3,1.625 0.247,0.138 0.472,0.299 0.719,0.438 0.197,0.111 0.398,0.201 0.594,0.313 1.038,0.588 2.067,1.211 3.0 94,1.813 28.612,16.766 52.762,38.815 71.688,64.375 0.28,0.378 0.566,0.745 0.844,1.125 0.877,1.193 1.71,2.388 2.563,3.594 0.034,0.049 0.060,0.107 0.094,0.156 0.303,0.43 0.604,0.85 0.906,1.281 0.673,0.959 1.348,1.908 2,2.875 0.107,0.158 0.238,0.373 0.344,0.531 0.045,0.068 0.048,0.12 0.094,0.188 0.64,0.955 1.257,1.917 1.875,2.875 0.387,0.596 0.775,1.182 1.156,1.781 0.313,0.491 0.629,1.007 0.938,1.5 0.691,1.103 1.36,2.201 2.031,3.313 0.671,1.112 1.348,2.224 2,3.344 0.247,0.425 0.474,0.855 0.719,1.281 0.402,0.7 0.793,1.391 1.188,2.094 1.271,2.269 2.526,4.544 3.719,6.844 0.114,0.22 0.23,0.436 0.344,0.656 0.48,0.934 0.97,1.874 1.438,2.813 0.073,0.146 0.115,0.292 0.188,0.438 0.43,0.867 0.862,1.753 1.281,2.625 0.105,0.218 0.239,0.437 0.344,0.656 0.074,0.156 0.113,0.313 0.188,0.469 0.837,1.76 1.673,3.529 2.469,5.313 0.119,0.266 0.226,0.515 0.344,0.781 0.052,0.118 0.105,0.257 0.156,0.375 0.435,0.988 0.86,1.973 1.281,2.969 0.088,0.209 0.162,0.384 0.25,0.594 1.305,3.105 2.541,6.268 3.719 ,9.438 0.194,0.524 0.403,1.037 0.594,1.563 0.219,0.603 0.442,1.207 0.656,1.813 0.007,0.021 0.024,0.042 0.031,0.063 1.037,2.926 2.012,5.899 2.938,8.875 0.576,1.851 1.124,3.693 1.656,5.563 1.058,3.715 2.024,7.464 2.906,11.25 0.23,0.978 0.437,1.957 0.656,2.938 0.020,0.089 0.043,0.192 0.063,0.281 0.046,0.209 0.080,0.416 0.125,0.625 0.22,1.008 0.444,2.023 0.656,3.031 0.138,0.682 0.274,1.348 0.406,2.031 0.123,0.63 0.259,1.273 0.375,1.906 0.075,0.404 0.115,0.814 0.188,1.219 0.116,0.653 0.262,1.286 0.375,1.938 0.039,0.223 0.087,0.433 0.125,0.656 0.034,0.203 0.060,0.422 0.094,0.625 0.182,1.086 0.343,2.162 0.5,3.25 0.013,0.088 0.019,0.193 0.031,0.281 0.080,0.534 0.173,1.058 0.25,1.594 0.117,0.801 0.204,1.607 0.313,2.406 0.021,0.158 0.042,0.311 0.063,0.469 0.128,0.957 0.289,1.911 0.406,2.875 0.234,1.924 0.469,3.881 0.656,5.813 2.035,20.954 1.324,42.315 -2.313,63.625 -0.326,1.911 -0.689,3.841 -1.063,5.75 -0.029,0.148 -0.065,0.29 -0.094,0.438 -0.157,0.802 -0.304,1.607 -0.469,2.406 -0.111 ,0.555 -0.227,1.103 -0.344,1.656 -0.083,0.394 -0.163,0.795 -0.25,1.188 -0.001,0.008 -0.030-0.009 -0.031,0 -0.206,0.944 -0.41,1.892 -0.625,2.844 -0.114,0.504 -0.225,1.002 -0.344,1.5 -0.013,0.056 -0.049,0.1 -0.063,0.156 -0.021,0.089 -0.041,0.161 -0.063,0.25 -0.438,1.827 -0.896,3.658 -1.375,5.469 -0.266,1.003 -0.534,2.002 -0.813,3 -0.069,0.248 -0.149,0.471 -0.219,0.719 -0.078,0.278 -0.14,0.566 -0.219,0.844 -0.275,0.96 -0.589,1.92 -0.875,2.875 -0.37,1.235 -0.736,2.492 -1.125,3.719 -0.394,1.242 -0.805,2.454 -1.219,3.688 -0.159,0.475 -0.307,0.964 -0.469,1.438 -0.257,0.751 -0.486,1.502 -0.75,2.25 -0.056,0.159 -0.131,0.309 -0.188,0.469 -0.377,1.059 -0.765,2.104 -1.156,3.156 -0.454,1.221 -0.933,2.444 -1.406,3.656 -0.473,1.212 -0.946,2.423 -1.438,3.625 -0.278,0.68 -0.56,1.353 -0.844,2.031 -0.053,0.127 -0.071,0.279 -0.125,0.406 -0.468,1.112 -0.983,2.206 -1.469,3.313 -0.544,1.239 -1.091,2.456 -1.656,3.688 -0.559,1.218 -1.138,2.446 -1.719,3.656 -1.735,3.62 -3.574,7.203 -5.5,10.75 -0.171, 0.314 -0.328,0.656 -0.5,0.969 -0.476,0.867 -0.951,1.7 -1.438,2.563 -1.459,2.582 -2.97,5.149 -4.531,7.688 -0.086,0.14 -0.195,0.267 -0.281,0.406 -0.778,1.26 -1.572,2.533 -2.375,3.781 -0.924,1.436 -1.855,2.861 -2.813,4.281 -0.020,0.029 -0.043,0.064 -0.063,0.094 -0.106,0.158 -0.237,0.342 -0.344,0.5 -3.804,5.606 -7.861,11.098 -12.188,16.438 -0.182,0.225 -0.349,0.432 -0.531,0.656 -0.582,0.713 -1.19,1.448 -1.781,2.156 -0.281,0.337 -0.53,0.665 -0.813,1 -0.499,0.591 -1.025,1.163 -1.531,1.75 -0.796,0.925 -1.594,1.835 -2.406,2.75 -0.483,0.545 -0.95,1.085 -1.438,1.625 -0.323,0.357 -0.643,0.707 -0.969,1.063 -0.599,0.655 -1.207,1.321 -1.813,1.969 -0.219,0.234 -0.436,0.485 -0.656,0.719 -0.723,0.767 -1.456,1.525 -2.188,2.281 -0.106,0.11 -0.237,0.203 -0.344,0.313 -0.713,0.734 -1.403,1.463 -2.125,2.188 -0.128,0.129 -0.247,0.278 -0.375,0.406 l -0.063,0.063 c -0.834,0.834 -1.689,1.619 -2.531,2.438 -0.632,0.613 -1.268,1.238 -1.906,1.844 -0.233,0.222 -0.453,0.435 -0.688,0.656 -0.524,0.493 -1.066, 1.012 -1.594,1.5 -0.353,0.328 -0.708,0.644 -1.063,0.969 -0.388,0.355 -0.766,0.711 -1.156,1.063 -0.501,0.453 -0.996,0.896 -1.5,1.344 -3.812,3.392 -7.719,6.641 -11.688,9.75 -7.030,5.507 -14.289,10.537 -21.75,15.156 -5.081,3.145 -10.25,6.081 -15.5,8.813 z M 188.25,204.906 c 0.025-0.385 0.061-0.772 0.094-1.156 0.152-1.773 0.369-3.509 0.656-5.281 0.201-1.237 0.451-2.484 0.719-3.719 0.008-0.035 0.024-0.059 0.031-0.094 0.105-0.483 0.165-0.955 0.281-1.438 0.070-0.295 0.145-0.613 0.219-0.906 0.054-0.212 0.1-0.444 0.156-0.656 0.013-0.051 0.049-0.073 0.063-0.125 0.229-0.868 0.459-1.74 0.719-2.594 0.007-0.023 0.017-0.046 0.031-0.063 0.009-0.010 0.027-0.017 0.031-0.031 0.015-0.048 0.016-0.077 0.031-0.125 0.004-0.012 0.028-0.020 0.031-0.031 0.131-0.424 0.262-0.857 0.406-1.281 0.108-0.335 0.228-0.665 0.344-1 0.077-0.218 0.141-0.439 0.219-0.656 0.116-0.333 0.222-0.674 0.344-1 0.169-0.45 0.344-0.902 0.531-1.344 0.028-0.070 0.066-0.149 0.094-0.219 0.059-0.139 0.099-0.266 0.156-0.406 0.029-0.0 70 0.065-0.149 0.094-0.219 0.107-0.284 0.226-0.569 0.344-0.844 0.651-1.528 1.341-2.997 2.094-4.469 0.138-0.271 0.297-0.512 0.438-0.781 0.025-0.047 0.038-0.109 0.063-0.156 0.033-0.063 0.060-0.124 0.094-0.188 0.178-0.334 0.351-0.665 0.531-1 0.159-0.29 0.337-0.556 0.5-0.844 0.104-0.185 0.205-0.379 0.313-0.563 0.009-0.004 0.023-0.028 0.031-0.031 0.145-0.249 0.29-0.503 0.438-0.75 0.237-0.398 0.474-0.796 0.719-1.188 0.112-0.178 0.2-0.386 0.313-0.563 0.032-0.050 0.093-0.106 0.125-0.156 0.038-0.059 0.087-0.097 0.125-0.156 0.466-0.721 0.916-1.455 1.406-2.156 0.134-0.192 0.271-0.373 0.406-0.563 0.433-0.605 0.863-1.221 1.313-1.813 0.055-0.072 0.133-0.116 0.188-0.188 0.155-0.202 0.312-0.394 0.469-0.594 0.664-0.846 1.333-1.691 2.031-2.5 0.698-0.808 1.426-1.603 2.156-2.375 0.651-0.688 1.294-1.339 1.969-2 0.169-0.166 0.329-0.336 0.5-0.5 0.125-0.12 0.28-0.255 0.406-0.375 0.103-0.098 0.209-0.184 0.313-0.281 0.039-0.036 0.055-0.089 0.094-0.125 0.306-0.286 0.62-0.567 0.938-0.844 l 8.063,36.75 c -0.327,0.797 -0.626,1.566 -0.906,2.375 -0.14,0.405 -0.278,0.811 -0.406,1.219 -0.037,0.118 -0.089,0.257 -0.125,0.375 -0.017,0.055 -0.015,0.101 -0.031,0.156 -0.319,1.063 -0.608,2.138 -0.844,3.219 -0.122,0.558 -0.213,1.126 -0.313,1.688 -0.146,0.822 -0.271,1.644 -0.375,2.469 l -28.625,0.094 z m 142.344-7.656 -26.625-44.063 c 0.338,0.264 0.667,0.544 1,0.813 0.814,0.656 1.625,1.312 2.406,2 0.786,0.693 1.56,1.433 2.313,2.156 1.523,1.465 2.997,2.98 4.375,4.563 0.694,0.797 1.344,1.613 2,2.438 0.64,0.805 1.271,1.577 1.875,2.406 0.013,0.018 0.019,0.045 0.031,0.063 0.618,0.85 1.234,1.75 1.813,2.625 0.424,0.64 0.847,1.253 1.25,1.906 0.008,0.004 -0.009,0.027 0,0.031 0.030,0.049 0.033,0.107 0.063,0.156 0.264,0.43 0.526,0.877 0.781,1.313 0.025,0.043 0.067,0.083 0.094,0.125 0.093,0.146 0.194,0.285 0.281,0.438 0.112,0.196 0.202,0.397 0.313,0.594 0.16,0.285 0.311,0.557 0.469,0.844 0.032,0.058 0.062,0.129 0.094,0.188 0.168,0.307 0.339,0.598 0.5,0.906 0.029,0.055 0.065,0.132 0.094,0.188 0.148, 0.285 0.266,0.59 0.406,0.875 0.113,0.229 0.265,0.426 0.375,0.656 0.143,0.293 0.267,0.611 0.406,0.906 0.045,0.096 0.081,0.185 0.125,0.281 0.355,0.763 0.703,1.535 1.031,2.313 0.005,0.012 0.026,0.019 0.031,0.031 0.133,0.315 0.247,0.652 0.375,0.969 0.090,0.222 0.194,0.433 0.281,0.656 0.247,0.628 0.458,1.27 0.688,1.906 0.008,0.021 0.022,0.042 0.031,0.063 0.018,0.050 0.045,0.106 0.063,0.156 0.037,0.104 0.088,0.208 0.125,0.313 0.153,0.435 0.291,0.878 0.438,1.313 0.017,0.050 0.046,0.106 0.063,0.156 0.112,0.334 0.238,0.661 0.344,1 0.005,0.012 -0.004,0.050 0,0.063 0.004,0.013 -0.004,0.019 0,0.031 0.009,0.030 0.022,0.064 0.031,0.094 0.278,0.902 0.507,1.802 0.75,2.719 0.003,0.008 0.029,0.023 0.031,0.031 0.139,0.525 0.279,1.035 0.406,1.563 0.104,0.433 0.185,0.877 0.281,1.313 0.213,0.962 0.42,1.93 0.594,2.906 z" /> -<glyph unicode="" d="M 260.625,477.656 m0,0,c -16.641,0 -30.125-13.992 -30.125-31.281 0-17.289 13.484-31.313 30.125-31.313 16.641,0 30.125,14.024 30.125,31.313 0,17.289 -13.484,31.281 -30.125,31.281 z m -51.563-32.031 c -11.236,0 -20.281-9.39 -20.281-21.063 l 0-78.25 c 0-11.673 9.046-21.063 20.281-21.063 l 100.813,0 c 11.236,0 20.281,9.39 20.281,21.063 l 0,78.25 c 0,11.673 -9.046,21.063 -20.281,21.063 l -4.094,0 c -0.38-25.593 -20.432-46.219 -45.156-46.219 -24.724,0 -44.808,20.626 -45.188,46.219 l -6.375,0 z m -94.625-48.563 C 105.318,397.062 98,391.167 98,383.844 l 0-402.625 c 0-7.324 7.318-13.219 16.438-13.219 l 286.344,0 c 9.119,0 16.469,5.895 16.469,13.219 l 0,402.625 c 0,7.323 -7.349,13.219 -16.469,13.219 l -46,0 0-46.563 4.563,0 c 6.23,0 11.281-5.519 11.281-12.375 l 0-311.188 c 0-6.856 -5.051-12.375 -11.281-12.375 l -203.469,0 c -6.23,0 -11.25,5.519 -11.25,12.375 l 0,311.188 c 0,6.856 5.020,12.375 11.25,12.375 l 8.281,0 0,46.563 -49.719,0 z m 147.125-189.656 c -11.536,0 -20.875-9.008 -20.875-20.125 0-11.117 9.339-20.125 20.875-20.125 11.536,0 20.906,9.008 20.906,20.125 0,11.117 -9.37,20.125 -20.906,20.125 z m 28.844-9.594 c 1.293-3.279 2-6.815 2-10.531 0-3.001 -0.485-5.894 -1.344-8.625 l 44.969,0 c 7.202,0 13,4.283 13,9.594 0,5.31 -5.798,9.563 -13,9.563 l -45.625,0 z m -47.5-34.219 -31.594-86.438 c -2.393-6.546 -0.104-13.236 5.094-15 5.198-1.764 11.295,2.079 13.688,8.625 l 31.719,86.781 c -0.087-0.001 -0.163,0 -0.25,0 -7.008,0 -13.478,2.236 -18.656,6.031 z" /> -<glyph unicode="" d="M 66,478.281 C 62.676,478.281 60,475.605 60,472.281 L 60,275.781 L 200.813,275.781 L 200.813,359.125 C 200.813,371.224 211.057,381.469 223.156,381.469 L 351.438,381.469 L 351.438,472.281 C 351.438,475.605 348.762,478.281 345.438,478.281 L 66,478.281 z M 225.156,363.125 C 221.832,363.125 219.156,360.449 219.156,357.125 L 219.156,273.75 L 284.031,273.75 C 296.13,273.75 306.375,263.505 306.375,251.406 L 306.375,71.687 L 504.594,71.687 C 507.918,71.687 510.594,74.364 510.594,77.687 L 510.594,357.125 C 510.594,360.449 507.918,363.125 504.594,363.125 L 225.156,363.125 z M 6,259.437 C 2.676,259.437 0,256.762 0,253.437 L 0-26 C 0-29.324 2.676-32 6-32 L 285.438-32 C 288.762-32 291.438-29.324 291.438-26 L 291.438,253.437 C 291.438,256.762 288.762,259.437 285.438,259.437 L 6,259.437 z M 124.281,186.844 L 167.125,186.844 C 168.394,186.184 169.281,184.835 169.281,183.25 L 169.281,138.312 L 212.5,138.437 C 214.652,138.445 216.399,136.644 216.406,134.406 L 216. 531,93.469 C 216.538,91.231 214.777,89.413 212.625,89.406 L 169.281,89.281 L 169.281,44.187 C 169.281,41.95 167.558,40.156 165.406,40.156 L 126,40.156 C 123.848,40.156 122.125,41.95 122.125,44.187 L 122.125,89.094 L 78.906,88.969 C 76.754,88.962 75.038,90.762 75.031,93 L 74.906,133.969 C 74.9,136.206 76.629,137.993 78.781,138 L 122.125,138.125 L 122.125,183.25 C 122.125,184.835 123.012,186.184 124.281,186.844 z " /> -<glyph unicode="" d="M 86.76,478.023 m0,0,c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-47.261 67.159,0 0,47.261 c 0,13.026 -7.818,23.513 -17.546,23.513 l -32.066,0 z m 150.218,0 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-201.505 67.159,0 0,201.505 c 0,13.026 -7.818,23.513 -17.546,23.513 l -32.066,0 z m 150.218,0 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-83 67.159,0 0,83 c 0,13.026 -7.818,23.513 -17.546,23.513 l -32.066,0 z M 67.274,389.615 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-131.672 c 0-13.026 7.818-23.513 17.546-23.513 l 71.038,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,131.672 c 0,13.026 -7.818,23.513 -17.546,23.513 l -71.038,0 z m -0.088-35.74 71.215,0 0-10.757 -71.215,0 0,10.757 z m 300.524,0 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-131.672 c 0-13.026 7.818-23.513 17.546-23.513 l 71.038,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,131.672 c 0,13.026 -7.818,23.513 -17.546,23.513 l -71.038,0 z m -0.088-35.74 71.215,0 0-10.757 -71.215,0 0,10.757 z m -300.436-7.524 71.215,0 0-10.757 -71.215,0 0,10.757 z m 300.436-35.74 71.215,0 0-10.757 -71.215,0 0,10.757 z m -300.436-7.524 71.215,0 0-10.757 -71.215,0 0,10.757 z m 150.306-31.977 c -9.728,0 -17.546-10.487 -17.546-23.513 l 0-131.672 c 0-13.026 7.818-23.513 17.546-23.513 l 71.038,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,131.672 c 0,13.026 -7.818,23.513 -17.546,23.513 l -71.038,0 z m 150.13-3.762 71.215,0 0-10.757 -71.215,0 0,10.757 z m -150.218-31.978 71.215,0 0-10.757 -71.215,0 0,10.757 z m -148.19-6.348 0-201.77 c 0-13.026 7.818-23.513 17.546-23.513 l 32.066,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,201.77 -67.159,0 z m 300.436-35.74 0-166.030 c 0-13.026 7.818-23.513 17.546-23.513 l 32.066,0 c 9.728,0 17.546,10.487 17.546,23.513 l 0,166.030 -67.159,0 z m -152.246-1.176 71.215,0 0-10.757 -71.215,0 0,10.757 z m 0-43.264 71.215,0 0-10.757 -71.215,0 0,10.757 z m 2.028-74.066 0-47.525 c 0-13.026 7.818-23.513 17.546-23.513 l 32.066,0 c 9.728,0 17.546,10.487 17.546,23.51 3 l 0,47.525 -67.159,0 z" /> -<glyph unicode="" d="M 37.031,478.031 m0,0,c -9.728,0 -17.563-10.505 -17.563-23.531 l 0-47.25 67.156,0 0,47.25 c 0,13.026 -7.803,23.531 -17.531,23.531 l -32.063,0 z m 150.219,0 c -9.728,0 -17.563-10.505 -17.563-23.531 l 0-201.5 67.094,0 c 0.021,0.020 0.041,0.042 0.063,0.063 l 0,201.438 c 0,13.026 -7.803,23.531 -17.531,23.531 l -32.063,0 z m 150.219,0 c -9.728,0 -17.563-10.505 -17.563-23.531 l 0-83 67.156,0 0,83 c 0,13.026 -7.803,23.531 -17.531,23.531 l -32.063,0 z M 17.531,389.625 C 7.803,389.625 0,379.119 0,366.094 l 0-131.656 c 0-13.026 7.803-23.531 17.531-23.531 l 71.031,0 c 9.728,0 17.563,10.505 17.563,23.531 l 0,131.656 c 0,13.026 -7.834,23.531 -17.563,23.531 l -71.031,0 z m -0.094-35.75 71.219,0 0-10.75 -71.219,0 0,10.75 z m 300.531,0 c -9.728,0 -17.531-10.474 -17.531-23.5 l 0-52 c 7.831,12.16 21.751,20.719 36.719,20.719 l 41.969,0 c 10.082,0 19.769-3.351 27.438-9.406 l 0,40.688 c 0,13.026 -7.834,23.5 -17.563,23.5 l -71.031,0 z m -0.094-35.75 71.219,0 0-10.75 -71.219,0 0,10.75 z m -300.438-7.5 71.219,0 0-10.781 -71.219,0 0,10.781 z m 0-43.281 71.219,0 0-10.75 -71.219,0 0,10.75 z m 319.719-4.813 c -3.402,0 -6.025-2.289 -6.781-5.313 -3.024-11.339 -4.177-23.597 -5.5-35.125 -5.858-1.89 -11.707-4.353 -17.188-7.188 l -26.094,20.219 c -1.512,1.134 -3.205,1.875 -4.906,1.875 -6.425,0 -31.933-27.576 -36.469-33.813 -0.945-1.323 -1.688-2.643 -1.688-4.344 0-1.701 0.741-3.208 1.875-4.531 6.992-8.504 13.793-17.023 20.219-26.094 -3.024-5.669 -5.485-11.328 -7.375-17.375 l -35.156-5.313 C 215.259,144.964 213,141.585 213,138.75 l 0-41.969 c 0-3.213 2.256-6.246 5.469-6.813 l 34.594-5.094 c 1.89-6.425 4.537-12.671 7.75-18.719 -6.425-8.882 -13.418-17.182 -19.844-25.875 -0.945-1.323 -1.5-2.643 -1.5-4.344 0-1.512 0.368-3.021 1.313-4.344 7.937-10.961 21.172-22.679 31.188-31.75 1.323-1.323 3.018-2.094 4.719-2.094 1.701,0 3.396,0.585 4.719,1.719 l 26.656,20.219 c 5.48-2.835 11.142-5.11 17-7 l 5.313-34.781 c 0.378-3.213 3.38-5.656 6.781-5.656 l 41.969,0 c 3 .402,0 6.025,2.258 6.781,5.281 3.024,11.339 4.177,23.628 5.5,35.156 5.858,1.89 11.707,4.353 17.188,7.188 l 26.094-20.406 c 1.512-0.945 3.205-1.719 4.906-1.719 6.425,0 31.933,27.796 36.469,33.844 1.134,1.323 1.688,2.643 1.688,4.344 0,1.701 -0.741,3.396 -1.875,4.719 -6.992,8.504 -13.793,16.834 -20.219,26.094 3.024,5.48 5.296,11.14 7.375,17.188 L 498,89.219 c 3.024,0.567 5.281,3.978 5.281,6.813 l 0,41.938 c 0,3.213 -2.287,6.246 -5.5,6.813 l -34.563,5.281 c -1.89,6.236 -4.537,12.484 -7.75,18.531 6.425,8.882 13.418,17.213 19.844,25.906 0.945,1.323 1.5,2.643 1.5,4.344 0,1.512 -0.368,3.022 -1.313,4.156 -7.937,11.15 -21.172,22.865 -31.188,32.125 -1.323,1.134 -3.018,1.875 -4.719,1.875 -1.701,0 -3.397-0.554 -4.531-1.688 l -26.844-20.219 c -5.48,2.835 -11.142,5.11 -17,7 l -5.313,34.75 c -0.378,3.213 -3.38,5.688 -6.781,5.688 l -41.969,0 z M 167.75,235.375 c -9.728,0 -17.531-10.505 -17.531-23.531 l 0-131.656 c 0-13.026 7.803-23.5 17.531-23.5 l 34.969,0 C 186.152,63.49 176.438,79.423 176. 438,96.781 l 0,5.563 -8.781,0 0,10.75 8.781,0 0,25.625 c 0,2.467 0.158,4.761 0.469,6.906 l -9.25,0 0,10.75 12.406,0 c 1.314,2.851 2.94,5.482 4.781,8.031 4.437,6.144 10.955,12.571 21.594,15.844 -1.274,2.618 -2.412,5.504 -3.219,8.625 l -35.563,0 0,10.75 34.313,0 c 0.254,12.161 6.263,21.68 8.5,24.813 l 0.094,0.125 0.094,0.125 c 2.856,3.927 5.66,7.33 8.688,10.688 l -51.594,0 z m -148.281-42.094 0-201.781 c 0-13.026 7.834-23.5 17.563-23.5 l 32.063,0 c 9.728,0 17.531,10.474 17.531,23.5 l 0,201.781 -67.156,0 z M 358.125,165.75 c 26.646,0 48.406-21.729 48.406-48.375 0-26.646 -21.76-48.375 -48.406-48.375 -26.646,0 -48.375,21.729 -48.375,48.375 0,26.646 21.729,48.375 48.375,48.375 z m 0-36.563 c -6.759,0 -11.813-5.053 -11.813-11.813 0-6.759 5.053-11.781 11.813-11.781 6.759,0 11.813,5.022 11.813,11.781 0,6.759 -5.053,11.813 -11.813,11.813 z m -188.438-90.156 0-47.531 c 0-13.026 7.834-23.5 17.563-23.5 l 32.063,0 c 7.552,0 13.92,6.329 16.406,15.25 -7.922,7.295 -16.76,16.1 -24.563,26.875 l -0.063,0.094 -0.063,0.125 c -5.924,8.294 -8.156,17.986 -8.156,25.594 0,1.030 0.090,2.057 0.188,3.094 l -33.375,0 z" /> -<glyph unicode="" d="M 74.063,479.219 C 56.364,479.219 42,464.921 42,447.281 L 42-0.031 C 42-17.671 56.364-32 74.063-32 L 437.375-32 C 455.074-32 469.438-17.671 469.438-0.031 L 469.438,282.687 L 286.656,282.687 C 272.478,285.786 261.875,298.424 261.875,313.531 C 261.875,369.556 262.536,424.285 262,479.219 L 74.063,479.219 z M 303.313,477.094 L 303.313,323.125 L 464.406,323.125 C 460.212,334.621 453.822,345.702 446.75,352.75 L 342.531,456.562 C 333.517,465.547 317.959,473.466 303.313,477.094 z M 85,344.844 L 132.438,344.844 L 163.406,303.5 L 197.563,344.844 L 227.594,344.844 L 177.656,284.156 L 238.219,202.844 L 190.656,202.844 L 152.625,254 L 110.438,202.844 L 80.438,202.844 L 138.531,273.219 L 85,344.844 z M 82.063,164.437 L 429.406,164.437 L 429.406,142.219 L 82.063,142.219 L 82.063,164.437 z M 195.906,107.125 C 200.434,107.125 204.772,106.639 208.938,105.625 C 213.103,104.611 217.098,103.086 220.938,101.094 L 220.938,84.312 C 217.061,86.957 213.267,88.893 209.5,90 .125 C 205.733,91.357 201.76,91.969 197.594,91.969 C 190.131,91.969 184.243,89.594 179.969,84.812 C 175.694,80.031 173.562,73.435 173.563,65.031 C 173.562,56.663 175.694,50.094 179.969,45.312 C 184.243,40.531 190.131,38.125 197.594,38.125 C 201.76,38.125 205.733,38.737 209.5,39.969 C 213.267,41.2 217.061,43.137 220.938,45.781 L 220.938,29 C 217.098,27.008 213.103,25.514 208.938,24.5 C 204.772,23.486 200.434,22.969 195.906,22.969 C 182.394,22.969 171.678,26.747 163.781,34.281 C 155.884,41.852 151.938,52.099 151.938,65.031 C 151.938,78 155.884,88.246 163.781,95.781 C 171.678,103.352 182.394,107.125 195.906,107.125 z M 268.594,107.125 C 273.049,107.125 277.635,106.782 282.344,106.094 C 287.053,105.442 291.933,104.465 296.969,103.125 L 296.969,85.937 C 292.513,87.93 288.176,89.423 283.938,90.437 C 279.699,91.452 275.674,91.969 271.906,91.969 C 266.907,91.969 263.235,91.283 260.844,89.906 C 258.453,88.53 257.25,86.398 257.25,83.5 C 257.25,81.326 258.031,79.607 259.625,78.375 C 26 1.255,77.18 264.199,76.151 268.438,75.281 L 277.344,73.5 C 286.364,71.689 292.79,68.945 296.594,65.25 C 300.397,61.555 302.281,56.279 302.281,49.469 C 302.281,40.521 299.637,33.883 294.313,29.5 C 289.024,25.153 280.904,22.969 270,22.969 C 264.856,22.969 259.711,23.459 254.531,24.437 C 249.351,25.416 244.18,26.861 239,28.781 L 239,46.437 C 244.18,43.684 249.182,41.6 254,40.187 C 258.854,38.811 263.508,38.125 268,38.125 C 272.564,38.125 276.073,38.885 278.5,40.406 C 280.927,41.928 282.125,44.112 282.125,46.937 C 282.125,49.473 281.291,51.405 279.625,52.781 C 277.995,54.158 274.739,55.413 269.813,56.5 L 261.688,58.281 C 253.573,60.020 247.642,62.79 243.875,66.594 C 240.144,70.397 238.281,75.521 238.281,81.969 C 238.281,90.047 240.877,96.278 246.094,100.625 C 251.31,104.972 258.813,107.125 268.594,107.125 z M 311.031,105.656 L 332.063,105.656 L 353.594,45.781 L 375.063,105.656 L 396.063,105.656 L 366.031,24.531 L 341.094,24.531 L 311.031,105.656 z M 115.375,45.562 L 134.938,45.5 62 L 134.938,24.531 L 115.375,24.531 L 115.375,45.562 z " /> -<glyph unicode="" d="M 361.329,431.537 m0,0,c -3.033,0 -5.405-2.022 -6.079-4.719 -2.696-10.111 -3.705-21.085 -4.885-31.364 -5.224-1.685 -10.434-3.856 -15.321-6.384 l -23.26,18.014 c -1.348,1.011 -2.869,1.693 -4.385,1.693 -5.73,0 -28.486-24.61 -32.53-30.171 -0.843-1.18 -1.499-2.341 -1.499-3.858 0-1.517 0.654-2.873 1.665-4.052 6.235-7.583 12.312-15.171 18.041-23.26 -2.696-5.056 -4.893-10.123 -6.578-15.516 l -31.337-4.719 c -2.528-0.506 -4.552-3.523 -4.552-6.051 l 0-37.415 c 0-2.865 2.020-5.573 4.885-6.079 l 30.837-4.524 c 1.685-5.73 4.046-11.317 6.911-16.709 -5.73-7.92 -11.951-15.313 -17.681-23.065 -0.843-1.18 -1.36-2.369 -1.36-3.886 0-1.348 0.351-2.706 1.194-3.886 7.078-9.774 18.852-20.222 27.784-28.311 1.18-1.18 2.702-1.832 4.219-1.832 1.517,0 3.039,0.488 4.219,1.499 l 23.759,18.041 c 4.887-2.528 9.931-4.56 15.155-6.245 l 4.719-31.004 c 0.337-2.865 3.045-5.052 6.079-5.052 l 37.415,0 c 3.033,0 5.377,2.022 6.051,4.719 2.696,10.111 3.733,21.057 4.913,31.337 5.224,1.685 10.434,3.884 15.321,6.412 l 23.26-18.208 c 1.348-0.843 2.869-1.499 4.385-1.499 5.73,0 28.486,24.751 32.53,30.143 1.011,1.18 1.499,2.369 1.499,3.886 0,1.517 -0.682,3.039 -1.693,4.219 -6.235,7.583 -12.284,15.002 -18.014,23.26 2.696,4.887 4.724,9.929 6.578,15.321 l 31.17,4.719 c 2.696,0.506 4.719,3.551 4.719,6.079 l 0,37.415 c 0,2.865 -2.020,5.545 -4.885,6.051 l -30.837,4.719 c -1.685,5.561 -4.046,11.122 -6.911,16.515 5.73,7.92 11.951,15.341 17.681,23.093 0.843,1.18 1.36,2.369 1.36,3.886 0,1.348 -0.351,2.68 -1.194,3.692 -7.078,9.943 -18.852,20.387 -27.784,28.644 -1.18,1.011 -2.702,1.693 -4.219,1.693 -1.517,0 -3.041-0.515 -4.052-1.527 l -23.926-18.014 c -4.887,2.528 -9.959,4.532 -15.183,6.217 l -4.719,31.031 c -0.337,2.865 -3.017,5.052 -6.051,5.052 l -37.415,0 z M 107.833,385.49 C 48.267,385.49 0,337.195 0,277.629 c 0-59.565 48.267-107.833 107.833-107.833 7.318,0 14.464,0.721 21.372,2.109 l 213.667-152.881 c 5.122-3.665 11.088-4.18 14.489-0.555 l 27.118,28.922 c 3.4,3.624 -1.09 0,8.158 -2.831,14.211 l -12.74,44.326 -38.859,2.859 -2.193,40.913 -39.247-0.749 -3.858,39.691 -38.914-3.553 8.133,51.904 -37.471-3.497 -6.523,9.382 c 3.71,10.906 5.718,22.59 5.718,34.751 0,59.565 -48.295,107.86 -107.86,107.86 z m -15.46-34.778 c 25.928,0 46.936-21.007 46.936-46.936 0-25.928 -21.007-46.936 -46.936-46.936 -25.928,0 -46.963,21.007 -46.963,46.936 0,25.928 21.035,46.936 46.963,46.936 z m 287.664-5.468 c 23.761,0 43.133-19.372 43.133-43.133 0-23.761 -19.372-43.133 -43.133-43.133 -23.761,0 -43.133,19.372 -43.133,43.133 0,23.761 19.372,43.133 43.133,43.133 z" /> -<glyph unicode="" d="M 367.188,480.094 C 287.688,480.094 223.25,415.625 223.25,336.125 C 223.25,256.625 287.688,192.187 367.188,192.187 C 446.687,192.187 511.125,256.625 511.125,336.125 C 511.125,415.625 446.687,480.094 367.188,480.094 z M 351.031,405.437 L 383.375,405.437 C 386.103,405.437 388.313,403.228 388.313,400.5 L 388.313,357.25 L 431.563,357.25 C 434.29,357.25 436.469,355.040 436.469,352.312 L 436.469,319.969 C 436.469,317.241 434.29,315.031 431.563,315.031 L 388.313,315.031 L 388.313,271.781 C 388.313,269.053 386.103,266.844 383.375,266.844 L 351.031,266.844 C 348.303,266.844 346.094,269.053 346.094,271.781 L 346.094,315.031 L 302.813,315.031 C 300.085,315.031 297.906,317.241 297.906,319.969 L 297.906,352.312 C 297.906,355.040 300.085,357.25 302.813,357.25 L 346.094,357.25 L 346.094,400.5 C 346.094,403.228 348.303,405.437 351.031,405.437 z M 35.813,340.437 C 16.116,340.437 0,324.322 0,304.625 L 0,61.125 C 0,41.428 16.116,25.312 35.813,25.312 L 157.563,25.31 2 C 157.563,5.84 143.25-9.406 143.25-17.688 C 143.25-25.521 149.729-32 157.563-32 L 272.188-32 C 280.021-32 286.5-25.521 286.5-17.688 C 286.5-9.854 272.188,6.287 272.188,25.312 L 393.938,25.312 C 413.634,25.312 429.75,41.428 429.75,61.125 L 429.75,167.281 C 420.531,163.865 410.954,161.16 401.094,159.281 L 401.094,118.406 C 401.094,114.601 397.743,111.25 393.938,111.25 L 35.813,111.25 C 32.007,111.25 28.656,114.601 28.656,118.406 L 28.656,304.625 C 28.656,308.43 32.007,311.781 35.813,311.781 L 188.781,311.781 C 187.703,319.75 187.156,327.861 187.156,336.125 C 187.156,337.564 187.185,339.007 187.219,340.437 L 35.813,340.437 z " /> -<glyph unicode="" d="M 424.011,478.557 m0,0,c -23.803-0.244 -48.529-10.235 -67.87-29.604 l -67.496-67.559 124.46-124.211 67.434,67.496 c 36.407,36.458 39.606,91.942 7.105,124.398 l -7.105,7.105 c -15.235,15.214 -35.525,22.59 -56.528,22.374 z M 42.902,392.987 c -15.399,0 -27.796-12.398 -27.796-27.796 l 0-207.725 30.040,29.978 0,156.682 c 0,9.022 7.013,16.439 15.955,17.326 0.596,0.059 1.133,0 1.745,0 l 155.622,0 31.598,31.536 -207.164,0 z M 263.84,356.528 121.804,214.305 246.264,90.032 388.237,232.254 263.84,356.528 z m -4.737-35.587 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.709 -17.534-6.717 -24.244,0 -6.71,6.7 -6.762,17.597 -0.062,24.306 3.35,3.355 7.747,5.047 12.153,5.048 z m 235.77-23.371 -30.102-29.978 0-156.682 c 0-9.022 -7.013-16.502 -15.955-17.388 -0.596-0.059 -1.133,0 -1.745,0 l -155.56,0 -31.598-31.473 207.164,0 c 15.399,0 27.796,12.398 27.796,27.796 l 0,207.725 z m -197.566-14.771 c 4.406,0.006 8.798-1.645 12.153-4.986 6.71 -6.7 6.639-17.597 -0.062-24.306 -6.7-6.71 -17.534-6.717 -24.244,0 -6.698,6.689 -6.728,17.531 -0.062,24.244 3.35,3.355 7.809,5.043 12.215,5.048 z m -81.083-4.799 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.701-17.597 0-24.306 -6.7-6.71 -17.534-6.683 -24.244,0 -6.71,6.7 -6.763,17.534 -0.062,24.244 l 0,0.062 c 3.35,3.355 7.747,5.047 12.153,5.048 z m 117.792-31.91 c 4.397,0.012 8.798-1.635 12.153-4.986 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.71 -17.534-6.717 -24.244,0 -6.71,6.7 -6.762,17.534 -0.062,24.244 l 0.062,0 c 3.35,3.355 7.694,5.036 12.091,5.048 z m -79.587-6.232 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.639-17.534 -0.062-24.244 -6.7-6.709 -17.534-6.717 -24.244,0 -6.71,6.7 -6.763,17.534 -0.062,24.244 3.35,3.355 7.809,5.047 12.215,5.048 z m -81.083-4.799 c 4.406,0.006 8.798-1.645 12.153-4.986 6.71-6.7 6.702-17.596 0-24.306 -6.7-6.709 -17.534-6.745 -24.244-0.062 -6.71,6.7 -6.763,17.597 -0.062,24.306 3.35,3.355 7.747,5.043 12.153,5.048 z m 117.792-31.91 c 4.397,0.0 12 8.798-1.635 12.153-4.986 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.709 -17.534-6.682 -24.244,0 -6.71,6.7 -6.699,17.534 0,24.244 3.35,3.355 7.694,5.036 12.091,5.048 z m -79.587-6.232 c 4.406,0.001 8.798-1.69 12.153-5.048 6.71-6.7 6.701-17.534 0-24.244 -6.7-6.71 -17.597-6.745 -24.306-0.062 -6.71,6.7 -6.762,17.596 -0.062,24.306 3.35,3.355 7.809,5.047 12.215,5.048 z m -114.613-7.479 -67.434-67.559 c -36.407-36.458 -39.544-91.942 -7.043-124.398 l 7.105-7.105 c 32.501-32.456 87.991-29.229 124.398,7.229 L 221.397,65.165 96.937,189.438 z m 151.322-29.23 c 4.397,0.012 8.798-1.635 12.153-4.986 6.71-6.7 6.701-17.596 0-24.306 -6.7-6.709 -17.534-6.682 -24.244,0 -6.71,6.7 -6.699,17.534 0,24.244 3.35,3.355 7.694,5.036 12.091,5.048 z" /> -<glyph unicode="" d="M 312.772,543.030 312.807,543.065 312.772,543.030 zM 255.232,478.496 C 114.252,478.496 0,364.244 0,223.264 c 0-140.963 114.252-255.264 255.232-255.264 140.98,0 255.232,114.301 255.232,255.264 0,140.98 -114.252,255.232 -255.232,255.232 z m -66.526-108.148 c 6.384-0.917 142.641-21.142 199.957-54.58 7.107-4.144 10.638-8.485 15.012-13.052 15.837-16.384 36.823-84.562 39.062-98.635 l -0.853-1.454 c -0.829-0.317 -2.84-1.692 -5.467-3.508 -13.297-9.382 -44.605-31.3 -84.761-27.685 -36.1,3.21 -83.172,23.839 -139.942,61.28 2.451-5.908 14.315-33.858 16.308-38.62 l 0.758-0.948 c 8.201-4.215 87.123-44.47 126.257-43.676 31.55,0.6 65.413,16.033 78.851,24.145 1.376,0.829 2.989,1.703 4.33,0.822 1.093-0.935 0.925-2.759 0.537-4.488 -0.829-3.88 -2.667-10.945 -3.919-14.19 l -1.075-2.781 c -1.623-4.109 -2.979-8.013 -5.942-10.429 -7.918-7.16 -20.637-12.937 -40.548-21.649 -30.721-13.35 -80.556-21.895 -126.921-21.649 -16.613,0.441 -32.612,2.233 -46.774,3.856 -42.502,4.797 -73.413,8.247 -80.432-29.423 -41.744,39.927 -67.853,96.077 -67.853,158.367 0,47.705 15.312,91.822 41.148,127.711 41.744-9.506 72.913-19.643 80.179-22.059 0.070,3.122 0.664,31.414 0.664,31.414 l 0.411,0.98 1.011,0.253 z m 149.359-57.677 c -14.504-0.18 -28.224-5.643 -38.904-15.612 -11.34-10.617 -17.921-24.993 -18.362-40.548 -1.129-32.115 24.042-59.171 56.192-60.3 15.519-0.529 30.303,5.010 41.749,15.644 11.357,10.546 17.857,24.989 18.457,40.579 1.129,32.044 -24.179,59.059 -56.223,60.205 -0.973,0.036 -1.941,0.044 -2.908,0.032 z m 0.411-17.098 c 0.673,0.009 1.345-0.007 2.023-0.032 22.433-0.794 40.014-19.713 39.22-42.128 -0.353-10.811 -4.909-20.864 -12.863-28.254 -7.918-7.425 -18.226-11.263 -29.107-10.84 -22.433,0.794 -40.014,19.667 -39.22,42.065 0.282,10.846 4.874,20.878 12.863,28.285 7.424,6.911 16.983,10.77 27.084,10.903 z m 8.659-20.479 c -9.982,0 -18.077-5.382 -18.077-11.978 0-6.631 8.096-11.978 18.077-11.978 9.947,0 17.983,5.347 17.983,11.978 0,6.596 -8.036,11.978 -17.983,11 .978 z" /> -<glyph unicode="" d="M 256,480 C 114.615,480 0,365.385 0,224 C 0,82.615 114.615-32 256-32 C 289.151-32 320.831-25.689 349.906-14.219 L 264,68.656 L 263.781,68.844 L 263.594,69.062 C 258.893,73.868 252.482,82.464 257,95.094 C 259.259,101.408 264.702,106.249 269.375,108.375 C 274.048,110.501 278.076,110.866 281.781,110.844 L 281.844,110.844 L 281.875,110.844 C 288.466,110.768 294.944,110.763 301.469,110.719 L 301.469,134.562 C 287.81,127.582 272.347,123.656 256,123.656 C 200.719,123.656 155.656,168.719 155.656,224 C 155.656,279.281 200.719,324.344 256,324.344 C 311.281,324.344 356.344,279.281 356.344,224 C 356.344,222.936 356.314,221.869 356.281,220.812 L 434.563,220.812 C 449.794,220.812 462.688,207.919 462.688,192.687 L 462.688,110.875 C 468.582,110.895 474.645,110.932 480.375,110.937 C 480.406,110.938 480.438,110.937 480.469,110.937 C 482.175,110.947 483.854,110.955 485.656,110.781 C 502.517,144.917 512,183.351 512,224 C 512,365.385 397.385,480 256,480 z M 256,300.8 44 C 213.434,300.844 179.156,266.566 179.156,224 C 179.156,181.434 213.434,147.187 256,147.187 C 273.043,147.187 288.757,152.684 301.469,162 L 301.469,192.687 C 301.469,207.919 314.363,220.812 329.594,220.812 L 332.75,220.812 C 332.793,221.868 332.813,222.934 332.813,224 C 332.813,266.566 298.566,300.844 256,300.844 z M 256,267.906 C 280.257,267.906 299.906,248.257 299.906,224 C 299.906,199.743 280.257,180.094 256,180.094 C 231.743,180.094 212.094,199.743 212.094,224 C 212.094,248.257 231.743,267.906 256,267.906 z M 338.938,189.312 C 335.261,189.312 332.313,186.364 332.313,182.687 L 332.313,89.062 C 321.536,89.107 310.676,89.185 299.656,89.312 C 294.012,89.346 293.595,86.003 296.563,82.969 L 372.75,9.469 C 377.518,4.403 386.484,4.113 391.156,9.062 L 466.094,82.312 C 471.088,87.333 470.157,89.42 462.656,89.375 C 452.672,89.365 442.209,89.328 431.656,89.281 L 431.656,182.687 C 431.656,186.364 428.676,189.312 425,189.312 L 338.938,189.312 z " /> -<glyph unicode="" d="M 276.719,478.844 C 261.184,478.684 245.029,472.171 232.406,459.531 L 188.406,415.469 L 269.625,334.344 L 313.625,378.437 C 337.385,402.231 339.461,438.444 318.25,459.625 L 313.594,464.25 C 303.651,474.179 290.425,478.984 276.719,478.844 z M 172.156,399.219 L 79.5,306.406 L 160.719,225.312 L 253.375,318.094 L 172.156,399.219 z M 439.469,389.719 C 419.808,389.517 399.382,381.248 383.406,365.25 L 327.719,309.469 L 430.5,206.812 L 486.219,262.625 C 516.291,292.739 518.877,338.567 492.031,365.375 L 486.156,371.219 C 473.572,383.785 456.817,389.897 439.469,389.719 z M 169.094,375.969 C 171.969,375.969 174.842,374.879 177.031,372.687 C 181.41,368.315 181.405,361.191 177.031,356.812 C 172.659,352.434 165.566,352.429 161.188,356.812 C 156.809,361.185 156.784,368.309 161.156,372.687 C 163.343,374.877 166.218,375.968 169.094,375.969 z M 194,351.094 C 196.876,351.097 199.779,350.024 201.969,347.844 C 206.348,343.471 206.311,336.347 201.938,331.969 C 197.565 ,327.59 190.504,327.585 186.125,331.969 C 181.752,336.336 181.707,343.432 186.063,347.812 C 188.249,350.002 191.124,351.090 194,351.094 z M 141.125,347.937 C 144.001,347.938 146.873,346.848 149.063,344.656 C 153.441,340.283 153.436,333.191 149.063,328.812 C 144.69,324.434 137.598,324.42 133.219,328.781 C 128.84,333.154 128.815,340.246 133.188,344.625 L 133.188,344.656 C 135.374,346.846 138.249,347.937 141.125,347.937 z M 218,327.125 C 220.87,327.133 223.748,326.062 225.938,323.875 C 230.316,319.502 230.28,312.41 225.906,308.031 C 221.534,303.652 214.473,303.648 210.094,308.031 C 205.715,312.404 205.69,319.465 210.063,323.844 C 212.249,326.033 215.13,327.117 218,327.125 z M 166.031,323.062 C 168.907,323.063 171.779,321.973 173.969,319.781 C 178.348,315.408 178.342,308.316 173.969,303.937 C 169.596,299.559 162.504,299.554 158.125,303.937 C 153.746,308.31 153.721,315.403 158.094,319.781 C 160.28,321.971 163.156,323.062 166.031,323.062 z M 113.125,319.937 C 116.001,319.94 118.90 4,318.837 121.094,316.656 C 125.473,312.284 125.436,305.191 121.063,300.812 C 116.69,296.434 109.629,296.42 105.25,300.781 C 100.871,305.154 100.815,312.246 105.188,316.625 C 107.374,318.814 110.249,319.934 113.125,319.937 z M 190.031,299.125 C 192.901,299.133 195.748,298.031 197.938,295.844 C 202.316,291.471 202.311,284.379 197.938,280 C 193.565,275.621 186.473,275.608 182.094,279.969 C 177.715,284.342 177.722,291.434 182.094,295.812 C 184.28,298.002 187.162,299.117 190.031,299.125 z M 138.063,295.062 C 140.938,295.063 143.811,293.942 146,291.75 C 150.379,287.377 150.342,280.285 145.969,275.906 C 141.596,271.527 134.535,271.514 130.156,275.875 C 125.777,280.248 125.752,287.371 130.125,291.75 C 132.311,293.939 135.187,295.062 138.063,295.062 z M 307.156,288.906 L 238.781,220.437 C 244.258,218.596 249.387,215.972 254,212.719 C 254.533,215.331 255.788,217.816 257.813,219.844 L 257.813,219.875 C 260.58,222.646 264.236,224.030 267.875,224.031 C 271.514,224.032 275.135,222.649 27 7.906,219.875 C 283.448,214.341 283.441,205.354 277.906,199.812 C 276.137,198.041 274.026,196.86 271.781,196.219 L 285.75,182.25 C 286.382,184.491 287.581,186.61 289.344,188.375 C 292.111,191.146 295.767,192.53 299.406,192.531 C 303.046,192.532 306.666,191.149 309.438,188.375 C 314.98,182.841 314.973,173.855 309.438,168.312 C 307.659,166.531 305.54,165.324 303.281,164.687 L 316.125,151.875 C 316.759,154.123 317.949,156.259 319.719,158.031 L 319.719,158.062 C 322.486,160.833 326.118,162.209 329.75,162.219 C 333.382,162.229 337.010,160.862 339.781,158.094 C 345.323,152.559 345.316,143.573 339.781,138.031 C 337.988,136.235 335.842,135.040 333.563,134.406 L 345.875,122.094 L 409.969,186.25 L 307.156,288.906 z M 162.031,271.094 C 164.901,271.102 167.779,270.031 169.969,267.844 C 174.348,263.471 174.311,256.348 169.938,251.969 C 165.565,247.59 158.504,247.576 154.125,251.937 C 149.746,256.31 149.753,263.402 154.125,267.781 C 156.311,269.971 159.162,271.086 162.031,271.094 z M 84.4 69,269 C 86.411,263.208 87.25,257.339 87.25,251.719 C 87.25,241.528 86.202,237.539 86.25,239.5 L 86.219,239.25 C 85.73,232.57 85.438,226.291 85.438,220.375 C 85.438,186.364 90.885,181.931 99.5,176.375 C 101.516,175.075 104.387,173.799 108.063,172.594 L 144.5,209.062 L 84.469,269 z M 303.281,259.5 C 306.921,259.501 310.573,258.118 313.344,255.344 C 318.886,249.81 318.848,240.823 313.313,235.281 C 307.778,229.739 298.823,229.733 293.281,235.281 C 287.739,240.816 287.716,249.802 293.25,255.344 C 296.017,258.115 299.642,259.499 303.281,259.5 z M 34.813,258.062 C 32.275,258.062 30.988,256.782 29.719,254.969 C 26.999,251.162 25.025,245.357 23.031,241.187 C 12.698,217.983 0,184.817 0,159.437 C 0,139.134 1.98,118.279 9.594,99.062 C 34.792,36.519 108.757,26 168.219,26 L 208.844,26 L 208.844-20.406 C 208.844-26.751 214.093-32 220.438-32 C 223.519-32 226.418-30.738 228.594-28.563 L 321.406,64.25 C 323.582,66.425 324.875,69.324 324.875,72.406 C 324.875,75.488 323.582,78.387 321.406,80.5 62 L 228.594,173.406 C 226.418,175.582 223.519,176.844 220.438,176.844 C 214.093,176.844 208.844,171.595 208.844,165.25 L 208.844,118.844 L 168.219,118.844 C 90.085,118.844 38.781,133.871 38.781,220.344 C 38.781,227.776 39.144,235.224 39.688,242.656 C 39.869,245.557 40.594,248.818 40.594,251.719 C 40.594,255.163 38.438,258.062 34.813,258.062 z M 334.813,228 C 338.452,228.004 342.104,226.635 344.875,223.875 C 350.417,218.341 350.379,209.354 344.844,203.812 C 339.309,198.27 330.355,198.264 324.813,203.812 C 319.276,209.341 319.263,218.3 324.781,223.844 C 327.548,226.615 331.173,227.996 334.813,228 z M 365.188,197.687 C 368.819,197.697 372.448,196.33 375.219,193.562 C 380.761,188.028 380.723,179.042 375.188,173.5 C 369.653,167.958 360.698,167.952 355.156,173.5 C 349.62,179.029 349.639,187.957 355.156,193.5 C 357.923,196.271 361.556,197.678 365.188,197.687 z " /> -<glyph unicode="" d="M 257.313,478.031 C 213.183,478.414 168.982,467.415 129.469,445.031 C 129.449,445.020 129.426,445.011 129.406,445 C 129.36,444.974 129.327,444.932 129.281,444.906 C 127.469,443.877 125.636,442.827 123.844,441.75 C 122.216,440.772 120.61,439.799 119,438.781 C 118.010,438.156 117.046,437.516 116.063,436.875 C 115.631,436.595 115.179,436.313 114.75,436.031 C 114.601,435.933 114.461,435.849 114.313,435.75 C 113.142,434.977 111.967,434.196 110.813,433.406 C 110.358,433.095 109.889,432.782 109.438,432.469 C 109.238,432.329 109.043,432.171 108.844,432.031 C 107.297,430.952 105.799,429.86 104.281,428.75 C 93.574,420.915 83.58,412.339 74.375,403.094 C 65.611,394.291 57.54,384.888 50.219,375 C 50.068,374.796 49.932,374.611 49.781,374.406 C 48.905,373.222 48.040,372.040 47.188,370.844 C 46.961,370.525 46.725,370.195 46.5,369.875 C 45.469,368.414 44.466,366.947 43.469,365.469 C 43.309,365.23 43.159,364.989 43,364.75 C 41.908,363.12 40.832,361.462 39.781,359. 812 C 28.664,342.351 19.919,323.82 13.469,304.687 C 12.162,300.813 10.927,296.921 9.813,293 C 9.253,291.033 8.699,289.102 8.188,287.125 C 7.674,285.14 7.215,283.15 6.75,281.156 C 6.437,279.813 6.135,278.441 5.844,277.094 C 5.456,275.313 5.069,273.54 4.719,271.75 C 4.372,269.979 4.028,268.217 3.719,266.437 C 3.641,265.987 3.575,265.544 3.5,265.094 C 3.198,263.294 2.951,261.464 2.688,259.656 C 2.392,257.633 2.091,255.626 1.844,253.594 C 1.597,251.565 1.385,249.536 1.188,247.5 C -0.958,225.409 -0.24,202.841 3.594,180.375 C 3.938,178.36 4.325,176.357 4.719,174.344 C 5.109,172.351 5.498,170.365 5.938,168.375 C 5.973,168.212 6.026,168.038 6.063,167.875 C 6.381,166.446 6.718,165.022 7.063,163.594 C 7.545,161.574 8.030,159.573 8.563,157.562 C 14.061,136.791 22.267,116.581 33.094,97.469 C 33.131,97.403 33.15,97.347 33.188,97.281 C 34.217,95.469 35.267,93.667 36.344,91.875 C 37.322,90.247 38.295,88.61 39.313,87 C 39.937,86.006 40.581,85.045 41.219,84.062 C 41.597,83.482 41.96,82.89 42 .344,82.312 C 43.116,81.142 43.898,79.967 44.688,78.812 C 45.137,78.159 45.607,77.494 46.063,76.844 C 47.142,75.297 48.233,73.799 49.344,72.281 C 63.836,52.478 80.937,35.189 99.938,20.656 C 169.454-32.514 264.489-48.488 351.375-13.031 C 396.198,5.26 433.029,34.836 459.875,71.094 C 460.17,71.492 460.457,71.881 460.75,72.281 C 461.674,73.539 462.57,74.792 463.469,76.062 C 463.505,76.114 463.526,76.167 463.563,76.219 C 464.594,77.68 465.628,79.147 466.625,80.625 C 466.738,80.791 466.857,80.989 466.969,81.156 C 467.016,81.228 467.046,81.304 467.094,81.375 C 468.186,83.005 469.231,84.632 470.281,86.281 C 481.399,103.742 490.174,122.274 496.625,141.406 C 497.931,145.281 499.166,149.173 500.281,153.094 C 500.84,155.060 501.364,157.023 501.875,159 C 502.388,160.985 502.879,162.975 503.344,164.969 C 503.608,166.093 503.876,167.215 504.125,168.344 C 504.173,168.564 504.202,168.779 504.25,169 C 504.638,170.78 505.025,172.554 505.375,174.344 C 505.721,176.115 506.035,177.908 506.344,179 .687 C 506.385,179.923 506.46,180.139 506.5,180.375 C 506.536,180.589 506.558,180.817 506.594,181.031 C 506.896,182.831 507.142,184.63 507.406,186.437 C 507.702,188.461 507.972,190.468 508.219,192.5 C 508.465,194.528 508.708,196.588 508.906,198.625 C 511.052,220.716 510.334,243.252 506.5,265.719 C 506.156,267.734 505.769,269.737 505.375,271.75 C 504.985,273.742 504.596,275.76 504.156,277.75 C 504.155,277.758 504.127,277.741 504.125,277.75 C 503.792,279.273 503.455,280.826 503.094,282.344 C 503.080,282.403 503.046,282.441 503.031,282.5 C 502.549,284.52 502.032,286.521 501.5,288.531 C 490.365,330.592 468.325,370.393 435.344,403.375 C 386.128,452.591 321.81,477.471 257.313,478.031 z M 157.438,420.844 L 210.688,343.5 C 193.59,337.593 177.524,327.806 163.875,314.156 C 150.496,300.778 140.813,285.090 134.875,268.375 L 57.406,321.031 C 67.608,342.042 81.461,361.711 98.906,379.156 C 116.469,396.719 136.265,410.621 157.438,420.844 z M 256.125,323.062 C 281.357,322.793 306.496,313.004 325.75,293.75 C 347.166,272.334 356.829,243.633 354.75,215.625 C 354.742,215.522 354.758,215.416 354.75,215.312 C 354.715,214.864 354.666,214.417 354.625,213.969 C 354.555,213.196 354.494,212.428 354.406,211.656 C 354.4,211.605 354.381,211.552 354.375,211.5 C 354.24,210.333 354.051,209.162 353.875,208 C 353.691,206.786 353.479,205.583 353.25,204.375 C 353.021,203.167 352.773,201.95 352.5,200.75 C 352.232,199.573 351.967,198.419 351.656,197.25 C 351.65,197.228 351.631,197.21 351.625,197.187 C 351.494,196.701 351.357,196.203 351.219,195.719 C 351.142,195.447 351.079,195.178 351,194.906 C 350.781,194.162 350.549,193.395 350.313,192.656 C 350.259,192.488 350.211,192.324 350.156,192.156 C 349.966,191.57 349.763,190.989 349.563,190.406 C 349.512,190.26 349.457,190.114 349.406,189.969 C 349.074,189.019 348.736,188.098 348.375,187.156 C 348.305,186.973 348.228,186.776 348.156,186.594 C 347.975,186.131 347.782,185.647 347.594,185.187 C 347.5,184.958 347.408,184.729 347.313,184.5 C 3 37.42,160.809 318.49,140.934 292.844,130.469 C 242.508,109.928 185.121,133.393 163.438,182.906 C 163.093,183.692 162.795,184.451 162.469,185.25 C 162.065,186.24 161.651,187.255 161.281,188.25 C 161.153,188.595 161.030,188.936 160.906,189.281 C 160.506,190.4 160.109,191.527 159.75,192.656 C 159.731,192.714 159.737,192.754 159.719,192.812 C 159.348,193.987 158.983,195.159 158.656,196.344 C 158.652,196.357 158.66,196.393 158.656,196.406 C 158.326,197.605 158.003,198.824 157.719,200.031 C 157.46,201.129 157.221,202.208 157,203.312 C 156.978,203.423 156.959,203.546 156.938,203.656 C 156.933,203.679 156.911,203.696 156.906,203.719 C 156.896,203.77 156.885,203.824 156.875,203.875 C 156.651,205.014 156.464,206.141 156.281,207.281 C 156.264,207.392 156.236,207.514 156.219,207.625 C 156.042,208.75 155.918,209.875 155.781,211 C 155.336,214.681 155.099,218.36 155.063,222.062 C 155.038,224.531 155.093,227.004 155.25,229.469 C 155.329,230.701 155.438,231.927 155.563,233.156 C 155.687,234. 386 155.83,235.619 156,236.844 C 156.116,237.685 156.268,238.505 156.406,239.344 C 156.5,239.911 156.584,240.497 156.688,241.062 C 156.879,242.101 157.089,243.125 157.313,244.156 C 157.331,244.244 157.325,244.319 157.344,244.406 C 157.433,244.811 157.531,245.221 157.625,245.625 C 157.828,246.505 158.054,247.375 158.281,248.25 C 158.553,249.288 158.821,250.316 159.125,251.344 C 159.158,251.455 159.186,251.576 159.219,251.687 C 159.25,251.791 159.281,251.897 159.313,252 C 161.784,260.147 165.307,267.976 169.75,275.25 C 170.992,277.283 172.301,279.275 173.688,281.219 C 173.73,281.279 173.77,281.315 173.813,281.375 C 174.377,282.159 174.973,282.948 175.563,283.719 C 175.761,283.979 175.924,284.242 176.125,284.5 C 176.446,284.911 176.797,285.311 177.125,285.719 C 177.727,286.465 178.342,287.205 178.969,287.937 C 179.657,288.743 180.375,289.555 181.094,290.344 C 181.542,290.837 181.979,291.327 182.438,291.812 C 182.947,292.35 183.445,292.878 183.969,293.406 C 184.085,293.524 184.2 27,293.633 184.344,293.75 C 184.888,294.294 185.447,294.846 186,295.375 C 205.583,314.093 230.893,323.332 256.125,323.062 z M 254.438,298.75 C 239.205,298.624 224.003,293.947 211.063,284.687 C 210.802,284.502 210.539,284.313 210.281,284.125 C 210.095,283.988 209.904,283.857 209.719,283.719 C 208.916,283.12 208.118,282.502 207.344,281.875 C 207.312,281.849 207.313,281.808 207.281,281.781 C 207.233,281.742 207.173,281.696 207.125,281.656 C 206.468,281.119 205.824,280.588 205.188,280.031 C 204.733,279.633 204.259,279.223 203.813,278.812 C 203.264,278.308 202.756,277.774 202.219,277.25 C 201.937,276.976 201.62,276.716 201.344,276.437 C 200.109,275.195 198.952,273.912 197.813,272.594 C 196.343,270.9 194.95,269.162 193.656,267.375 C 193.527,267.196 193.378,267.024 193.25,266.844 C 193.214,266.793 193.192,266.739 193.156,266.687 C 192.593,265.888 192.031,265.070 191.5,264.25 C 190.936,263.382 190.4,262.51 189.875,261.625 C 189.827,261.543 189.767,261.457 189.719,261.375 C 187.696,2 57.934 185.995,254.374 184.563,250.719 C 184.508,250.58 184.46,250.421 184.406,250.281 C 184.386,250.229 184.364,250.209 184.344,250.156 C 184.009,249.284 183.677,248.385 183.375,247.5 C 183.132,246.788 182.908,246.093 182.688,245.375 C 182.601,245.096 182.521,244.811 182.438,244.531 C 182.414,244.451 182.399,244.362 182.375,244.281 C 182.107,243.366 181.859,242.457 181.625,241.531 C 181.605,241.45 181.583,241.393 181.563,241.312 C 181.331,240.385 181.102,239.437 180.906,238.5 C 180.808,238.028 180.745,237.567 180.656,237.094 C 180.551,236.538 180.437,235.964 180.344,235.406 C 180.339,235.377 180.349,235.341 180.344,235.312 C 180.178,234.313 180.032,233.32 179.906,232.312 C 179.904,232.298 179.908,232.264 179.906,232.25 C 179.843,231.743 179.803,231.259 179.75,230.75 C 179.699,230.246 179.604,229.755 179.563,229.25 C 179.56,229.236 179.564,229.202 179.563,229.187 C 179.482,228.186 179.416,227.191 179.375,226.187 C 179.373,226.143 179.377,226.107 179.375,226.062 C 179.335,225 .051 179.343,224.012 179.344,223 C 179.344,222.963 179.313,222.943 179.313,222.906 C 179.315,221.962 179.338,221.037 179.375,220.094 C 179.403,219.381 179.452,218.651 179.5,217.937 C 179.528,217.525 179.559,217.131 179.594,216.719 C 179.598,216.667 179.589,216.614 179.594,216.562 C 179.667,215.709 179.773,214.851 179.875,214 C 179.997,212.992 180.118,211.977 180.281,210.969 C 180.405,210.208 180.571,209.448 180.719,208.687 C 180.822,208.15 180.916,207.598 181.031,207.062 C 181.039,207.026 181.054,207.005 181.063,206.969 C 181.28,205.964 181.523,204.965 181.781,203.969 C 181.808,203.865 181.816,203.76 181.844,203.656 C 182.106,202.662 182.384,201.672 182.688,200.687 C 183.009,199.643 183.382,198.595 183.75,197.562 C 184.072,196.66 184.393,195.767 184.75,194.875 C 184.809,194.728 184.878,194.584 184.938,194.437 C 184.968,194.363 185.001,194.293 185.031,194.219 C 185.494,193.093 185.98,191.982 186.5,190.875 C 187.013,189.782 187.556,188.698 188.125,187.625 C 188.16,187.558 188. 183,187.504 188.219,187.437 C 188.675,186.582 189.133,185.716 189.625,184.875 C 189.634,184.871 189.647,184.847 189.656,184.844 C 208.349,152.766 248.294,138.507 283.656,152.937 C 299.1,159.24 311.337,170.062 319.469,183.25 C 319.477,183.254 319.46,183.277 319.469,183.281 C 319.779,183.785 320.077,184.302 320.375,184.812 C 320.495,185.018 320.632,185.2 320.75,185.406 C 320.868,185.613 320.978,185.824 321.094,186.031 C 321.477,186.714 321.859,187.402 322.219,188.094 C 322.249,188.152 322.282,188.223 322.313,188.281 C 322.753,189.134 323.156,189.979 323.563,190.844 C 323.981,191.734 324.368,192.66 324.75,193.562 C 324.763,193.593 324.8,193.595 324.813,193.625 C 324.952,193.957 325.084,194.291 325.219,194.625 C 325.313,194.859 325.408,195.109 325.5,195.344 C 325.764,196.013 326.006,196.667 326.25,197.344 C 326.277,197.419 326.317,197.488 326.344,197.562 C 326.383,197.672 326.43,197.796 326.469,197.906 C 326.774,198.771 327.070,199.624 327.344,200.5 C 327.349,200.513 327.34,200. 549 327.344,200.562 C 327.348,200.576 327.34,200.58 327.344,200.594 C 327.648,201.571 327.923,202.573 328.188,203.562 C 328.19,203.57 328.216,203.585 328.219,203.594 C 328.366,204.148 328.491,204.693 328.625,205.25 C 328.736,205.705 328.835,206.168 328.938,206.625 C 329.165,207.645 329.377,208.658 329.563,209.687 C 329.746,210.705 329.889,211.724 330.031,212.75 C 330.457,215.83 330.708,218.958 330.75,222.094 C 330.764,223.128 330.748,224.15 330.719,225.187 C 330.691,226.162 330.659,227.148 330.594,228.125 C 330.59,228.184 330.598,228.222 330.594,228.281 C 330.59,228.333 330.566,228.386 330.563,228.437 C 330.492,229.418 330.391,230.393 330.281,231.375 C 330.225,231.88 330.192,232.401 330.125,232.906 C 330.11,232.92 330.109,232.923 330.094,232.937 C 328.004,248.896 320.855,264.333 308.594,276.594 C 293.652,291.536 274.022,298.912 254.438,298.75 z M 255.031,268.781 C 266.734,268.787 278.444,264.306 287.375,255.375 C 295.182,247.568 299.554,237.632 300.531,227.437 C 300.575,226. 977 300.626,226.524 300.656,226.062 C 300.666,225.91 300.679,225.746 300.688,225.594 C 300.712,225.156 300.738,224.719 300.75,224.281 C 300.755,224.105 300.747,223.926 300.75,223.75 C 300.756,223.332 300.755,222.918 300.75,222.5 C 300.748,222.315 300.755,222.123 300.75,221.937 C 300.74,221.527 300.708,221.129 300.688,220.719 C 300.667,220.32 300.625,219.898 300.594,219.5 C 300.579,219.307 300.58,219.13 300.563,218.937 C 300.544,218.732 300.553,218.518 300.531,218.312 C 300.514,218.142 300.457,217.983 300.438,217.812 C 300.388,217.383 300.343,216.959 300.281,216.531 C 300.195,215.935 300.11,215.342 300,214.75 C 299.933,214.387 299.857,214.018 299.781,213.656 C 299.733,213.427 299.677,213.197 299.625,212.969 C 299.36,211.797 299.043,210.645 298.688,209.5 C 298.51,208.927 298.325,208.377 298.125,207.812 C 298.002,207.463 297.882,207.097 297.75,206.75 C 297.666,206.53 297.587,206.312 297.5,206.094 C 297.057,204.981 296.56,203.919 296.031,202.844 C 295.86,202.496 295.712,202.126 295.531,201.781 C 290.706,192.564 282.702,184.959 272.313,180.719 C 250.46,171.801 225.707,181.007 214.781,201.344 C 214.789,201.351 214.805,201.368 214.813,201.375 C 214.521,201.916 214.237,202.45 213.969,203 C 213.867,203.208 213.754,203.416 213.656,203.625 C 213.519,203.917 213.381,204.204 213.25,204.5 C 213.214,204.581 213.192,204.669 213.156,204.75 C 212.682,205.837 212.261,206.949 211.875,208.062 C 211.727,208.49 211.572,208.913 211.438,209.344 C 211.398,209.468 211.351,209.594 211.313,209.719 C 211.295,209.777 211.299,209.848 211.281,209.906 C 210.945,211.027 210.655,212.142 210.406,213.281 C 210.278,213.869 210.167,214.471 210.063,215.062 C 209.643,217.429 209.389,219.823 209.344,222.219 C 209.333,222.766 209.303,223.327 209.313,223.875 C 209.313,223.926 209.343,223.98 209.344,224.031 C 209.355,224.593 209.374,225.127 209.406,225.687 C 209.408,225.725 209.404,225.775 209.406,225.812 C 209.44,226.373 209.477,226.941 209.531,227.5 C 209.535,227.537 209.559,227.557 209. 563,227.594 C 209.618,228.153 209.674,228.724 209.75,229.281 C 209.755,229.319 209.776,229.369 209.781,229.406 C 209.856,229.949 209.936,230.491 210.031,231.031 C 210.040,231.082 210.053,231.137 210.063,231.187 C 210.159,231.728 210.259,232.244 210.375,232.781 C 210.386,232.833 210.395,232.886 210.406,232.937 C 210.509,233.406 210.632,233.878 210.75,234.344 C 210.769,234.417 210.762,234.49 210.781,234.562 C 210.928,235.132 211.112,235.686 211.281,236.25 C 211.299,236.308 211.295,236.349 211.313,236.406 C 211.468,236.917 211.639,237.431 211.813,237.937 C 211.835,238.003 211.852,238.091 211.875,238.156 C 212.047,238.65 212.248,239.137 212.438,239.625 C 212.653,240.179 212.857,240.705 213.094,241.25 C 213.134,241.343 213.178,241.438 213.219,241.531 C 213.42,241.986 213.627,242.457 213.844,242.906 C 213.892,243.007 213.951,243.118 214,243.219 C 214.212,243.65 214.43,244.074 214.656,244.5 C 214.935,245.025 215.232,245.517 215.531,246.031 C 215.607,246.161 215.673,246.309 215.75,2 46.437 C 215.979,246.822 216.228,247.215 216.469,247.594 C 216.788,248.097 217.13,248.572 217.469,249.062 C 217.808,249.553 218.141,250.022 218.5,250.5 C 218.859,250.978 219.216,251.442 219.594,251.906 C 219.972,252.371 220.384,252.862 220.781,253.312 C 221.074,253.644 221.354,253.957 221.656,254.281 C 222.003,254.651 222.358,255.014 222.719,255.375 C 223.277,255.933 223.827,256.477 224.406,257 C 224.908,257.453 225.452,257.886 225.969,258.312 C 234.387,265.274 244.705,268.776 255.031,268.781 z M 375.469,178.5 L 452.813,125.406 C 442.593,104.258 428.702,84.421 411.156,66.875 C 393.76,49.479 374.132,35.693 353.188,25.5 L 300.844,103.062 C 317.39,109.014 332.929,118.617 346.188,131.875 C 359.794,145.482 369.556,161.463 375.469,178.5 z " /> -<glyph unicode="" d="M 255.75,480 m0,0,c -81.845,0 -148.202-66.357 -148.202-148.202 0-81.845 66.357-148.202 148.202-148.202 81.845,0 148.174,66.357 148.174,148.202 0,81.845 -66.329,148.202 -148.174,148.202 z m 0-37.788 c 60.981,0 110.414-49.433 110.414-110.414 0-60.981 -49.433-110.414 -110.414-110.414 -60.981,0 -110.414,49.433 -110.414,110.414 0,60.981 49.433,110.414 110.414,110.414 z m 0-16.195 c -52.039,0 -94.247-42.18 -94.247-94.219 0-52.039 42.208-94.219 94.247-94.219 52.039,0 94.219,42.18 94.219,94.219 0,52.039 -42.18,94.219 -94.219,94.219 z m -86.706-225.642 -96.779-167.624 69.677-5.259 40.932-58.602 72.626,125.774 73.127-126.664 40.932,58.602 69.677,5.259 -97.169,168.264 c -24.783-16.282 -54.418-25.767 -86.289-25.767 -32.045,0 -61.864,9.572 -86.734,26.017 z" /> -<glyph unicode="" d="M 164.844,408.685 0,343.998 l 76.094-56.875 164.844,64.688 -76.094,56.875 z m 178.594,0 -76.094-56.875 164.781-64.688 76.094,56.875 -164.781,64.688 z m -87.531-64.688 0-0.094 -164.594-64.594 -0.5-8.094 c 0.441-59.383 0.5-118.772 0.5-178.156 l 164.594-64.625 0-0.063 0.125,0.063 0.125-0.063 0,0.063 164.563,64.625 c -0.547,59.553 0.754,119.084 1.75,178.625 l -0.125,7.094 -166.188,65.125 0,0.094 -0.125-0.094 -0.125,0.094 z m -6.063-51.094 c 46.023,0 83.281-37.289 83.281-83.313 0-16.8 -5.073-33.345 -14.656-47.188 l 40.563-40.594 c 2.721-2.721 4.375-6.634 4.375-10.656 0-8.282 -6.843-15.125 -15.125-15.125 -4.023,0 -7.935,1.661 -10.656,4.5 l -40.594,40.469 c -13.843-9.583 -30.387-14.688 -47.188-14.688 -46.023,0 -83.313,37.258 -83.313,83.281 0,46.023 37.289,83.313 83.313,83.313 z m 0-30.281 c -29.223,0 -53-23.808 -53-53.031 0-29.223 23.777-53 53-53 29.223,0 53,23.777 53,53 0,29.223 -23.777,53.031 -53,53.031 z" /> -<glyph unicode="" d="M 164.845,348.294 0,283.609 76.092,226.74 240.937,291.425 164.845,348.294 z m 178.577,0 -76.092-56.869 164.786-64.685 76.092,56.869 -164.786,64.685 z m -87.505-64.685 0-0.067 -164.607-64.618 164.726-64.618 164.667,64.618 -164.548,64.618 0,0.067 -0.119-0.067 -0.119,0.067 z m 180.004-68.997 -157.177-64.685 76.092-56.869 L 512.013,157.742 435.921,214.611 z M 79.896,210.299 3.805,153.43 157.236,93.057 233.328,149.926 79.896,210.299 z m 176.14-56.128 -11.354-8.557 -11.473-8.557 0.119-0.067 -76.092-56.869 -65.926,25.874 0-73.31 164.607-64.618 0-0.067 0.119,0.067 0.119-0.067 0,0.067 164.548,64.618 0,73.31 -65.867-25.874 -76.092,56.869 0.178,0.067 -22.887,17.115 z" /> -<glyph unicode="" d="M 42.656,446.969 C 19.19,446.969 0,427.779 0,404.312 L 0,114.156 C 0,90.69 19.19,71.5 42.656,71.5 L 187.719,71.5 C 187.719,48.3 170.656,30.179 170.656,20.312 C 170.656,10.979 178.385,3.25 187.719,3.25 L 324.281,3.25 C 333.615,3.25 341.344,10.979 341.344,20.312 C 341.344,29.646 324.281,48.833 324.281,71.5 L 469.344,71.5 C 492.81,71.5 512,90.69 512,114.156 L 512,404.312 C 512,427.779 492.81,446.969 469.344,446.969 L 42.656,446.969 z M 42.656,412.844 L 469.344,412.844 C 473.877,412.844 477.875,408.846 477.875,404.312 L 477.875,182.437 C 477.875,177.904 473.877,173.906 469.344,173.906 L 42.656,173.906 C 38.123,173.906 34.125,177.904 34.125,182.437 L 34.125,404.312 C 34.125,408.846 38.123,412.844 42.656,412.844 z M 190.5,399.25 L 100.344,233.812 L 45.438,233.812 L 45.438,195.187 L 118.75,195.187 L 118.75,195.5 L 119.219,195.031 L 189.344,326.875 L 262.156,194.406 L 262.156,194.219 L 262.25,194.219 L 262.406,193.937 L 262.688,194.219 L 318.75,194.219 L 318.75,195.625 L 356.781,274.156 L 395.156,194.906 L 395.531,195.187 L 468.563,195.187 L 468.563,233.812 L 412.531,233.812 L 357.188,339.312 L 356.875,340.344 L 356.781,340.125 L 356.656,340.344 L 356.344,339.312 L 300.531,232.844 L 281.188,232.844 L 191.094,398.156 L 191.063,398.094 L 190.5,399.25 z " /> -<glyph unicode="" d="M 164.844,416.312 0,351.625 l 76.094-56.875 164.844,64.688 -76.094,56.875 z m 178.594,0 -76.094-56.875 164.781-64.688 76.094,56.875 -164.781,64.688 z m -87.531-64.688 0-0.094 -164.594-64.594 -0.5-8.094 c 0.441-59.383 0.5-118.772 0.5-178.156 l 164.594-64.625 0-0.062 0.125,0.062 0.125-0.062 0,0.062 164.563,64.625 c -0.547,59.553 0.754,119.084 1.75,178.625 l -0.125,7.094 -166.188,65.125 0,0.094 -0.125-0.094 -0.125,0.094 z m -16.25-55.75 28.906,0 c 2.344,0 4.427-1.693 4.688-3.906 l 3.656-23.969 c 4.036-1.302 7.943-2.859 11.719-4.813 l 18.5,13.938 c 0.781,0.781 1.953,1.156 3.125,1.156 1.172,0 2.339-0.5 3.25-1.281 6.901-6.38 16-14.474 21.469-22.156 0.651-0.781 0.938-1.802 0.938-2.844 0-1.172 -0.411-2.089 -1.063-3 -4.427-5.99 -9.229-11.724 -13.656-17.844 2.214-4.167 4.042-8.453 5.344-12.75 l 23.813-3.656 c 2.214-0.391 3.781-2.474 3.781-4.688 l 0-28.906 c 0-1.953 -1.573-4.297 -3.656-4.688 l -24.094-3.656 c -1.432-4.167 -2.979-8.068 -5.063-11.844 4.427-6. 38 9.12-12.109 13.938-17.969 0.781-0.911 1.281-2.078 1.281-3.25 0-1.172 -0.375-2.089 -1.156-3 -3.125-4.167 -20.698-23.313 -25.125-23.313 -1.172,0 -2.365,0.536 -3.406,1.188 L 288.875,128.687 c -3.776-1.953 -7.807-3.635 -11.844-4.938 -0.911-7.943 -1.698-16.406 -3.781-24.219 -0.521-2.083 -2.344-3.656 -4.688-3.656 l -28.906,0 c -2.344,0 -4.427,1.693 -4.688,3.906 l -3.625,23.969 c -4.036,1.302 -7.943,2.859 -11.719,4.813 l -18.375-13.938 c -0.911-0.781 -2.078-1.188 -3.25-1.188 -1.172,0 -2.339,0.526 -3.25,1.438 -6.901,6.25 -16.031,14.323 -21.5,21.875 -0.651,0.911 -0.906,1.958 -0.906,3 0,1.172 0.411,2.089 1.063,3 4.427,5.99 9.229,11.724 13.656,17.844 -2.214,4.167 -4.042,8.448 -5.344,12.875 l -23.813,3.531 c -2.214,0.391 -3.781,2.474 -3.781,4.688 l 0,28.906 c 0,1.953 1.547,4.297 3.5,4.688 l 24.219,3.625 c 1.302,4.167 3.010,8.094 5.094,12 -4.427,6.25 -9.12,12.109 -13.938,17.969 -0.781,0.911 -1.313,1.953 -1.313,3.125 0,1.172 0.536,2.089 1.188,3 3.125,4.297 20.698,23.281 25.125,23.281 1 .172,0 2.333-0.5 3.375-1.281 l 17.969-13.938 c 3.776,1.953 7.839,3.635 11.875,4.938 0.911,7.943 1.667,16.406 3.75,24.219 0.521,2.083 2.344,3.656 4.688,3.656 z m 14.469-66.656 c -18.359,0 -33.344-14.984 -33.344-33.344 0-18.359 14.984-33.344 33.344-33.344 18.359,0 33.344,14.984 33.344,33.344 0,18.359 -14.984,33.344 -33.344,33.344 z" /> -<glyph unicode="" d="M 424,478.562 C 400.197,478.318 375.498,468.337 356.156,448.969 L 288.656,381.406 L 401.938,268.312 C 408.311,268.146 414.504,266.762 420.188,264.281 L 480.531,324.687 C 516.938,361.146 520.158,416.638 487.656,449.094 L 480.531,456.187 C 465.296,471.401 445.003,478.778 424,478.562 z M 42.906,393 C 27.508,393 15.094,380.586 15.094,365.187 L 15.094,157.469 L 45.156,187.437 L 45.156,344.125 C 45.156,353.147 52.152,360.551 61.094,361.437 C 61.69,361.497 62.231,361.437 62.844,361.437 L 218.469,361.437 L 250.063,393 L 42.906,393 z M 263.844,356.531 L 121.813,214.312 L 211.688,124.531 C 212.916,132.62 216.058,138.758 220.25,144.562 C 223.813,149.495 228.649,154.608 235.656,158.406 C 234.641,162.1 233.906,166.027 233.906,170.312 C 233.906,184.038 240.74,194.83 243.094,198.125 A41.204,41.204 180 0 0 243.281,198.406 C 245.459,201.401 247.486,203.893 249.5,206.25 C 246.859,207.038 244.37,208.471 242.281,210.562 C 235.572,217.263 235.518,228.103 242.219,234. 812 C 245.569,238.167 250.031,239.843 254.438,239.844 C 258.844,239.845 263.239,238.171 266.594,234.812 C 268.633,232.776 270.053,230.351 270.844,227.781 C 272.66,229.405 274.538,231.042 276.563,232.656 C 279.055,234.644 281.649,236.631 285.625,238.937 C 289.601,241.244 293.727,245.594 309.188,245.594 C 314.030,245.594 318.125,244.775 321.906,243.719 C 328.558,255.225 340.126,264.13 353.281,267.187 L 263.844,356.531 z M 259.094,320.937 C 263.5,320.938 267.895,319.265 271.25,315.906 C 277.96,309.206 277.951,298.304 271.25,291.594 C 264.55,284.884 253.71,284.877 247,291.594 C 240.29,298.294 240.237,309.197 246.938,315.906 C 250.288,319.261 254.688,320.937 259.094,320.937 z M 494.875,297.562 L 464.781,267.594 L 464.781,244.531 C 473.362,242.713 480.091,238.713 485.625,233.969 A41.204,41.204 180 0 0 486.781,232.937 C 489.129,230.767 491.899,228.291 494.875,225.562 L 494.875,297.562 z M 297.313,282.812 C 301.719,282.819 306.114,281.154 309.469,277.812 C 316.178,271.112 316.107,26 0.209 309.406,253.5 C 302.706,246.79 291.866,246.783 285.156,253.5 C 278.458,260.189 278.428,271.037 285.094,277.75 C 288.444,281.105 292.906,282.807 297.313,282.812 z M 216.219,278 C 220.625,278.001 225.020,276.296 228.375,272.937 C 235.085,266.237 235.076,255.366 228.375,248.656 C 221.675,241.946 210.835,241.974 204.125,248.656 C 197.415,255.356 197.362,266.165 204.063,272.875 L 204.063,272.937 C 207.413,276.292 211.813,277.999 216.219,278 z M 173.344,235.062 C 177.75,235.069 182.145,233.404 185.5,230.062 C 192.21,223.362 192.202,212.491 185.5,205.781 C 178.8,199.072 167.96,199.036 161.25,205.719 C 154.54,212.419 154.487,223.291 161.188,230 C 164.538,233.355 168.938,235.057 173.344,235.062 z M 363.156,227.156 C 360.119,227.156 357.769,225.106 357.094,222.406 C 354.394,212.283 353.368,201.323 352.188,191.031 C 346.957,189.344 341.736,187.156 336.844,184.625 L 313.563,202.687 C 312.213,203.7 310.706,204.375 309.188,204.375 C 303.451,204.375 280.674,179.724 276.625,174.156 C 275.781,172.975 275.094,171.8 275.094,170.281 C 275.094,168.763 275.769,167.431 276.781,166.25 C 283.024,158.658 289.107,151.067 294.844,142.969 C 292.144,137.907 289.937,132.836 288.25,127.437 L 256.875,122.719 C 254.344,122.213 252.313,119.156 252.313,116.625 L 252.313,79.187 C 252.313,76.319 254.351,73.6 257.219,73.094 L 288.094,68.562 C 289.781,62.826 292.132,57.243 295,51.844 C 289.264,43.914 283.018,36.511 277.281,28.75 C 276.438,27.569 275.938,26.362 275.938,24.844 C 275.938,23.494 276.281,22.15 277.125,20.969 C 284.211,11.183 296.027,0.723 304.969-7.375 C 306.15-8.556 307.669-9.219 309.188-9.219 C 310.706-9.219 312.194-8.731 313.375-7.719 L 337.188,10.344 C 342.080,7.813 347.145,5.781 352.375,4.094 L 357.094-26.938 C 357.431-29.806 360.119-32 363.156-32 L 400.625-32 C 403.662-32 406.013-29.981 406.688-27.281 C 409.387-17.158 410.413-6.198 411.594,4.094 C 416.824,5.781 422.045,8.001 426.938,10.531 L 450.219-7.719 C 451.568-8.562 453.075-9.219 454.594-9.219 C 460.33-9. 219 483.107,15.57 487.156,20.969 C 488.169,22.15 488.688,23.325 488.688,24.844 C 488.688,26.362 488.012,27.882 487,29.062 C 480.758,36.655 474.674,44.077 468.938,52.344 C 471.637,57.236 473.675,62.32 475.531,67.719 L 506.75,72.437 C 509.449,72.944 511.469,75.969 511.469,78.5 L 511.469,115.969 C 511.469,118.837 509.431,121.525 506.563,122.031 L 475.688,126.75 C 474,132.318 471.649,137.882 468.781,143.281 C 474.518,151.211 480.764,158.645 486.5,166.406 C 487.344,167.587 487.844,168.763 487.844,170.281 C 487.844,171.631 487.5,172.988 486.656,174 C 479.57,183.954 467.754,194.42 458.813,202.687 C 457.632,203.7 456.112,204.375 454.594,204.375 C 453.075,204.375 451.575,203.856 450.563,202.844 L 426.594,184.812 C 421.701,187.343 416.636,189.344 411.406,191.031 L 406.688,222.094 C 406.35,224.962 403.662,227.156 400.625,227.156 L 363.156,227.156 z M 211.563,196.906 C 215.969,196.907 220.364,195.234 223.719,191.875 C 230.428,185.175 230.42,174.334 223.719,167.625 C 217.019,160.915 206. 116,160.88 199.406,167.562 C 192.697,174.263 192.644,185.165 199.344,191.875 C 202.694,195.23 207.156,196.905 211.563,196.906 z M 96.938,189.437 L 29.5,121.875 C -6.907,85.417 -10.033,29.925 22.469-2.531 L 29.563-9.625 C 62.064-42.081 117.562-38.864 153.969-2.406 L 215.406,59.156 C 213.126,64.159 211.728,69.6 211.281,75.25 L 96.938,189.437 z M 381.875,140.75 C 405.664,140.75 425.094,121.351 425.094,97.562 C 425.094,73.774 405.664,54.375 381.875,54.375 C 358.086,54.375 338.688,73.774 338.688,97.562 C 338.688,121.351 358.086,140.75 381.875,140.75 z " /> -<glyph unicode="" d="M 302.051,405.582 m0,0,-94.57,0 0,44.060 94.57,0 0-44.060 z m 161.775-114.105 -143.089,0 0,34.213 143.089,0 0-34.213 z m 0-47.803 -143.089,0 0,17.12 143.089,0 0-17.12 z m 0-35.567 -143.089,0 0,17.146 143.089,0 0-17.146 z m 0-164.907 -143.089,0 0,25.719 143.089,0 0-25.719 z M 276.119,62.603 c 0-11.625 -9.529-21.154 -21.128-21.154 l -190.679,0 c -11.599,0 -21.101,9.529 -21.101,21.154 l 0,249.338 c 0,11.626 9.502,21.101 21.101,21.101 l 190.679,0 c 11.599,0 21.128-9.476 21.128-21.101 l 0-249.338 z m 44.617,127.562 95.366,0 0-17.067 -95.366,0 0,17.067 z m 132.871,189.326 -397.762,0 C 25.003,379.491 0,354.515 0,323.673 l 0-269.775 c 0-30.895 25.003-55.898 55.845-55.898 l 397.762,0 c 30.842,0 55.845,25.003 55.845,55.898 l 0,269.775 c 0,30.842 -25.003,55.818 -55.845,55.818 m -294.062-207.348 c -18.155,0 -34.664,6.582 -47.908,17.146 -16.828-13.882 -27.816-34.691 -27.816-58.207 l 0-70.815 151.503,0 0,70.815 c 0,23.516 -10.988,44.326 -27.869,58.207 -13.218 -10.564 -29.701-17.146 -47.909-17.146 m 0,18.394 c 32.514,0 58.95,26.383 58.95,58.897 0,32.488 -26.436,58.924 -58.95,58.924 -32.487,0 -58.924-26.436 -58.924-58.924 0-32.514 26.436-58.897 58.924-58.897" /> -<glyph unicode="" d="M 136.844,475.719 C 120.084,475.719 106.469,462.103 106.469,445.344 L 106.469,260.344 C 109.171,261.142 111.997,261.594 114.875,261.594 L 146.938,261.594 L 146.938,435.25 L 308.844,435.25 L 308.844,303.687 C 308.844,286.928 322.459,273.344 339.219,273.344 L 470.75,273.344 L 470.75,30.469 L 269.75,30.469 C 269.873,29.327 269.969,28.168 269.969,26.937 C 269.969,20.403 266.694,12.631 263.281,8 L 263.406,7.906 C 263.143,7.555 262.742,7.166 262.469,6.812 C 262.435,6.768 262.409,6.7 262.375,6.656 C 258.456,1.601 253.525-3.787 247.375-10 L 480.875-10 C 497.635-10 511.25,3.584 511.25,20.344 L 511.25,303.687 C 511.25,320.447 501.45,343.862 489.75,355.562 L 391.063,454.219 C 379.362,465.919 355.978,475.719 339.219,475.719 L 136.844,475.719 z M 349.344,432.719 C 354.719,430.821 360.099,427.964 362.313,425.75 L 461.281,326.781 C 463.495,324.568 466.321,319.188 468.219,313.812 L 349.344,313.812 L 349.344,432.719 z M 114.875,236.562 C 111.728,236.562 109.293,2 34.485 108.594,231.687 C 105.796,221.196 104.724,209.822 103.5,199.156 C 98.080,197.408 92.664,195.123 87.594,192.5 L 63.469,211.219 C 62.070,212.268 60.511,212.969 58.938,212.969 C 52.993,212.969 29.384,187.426 25.188,181.656 C 24.313,180.432 23.594,179.23 23.594,177.656 C 23.594,176.083 24.295,174.661 25.344,173.437 C 31.813,165.569 38.118,157.705 44.063,149.312 C 41.265,144.067 38.999,138.845 37.25,133.25 L 4.719,128.344 C 2.096,127.819 0,124.654 0,122.031 L 0,83.219 C 0,80.246 2.090,77.462 5.063,76.937 L 37.063,72.219 C 38.811,66.274 41.278,60.501 44.25,54.906 C 38.305,46.688 31.82,38.981 25.875,30.937 C 25.001,29.714 24.469,28.511 24.469,26.937 C 24.469,25.539 24.844,24.13 25.719,22.906 C 33.062,12.765 45.295,1.924 54.563-6.469 C 55.786-7.693 57.364-8.406 58.938-8.406 C 60.511-8.406 62.057-7.862 63.281-6.813 L 87.938,11.875 C 93.008,9.252 98.267,7.155 103.688,5.406 L 108.594-26.75 C 108.943-29.722 111.728-32 114.875-32 L 153.688-32 C 156.835-32 159.301-29.891 160-27.094 C 162.798-16.603 163.839-5.26 165.063,5.406 C 170.483,7.155 175.898,9.44 180.969,12.062 L 205.094-6.813 C 206.493-7.687 208.083-8.406 209.656-8.406 C 215.601-8.406 239.21,17.311 243.406,22.906 C 244.455,24.13 244.969,25.364 244.969,26.937 C 244.969,28.511 244.268,30.057 243.219,31.281 C 236.749,39.15 230.445,46.87 224.5,55.437 C 227.298,60.508 229.42,65.749 231.344,71.344 L 263.688,76.219 C 266.485,76.743 268.563,79.908 268.563,82.531 L 268.563,121.344 C 268.563,124.316 266.472,127.1 263.5,127.625 L 231.5,132.531 C 229.751,138.301 227.316,144.061 224.344,149.656 C 230.289,157.874 236.743,165.582 242.688,173.625 C 243.562,174.849 244.094,176.083 244.094,177.656 C 244.094,179.055 243.749,180.451 242.875,181.5 C 235.531,191.816 223.298,202.651 214.031,211.219 C 212.807,212.268 211.23,212.969 209.656,212.969 C 208.083,212.969 206.487,212.455 205.438,211.406 L 180.625,192.687 C 175.554,195.31 170.295,197.408 164.875,199.156 L 160,231.312 C 159.65,234.285 156.835,236.562 153.688, 236.562 L 114.875,236.562 z M 226.781,232.844 C 228.020,232.020 229.186,231.157 230.281,230.219 L 230.656,229.906 L 231,229.594 C 239.599,221.643 252.077,211.013 262.063,197.5 C 262.085,197.47 262.103,197.437 262.125,197.406 C 262.485,196.918 262.897,196.496 263.25,196 L 263.125,195.906 C 263.98,194.737 264.735,193.547 265.375,192.375 L 420.156,192.375 C 425.848,192.375 430.281,196.808 430.281,202.5 L 430.281,222.75 C 430.281,228.442 425.848,232.844 420.156,232.844 L 226.781,232.844 z M 269.563,151.906 C 284.503,148.456 293.563,135.54 293.563,121.344 L 293.563,111.437 L 420.156,111.437 C 425.848,111.437 430.281,115.871 430.281,121.562 L 430.281,141.781 C 430.281,147.473 425.848,151.906 420.156,151.906 L 269.563,151.906 z M 134.281,147.062 C 158.935,147.062 179.063,126.935 179.063,102.281 C 179.063,77.627 158.935,57.531 134.281,57.531 C 109.627,57.531 89.531,77.627 89.531,102.281 C 89.531,126.935 109.627,147.062 134.281,147.062 z " /> -<glyph unicode=" " horiz-adv-x="256" /> +<font id="spacewalk-icon" horiz-adv-x="1024"> +<font-face units-per-em="1024" ascent="960" descent="-64" /> +<missing-glyph horiz-adv-x="1024" /> +<glyph unicode=" " d="" horiz-adv-x="512" /> +<glyph unicode="" d="M345.75 853.441c-33.8 0-71.414-26.073-83.485-57.942l-24.665-65.675h-108.15c-68.082 0-123.617-55.535-123.617-123.617v-432.658c0-68.082 55.535-123.617 123.617-123.617h679.891c48.377 0 90.387 28.067 110.669 68.721 0.144 4.138 0.234 8.254 0.234 12.303 0 60.852-14.346 84.070-38.784 99.831-24.438 15.761-68.851 22.966-128.128 22.966h-26.598v-35.796c0-30.73-25.103-55.833-55.833-55.833-15.13 0-29.252 6.375-39.311 16.404l-35.913 35.913c-35.567-25.676-79.199-40.893-126.312-40.893-119.264 0-216.3 97.094-216.3 216.358 0 119.264 97.035 216.3 216.3 216.3 60.035 0 114.439-24.631 153.671-64.269l8.495 8.495c10.063 10.063 24.211 16.463 39.37 16.463 30.73 0 55.833-25.103 55.833-55.833v-35.796h26.598c49.153 0 105.572-3.945 158.182-22.849 7.195-2.585 14.343-5.525 21.384-8.788v162.576c0 68.082-55.476 123.617-123.558 123.617h-108.208l-24.606 65.675c-12.071 31.868-49.744 57.942-83.544 57.942h-247.233zM670.902 529.343c-4.866 0-9.454-2.014-12.889-5.448l-146.524-146.524c-3. 435-3.435-5.449-8.023-5.449-12.889s2.014-9.454 5.449-12.889l146.524-146.524c3.435-3.435 8.023-5.448 12.889-5.448 10.018 0 18.337 8.319 18.337 18.337v73.233h64.093c123.367 0 204.407-23.758 204.407-160.292 0-11.736-0.606-23.475-1.465-35.21-0.286-4.58-1.406-9.715-1.406-14.295 0-5.438 3.415-10.018 9.139-10.018 4.007 0 6.023 2 8.026 4.863 4.294 6.011 7.455 15.211 10.604 21.794 16.315 36.638 36.323 88.992 36.323 129.065 0 32.058-3.152 64.979-15.174 95.32-39.787 98.751-156.571 115.356-250.456 115.356h-64.093v73.291c0 10.018-8.319 18.279-18.337 18.279zM469.366 528.933c-76.773 0-139.025-62.251-139.025-139.025 0-76.773 62.251-139.083 139.025-139.083 25.76 0 49.903 7.055 70.596 19.275l-55.012 55.012c-10.063 10.063-16.404 24.27-16.404 39.428s6.341 29.307 16.404 39.37l83.544 83.485c-25.229 25.635-60.339 41.538-99.128 41.538z" /> +<glyph unicode="" d="M332.983 819.098l-330.983-129.883 152.786-114.197 330.983 129.883-152.786 114.197zM691.574 819.098l-152.786-114.197 330.858-129.883 152.786 114.197-330.858 129.883zM515.824 689.215v-0.188l-330.481-129.695-1.004-16.251c0.886-119.233 1.004-238.478 1.004-357.713l330.983-129.758 71.467 28.047c-4.089 17.649-6.275 36.010-6.275 54.902 0 133.86 108.526 242.386 242.386 242.386 7.981 0 15.872-0.375 23.655-1.129 0.757 54.736 1.782 109.468 2.698 164.205l-0.251 14.243-334.183 130.95zM823.905 338.467c-110.359 0-199.908-89.548-199.908-199.908 0-110.359 89.548-199.845 199.908-199.845 110.359 0 199.908 89.485 199.908 199.845 0 110.359-89.548 199.908-199.908 199.908zM765.112 237.76c4.425 0 8.547-1.834 11.671-4.957l47.122-47.122 47.122 47.122c3.123 3.123 7.309 4.957 11.733 4.957 4.425 0 8.861-1.834 11.984-4.957l23.404-23.404c3.123-3.123 4.957-7.56 4.957-11.984 0-4.425-1.834-8.61-4.957-11.733l-47.122-47.122 47.122-47.059c3.123-3.123 4.957-7.309 4.957-11.733s-1.834-8 .861-4.957-11.984l-23.404-23.404c-3.123-3.123-7.56-4.957-11.984-4.957s-8.61 1.834-11.733 4.957l-47.122 47.122-47.122-47.122c-3.123-3.123-7.246-4.957-11.671-4.957-4.425 0-8.861 1.834-11.984 4.957l-23.404 23.404c-3.123 3.123-4.957 7.56-4.957 11.984s1.833 8.61 4.957 11.733l47.059 47.059-47.059 47.122c-3.123 3.123-4.957 7.309-4.957 11.733 0 4.425 1.833 8.861 4.957 11.984l23.404 23.404c3.123 3.123 7.56 4.957 11.984 4.957z" /> +<glyph unicode="" d="M90.216 885.519c-46.397 0-84.392-37.995-84.392-84.392v-573.62c0-46.397 37.995-84.392 84.392-84.392h286.842c0-45.87-33.795-81.685-33.795-101.193 0-18.453 15.342-33.731 33.795-33.731h269.912c18.453 0 33.731 15.278 33.731 33.731s-33.731 56.378-33.731 101.193h286.842c46.397 0 84.327 37.995 84.327 84.392v573.62c0 46.397-37.931 84.392-84.327 84.392h-843.596zM90.216 817.993h843.596c8.963 0 16.865-7.902 16.865-16.865v-438.631c0-8.963-7.902-16.865-16.865-16.865h-843.596c-8.963 0-16.865 7.902-16.865 16.865v438.631c0 8.963 7.902 16.865 16.865 16.865zM482.692 774.284c-4.518 0-8.073-3.065-9.076-7.081-4.016-15.058-5.517-31.36-7.274-46.67-7.78-2.51-15.574-5.762-22.852-9.527l-34.632 26.843c-2.008 1.506-4.243 2.511-6.502 2.511-8.533 0-42.384-36.65-48.408-44.932-1.255-1.757-2.317-3.47-2.317-5.729 0-2.259 1.005-4.294 2.511-6.051 9.286-11.294 18.374-22.585 26.908-34.632-4.016-7.529-7.275-15.078-9.785-23.11l-46.734-7.017c-3.765-0.753-6.759-5.247-6.759-9.012v-55.746c0 -4.267 3.007-8.259 7.274-9.012l45.962-6.759c2.51-8.533 6.033-16.816 10.3-24.848-8.533-11.796-17.859-22.83-26.393-34.375-1.255-1.757-1.996-3.535-1.996-5.793 0-2.008 0.483-4.037 1.738-5.793 10.541-14.557 28.154-30.117 41.456-42.164 1.757-1.757 3.985-2.768 6.244-2.768 2.259 0 4.552 0.747 6.308 2.253l35.34 26.908c7.278-3.765 14.814-6.824 22.595-9.334l7.017-46.155c0.502-4.267 4.559-7.532 9.076-7.532h55.682c4.518 0 8.073 3.001 9.076 7.017 4.016 15.058 5.517 31.36 7.274 46.67 7.78 2.51 15.509 5.827 22.788 9.591l34.632-27.165c2.008-1.255 4.307-2.253 6.566-2.253 8.533 0 42.384 36.901 48.408 44.932 1.506 1.757 2.253 3.535 2.253 5.793 0 2.259-1.005 4.487-2.511 6.244-9.286 11.294-18.31 22.334-26.843 34.632 4.016 7.278 7.024 14.821 9.785 22.852l46.477 7.017c4.016 0.753 7.017 5.312 7.017 9.076v55.682c0 4.267-3.007 8.324-7.274 9.076l-45.962 7.017c-2.51 8.282-6.033 16.559-10.3 24.59 8.533 11.796 17.859 22.83 26.393 34.375 1.255 1.757 1.996 3.535 1.996 5.794 0 2.008-0.483 3.966-1.738 5.472-1 0.541 14.807-28.154 30.381-41.456 42.679-1.757 1.506-3.985 2.511-6.244 2.511-2.259 0-4.545-0.747-6.051-2.253l-35.598-26.843c-7.278 3.765-14.814 6.76-22.595 9.27l-7.017 46.219c-0.502 4.267-4.559 7.532-9.076 7.532h-55.682zM510.501 645.733c35.387 0 64.308-28.856 64.308-64.243s-28.92-64.243-64.308-64.243c-35.387 0-64.243 28.856-64.243 64.243 0 35.387 28.856 64.243 64.243 64.243z" /> +<glyph unicode="" d="M276.909 926.068c-7.31 0-14.656-2.773-20.258-8.374l-0.399-0.479c-11.203-11.203-11.203-29.233 0-40.436l185.908-185.908h-389.442c-23.465 0-42.35-13.659-42.35-30.626v-665.792c0-16.967 18.885-30.626 42.35-30.626h920.689c23.465 0 42.35 13.659 42.35 30.626v665.792c0 16.967-18.885 30.626-42.35 30.626h-392.712l185.908 185.908c11.203 11.203 11.203 29.233 0 40.436l-0.479 0.479c-11.203 11.203-29.233 11.203-40.436 0l-214.301-214.301-214.301 214.301c-5.601 5.601-12.868 8.374-20.178 8.374zM118.276 618.613h621.927c16.967 0 30.626-13.659 30.626-30.626v-516.173c0-16.967-13.659-30.626-30.626-30.626h-621.927c-16.967 0-30.626 13.659-30.626 30.626v516.173c0 16.967 13.659 30.626 30.626 30.626zM835.032 518.601h116.442c11.311 0 20.417-9.106 20.417-20.417v-13.319c0-11.311-9.106-20.417-20.417-20.417h-116.442c-11.311 0-20.417 9.106-20.417 20.417v13.319c0 11.311 9.106 20.417 20.417 20.417zM835.032 421.539h116.442c11.311 0 20.417-9.106 20.417-20.417v-13.319c0-11.311-9.106-20 .417-20.417-20.417h-116.442c-11.311 0-20.417 9.106-20.417 20.417v13.319c0 11.311 9.106 20.417 20.417 20.417zM835.032 324.398h116.442c11.311 0 20.417-9.106 20.417-20.417v-13.319c0-11.311-9.106-20.417-20.417-20.417h-116.442c-11.311 0-20.417 9.106-20.417 20.417v13.319c0 11.311 9.106 20.417 20.417 20.417zM835.032 227.257h116.442c11.311 0 20.417-9.106 20.417-20.417v-13.239c0-11.311-9.106-20.417-20.417-20.417h-116.442c-11.311 0-20.417 9.106-20.417 20.417v13.239c0 11.311 9.106 20.417 20.417 20.417z" /> +<glyph unicode="" d="M334.272 878.208l-327.872-128.704 151.36-113.152 327.872 128.704-151.36 113.152zM689.536 878.208l-151.36-113.152 327.744-128.704 151.36 113.152-327.744 128.704zM515.392 749.504v-0.192l-327.36-128.448-1.024-16.128c0.878-118.12 1.024-236.246 1.024-354.368l327.872-128.512 70.784 27.776c-4.051 17.485-6.208 35.619-6.208 54.336 0 132.61 107.518 240.128 240.128 240.128 7.907 0 15.713-0.341 23.424-1.088 0.75 54.225 1.781 108.461 2.688 162.688l-0.256 14.080-331.072 129.728zM820.224 402.624c-109.432 0-198.208-88.776-198.208-198.208s88.776-198.208 198.208-198.208c109.432 0 198.208 88.776 198.208 198.208 0 109.432-88.776 198.208-198.208 198.208zM803.712 320.064h33.024c9.033 0 16.512-7.479 16.512-16.512v-66.112h66.112c9.033 0 16.512-7.479 16.512-16.512v-33.024c0-9.033-7.479-16.512-16.512-16.512h-66.112v-66.048c0-9.033-7.479-16.512-16.512-16.512h-33.024c-9.033 0-16.512 7.479-16.512 16.512v66.048h-66.112c-9.033 0-16.512 7.479-16.512 16.512v33.024c0 9.033 7.479 16.512 16.512 16.512h66.112v66.112c0 9.033 7.479 16.512 16.512 16.512z" /> +<glyph unicode="" d="M223.442 951.232c-45.411 0-82.562-37.151-82.562-82.562v-49.55h-66.023c-36.123 0-66.089-29.901-66.089-66.023v-660.56c0-36.123 29.966-66.023 66.089-66.023h491.22c-14.446 20.139-26.248 42.322-34.856 66.023h-76.566v148.651h65.694c2.298 11.271 5.327 22.29 8.961 33.012h-74.655v165.124h165.124v-37.492c10.434 8.194 21.438 15.638 33.012 22.271v15.221h30.903c32.407 13.488 67.937 20.888 105.228 20.888 27.297 0 53.661-3.97 78.542-11.399v304.286c0 36.123-29.901 66.023-66.023 66.023h-66.089v49.55c0 45.411-37.151 82.562-82.562 82.562h-33.012c-45.411 0-82.562-37.151-82.562-82.562v-49.55h-198.201v49.55c0 45.411-37.151 82.562-82.562 82.562h-33.012zM223.442 885.143h33.012c8.773 0 16.539-7.7 16.539-16.473v-148.651c0-8.773-7.766-16.473-16.539-16.473h-33.012c-8.773 0-16.539 7.7-16.539 16.473v148.651c0 8.773 7.766 16.473 16.539 16.473zM619.778 885.143h33.012c8.773 0 16.539-7.7 16.539-16.473v-148.651c0-8.773-7.766-16.473-16.539-16.473h-33.012c-8.773 0-16.539 7.7-16.539 16.473v148.651c0 8.773 7.766 16.473 16.539 16.473zM74.857 620.985h148.585v-148.651h-148.585v148.651zM256.453 620.985h165.124v-148.651h-165.124v148.651zM454.654 620.985h165.124v-148.651h-165.124v148.651zM652.789 620.985h148.651v-148.651h-148.651v148.651zM74.857 439.323h148.585v-165.124h-148.585v165.124zM256.453 439.323h165.124v-165.124h-165.124v165.124zM788.921 415.075c-126.386 0-228.906-102.587-228.906-228.972 0-126.386 102.521-228.906 228.906-228.906 126.386 0 228.906 102.521 228.906 228.906 0 126.386-102.521 228.972-228.906 228.972zM784.77 348.261c1.389 0.035 2.754 0 4.151 0 89.424 0 162.158-72.735 162.158-162.158 0-89.424-72.735-162.159-162.158-162.159-89.424 0-162.158 72.735-162.158 162.159 0 88.027 70.508 159.935 158.007 162.158zM798.475 300.621c-5.365 0-9.554-4.189-9.554-9.554v-104.965h-66.748c-5.365 0-9.554-4.123-9.554-9.488v-19.108c0-5.365 4.189-9.554 9.554-9.554h95.345c5.365 0 9.554 4.189 9.554 9.554v133.562c0 5.365-4.189 9.554-9.554 9.554h-19.043zM74.857 241.188h14 8.585v-148.651h-148.585v148.651zM256.453 241.188h165.124v-148.651h-165.124v148.651z" /> +<glyph unicode="" d="M737.688 953.125c-154.583 0-280-125.417-280-280s125.417-280 280-280c154.583 0 280 125.417 280 280 0 154.583-125.417 280-280 280zM737.688 871.5c109.375 0 198.375-89 198.375-198.375s-89-198.313-198.375-198.313c-109.375 0-198.313 88.938-198.313 198.313 0 109.375 88.938 198.375 198.313 198.375zM749.375 813.125c-6.563 0-11.688-5.063-11.688-11.625v-128.375h-81.625c-6.563 0-11.688-5.063-11.688-11.625v-23.375c0-6.563 5.125-11.625 11.688-11.625h116.625c6.563 0 11.688 5.063 11.688 11.625v163.375c0 6.562-5.125 11.625-11.688 11.625h-23.313zM71.625 680.875c-39.393 0-71.625-32.232-71.625-71.625v-487c0-39.393 32.232-71.625 71.625-71.625h243.5c0-38.946-28.625-69.437-28.625-86 0-15.668 12.957-28.625 28.625-28.625h229.25c15.668 0 28.625 12.957 28.625 28.625s-28.625 47.95-28.625 86h243.5c39.393 0 71.625 32.232 71.625 71.625v236.313c-18.438-6.833-37.592-12.242-57.313-16v-105.75c0-7.61-6.702-14.313-14.313-14.313h-716.25c-7.61 0-14.313 6.702-14.313 14.313v372.438c0 7. 61 6.702 14.313 14.313 14.313h333.938c-2.156 15.937-3.25 32.16-3.25 48.688 0 2.878 0.058 5.763 0.125 8.625h-330.813z" /> +<glyph unicode="" d="M577.216 954.176c-28.259 0-51.712-23.453-51.712-51.712s23.453-51.648 51.712-51.648v-206.72c-53.289 0-103.36-62.945-103.36-129.152 0-14.13 11.726-25.856 25.856-25.856h163.072l30.656-195.776c1.211-6.459 6.469-10.944 12.928-10.944h0.448c6.459 0 11.673 5.253 12.48 11.712l20.608 195.008h173.184c14.13 0 25.856 11.726 25.856 25.856 0 66.207-50.071 129.152-103.36 129.152v206.72c28.259 0 51.648 23.389 51.648 51.648s-23.389 51.712-51.648 51.712zM654.72 850.816c7.267 0 12.928-5.661 12.928-12.928v-180.864c0-7.267-5.661-12.928-12.928-12.928s-12.928 5.661-12.928 12.928v180.864c0 7.267 5.661 12.928 12.928 12.928zM524.544 672.704l-196.544-5.056c-23.313-0.6-56.053-15.001-72.32-32.128l-196.416-206.848c-16.267-17.127-15.591-44.213 1.536-60.48l434.304-412.48c17.127-16.267 44.213-15.591 60.48 1.536l333.952 351.616c16.267 17.127 15.527 44.213-1.6 60.48l-88.704 84.224h-27.392l-5.056-47.808 71.552-67.968-314.304-330.944-413.632 392.896 157.184 165.44 134.4-127.68c17.127 -16.267 44.213-15.591 60.48 1.536l32.018 31.515c-18.9 6.653-32.998 22.395-38.333 41.862l-25.237-23.714-121.472 115.392c7.157 3.652 15.302 6.35 19.712 6.464l139.584 3.648c2.843 4.256 5.862 8.391 9.024 12.352 15.771 19.756 36.059 36.185 59.52 45.312-4.446 0.626-8.749 0.935-12.736 0.832z" /> +<glyph unicode="" d="M277.376 926.080c-7.323 0-14.677-2.773-20.288-8.384l-0.384-0.512c-11.222-11.222-11.222-29.29 0-40.512l186.24-186.24h-390.144c-23.506 0-42.432-13.66-42.432-30.656v-666.944c0-16.996 18.926-30.72 42.432-30.72h922.304c23.506 0 42.432 13.724 42.432 30.72v666.944c0 16.996-18.926 30.656-42.432 30.656h-393.408l186.24 186.24c11.222 11.222 11.222 29.29 0 40.512l-0.512 0.512c-11.222 11.222-29.29 11.222-40.512 0l-214.656-214.72-214.656 214.72c-5.611 5.611-12.901 8.384-20.224 8.384zM118.464 618.048h623.040c16.996 0 30.656-13.66 30.656-30.656v-517.056c0-16.996-13.66-30.72-30.656-30.72h-623.040c-16.996 0-30.656 13.724-30.656 30.72v517.056c0 16.996 13.66 30.656 30.656 30.656zM401.792 559.296c-5.401 0-9.616-3.583-10.816-8.384-4.801-18.002-6.604-37.506-8.704-55.808-9.301-3-18.627-6.891-27.328-11.392l-41.408 32.064c-2.4 1.8-5.044 3.008-7.744 3.008-10.201 0-50.719-43.795-57.92-53.696-1.5-2.1-2.688-4.212-2.688-6.912 0-2.7 1.144-5.068 2.944-7.168 11.101-13.502 21.927- 27.006 32.128-41.408-4.801-9.001-8.712-18.047-11.712-27.648l-55.808-8.384c-4.501-0.9-8.064-6.315-8.064-10.816v-66.56c0-5.101 3.603-9.916 8.704-10.816l54.912-8.128c3-10.201 7.187-20.095 12.288-29.696-10.201-14.102-21.287-27.286-31.488-41.088-1.5-2.1-2.432-4.212-2.432-6.912 0-2.4 0.612-4.812 2.112-6.912 12.602-17.402 33.57-35.966 49.472-50.368 2.1-2.1 4.852-3.328 7.552-3.328 2.7 0 5.388 0.888 7.488 2.688l42.304 32.128c8.701-4.501 17.707-8.136 27.008-11.136l8.384-55.168c0.6-5.101 5.415-9.024 10.816-9.024h66.624c5.401 0 9.552 3.583 10.752 8.384 4.801 18.002 6.604 37.506 8.704 55.808 9.301 3 18.627 6.955 27.328 11.456l41.408-32.448c2.4-1.5 5.108-2.688 7.808-2.688 10.201 0 50.719 44.095 57.92 53.696 1.8 2.1 2.688 4.212 2.688 6.912 0 2.7-1.208 5.388-3.008 7.488-11.101 13.502-21.927 26.706-32.128 41.408 4.801 8.701 8.412 17.727 11.712 27.328l55.488 8.384c4.801 0.9 8.448 6.315 8.448 10.816v66.624c0 5.101-3.603 9.852-8.704 10.752l-54.912 8.448c-3 9.901-7.187 19.775-12.288 29.376 10.20 1 14.102 21.287 27.286 31.488 41.088 1.5 2.1 2.368 4.212 2.368 6.912 0 2.4-0.612 4.792-2.112 6.592-12.602 17.702-33.57 36.306-49.472 51.008-2.1 1.8-4.788 3.008-7.488 3.008-2.7 0-5.432-0.888-7.232-2.688l-42.56-32.128c-8.701 4.501-17.707 8.136-27.008 11.136l-8.448 55.168c-0.6 5.101-5.351 9.024-10.752 9.024h-66.624zM836.48 517.888h116.672c11.331 0 20.416-9.149 20.416-20.48v-13.312c0-11.331-9.085-20.48-20.416-20.48h-116.672c-11.331 0-20.48 9.149-20.48 20.48v13.312c0 11.331 9.149 20.48 20.48 20.48zM836.48 420.672h116.672c11.331 0 20.416-9.149 20.416-20.48v-13.312c0-11.331-9.085-20.48-20.416-20.48h-116.672c-11.331 0-20.48 9.149-20.48 20.48v13.312c0 11.331 9.149 20.48 20.48 20.48zM435.072 405.696c42.306 0 76.8-34.494 76.8-76.8 0-42.306-34.494-76.864-76.8-76.864-42.306 0-76.8 34.558-76.8 76.864 0 42.306 34.494 76.8 76.8 76.8zM836.48 323.328h116.672c11.331 0 20.416-9.085 20.416-20.416v-13.376c0-11.331-9.085-20.416-20.416-20.416h-116.672c-11.331 0-20.48 9.085-20.48 20.416v13.376c0 11. 331 9.149 20.416 20.48 20.416zM836.48 226.048h116.672c11.331 0 20.416-9.149 20.416-20.48v-13.248c0-11.331-9.085-20.48-20.416-20.48h-116.672c-11.331 0-20.48 9.149-20.48 20.48v13.248c0 11.331 9.149 20.48 20.48 20.48z" /> +<glyph unicode="" d="M454.154 957.056c-95.221 0-172.138-76.918-172.138-172.138h344.277c0 95.221-76.918 172.138-172.139 172.138zM109.877 819.245c-8.742 0-17.48-3.397-24.205-10.122-13.449-13.449-13.449-34.961 0-48.41l93.048-93.048v-158.181h-120.522c-18.829 0-34.39-15.624-34.39-34.453 0-18.829 15.561-34.39 34.39-34.39h120.522c0-62.405 12.355-110.311 31.184-147.431l-108.64-122.094c-12.373-14.525-11.284-36.065 2.703-48.976 6.994-5.918 15.067-8.613 23.136-8.613 9.683 0 18.783 3.785 25.777 11.317l98.455 111.343c0 0 71.057-70.98 168.429-70.98v482.026h68.843v-482.026c6.981 0 13.844 0.374 20.559 1.069 1.866 129.5 96.294 236.639 220.108 258.082 0.193 5.321 0.314 10.738 0.314 16.283h120.522c18.829 0 34.453 15.561 34.453 34.39s-15.624 34.453-34.453 34.453h-120.522v158.181l93.111 93.048c13.449 13.449 13.449 34.961 0 48.41-13.449 13.449-34.961 13.449-48.41 0l-93.111-93.048h-454.048l-93.048 93.048c-6.725 6.725-15.463 10.122-24.205 10.122zM774.981 388.018c-124.558 0-225.641-101.083-2 25.641-225.641s101.083-225.578 225.641-225.578c124.558 0 225.641 101.020 225.641 225.578 0 124.558-101.083 225.641-225.641 225.641zM742.665 312.825h64.631c2.644 0 5.279-0.92 7.041-2.389 2.056-1.175 2.955-3.225 2.955-5.281l-5.281-182.449c-0.294-4.113-4.709-7.293-9.996-7.293h-54.383c-5.582 0-9.933 3.18-9.933 7.293l-5.030 182.449c0 2.056 0.898 4.106 2.955 5.281 1.763 1.469 4.398 2.389 7.041 2.389zM747.066 87.184h56.395c4.994 0 9.116-4.394 9.116-9.682v-55.829c0-5.288-4.122-9.682-9.116-9.682h-56.395c-5.288 0-9.682 4.394-9.682 9.682v55.829c0 5.288 4.394 9.682 9.682 9.682z" /> +<glyph unicode="" d="M791.438 906.812c-11.91 0-22.8-6.673-28.375-17.063l-194.563-356.75c-5.575-9.883-5.391-22.055 0.438-31.938 5.828-9.883 16.472-15.938 27.875-15.938h389.25c11.403 0 22.047 6.055 27.875 15.938s6.075 22.055 0.5 31.938l-194.625 356.75c-5.575 10.39-16.465 17.063-28.375 17.063zM763.625 777.062h55.688c2.281 0 4.605-1.545 6.125-2.813 1.774-1.267 2.5-3.292 2.5-4.813l-4.563-116.313c-0.253-3.294-4.064-5.813-8.625-5.813h-46.875c-4.815 0-8.563 2.518-8.563 5.813l-4.313 115.813c0 1.52 0.726 4.045 2.5 5.313 1.52 1.267 3.844 2.813 6.125 2.813zM71.188 689.187c-36.951 0-67.188-30.174-67.188-67.125v-456.938c0-36.951 30.237-67.125 67.188-67.125h228.375c0-36.531-26.813-65.089-26.813-80.625 0-14.696 12.116-26.875 26.813-26.875h215.063c14.696 0 26.813 12.179 26.813 26.875s-26.813 44.934-26.813 80.625h228.375c36.951 0 67.188 30.174 67.188 67.125v264h-53.688v-156.5c0-7.138-6.362-13.375-13.5-13.375h-671.813c-7.138 0-13.5 6.237-13.5 13.375v349.438c0 7.138 6.362 13.375 13.5 13 .375h489.437l29.25 53.75h-518.687zM767.125 614.875h48.688c4.561 0 8.063-3.814 8.063-8.375v-48.125c0-4.561-3.501-8.375-8.063-8.375h-48.688c-4.561 0-8.125 3.814-8.125 8.375v48.125c0 4.561 3.564 8.375 8.125 8.375zM303.938 614.062l-141.938-260.5h-86.437v-60.875h115.437v0.563l0.75-0.75 110.375 207.563 114.688-208.563v-0.313h0.125l0.25-0.375 0.5 0.375h88.188v2.25l59.938 123.625 60.375-124.75 0.625 0.375h115v60.875h-88.25l-39.688 75.563h-17.063c-24.749 0-48 10.425-64.5 28.063l-55.125-105.188h-30.438l-141.813 260.313-0.063-0.063-0.938 1.813z" /> +<glyph unicode="" d="M800.994 869.505c-8.652-0.196-17.688-7.392-27.004-21.092l-53.688-64.873c-17.056-21.796-5.402-45.977 8.309-70.306-15.462-18.090-33.534-38.326-51.611-58.641l-166.656 95.871-503.964-292.088 0.639-109.933 499.65-291.928 511.474 295.923-0.16 105.938-288.733 166.177 43.142 52.090c23.488 1.434 45.433-20.494 70.785 11.185l55.605 68.548c15.85 17.539 3.469 28.331-8.788 39.147l-73.981 66.79c-4.936 5.071-9.829 7.308-15.020 7.19zM812.019 816.136c5.083 0.377 10.209-1.332 14.381-5.113l14.86-13.262c8.342-7.563 9.155-20.683 1.917-29.401l-35.153-42.503c-7.237-8.718-19.94-9.64-28.282-2.077l-14.7 13.422c-8.343 7.563-9.155 20.683-1.917 29.401l35.313 42.343c3.619 4.359 8.499 6.814 13.582 7.19zM510.344 695.658l133.261-78.774c-7.060-8.039-14.086-16.040-20.453-23.489-37.075 21.559-70.044 55.951-91.877 30.519-28.893-28.283-57.34-64.28-86.923-102.742 123.827 58.863 138.342-89.050 250.065-97.15 22.709 29.448 36.439 47.025 46.178 73.821 8.622 30.983-44.467 45.713-62.316 65.0 33l18.695 22.53 215.072-127.030-404.418-240.637-411.768 238.72 414.484 239.199zM293.994 482.983l-6.391-9.108 2.716-9.108 10.066 3.515 6.391 11.025-12.783 3.675zM529.518 436.326l-12.783-12.783 14.541-5.433 8.309 10.066-10.066 8.149zM398.973 410.76l-10.067-12.783 9.108-8.149 15.499 8.149-14.54 12.783zM293.834 404.049l-12.783-12.783 14.541-5.433 8.309 10.066-10.067 8.149zM526.003 384.236l-7.51-11.664 10.386-5.273 4.953 7.35-7.83 9.587zM439.080 352.758l-7.031-9.268 6.391-6.072 10.706 6.072-10.067 9.268zM593.433 335.981l-11.025-11.824 16.458-5.592 14.7 10.066-20.133 7.35zM500.437 303.224l-3.515-15.339 11.025-6.711 6.871 11.025-14.381 11.025z" /> +<glyph unicode="" d="M511.991 954.176c-279.436 0-506.167-226.731-506.167-506.167s226.731-506.167 506.167-506.167c151.849 0 288.112 66.983 380.903 172.959-4.896 6.673-10.824 11.689-17.689 16.117-13.78 8.887-36.506 15.069-66.694 18.279-25.824-25.798-54.978-48.244-86.742-66.628-9.817-10.354-23.063-17.414-37.868-19.392-31.094-13.986-64.189-24.348-98.731-30.399-0.659 3.295-1.31 9.889-1.31 10.548-0.659 10.545 10.552 17.827 9.893 27.713-7.25 1.977-9.245 9.191-7.927 17.099 1.102 9.367 8.151 16.433 15.068 22.734l-113.144 113.144c-11.263 11.263-18.534 27.092-18.803 44.091-2.937 1.775-6.409 2.673-11.006 1.965-11.863-1.977-15.118-6.583-28.958-1.31-9.227 3.295-17.176 9.865-26.402 14.479-10.545 5.931-29 11.846-32.954 25.027-3.954 10.545-2.585 23.068-8.517 32.954-3.954 6.59-15.869 19.785-24.437 19.785 7.909 0-7.26 19.774-9.238 21.751-7.25 8.568-33.575 31.631-28.302 44.812 1.318 1.977-13.218 7.268-15.855 7.927 2.636-6.59 3.322-13.854 6.617-19.785 3.295-6.59 7.249-12.54 11.203-19.13 7.25-11.863 17.173-26.317 15.855-40.816-8.568-2.636-5.946 9.862-8.582 15.134-4.613 8.568-17.145 8.528-20.441 17.755 1.318 0.659 1.958 0.717 3.276 1.376 0.659 11.204-15.805 20.394-13.168 28.302-9.227 7.25-9.199 21.107-15.789 30.333-5.931 8.568-15.869 12.544-24.437 18.475-3.295 1.977-26.977 32.287-18.41 34.264-13.181-3.295-19.797 27.666-17.82 35.575 0 0-1.31-0.004-1.31 0.655 2.636 7.909-1.962 48.739 8.582 49.398-7.25-0.659-9.249 17.145-7.272 20.441 1.318 2.636 11.199-7.264 11.858-8.582 3.954 1.977 7.935 7.31 6.617 11.924-1.977 5.272-9.21 9.869-13.824 13.824-1.977 1.318-28.364 18.414-29.023 17.755 2.636 4.613 1.989 9.284-1.965 12.579-12.522-9.886-5.923 9.226-12.513 11.203-2.636 0.659-5.291 2.605-7.927 5.241 38.225 60.632 91.608 111.365 154.877 146.294 3.954 0.659 9.206 0.655 14.479 0.655 11.863-1.318 18.49-11.168 27.058-17.099 1.318 3.295-1.364 8.563-3.341 11.858 1.977 5.272 9.931 6.609 14.544 7.927 5.931 0.659 14.448 1.916 19.72-0.721-3.954 5.931-8.555 11.237-13.168 16.51-0.65 9-0.659-2.617-1.958-3.276-3.276-7.25 5.931-21.122-2.015-27.713-4.652-5.272-2.636-9.862-5.885-15.134-7.862-3.295-1.318-5.291-1.38-7.927-0.721 19.771 10.545 40.228 19.808 61.977 27.058 3.954-2.636 7.892-7.245 13.824-11.858-3.954 3.295-3.939-11.843-2.621-14.479 7.25-9.886 23.068-3.341 32.954-3.341-0.618 0 25.413-3.443 23.782 2.096 3.865-6.544 4.245-15.579 9.827-21.161 5.931 5.931-2.644 12.478 1.31 18.41 1.318 2.636 13.211 5.95 17.165 7.927 4.613 3.295-3.33 7.919-5.307 9.238-6.59 3.954-32.307 5.938-19.785 21.096 4.613 5.272 21.13 2.64 26.402-0.655 7.25-3.954 15.127-11.23 5.241-17.82 4.613-0.659 26.356-6.566 23.061-15.134 1.977 3.954 5.276 9.827 10.548 9.827 5.931-0.659 7.257-14.459 9.893-17.755 9.227-16.476 25.077 16.452 27.713 15.134-11.863 4.613 10.513 10.56 16.444 8.582 4.613-1.977 11.843-17.824 3.276-17.165 7.25-6.59 7.94-21.034-5.241-20.375-9.227 0.659-19.8 13.161-28.368 3.276-5.931-6.59-8.547-16.475-14.479-22.406-9.12-9.12-21.457-8.624-32.561-7.338 3.343-1.491-10.319-15.79 -11.596-18.344-3.954-4.613-6.609-9.927-7.927-15.199-1.318-6.59 0.020-13.85-3.276-20.441 11.204 3.295 17.127-17.095 12.513-17.755 13.84 1.977 25.080 1.993 38.261-2.621 9.227-3.295 23.038-7.279 26.992-17.165 2.636 3.954 15.176 1.973 19.13 0.655 7.909-3.954 8.571-12.536 10.548-19.785 2.636-9.886 11.202-26.368 22.406-21.096 1.977 1.318 16.475 7.904 11.203 11.858-5.272 4.613-11.234 16.536-5.962 23.127 5.272 7.25 17.8 9.183 21.096 18.41 5.272 15.158-15.789 13.168-15.789 24.371 0 6.59 8.521 8.601 7.862 16.51 0 6.59-9.874 19.758-1.965 24.371 6.59 3.954 38.226-2.663 44.157-6.617 5.931-3.954 24.429-9.202 25.747-15.134h-3.341c5.272-4.613 9.882-14.463 0.655-17.099 5.561 1.236 20.973-4.539 13.103-8.517 3.168 0.925 5.986 0.344 9.303 2.555 4.613 2.636 7.303 7.226 13.234 3.931 1.318-0.659 8.559 13.893 12.513 13.234 5.931-0.659 7.257-9.28 9.893-13.234 2.636-5.931 9.877-7.892 12.513-13.824 4.613-11.204 2.596-21.727 17.755-25.682 4.613-1.318 17.169 5.889 16.51-3.996 2.636 2.636 3.931 4.648 3.9 31 5.307 0.659-9.227 4.651-19.793 15.855-18.475 0 0 0.008-12.502-1.31-14.479-3.954-5.931-13.854-4.632-19.785-7.927-1.915-0.638-16.854-13.638-15.986-16.248-8.579 9.704-22.343 9.63-33.478 7.010-11.863-1.977-23.060-3.248-34.264-7.862-5.272-2.636-10.524-5.279-14.479-9.893-1.977-2.636-5.287-14.54-8.582-15.199 6.59 1.318 9.862 8.625 15.134 12.579 7.25 4.613 19.141 10.498 28.368 7.862 7.25-1.977 13.154-4.616 4.586-10.548-3.954-2.636-9.865 0.008-14.479-1.31 5.931-1.318 14.494-3.961 11.858-9.893 17.135-9.886-5.24-21.759-16.444-20.441 5.272-0.659-11.203-10.486-11.203-9.827-5.931-3.295-13.862-3.306-18.475-9.238-5.272-7.25 1.958-19.801-7.927-17.165-3.954-8.568-19.091-3.942-25.682-13.168 7.25-7.909-7.229-19.123-14.479-9.238-6.59-2.636-3.302-9.869-9.893-13.824 2.636-3.954 3.303-7.912-1.31-10.548 1.318 0.659 9.226-5.958 11.203-6.617-1.318-3.295-3.977-5.896-7.272-5.896 3.295-8.568-3.961-17.789-9.893-23.061-6.59-5.272-21.739-10.54-23.716-11.858-11.583-10.939-19.398-26.929-0.131-31.971l42.781 42.781c11.474 11.44 27.673 18.672 45.009 18.672 35.169 0 63.877-28.642 63.877-63.811v-25.289h16.379c48.398 0 104.265-3.79 157.17-22.799 30.925-11.112 61.36-28.607 86.283-53.526 12.392 43.836 18.999 90.118 18.999 137.909 0 279.436-226.731 506.167-506.167 506.167zM675.45 429.468c-4.736 0-9.17-1.898-12.513-5.241l-142.626-142.626c-3.343-3.343-5.307-7.843-5.307-12.579s1.964-9.17 5.307-12.513l142.626-142.626c3.343-3.343 7.778-5.307 12.513-5.307 9.75 0 17.82 8.070 17.82 17.82v71.346h62.436c120.064 0 198.903-23.112 198.903-155.991 0-11.421-0.606-22.843-1.441-34.264-0.279-4.457-1.376-9.498-1.376-13.955 0-5.293 3.339-9.762 8.91-9.762 3.9 0 5.846 1.931 7.796 4.717 4.179 5.85 7.287 14.82 10.351 21.227 15.879 35.657 35.378 86.592 35.378 125.592 0 31.2-3.106 63.24-14.806 92.769-38.721 96.107-152.344 112.292-243.715 112.292h-62.436v71.28c0 9.75-8.070 17.82-17.82 17.82zM502.753 428.224c-2.636-5.272 2.624-13.157 1.965-15.134-3.295-6.59-9.206-5.265-14.479-1.31-8.477 6.521-26.599-4.37-36.557- 0.131 0.973-0.523 3.184-2.712 4.914-3.865-1.977-7.909-6.594-3.26-10.548-5.896-4.613-3.295-8.559-9.939-12.513-13.234 8.568-16.476-0.659-32.259 0-50.053 0-13.181 8.574-36.252 21.096-43.502 3.089-1.716 9.954-2.846 16.641-3.21 3.276 8.423 8.266 16.063 14.479 22.275l81.5 81.5c-0.18 0.696-0.434 1.657-0.59 2.228-1.977 7.909-2.589 7.946-7.862 15.855-8.568-9.886-9.915-2.648-17.165 1.965-7.25 3.954-17.797 2.663-21.751 6.617-9.886-7.25-17.153-5.307-19.13 5.896z" /> +<glyph unicode="" d="M813.125 953.687c-115.149 0-208.563-93.414-208.563-208.563s93.414-208.563 208.563-208.563c115.149 0 208.563 93.414 208.563 208.563 0 115.149-93.414 208.563-208.563 208.563zM818.563 884.187c46.711 0 98.875-37.176 98.875-86.875 0-41.28-28.235-57.072-48.875-68.75-12.764-7.333-20.688-20.629-20.688-26.875 0-4.888-3.799-8.688-8.688-8.688h-52.125c-4.888 0-8.688 3.799-8.688 8.688v9.75c0 26.343 26.343 48.935 45.625 57.625 16.566 7.604 23.875 14.628 23.875 28.75 0 11.949-15.994 23.125-33.375 23.125-9.777 0-18.758-3.304-23.375-6.563-5.16-3.802-10.548-8.643-23.313-24.938-1.629-2.173-4.368-3.313-6.813-3.313-1.901 0-3.83 0.539-5.188 1.625l-35.813 27.188c-3.531 2.716-4.632 7.635-2.188 11.438 23.356 38.836 56.483 57.813 100.75 57.813zM76 755.25c-39.6 0-72-32.338-72-71.938v-489.688c0-39.6 32.4-71.938 72-71.938h244.75c0-39.15-28.75-69.725-28.75-86.375 0-15.75 13-28.813 28.75-28.813h230.5c15.75 0 28.75 13.063 28.75 28.813s-28.75 48.125-28.75 86.375h244.75c39.6 0 72 32.338 72 71.938v312c-17.642-4.024-36.014-6.188-54.875-6.188-0.903 0-1.787-0.010-2.688 0v-190.563c0-7.65-6.788-14.375-14.438-14.375h-720c-7.65 0-14.438 6.725-14.438 14.375v374.438c0 7.65 6.787 14.375 14.438 14.375h496c-3.004 15.353-4.563 31.205-4.563 47.438 0 3.38 0.052 6.778 0.187 10.125h-491.625zM787.063 675.625h52.125c4.888 0 8.688-3.799 8.688-8.688v-52.125c0-4.888-3.799-8.688-8.688-8.688h-52.125c-4.888 0-8.688 3.799-8.688 8.688v52.125c0 4.888 3.799 8.688 8.688 8.688zM325.438 674.75l-152.125-279.188h-92.625v-65.188h123.687v0.563l0.813-0.813 118.313 222.5 122.875-223.563v-0.313h0.187l0.25-0.438 0.5 0.438h94.563v2.375l64.188 132.5 64.75-133.688 0.625 0.438h123.25v65.188h-94.563l-93.375 178.063-0.5 1.75-0.187-0.375-0.187 0.375-0.563-1.75-94.188-179.688h-32.625l-152 278.938-0.062-0.062-1 1.938z" /> +<glyph unicode="" d="M543.040 954.496c-19.874-0.219-39.022-6.618-55.616-17.856-25.076-16.983-44.293-44.972-51.2-79.104l-24.128-119.104 219.264-44.224 24.128 118.976c13.001 64.249-22.596 125.306-79.872 136.896l-12.544 2.56c-6.712 1.358-13.407 1.929-20.032 1.856zM242.816 942.784c-3.577-0.064-7.195-0.356-10.816-0.832l-12.672-1.664c-27.158-3.573-50.302-18.327-66.368-39.68-18.208-24.2-27.326-56.865-22.784-91.392l15.808-120.448 221.76 29.248-15.744 120.32c-8.016 60.929-55.537 105.41-109.184 104.448zM821.696 875.52c-11.46-0.177-22.856-2.313-33.856-6.272-28.495-10.256-54.054-32.634-69.184-64l-52.864-109.44 201.6-97.088 52.736 109.312c28.481 59.041 9.113 126.994-43.52 152.384l-11.456 5.632c-13.878 6.694-28.721 9.699-43.456 9.472zM403.264 694.72l-19.584-96.896-0.64 4.8-4.096-20.032 1.856 1.216-6.976-34.624c-0.377 1.127-0.703 2.286-0.96 3.456l-9.856-48.896c0.661 0.932 1.369 1.831 2.112 2.688l-5.12-25.472 25.792-7.744c-0.68 1.177-1.213 2.425-1.664 3.712 1.265-1.164 2.819-2.050 4 .672-2.432 4.429-0.872 8.523 1.255 10.432 5.056l-1.472 11.328c-1.318 1.381-3.112 2.333-5.184 2.752-0.667 0.134-1.285 0.258-1.92 0.256-0.635-0.001-1.247-0.129-1.856-0.256-1.219-0.255-2.39-0.764-3.456-1.472-0.437-0.29-0.832-0.608-1.216-0.96 1.607 4.612 4.624 8.49 8.512 11.072 4.669 3.102 10.478 4.451 16.384 3.264 11.824-2.392 19.482-13.967 17.088-25.792-1.386-6.847-5.871-12.257-11.648-15.168l60.8-18.24 39.68 10.048c-0.071 1.729 0.089 3.475 0.448 5.248 1.196 5.912 4.625 10.786 9.28 13.888 4.655 3.102 10.536 4.397 16.448 3.2 6.904-1.397 12.281-5.836 15.168-11.712-0.266 0.030-0.57 0.062-0.832 0.064l-2.752-5.824 10.112 2.496c-1.351 1.532-3.288 2.624-5.504 3.072-0.224 0.045-0.42 0.095-0.64 0.128l28.224 7.104c0.581-1.034 1.064-2.109 1.536-3.2 0.714 0.34 1.366 0.635 2.112 0.896 1.411 0.494 2.932 0.887 4.416 1.088l10.176 50.496c-1.761-5.889-5.074-10.902-9.344-14.912l7.808 38.4c2.399-5.372 3.484-11.4 2.816-17.536l13.568 67.328-10.88-22.592 15.424 76.224-219.264 44.48zM372.48 673.408l-2 20.608-28.928 14.336-109.44 24.128-7.296c0.743 2.851 2.073 5.508 3.84 7.808 3.415 4.445 8.475 7.54 14.464 8.32 0.748 0.098 1.566 0.17 2.304 0.192 11.068 0.324 20.798-7.794 22.272-19.008 0.453-3.44 0.089-6.787-0.96-9.856l102.080-30.72 6.848 33.92c-9.071 1.653-16.459 8.915-17.728 18.56-0.787 5.98 0.891 11.683 4.288 16.128 3.397 4.445 8.483 7.598 14.464 8.384 2.616 0.344 5.181 0.163 7.616-0.384l22.656 112.32zM435.328 657.28c1.453 0 2.873-0.147 4.352-0.448 11.824-2.392 19.482-13.967 17.088-25.792-2.393-11.824-13.892-19.499-25.728-17.088-11.824 2.393-19.545 13.968-17.152 25.792 1.196 5.912 4.671 10.791 9.344 13.888 3.505 2.323 7.736 3.648 12.096 3.648zM653.952 652.032l-0.832-4.16-9.664-47.616c2.66 5.128 7.121 8.781 12.224 10.56 5.293 1.845 11.268 1.671 16.704-0.96 10.866-5.241 15.419-18.318 10.176-29.184-5.242-10.865-18.247-15.438-29.12-10.176-7.239 3.492-11.661 10.445-12.288 17.92l-9.344-46.080c2.379-0.276 4.762-0.882 7.040-1.984 10.866-5.242 15.419-18.382 10.176-29.248-4.719-9. 784-15.779-14.315-25.856-11.328l-4.48-21.824 50.56 12.736c-0.018 3.208 0.685 6.509 2.176 9.6 2.621 5.433 7.251 9.291 12.544 11.136 1.985 0.692 4.094 1.182 6.208 1.28 3.523 0.163 7.162-0.532 10.56-2.176 4.344-2.096 7.583-5.522 9.664-9.472l58.752 14.912c-6.641 6.353-8.819 16.485-4.608 25.216h0.064c2.621 5.433 7.138 9.217 12.416 11.072 1.979 0.696 4.034 1.171 6.144 1.28 3.517 0.183 7.164-0.602 10.56-2.24 9.932-4.791 14.482-16.028 11.2-26.24l30.656 7.744 12.352 25.536-193.984 93.696zM502.528 643.712c1.449 0.006 2.94-0.151 4.416-0.448 11.824-2.393 19.418-14.031 17.024-25.856-2.393-11.824-13.892-19.435-25.728-17.024-11.804 2.388-19.442 13.925-17.088 25.728 1.196 5.912 4.738 10.851 9.408 13.952 3.502 2.327 7.621 3.628 11.968 3.648zM334.336 638.208c11.068 0.324 20.861-7.858 22.336-19.072 1.574-11.961-6.902-22.888-18.88-24.448-11.961-1.574-22.874 6.792-24.448 18.752l0.064 0.064c-0.787 5.98 0.891 11.747 4.288 16.192 3.397 4.445 8.419 7.534 14.4 8.32 0.748 0.098 1.502 0.17 2.24 0.192zM 567.296 630.528c1.45 0.006 2.938-0.149 4.416-0.448 11.824-2.392 19.482-13.903 17.088-25.728-2.393-11.824-13.892-19.435-25.728-17.024-11.824 2.392-19.544 13.776-17.152 25.6l0.064 0.064c1.196 5.912 4.625 10.786 9.28 13.888 3.492 2.327 7.681 3.629 12.032 3.648zM268.864 629.696c11.063 0.317 20.734-7.922 22.208-19.136 1.574-11.961-6.774-22.952-18.752-24.512-11.94-1.571-22.909 6.888-24.512 18.816-0.787 5.98 0.941 11.743 4.352 16.192 3.41 4.449 8.493 7.59 14.464 8.384 0.748 0.098 1.502 0.235 2.24 0.256zM200.832 620.608c11.068 0.324 20.797-7.858 22.272-19.072 1.573-11.961-6.774-22.888-18.752-24.448-11.961-1.573-23.067 6.855-24.64 18.816-0.787 5.98 1.001 11.747 4.416 16.192 3.415 4.446 8.539 7.54 14.528 8.32 0.748 0.098 1.438 0.17 2.176 0.192zM723.712 582.272c0.706 0.038 1.404 0.033 2.112 0 2.832-0.131 5.669-0.871 8.384-2.176 10.866-5.242 15.355-18.318 10.112-29.184-5.241-10.866-18.247-15.438-29.12-10.176-10.847 5.232-15.439 18.265-10.24 29.12 2.621 5.433 7.252 9.349 12.544 11.2 1.98 4 0.694 4.089 1.102 6.208 1.216zM419.968 581.568c1.453 0 2.872-0.147 4.352-0.448 11.824-2.393 19.482-13.967 17.088-25.792-2.393-11.824-13.852-19.398-25.664-17.024-11.824 2.392-19.481 13.904-17.088 25.728h-0.064c1.196 5.912 4.671 10.855 9.344 13.952 3.505 2.323 7.672 3.584 12.032 3.584zM487.296 568c1.453 0 2.873-0.147 4.352-0.448 11.824-2.393 19.418-13.967 17.024-25.792-2.393-11.824-13.828-19.435-25.664-17.024-11.824 2.393-19.609 13.84-17.216 25.664 1.196 5.912 4.799 10.791 9.472 13.888 3.505 2.323 7.672 3.712 12.032 3.712zM552 554.88c1.45 0.006 2.874-0.149 4.352-0.448 11.824-2.393 19.482-13.903 17.088-25.728-2.393-11.824-13.916-19.462-25.728-17.088-11.824 2.393-19.352 13.905-16.96 25.728 1.196 5.912 4.625 10.722 9.28 13.824 3.492 2.327 7.617 3.693 11.968 3.712zM279.040 553.024c11.056 0.322 20.669-7.858 22.144-19.072 1.573-11.961-6.838-22.824-18.816-24.384-11.961-1.573-22.939 6.727-24.512 18.688-0.787 5.98 1.001 11.811 4.416 16.256 3.415 4.445 8.539 7.54 14.528 8.32 0.748 0.0 98 1.503 0.17 2.24 0.192zM114.112 522.176l-2.368-434.56 363.52-146.368 149.504 52.864c-8.702 11.239-16.452 23.286-23.104 35.968l-123.264-43.008-330.432 134.592v346.88l332.8-99.2 351.68 94.4-0.512-78.144c11.458-0.686 22.688-2.134 33.664-4.352l1.472 131.52-391.808-99.136-361.152 108.544zM471.936 492.352c1.453 0 3-0.211 4.48-0.512 11.824-2.393 19.418-13.903 17.024-25.728-2.393-11.824-13.98-19.462-25.792-17.088-11.824 2.392-19.48 13.904-17.088 25.728 1.196 5.912 4.735 10.855 9.408 13.952 3.505 2.323 7.608 3.648 11.968 3.648zM817.152 341.824c-109.836 0-198.912-89.14-198.912-198.976s89.076-198.912 198.912-198.912c109.836 0 198.976 89.076 198.976 198.912 0 109.836-89.14 198.976-198.976 198.976zM462.016 339.584v-315.456h33.344v315.456h-33.344zM800.576 258.944h33.152c9.067 0 16.576-7.509 16.576-16.576v-66.304h66.368c9.067 0 16.576-7.509 16.576-16.576v-33.216c0-9.067-7.509-16.576-16.576-16.576h-66.368v-66.304c0-9.067-7.509-16.576-16.576-16.576h-33.152c-9.067 0-16.576 7.509-16.576 16.5 76v66.304h-66.304c-9.067 0-16.576 7.509-16.576 16.576v33.216c0 9.067 7.509 16.576 16.576 16.576h66.304v66.304c0 9.067 7.509 16.576 16.576 16.576z" /> +<glyph unicode="" d="M809.125 953.687c-115.149 0-208.563-93.414-208.563-208.563s93.414-208.563 208.563-208.563c115.149 0 208.563 93.414 208.563 208.563 0 115.149-93.414 208.563-208.563 208.563zM809.125 892.875c81.473 0 147.75-66.277 147.75-147.75s-66.277-147.75-147.75-147.75c-81.473 0-147.75 66.277-147.75 147.75 0 81.473 66.277 147.75 147.75 147.75zM817.813 849.437c-4.888 0-8.688-3.799-8.688-8.688v-95.625h-60.813c-4.888 0-8.688-3.799-8.688-8.688v-17.375c0-4.888 3.799-8.688 8.688-8.688h86.875c4.888 0 8.688 3.799 8.688 8.688v121.688c0 4.888-3.799 8.688-8.688 8.688h-17.375zM72 755.25c-39.6 0-72-32.338-72-71.938v-489.688c0-39.6 32.4-71.938 72-71.938h244.75c0-39.15-28.75-69.725-28.75-86.375 0-15.75 13-28.813 28.75-28.813h230.5c15.75 0 28.75 13.063 28.75 28.813s-28.75 48.125-28.75 86.375h244.75c39.6 0 72 32.338 72 71.938v312c-17.642-4.024-36.014-6.188-54.875-6.188-0.903 0-1.787-0.010-2.688 0v-190.563c0-7.65-6.788-14.375-14.438-14.375h-720c-7.65 0-14.438 6.725-14.438 14.375 v374.438c0 7.65 6.787 14.375 14.438 14.375h496c-3.004 15.353-4.563 31.205-4.563 47.438 0 3.38 0.052 6.778 0.188 10.125h-491.625zM321.438 674.75l-152.125-279.188h-92.625v-65.188h123.687v0.563l0.813-0.813 118.313 222.5 122.875-223.563v-0.313h0.188l0.25-0.438 0.5 0.438h94.563v2.375l64.188 132.5 64.75-133.688 0.625 0.438h123.25v65.188h-94.563l-93.375 178.063-0.5 1.75-0.188-0.375-0.188 0.375-0.563-1.75-94.188-179.688h-32.625l-152 278.938-0.063-0.063-1 1.938z" /> +<glyph unicode="" d="M537.694 955.641c-19.874-0.219-39.045-6.651-55.639-17.889-25.076-16.983-44.278-44.945-51.185-79.078l-24.169-119.091 219.27-44.248 24.169 118.945c13.001 64.249-22.604 125.317-79.881 136.907l-12.559 2.556c-6.712 1.358-13.382 1.972-20.007 1.898zM237.448 943.885c-3.577-0.064-7.185-0.327-10.807-0.803l-12.705-1.679c-27.158-3.573-50.306-18.295-66.373-39.648-18.208-24.2-27.324-56.891-22.781-91.417l15.845-120.478 221.753 29.28-15.772 120.332c-8.016 60.929-55.513 105.376-109.161 104.414zM816.328 876.636c-11.46-0.177-22.88-2.32-33.88-6.279-28.495-10.256-54.017-32.597-69.147-63.963l-52.864-109.453 201.6-97.113 52.718 109.307c28.481 59.041 9.115 126.997-43.518 152.387l-11.464 5.622c-13.878 6.694-28.71 9.719-43.445 9.492zM397.867 695.845l-19.569-96.894-0.657 4.819-4.089-20.080 1.898 1.241-7.010-34.61c-0.377 1.127-0.692 2.262-0.949 3.432l-9.857-48.921c0.661 0.932 1.375 1.844 2.117 2.702l-5.111-25.483 25.775-7.74c-0.68 1.177-1.228 2.437-1.679 3.724 1.265-1.164 2 .82-2.028 4.673-2.41 4.429-0.872 8.533 1.237 10.441 5.038l-1.46 11.318c-1.318 1.381-3.112 2.355-5.184 2.775-0.667 0.134-1.263 0.221-1.898 0.219-0.635-0.001-1.289-0.092-1.898-0.219-1.219-0.255-2.365-0.752-3.432-1.46-0.437-0.29-0.858-0.597-1.241-0.949 1.607 4.612 4.655 8.444 8.543 11.026 4.669 3.102 10.45 4.473 16.356 3.286 11.824-2.392 19.48-13.95 17.086-25.775-1.386-6.847-5.833-12.276-11.61-15.188l60.75-18.254 39.721 10.076c-0.071 1.729 0.079 3.484 0.438 5.257 1.196 5.912 4.618 10.771 9.273 13.873 4.655 3.102 10.516 4.41 16.429 3.213 6.904-1.397 12.301-5.88 15.188-11.756-0.266 0.030-0.541 0.070-0.803 0.073l-2.775-5.841 10.076 2.556c-1.351 1.532-3.261 2.618-5.476 3.067-0.224 0.045-0.437 0.040-0.657 0.073l28.258 7.156c0.581-1.034 1.062-2.122 1.533-3.213 0.714 0.34 1.372 0.615 2.118 0.876 1.411 0.494 2.897 0.894 4.381 1.095l10.222 50.528c-1.761-5.889-5.076-10.958-9.346-14.969l7.813 38.407c2.399-5.372 3.443-11.388 2.775-17.524l13.581 67.322-10.88-22.562 15.407 76.23-219.27 44.46 7zM367.126 674.525l-220.658-28.915 14.384-109.453 24.096-7.302c0.743 2.851 2.103 5.513 3.87 7.813 3.415 4.445 8.469 7.544 14.457 8.324 0.748 0.098 1.526 0.197 2.264 0.219 11.068 0.324 20.796-7.843 22.27-19.057 0.453-3.44 0.1-6.788-0.949-9.857l102.078-30.667 6.864 33.88c-9.071 1.653-16.474 8.901-17.743 18.546-0.787 5.98 0.911 11.692 4.308 16.137 3.397 4.445 8.476 7.611 14.457 8.397 2.616 0.344 5.159 0.182 7.594-0.365l22.708 112.3zM429.921 658.388c1.453 0 2.902-0.137 4.381-0.438 11.824-2.392 19.48-13.95 17.086-25.775-2.393-11.824-13.866-19.497-25.702-17.086-11.824 2.393-19.552 13.951-17.159 25.775 1.196 5.912 4.673 10.776 9.346 13.873 3.505 2.323 7.688 3.651 12.048 3.651zM648.607 653.131l-0.876-4.162-9.638-47.607c2.66 5.128 7.091 8.809 12.194 10.587 5.293 1.845 11.285 1.682 16.721-0.949 10.866-5.241 15.392-18.341 10.149-29.207-5.242-10.865-18.188-15.411-29.061-10.149-7.239 3.492-11.713 10.415-12.34 17.889l-9.346-46.074c2.379-0.276 4.805-0.869 7.083-1.971 10.866-5.242 15.392-18 .414 10.149-29.28-4.719-9.784-15.771-14.305-25.848-11.318l-4.454-21.832 50.528 12.778c-0.018 3.208 0.699 6.474 2.19 9.565 2.621 5.433 7.266 9.326 12.559 11.172 1.985 0.692 4.092 1.144 6.206 1.241 3.523 0.163 7.117-0.546 10.514-2.19 4.344-2.096 7.63-5.469 9.711-9.419l58.706 14.895c-6.641 6.353-8.811 16.46-4.6 25.191h0.073c2.621 5.433 7.135 9.244 12.413 11.099 1.979 0.696 4.023 1.132 6.133 1.241 3.517 0.183 7.192-0.552 10.587-2.191 9.932-4.791 14.453-16.075 11.172-26.286l30.667 7.74 12.34 25.556-193.933 93.681zM497.17 644.807c1.449 0.006 2.905-0.141 4.381-0.438 11.824-2.393 19.407-14.023 17.013-25.848-2.393-11.824-13.866-19.424-25.702-17.013-11.804 2.388-19.44 13.899-17.086 25.702 1.196 5.912 4.749 10.845 9.419 13.946 3.502 2.327 7.628 3.631 11.975 3.651zM328.938 639.33c11.068 0.324 20.869-7.843 22.343-19.058 1.574-11.961-6.861-22.9-18.838-24.461-11.961-1.574-22.886 6.805-24.461 18.765l0.073 0.073c-0.787 5.98 0.838 11.692 4.235 16.137s8.476 7.538 14.457 8.324c0.748 0.098 1.453 0.197 2.191 0.219zM561.936 631.663c1.45 0.006 2.903-0.139 4.381-0.438 11.824-2.392 19.48-13.95 17.086-25.775-2.393-11.824-13.866-19.424-25.702-17.013-11.824 2.392-19.551 13.805-17.159 25.629l0.073 0.073c1.196 5.912 4.618 10.771 9.273 13.873 3.492 2.327 7.697 3.632 12.048 3.651zM263.515 630.787c11.063 0.317 20.723-7.916 22.197-19.13 1.574-11.961-6.787-22.901-18.765-24.461-11.94-1.571-22.93 6.837-24.534 18.765-0.787 5.98 0.97 11.761 4.381 16.21 3.41 4.449 8.486 7.603 14.457 8.397 0.748 0.098 1.526 0.198 2.264 0.219zM195.463 621.733c11.068 0.324 20.796-7.843 22.27-19.058 1.573-11.961-6.788-22.9-18.765-24.461-11.961-1.573-23.033 6.878-24.607 18.838-0.787 5.98 0.966 11.691 4.381 16.137 3.415 4.446 8.541 7.544 14.53 8.324 0.748 0.098 1.453 0.197 2.191 0.219zM718.339 583.399c0.706 0.038 1.409 0.033 2.117 0 2.832-0.131 5.682-0.886 8.397-2.191 10.866-5.242 15.319-18.341 10.076-29.207-5.241-10.866-18.261-15.411-29.134-10.149-10.847 5.232-15.421 18.279-10.222 29.134 2.621 5.433 7.267 9.321 12.559 11.172 1.984 0.694 4.087 1.128 6.206 1.241zM414.587 582.669c1.453 0 2.902-0.137 4.381-0.438 11.824-2.393 19.48-13.95 17.086-25.775-2.393-11.824-13.89-19.387-25.702-17.013-11.824 2.392-19.479 13.878-17.086 25.702h-0.073c1.196 5.912 4.673 10.85 9.346 13.946 3.505 2.323 7.688 3.578 12.048 3.578zM481.909 569.088c1.453 0 2.902-0.137 4.381-0.438 11.824-2.393 19.407-13.95 17.013-25.775-2.393-11.824-13.866-19.424-25.702-17.013-11.824 2.393-19.552 13.805-17.159 25.629 1.196 5.912 4.746 10.85 9.419 13.946 3.505 2.323 7.688 3.651 12.048 3.651zM546.602 556.018c1.45 0.006 2.903-0.139 4.381-0.438 11.824-2.393 19.48-13.95 17.086-25.775-2.393-11.824-13.89-19.46-25.702-17.086-11.824 2.393-19.405 13.952-17.013 25.775 1.196 5.912 4.618 10.698 9.273 13.8 3.492 2.327 7.624 3.705 11.975 3.724zM273.664 554.119c11.056 0.322 20.65-7.843 22.124-19.057 1.573-11.961-6.788-22.827-18.765-24.388-11.961-1.573-22.961 6.732-24.534 18.692-0.787 5.98 0.966 11.837 4.381 16.283 3.415 4.445 8.542 7.5 44 14.53 8.324 0.748 0.098 1.526 0.125 2.264 0.146zM108.719 523.306l-2.337-434.598 363.479-146.326 387.064 136.834 4.746 434.671-391.81-99.157-361.143 108.577zM466.576 493.442c1.453 0 2.975-0.21 4.454-0.511 11.824-2.393 19.407-13.877 17.013-25.702-2.393-11.824-13.963-19.46-25.775-17.086-11.824 2.392-19.479 13.878-17.086 25.702 1.196 5.912 4.746 10.85 9.419 13.946 3.505 2.323 7.615 3.651 11.975 3.651zM142.599 469.638l332.812-99.157 351.651 94.411-2.337-353.987-351.724-122.742-330.403 134.644v346.831zM456.645 340.69v-315.434h33.369v315.434h-33.369z" /> +<glyph unicode="" d="M809.125 953.687c-115.149 0-208.563-93.414-208.563-208.563s93.414-208.563 208.563-208.563c115.149 0 208.563 93.414 208.563 208.563 0 115.149-93.414 208.563-208.563 208.563zM907.438 831.25c4.617 0 8.991-1.929 12.25-5.188l24.688-24.438c3.259-3.259 4.875-7.883 4.875-12.5s-1.616-8.929-4.875-12.188l-147.438-147.5c-3.259-3.259-7.883-5.125-12.5-5.125-4.345 0-8.991 1.866-12.25 5.125l-98.313 98.313c-3.259 3.259-4.875 7.633-4.875 12.25s1.616 9.241 4.875 12.5l24.75 24.438c3.259 3.259 7.571 5.125 12.188 5.125s8.991-1.866 12.25-5.125l61.375-61.375 110.813 110.5c3.259 3.259 7.571 5.188 12.188 5.188zM72 755.25c-39.6 0-72-32.338-72-71.938v-489.688c0-39.6 32.4-71.938 72-71.938h244.75c0-39.15-28.75-69.725-28.75-86.375 0-15.75 13-28.813 28.75-28.813h230.5c15.75 0 28.75 13.063 28.75 28.813s-28.75 48.125-28.75 86.375h244.75c39.6 0 72 32.338 72 71.938v312c-17.642-4.024-36.014-6.188-54.875-6.188-0.903 0-1.787-0.010-2.688 0v-190.563c0-7.65-6.788-14.375-14.438-14.375h-72 0c-7.65 0-14.438 6.725-14.438 14.375v374.438c0 7.65 6.787 14.375 14.438 14.375h496c-3.004 15.353-4.563 31.205-4.563 47.438 0 3.38 0.052 6.778 0.188 10.125h-491.625zM321.438 674.75l-152.125-279.188h-92.625v-65.188h123.687v0.563l0.813-0.813 118.313 222.5 122.875-223.563v-0.313h0.188l0.25-0.438 0.5 0.438h94.563v2.375l64.188 132.5 64.75-133.688 0.625 0.438h123.25v65.188h-94.563l-93.375 178.063-0.5 1.75-0.188-0.375-0.188 0.375-0.563-1.75-94.188-179.688h-32.625l-152 278.938-0.063-0.063-1 1.938z" /> +<glyph unicode="" d="M822.261 950.336c-45.689-0.469-93.15-19.624-130.275-56.801l-129.528-129.715 238.9-238.402 129.404 129.528c69.882 69.98 76.072 176.539 13.687 238.837l-13.687 13.625c-29.243 29.202-68.187 43.341-108.5 42.927zM90.755 786.093c-29.557 0-53.379-23.822-53.379-53.379v-398.726l57.672 57.547v300.74c0 17.318 13.445 31.582 30.609 33.284 1.144 0.114 2.184 0 3.36 0h298.749l60.658 60.534h-397.668zM514.864 716.103l-272.681-272.993 238.9-238.526 5.537 5.537c0.196 22.235 2.868 43.859 7.777 64.64-11.201-3.334-23.793-0.558-32.662 8.274-12.879 12.861-12.859 33.657 0 46.536 6.43 6.44 14.766 9.682 23.206 9.705 8.44 0.023 16.891-3.149 23.33-9.581 1.234-1.233 2.3-2.553 3.297-3.919 7.423 16.697 16.397 32.54 26.69 47.407-6.69 12.452-4.73 28.289 5.786 38.821 6.43 6.439 14.766 9.682 23.206 9.705 3.781 0.010 7.533-0.653 11.136-1.929 13.364 12.574 27.872 23.951 43.425 33.844-8.082 12.717-6.677 29.701 4.417 40.812h0.124c6.43 6.44 14.766 9.682 23.206 9.705 8.44 0.023 16.891-3.14 9 23.33-9.581 3.598-3.593 6.128-7.819 7.714-12.318 17.549 6.227 35.835 10.847 54.748 13.625l-220.484 220.236zM505.719 647.792c8.458 0.002 16.891-3.258 23.33-9.705 12.879-12.86 12.863-33.781 0-46.66-12.861-12.878-33.657-12.893-46.536 0-12.879 12.861-12.985 33.782-0.125 46.66 6.43 6.44 14.872 9.703 23.33 9.705zM958.322 602.936l-57.796-57.547v-73.35c20.675-9.586 40.090-21.454 57.796-35.399v166.297zM579.069 574.567c8.458 0.012 16.891-3.168 23.33-9.581 12.879-12.861 12.738-33.719-0.125-46.598-12.861-12.879-33.657-12.894-46.536 0-12.857 12.838-12.919 33.651-0.124 46.536 6.43 6.439 14.997 9.633 23.454 9.643zM423.473 565.359c8.458 0.002 16.828-3.259 23.268-9.705 12.879-12.861 12.863-33.719 0-46.598-12.861-12.879-33.657-12.827-46.536 0-12.879 12.86-12.924 33.657-0.062 46.536v0.062c6.43 6.439 14.873 9.703 23.33 9.705zM496.76 492.134c8.458 0.002 16.891-3.196 23.33-9.643 12.879-12.861 12.738-33.656-0.125-46.536-12.861-12.878-33.657-12.893-46.536 0-12.879 12.861-12.986 33.657-0.125 46.53 6 6.43 6.439 14.997 9.641 23.454 9.643zM341.164 482.927c8.458 0.012 16.891-3.105 23.33-9.519 12.879-12.86 12.863-33.781 0-46.66-12.861-12.878-33.657-12.951-46.536-0.124-12.879 12.861-12.986 33.782-0.124 46.66 6.43 6.44 14.873 9.633 23.33 9.643zM778.089 446.407c-131.892 0-238.9-107.007-238.9-238.9 0-131.892 107.007-238.9 238.9-238.9 131.892 0 238.9 107.007 238.9 238.9 0 131.892-107.007 238.9-238.9 238.9zM414.452 409.764c8.458 0.002 16.891-3.258 23.33-9.705 12.879-12.861 12.863-33.657 0-46.536-12.861-12.879-33.781-12.952-46.66-0.124-12.879 12.86-12.985 33.781-0.125 46.66 6.43 6.44 14.997 9.703 23.454 9.705zM194.465 395.392l-129.404-129.715c-69.882-69.98-75.948-176.477-13.563-238.775l13.687-13.625c62.385-62.298 168.893-56.107 238.775 13.874l129.404 129.715-238.9 238.526zM707.788 326.024c5.288 0 10.265-2.177 13.998-5.91l56.303-56.303 56.303 56.303c3.733 3.733 8.71 5.91 13.998 5.91s10.576-2.177 14.309-5.91l27.996-27.996c3.733-3.733 5.91-9.021 5.91-14.309s-2.177-10.265-5.91-13.998 l-56.303-56.303 56.303-56.303c3.733-3.733 5.91-8.71 5.91-13.998s-2.177-10.576-5.91-14.309l-27.996-27.996c-3.733-3.733-9.021-5.91-14.309-5.91s-10.265 2.177-13.998 5.91l-56.303 56.303-56.303-56.303c-3.733-3.733-8.71-5.91-13.998-5.91s-10.576 2.177-14.309 5.91l-27.996 27.996c-3.733 3.733-5.91 9.021-5.91 14.309s2.177 10.265 5.91 13.998l56.303 56.303-56.303 56.303c-3.733 3.733-5.91 8.71-5.91 13.998s2.177 10.576 5.91 14.309l27.996 27.996c3.733 3.733 9.021 5.91 14.309 5.91z" /> +<glyph unicode="" d="M809.125 953.687c-115.149 0-208.563-93.414-208.563-208.563s93.414-208.563 208.563-208.563c115.149 0 208.563 93.414 208.563 208.563 0 115.149-93.414 208.563-208.563 208.563zM779.25 884.187h59.75c2.444 0 4.933-0.83 6.563-2.188 1.901-1.086 2.688-2.974 2.688-4.875l-4.875-168.625c-0.272-3.802-4.362-6.813-9.25-6.813h-50.25c-5.16 0-9.25 3.010-9.25 6.813l-4.563 168.625c0 1.901 0.786 3.789 2.688 4.875 1.629 1.358 4.056 2.188 6.5 2.188zM72 755.25c-39.6 0-72-32.338-72-71.938v-489.688c0-39.6 32.4-71.938 72-71.938h244.75c0-39.15-28.75-69.725-28.75-86.375 0-15.75 13-28.813 28.75-28.813h230.5c15.75 0 28.75 13.063 28.75 28.813s-28.75 48.125-28.75 86.375h244.75c39.6 0 72 32.338 72 71.938v312c-17.642-4.024-36.014-6.188-54.875-6.188-0.903 0-1.787-0.010-2.688 0v-190.563c0-7.65-6.788-14.375-14.438-14.375h-720c-7.65 0-14.438 6.725-14.438 14.375v374.438c0 7.65 6.787 14.375 14.438 14.375h496c-3.004 15.353-4.563 31.205-4.563 47.438 0 3.38 0.052 6.778 0.188 10.125h-491.62 5zM783.313 675.625h52.188c4.617 0 8.375-4.049 8.375-8.938v-51.625c0-4.888-3.758-8.938-8.375-8.938h-52.188c-4.888 0-8.938 4.049-8.938 8.938v51.625c0 4.888 4.049 8.938 8.938 8.938zM321.438 674.75l-152.125-279.188h-92.625v-65.188h123.687v0.563l0.813-0.813 118.313 222.5 122.875-223.563v-0.313h0.188l0.25-0.438 0.5 0.438h94.563v2.375l64.188 132.5 64.75-133.688 0.625 0.438h123.25v65.188h-94.563l-93.375 178.063-0.5 1.75-0.188-0.375-0.188 0.375-0.563-1.75-94.188-179.688h-32.625l-152 278.938-0.063-0.063-1 1.938z" /> +<glyph unicode="" d="M332.672 879.872l-327.872-128.704 151.36-113.152 327.872 128.704-151.36 113.152zM687.936 879.872l-151.36-113.152 327.744-128.704 151.36 113.152-327.744 128.704zM513.792 751.168v-0.128l-327.36-128.448-1.024-16.128c0.878-118.12 1.024-236.246 1.024-354.368l327.872-128.512 70.784 27.776c-4.051 17.485-6.208 35.619-6.208 54.336 0 132.61 107.518 240.128 240.128 240.128 7.907 0 15.713-0.341 23.424-1.088 0.75 54.225 1.781 108.461 2.688 162.688l-0.256 14.080-331.072 129.664zM818.624 404.288c-109.432 0-198.208-88.776-198.208-198.208s88.776-198.144 198.208-198.144c109.432 0 198.208 88.712 198.208 198.144 0 109.432-88.776 198.208-198.208 198.208zM819.328 296.704c5.618 0 11.075-2.344 15.040-6.144l107.392-107.52c3.965-3.965 6.272-9.422 6.272-15.040s-2.28-11.112-6.080-14.912l-12.416-12.352c-3.965-3.965-9.422-6.272-15.040-6.272-5.618 0-11.048 2.307-14.848 6.272l-80.32 80.128-80.256-80.128c-3.8-3.965-9.294-6.272-14.912-6.272s-11.048 2.307-14.848 6.272l-12.416 12.3 52c-3.965 3.8-6.272 9.294-6.272 14.912s2.307 11.075 6.272 15.040l107.584 107.52c3.8 3.8 9.23 6.144 14.848 6.144z" /> +<glyph unicode="" d="M819.014 950.336c-45.507-0.467-92.778-19.546-129.755-56.574l-129.012-129.198 237.947-237.451 128.888 129.012c69.603 69.701 75.769 175.835 13.632 237.885l-13.632 13.57c-29.126 29.086-67.914 43.168-108.067 42.756zM90.427 786.748c-29.439 0-53.166-23.727-53.166-53.166v-397.135l57.442 57.318v299.54c0 17.249 13.392 31.456 30.487 33.151 1.14 0.113 2.175 0 3.346 0h297.557l60.416 60.292h-396.082zM512.844 717.037l-271.594-271.903 237.947-237.575 5.515 5.515c0.195 22.146 2.856 43.684 7.746 64.382-11.156-3.321-23.698-0.556-32.532 8.241-12.828 12.81-12.808 33.522 0 46.35 6.405 6.414 14.707 9.644 23.113 9.667 8.406 0.023 16.823-3.137 23.237-9.543 1.229-1.228 2.291-2.543 3.284-3.904 7.393 16.63 16.332 32.41 26.583 47.218-6.664 12.402-4.711 28.176 5.763 38.666 6.405 6.414 14.707 9.643 23.113 9.667 3.766 0.010 7.503-0.65 11.092-1.921 13.311 12.524 27.761 23.855 43.252 33.709-8.049 12.666-6.65 29.582 4.4 40.649h0.124c6.405 6.414 14.707 9.644 23.113 9.667 8.406 0.0 23 16.823-3.137 23.237-9.543 3.583-3.578 6.104-7.788 7.684-12.269 17.479 6.202 35.692 10.804 54.529 13.57l-219.605 219.357zM503.735 648.999c8.424 0.002 16.823-3.245 23.237-9.667 12.827-12.809 12.812-33.646 0-46.474-12.81-12.827-33.523-12.842-46.35 0-12.828 12.81-12.933 33.647-0.124 46.474 6.405 6.414 14.813 9.665 23.237 9.667zM954.532 604.322l-57.566-57.318v-73.057c20.592-9.547 39.93-21.368 57.566-35.258v165.633zM576.792 576.066c8.424 0.012 16.823-3.155 23.237-9.543 12.827-12.81 12.688-33.585-0.124-46.412-12.81-12.828-33.523-12.842-46.35 0-12.805 12.787-12.867 33.517-0.124 46.35 6.405 6.414 14.937 9.594 23.361 9.605zM421.817 566.895c8.424 0.002 16.761-3.246 23.175-9.667 12.827-12.81 12.812-33.585 0-46.412-12.81-12.828-33.523-12.776-46.35 0-12.827 12.809-12.872 33.522-0.062 46.35v0.062c6.405 6.414 14.813 9.665 23.237 9.667zM494.812 493.962c8.424 0.002 16.823-3.184 23.237-9.605 12.828-12.81 12.687-33.522-0.124-46.35-12.809-12.827-33.523-12.842-46.35 0-12.827 12.81-12.934 33.52 3-0.124 46.35 6.405 6.414 14.937 9.603 23.361 9.605zM339.837 484.791c8.424 0.012 16.823-3.093 23.237-9.481 12.828-12.809 12.812-33.646 0-46.474-12.809-12.827-33.523-12.899-46.35-0.124-12.827 12.81-12.934 33.647-0.124 46.474 6.405 6.414 14.813 9.594 23.237 9.605zM777.931 448.418c-131.683 0-238.566-106.821-238.566-238.504s106.883-238.504 238.566-238.504c131.683 0 238.504 106.821 238.504 238.504 0 131.683-106.821 238.504-238.504 238.504zM412.832 411.92c8.424 0.002 16.823-3.245 23.237-9.667 12.827-12.81 12.812-33.523 0-46.35-12.81-12.828-33.647-12.9-46.474-0.124-12.828 12.809-12.933 33.646-0.124 46.474 6.405 6.414 14.937 9.665 23.361 9.667zM193.723 397.606l-128.888-129.198c-69.603-69.7-75.645-175.773-13.508-237.823l13.632-13.57c62.136-62.050 168.219-55.883 237.823 13.818l128.888 129.198-237.947 237.575zM758.040 349.088h39.72c10.87 0 19.891-9.021 19.891-19.891v-79.501h79.501c10.87 0 19.891-9.021 19.891-19.891v-39.782c0-10.87-9.021-19.829-19.891-19.829h-79.501v-79.501c0-10.87-9.02 1-19.891-19.891-19.891h-39.72c-10.87 0-19.891 9.021-19.891 19.891v79.501h-79.501c-10.87 0-19.891 8.959-19.891 19.829v39.782c0 10.87 9.021 19.891 19.891 19.891h79.501v79.501c0 10.87 9.021 19.891 19.891 19.891z" /> +<glyph unicode="" d="M111.744 955.328c-35.030 0-63.488-28.458-63.488-63.488v-888.32c0-35.030 28.458-63.424 63.488-63.424h719.104c35.030 0 63.424 28.394 63.424 63.424v76.544c-18.233 38.092-51.324 55.751-84.608 64.32v-119.68h-676.8v846.016h338.432v-274.944c0-35.030 28.394-63.488 63.424-63.488h274.944v-119.488c32.664-3.365 61.239-10.425 84.608-20.8v203.776c0 35.030-20.473 83.897-44.928 108.352l-206.208 206.272c-24.455 24.455-73.386 44.928-108.416 44.928h-422.976zM555.904 865.408c11.236-3.966 22.445-9.901 27.072-14.528l206.912-206.848c4.627-4.627 10.562-15.9 14.528-27.136h-248.512v248.512zM602.368 483.136c-5.533 0-10.75-2.302-14.656-6.208l-166.656-166.656c-3.906-3.906-6.208-9.123-6.208-14.656s2.302-10.75 6.208-14.656l166.656-166.656c3.906-3.906 9.123-6.144 14.656-6.144 11.392 0 20.8 9.408 20.8 20.8v83.328h72.896c140.284 0 232.448-27.015 232.448-182.272 0-13.345-0.688-26.655-1.664-40-0.325-5.208-1.6-11.112-1.6-16.32 0-6.184 3.858-11.392 10.368-11.392 4.557 0 6.874 2.313 9 .152 5.568 4.882 6.835 8.452 17.218 12.032 24.704 18.553 41.662 41.344 101.248 41.344 146.816 0 36.454-3.61 73.915-17.28 108.416-45.242 112.292-178.041 131.136-284.8 131.136h-72.896v83.328c0 11.392-9.408 20.864-20.8 20.864z" /> +<glyph unicode="" d="M56.384 835.456c-26.705 0-48.192-18.473-48.192-41.408v-700.8c0-22.935 21.487-41.408 48.192-41.408h915.904c26.705 0 48.192 18.473 48.192 41.408v700.8c0 22.935-21.487 41.408-48.192 41.408h-915.904zM342.208 623.872c22.643 0 44.131-2.801 64.448-8.384 20.472-5.584 39.296-13.848 56.512-24.704v-49.984c-17.371 14.734-35.819 25.835-55.36 33.28-19.542 7.444-40.138 11.136-61.696 11.136-42.496 0-74.405-11.855-95.808-35.584-21.248-23.73-31.872-59.119-31.872-106.112 0-46.838 10.624-82.063 31.872-105.792 21.403-23.729 53.312-35.648 95.808-35.648 16.595 0 31.452 1.432 44.48 4.224 13.028 2.947 24.744 7.455 35.136 13.504v93.248h-76.8v38.656h123.328v-149.12c-18.146-12.873-38.164-22.643-60.032-29.312-21.868-6.514-45.201-9.792-70.016-9.792-54.283 0-96.78 15.849-127.488 47.488-30.553 31.794-45.824 75.935-45.824 132.544 0 56.764 15.271 100.969 45.824 132.608 30.708 31.794 73.205 47.744 127.488 47.744zM699.264 623.872c48.699 0 87.642-16.364 116.8-49.088 29.157-32.57 43. 776-76.361 43.776-131.264 0-54.748-14.619-98.475-43.776-131.2-29.158-32.57-68.101-48.832-116.8-48.832-48.854 0-87.935 16.262-117.248 48.832-29.158 32.569-43.712 76.297-43.712 131.2 0 54.903 14.554 98.694 43.712 131.264 29.313 32.724 68.394 49.088 117.248 49.088zM699.264 585.664c-34.121 0-61.246-12.709-81.408-38.144-20.007-25.436-30.016-60.109-30.016-104 0-43.736 10.009-78.309 30.016-103.744 20.162-25.435 47.287-38.144 81.408-38.144 34.12 0 61.108 12.709 80.96 38.144 20.007 25.435 30.016 60.008 30.016 103.744 0 43.891-10.009 78.564-30.016 104-19.852 25.435-46.84 38.144-80.96 38.144z" /> +<glyph unicode="" d="M142.592 881.28c-75.083 0-136.768-61.685-136.768-136.768v-585.984c0-75.083 61.685-136.768 136.768-136.768h742.272c75.083 0 136.768 61.685 136.768 136.768v429.76c0 75.083-61.685 136.704-136.768 136.704h-410.176v19.52c0 75.083-61.685 136.768-136.768 136.768h-195.328zM476.544 596.032h65.088c5.28 0 9.973-3.781 10.56-8.768l8.192-54.016c9.093-2.933 17.925-6.416 26.432-10.816l41.664 31.36c1.76 1.76 4.4 2.624 7.040 2.624s5.243-1.12 7.296-2.88c15.547-14.373 36.128-32.613 48.448-49.92 1.467-1.76 2.048-4.053 2.048-6.4 0-2.64-0.901-4.731-2.368-6.784-9.973-13.493-20.811-26.405-30.784-40.192 4.987-9.387 9.099-19.056 12.032-28.736l53.632-8.192c4.987-0.88 8.512-5.573 8.512-10.56v-65.152c0-4.4-3.499-9.68-8.192-10.56l-54.272-8.192c-3.227-9.387-6.763-18.181-11.456-26.688 9.973-14.373 20.571-27.312 31.424-40.512 1.76-2.053 2.944-4.656 2.944-7.296 0-2.64-0.928-4.731-2.688-6.784-7.040-9.387-46.603-52.48-56.576-52.48-2.64 0-5.269 1.157-7.616 2.624l-40.512 31.68c-8.507- 4.4-17.595-8.203-26.688-11.136-2.053-17.893-3.819-36.992-8.512-54.592-1.173-4.693-5.28-8.192-10.56-8.192h-65.088c-5.28 0-9.973 3.845-10.56 8.832l-8.256 53.952c-9.093 2.933-17.861 6.48-26.368 10.88l-41.408-31.424c-2.053-1.76-4.656-2.624-7.296-2.624s-5.307 1.147-7.36 3.2c-15.547 14.080-36.064 32.267-48.384 49.28-1.467 2.053-2.048 4.437-2.048 6.784 0 2.64 0.901 4.667 2.368 6.72 9.973 13.493 20.811 26.405 30.784 40.192-4.987 9.387-9.099 19.083-12.032 29.056l-53.696 7.936c-4.987 0.88-8.512 5.573-8.512 10.56v65.088c0 4.4 3.536 9.68 7.936 10.56l54.592 8.192c2.933 9.387 6.699 18.208 11.392 27.008-9.973 14.080-20.507 27.312-31.36 40.512-1.76 2.053-2.944 4.4-2.944 7.040 0 2.64 1.157 4.667 2.624 6.72 7.040 9.68 46.667 52.48 56.64 52.48 2.64 0 5.269-1.12 7.616-2.88l40.512-31.424c8.507 4.4 17.595 8.203 26.688 11.136 2.053 17.893 3.819 36.992 8.512 54.592 1.173 4.693 5.28 8.192 10.56 8.192zM509.056 445.824c-41.36 0-75.072-33.712-75.072-75.072s33.712-75.072 75.072-75.072c41.36 0 75.136 33. 712 75.136 75.072 0 41.36-33.776 75.072-75.136 75.072z" /> +<glyph unicode="" d="M332.672 879.872l-327.872-128.704 151.36-113.152 327.872 128.704-151.36 113.152zM687.936 879.872l-151.36-113.152 327.744-128.704 151.36 113.152-327.744 128.704zM513.792 751.168v-0.128l-327.36-128.448-1.024-16.128c0.878-118.12 1.024-236.246 1.024-354.368l327.872-128.512 70.784 27.776c-4.051 17.485-6.208 35.619-6.208 54.336 0 132.61 107.518 240.128 240.128 240.128 7.907 0 15.713-0.341 23.424-1.088 0.75 54.225 1.781 108.461 2.688 162.688l-0.256 14.080-331.072 129.664zM820.288 403.712c-109.041 0-197.568-88.463-197.568-197.504s88.527-197.504 197.568-197.504c109.041 0 197.504 88.463 197.504 197.504 0 109.041-88.463 197.504-197.504 197.504zM825.408 337.92c44.234 0 93.632-35.241 93.632-82.304 0-39.090-26.791-54.030-46.336-65.088-12.087-6.944-19.52-19.557-19.52-25.472 0-4.629-3.627-8.192-8.256-8.192h-49.344c-4.629 0-8.256 3.563-8.256 8.192v9.28c0 24.946 24.941 46.298 43.2 54.528 15.688 7.201 22.656 13.891 22.656 27.264 0 11.316-15.157 21.824-31.616 21.824 -9.258 0-17.772-3.058-22.144-6.144-4.886-3.6-10.057-8.25-22.144-23.68-1.543-2.057-4.085-3.072-6.4-3.072-1.8 0-3.578 0.507-4.864 1.536l-33.984 25.728c-3.343 2.572-4.363 7.216-2.048 10.816 22.117 36.776 53.505 54.784 95.424 54.784zM795.584 140.416h49.344c4.629 0 8.256-3.627 8.256-8.256v-49.344c0-4.629-3.627-8.256-8.256-8.256h-49.344c-4.629 0-8.256 3.627-8.256 8.256v49.344c0 4.629 3.627 8.256 8.256 8.256z" /> +<glyph unicode="" d="M848.022 957.115c-47.606-0.488-97.058-20.471-135.741-59.207l-134.993-135.118 248.92-248.422 134.868 134.993c72.814 72.916 79.212 183.884 14.21 248.796l-14.21 14.21c-30.47 30.427-71.050 45.179-113.055 44.748zM85.805 785.974c-30.797 0-55.593-24.796-55.593-55.593v-415.449l60.080 59.955v313.363c0 18.045 14.026 32.879 31.91 34.652 1.192 0.118 2.265 0 3.49 0h311.244l63.196 63.071h-414.327zM527.679 713.056l-284.071-284.445 248.92-248.547 283.946 284.445-248.796 248.546zM518.206 641.882c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.434-48.488 0-13.419 13.401-13.525 35.194-0.124 48.612 6.7 6.71 15.494 10.095 24.306 10.096zM989.746 595.139l-60.205-59.955v-313.363c0-18.045-14.026-33.003-31.91-34.777-1.192-0.118-2.265 0-3.49 0h-311.119l-63.196-62.947h414.327c30.797 0 55.593 24.796 55.593 55.593v415.449zM594.615 565.598c8.812 0.012 17.597-3.289 24.306-9.972 13.419-13.401 13.278-35.194-0.124-48.612-13.4-13.419- 35.069-13.435-48.488 0-13.396 13.377-13.455 35.063-0.124 48.488 6.7 6.709 15.618 10.086 24.431 10.096zM432.449 556c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.401 13.403-35.194 0-48.612-13.4-13.419-35.069-13.365-48.488 0-13.419 13.4-13.525 35.068-0.124 48.488v0.124c6.7 6.709 15.494 10.094 24.306 10.096zM668.032 492.181c8.794 0.024 17.597-3.27 24.306-9.972 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.434-48.488 0-13.419 13.4-13.523 35.068-0.124 48.488h0.124c6.7 6.71 15.387 10.072 24.182 10.096zM508.857 479.716c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.401 13.278-35.068-0.124-48.488-13.4-13.419-35.069-13.434-48.488 0-13.419 13.401-13.525 35.069-0.124 48.488 6.7 6.709 15.618 10.094 24.431 10.096zM346.691 470.118c8.812 0.012 17.597-3.289 24.306-9.972 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.489-48.488-0.124-13.419 13.401-13.525 35.194-0.124 48.612 6.7 6.71 15.494 10.086 24.306 10.096zM582.274 406.299c8.794 0.024 17.597-3.27 24.306-9.972 13 .419-13.401 13.403-35.193 0-48.612-13.4-13.419-35.069-13.365-48.488 0-13.419 13.401-13.398 35.069 0 48.488 6.7 6.709 15.387 10.072 24.182 10.096zM423.1 393.834c8.812 0.002 17.597-3.379 24.306-10.096 13.419-13.401 13.403-35.069 0-48.488-13.4-13.419-35.193-13.49-48.612-0.124-13.419 13.4-13.525 35.193-0.124 48.612 6.7 6.71 15.618 10.095 24.431 10.096zM193.874 378.877l-134.868-135.118c-72.814-72.916-79.088-183.884-14.085-248.796l14.21-14.21c65.003-64.912 175.982-58.457 248.796 14.459l134.868 135.118-248.92 248.547zM496.517 320.417c8.794 0.024 17.597-3.27 24.306-9.972 13.419-13.4 13.403-35.193 0-48.612-13.4-13.419-35.069-13.365-48.488 0-13.419 13.401-13.398 35.068 0 48.488 6.7 6.71 15.387 10.072 24.182 10.096z" /> +<glyph unicode="" d="M734.375 960.188c-158.999 0-287.875-128.938-287.875-287.938 0-158.999 128.876-287.875 287.875-287.875 158.999 0 287.875 128.876 287.875 287.875 0 158.999-128.876 287.938-287.875 287.938zM702.063 810.875h64.688c5.456 0 9.875-4.419 9.875-9.875v-86.5h86.5c5.456 0 9.813-4.419 9.813-9.875v-64.688c0-5.456-4.357-9.875-9.813-9.875h-86.5v-86.5c0-5.456-4.419-9.875-9.875-9.875h-64.688c-5.456 0-9.875 4.419-9.875 9.875v86.5h-86.563c-5.456 0-9.813 4.419-9.813 9.875v64.688c0 5.456 4.357 9.875 9.813 9.875h86.563v86.5c0 5.456 4.419 9.875 9.875 9.875zM71.625 680.875c-39.393 0-71.625-32.232-71.625-71.625v-487c0-39.393 32.232-71.625 71.625-71.625h243.5c0-38.946-28.625-69.437-28.625-86 0-15.668 12.957-28.625 28.625-28.625h229.25c15.668 0 28.625 12.957 28.625 28.625s-28.625 47.95-28.625 86h243.5c39.393 0 71.625 32.232 71.625 71.625v212.313c-18.438-6.833-37.592-12.242-57.313-16v-81.75c0-7.61-6.702-14.313-14.313-14.313h-716.25c-7.61 0-14.313 6.702-14.313 14.313v372.438c 0 7.61 6.702 14.313 14.313 14.313h305.938c-2.156 15.937-3.25 32.16-3.25 48.688 0 2.878 0.058 5.763 0.125 8.625h-302.813z" /> +<glyph unicode="" d="M512 784.019c-112.035 0-202.875-90.84-202.875-202.875s90.84-202.875 202.875-202.875c112.035 0 202.875 90.84 202.875 202.875 0 112.035-90.84 202.875-202.875 202.875zM402.5 627.207h219v-92.125h-219v92.125zM955.733 357.257c0-9.067-8-17.067-17.067-17.067h-853.333c-9.067 0-17.067 8-17.067 17.067v443.733c0 9.067 8 17.067 17.067 17.067h853.333c9.067 0 17.067-8 17.067-17.067v-443.733M1024 800.99c0 46.933-38.4 85.333-85.333 85.333h-853.333c-46.933 0-85.333-38.4-85.333-85.333v-580.267c0-46.933 38.4-85.333 85.333-85.333h290.133c0-46.4-34.133-82.667-34.133-102.4 0-18.667 15.467-34.133 34.133-34.133h273.067c18.667 0 34.133 15.467 34.133 34.133 0 18.667-34.133 57.067-34.133 102.4h290.133c46.933 0 85.333 38.4 85.333 85.333v580.267" /> +<glyph unicode="" d="M435.391 611.416v57.457c0 42.195 34.414 76.609 76.609 76.609 42.195 0 76.609-34.414 76.609-76.609v-57.457h-153.218M684.37 582.688c0 15.86-12.868 28.728-28.728 28.728h-9.576v57.457c0 73.616-60.449 134.066-134.066 134.066-73.616 0-134.066-60.449-134.066-134.066v-57.457h-9.576c-15.86 0-28.728-12.868-28.728-28.728v-172.37c0-15.86 12.868-28.728 28.728-28.728h287.283c15.86 0 28.728 12.868 28.728 28.728v172.37M955.733 364.876c0-9.067-8-17.067-17.067-17.067h-853.333c-9.067 0-17.067 8-17.067 17.067v443.733c0 9.067 8 17.067 17.067 17.067h853.333c9.067 0 17.067-8 17.067-17.067v-443.733M1024 808.609c0 46.933-38.4 85.333-85.333 85.333h-853.333c-46.933 0-85.333-38.4-85.333-85.333v-580.267c0-46.933 38.4-85.333 85.333-85.333h290.133c0-46.4-34.133-82.667-34.133-102.4 0-18.667 15.467-34.133 34.133-34.133h273.067c18.667 0 34.133 15.467 34.133 34.133 0 18.667-34.133 57.067-34.133 102.4h290.133c46.933 0 85.333 38.4 85.333 85.333v580.267" /> +<glyph unicode="" d="M514.625 956.062c-88.26 0.766-176.662-21.232-255.688-66-0.039-0.023-0.085-0.040-0.125-0.063-0.092-0.052-0.158-0.135-0.25-0.188-3.625-2.058-7.29-4.159-10.875-6.313-3.255-1.956-6.467-3.903-9.688-5.938-1.98-1.251-3.908-2.531-5.875-3.813-0.862-0.559-1.767-1.124-2.625-1.688-0.298-0.197-0.577-0.365-0.875-0.563-2.341-1.545-4.691-3.108-7-4.688-0.909-0.622-1.846-1.248-2.75-1.875-0.4-0.279-0.788-0.595-1.188-0.875-3.093-2.159-6.090-4.342-9.125-6.563-21.414-15.671-41.403-32.822-59.813-51.313-17.528-17.605-33.669-36.411-48.313-56.188-0.302-0.408-0.574-0.778-0.875-1.188-1.752-2.369-3.482-4.733-5.188-7.125-0.452-0.637-0.926-1.298-1.375-1.938-2.063-2.923-4.068-5.857-6.063-8.813-0.32-0.477-0.619-0.96-0.938-1.438-2.184-3.261-4.337-6.576-6.438-9.875-22.235-34.922-39.724-71.986-52.625-110.25-2.613-7.749-5.083-15.533-7.313-23.375-1.118-3.933-2.228-7.796-3.25-11.75-1.026-3.969-1.946-7.949-2.875-11.938-0.626-2.686-1.231-5.431-1.813-8.125-0.776-3.561-1.55-7.108-2.25-10. 688-0.693-3.543-1.382-7.065-2-10.625-0.155-0.9-0.288-1.786-0.438-2.688-0.605-3.599-1.097-7.261-1.625-10.875-0.591-4.046-1.194-8.061-1.688-12.125-0.493-4.056-0.917-8.114-1.313-12.188-4.292-44.182-2.855-89.317 4.813-134.25 0.688-4.030 1.462-8.036 2.25-12.063 0.78-3.985 1.559-7.958 2.438-11.938 0.071-0.327 0.178-0.673 0.25-1 0.637-2.859 1.312-5.707 2-8.563 0.965-4.040 1.936-8.042 3-12.063 10.998-41.542 27.409-81.964 49.063-120.188 0.075-0.132 0.113-0.243 0.188-0.375 2.058-3.625 4.159-7.228 6.313-10.813 1.956-3.255 3.903-6.53 5.938-9.75 1.25-1.987 2.538-3.91 3.813-5.875 0.756-1.161 1.483-2.344 2.25-3.5 1.545-2.341 3.108-4.691 4.688-7 0.898-1.307 1.838-2.637 2.75-3.938 2.159-3.093 4.342-6.090 6.563-9.125 28.985-39.607 63.187-74.185 101.188-103.25 139.034-106.34 329.102-138.288 502.875-67.375 89.645 36.582 163.308 95.735 217 168.25 0.59 0.797 1.165 1.575 1.75 2.375 1.849 2.516 3.641 5.021 5.438 7.563 0.072 0.104 0.115 0.209 0.188 0.313 2.063 2.923 4.131 5.857 6.125 8.813 0.225 0.3 33 0.464 0.728 0.688 1.063 0.095 0.143 0.154 0.296 0.25 0.438 2.184 3.261 4.274 6.513 6.375 9.813 22.235 34.922 39.786 71.986 52.688 110.25 2.613 7.749 5.083 15.533 7.313 23.375 1.118 3.933 2.165 7.858 3.188 11.813 1.026 3.969 2.009 7.949 2.938 11.938 0.528 2.249 1.064 4.493 1.563 6.75 0.096 0.441 0.155 0.871 0.25 1.313 0.776 3.561 1.55 7.108 2.25 10.688 0.693 3.543 1.32 7.128 1.938 10.688 0.082 0.471 0.232 0.903 0.313 1.375 0.072 0.428 0.116 0.884 0.188 1.313 0.605 3.599 1.097 7.198 1.625 10.813 0.591 4.046 1.131 8.061 1.625 12.125 0.493 4.056 0.979 8.177 1.375 12.25 4.292 44.182 2.855 89.255-4.813 134.188-0.688 4.030-1.462 8.036-2.25 12.063-0.78 3.985-1.559 8.020-2.438 12-0.002 0.016-0.059-0.018-0.063 0-0.666 3.045-1.34 6.152-2.063 9.188-0.028 0.118-0.096 0.195-0.125 0.313-0.965 4.040-1.998 8.042-3.063 12.063-22.271 84.121-66.349 163.724-132.313 229.688-98.432 98.432-227.067 148.193-356.063 149.313zM314.875 841.687l106.5-154.688c-34.195-11.814-66.326-31.389-93.625-58.688-2 6.757-26.757-46.124-58.133-58-91.563l-154.938 105.313c20.403 42.021 48.11 81.36 83 116.25 35.126 35.126 74.718 62.93 117.063 83.375zM512.25 646.125c50.463-0.538 100.742-20.117 139.25-58.625 42.833-42.833 62.158-100.234 58-156.25-0.016-0.207 0.016-0.418 0-0.625-0.070-0.898-0.167-1.792-0.25-2.688-0.14-1.546-0.261-3.082-0.438-4.625-0.012-0.103-0.051-0.209-0.063-0.313-0.27-2.333-0.648-4.676-1-7-0.368-2.427-0.793-4.835-1.25-7.25-0.457-2.415-0.953-4.85-1.5-7.25-0.536-2.355-1.065-4.662-1.688-7-0.012-0.045-0.051-0.080-0.063-0.125-0.262-0.973-0.536-1.969-0.813-2.938-0.154-0.544-0.279-1.082-0.438-1.625-0.438-1.489-0.903-3.023-1.375-4.5-0.107-0.336-0.203-0.664-0.313-1-0.38-1.172-0.786-2.334-1.188-3.5-0.101-0.292-0.21-0.584-0.313-0.875-0.664-1.9-1.34-3.742-2.063-5.625-0.141-0.366-0.295-0.76-0.438-1.125-0.362-0.925-0.749-1.893-1.125-2.813-0.187-0.459-0.372-0.917-0.563-1.375-19.784-47.382-57.646-87.131-108.938-108.063-100.671-41.082-215.445 5.849-258.813 104.875-0.688 1.572-1.285 3.090-1. 938 4.688-0.808 1.981-1.635 4.009-2.375 6-0.256 0.69-0.502 1.372-0.75 2.063-0.801 2.237-1.594 4.491-2.313 6.75-0.037 0.116-0.026 0.196-0.063 0.313-0.742 2.349-1.472 4.693-2.125 7.063-0.008 0.027 0.008 0.098 0 0.125-0.66 2.397-1.306 4.835-1.875 7.25-0.517 2.195-0.995 4.354-1.438 6.563-0.044 0.221-0.081 0.466-0.125 0.688-0.010 0.045-0.054 0.080-0.063 0.125-0.020 0.103-0.043 0.21-0.063 0.313-0.448 2.278-0.822 4.532-1.188 6.813-0.035 0.221-0.091 0.466-0.125 0.688-0.353 2.25-0.601 4.5-0.875 6.75-0.89 7.363-1.365 14.719-1.438 22.125-0.048 4.937 0.060 9.883 0.375 14.813 0.157 2.465 0.377 4.916 0.625 7.375 0.248 2.459 0.536 4.925 0.875 7.375 0.233 1.683 0.537 3.323 0.813 5 0.187 1.135 0.356 2.306 0.563 3.438 0.383 2.078 0.802 4.126 1.25 6.188 0.038 0.175 0.024 0.325 0.063 0.5 0.178 0.81 0.374 1.63 0.563 2.438 0.406 1.76 0.858 3.5 1.313 5.25 0.543 2.076 1.079 4.132 1.688 6.188 0.066 0.223 0.121 0.465 0.188 0.688 0.062 0.206 0.125 0.419 0.188 0.625 4.943 16.293 11.989 31.953 20.875 46 .5 2.483 4.065 5.101 8.050 7.875 11.938 0.086 0.12 0.164 0.193 0.25 0.313 1.128 1.567 2.321 3.146 3.5 4.688 0.396 0.52 0.723 1.046 1.125 1.563 0.642 0.822 1.343 1.623 2 2.438 1.203 1.493 2.435 2.972 3.688 4.438 1.377 1.611 2.813 3.235 4.25 4.813 0.897 0.987 1.77 1.967 2.688 2.938 1.018 1.074 2.016 2.131 3.063 3.188 0.233 0.236 0.516 0.453 0.75 0.688 1.088 1.088 2.206 2.192 3.313 3.25 39.166 37.435 89.786 55.913 140.25 55.375zM508.875 597.5c-30.465-0.253-60.869-9.605-86.75-28.125-0.52-0.371-1.048-0.748-1.563-1.125-0.372-0.273-0.755-0.535-1.125-0.813-1.605-1.198-3.202-2.433-4.75-3.688-0.064-0.052-0.061-0.135-0.125-0.188-0.096-0.079-0.217-0.171-0.313-0.25-1.315-1.074-2.602-2.136-3.875-3.25-0.908-0.796-1.857-1.616-2.75-2.438-1.097-1.009-2.113-2.077-3.188-3.125-0.563-0.548-1.197-1.068-1.75-1.625-2.47-2.484-4.783-5.051-7.063-7.688-2.938-3.387-5.725-6.864-8.313-10.438-0.259-0.359-0.557-0.702-0.813-1.063-0.073-0.102-0.115-0.21-0.188-0.313-1.127-1.6-2.25-3.235-3.313-4.875-1.128-1.736 -2.2-3.479-3.25-5.25-0.097-0.164-0.216-0.336-0.313-0.5-4.045-6.882-7.448-14.001-10.313-21.313-0.109-0.278-0.205-0.596-0.313-0.875-0.040-0.105-0.085-0.145-0.125-0.25-0.669-1.745-1.333-3.543-1.938-5.313-0.485-1.425-0.933-2.814-1.375-4.25-0.173-0.558-0.334-1.128-0.5-1.688-0.048-0.161-0.078-0.339-0.125-0.5-0.537-1.831-1.032-3.649-1.5-5.5-0.041-0.162-0.085-0.275-0.125-0.438-0.462-1.855-0.92-3.751-1.313-5.625-0.196-0.944-0.322-1.866-0.5-2.813-0.211-1.111-0.439-2.259-0.625-3.375-0.010-0.058 0.010-0.13 0-0.188-0.331-2-0.624-3.985-0.875-6-0.004-0.029 0.004-0.096 0-0.125-0.126-1.014-0.207-1.982-0.313-3-0.102-1.008-0.293-1.991-0.375-3-0.004-0.029 0.002-0.096 0-0.125-0.162-2.002-0.292-3.994-0.375-6-0.004-0.088 0.004-0.162 0-0.25-0.080-2.022-0.063-4.101-0.063-6.125 0-0.074-0.063-0.114-0.063-0.188 0.004-1.888 0.051-3.738 0.125-5.625 0.056-1.425 0.154-2.885 0.25-4.313 0.056-0.825 0.118-1.613 0.188-2.438 0.008-0.104-0.009-0.209 0-0.313 0.146-1.707 0.358-3.422 0.563-5.125 0.244-2.016 0.485-4 .047 0.813-6.063 0.247-1.522 0.58-3.042 0.875-4.563 0.207-1.074 0.395-2.179 0.625-3.25 0.016-0.073 0.046-0.114 0.063-0.188 0.435-2.009 0.92-4.007 1.438-6 0.054-0.207 0.070-0.418 0.125-0.625 0.525-1.988 1.080-3.968 1.688-5.938 0.644-2.089 1.389-4.185 2.125-6.25 0.644-1.805 1.286-3.591 2-5.375 0.118-0.294 0.255-0.581 0.375-0.875 0.060-0.148 0.127-0.29 0.188-0.438 0.926-2.252 1.898-4.473 2.938-6.688 1.027-2.187 2.113-4.354 3.25-6.5 0.070-0.134 0.117-0.242 0.188-0.375 0.913-1.711 1.829-3.443 2.813-5.125 0.018-0.008 0.045-0.056 0.063-0.063 37.386-64.155 117.276-92.674 188-63.813 30.888 12.605 55.361 34.249 71.625 60.625 0.016 0.008-0.017 0.053 0 0.063 0.62 1.007 1.216 2.042 1.813 3.063 0.241 0.411 0.513 0.775 0.75 1.188 0.236 0.413 0.455 0.835 0.688 1.25 0.766 1.366 1.53 2.741 2.25 4.125 0.061 0.116 0.127 0.259 0.188 0.375 0.882 1.705 1.687 3.395 2.5 5.125 0.836 1.78 1.612 3.632 2.375 5.438 0.026 0.060 0.1 0.065 0.125 0.125 0.28 0.664 0.542 1.333 0.813 2 0.189 0.468 0.378 0.968 0 .563 1.438 0.527 1.339 1.011 2.646 1.5 4 0.054 0.15 0.134 0.288 0.188 0.438 0.078 0.22 0.173 0.468 0.25 0.688 0.61 1.729 1.203 3.436 1.75 5.188 0.010 0.026-0.008 0.098 0 0.125 0.008 0.028-0.008 0.036 0 0.063 0.608 1.955 1.158 3.958 1.688 5.938 0.006 0.016 0.057 0.046 0.063 0.063 0.294 1.108 0.544 2.199 0.813 3.313 0.221 0.91 0.421 1.835 0.625 2.75 0.456 2.039 0.879 4.065 1.25 6.125 0.367 2.035 0.654 4.073 0.938 6.125 0.852 6.16 1.354 12.417 1.438 18.688 0.027 2.068-0.004 4.113-0.063 6.188-0.055 1.949-0.119 3.922-0.25 5.875-0.008 0.118 0.008 0.194 0 0.313-0.008 0.104-0.055 0.209-0.063 0.313-0.141 1.961-0.344 3.912-0.563 5.875-0.113 1.010-0.179 2.052-0.313 3.063-0.030 0.028-0.032 0.034-0.063 0.063-4.18 31.917-18.478 62.791-43 87.313-29.884 29.884-69.143 44.637-108.313 44.313zM510.063 537.562c23.406 0.011 46.826-8.951 64.688-26.813 15.614-15.614 24.357-35.487 26.313-55.875 0.088-0.92 0.19-1.828 0.25-2.75 0.020-0.305 0.045-0.632 0.063-0.938 0.048-0.875 0.102-1.749 0.125-2.625 0. 010-0.352-0.006-0.71 0-1.063 0.012-0.836 0.010-1.664 0-2.5-0.004-0.371 0.009-0.755 0-1.125-0.020-0.821-0.083-1.617-0.125-2.438-0.041-0.798-0.125-1.642-0.188-2.438-0.030-0.385-0.028-0.74-0.063-1.125-0.037-0.411-0.020-0.84-0.063-1.25-0.035-0.341-0.148-0.659-0.188-1-0.1-0.859-0.189-1.708-0.313-2.563-0.173-1.193-0.343-2.379-0.563-3.563-0.134-0.726-0.286-1.464-0.438-2.188-0.096-0.458-0.209-0.919-0.313-1.375-0.53-2.344-1.164-4.647-1.875-6.938-0.355-1.145-0.725-2.245-1.125-3.375-0.247-0.699-0.486-1.431-0.75-2.125-0.167-0.44-0.326-0.876-0.5-1.313-0.887-2.226-1.88-4.35-2.938-6.5-0.343-0.696-0.638-1.436-1-2.125-9.65-18.435-25.658-33.645-46.438-42.125-43.704-17.835-93.21 0.577-115.063 41.25 0.016 0.014 0.047 0.049 0.063 0.063-0.584 1.082-1.151 2.15-1.688 3.25-0.203 0.416-0.429 0.832-0.625 1.25-0.274 0.584-0.55 1.158-0.813 1.75-0.072 0.162-0.116 0.337-0.188 0.5-0.949 2.175-1.79 4.397-2.563 6.625-0.296 0.854-0.605 1.702-0.875 2.563-0.079 0.249-0.174 0.501-0.25 0.75-0.036 0.116-0.027 0.25 9-0.063 0.375-0.673 2.242-1.253 4.472-1.75 6.75-0.256 1.176-0.478 2.379-0.688 3.563-0.839 4.732-1.347 9.522-1.438 14.313-0.021 1.095-0.081 2.217-0.063 3.313 0.002 0.102 0.060 0.211 0.063 0.313 0.023 1.123 0.061 2.191 0.125 3.313 0.004 0.075-0.005 0.175 0 0.25 0.067 1.122 0.142 2.256 0.25 3.375 0.008 0.074 0.055 0.113 0.063 0.188 0.11 1.119 0.223 2.26 0.375 3.375 0.010 0.075 0.052 0.175 0.063 0.25 0.15 1.086 0.31 2.169 0.5 3.25 0.018 0.102 0.044 0.211 0.063 0.313 0.193 1.080 0.393 2.113 0.625 3.188 0.022 0.103 0.040 0.21 0.063 0.313 0.206 0.937 0.452 1.882 0.688 2.813 0.037 0.146 0.024 0.292 0.063 0.438 0.294 1.139 0.661 2.246 1 3.375 0.035 0.116 0.027 0.197 0.063 0.313 0.311 1.022 0.652 2.050 1 3.063 0.046 0.132 0.079 0.306 0.125 0.438 0.344 0.987 0.746 1.961 1.125 2.938 0.431 1.107 0.839 2.16 1.313 3.25 0.081 0.186 0.168 0.377 0.25 0.563 0.402 0.91 0.817 1.851 1.25 2.75 0.097 0.202 0.214 0.423 0.313 0.625 0.423 0.863 0.86 1.711 1.313 2.563 0.557 1.051 1.152 2.034 1.75 3.063 0.151 0.259 0.284 0.555 0.438 0.813 0.458 0.768 0.955 1.555 1.438 2.313 0.638 1.006 1.322 1.956 2 2.938 0.678 0.982 1.345 1.919 2.063 2.875 0.717 0.956 1.432 1.883 2.188 2.813 0.756 0.929 1.581 1.912 2.375 2.813 0.585 0.664 1.145 1.29 1.75 1.938 0.693 0.74 1.403 1.465 2.125 2.188 1.116 1.116 2.217 2.204 3.375 3.25 1.003 0.906 2.092 1.771 3.125 2.625 16.837 13.922 37.473 20.928 58.125 20.938zM750.938 357l154.688-106.188c-20.439-42.297-48.221-81.971-83.313-117.063-34.792-34.792-74.049-62.364-115.938-82.75l-104.688 155.125c33.092 11.902 64.171 31.108 90.688 57.625 27.213 27.213 46.737 59.176 58.563 93.25z" /> +<glyph unicode="" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512c66.303 0 129.662 12.622 187.813 35.563l-172.625 166.563c-9.401 9.612-22.223 26.804-13.188 52.063 4.518 12.629 15.405 22.31 24.75 26.563 9.345 4.252 17.402 4.981 24.813 4.938h0.188c13.183-0.152 26.138-0.162 39.188-0.25v47.688c-27.318-13.96-58.243-21.813-90.938-21.813-110.562 0-200.688 90.125-200.688 200.688 0 110.562 90.125 200.688 200.688 200.688 110.562 0 200.688-90.125 200.688-200.688 0-2.128-0.059-4.263-0.125-6.375h156.563c30.462 0 56.25-25.788 56.25-56.25v-163.625c11.789 0.041 23.915 0.113 35.375 0.125 0.062 0 0.125 0 0.188 0 3.413 0.019 6.771 0.036 10.375-0.313 33.721 68.272 52.688 145.139 52.688 226.438 0 282.77-229.23 512-512 512zM512 601.687c-85.133 0-153.688-68.555-153.688-153.688s68.555-153.625 153.688-153.625c34.087 0 65.515 10.993 90.938 29.625v61.375c0 30.462 25.788 56.25 56.25 56.25h6.313c0.085 2.111 0.125 4.243 0.125 6.375 0 85.133-68.492 153.688-153.625 153.688zM512 535.812c 48.514 0 87.813-39.298 87.813-87.813s-39.298-87.813-87.813-87.813c-48.514 0-87.813 39.298-87.813 87.813 0 48.514 39.298 87.813 87.813 87.813zM677.875 378.625c-7.352 0-13.25-5.898-13.25-13.25v-187.25c-21.552 0.088-43.273 0.245-65.313 0.5-11.289 0.066-12.123-6.619-6.188-12.688l152.375-147c9.536-10.132 27.469-10.712 36.813-0.813l149.875 146.5c9.989 10.041 8.127 14.215-6.875 14.125-19.968-0.020-40.895-0.093-62-0.188v186.813c0 7.352-5.96 13.25-13.313 13.25h-172.125z" /> +<glyph unicode="" d="M510 958.875c-281.665 0-510-228.335-510-510 0-22.673 1.507-44.984 4.375-66.875 2.193 4.532 4.453 8.009 5.875 10l0.25 0.375c9.717 13.361 21.684 25.891 37.563 41.625 7.939 7.867 16.090 15.519 24.688 22.375 4.299 3.428 8.584 6.64 14.375 10 5.791 3.36 11.622 8.875 30.75 8.875 17.755 0 30.043-6.938 38.625-13.375l0.313-0.188 0.313-0.25 7.75-6c1.22 6.502 2.658 13.116 4.438 19.875 0.011 0.045 0.051 0.080 0.063 0.125 0.056 0.211 0.069 0.414 0.125 0.625h0.063c6.86 25.867 32.257 46.375 60.188 46.375h77.625c5.401 0 10.7-0.706 15.813-2 28.796 75.1 101.58 128.438 186.813 128.438 110.457 0 200-89.543 200-200 0-84.589-52.545-156.889-126.75-186.125 2.088-6.384 3.188-13.131 3.188-20.063v-77.625c0-15.769-4.929-26.967-12.5-37.188s-19.343-20.408-37.5-23.813l-0.875-0.188-0.813-0.125-16.188-2.438c1.813-2.219 3.447-4.356 5.313-6.625 0.214-0.261 0.41-0.488 0.625-0.75l-0.063-0.063c8.337-9.975 14.813-22.678 14.813-40 0-12.907-6.444-28.269-13.188-37.438l0.188-0.188c-0.525-0 .699-1.329-1.482-1.875-2.188-0.068-0.088-0.119-0.225-0.188-0.313-8.87-11.437-20.255-23.658-35.063-38.375-7.919-7.87-16.040-15.492-24.625-22.375-4.292-3.442-8.583-6.743-14.375-10.125-0.196-0.114-0.429-0.256-0.625-0.375 19.85-2.347 40.018-3.625 60.5-3.625 281.665 0 510 228.335 510 510 0 281.665-228.335 510-510 510zM510 600.312c-70.334 0-129.471-47.941-146.5-112.938 2.421-5.261 4.161-11.018 5.063-17.25h0.125l0.25-1.688 2.125-13.938 10.188 7.688 0.125-0.188c12.323 9.899 25.614 13.25 37.938 13.25 1.067 0 2.092-0.077 3.125-0.125 11.285 37.699 46.195 65.188 87.563 65.188 50.495 0 91.438-40.943 91.438-91.438 0-41.027-27.030-75.734-64.25-87.313 0.216-2.18 0.313-4.271 0.313-6.25 0-14.103-6.637-29.18-12-36.688l-0.25-0.313-0.188-0.313c-3.087-4.177-5.536-7.265-8.563-11.188l17.938-2.75 0.563-0.125 0.563-0.063c3.234-0.571 6.343-1.385 9.313-2.375 66.819 15.754 116.563 75.748 116.563 147.375 0 83.632-67.806 151.438-151.438 151.438zM229.75 473.125c-6.295 0-11.164-4.155-12.563-9.75-5.595-20.98 2-7.74-43.731-10.188-65.063-10.841-3.497-21.671-8.067-31.813-13.313l-48.25 37.438c-2.798 2.098-5.915 3.5-9.063 3.5-11.89 0-59.107-51.085-67.5-62.625-1.749-2.448-3.188-4.853-3.188-8 0-3.147 1.402-5.99 3.5-8.438 12.939-15.737 25.548-31.464 37.438-48.25-5.595-10.491-10.128-20.935-13.625-32.125l-65.063-9.813c-5.246-1.049-9.438-7.379-9.438-12.625v-77.625c0-5.945 4.18-11.513 10.125-12.563l64-9.438c3.497-11.89 8.43-23.435 14.375-34.625-11.89-16.436-24.86-31.851-36.75-47.938-1.749-2.448-2.813-4.853-2.813-8 0-2.798 0.751-5.615 2.5-8.063 14.687-20.283 39.153-41.964 57.688-58.75 2.448-2.448 5.603-3.875 8.75-3.875 3.147 0 6.24 1.089 8.688 3.188l49.313 37.375c10.141-5.246 20.659-9.44 31.5-12.938l9.813-64.313c0.699-5.945 6.268-10.5 12.563-10.5h77.625c6.295 0 11.226 4.217 12.625 9.813 5.595 20.982 7.677 43.668 10.125 65 10.841 3.497 21.671 8.067 31.813 13.313l48.25-37.75c2.798-1.749 5.978-3.188 9.125-3.188 11.89 0 59.107 51.435 67.5 62.625 2.098 2.448 3.125 4.915 3.125 8.063 0 3.147-1.402 6.24-3.5 8.688-12.939 15.737-25.548 31.177-37.438 48.313 5.595 10.141 9.841 20.622 13.688 31.813l64.688 9.75c5.595 1.049 9.75 7.379 9.75 12.625v77.625c0 5.945-4.18 11.513-10.125 12.563l-64 9.813c-3.497 11.54-8.368 23.060-14.313 34.25 11.89 16.436 24.798 31.851 36.688 47.938 1.749 2.448 2.813 4.915 2.813 8.063 0 2.798-0.689 5.589-2.438 7.688-14.687 20.632-39.153 42.302-57.688 59.438-2.448 2.098-5.603 3.5-8.75 3.5-3.147 0-6.339-1.027-8.438-3.125l-49.625-37.438c-10.141 5.246-20.659 9.44-31.5 12.938l-9.75 64.313c-0.699 5.945-6.33 10.5-12.625 10.5h-77.625zM268.563 294.125c49.308 0 89.563-40.255 89.563-89.563s-40.255-89.5-89.563-89.5c-49.308 0-89.5 40.192-89.5 89.5 0 49.308 40.192 89.563 89.5 89.563zM268.563 244.812c-22.502 0-40.188-17.686-40.188-40.188s17.686-40.25 40.188-40.25c22.502 0 40.25 17.748 40.25 40.25 0 22.502-17.748 40.188-40.25 40.188z" /> +<glyph unicode="" d="M74.063 956.062c-19.457 0-35.125-21.011-35.125-47.063v-94.5h134.313v94.5c0 26.052-15.606 47.063-35.063 47.063h-64.125zM374.5 956.062c-19.457 0-35.125-21.011-35.125-47.063v-403h134.188c0.043 0.040 0.082 0.085 0.125 0.125v402.875c0 26.052-15.606 47.063-35.063 47.063h-64.125zM674.938 956.062c-19.457 0-35.125-21.011-35.125-47.063v-166h134.313v166c0 26.052-15.606 47.063-35.063 47.063h-64.125zM35.063 779.25c-19.457 0-35.063-21.011-35.063-47.063v-263.313c0-26.052 15.606-47.063 35.063-47.063h142.063c19.457 0 35.125 21.011 35.125 47.063v263.313c0 26.052-15.668 47.063-35.125 47.063h-142.063zM34.875 707.75h142.438v-21.5h-142.438v21.5zM635.938 707.75c-19.457 0-35.063-20.948-35.063-47v-104c15.662 24.321 43.503 41.438 73.438 41.438h83.938c20.164 0 39.537-6.703 54.875-18.813v81.375c0 26.052-15.668 47-35.125 47h-142.063zM635.75 636.25h142.438v-21.5h-142.438v21.5zM34.875 621.25h142.438v-21.563h-142.438v21.563zM34.875 534.687h142.438v-21.5h-142.438v21.5zM674.313 5 25.062c-6.803 0-12.051-4.578-13.563-10.625-6.047-22.678-8.354-47.194-11-70.25-11.717-3.78-23.414-8.706-34.375-14.375l-52.188 40.438c-3.024 2.268-6.411 3.75-9.813 3.75-12.851 0-63.866-55.152-72.938-67.625-1.89-2.646-3.375-5.286-3.375-8.688 0-3.402 1.482-6.417 3.75-9.063 13.985-17.008 27.587-34.045 40.438-52.188-6.047-11.339-10.97-22.655-14.75-34.75l-70.313-10.625c-5.669-1.134-10.188-7.893-10.188-13.563v-83.938c0-6.425 4.512-12.491 10.938-13.625l69.188-10.188c3.78-12.851 9.075-25.343 15.5-37.438-12.851-17.764-26.837-34.364-39.688-51.75-1.89-2.646-3-5.286-3-8.688 0-3.024 0.735-6.042 2.625-8.688 15.874-21.922 42.343-45.358 62.375-63.5 2.646-2.646 6.036-4.187 9.438-4.187 3.402 0 6.792 1.17 9.438 3.437l53.313 40.438c10.961-5.669 22.283-10.22 34-14l10.625-69.563c0.756-6.425 6.759-11.312 13.563-11.312h83.938c6.803 0 12.051 4.515 13.563 10.562 6.047 22.678 8.354 47.257 11 70.313 11.717 3.78 23.414 8.706 34.375 14.375l52.188-40.813c3.024-1.89 6.411-3.437 9.813-3.437 12.851 0 63.866 55 .593 72.938 67.688 2.268 2.646 3.375 5.286 3.375 8.688 0 3.402-1.482 6.792-3.75 9.438-13.985 17.008-27.587 33.667-40.438 52.188 6.047 10.961 10.592 22.28 14.75 34.375l69.938 10.563c6.047 1.134 10.563 7.956 10.563 13.625v83.875c0 6.425-4.575 12.491-11 13.625l-69.125 10.563c-3.78 12.473-9.075 24.968-15.5 37.063 12.851 17.764 26.837 34.426 39.688 51.813 1.89 2.646 3 5.286 3 8.688 0 3.024-0.735 6.045-2.625 8.313-15.874 22.3-42.343 45.73-62.375 64.25-2.646 2.268-6.036 3.75-9.438 3.75-3.402 0-6.795-1.107-9.063-3.375l-53.688-40.438c-10.961 5.669-22.283 10.22-34 14l-10.625 69.5c-0.756 6.425-6.759 11.375-13.563 11.375h-83.938zM335.5 470.75c-19.457 0-35.063-21.011-35.063-47.063v-263.313c0-26.052 15.606-47 35.063-47h69.938c-33.134 13.606-52.563 45.472-52.563 80.188v11.125h-17.563v21.5h17.563v51.25c0 4.934 0.315 9.522 0.938 13.813h-18.5v21.5h24.813c2.629 5.701 5.88 10.963 9.563 16.063 8.874 12.288 21.91 25.142 43.188 31.688-2.548 5.236-4.823 11.007-6.438 17.25h-71.125v21.5h68.625c0.507 24.321 12.526 43.361 17 49.625l0.375 0.5c5.712 7.854 11.32 14.66 17.375 21.375h-103.188zM38.938 386.562v-403.563c0-26.052 15.668-47 35.125-47h64.125c19.457 0 35.063 20.948 35.063 47v403.563h-134.313zM716.25 331.5c53.292 0 96.813-43.458 96.813-96.75s-43.52-96.75-96.813-96.75c-53.292 0-96.75 43.458-96.75 96.75 0 53.292 43.458 96.75 96.75 96.75zM716.25 258.375c-13.519 0-23.625-10.106-23.625-23.625s10.106-23.563 23.625-23.563c13.519 0 23.625 10.044 23.625 23.563 0 13.519-10.106 23.625-23.625 23.625zM339.375 78.062v-95.063c0-26.052 15.668-47 35.125-47h64.125c15.104 0 27.84 12.658 32.813 30.5-15.844 14.589-33.52 32.2-49.125 53.75l-0.125 0.188-0.125 0.25c-11.849 16.588-16.313 35.972-16.313 51.188 0 2.060 0.18 4.114 0.375 6.188h-66.75z" /> +<glyph unicode="" d="M273.688 951.437c-33.519 0-60.75-27.231-60.75-60.75v-370c5.404 1.596 11.056 2.5 16.813 2.5h64.125v347.313h323.813v-263.125c0-33.519 27.231-60.688 60.75-60.688h263.063v-485.75h-402c0.246-2.283 0.438-4.601 0.438-7.063 0-13.068-6.55-28.614-13.375-37.875l0.25-0.188c-0.527-0.702-1.328-1.48-1.875-2.188-0.068-0.088-0.119-0.225-0.188-0.313-7.839-10.11-17.7-20.887-30-33.313h467c33.519 0 60.75 27.168 60.75 60.688v566.688c0 33.519-19.6 80.35-43 103.75l-197.375 197.313c-23.4 23.4-70.168 43-103.688 43h-404.75zM698.688 865.437c10.751-3.795 21.51-9.51 25.938-13.938l197.938-197.938c4.427-4.427 10.080-15.186 13.875-25.938h-237.75v237.813zM229.75 473.125c-6.295 0-11.164-4.155-12.563-9.75-5.595-20.982-7.74-43.731-10.188-65.063-10.841-3.497-21.671-8.067-31.813-13.313l-48.25 37.438c-2.798 2.098-5.915 3.5-9.063 3.5-11.89 0-59.107-51.085-67.5-62.625-1.749-2.448-3.188-4.853-3.188-8 0-3.147 1.402-5.99 3.5-8.438 12.939-15.737 25.548-31.464 37.438-48.25-5.595-10.491-10.128 -20.935-13.625-32.125l-65.063-9.813c-5.246-1.049-9.438-7.379-9.438-12.625v-77.625c0-5.945 4.18-11.513 10.125-12.563l64-9.438c3.497-11.89 8.43-23.435 14.375-34.625-11.89-16.436-24.86-31.851-36.75-47.938-1.749-2.448-2.813-4.853-2.813-8 0-2.798 0.751-5.615 2.5-8.063 14.687-20.283 39.153-41.964 57.688-58.75 2.448-2.448 5.603-3.875 8.75-3.875 3.147 0 6.24 1.089 8.688 3.188l49.313 37.375c10.141-5.246 20.659-9.44 31.5-12.938l9.813-64.313c0.699-5.945 6.268-10.5 12.563-10.5h77.625c6.295 0 11.226 4.217 12.625 9.813 5.595 20.982 7.677 43.668 10.125 65 10.841 3.497 21.671 8.067 31.813 13.313l48.25-37.75c2.798-1.749 5.978-3.188 9.125-3.188 11.89 0 59.107 51.435 67.5 62.625 2.098 2.448 3.125 4.915 3.125 8.063 0 3.147-1.402 6.24-3.5 8.688-12.939 15.737-25.548 31.177-37.438 48.313 5.595 10.141 9.841 20.622 13.688 31.813l64.688 9.75c5.595 1.049 9.75 7.379 9.75 12.625v77.625c0 5.945-4.18 11.513-10.125 12.563l-64 9.813c-3.497 11.54-8.368 23.060-14.313 34.25 11.89 16.436 24.798 31.851 36.688 47 .938 1.749 2.448 2.813 4.915 2.813 8.063 0 2.798-0.689 5.589-2.438 7.688-14.687 20.632-39.153 42.302-57.688 59.438-2.448 2.098-5.603 3.5-8.75 3.5-3.147 0-6.339-1.027-8.438-3.125l-49.625-37.438c-10.141 5.246-20.659 9.44-31.5 12.938l-9.75 64.313c-0.699 5.945-6.33 10.5-12.625 10.5h-77.625zM453.563 465.687c2.478-1.648 4.81-3.373 7-5.25l0.75-0.625 0.688-0.625c17.199-15.901 42.155-37.161 62.125-64.188 0.045-0.061 0.080-0.127 0.125-0.188 0.719-0.976 1.545-1.821 2.25-2.813l-0.25-0.188c1.709-2.338 3.219-4.718 4.5-7.063h309.563c11.384 0 20.25 8.866 20.25 20.25v40.5c0 11.384-8.866 20.188-20.25 20.188h-386.75zM539.125 303.812c29.88-6.9 48-32.732 48-61.125v-19.813h253.188c11.384 0 20.25 8.866 20.25 20.25v40.438c0 11.384-8.866 20.25-20.25 20.25h-301.188zM268.563 294.125c49.308 0 89.563-40.255 89.563-89.563s-40.255-89.5-89.563-89.5c-49.308 0-89.5 40.192-89.5 89.5 0 49.308 40.192 89.563 89.5 89.563z" /> +<glyph unicode="" d="M223.442 951.232c-45.411 0-82.562-37.151-82.562-82.562v-49.55h-66.023c-36.123 0-66.089-29.901-66.089-66.023v-660.56c0-36.123 29.966-66.023 66.089-66.023h491.22c-14.446 20.139-26.248 42.322-34.856 66.023h-76.566v148.651h65.694c2.298 11.271 5.327 22.29 8.961 33.012h-74.655v165.124h165.124v-37.492c10.434 8.194 21.438 15.638 33.012 22.271v15.221h30.903c32.407 13.488 67.937 20.888 105.228 20.888 27.297 0 53.661-3.97 78.542-11.399v304.286c0 36.123-29.901 66.023-66.023 66.023h-66.089v49.55c0 45.411-37.151 82.562-82.562 82.562h-33.012c-45.411 0-82.562-37.151-82.562-82.562v-49.55h-198.201v49.55c0 45.411-37.151 82.562-82.562 82.562h-33.012zM223.442 885.143h33.012c8.773 0 16.539-7.7 16.539-16.473v-148.651c0-8.773-7.766-16.473-16.539-16.473h-33.012c-8.773 0-16.539 7.7-16.539 16.473v148.651c0 8.773 7.766 16.473 16.539 16.473zM619.778 885.143h33.012c8.773 0 16.539-7.7 16.539-16.473v-148.651c0-8.773-7.766-16.473-16.539-16.473h-33.012c-8.773 0-16.539 7.7-16.539 16.473v148.651c0 8.773 7.766 16.473 16.539 16.473zM74.857 620.985h148.585v-148.651h-148.585v148.651zM256.453 620.985h165.124v-148.651h-165.124v148.651zM454.654 620.985h165.124v-148.651h-165.124v148.651zM652.789 620.985h148.651v-148.651h-148.651v148.651zM74.857 439.323h148.585v-165.124h-148.585v165.124zM256.453 439.323h165.124v-165.124h-165.124v165.124zM788.921 415.075c-126.386 0-228.906-102.587-228.906-228.972 0-126.386 102.521-228.906 228.906-228.906 126.386 0 228.906 102.521 228.906 228.906 0 126.386-102.521 228.972-228.906 228.972zM784.77 348.261c1.389 0.035 2.754 0 4.151 0 89.424 0 162.158-72.735 162.158-162.158 0-89.424-72.735-162.159-162.158-162.159-89.424 0-162.158 72.735-162.158 162.159 0 88.027 70.508 159.935 158.007 162.158zM798.475 300.621c-5.365 0-9.554-4.189-9.554-9.554v-104.965h-66.748c-5.365 0-9.554-4.123-9.554-9.488v-19.108c0-5.365 4.189-9.554 9.554-9.554h95.345c5.365 0 9.554 4.189 9.554 9.554v133.562c0 5.365-4.189 9.554-9.554 9.554h-19.043zM74.857 241.188h14 8.585v-148.651h-148.585v148.651zM256.453 241.188h165.124v-148.651h-165.124v148.651z" /> +<glyph unicode="" d="M553.438 957.687c-31.069-0.319-63.38-13.345-88.625-38.625l-88-88.125 162.438-162.25 88 88.188c47.52 47.587 51.672 120.012 9.25 162.375l-9.313 9.25c-19.885 19.857-46.337 29.469-73.75 29.188zM344.313 798.437l-185.313-185.625 162.438-162.188 185.313 185.563-162.438 162.25zM878.938 779.437c-39.322-0.403-80.174-16.941-112.125-48.938l-111.375-111.563 205.563-205.313 111.438 111.625c60.144 60.228 65.317 151.883 11.625 205.5l-11.75 11.688c-25.168 25.133-58.679 37.356-93.375 37zM338.188 751.937c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.745 8.747-22.992 0-31.75-8.745-8.757-22.93-8.767-31.688 0-8.758 8.746-8.808 22.993-0.063 31.75 4.373 4.379 10.124 6.561 15.875 6.563zM388 702.187c5.751 0.006 11.559-2.139 15.938-6.5 8.758-8.746 8.684-22.993-0.063-31.75-8.745-8.758-22.867-8.768-31.625 0-8.746 8.734-8.836 22.927-0.125 31.688 4.373 4.379 10.124 6.556 15.875 6.563zM282.25 695.875c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8 .758-22.93-8.785-31.688-0.063-8.758 8.745-8.808 22.93-0.063 31.688v0.063c4.373 4.379 10.124 6.561 15.875 6.563zM436 654.25c5.739 0.016 11.496-2.126 15.875-6.5 8.758-8.745 8.684-22.93-0.063-31.688-8.745-8.758-22.867-8.767-31.625 0-8.758 8.745-8.807 22.867-0.063 31.625 4.373 4.379 10.136 6.547 15.875 6.563zM332.063 646.125c5.751 0.001 11.496-2.179 15.875-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8.757-22.93-8.767-31.688 0-8.758 8.746-8.808 22.93-0.063 31.688 4.373 4.379 10.124 6.561 15.875 6.563zM226.25 639.875c5.751 0.006 11.559-2.201 15.938-6.563 8.758-8.745 8.685-22.93-0.063-31.688-8.745-8.757-22.867-8.785-31.625-0.063-8.758 8.746-8.87 22.93-0.125 31.688 4.373 4.379 10.124 6.618 15.875 6.625zM380.063 598.25c5.739 0.016 11.434-2.189 15.813-6.563 8.758-8.746 8.747-22.93 0-31.688-8.745-8.757-22.93-8.785-31.688-0.063-8.758 8.746-8.744 22.93 0 31.688 4.373 4.379 10.136 6.609 15.875 6.625zM276.125 590.125c5.751 0.001 11.496-2.241 15.875-6.625 8.758-8.746 8.685-22.93-0.063-31.6 88-8.745-8.758-22.867-8.785-31.625-0.063-8.758 8.745-8.808 22.992-0.063 31.75 4.373 4.379 10.124 6.624 15.875 6.625zM614.313 577.812l-136.75-136.938c10.954-3.684 21.212-8.931 30.438-15.438 1.067 5.224 3.575 10.194 7.625 14.25v0.063c5.534 5.542 12.846 8.311 20.125 8.313s14.52-2.764 20.063-8.313c11.084-11.069 11.070-29.041 0-40.125-3.538-3.543-7.76-5.906-12.25-7.188l27.938-27.938c1.264 4.482 3.662 8.72 7.188 12.25 5.534 5.542 12.846 8.311 20.125 8.313 7.279 0.002 14.52-2.764 20.063-8.313 11.084-11.069 11.070-29.041 0-40.125-3.557-3.562-7.796-5.976-12.313-7.25l25.688-25.625c1.268 4.495 3.647 8.767 7.188 12.313v0.063c5.534 5.542 12.799 8.293 20.063 8.313s14.52-2.714 20.063-8.25c11.084-11.069 11.070-29.041 0-40.125-3.587-3.592-7.878-5.982-12.438-7.25l24.625-24.625 128.188 128.313-205.625 205.313zM324.063 542.187c5.739 0.016 11.496-2.126 15.875-6.5 8.758-8.745 8.684-22.992-0.063-31.75-8.745-8.757-22.867-8.785-31.625-0.063-8.758 8.746-8.744 22.93 0 31.688 4.373 4.379 10.073 6.609 1 5.813 6.625zM168.938 538c3.885-11.584 5.563-23.321 5.563-34.563 0-20.381-2.096-28.36-2-24.438l-0.063-0.5c-0.978-13.36-1.563-25.919-1.563-37.75 0-68.022 10.894-76.887 28.125-88 4.033-2.601 9.774-5.152 17.125-7.563l72.875 72.938-120.063 119.875zM606.563 519c7.279 0.002 14.583-2.764 20.125-8.313 11.084-11.068 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.096-40.063 0-11.084 11.069-11.131 29.041-0.063 40.125 5.534 5.542 12.784 8.311 20.063 8.313zM69.625 516.125c-5.076 0-7.65-2.562-10.188-6.188-5.439-7.614-9.387-19.223-13.375-27.563-20.666-46.409-46.063-112.74-46.063-163.5 0-40.608 3.96-82.318 19.188-120.75 50.397-125.087 198.327-146.125 317.25-146.125h81.25v-92.812c0-12.69 10.498-23.188 23.188-23.188 6.164 0 11.962 2.524 16.313 6.875l185.625 185.625c4.351 4.351 6.938 10.149 6.938 16.313s-2.587 11.962-6.938 16.313l-185.625 185.688c-4.351 4.351-10.149 6.875-16.313 6.875-12.69 0-23.188-10.498-23.188-23.188v-92.813h-81.25c-156.268 0-258.875 30.054-258.875 203 0 14.865 0.725 29. 76 1.813 44.625 0.363 5.801 1.813 12.324 1.813 18.125 0 6.889-4.311 12.688-11.563 12.688zM669.625 456c7.279 0.008 14.583-2.73 20.125-8.25 11.084-11.069 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.097-40.063 0-11.073 11.058-11.098 28.975-0.063 40.063 5.534 5.542 12.784 8.304 20.063 8.313zM730.375 395.375c7.264 0.020 14.52-2.714 20.063-8.25 11.084-11.068 11.008-29.041-0.063-40.125-11.069-11.084-28.978-11.096-40.063 0-11.073 11.057-11.034 28.913 0 40 5.534 5.542 12.799 8.355 20.063 8.375z" /> +<glyph unicode="" d="M510.464 956.992c-281.96 0-510.464-228.504-510.464-510.464 0-281.925 228.504-510.528 510.464-510.528 281.96 0 510.464 228.602 510.464 510.528 0 281.96-228.504 510.464-510.464 510.464zM377.412 740.695c12.768-1.834 285.282-42.285 399.914-109.159 14.214-8.289 21.276-16.969 30.024-26.105 31.674-32.767 73.645-169.124 78.125-197.271l-1.707-2.908c-1.658-0.635-5.679-3.383-10.935-7.016-26.595-18.764-89.209-62.601-169.523-55.37-72.201 6.419-166.344 47.678-279.883 122.559 4.903-11.816 28.629-67.716 32.615-77.24l1.517-1.896c16.401-8.43 174.247-88.94 252.514-87.353 63.101 1.199 130.826 32.066 157.703 48.291 2.751 1.658 5.979 3.407 8.659 1.643 2.187-1.869 1.851-5.519 1.075-8.975-1.658-7.76-5.333-21.89-7.838-28.38l-2.149-5.562c-3.245-8.218-5.957-16.026-11.883-20.859-15.837-14.32-41.274-25.873-81.095-43.297-61.443-26.701-161.113-43.791-253.842-43.297-33.226 0.882-65.224 4.466-93.547 7.711-85.004 9.594-146.825 16.494-160.863-58.846-83.488 79.855-135.707 192.154-1 35.707 316.733 0 95.409 30.623 183.644 82.296 255.422 83.488-19.011 145.826-39.287 160.358-44.119 0.141 6.243 1.327 62.828 1.327 62.828l0.822 1.959 2.023 0.506zM676.131 625.342c-29.009-0.361-56.447-11.285-77.809-31.225-22.68-21.233-35.842-49.986-36.724-81.095-2.257-64.229 48.083-118.343 112.383-120.6 31.039-1.058 60.606 10.019 83.497 31.288 22.715 21.092 35.714 49.978 36.913 81.159 2.257 64.088-48.358 118.118-112.446 120.41-1.947 0.071-3.881 0.087-5.815 0.063zM676.953 591.146c1.347 0.018 2.69-0.014 4.045-0.063 44.865-1.587 80.028-39.426 78.441-84.256-0.705-21.621-9.818-41.729-25.725-56.508-15.837-14.849-36.452-22.527-58.214-21.68-44.865 1.587-80.028 39.334-78.441 84.129 0.564 21.692 9.747 41.757 25.725 56.571 14.847 13.822 33.966 21.54 54.169 21.807zM694.272 550.188c-19.964 0-36.155-10.764-36.155-23.956 0-13.262 16.191-23.956 36.155-23.956 19.893 0 35.965 10.694 35.965 23.956 0 13.192-16.072 23.956-35.965 23.956zM625.545 1086.061v0z" /> +<glyph unicode="" d="M604.101 811.165h-189.14v88.12h189.14v-88.12zM927.651 582.955h-286.179v68.426h286.179v-68.426zM927.651 487.349h-286.179v34.239h286.179v-34.239zM927.651 416.216h-286.179v34.293h286.179v-34.293zM927.651 86.403h-286.179v51.439h286.179v-51.439zM552.238 125.207c0-23.251-19.058-42.308-42.256-42.308h-381.358c-23.198 0-42.203 19.058-42.203 42.308v498.675c0 23.251 19.005 42.202 42.203 42.202h381.358c23.198 0 42.256-18.951 42.256-42.202v-498.675zM641.472 380.331h190.733v-34.133h-190.733v34.133zM907.213 758.983h-795.524c-61.684 0-111.69-49.952-111.69-111.637v-539.55c0-61.79 50.006-111.796 111.69-111.796h795.524c61.684 0 111.689 50.005 111.689 111.796v539.55c0 61.684-50.006 111.637-111.689 111.637M319.090 344.287c-36.309 0-69.327 13.165-95.817 34.293-33.655-27.763-55.632-69.381-55.632-116.414v-141.629h303.005v141.629c0 47.033-21.977 88.651-55.738 116.414-26.437-21.128-59.401-34.293-95.818-34.293M319.090 381.074c65.029 0 117.901 52.766 117.901 117.794 0 64.97 5-52.872 117.847-117.901 117.847-64.974 0-117.847-52.872-117.847-117.847 0-65.028 52.872-117.794 117.847-117.794" /> +<glyph unicode="" d="M173.521 956.047c-19.457 0-35.093-20.974-35.093-47.026v-94.522h134.317v94.522c0 26.052-15.636 47.026-35.093 47.026h-64.131zM473.957 956.047c-19.457 0-35.093-20.974-35.093-47.026v-403.011h134.317v403.011c0 26.052-15.636 47.026-35.093 47.026h-64.131zM774.392 956.047c-19.457 0-35.093-20.974-35.093-47.026v-166.001h134.317v166.001c0 26.052-15.636 47.026-35.093 47.026h-64.131zM134.548 779.231c-19.457 0-35.093-20.974-35.093-47.026v-263.344c0-26.052 15.636-47.026 35.093-47.026h142.077c19.457 0 35.093 20.974 35.093 47.026v263.344c0 26.052-15.636 47.026-35.093 47.026h-142.077zM134.372 707.751h142.429v-21.514h-142.429v21.514zM735.42 707.751c-19.457 0-35.093-20.974-35.093-47.026v-263.344c0-26.052 15.636-47.026 35.093-47.026h142.077c19.457 0 35.093 20.974 35.093 47.026v263.344c0 26.052-15.636 47.026-35.093 47.026h-142.077zM735.244 636.272h142.429v-21.514h-142.429v21.514zM134.372 621.224h142.429v-21.514h-142.429v21.514zM735.244 549.745h142.429v-21.514h-142.429 v21.514zM134.372 534.697h142.429v-21.514h-142.429v21.514zM434.984 470.742c-19.457 0-35.093-20.974-35.093-47.026v-263.344c0-26.052 15.636-47.026 35.093-47.026h142.077c19.457 0 35.093 20.974 35.093 47.026v263.344c0 26.052-15.636 47.026-35.093 47.026h-142.077zM735.244 463.218h142.429v-21.514h-142.429v21.514zM434.808 399.262h142.429v-21.514h-142.429v21.514zM138.428 386.566v-403.54c0-26.052 15.636-47.026 35.093-47.026h64.131c19.457 0 35.093 20.974 35.093 47.026v403.54h-134.317zM739.3 315.086v-332.061c0-26.052 15.636-47.026 35.093-47.026h64.131c19.457 0 35.093 20.974 35.093 47.026v332.061h-134.317zM434.808 312.735h142.429v-21.514h-142.429v21.514zM434.808 226.208h142.429v-21.514h-142.429v21.514zM438.864 78.077v-95.051c0-26.052 15.636-47.026 35.093-47.026h64.131c19.457 0 35.093 20.974 35.093 47.026v95.051h-134.317z" /> +<glyph unicode="" d="M544.813 951.75l-188.563-478.438 160.75-0.75-106.125-409.75 291.125 510.375-144.188-0.563 172.125 375.75-185.125 3.375zM459.625 899.812c-1.977-0.248-3.968-0.478-5.938-0.75-1.941-0.268-3.872-0.583-5.813-0.875-1.579-0.236-3.173-0.498-4.75-0.75-1.029-0.166-2.034-0.328-3.063-0.5-0.653-0.109-1.285-0.201-1.938-0.313-2.559-0.44-5.193-0.893-7.75-1.375-4.628-0.873-9.254-1.8-13.875-2.813-0.397-0.087-0.728-0.162-1.125-0.25-0.653-0.144-1.347-0.291-2-0.438-1.995-0.451-4.007-0.897-6-1.375-0.042-0.010-0.021-0.053-0.062-0.062-4.721-1.126-9.496-2.356-14.188-3.625-5.201-1.407-10.402-2.917-15.563-4.5-0.274-0.084-0.538-0.165-0.813-0.25-30.775-9.502-60.746-22.153-89.5-37.938-1.875-1.029-3.761-2.006-5.625-3.063-0.037-0.021-0.087-0.042-0.125-0.062-0.088-0.050-0.162-0.138-0.25-0.187-1.363-0.774-2.695-1.588-4.063-2.375-0.299-0.173-0.639-0.326-0.938-0.5-1.782-1.030-3.556-2.069-5.313-3.125-1.334-0.802-2.677-1.569-4-2.375-0.402-0.246-0.787-0.566-1.188-0.813-1.335-0.819-2.66 6-1.594-4-2.438-1.455-0.92-2.877-1.81-4.313-2.75-0.396-0.255-0.793-0.557-1.188-0.813-0.023-0.016-0.040-0.048-0.062-0.062-0.301-0.195-0.575-0.367-0.875-0.563-0.534-0.341-1.105-0.658-1.625-1-0.283-0.187-0.53-0.375-0.813-0.563-2.184-1.442-4.407-2.902-6.563-4.375-0.036-0.025-0.089-0.038-0.125-0.062-0.862-0.59-1.705-1.155-2.563-1.75-0.379-0.264-0.746-0.61-1.125-0.875-0.865-0.604-1.71-1.205-2.563-1.813-1.87-1.323-3.716-2.653-5.563-4-0.173-0.126-0.389-0.248-0.563-0.375-0.996-0.729-1.948-1.452-2.938-2.188-1.498-1.113-2.955-2.246-4.438-3.375-0.101-0.077-0.212-0.173-0.313-0.25-4.827-3.682-9.65-7.406-14.313-11.25-0.152-0.125-0.286-0.25-0.438-0.375-2.348-1.941-4.632-3.957-6.938-5.938-2.375-2.040-4.733-4.043-7.063-6.125-2.131-1.904-4.283-3.812-6.375-5.75-2.516-2.328-4.978-4.685-7.438-7.063-1.536-1.485-3.049-2.997-4.563-4.5-0.623-0.619-1.318-1.253-1.938-1.875-0.197-0.198-0.366-0.364-0.563-0.563-1.882-1.896-3.715-3.826-5.563-5.75-1.901-1.98-3.761-3.99-5.625-6-2.188-2.359-4.425-4.726-6.563- 7.125-0.55-0.618-1.016-1.255-1.563-1.875-1.889-2.143-3.776-4.326-5.625-6.5-0.973-1.143-1.976-2.286-2.938-3.438-0.549-0.658-1.080-1.277-1.625-1.938-1.702-2.061-3.397-4.163-5.063-6.25-1.824-2.286-3.595-4.559-5.375-6.875-0.886-1.153-1.75-2.34-2.625-3.5-0.883-1.17-1.816-2.323-2.688-3.5-0.287-0.387-0.527-0.737-0.813-1.125-0.785-1.067-1.599-2.114-2.375-3.188-0.859-1.178-1.716-2.375-2.563-3.563-0.429-0.604-0.887-1.206-1.313-1.813-0.526-0.746-0.981-1.502-1.5-2.25-1.411-2.031-2.867-4.076-4.25-6.125-0.304-0.452-0.573-0.922-0.875-1.375-0.366-0.546-0.699-1.076-1.063-1.625-0.403-0.609-0.788-1.264-1.188-1.875-1.285-1.96-2.624-3.91-3.875-5.875-0.5-0.788-0.943-1.522-1.438-2.313-3.989-6.348-7.776-12.824-11.438-19.313-0.222-0.394-0.467-0.793-0.688-1.188-1.639-2.924-3.302-5.862-4.875-8.813-0.254-0.477-0.498-0.96-0.75-1.438-1.633-3.088-3.189-6.197-4.75-9.313-1.714-3.421-3.372-6.86-5-10.313-1.635-3.468-3.264-6.939-4.813-10.438-1.55-3.502-3.037-7.032-4.5-10.563-0.709-1.71-1.374-3.409-2.063-5.125- 0.589-1.464-1.238-2.906-1.813-4.375-0.222-0.57-0.405-1.179-0.625-1.75-0.784-2.027-1.555-4.025-2.313-6.063-0.833-2.241-1.638-4.559-2.438-6.813-0.67-1.888-1.353-3.729-2-5.625-0.129-0.38-0.247-0.745-0.375-1.125-0.311-0.922-0.569-1.827-0.875-2.75-0.629-1.897-1.332-3.783-1.938-5.688-0.409-1.279-0.789-2.594-1.188-3.875-0.979-3.17-1.898-6.372-2.813-9.563-0.029-0.102-0.096-0.148-0.125-0.25-0.53-1.865-1.046-3.774-1.563-5.625-0.19-0.694-0.376-1.367-0.563-2.063-0.318-1.163-0.634-2.325-0.938-3.5-0.238-0.92-0.46-1.828-0.688-2.75-0.238-0.963-0.458-1.973-0.688-2.938-0.463-1.871-0.934-3.748-1.375-5.625-0.531-2.259-1.064-4.545-1.563-6.813-0.064-0.295-0.124-0.582-0.188-0.875-0.711-3.265-1.419-6.531-2.063-9.813-0.023-0.118-0.039-0.194-0.063-0.313-0.182-0.93-0.32-1.885-0.5-2.813-0.123-0.649-0.255-1.288-0.375-1.938-0.339-1.776-0.69-3.587-1-5.375-0.147-0.854-0.295-1.645-0.438-2.5-0.115-0.686-0.205-1.435-0.313-2.125-0.996-6.087-1.861-12.181-2.625-18.313-0.061-0.475-0.13-0.961-0.188-1.438-0.067-0.5 53-0.122-1.072-0.188-1.625-0.388-3.291-0.742-6.635-1.063-9.938-0.256-2.632-0.475-5.237-0.688-7.875-0.415-5.146-0.75-10.27-1-15.438-0.014-0.295 0.014-0.58 0-0.875-0.114-2.446-0.236-4.925-0.313-7.375-0.083-2.648-0.149-5.285-0.188-7.938-0.026-1.801-0.056-3.572-0.063-5.375-0.003-0.851-0.001-1.712 0-2.563 0.005-2.643 0.014-5.291 0.063-7.938 0.049-2.673 0.156-5.324 0.25-8 0.093-2.643 0.176-5.355 0.313-8 0.095-1.835 0.196-3.664 0.313-5.5 0.052-0.829 0.131-1.671 0.188-2.5 0.182-2.667 0.398-5.332 0.625-8 0.611-7.174 1.311-14.323 2.25-21.5 0.006-0.043-0.005-0.082 0-0.125 0.013-0.1 0.050-0.213 0.063-0.313 0.088-0.67 0.223-1.328 0.313-2 0.024-0.177 0.039-0.323 0.063-0.5 0.423-3.081 0.891-6.17 1.375-9.25 0.326-2.072 0.647-4.179 1-6.25 0.246-1.474 0.421-2.956 0.688-4.438 0.394-2.187 0.887-4.315 1.313-6.5 0.031-0.16 0.094-0.34 0.125-0.5 0.151-0.808 0.279-1.64 0.438-2.438 0.067-0.332 0.12-0.605 0.188-0.938 0.524-2.608 0.997-5.22 1.563-7.813 0.223-1.020 0.521-2.107 0.75-3.125 0.102-0.451 0.1 46-0.862 0.25-1.313 0.795-3.488 1.692-6.916 2.563-10.375 0.489-1.944 1.051-3.878 1.563-5.813 0.657-2.482 1.306-4.971 2-7.438 0.693-2.462 1.394-4.929 2.125-7.375 5.129-17.175 11.186-33.941 18.125-50.25 9.226-21.683 19.962-42.641 32.125-62.563 0.251-0.411 0.498-0.715 0.75-1.125 1.057-1.728 2.116-3.416 3.188-5.125 0.407-0.65 0.776-1.29 1.188-1.938 0.399-0.625 0.848-1.315 1.25-1.938 1.091-1.698 2.202-3.325 3.313-5 0.757-1.141 1.485-2.3 2.25-3.438 0.305-0.452 0.631-0.924 0.938-1.375 0.16-0.236 0.34-0.514 0.5-0.75 0.255-0.376 0.494-0.751 0.75-1.125 0.852-1.239 1.76-2.454 2.625-3.688 0.841-1.202 1.654-2.436 2.5-3.625 4.597-6.46 9.431-12.757 14.313-18.938 3.587-4.541 7.204-8.986 10.938-13.375 1.878-2.208 3.773-4.393 5.688-6.563 1.898-2.15 3.818-4.326 5.75-6.438 0.029-0.031 0.034-0.094 0.063-0.125 1.917-2.094 3.862-4.068 5.813-6.125 3.945-4.159 7.985-8.309 12.063-12.313 4.087-4.013 8.223-7.895 12.438-11.75 1.894-1.733 3.768-3.487 5.688-5.188 0.211-0.187 0.414-0.376 0.625-0.563 1.587- 1.401 3.209-2.808 4.813-4.188 0.546-0.47 1.14-0.907 1.688-1.375 2.165-1.845 4.305-3.696 6.5-5.5 3.211-2.657 6.406-5.316 9.688-7.875 3.059-2.385 6.076-4.754 9.188-7.063 3.123-2.317 6.326-4.512 9.5-6.75 1.25-0.881 2.542-1.75 3.813-2.625 0.904-0.622 1.79-1.264 2.688-1.875 2.853-1.951 5.666-3.921 8.563-5.812 2.867-1.872 5.779-3.688 8.688-5.5 0.736-0.457 1.449-0.922 2.188-1.375 2.947-1.815 5.949-3.56 8.938-5.313 3.346-1.962 6.666-3.929 10.063-5.812 3.39-1.879 6.811-3.7 10.25-5.5 16-8.373 32.512-15.859 49.5-22.438l18.313 71.813 49 222.937c-1.167 0.797-2.288 1.677-3.438 2.5-0.899 0.643-1.8 1.278-2.688 1.938-0.216 0.161-0.41 0.339-0.625 0.5-0.283 0.212-0.593 0.411-0.875 0.625-1.012 0.76-2.005 1.526-3 2.313-0.11 0.087-0.265 0.162-0.375 0.25-0.937 0.744-1.827 1.55-2.75 2.313-0.517 0.426-1.050 0.88-1.563 1.313-0.747 0.633-1.513 1.23-2.25 1.875-1.222 1.063-2.429 2.091-3.625 3.188-1.063 0.978-2.085 1.998-3.125 3-0.051 0.049-0.137 0.014-0.187 0.062-1.034 0.999-1.988 2.103-3 3.125-0.765 0. 77-1.56 1.528-2.313 2.313-0.213 0.223-0.476 0.401-0.688 0.625-1.182 1.244-2.287 2.533-3.438 3.813-1.35 1.503-2.636 3.017-3.938 4.563-0.632 0.75-1.317 1.49-1.938 2.25-0.52 0.637-0.988 1.231-1.5 1.875-0.229 0.288-0.46 0.649-0.688 0.938-1.159 1.475-2.319 2.923-3.438 4.438-0.929 1.255-1.788 2.473-2.688 3.75-0.245 0.349-0.508 0.774-0.75 1.125-0.637 0.918-1.254 1.82-1.875 2.75-0.85 1.279-1.741 2.571-2.563 3.875-0.008 0.014 0.008 0.048 0 0.062-0.984 1.562-1.871 3.152-2.813 4.75-0.087 0.148-0.222 0.234-0.313 0.375-0.56 0.956-1.143 1.969-1.688 2.938-0.156 0.277-0.283 0.534-0.438 0.813-0.362 0.652-0.708 1.28-1.063 1.938-0.362 0.669-0.708 1.387-1.063 2.063-0.145 0.276-0.294 0.535-0.438 0.813-0.463 0.892-0.921 1.776-1.375 2.688-0.455 0.911-0.934 1.828-1.375 2.75-0.245 0.51-0.444 1.056-0.688 1.563-0.293 0.626-0.588 1.244-0.875 1.875-0.381 0.838-0.753 1.663-1.125 2.5-0.332 0.757-0.632 1.502-0.938 2.25-0.309 0.73-0.633 1.448-0.938 2.188-0.656 1.608-1.318 3.251-1.938 4.875-0.104 0.273-0.211 0.541-0.313 0.813-0.081 0.218-0.171 0.47-0.25 0.688-0.16 0.435-0.281 0.814-0.438 1.25-0.105 0.294-0.208 0.643-0.313 0.938-0.532 1.502-1.071 2.993-1.563 4.5-0.111 0.338-0.205 0.662-0.313 1-0.014 0.042 0.006 0.089 0 0.125-0.020 0.060-0.043 0.128-0.062 0.187-0.704 2.228-1.38 4.44-2 6.688-0.008 0.026 0.008 0.099 0 0.125-0.626 2.273-1.273 4.584-1.813 6.875-0.491 2.082-0.956 4.093-1.375 6.188-0.044 0.217-0.082 0.47-0.125 0.688-0.010 0.043-0.054 0.082-0.062 0.125-0.020 0.097 0.018 0.153 0 0.25-0.031 0.157-0.032 0.343-0.062 0.5-0.385 2.001-0.741 3.994-1.063 6-0.033 0.21-0.092 0.415-0.125 0.625-0.016 0.1-0.047 0.213-0.062 0.313-0.311 2.034-0.564 4.090-0.813 6.125-0.525 4.344-0.839 8.647-1.063 13h-0.938l-52.625 0.25 18.438 49.313 164.313 440.25zM743.125 849l-101-216.688 163.063 0.625-101.188-167.563c0.010-0.037-0.010-0.088 0-0.125 0.171-0.695 0.337-1.364 0.5-2.063 0.083-0.356 0.169-0.706 0.25-1.063 0.265-1.162 0.507-2.33 0.75-3.5 0.004-0.018-0.004-0.043 0-0.062 0.212-1.025 0.43-2.035 0.625-3.063 0.101-0.531 0.216-1.092 0.313-1.625 0.201-1.107 0.382-2.202 0.563-3.313 0.074-0.457 0.179-0.917 0.25-1.375 0.079-0.51 0.175-0.99 0.25-1.5 0.156-1.064 0.236-2.18 0.375-3.25 0.15-1.155 0.309-2.339 0.438-3.5 0.014-0.119 0.049-0.194 0.062-0.313 0.034-0.315 0.092-0.622 0.125-0.938 0.139-1.336 0.264-2.662 0.375-4 0.023-0.278 0.041-0.535 0.062-0.813 0.239-3.044 0.407-6.105 0.5-9.188 0.006-0.179-0.004-0.384 0-0.563 0.041-1.485 0.056-2.952 0.062-4.438 0.001-0.158 0-0.342 0-0.5 0.002-1.505-0.030-2.995-0.062-4.5-0.002-0.099 0.002-0.151 0-0.25-0.037-1.565-0.112-3.124-0.187-4.688-0.002-0.039 0.002-0.086 0-0.125-0.038-0.792-0.139-1.583-0.187-2.375-0.048-0.793-0.004-1.585-0.062-2.375-0.002-0.039 0.002-0.086 0-0.125-0.077-1.048-0.156-2.082-0.25-3.125-0.044-0.492-0.077-1.009-0.125-1.5-0.033-0.376-0.090-0.75-0.125-1.125-0.072-0.695-0.17-1.37-0.25-2.063-0.057-0.495-0.127-1.006-0.187-1.5-0.23-1.723-0.49-3.411-0.75-5.125-0.349-2.302-0.754-4.584-1.188-6.875-0.434-2.291-0.919-4.598-1. 438-6.875-0.509-2.234-0.972-4.47-1.563-6.688-0.012-0.043-0.051-0.082-0.062-0.125-0.248-0.923-0.551-1.831-0.813-2.75-0.146-0.516-0.224-1.047-0.375-1.563-0.178-0.608-0.379-1.207-0.563-1.813-0.248-0.818-0.494-1.637-0.75-2.438-0.102-0.319-0.209-0.619-0.313-0.938-0.103-0.318-0.207-0.682-0.313-1-0.267-0.793-0.539-1.52-0.813-2.313-0.096-0.277-0.216-0.599-0.313-0.875-0.63-1.802-1.252-3.527-1.938-5.313-0.133-0.347-0.302-0.716-0.438-1.063-0.344-0.877-0.706-1.815-1.063-2.688-0.081-0.197-0.106-0.366-0.187-0.563-0.097-0.238-0.213-0.512-0.313-0.75-0.486-1.163-0.991-2.348-1.5-3.5-0.104-0.235-0.208-0.453-0.313-0.688-0.512-1.146-1.029-2.241-1.563-3.375-0.12-0.255-0.254-0.496-0.375-0.75-0.528-1.109-1.076-2.278-1.625-3.375-0.127-0.255-0.184-0.496-0.313-0.75-0.554-1.094-1.176-2.168-1.75-3.25-0.137-0.258-0.237-0.492-0.375-0.75-0.574-1.070-1.156-2.193-1.75-3.25-0.155-0.277-0.344-0.536-0.5-0.813-0.586-1.031-1.145-2.044-1.75-3.063-0.175-0.296-0.386-0.58-0.563-0.875-0.596-0.993-1.198-2.019-1.813-3-0 .185-0.297-0.313-0.579-0.5-0.875-3.027-4.776-6.321-9.4-9.75-13.875-9.693-12.65-20.917-24.083-33.438-33.938-0.411-0.324-0.836-0.617-1.25-0.938-2.064-1.597-4.12-3.175-6.25-4.688-0.313-0.222-0.686-0.405-1-0.625-0.978-0.682-1.944-1.335-2.938-2-0.258-0.174-0.491-0.39-0.75-0.563-1.058-0.701-2.175-1.381-3.25-2.063-0.669-0.426-1.326-0.832-2-1.25-0.676-0.417-1.317-0.841-2-1.25-0.123-0.074-0.252-0.176-0.375-0.25-1.247-0.743-2.481-1.471-3.75-2.188-1.346-0.766-2.759-1.516-4.125-2.25-0.039-0.021-0.086-0.042-0.125-0.062-2.837-1.509-5.685-2.935-8.625-4.313-2.94-1.378-5.959-2.697-9-3.938-8.702-3.551-17.574-6.428-26.438-8.625l-134.188-222.063-35.25-61.312c6.574-1.742 13.132-3.407 19.813-4.875 3.787-0.832 7.555-1.57 11.375-2.313 3.78-0.735 7.626-1.478 11.438-2.125 0.313-0.052 0.625-0.072 0.938-0.124 2.74-0.459 5.495-0.9 8.25-1.312 1.423-0.217 2.832-0.354 4.25-0.563 2.464-0.362 4.891-0.746 7.375-1.062 15.552-1.978 31.289-3.186 47.063-3.625 4.732-0.132 9.442-0.196 14.188-0.188 0.494 0.001 1.006 0 1.5 0 0.516 0.002 1.046 0 1.563 0 2.093 0.020 4.155 0.082 6.25 0.124 2.051 0.042 4.134 0.058 6.188 0.124 0.574 0.020 1.113 0.040 1.688 0.062 1.995 0.072 4.004 0.152 6 0.25 1.62 0.080 3.255 0.154 4.875 0.25 1.641 0.098 3.296 0.26 4.938 0.375 1.899 0.132 3.788 0.282 5.688 0.437 0.728 0.060 1.459 0.062 2.188 0.124 7.125 0.614 14.246 1.375 21.375 2.313 0.178 0.024 0.385 0.038 0.563 0.062 0.593 0.078 1.157 0.168 1.75 0.25 3.164 0.432 6.337 0.941 9.5 1.438 2.103 0.33 4.206 0.657 6.313 1 0.138 0.024 0.3 0.038 0.438 0.062 1.32 0.216 2.683 0.388 4 0.625 2.192 0.39 4.318 0.83 6.5 1.25 1.29 0.251 2.586 0.551 3.875 0.813 0.338 0.068 0.662 0.18 1 0.25 2.273 0.459 4.556 0.82 6.813 1.312 1.469 0.323 2.97 0.662 4.438 1 1.516 0.346 3.002 0.761 4.5 1.125 1.948 0.473 3.92 0.946 5.875 1.438 36.198 9.106 70.699 22.309 103.125 39.062 0.433 0.222 0.88 0.464 1.313 0.688 2.061 1.073 4.144 2.149 6.188 3.25 0.462 0.248 0.914 0.501 1.375 0.75 1.999 1.086 4.018 2.137 6 3.25 0.495 0.276 0.944 0.597 1. 438 0.875 0.393 0.223 0.795 0.401 1.188 0.625 2.075 1.175 4.135 2.422 6.188 3.625 57.225 33.532 105.524 77.63 143.375 128.75 0.56 0.756 1.132 1.491 1.688 2.25 1.754 2.386 3.421 4.777 5.125 7.188 0.069 0.098 0.119 0.214 0.187 0.313 0.607 0.86 1.207 1.7 1.813 2.563 1.347 1.918 2.695 3.816 4 5.75 0.214 0.316 0.475 0.746 0.688 1.063 0.090 0.136 0.096 0.241 0.187 0.375 1.28 1.911 2.515 3.833 3.75 5.75 0.774 1.191 1.549 2.364 2.313 3.563 0.625 0.982 1.258 2.014 1.875 3 1.382 2.206 2.72 4.402 4.063 6.625 1.343 2.224 2.696 4.447 4 6.688 0.495 0.849 0.948 1.71 1.438 2.563 0.803 1.4 1.587 2.781 2.375 4.188 2.543 4.537 5.053 9.087 7.438 13.688 0.229 0.44 0.46 0.872 0.688 1.313 0.961 1.867 1.94 3.748 2.875 5.625 0.145 0.291 0.23 0.583 0.375 0.875 0.86 1.735 1.725 3.507 2.563 5.25 0.211 0.437 0.478 0.875 0.688 1.313 0.149 0.312 0.227 0.625 0.375 0.938 1.674 3.52 3.347 7.058 4.938 10.625 0.237 0.532 0.452 1.030 0.688 1.563 0.104 0.235 0.209 0.514 0.313 0.75 0.869 1.977 1.719 3.947 2.563 5 .938 0.177 0.419 0.324 0.769 0.5 1.188 2.611 6.21 5.082 12.536 7.438 18.875 0.389 1.049 0.806 2.074 1.188 3.125 0.438 1.206 0.883 2.415 1.313 3.625 0.014 0.041 0.048 0.084 0.062 0.125 2.073 5.852 4.023 11.797 5.875 17.75 1.152 3.702 2.248 7.386 3.313 11.125 2.115 7.431 4.049 14.928 5.813 22.5 0.46 1.956 0.874 3.914 1.313 5.875 0.039 0.178 0.086 0.384 0.125 0.563 0.091 0.418 0.16 0.832 0.25 1.25 0.439 2.017 0.889 4.046 1.313 6.063 0.276 1.363 0.548 2.695 0.813 4.063 0.246 1.259 0.519 2.546 0.75 3.813 0.149 0.807 0.23 1.629 0.375 2.438 0.232 1.307 0.524 2.572 0.75 3.875 0.078 0.447 0.174 0.865 0.25 1.313 0.068 0.406 0.12 0.844 0.187 1.25 0.365 2.172 0.685 4.324 1 6.5 0.026 0.177 0.037 0.386 0.062 0.563 0.161 1.068 0.346 2.117 0.5 3.188 0.234 1.603 0.407 3.215 0.625 4.813 0.042 0.316 0.083 0.622 0.125 0.938 0.257 1.914 0.578 3.822 0.813 5.75 0.468 3.848 0.937 7.762 1.313 11.625 4.071 41.907 2.648 84.631-4.625 127.25-0.652 3.822-1.378 7.681-2.125 11.5-0.058 0.295-0.13 0.579-0.18 7 0.875-0.313 1.604-0.609 3.215-0.938 4.813-0.223 1.11-0.454 2.205-0.688 3.313-0.166 0.789-0.327 1.59-0.5 2.375-0.002 0.016-0.059-0.018-0.062 0-0.413 1.888-0.82 3.785-1.25 5.688-0.228 1.008-0.45 2.003-0.688 3-0.027 0.112-0.098 0.201-0.125 0.313-0.042 0.177-0.082 0.323-0.125 0.5-0.877 3.655-1.791 7.315-2.75 10.938-0.531 2.006-1.069 4.005-1.625 6-0.138 0.496-0.298 0.942-0.438 1.438-0.157 0.555-0.279 1.133-0.438 1.688-0.549 1.921-1.178 3.839-1.75 5.75-0.74 2.471-1.472 4.984-2.25 7.438-0.788 2.485-1.611 4.908-2.438 7.375-0.318 0.949-0.614 1.928-0.938 2.875-0.514 1.502-0.972 3.005-1.5 4.5-0.112 0.319-0.262 0.619-0.375 0.938-0.753 2.117-1.531 4.209-2.313 6.313-0.908 2.442-1.867 4.889-2.813 7.313-0.946 2.423-1.892 4.846-2.875 7.25-0.555 1.361-1.119 2.706-1.688 4.063-0.107 0.255-0.143 0.558-0.25 0.813-0.936 2.223-1.967 4.413-2.938 6.625-1.087 2.478-2.182 4.912-3.313 7.375-1.118 2.436-2.277 4.891-3.438 7.313-3.471 7.239-7.149 14.405-11 21.5-0.341 0.627-0.656 1.312-1 1.938-0.951 1.733 -1.901 3.401-2.875 5.125-2.917 5.164-5.941 10.298-9.063 15.375-0.172 0.28-0.39 0.533-0.563 0.813-1.556 2.519-3.143 5.066-4.75 7.563-1.849 2.872-3.709 5.721-5.625 8.563-0.040 0.059-0.085 0.129-0.125 0.187-0.212 0.317-0.474 0.684-0.688 1-7.608 11.212-15.721 22.196-24.375 32.875-0.364 0.45-0.697 0.864-1.063 1.313-1.165 1.427-2.379 2.896-3.563 4.313-0.562 0.674-1.060 1.33-1.625 2-0.998 1.182-2.051 2.325-3.063 3.5-1.593 1.849-3.187 3.669-4.813 5.5-0.966 1.090-1.9 2.17-2.875 3.25-0.646 0.714-1.287 1.414-1.938 2.125-1.198 1.31-2.414 2.642-3.625 3.938-0.438 0.468-0.872 0.971-1.313 1.438-1.446 1.534-2.911 3.049-4.375 4.563-0.213 0.22-0.474 0.405-0.688 0.625-1.426 1.469-2.807 2.926-4.25 4.375-0.256 0.257-0.493 0.556-0.75 0.813l-0.125 0.125c-1.667 1.667-3.377 3.237-5.063 4.875-1.265 1.226-2.536 2.476-3.813 3.688-0.467 0.444-0.907 0.871-1.375 1.313-1.047 0.986-2.132 2.024-3.188 3-0.707 0.655-1.415 1.287-2.125 1.938-0.776 0.709-1.532 1.421-2.313 2.125-1.002 0.906-1.992 1.791-3 2.688-7.62 5 6.783-15.438 13.283-23.375 19.5-14.060 11.013-28.578 21.075-43.5 30.313-10.162 6.291-20.5 12.163-31 17.625zM376.5 409.812c0.049-0.77 0.122-1.545 0.187-2.313 0.303-3.545 0.738-7.018 1.313-10.563 0.401-2.475 0.902-4.969 1.438-7.438 0.016-0.070 0.048-0.118 0.062-0.187 0.211-0.966 0.331-1.911 0.563-2.875 0.14-0.59 0.29-1.226 0.438-1.813 0.108-0.425 0.201-0.888 0.313-1.313 0.027-0.103 0.098-0.147 0.125-0.25 0.457-1.735 0.918-3.481 1.438-5.188 0.014-0.046 0.034-0.093 0.062-0.125 0.018-0.020 0.054-0.034 0.062-0.062 0.029-0.096 0.033-0.154 0.062-0.25 0.008-0.024 0.055-0.040 0.062-0.062 0.262-0.848 0.524-1.715 0.813-2.563 0.217-0.67 0.456-1.331 0.688-2 0.154-0.437 0.283-0.879 0.438-1.313 0.232-0.666 0.443-1.349 0.688-2 0.337-0.9 0.688-1.804 1.063-2.688 0.055-0.14 0.131-0.297 0.187-0.438 0.117-0.278 0.198-0.531 0.313-0.813 0.057-0.14 0.13-0.297 0.187-0.438 0.213-0.567 0.453-1.138 0.688-1.688 1.303-3.057 2.683-5.994 4.188-8.938 0.276-0.543 0.593-1.024 0.875-1.563 0.050-0.094 0.075-0. 219 0.125-0.313 0.067-0.127 0.12-0.249 0.187-0.375 0.356-0.667 0.701-1.33 1.063-2 0.318-0.58 0.675-1.113 1-1.688 0.208-0.37 0.411-0.759 0.625-1.125 0.018-0.008 0.046-0.056 0.062-0.062 0.29-0.498 0.579-1.006 0.875-1.5 0.474-0.795 0.948-1.593 1.438-2.375 0.223-0.355 0.399-0.772 0.625-1.125 0.064-0.1 0.186-0.212 0.25-0.313 0.076-0.119 0.173-0.194 0.25-0.313 0.932-1.442 1.832-2.911 2.813-4.313 0.268-0.385 0.541-0.745 0.813-1.125 0.865-1.21 1.725-2.442 2.625-3.625 0.109-0.143 0.265-0.232 0.375-0.375 0.309-0.403 0.624-0.789 0.938-1.188 1.328-1.692 2.666-3.383 4.063-5 1.396-1.617 2.852-3.205 4.313-4.75 1.301-1.377 2.587-2.678 3.938-4 0.338-0.332 0.659-0.671 1-1 0.251-0.241 0.56-0.511 0.813-0.75 0.205-0.195 0.419-0.369 0.625-0.563 0.078-0.073 0.11-0.177 0.187-0.25 0.612-0.572 1.241-1.134 1.875-1.688l16.125 73.5c-0.654 1.593-1.252 3.133-1.813 4.75-0.281 0.81-0.556 1.621-0.813 2.438-0.075 0.236-0.178 0.513-0.25 0.75-0.034 0.11-0.029 0.202-0.062 0.313-0.638 2.127-1.216 4.277-1.688 6.43 8-0.243 1.115-0.426 2.253-0.625 3.375-0.291 1.645-0.542 3.289-0.75 4.938l-57.25 0.187zM661.188 394.5l-53.25-88.125c0.676 0.528 1.334 1.089 2 1.625 1.629 1.312 3.251 2.624 4.813 4 1.573 1.386 3.121 2.865 4.625 4.313 3.045 2.93 5.994 5.959 8.75 9.125 1.387 1.594 2.688 3.226 4 4.875 1.281 1.61 2.542 3.153 3.75 4.813 0.025 0.035 0.037 0.090 0.062 0.125 1.236 1.701 2.467 3.5 3.625 5.25 0.848 1.281 1.695 2.506 2.5 3.813 0.016 0.008-0.018 0.054 0 0.062 0.060 0.098 0.065 0.214 0.125 0.313 0.529 0.86 1.051 1.753 1.563 2.625 0.051 0.086 0.135 0.167 0.187 0.25 0.186 0.291 0.388 0.57 0.563 0.875 0.224 0.392 0.405 0.794 0.625 1.188 0.32 0.571 0.622 1.113 0.938 1.688 0.063 0.117 0.125 0.258 0.187 0.375 0.335 0.614 0.679 1.195 1 1.813 0.057 0.11 0.13 0.265 0.187 0.375 0.295 0.571 0.532 1.18 0.813 1.75 0.226 0.459 0.529 0.852 0.75 1.313 0.285 0.585 0.535 1.223 0.813 1.813 0.090 0.191 0.161 0.369 0.25 0.563 0.71 1.527 1.405 3.070 2.063 4.625 0.010 0.024 0.053 0.039 0.062 0.062 0.265 0.629 0. 494 1.304 0.75 1.938 0.18 0.444 0.387 0.867 0.563 1.313 0.494 1.256 0.915 2.539 1.375 3.813 0.016 0.042 0.044 0.085 0.062 0.125 0.036 0.1 0.089 0.212 0.125 0.313 0.074 0.208 0.177 0.416 0.25 0.625 0.307 0.87 0.581 1.757 0.875 2.625 0.033 0.101 0.092 0.212 0.125 0.313 0.224 0.668 0.476 1.322 0.688 2 0.010 0.025-0.008 0.1 0 0.125 0.008 0.026-0.008 0.037 0 0.062 0.018 0.059 0.044 0.128 0.062 0.187 0.557 1.803 1.013 3.605 1.5 5.438 0.006 0.016 0.058 0.047 0.062 0.062 0.279 1.051 0.558 2.069 0.813 3.125 0.208 0.865 0.37 1.754 0.563 2.625 0.425 1.924 0.84 3.861 1.188 5.813z" /> +<glyph unicode="" d="M848 957.125c-47.606-0.488-97.005-20.451-135.688-59.188l-135-135.125 226.563-226.188c12.747-0.334 25.134-3.101 36.5-8.063l120.688 120.813c72.814 72.916 79.253 183.9 14.25 248.813l-14.25 14.188c-30.47 30.427-71.057 45.181-113.063 44.75zM85.813 786c-30.797 0-55.625-24.828-55.625-55.625v-415.438l60.125 59.938v313.375c0 18.045 13.991 32.852 31.875 34.625 1.192 0.118 2.275 0 3.5 0h311.25l63.188 63.125h-414.313zM527.688 713.062l-284.063-284.438 179.75-179.563c2.456 16.178 8.74 28.453 17.125 40.063 7.125 9.866 16.797 20.090 30.813 27.688-2.031 7.388-3.5 15.241-3.5 23.813 0 27.452 13.667 49.034 18.375 55.625 5.605 8.405 12.42 15.495 20.289 21.227-15.558-14.675-11.505-9.69-7.476-4.977-5.281 1.576-10.259 4.442-14.438 8.625-13.419 13.401-13.526 35.081-0.125 48.5 6.7 6.709 15.625 10.061 24.438 10.063 8.812 0.002 17.603-3.345 24.313-10.063 4.079-4.073 6.918-8.924 8.5-14.063 3.633 3.247 7.389 6.522 11.438 9.75 4.985 3.975 10.173 7.949 18.125 12.563 7.952 4.614 16.205 13.313 47.125 13.313 9.685 0 17.874-1.638 25.438-3.75 13.303 23.013 36.44 40.822 62.75 46.938l-178.875 178.688zM518.188 641.875c8.812 0.002 17.603-3.345 24.313-10.063 13.419-13.4 13.403-35.205 0-48.625-13.4-13.419-35.081-13.434-48.5 0-13.419 13.401-13.525 35.206-0.125 48.625 6.7 6.71 15.5 10.061 24.313 10.063zM989.75 595.125l-60.188-59.938v-46.125c17.162-3.636 30.619-11.637 41.688-21.125 7.602-6.554 13.921-14.345 18.698-23.099-11.69 16.695-6.15 11.744-0.198 6.286v144zM594.625 565.625c8.812 0.012 17.603-3.318 24.313-10 13.419-13.401 13.277-35.206-0.125-48.625-13.4-13.419-35.081-13.435-48.5 0-13.396 13.377-13.456 35.075-0.125 48.5 6.7 6.709 15.625 10.114 24.438 10.125zM432.438 556c8.812 0.002 17.603-3.408 24.313-10.125 13.419-13.401 13.403-35.144 0-48.563-13.4-13.419-35.081-13.365-48.5 0-13.419 13.4-13.526 35.018-0.125 48.438v0.125c6.7 6.709 15.5 10.123 24.313 10.125zM346.688 470.125c8.812 0.012 17.603-3.317 24.313-10 13.419-13.4 13.403-35.143 0-48.563-13.4-13.419-35.0 81-13.49-48.5-0.125-13.419 13.401-13.526 35.144-0.125 48.563 6.7 6.71 15.5 10.114 24.313 10.125zM726.313 454.312c-6.074 0-10.775-4.101-12.125-9.5-5.399-20.246-7.451-42.167-9.813-62.75-10.46-3.374-20.902-7.751-30.688-12.813l-46.563 36.125c-2.699 2.025-5.713 3.375-8.75 3.375-11.473 0-57.027-49.302-65.125-60.438-1.687-2.362-3.063-4.713-3.063-7.75 0-3.037 1.35-5.701 3.375-8.063 12.485-15.184 24.652-30.366 36.125-46.563-5.399-10.123-9.813-20.265-13.188-31.063l-62.75-9.438c-5.061-1.012-9.125-7.126-9.125-12.188v-74.875c0-5.736 4.076-11.175 9.813-12.188l61.75-9.063c3.374-11.473 8.076-22.64 13.813-33.438-11.473-15.859-23.965-30.666-35.438-46.188-1.687-2.362-2.688-4.776-2.688-7.813 0-2.699 0.688-5.388 2.375-7.75 14.172-19.571 37.804-40.491 55.688-56.688 2.362-2.362 5.401-3.688 8.438-3.688 3.037 0 6.013 0.975 8.375 3l47.625 36.125c9.785-5.061 19.915-9.126 30.375-12.5l9.438-62.063c0.675-5.736 6.051-10.125 12.125-10.125h74.938c6.074 0 10.775 4.039 12.125 9.438 5.399 20.246 7.451 42.167 9 .813 62.75 10.46 3.374 20.902 7.814 30.688 12.875l46.563-36.5c2.699-1.687 5.713-3 8.75-3 11.473 0 57.027 49.577 65.125 60.375 2.025 2.362 3.063 4.713 3.063 7.75 0 3.037-1.35 6.076-3.375 8.438-12.485 15.184-24.652 30.028-36.125 46.563 5.399 9.785 9.476 19.952 13.188 30.75l62.438 9.438c5.399 1.012 9.438 7.064 9.438 12.125v74.938c0 5.736-4.076 11.113-9.813 12.125l-61.75 9.438c-3.374 11.135-8.076 22.265-13.813 33.063 11.473 15.859 23.965 30.728 35.438 46.25 1.687 2.362 2.688 4.713 2.688 7.75 0 2.699-0.688 5.413-2.375 7.438-14.172 19.908-37.804 40.841-55.688 57.375-2.362 2.025-5.401 3.375-8.438 3.375-3.037 0-6.038-1.038-8.063-3.063l-47.938-36.063c-9.785 5.061-19.915 9.063-30.375 12.438l-9.438 62.125c-0.675 5.736-6.051 10.125-12.125 10.125h-74.938zM423.125 393.812c8.812 0.002 17.603-3.345 24.313-10.063 13.419-13.401 13.403-35.081 0-48.5-13.4-13.419-35.206-13.491-48.625-0.125-13.419 13.4-13.525 35.206-0.125 48.625 6.7 6.71 15.625 10.061 24.438 10.063zM193.875 378.875l-134.875-135.1 25c-72.814-72.916-79.065-183.901-14.063-248.813l14.188-14.188c65.003-64.912 175.998-58.479 248.813 14.438l122.875 123.125c-4.561 10.006-7.356 20.887-8.25 32.188l-228.688 228.375zM763.75 281.5c47.577 0 86.438-38.798 86.438-86.375s-38.86-86.375-86.438-86.375c-47.577 0-86.375 38.798-86.375 86.375 0 47.577 38.798 86.375 86.375 86.375z" /> +<glyph unicode="" d="M722.658 863.075c-6.067 0-10.809-4.044-12.157-9.437-5.393-20.222-7.411-42.169-9.77-62.729-10.448-3.37-20.869-7.712-30.643-12.768l-46.519 36.027c-2.696 2.022-5.738 3.386-8.771 3.386-11.459 0-56.971-49.22-65.060-60.342-1.685-2.359-2.998-4.683-2.998-7.716 0-3.033 1.309-5.746 3.331-8.105 12.47-15.167 24.624-30.341 36.083-46.519-5.393-10.111-9.786-20.246-13.156-31.031l-62.673-9.437c-5.056-1.011-9.104-7.046-9.104-12.102v-74.831c0-5.73 4.041-11.146 9.77-12.157l61.674-9.049c3.37-11.459 8.093-22.633 13.823-33.418-11.459-15.841-23.902-30.627-35.361-46.131-1.685-2.359-2.72-4.738-2.72-7.772 0-2.696 0.702-5.412 2.387-7.772 14.156-19.548 37.705-40.445 55.568-56.622 2.359-2.359 5.405-3.664 8.438-3.664 3.033 0 6.079 0.975 8.438 2.998l47.518 36.083c9.774-5.056 19.861-9.12 30.31-12.49l9.437-62.007c0.674-5.73 6.091-10.103 12.157-10.103h74.83c6.067 0 10.754 4.044 12.102 9.437 5.393 20.222 7.466 42.114 9.826 62.673 10.448 3.37 20.869 7.768 30.643 12.823l46.519-36.416 c2.696-1.685 5.738-2.998 8.771-2.998 11.459 0 56.971 49.501 65.060 60.286 2.022 2.359 2.998 4.738 2.998 7.772 0 3.033-1.364 6.079-3.386 8.438-12.47 15.167-24.568 30.004-36.027 46.519 5.393 9.774 9.449 19.858 13.156 30.643l62.34 9.437c5.393 1.011 9.437 7.102 9.437 12.157v74.83c0 5.73-4.041 11.091-9.77 12.102l-61.674 9.437c-3.37 11.122-8.093 22.245-13.823 33.030 11.459 15.841 23.902 30.682 35.361 46.186 1.685 2.359 2.72 4.738 2.72 7.772 0 2.696-0.702 5.361-2.387 7.383-14.156 19.885-37.705 40.774-55.568 57.289-2.359 2.022-5.404 3.386-8.438 3.386-3.033 0-6.083-1.031-8.105-3.053l-47.852-36.027c-9.774 5.056-19.917 9.064-30.365 12.435l-9.437 62.063c-0.674 5.73-6.035 10.103-12.102 10.103h-74.83zM215.665 770.98c-119.13 0-215.665-96.59-215.665-215.721 0-119.13 96.535-215.665 215.665-215.665 14.635 0 28.927 1.441 42.744 4.219l427.333-305.761c10.244-7.33 22.177-8.359 28.977-1.11l54.235 57.844c6.801 7.249-2.179 16.316-5.662 28.422l-25.48 88.653-77.717 5.718-4.385 81.825-78.494-1.499-7.71 6 79.383-77.828-7.106 16.265 103.808-74.942-6.995-13.045 18.763c7.421 21.811 11.436 45.18 11.436 69.501 0 119.13-96.59 215.721-215.721 215.721zM184.745 701.423c51.857 0 93.871-42.014 93.871-93.871s-42.014-93.871-93.871-93.871c-51.857 0-93.927 42.014-93.927 93.871 0 51.857 42.070 93.871 93.927 93.871zM760.074 690.487c47.522 0 86.266-38.744 86.266-86.266 0-47.522-38.744-86.266-86.266-86.266-47.522 0-86.266 38.744-86.266 86.266 0 47.522 38.744 86.266 86.266 86.266z" /> +<glyph unicode="" d="M148.125 958.437c-35.397 0-64.125-28.596-64.125-63.875v-894.625c0-35.279 28.728-63.938 64.125-63.938h726.625c35.397 0 64.125 28.659 64.125 63.938v565.438h-365.563c-28.357 6.198-49.563 31.474-49.563 61.688 0 112.050 1.322 221.508 0.25 331.375h-375.875zM606.625 954.187v-307.938h322.188c-8.388 22.993-21.169 45.154-35.313 59.25l-208.438 207.625c-18.029 17.968-49.145 33.808-78.438 41.063zM170 689.687h94.875l61.938-82.688 68.313 82.688h60.063l-99.875-121.375 121.125-162.625h-95.125l-76.063 102.313-84.375-102.313h-60l116.188 140.75-107.063 143.25zM164.125 328.875h694.688v-44.438h-694.688v44.438zM391.813 214.25c9.056 0 17.731-0.972 26.063-3 8.332-2.029 16.32-5.078 24-9.063v-33.563c-7.752 5.289-15.34 9.162-22.875 11.625s-15.481 3.687-23.813 3.688c-14.925 0-26.701-4.749-35.25-14.313-8.549-9.563-12.813-22.754-12.813-39.563 0-16.736 4.263-29.874 12.813-39.438 8.549-9.563 20.325-14.375 35.25-14.375 8.332 0 16.278 1.224 23.813 3.688 7.535 2.463 15.123 6.336 22 .875 11.625v-33.563c-7.68-3.985-15.668-6.971-24-9s-17.006-3.063-26.063-3.063c-27.024 0-48.456 7.556-64.25 22.625-15.794 15.142-23.688 35.636-23.688 61.5 0 25.937 7.894 46.43 23.688 61.5 15.794 15.142 37.226 22.687 64.25 22.688zM537.188 214.25c8.911 0 18.082-0.686 27.5-2.063 9.418-1.304 19.179-3.257 29.25-5.938v-34.375c-8.911 3.985-17.586 6.971-26.063 9-8.477 2.028-16.528 3.062-24.063 3.063-9.998 0-17.343-1.372-22.125-4.125-4.782-2.753-7.188-7.017-7.188-12.813 0-4.347 1.562-7.787 4.75-10.25 3.26-2.391 9.148-4.449 17.625-6.188l17.813-3.563c18.040-3.623 30.893-9.11 38.5-16.5s11.375-17.942 11.375-31.563c0-17.895-5.288-31.171-15.938-39.938-10.578-8.694-26.818-13.063-48.625-13.063-10.288 0-20.577 0.981-30.938 2.938-10.36 1.956-20.702 4.848-31.063 8.688v35.313c10.36-5.506 20.364-9.675 30-12.5 9.708-2.753 19.016-4.125 28-4.125 9.129 0 16.146 1.52 21 4.563 4.854 3.043 7.25 7.411 7.25 13.063 0 5.071-1.667 8.934-5 11.688-3.26 2.753-9.772 5.264-19.625 7.438l-16.25 3.563c-16.229 3.477-28 .090 9.018-35.625 16.625-7.462 7.607-11.188 17.854-11.188 30.75 0 16.156 5.192 28.618 15.625 37.313 10.433 8.694 25.439 13 45 13zM622.063 211.312h42.063l43.063-119.75 42.938 119.75h42l-60.063-162.25h-49.875l-60.125 162.25zM230.75 91.125h39.125v-42.063h-39.125v42.063z" /> +<glyph unicode="" d="M329.688 832.625l-329.688-129.375 152.188-113.75 329.688 129.375-152.188 113.75zM686.875 832.625l-152.188-113.75 329.563-129.375 152.187 113.75-329.563 129.375zM511.813 703.25v-0.187l-329.188-129.188-1-16.188c0.883-118.766 1-237.544 1-356.313l329.688-129.25 329.125 129.25c-1.094 119.107 1.508 238.169 3.5 357.25l-0.25 14.188-332.875 130.437zM479.313 591.75h57.813c4.688 0 8.854-3.385 9.375-7.813l7.313-47.938c8.073-2.604 15.885-5.719 23.438-9.625l37 27.875c1.563 1.563 3.906 2.313 6.25 2.313s4.677-1 6.5-2.563c13.802-12.76 32-28.948 42.938-44.313 1.302-1.563 1.875-3.604 1.875-5.688 0-2.344-0.823-4.177-2.125-6-8.854-11.979-18.458-23.448-27.313-35.688 4.427-8.333 8.083-16.906 10.688-25.5l47.625-7.313c4.427-0.781 7.563-4.948 7.563-9.375v-57.813c0-3.906-3.146-8.594-7.313-9.375l-48.188-7.313c-2.865-8.333-5.958-16.135-10.125-23.688 8.854-12.76 18.24-24.219 27.875-35.938 1.563-1.823 2.563-4.156 2.563-6.5 0-2.344-0.75-4.177-2.313-6-6.25-8.333-41.396-46.625-50 .25-46.625-2.344 0-4.729 1.073-6.813 2.375l-35.938 28.125c-7.552-3.906-15.615-7.271-23.688-9.875-1.823-15.885-3.396-32.813-7.563-48.438-1.042-4.167-4.688-7.313-9.375-7.313h-57.813c-4.688 0-8.854 3.385-9.375 7.813l-7.25 47.938c-8.073 2.604-15.885 5.719-23.438 9.625l-36.75-27.875c-1.823-1.563-4.156-2.375-6.5-2.375s-4.677 1.052-6.5 2.875c-13.802 12.5-32.063 28.646-43 43.75-1.302 1.823-1.813 3.917-1.813 6 0 2.344 0.823 4.177 2.125 6 8.854 11.979 18.458 23.448 27.313 35.688-4.427 8.333-8.083 16.896-10.688 25.75l-47.625 7.063c-4.427 0.781-7.563 4.948-7.563 9.375v57.813c0 3.906 3.094 8.594 7 9.375l48.438 7.25c2.604 8.333 6.021 16.188 10.188 24-8.854 12.5-18.24 24.219-27.875 35.938-1.562 1.823-2.625 3.906-2.625 6.25 0 2.344 1.073 4.177 2.375 6 6.25 8.594 41.396 46.563 50.25 46.563 2.344 0 4.667-1 6.75-2.563l35.938-27.875c7.552 3.906 15.677 7.271 23.75 9.875 1.823 15.885 3.333 32.813 7.5 48.438 1.042 4.167 4.688 7.313 9.375 7.313zM508.25 458.437c-36.719 0-66.688-29.969-66.688-66.688s 29.969-66.688 66.688-66.688c36.719 0 66.688 29.969 66.688 66.688 0 36.719-29.969 66.688-66.688 66.688z" /> +<glyph unicode="" d="M85.313 893.937c-46.933 0-85.313-38.379-85.313-85.313v-580.313c0-46.933 38.379-85.313 85.313-85.313h290.125c0-46.4-34.125-82.642-34.125-102.375 0-18.667 15.458-34.125 34.125-34.125h273.125c18.667 0 34.125 15.458 34.125 34.125s-34.125 57.042-34.125 102.375h290.125c46.933 0 85.313 38.379 85.313 85.313v580.313c0 46.933-38.379 85.313-85.313 85.313h-853.375zM85.313 825.687h853.375c9.067 0 17.063-7.996 17.063-17.063v-443.75c0-9.067-7.996-17.063-17.063-17.063h-853.375c-9.067 0-17.063 7.996-17.063 17.063v443.75c0 9.067 7.996 17.063 17.063 17.063zM381 798.5l-180.313-330.875h-109.812v-77.25h146.625v0.625l0.938-0.938 140.25 263.688 145.625-264.938v-0.375h0.188l0.313-0.563 0.563 0.563h112.125v2.813l76.063 157.063 76.75-158.5 0.75 0.563h146.063v77.25h-112.063l-110.688 211-0.625 2.063-0.188-0.438-0.25 0.438-0.625-2.063-111.625-212.938h-38.688l-180.188 330.625-0.063-0.125-1.125 2.313z" /> +<glyph unicode="" d="M46.319 828.783c-25.469 0-46.319-20.85-46.319-46.319v-314.856c0-25.469 20.85-46.319 46.319-46.319h157.454c0-25.18-18.548-44.885-18.548-55.593 0-10.13 8.419-18.497 18.548-18.497h127.818v-154.345c0-31.481 25.77-57.251 57.251-57.251h194.602c0-31.124-22.9-55.465-22.9-68.701 0-12.521 10.379-22.901 22.9-22.901h183.152c12.521 0 22.901 10.38 22.901 22.901s-22.901 38.293-22.901 68.701h194.654c31.481 0 57.199 25.77 57.199 57.251v389.205c0 31.481-25.718 57.251-57.199 57.251h-405.525v143.154c0 25.469-20.85 46.319-46.319 46.319h-463.088zM46.319 791.738h463.088c4.92 0 9.274-4.354 9.274-9.274v-143.154h-129.839c-31.481 0-57.251-25.77-57.251-57.251v-49.635h-285.272c-4.92 0-9.274 4.354-9.274 9.274v240.766c0 4.92 4.354 9.274 9.274 9.274zM388.842 593.509h572.409c6.082 0 11.45-5.369 11.45-11.45v-297.655c0-6.082-5.369-11.398-11.45-11.398h-572.409c-6.082 0-11.45 5.317-11.45 11.398v297.655c0 6.082 5.369 11.45 11.45 11.45z" /> +<glyph unicode="" d="M714.21 955.942c-167.526 0-303.226-135.7-303.226-303.226s135.7-303.226 303.226-303.226c167.526 0 303.226 135.7 303.226 303.226 0 167.526-135.7 303.226-303.226 303.226zM483.157 697.323h461.605v-89.214h-461.605v89.214zM57.137 531.927c-31.504 0-57.137-25.633-57.137-57.137v-389.432c0-31.504 25.633-57.638 57.137-57.638h194.466c0-31.146-22.554-55.418-22.554-68.664 0-12.53 10.024-23.055 22.554-23.055h183.439c12.53 0 23.055 10.525 23.055 23.055s-23.055 38.234-23.055 68.664h194.967c31.504 0 57.137 26.134 57.137 57.638v211.506c-15.448 1.154-30.771 2.957-45.609 6.014v-126.302c0-6.086-5.442-11.026-11.528-11.026h-572.872c-6.086 0-11.528 4.94-11.528 11.026v298.214c0 6.086 5.442 11.528 11.528 11.528h341.317c-7.753 14.672-14.369 29.815-20.048 45.609h-321.269z" /> +<glyph unicode="" d="M132 956.562c-6.648 0-12-5.352-12-12v-393h281.625v166.688c0 24.198 20.489 44.688 44.688 44.688h256.563v181.625c0 6.648-5.352 12-12 12h-558.875zM450.313 726.25c-6.648 0-12-5.352-12-12v-166.75h129.75c24.198 0 44.688-20.489 44.688-44.688v-359.438h396.438c6.648 0 12 5.352 12 12v558.875c0 6.648-5.352 12-12 12h-558.875zM12 518.875c-6.648 0-12-5.352-12-12v-558.875c0-6.648 5.352-12 12-12h558.875c6.648 0 12 5.352 12 12v558.875c0 6.648-5.352 12-12 12h-558.875zM248.563 373.687h85.688c2.538-1.32 4.313-4.017 4.313-7.188v-89.875l86.438 0.25c4.304 0.014 7.798-3.587 7.813-8.063l0.25-81.875c0.014-4.475-3.509-8.111-7.813-8.125l-86.688-0.25v-90.188c0-4.475-3.446-8.063-7.75-8.063h-78.813c-4.304 0-7.75 3.587-7.75 8.063v89.813l-86.438-0.25c-4.304-0.014-7.737 3.587-7.75 8.063l-0.25 81.938c-0.013 4.475 3.446 8.049 7.75 8.063l86.688 0.25v90.25c0 3.17 1.774 5.868 4.313 7.188z" /> +<glyph unicode="" d="M521.25 955.312c-33.282 0-60.25-27.985-60.25-62.563s26.968-62.625 60.25-62.625c33.282 0 60.25 28.047 60.25 62.625 0 34.578-26.968 62.563-60.25 62.563zM418.125 891.25c-22.471 0-40.563-18.779-40.563-42.125v-156.5c0-23.346 18.091-42.125 40.563-42.125h201.625c22.471 0 40.563 18.779 40.563 42.125v156.5c0 23.346-18.091 42.125-40.563 42.125h-8.188c-0.76-51.185-40.864-92.438-90.313-92.438-49.449 0-89.615 41.252-90.375 92.438h-12.75zM228.875 794.125c-18.239 0-32.875-11.791-32.875-26.438v-805.25c0-14.647 14.636-26.438 32.875-26.438h572.688c18.238 0 32.938 11.791 32.938 26.438v805.25c0 14.647-14.699 26.438-32.938 26.438h-92v-93.125h9.125c12.46 0 22.563-11.037 22.563-24.75v-622.375c0-13.713-10.102-24.75-22.563-24.75h-406.938c-12.46 0-22.5 11.037-22.5 24.75v622.375c0 13.713 10.040 24.75 22.5 24.75h16.563v93.125h-99.438zM523.125 414.812c-23.073 0-41.75-18.015-41.75-40.25s18.677-40.25 41.75-40.25c23.073 0 41.813 18.015 41.813 40.25 0 22.235-18.74 40.25-41.813 4 0.25zM580.813 395.625c2.585-6.558 4-13.631 4-21.063 0-6.001-0.971-11.789-2.688-17.25h89.938c14.404 0 26 8.567 26 19.188s-11.596 19.125-26 19.125h-91.25zM485.813 327.187l-63.188-172.875c-4.786-13.093-0.208-26.471 10.188-30 10.395-3.529 22.589 4.157 27.375 17.25l63.438 173.563c-0.174-0.001-0.325 0-0.5 0-14.016 0-26.955 4.472-37.313 12.063z" /> +<glyph unicode="" d="M511.5 960c-163.69 0-296.404-132.713-296.404-296.403 0-163.69 132.713-296.403 296.404-296.403 163.69 0 296.348 132.713 296.348 296.403 0 163.69-132.657 296.403-296.348 296.403zM511.5 884.424c121.962 0 220.828-98.866 220.828-220.828s-98.866-220.828-220.828-220.828c-121.962 0-220.828 98.866-220.828 220.828 0 121.962 98.866 220.828 220.828 220.828zM511.5 852.035c-104.078 0-188.494-84.36-188.494-188.438s84.416-188.438 188.494-188.438c104.078 0 188.438 84.36 188.438 188.438 0 104.078-84.36 188.438-188.438 188.438zM338.087 400.751l-193.558-335.249 139.353-10.518 81.864-117.204 145.252 251.548 146.254-253.329 81.864 117.204 139.353 10.518-194.337 336.529c-49.566-32.563-108.836-51.534-172.577-51.534-64.090 0-123.729 19.144-173.468 52.035z" /> +<glyph unicode="" d="M98.88 876.352c-45.928 0-83.52-37.528-83.52-83.456v-567.872c0-45.928 37.592-83.52 83.52-83.52h283.904c0-45.406-33.408-80.849-33.408-100.16 0-18.267 15.141-33.408 33.408-33.408h267.2c18.267 0 33.408 15.141 33.408 33.408s-33.408 55.798-33.408 100.16h283.904c45.928 0 83.52 37.592 83.52 83.52v567.872c0 45.928-37.592 83.456-83.52 83.456h-835.008zM98.88 809.6h835.008c8.872 0 16.704-7.831 16.704-16.704v-434.24c0-8.872-7.832-16.704-16.704-16.704h-835.008c-8.873 0-16.704 7.832-16.704 16.704v434.24c0 8.873 7.831 16.704 16.704 16.704zM515.968 788.544c-115.894 0-209.92-94.026-209.92-209.92s94.026-209.92 209.92-209.92c115.894 0 209.92 94.026 209.92 209.92 0 115.894-94.026 209.92-209.92 209.92zM521.472 718.592c47.014 0 99.456-37.468 99.456-87.488 0-41.547-28.443-57.367-49.216-69.12-12.847-7.38-20.736-20.785-20.736-27.072 0-4.92-3.848-8.768-8.768-8.768h-52.48c-4.92 0-8.768 3.848-8.768 8.768v9.856c0 26.514 26.545 49.173 45.952 57.92 16.673 7.653 24.064 14.779 24 .064 28.992 0 12.027-16.107 23.232-33.6 23.232-9.84 0-18.905-3.248-23.552-6.528-5.193-3.827-10.641-8.752-23.488-25.152-1.64-2.187-4.388-3.328-6.848-3.328-1.913 0-3.817 0.571-5.184 1.664l-36.096 27.328c-3.553 2.733-4.636 7.629-2.176 11.456 23.507 39.087 56.886 58.24 101.44 58.24zM489.728 508.672h52.48c4.92 0 8.768-3.848 8.768-8.768v-52.48c0-4.92-3.848-8.704-8.768-8.704h-52.48c-4.92 0-8.768 3.784-8.768 8.704v52.48c0 4.92 3.848 8.768 8.768 8.768z" /> +<glyph unicode="" d="M425.5 953.937c-29.671 0-53.938-24.267-53.938-53.938v-353.063c0.33 0.052 0.185 0.045 0.75 0.125 1.244 0.178 1.808 0.25 1.875 0.25 1.546 0.228 3.37 0.482 5.75 0.75 2.484 0.281 4.109 0.365 4.875 0.438 1.545 0.146 3.564 0.383 6.063 0.563h0.063c1.898 0.137 3.174 0.21 3.875 0.25 0.016 0.001 0.046-0.001 0.063 0 0.691 0.040 1.603 0.076 2.625 0.125 0.807 0.041-0.37-0.025 0.188 0 1.022 0.045 1.547 0.066 1.625 0.063 1.287 0.060 2.533 0.096 3.563 0.125 1.986 0.055 4.56 0.125 7.688 0.125 69.659 0 133.216-26.649 179.5-70.5h18.813c0-6.008-0.873-11.752-2.313-17.188 11.742-13.488 22.027-28.178 30.563-44 21.392 12.57 46.24 19.875 72.5 19.875 8.261 0 16.119-0.739 23.5-1.938-4.502 0.733-4.26 0.801 0.875-0.063l0.938-0.188c0.020-0.004 0.044 0.004 0.063 0 0.063-0.013 0.381-0.086 0.563-0.125 0.263-0.057 0.243-0.063 0.813-0.188 0.384-0.084 0.012 0.058 0.563-0.063v-0.063h0.188c-0.297 0.065 0.709-0.139 2.5-0.563 0.091-0.020 0.164-0.044 0.25-0.063 0.111-0.023 0.211-0.041 0 .313-0.063 0.857-0.208 1.734-0.435 2.688-0.688 1.806-0.477 3.707-1.011 5.688-1.625 0.159-0.049 1.456-0.4 3.938-1.25h0.063c-0.596 0.205 0.002-0.045 1.625-0.625 0.054-0.020 0.005 0.021 0.063 0 3.373-1.21 4.819-1.913 4.25-1.688h0.063c1.754-0.696 2.12-0.842 1.125-0.438 0.648-0.263 2.25-0.906 4.813-2.063 0.091-0.042 0.006-0.008 0.125-0.063 0.193-0.085 0.243-0.071 0.5-0.188 0.026-0.012-0.009-0.058 0-0.063 0.022-0.006 0.057-0.001 0.063 0 4.085-1.871 7.543-3.713 10.375-5.313 0.209-0.119 0.138-0.053 0.375-0.188v-0.063h0.063c2.362-1.345 3.832-2.295 4.563-2.75 0.528-0.329 2.197-1.296 4.875-3.125 3.057-2.088 6.085-4.33 9.063-6.75 0.059-0.048 0.128-0.077 0.188-0.125 0.034-0.028 0.012-0.057 0-0.063-0.012 0.008 0.026 0.021 0.125-0.063 0.209-0.176 0.214-0.155 0.188-0.125 0.207-0.181 0.467-0.44 0.75-0.688l-0.063-0.063c1.386-1.154 2.727-2.353 4.063-3.563 2.114 3.331 3.375 7.252 3.375 11.438 0 11.801-21.625 36.091-21.625 64.75h183.438c29.671 0 53.938 24.267 53.938 53.938v366.813c0 29.671-24.26 7 53.938-53.938 53.938h-539.438zM425.5 910.812h539.438c5.732 0 10.813-5.081 10.813-10.813v-280.5c0-5.732-5.081-10.813-10.813-10.813h-539.438c-5.732 0-10.813 5.081-10.813 10.813v280.5c0 5.732 5.081 10.813 10.813 10.813zM410.563 502.687c-2.135 0-4.256-0.066-6.375-0.125-1.249-0.035-2.445-0.069-3.688-0.125-0.199-0.008-0.426 0.010-0.625 0-0.776-0.036-1.539-0.080-2.313-0.125-1.083-0.062-2.234-0.11-3.313-0.188-1.673-0.12-3.339-0.281-5-0.438-1.344-0.127-2.664-0.224-4-0.375-1.938-0.219-3.829-0.482-5.75-0.75-0.201-0.028-0.362-0.034-0.563-0.063-0.536-0.076-1.090-0.17-1.625-0.25-2.253-0.337-4.523-0.721-6.75-1.125-2.587-0.469-5.199-1.005-7.75-1.563-2.084-0.456-4.066-0.924-6.125-1.438-0.464-0.116-0.975-0.194-1.438-0.313-2.187-0.561-4.406-1.249-6.563-1.875-0.31-0.090-0.628-0.159-0.938-0.25-1.311-0.387-2.513-0.777-3.813-1.188-1.361-0.43-2.777-0.795-4.125-1.25-0.246-0.083-0.505-0.166-0.75-0.25-1.978-0.676-3.863-1.457-5.813-2.188-2.374-0.889-4.796-1.782-7.125-2.75-1.936-0.805-3.909-1.642-5.81 3-2.5-1.479-0.667-2.916-1.364-4.375-2.063-1.5-0.718-2.959-1.436-4.438-2.188-0.442-0.225-0.935-0.397-1.375-0.625-1.020-0.527-1.99-1.082-3-1.625-0.498-0.268-0.942-0.603-1.438-0.875-2.162-1.185-4.327-2.369-6.438-3.625-0.084-0.050-0.228-0.075-0.313-0.125-1.841-1.099-3.637-2.224-5.438-3.375-0.907-0.581-1.728-1.219-2.625-1.813-0.489-0.324-1.014-0.672-1.5-1-0.917-0.618-1.845-1.181-2.75-1.813-0.115-0.080-0.26-0.169-0.375-0.25-0.514-0.36-0.99-0.76-1.5-1.125-1.217-0.87-2.367-1.731-3.563-2.625-0.263-0.197-0.55-0.364-0.813-0.563-1.88-1.42-3.738-2.895-5.563-4.375-0.037-0.030-0.151-0.033-0.188-0.063-1.861-1.511-3.636-3.116-5.438-4.688-1.849-1.613-3.715-3.262-5.5-4.938-1.796-1.686-3.521-3.378-5.25-5.125-3.283-3.317-6.469-6.722-9.5-10.25-0.423-0.493-0.832-1.004-1.25-1.5-1.169-1.388-2.309-2.707-3.438-4.125-0.116-0.146-0.259-0.291-0.375-0.438-4.529-5.726-8.653-11.747-12.5-17.938-2.559-4.117-5.012-8.32-7.25-12.625-6.911-13.295-12.246-27.501-15.813-42.313 101.421-5.326 181.875-82.479 181.875-17 6.938 0-6.119-0.341-12.228-1-18.188-10.014 89.276-92.188 158.938-192.063 158.938-6.579 0-13.15-0.198-19.688-0.688-0.168-0.021-0.333-0.041-0.5-0.063-100.010-12.736-176.937-89.743-176.938-182.875 0-102.041 92.302-184.75 206.188-184.75 3.131 0 6.216 0.064 9.313 0.188 4.187-0.294 8.539-0.438 12.938-0.438h618.625c13.743 0 24.741 1.687 33.563 4.938 79.711 16.795 139.688 90.964 139.688 179.813 0 92.841-65.566 169.491-150.625 181.563-2.292 0.079-4.625 0.125-6.938 0.125-90.16 0-164.977-60.929-179.375-140.938-0.026 1.178-0.063 2.378-0.063 3.563 0 69.279 44.781 128.809 108.938 154.938-4.748 15.894-14.304 29.845-27.188 40.375-0.024 0.020-0.038 0.043-0.063 0.063-1.933 1.576-3.988 3.083-6.063 4.5-1.039 0.71-2.115 1.394-3.188 2.063-1 0.623-1.972 1.227-3 1.813-0.087 0.049-0.163 0.076-0.25 0.125-2.239 1.265-4.513 2.483-6.875 3.563-0.134 0.061-0.304 0.127-0.438 0.188-1.054 0.476-2.11 0.938-3.188 1.375-0.25 0.102-0.562 0.213-0.813 0.313-0.958 0.379-1.837 0.776-2.813 1.125-0.376 0.135-0.747 0.2 45-1.125 0.375-0.857 0.294-1.756 0.543-2.625 0.813-1.249 0.387-2.539 0.726-3.813 1.063-0.654 0.173-1.34 0.403-2 0.563-0.582 0.14-1.163 0.246-1.75 0.375-0.065 0.012-0.122 0.051-0.188 0.063-0.153 0.034-0.347 0.029-0.5 0.063-0.065 0.014-0.123 0.049-0.188 0.063-0.184 0.031-0.378 0.033-0.563 0.063-5.186 0.842-10.559 1.313-16 1.313-51.59 0-93.375-39.551-93.375-88.375 0-19.402 6.552-37.359 17.75-51.938-20.698 16.215-33.875 40.772-33.875 68.188 0 15.418 4.165 29.883 11.5 42.5l-9 20.5c-31.214 71.154-105.071 120.875-192.063 120.875z" /> +<glyph unicode="" d="M329.688 817.371l-329.688-129.375 152.188-113.75 329.688 129.375-152.188 113.75zM686.875 817.371l-152.188-113.75 329.563-129.375 152.188 113.75-329.563 129.375zM511.813 687.996v-0.187l-329.188-129.188-1-16.188c0.883-118.766 1-237.544 1-356.313l329.688-129.25 329.125 129.25c-1.094 119.107 1.508 238.169 3.5 357.25l-0.25 14.188-332.875 130.437zM499.688 585.808c92.047 0 166.563-74.578 166.563-166.625 0-33.601-10.146-66.69-29.313-94.375l81.125-81.188c5.442-5.442 8.75-13.267 8.75-21.313 0-16.564-13.686-30.25-30.25-30.25-8.045 0-15.87 3.321-21.313 9l-81.188 80.938c-27.685-19.167-60.774-29.375-94.375-29.375-92.047 0-166.625 74.516-166.625 166.563 0 92.047 74.578 166.625 166.625 166.625zM499.688 525.246c-58.446 0-106-47.616-106-106.063s47.554-106 106-106c58.446 0 106 47.554 106 106 0 58.446-47.554 106.063-106 106.063z" /> +<glyph unicode="" d="M517.25 955.312c-33.282 0-60.25-27.985-60.25-62.563s26.968-62.625 60.25-62.625c33.282 0 60.313 28.047 60.313 62.625 0 34.578-27.030 62.563-60.313 62.563zM412.063 891.25c-21.491-1.124-38.5-19.509-38.5-42.125v-156.5c0-23.346 18.091-42.125 40.563-42.125h201.625c22.471 0 40.563 18.779 40.563 42.125v156.5c0 23.346-18.091 42.125-40.563 42.125h-8.125c-0.76-51.185-40.926-92.438-90.375-92.438-49.449 0-89.553 41.252-90.313 92.438h-12.813c-0.702 0-1.369 0.036-2.063 0zM224.938 794.125c-18.239 0-32.938-11.791-32.938-26.438v-805.25c0-14.647 14.699-26.437 32.938-26.437h572.625c18.238 0 32.938 11.79 32.938 26.437v805.25c0 14.647-14.699 26.438-32.938 26.438h-92v-93.125h9.188c12.46 0 22.5-11.037 22.5-24.75v-622.375c0-13.713-10.040-24.75-22.5-24.75h-407c-12.46 0-22.5 11.037-22.5 24.75v622.375c0 13.713 10.040 24.75 22.5 24.75h16.563v93.125h-99.375zM498.688 568.187c-18.155 0-37.041-1.909-56.563-5.813-19.522-3.905-41.067-9.989-64.688-18.188v-91.938c19.912 12.884 39.02 5 22.558 57.375 29 18.35 6.637 35.437 9.937 51.25 9.938 16.788 0 29.88-3.879 39.25-11.688 9.37-7.614 14.062-18.273 14.063-31.938 0-8.98-2.667-17.958-7.938-26.938-5.076-8.98-13.185-18.537-24.313-28.688l-18.688-17c-20.693-19.131-34.308-34.944-40.75-47.438-6.442-12.299-9.625-26.43-9.625-42.438v-14.375h105.688v13.188c0 8.784 2.025 16.777 6.125 24 4.099 7.418 12.788 17.209 26.063 29.313l18.75 16.688c18.35 17.374 31.324 33.593 38.938 48.625 7.613 15.226 11.437 32.369 11.438 51.5 0 37.286-12.513 65.611-37.5 84.938-24.988 19.521-61.243 29.25-108.875 29.25zM438.063 227.375v-104.25h105.688v104.25h-105.688z" /> +<glyph unicode="" d="M512.87 958.183c-33.282 0-60.234-28.001-60.234-62.579s26.952-62.631 60.234-62.631c33.282 0 60.285 28.053 60.285 62.631 0 34.578-27.002 62.579-60.285 62.579zM409.742 894.129c-22.471 0-40.562-18.795-40.562-42.14v-156.499c0-23.346 18.091-42.14 40.562-42.14h201.642c22.471 0 40.562 18.795 40.562 42.14v156.499c0 23.346-18.091 42.14-40.562 42.14h-8.163c-0.76-51.185-40.903-92.446-90.351-92.446-49.449 0-89.591 41.26-90.351 92.446h-12.777zM220.522 796.995c-18.239 0-32.906-11.796-32.906-26.443v-805.252c0-14.647 14.667-26.443 32.906-26.443h572.68c18.238 0 32.906 11.796 32.906 26.443v805.252c0 14.647-14.667 26.443-32.906 26.443h-92.024v-93.13h9.177c12.46 0 22.512-11.045 22.512-24.758v-622.362c0-13.713-10.051-24.758-22.512-24.758h-406.985c-12.46 0-22.512 11.045-22.512 24.758v622.362c0 13.713 10.051 24.758 22.512 24.758h16.58v93.13h-99.427zM509.726 555.899c0.007 0-0.010 0-0.027 0.001l-55.898-194.795-22.258 72.534c-2.401 7.617-9.181 13.021-17.176 13.021-9.961 0- 18.036-8.389-18.036-18.738 0-6.924 3.615-12.971 8.99-16.215l-30.615-28.9-49.942 0.052v-37.452l61.502-0.053c0.001 0 0.003 0 0.005 0l25.093 30.657 28.495-92.92c2.406-7.608 9.182-13.005 17.171-13.005 9.961 0 18.036 8.389 18.036 18.738 0 5.532-2.308 10.505-5.977 13.935l36.48 129.14 37.367-270.12c1.277-9.164 8.786-16.127 17.86-16.127 9.961 0 18.036 8.389 18.036 18.738 0 3.558-0.954 6.884-2.612 9.718l50.425 171.456 58.307 0.053v37.452h-72.098c0 0-0.002 0-0.003 0l-46.642-126-39.142 282.763c-1.299 9.139-8.797 16.074-17.853 16.074-9.961 0-18.036-8.389-18.036-18.738 0-10.349 8.075-18.738 18.036-18.738 1.99 0 3.905 0.335 5.695 0.953z" /> +<glyph unicode="" d="M329.69 696.588l-329.69-129.37 152.183-113.738 329.691 129.37-152.183 113.738zM686.845 696.588l-152.183-113.738 329.572-129.37 152.183 113.738-329.572 129.37zM511.835 567.218v-0.135l-329.215-129.235 329.453-129.235 329.334 129.235-329.572 129.37zM871.843 429.223l-314.353-129.37 152.183-113.738 314.353 129.37-152.183 113.738zM159.792 420.598l-152.183-113.738 306.863-120.745 152.183 113.738-306.863 120.745zM512.072 308.343l-22.709-17.115-22.946-17.115 0.238-0.135-152.183-113.738-131.852 51.748v-146.619l329.69-129.236 329.096 129.236v146.619l-131.734-51.748-152.183 113.738 0.356 0.135-45.774 34.229z" /> +<glyph unicode="" d="M251.18 938.808c-18.45 0-33.26-15.437-33.26-34.618v-424.044c48.501 47.813 116.934 77.67 192.644 77.67 98.466 0 184.635-50.394 230.746-125.476 19.706 9.199 41.932 14.329 65.263 14.329 20.733 0 40.516-4.076 58.472-11.413v468.934c0 19.181-14.81 34.618-33.26 34.618h-480.605zM321.346 815.995h326.753c16.244 0 29.299-14.334 29.299-32.146 0-17.811-13.055-32.146-29.299-32.146h-326.753c-16.244 0-29.299 14.334-29.299 32.146 0 17.811 13.055 32.146 29.299 32.146zM321.346 670.99h326.753c16.244 0 29.299-14.334 29.299-32.146 0-17.811-13.055-32.209-29.299-32.209h-326.753c-16.244 0-29.299 14.398-29.299 32.209s13.055 32.146 29.299 32.146zM410.564 502.717c-2.135 0-4.231-0.068-6.35-0.127-1.249-0.035-2.467-0.071-3.71-0.127-0.199-0.008-0.43 0.010-0.629 0-0.776-0.036-1.553-0.082-2.326-0.127-1.083-0.062-2.191-0.113-3.269-0.19-1.673-0.12-3.369-0.287-5.030-0.444-1.344-0.127-2.688-0.229-4.024-0.38-1.938-0.219-3.801-0.493-5.721-0.761-0.201-0.028-0.366-0.035-0.566-0.063-0.536 -0.076-1.1-0.173-1.635-0.254-2.253-0.337-4.5-0.737-6.727-1.141-2.587-0.469-5.182-0.964-7.733-1.522-2.084-0.456-4.103-0.944-6.162-1.458-0.464-0.116-0.984-0.198-1.446-0.317-2.187-0.561-4.382-1.213-6.539-1.839-0.31-0.090-0.634-0.162-0.943-0.254-1.311-0.387-2.536-0.795-3.835-1.205-1.361-0.43-2.739-0.813-4.087-1.268-0.246-0.083-0.509-0.17-0.754-0.254-1.978-0.676-3.898-1.425-5.847-2.156-2.374-0.889-4.776-1.822-7.105-2.79-1.936-0.805-3.88-1.615-5.784-2.473-1.479-0.667-2.942-1.393-4.401-2.092-1.5-0.718-2.986-1.404-4.464-2.156-0.442-0.225-0.88-0.407-1.32-0.634-1.020-0.527-2.008-1.106-3.018-1.649-0.498-0.268-0.951-0.553-1.446-0.824-2.162-1.185-4.303-2.422-6.413-3.677-0.084-0.050-0.23-0.076-0.314-0.127-1.841-1.099-3.669-2.209-5.47-3.36-0.907-0.581-1.744-1.182-2.641-1.775-0.489-0.324-1.023-0.687-1.509-1.014-0.917-0.618-1.798-1.207-2.704-1.839-0.115-0.080-0.262-0.173-0.377-0.254-0.514-0.36-0.999-0.713-1.509-1.078-1.217-0.87-2.388-1.769-3.584-2.663-0.263-0.197-0.555-0.373-0.817-0.571-1.88 -1.42-3.708-2.895-5.533-4.375-0.037-0.030-0.152-0.033-0.189-0.063-1.861-1.511-3.668-3.12-5.47-4.692-1.849-1.613-3.685-3.207-5.47-4.882-1.796-1.686-3.552-3.388-5.281-5.136-3.283-3.317-6.463-6.743-9.494-10.271-0.423-0.493-0.84-1.025-1.257-1.522-1.169-1.388-2.267-2.703-3.395-4.121-0.116-0.146-0.261-0.297-0.377-0.444-4.529-5.726-8.665-11.753-12.512-17.943-2.559-4.117-4.992-8.312-7.23-12.617-6.911-13.295-12.277-27.479-15.844-42.29 101.421-5.326 181.893-82.501 181.893-176.96 0-6.119-0.347-12.174-1.006-18.133-10.014 89.276-92.204 158.89-192.078 158.89-6.579 0-13.141-0.207-19.679-0.697-0.168-0.021-0.336-0.042-0.503-0.063-100.010-12.736-176.926-89.725-176.926-182.857 0-102.041 92.276-184.759 206.162-184.759 3.131 0 6.271 0.066 9.368 0.19 4.187-0.294 8.491-0.444 12.889-0.444h618.612c13.743 0 24.753 1.695 33.574 4.945 79.711 16.795 139.705 90.965 139.705 179.813 0 92.841-65.586 169.517-150.645 181.588-2.292 0.079-4.604 0.127-6.916 0.127-90.16 0-164.98-60.938-179.378-140.947-0.026 1.178 -0.063 2.366-0.063 3.551 0 69.279 44.803 128.83 108.96 154.959-4.748 15.894-14.341 29.859-27.224 40.388-0.024 0.020-0.039 0.044-0.063 0.063-1.933 1.576-3.961 3.085-6.036 4.502-1.039 0.71-2.134 1.361-3.207 2.029-1 0.623-1.99 1.253-3.018 1.839-0.087 0.049-0.165 0.078-0.251 0.127-2.239 1.265-4.491 2.471-6.853 3.551-0.134 0.061-0.306 0.129-0.44 0.19-1.054 0.476-2.13 0.894-3.207 1.331-0.25 0.102-0.504 0.217-0.754 0.317-0.958 0.379-1.854 0.793-2.829 1.141-0.376 0.135-0.753 0.25-1.132 0.38-0.857 0.294-1.772 0.555-2.641 0.824-1.249 0.387-2.499 0.741-3.772 1.078-0.654 0.173-1.351 0.348-2.012 0.507-0.582 0.14-1.173 0.252-1.76 0.38-0.065 0.012-0.123 0.052-0.189 0.063-0.153 0.034-0.35 0.030-0.503 0.063-0.065 0.014-0.124 0.050-0.189 0.063-0.184 0.031-0.381 0.033-0.566 0.063-5.186 0.842-10.529 1.332-15.97 1.332-51.59 0-93.43-39.561-93.43-88.385 0-19.402 6.595-37.349 17.793-51.928-20.698 16.215-33.889 40.744-33.889 68.159 0 15.418 4.171 29.927 11.506 42.544l-8.991 20.479c-31.214 71.154-105 .087 120.911-192.078 120.911z" /> </font></defs></svg> \ No newline at end of file diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf b/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf old mode 100644 new mode 100755 index 8c2d5d3..4e75ac2 Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf and b/branding/fonts/font-spacewalk/font/spacewalk-icon.ttf differ diff --git a/branding/fonts/font-spacewalk/font/spacewalk-icon.woff b/branding/fonts/font-spacewalk/font/spacewalk-icon.woff old mode 100644 new mode 100755 index 7f5e7f6..c17e0bc Binary files a/branding/fonts/font-spacewalk/font/spacewalk-icon.woff and b/branding/fonts/font-spacewalk/font/spacewalk-icon.woff differ commit 013ec9b54dfd1485393e34c18d43bbeab57bbb26 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Nov 5 12:30:55 2013 +0100 Improve the half-table by creating a .col-md-auto which adjust the grid dynamically while still being responsive (ej: in sm size they would break) diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index cb3a87d..5a58a12 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -32,22 +32,7 @@ <c:if test="${requestScope.systemGroupsWidget == 'y'}"> <script type="text/javascript" src="/rhn/dwr/interface/SystemGroupsRenderer.js"></script> </c:if> -<script type="text/javascript"> - $(document).on("ready", function() { - //for each div with class row - $(".row-0").each(function() { - //we count the number of childrens with class col-md-6 - var numberOfChildrenCol6 = $(this).children(".col-md-6").length; - //and we count the number of children with class different than col-md-6 - var numberOfChildrenDifferent = $(this).children().not('.col-md-6').length; - //if the number of childrens different to col-md-6 is Cero and the row has only 1 col-md-6 (which takes only 50% of the space) - if (numberOfChildrenDifferent == 0 && numberOfChildrenCol6 == 1) { - //we remove the class col-md-6 and change it for col-md-12, which will take a width of 100%. - $(this).children(".col-md-6").removeClass('col-md-6').addClass('col-md-12'); - } - }); - }); -</script> + </head> <body> <rhn:toolbar base="h1" icon="fa-tachometer" imgAlt="yourrhn.jsp.toolbar.img.alt" @@ -63,14 +48,14 @@ <c:when test="${requestScope.anyListsSelected == 'true'}"> <div class="row-0"> <c:if test="${requestScope.tasks == 'y'}"> - <div class="col-md-6" id="tasks-pane" > + <div class="col-md-auto" id="tasks-pane" > <script type="text/javascript"> TasksRenderer.renderAsync(makeAjaxCallback('tasks-pane', false)); </script> </div> </c:if> <c:if test="${requestScope.inactiveSystems == 'y'}"> - <div class="col-md-6" id="inactive-systems-pane" > + <div class="col-md-auto" id="inactive-systems-pane" > <script type="text/javascript"> InactiveSystemsRenderer.renderAsync(makeAjaxCallback("inactive-systems-pane", false)); </script> diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index a70419d..88f7209 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -79,4 +79,30 @@ function makeAjaxCallback(divId, debug) { return cb; } - +// Extension to Twitter Bootstrap. +// Gives you a col-XX-auto class like Bootstrap +// That dynamically adjust the grid for the columns to take +// as much space as possible while still being responsive +// So three col-md-auto would get col-md-4 each. +// Five col-md-auto would get two with col-md-3 and three with col-md-2 +$(document).on("ready", function() { + $.each(['xs', 'sm', 'md', 'lg'], function(idx, gridSize) { + //for each div with class row + $('.col-' + gridSize + '-auto:first').parent().each(function() { + //we count the number of childrens with class col-md-6 + var numberOfCols = $(this).children('.col-' + gridSize + '-auto').length; + if (numberOfCols > 0 && numberOfCols < 13) { + minSpan = Math.floor(12 / numberOfCols); + remainder = (12 % numberOfCols); + $(this).children('.col-' + gridSize + '-auto').each(function(idx, col) { + var width = minSpan; + if (remainder > 0) { + width += 1; + remainder--; + } + $(this).addClass('col-' + gridSize + '-' + width); + }); + } + }); + }); +}); \ No newline at end of file commit 6143ce3eaa565b58ea6ac10e5963b89d8c433864 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Nov 5 10:10:05 2013 +0100 Use the toolbat jsp tag diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index a09b0d8..d930aab 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -6,15 +6,14 @@ <html> <body> -<div class="toolbar-h1"> - <div class="toolbar"> - <span class="toolbar"> - <a href="TreeCreate.do"><img src="/img/action-add.gif" alt="<bean:message key="kickstart.kickstartable_distro_create_new.jsp" />" title="<bean:message key="kickstart.kickstartable_distro_create_new.jsp" />" /><bean:message key="kickstart.kickstartable_distro_create_new.jsp" /></a> - </span> - </div><img alt="<bean:message key="kickstarts.alt.img"/>" src="/img/rhn-kickstart_profile.gif" /> - <bean:message key="kickstart.kickstartable_distributions.jsp" /> -</div> +<rhn:toolbar base="h1" miscIcon="fa-plus" + miscText="kickstart.kickstartable_distro_create_new.jsp" + miscUrl="TreeCreate.do" + img="/img/rhn-kickstart_profile.gif" + imgAlt="kickstarts.alt.img"> +<bean:message key="kickstart.kickstartable_distributions.jsp" /> +</rhn:toolbar> <div class="page-summary"> <p> commit 158120bd4cef2f6926d83d16f4ecc72cfb0b7db3 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Nov 5 10:09:24 2013 +0100 Fix toolbar: either icon or (back-compat) img are needed, but not both diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index a18022d..ca9cbac 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -14,15 +14,15 @@ */ package com.redhat.rhn.frontend.taglibs; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.manager.acl.AclManager; - import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.TagSupport; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.manager.acl.AclManager; + /** * The ToolbarTag generates a toolbar showing the page title, optional * help link, and action buttons to the right of the page. @@ -618,15 +618,20 @@ public class ToolbarTag extends TagSupport { } return ""; } + private String renderMiscLink() { - if (evalAcl(getMiscAcl()) && - assertNotEmpty(getMiscUrl()) && - assertNotEmpty(getMiscText()) && - assertNotEmpty(getMiscImg())) { - return renderActionLink(getMiscUrl(), getMiscText(), - getMiscAlt(), getMiscIcon(), getMiscImg()); + if (!evalAcl(getMiscAcl())) { + return ""; } - return ""; + if (!assertNotEmpty(getMiscUrl()) || !assertNotEmpty(getMiscText())) { + return ""; + } + // either icon or img is fine + if (!assertNotEmpty(getMiscImg()) && !assertNotEmpty(getMiscIcon())) { + return ""; + } + return renderActionLink(getMiscUrl(), getMiscText(), + getMiscAlt(), getMiscIcon(), getMiscImg()); } private String renderActionLink(String url, String text, commit 812f329dba65f1fce91d275f91e4d752696f157d Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Nov 4 13:46:52 2013 +0100 TB3: Audit/OpenScap form diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp index e78ad05..b5e442e 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -4,172 +4,161 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> - <html> -<head> - <script language="javascript"> - Event.observe(window, 'load', function() { - scanDateSearchOptions(); - }); - function scanDateSearchOptions() { - if ($("scanDateOptionsCheckBox").checked) { - Element.show("scanDateOptions"); - } else { - Element.hide("scanDateOptions"); - } - } - </script> -</head> - -<body> - -<rhn:toolbar base="h1" icon="fa-search"> - <bean:message key="scapsearch.jsp.toolbar"/> -</rhn:toolbar> - -<p><bean:message key="scapsearch.jsp.summary"/></p> -<div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="scapsearch.jsp.instructions"/></h4> - </div> - <div class="panel-body"> - <html:form styleClass="form-inline" action="/audit/scap/Search.do"> - <rhn:csrf/> - <table class="table"> - <tr> - <td><bean:message key="scapsearch.jsp.searchfor"/>:</td> - <td> - <div class="form-group"> - <html:text property="search_string" styleClass="form-control" name="search_string" - value="${search_string}" maxlength="100" accesskey="4"/> - </div> - <div class="form-group"> - <button type="submit" class="btn btn-default btn-sm"> - <i class="fa fa-search"></i> - <bean:message key="button.search"/> - </button> - </div> - <br/> - <span class="small-text"> - <bean:message key="scapsearch.jsp.whatsearch.tip"/> - </span> - </td> - </tr> - <tr> - <td><bean:message key="scapsearch.jsp.withresult"/>:</td> - <td> - <div class="form-group"> - <html:select styleClass="form-control" property="result_filter"> - <html:options collection="allResults" property="label" labelProperty="label"/> - </html:select> - </div> - </td> - </tr> - <tr><td><bean:message key="systemsearch.jsp.wheretosearch"/></td> - <td> - <div class="text-left"> - <html:radio property="whereToSearch" value="all" styleId="whereToSearch-all"/> - <label for="whereToSearch-all"><bean:message key="systemsearch.jsp.searchallsystems"/></label> - </div> - <div class="text-left"> - <html:radio property="whereToSearch" value="system_list" styleId="whereToSearch-system_list"/> - <label for="whereToSearch-system_list"><bean:message key="systemsearch.jsp.searchSSM"/></label> + <head> + <script language="javascript"> + Event.observe(window, 'load', function() { + scanDateSearchOptions(); + }); + function scanDateSearchOptions() { + if ($("scanDateOptionsCheckBox").checked) { + Element.show("scanDateOptions"); + } else { + Element.hide("scanDateOptions"); + } + } + </script> + </head> + <body> + <rhn:toolbar base="h1" icon="fa-search"> + <bean:message key="scapsearch.jsp.toolbar"/> + </rhn:toolbar> + <p><bean:message key="scapsearch.jsp.summary"/></p> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="scapsearch.jsp.instructions"/></h4> </div> - </td> - </tr> - <tr><td><bean:message key="scapsearch.jsp.scan_date"/>:</td> - <td> - <html:checkbox styleId="scanDateOptionsCheckBox" property="optionScanDateSearch" onclick="javascript:scanDateSearchOptions()"> - <label for="scanDateOptionsCheckBox"> - <bean:message key="scapsearch.jsp.search_by_scan_dates"/> - </label> - </html:checkbox> - </br> - <div id="scanDateOptions" class="indent"> - <table> - <tr><td><bean:message key="scapsearch.jsp.start_date"/>:</td> - <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> - <jsp:param name="widget" value="start"/> - </jsp:include> - </td> - </tr> - <tr><td><bean:message key="scapsearch.jsp.end_date"/>:</td> - <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> - <jsp:param name="widget" value="end"/> - </jsp:include> - </td> - <tr> - </table> + <div class="panel-body"> + <html:form styleClass="form-inline" action="/audit/scap/Search.do"> + <rhn:csrf/> + <table class="table"> + <tr> + <td><bean:message key="scapsearch.jsp.searchfor"/>:</td> + <td> + <div class="form-group"> + <html:text property="search_string" styleClass="form-control" name="search_string" + value="${search_string}" maxlength="100" accesskey="4"/> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-default btn-sm"> + <i class="fa fa-search"></i> + <bean:message key="button.search"/> + </button> + </div> + <br/> + <span class="small-text"> + <bean:message key="scapsearch.jsp.whatsearch.tip"/> + </span> + </td> + </tr> + <tr> + <td><bean:message key="scapsearch.jsp.withresult"/>:</td> + <td> + <div class="form-group"> + <html:select styleClass="form-control" property="result_filter"> + <html:options collection="allResults" property="label" labelProperty="label"/> + </html:select> + </div> + </td> + </tr> + <tr><td><bean:message key="systemsearch.jsp.wheretosearch"/></td> + <td> + <div class="text-left"> + <html:radio property="whereToSearch" value="all" styleId="whereToSearch-all"/> + <label for="whereToSearch-all"><bean:message key="systemsearch.jsp.searchallsystems"/></label> + </div> + <div class="text-left"> + <html:radio property="whereToSearch" value="system_list" styleId="whereToSearch-system_list"/> + <label for="whereToSearch-system_list"><bean:message key="systemsearch.jsp.searchSSM"/></label> + </div> + </td> + </tr> + <tr><td><bean:message key="scapsearch.jsp.scan_date"/>:</td> + <td> + <html:checkbox styleId="scanDateOptionsCheckBox" property="optionScanDateSearch" onclick="javascript:scanDateSearchOptions()"> + <label for="scanDateOptionsCheckBox"> + <bean:message key="scapsearch.jsp.search_by_scan_dates"/> + </label> + </html:checkbox> + </br> + <div id="scanDateOptions" class="indent"> + <table> + <tr><td><bean:message key="scapsearch.jsp.start_date"/>:</td> + <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> + <jsp:param name="widget" value="start"/> + </jsp:include> + </td> + </tr> + <tr><td><bean:message key="scapsearch.jsp.end_date"/>:</td> + <td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> + <jsp:param name="widget" value="end"/> + </jsp:include> + </td> + <tr> + </table> + </div> + </td> + </tr> + <tr><td><bean:message key="scapsearch.jsp.show_as"/>:</td> + <td> + <div class="text-left"> + <html:radio property="show_as" value="rr" styleId="show_as-rr"/> + <label for="show_as-rr"><bean:message key="scapsearch.jsp.list_rr"/></label> + </div> + <div class="text-left"> + <html:radio property="show_as" value="tr" styleId="show_as-tr"/> + <label for="show_as-tr"><bean:message key="scapsearch.jsp.list_tr"/></label> + </div> + </td> + </tr> + </table> + <input type="hidden" name="submitted" value="true"/> + </html:form> </div> - </td> - </tr> - <tr><td><bean:message key="scapsearch.jsp.show_as"/>:</td> - <td> - <div class="text-left"> - <html:radio property="show_as" value="rr" styleId="show_as-rr"/> - <label for="show_as-rr"><bean:message key="scapsearch.jsp.list_rr"/></label> - </div> - <div class="text-left"> - <html:radio property="show_as" value="tr" styleId="show_as-tr"/> - <label for="show_as-tr"><bean:message key="scapsearch.jsp.list_tr"/></label> - </div> - </td> - </tr> - </table> - <input type="hidden" name="submitted" value="true"/> - </html:form> - </div> -</div> - - - - -<c:if test="${(search_string != null && search_string != '')}"> - <c:set var="pageList" value="${requestScope.pageList}"/> - <hr/> - - <rl:listset name="searchSet"> - <rhn:csrf/> - <c:choose> - <c:when test="${param.show_as == 'tr'}"> - <rl:list emptykey="generic.jsp.none" name="searchResultsTr" dataset="pageList"> - <%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %> - </rl:list> - <rl:csv dataset="pageList" name="searchResultsTr" - exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/> - </c:when> - - <c:otherwise> - <rl:list emptykey="generic.jsp.none" name="searchResults" dataset="pageList"> - <rl:decorator name="PageSizeDecorator"/> - <%@ include file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %> - </rl:list> - <rl:csv dataset="pageList" name="searchResults" - exportColumns="id,documentIdref,identsString,evaluationResult"/> - </c:otherwise> - </c:choose> + </div> + <c:if test="${(search_string != null && search_string != '')}"> + <c:set var="pageList" value="${requestScope.pageList}"/> + <rl:listset name="searchSet"> + <rhn:csrf/> + <c:choose> + <c:when test="${param.show_as == 'tr'}"> + <rl:list emptykey="generic.jsp.none" name="searchResultsTr" dataset="pageList"> + <%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %> + </rl:list> + <rl:csv dataset="pageList" name="searchResultsTr" + exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/> + </c:when> -  - <input type="hidden" name="submitted" value="true"/> - <input type="hidden" name="search_string" value="${search_string}"/> - <input type="hidden" name="whereToSearch" value="${param.whereToSearch}"/> - <input type="hidden" name="show_as" value="${param.show_as}"/> - <input type="hidden" name="result_filter" value="${param.result_filter}"/> - <input type="hidden" name="optionScanDateSearch" value="${param.optionScanDateSearch}"/> - <input type="hidden" name="start_year" value="${param.start_year}"/> - <input type="hidden" name="start_month" value="${param.start_month}"/> - <input type="hidden" name="start_day" value="${param.start_day}"/> - <input type="hidden" name="start_hour" value="${param.start_hour}"/> - <input type="hidden" name="start_minute" value="${param.start_minute}"/> - <input type="hidden" name="start_am_pm" value="${param.start_am_pm}"/> - <input type="hidden" name="end_year" value="${param.end_year}"/> - <input type="hidden" name="end_month" value="${param.end_month}"/> - <input type="hidden" name="end_day" value="${param.end_day}"/> - <input type="hidden" name="end_hour" value="${param.end_hour}"/> - <input type="hidden" name="end_minute" value="${param.end_minute}"/> - <input type="hidden" name="end_am_pm" value="${param.end_am_pm}"/> - </rl:listset> -</c:if> + <c:otherwise> + <rl:list emptykey="generic.jsp.none" name="searchResults" dataset="pageList"> + <rl:decorator name="PageSizeDecorator"/> + <%@ include file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %> + </rl:list> + <rl:csv dataset="pageList" name="searchResults" + exportColumns="id,documentIdref,identsString,evaluationResult"/> + </c:otherwise> + </c:choose> -</body> +  + <input type="hidden" name="submitted" value="true"/> + <input type="hidden" name="search_string" value="${search_string}"/> + <input type="hidden" name="whereToSearch" value="${param.whereToSearch}"/> + <input type="hidden" name="show_as" value="${param.show_as}"/> + <input type="hidden" name="result_filter" value="${param.result_filter}"/> + <input type="hidden" name="optionScanDateSearch" value="${param.optionScanDateSearch}"/> + <input type="hidden" name="start_year" value="${param.start_year}"/> + <input type="hidden" name="start_month" value="${param.start_month}"/> + <input type="hidden" name="start_day" value="${param.start_day}"/> + <input type="hidden" name="start_hour" value="${param.start_hour}"/> + <input type="hidden" name="start_minute" value="${param.start_minute}"/> + <input type="hidden" name="start_am_pm" value="${param.start_am_pm}"/> + <input type="hidden" name="end_year" value="${param.end_year}"/> + <input type="hidden" name="end_month" value="${param.end_month}"/> + <input type="hidden" name="end_day" value="${param.end_day}"/> + <input type="hidden" name="end_hour" value="${param.end_hour}"/> + <input type="hidden" name="end_minute" value="${param.end_minute}"/> + <input type="hidden" name="end_am_pm" value="${param.end_am_pm}"/> + </rl:listset> + </c:if> + </body> </html> commit 73abe67b597fb91e66258985265f99fd2b82a8a2 Author: Bo Maryniuk <bo(a)suse.de> Date: Mon Nov 4 13:16:31 2013 +0100 TB3: Delete organisation diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp index d4d60ef..906f08a 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp @@ -5,60 +5,81 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html> -<body> -<rhn:toolbar base="h1" icon="fa-group"> - <bean:message key="orgdelete.jsp.header1" arg0="${orgName}"/> -</rhn:toolbar> - -<rhn:dialogmenu mindepth="0" maxdepth="1" - definition="/WEB-INF/nav/org_tabs.xml" - renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - -<html:form action="/admin/multiorg/DeleteOrg?oid=${oid}"> - <rhn:csrf /> - <html:hidden property="submitted" value="true"/> - <h2><bean:message key="orgdelete.jsp.header2"/></h2> - - <table class="details" align="center"> - <tr> - <th width="25%"><bean:message key="org.name.jsp"/></th> - <td>${orgName}</td> - </tr> - <tr> - <th><bean:message key="org.active.users.jsp"/></th> - <td>${users}</td> - </tr> - <tr> - <th><bean:message key="org.systems.jsp"/></th> - <td>${systems}</td> - </tr> - <tr> - <th><bean:message key="org.system.groups.jsp"/></th> - <td>${groups}</td> - </tr> - <tr> - <th><bean:message key="org.actkeys.jsp"/></th> - <td>${actkeys}</td> - </tr> - <tr> - <th><bean:message key="org.kickstart.profiles.jsp"/></th> - <td>${ksprofiles}</td> - </tr> - <tr> - <th><bean:message key="org.config.channels.jsp"/></th> - <td>${cfgchannels}</td> - </tr> - - </table> - - <div class="text-right"> - <hr/> - <html:submit> - <bean:message key="orgdelete.jsp.submit"/> - </html:submit> - </div> - -</html:form> - -</body> + <body> + <rhn:toolbar base="h1" icon="fa-group"> + <bean:message key="orgdelete.jsp.header1" arg0="${orgName}"/> + </rhn:toolbar> + <rhn:dialogmenu mindepth="0" maxdepth="1" + definition="/WEB-INF/nav/org_tabs.xml" + renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> + <html:form action="/admin/multiorg/DeleteOrg?oid=${oid}"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="orgdelete.jsp.header2"/></h4> + </div> + <div class="panel-body"> + <table class="table"> + <tr> + <td> + <bean:message key="org.name.jsp"/> + </td> + <td> + ${orgName} + </td> + </tr> + <tr> + <td><bean:message key="org.active.users.jsp"/></td> + <td>${users}</td> + </tr> + <tr> + <td> + <bean:message key="org.systems.jsp"/> + </td> + <td> + ${systems} + </td> + </tr> + <tr> + <td> + <bean:message key="org.system.groups.jsp"/> + </td> + <td> + ${groups} + </td> + </tr> + <tr> + <td> + <bean:message key="org.actkeys.jsp"/> + </td> + <td> + ${actkeys} + </td> + </tr> + <tr> + <td> + <bean:message key="org.kickstart.profiles.jsp"/> + </td> + <td> + ${ksprofiles} + </td> + </tr> + <tr> + <td> + <bean:message key="org.config.channels.jsp"/> + </td> + <td> + ${cfgchannels} + </td> + </tr> + </table> + <br/> + <html:submit styleClass="btn btn-danger"> + <bean:message key="orgdelete.jsp.submit"/> + </html:submit> + <rhn:csrf /> + <html:hidden property="submitted" value="true"/> + </div> + </div> + </html:form> + </body> </html> commit fded035b5630cf4b325a34053138bdddcb1082c7 Author: cyntss <csanchez(a)suse.com> Date: Mon Nov 4 10:08:16 2013 +0100 Fully responsive diff --git a/branding/css/mixins.less b/branding/css/mixins.less index fe0e34c..4815b19 100644 --- a/branding/css/mixins.less +++ b/branding/css/mixins.less @@ -38,4 +38,4 @@ } .shadow-text { text-shadow: 1px 1px 1px #333; -} \ No newline at end of file +} diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp index 8a130ac..ce2928c 100644 --- a/java/code/webapp/WEB-INF/includes/footer.jsp +++ b/java/code/webapp/WEB-INF/includes/footer.jsp @@ -3,8 +3,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <div> -</div> -<div> <bean:message key="footer.jsp.copyright" /> <a href="https://www.redhat.com/legal/privacy_statement.html"><bean:message key="footer.jsp.privacyStatement" /></a> : <a href="http://www.redhat.com/legal/legal_statement.html"><bean:message key="footer.jsp.legalStatement" /></a> diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index d65fe3d..d5fd900 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -21,17 +21,17 @@ <div class="spacewalk-header-links"> <rhn:require acl="user_authenticated()"> <ul class="nav nav-pills"> - <li><a href="/rhn/account/LocalePreferences.do"><c:out value="${rhnActiveLang} "/>(<bean:message key="header.jsp.change"/>)</a></li> + <li class="hidden-sm hidden-xs"><a href="/rhn/account/LocalePreferences.do"><c:out value="${rhnActiveLang} "/>(<bean:message key="header.jsp.change"/>)</a></li> </ul> <ul class="nav nav-pills"> - <li><a href="http://kbase.redhat.com/"><bean:message key="header.jsp.knowledgebase" /></a></li> - <li><a href="/help"><bean:message key="header.jsp.documentation" /></a></li> + <li class="hidden-sm hidden-xs"><a href="http://kbase.redhat.com/"><bean:message key="header.jsp.knowledgebase" /></a></li> + <li class="hidden-sm hidden-xs"><a href="/help"><bean:message key="header.jsp.documentation" /></a></li> </ul> <ul class="nav nav-pills"> <li> <a href="/rhn/account/UserDetails.do"><i class="fa fa-user"></i><c:out escapeXml="true" value="${requestScope.session.user.login}" /></a> </li> - <li> + <li class="hidden-sm hidden-xs hidden-md"> <a><i class="fa fa-sitemap"></i><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></a> </li> <li> @@ -68,16 +68,7 @@ </div> <nav class="navbar navbar-inverse spacewalk-main-nav" role="navigation"> - <rhn:require acl="user_authenticated()"> - <rhn:menu mindepth="0" maxdepth="0" - definition="/WEB-INF/nav/sitenav-authenticated.xml" - renderer="com.redhat.rhn.frontend.nav.TopnavRenderer" /> - </rhn:require> - <rhn:require acl="not user_authenticated()"> - <rhn:menu mindepth="0" maxdepth="0" - definition="/WEB-INF/nav/sitenav.xml" - renderer="com.redhat.rhn.frontend.nav.TopnavRenderer" /> - </rhn:require> + <button class="pull-left main-menu-mobile" data-toggle="collapse" data-target=".main-menu-hor"></button> <rhn:require acl="user_authenticated()"> <div id="bar"> <div class="spacewalk-bar pull-right"> @@ -105,5 +96,17 @@ </div> </div> </rhn:require> + <div class="clear-responsive-btn"></div> + <rhn:require acl="user_authenticated()"> + <rhn:menu mindepth="0" maxdepth="0" + definition="/WEB-INF/nav/sitenav-authenticated.xml" + renderer="com.redhat.rhn.frontend.nav.TopnavRenderer" /> + </rhn:require> + <rhn:require acl="not user_authenticated()"> + <rhn:menu mindepth="0" maxdepth="0" + definition="/WEB-INF/nav/sitenav.xml" + renderer="com.redhat.rhn.frontend.nav.TopnavRenderer" /> + </rhn:require> + </nav>  diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 67d296c..a70419d 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -56,6 +56,14 @@ function columnHeight() { var newHeight = heightDoc - 145 - sectionHeight + "px"; $(".spacewalk-main-column-layout section").css("padding-bottom", newHeight); }; + //function to hide or show the Collapsable menues. 768 is the size described by Bootstrap for @screen-desktop + if ($(document).width()>1051) { + $(".collapse").addClass('in').css({ + "height": 'auto' + }); + } else { + $(".collapse").removeClass('in'); + }; }; // Render page fragments loaded via DWR commit c6160c35b8df587212b6a7ae940fca7d29bb4591 Author: cyntss <csanchez(a)suse.com> Date: Mon Nov 4 10:06:32 2013 +0100 changes in columns in the footer diff --git a/branding/css/theme.less b/branding/css/theme.less index 49e0b3f..b8696b8 100644 --- a/branding/css/theme.less +++ b/branding/css/theme.less @@ -21,15 +21,14 @@ footer { .make-row(0); div:nth-child(1) { - .make-xs-column(2); - } - div:nth-child(2) { .make-xs-column(8); .text-center; + .make-sm-column-offset(2); } - div:nth-child(3) { + div:nth-child(2) { .make-xs-column(2); .text-right; + .hidden-xs; } } @@ -71,11 +70,11 @@ p { .spacewalk-header-container { .make-row(0); .spacewalk-logo { - .make-md-column(3); + .make-xs-column(5); padding-left: 0; } .spacewalk-header-links { - .make-md-column(9); + .make-xs-column(7); .text-right; padding-right: 0; } @@ -152,9 +151,6 @@ header { .spacewalk-logo { padding-top: 1.4em; } - .spacewalk-logo { - padding-top: 1.4em; - } .nav-pills { display: inline-block; border-radius: 0 0 4px 4px @@ -201,7 +197,7 @@ header { .navbar-nav > li:hover { background: @spacewalk-blue; - border-radius: 4px 4px 0 0 + .border-rounded(4px; 4px; 0; 0); } form input[type="search"] { @@ -645,3 +641,37 @@ ul.nav.nav-tabs:last-child{ } } +// Rewriting +// Jumbotron +// -------------------------------------------------- + + +.jumbotron { + padding: @jumbotron-padding; + margin-bottom: @jumbotron-padding; + font-size: (@font-size-base * 1.3); + line-height: (@line-height-base * 1.5); + background-color: transparent; + border: 1px solid #ccc; + + h1 { + line-height: 1; + } + p { + line-height: 1.4; + } + + @media screen and (min-width: @screen-tablet) { + padding-top: (@jumbotron-padding * 1); + padding-bottom: (@jumbotron-padding * 1); + + .container & { + padding-left: (@jumbotron-padding * 2); + padding-right: (@jumbotron-padding * 2); + } + + h1 { + font-size: (@font-size-base * 3.5); + } + } +} \ No newline at end of file commit 00873040c3bff1e10da618b6f929dd84af1a7ed1 Author: cyntss <csanchez(a)suse.com> Date: Mon Nov 4 10:05:32 2013 +0100 responsive rules added diff --git a/branding/css/responsive-rules.less b/branding/css/responsive-rules.less index 8837d7a..26f6c9a 100644 --- a/branding/css/responsive-rules.less +++ b/branding/css/responsive-rules.less @@ -7,7 +7,7 @@ } } .sidenav-horizontal { - #sidenav{ + #sidenav { a:before { content: ""; margin: 0; @@ -53,11 +53,125 @@ } } } -@media (min-width: @screen-sm) and (max-width: @screen-sm-max) { - .sidenav-horizontal; - .aside-horizontal; +//second logo of SPACEWALK +.logoLetter { + .spacewalk-header-container a:nth-child(2) { + display: none; + } +} +// columns in the header +.header-responsive { + .spacewalk-header-container { + .make-row(0); + .spacewalk-logo { + .make-xs-column(6); + padding-left: 0; + } + .spacewalk-header-links { + .make-xs-column(6); + padding-right: 0; + } + } + header { + .spacewalk-logo { + padding-top: .2em; + img#rhLogo { + width: 33px; + } + img#rhnLogo { + height: 34px + } + } + } +} +// columns without paddings +.columns-no-padding { + .row-0 { + .col-md-6 { + padding-left: 0; + padding-right: 0; + } + } } -@media (max-width: @screen-xs-max) { +// Logal text in the footer takes 100% in small screens +.legal-text-footer { + footer { + div:nth-child(1) { + .make-xs-column(12); + } + } +} +// buttons will go 100% width +.buttons-full-size { + form { + .btn-success { + width: 100% + } + } +} +// main navigation bar hidden in medium and small screens but with a button to make them visible again +.menu-toggle-hide { + .main-menu-hor { + float: none; + width: 100%; + border-top: 1px solid #555; + margin: 0; + &.navbar-nav > li:hover { + .border-rounded(0;0;0;0); + } + } + .clear-responsive-btn { + .clearfix; + } +} +.main-menu-hor { + .pull-left; +} +.clear-responsive-btn{ + clear: none; +} + +// Button for the main menu +.main-menu-mobile{ + display: none; +} +.button-main-menu-vissible { + .main-menu-mobile { + display: inline-block; + border: 1px solid #444; + padding: 0 .4em; + margin: 5px 15px; + color: #555; + background: #000; + .border-rounded(4px; 4px; 4px; 4px); + &:before{ + content: "\f0c9"; + font-family: 'FontAwesome'; + font-size: 1.3em + } + &:hover{ + color: #444; + } + } +} +//classes that will take effect on tablets and mobiles screens +@media (max-width: 1061px) { + .button-main-menu-vissible; + .menu-toggle-hide; +} +@media (max-width: @screen-tablet) { .sidenav-horizontal; .aside-horizontal; -} \ No newline at end of file + .header-responsive; + .columns-no-padding; + .legal-text-footer; + .menu-toggle-hide; + .button-main-menu-vissible; +} +//classes that will take effect only on mobiles screens +@media (max-width: @screen-phone) { + .logoLetter; + .buttons-full-size; +} + + commit bb81ec8aeed085460de09b2a029a8bf2920fb160 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 31 12:43:55 2013 +0100 Fix the old List not creating certain element blocks breaking the layout: - if there is no alphabar we still render the alphabar container if there is other top-addon-content diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 7e448b5..705458b 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.taglibs; import java.io.IOException; +import java.io.StringWriter; import java.io.Writer; import java.util.Arrays; import java.util.Collections; @@ -463,7 +464,7 @@ public class ListDisplayTag extends ListDisplayTagBase { "</a></div>"); } - private void renderBoundsVariables(JspWriter out) throws IOException { + private void renderBoundsVariables(Writer out) throws IOException { StringBuffer target = new StringBuffer(); // pagination formvars renderHidden(target, "lower", String.valueOf(getPageList().getStart())); @@ -478,7 +479,7 @@ public class ListDisplayTag extends ListDisplayTagBase { renderHidden(target, PREV_LOWER, putil.getPrevLower()); renderHidden(target, NEXT_LOWER, putil.getNextLower()); renderHidden(target, LAST_LOWER, putil.getLastLower()); - out.println(target.toString()); + out.append(target.toString()); } @Override @@ -530,16 +531,12 @@ public class ListDisplayTag extends ListDisplayTagBase { } - private void renderPagination(JspWriter out, boolean top) + private void renderPagination(Writer out, boolean top) throws IOException { - out.println("<div class=\"spacewalk-list-pagination\""); - if (tableId != null) { - out.print("id=\"" + tableId + "\" "); - } - out.println(">"); + out.append("<div class=\"spacewalk-list-pagination\">\n"); - out.print("<div class=\"list-infotext\">"); + out.append("<div class=\"list-infotext\">"); int finalResult = getPageList().getEnd(); if (finalResult > getPageList().getTotalSize()) { finalResult = getPageList().getTotalSize(); @@ -556,46 +553,46 @@ public class ListDisplayTag extends ListDisplayTagBase { args[1] = new Integer(finalResult); args[2] = new Integer(getPageList().getTotalSize()); } - out.println(LocalizationService.getInstance() + out.append(LocalizationService.getInstance() .getMessage("message.range", args)); if ((set != null) && (!RhnSetDecl.SYSTEMS.getLabel().equals(set.getLabel()))) { if (top) { - out.print("<strong><span id=\"pagination_selcount_top\">"); + out.append("<strong><span id=\"pagination_selcount_top\">"); } else { - out.print("<strong><span id=\"pagination_selcount_bottom\">"); + out.append("<strong><span id=\"pagination_selcount_bottom\">"); } - out.print(LocalizationService.getInstance() + out.append(LocalizationService.getInstance() .getMessage("message.numselected", Integer.toString(set.size())) ); - out.print("</span></strong>\n"); + out.append("</span></strong>\n"); } - out.println("</div>"); + out.append("</div>"); appendButtons(out); - out.println(" </div>\n"); + out.append(" </div>"); } - private void appendButtons(JspWriter out) throws IOException { - out.println("<div class=\"spacewalk-list-pagination-btns btn-group\">"); + private void appendButtons(Writer out) throws IOException { + out.append("<div class=\"spacewalk-list-pagination-btns btn-group\">\n"); boolean canGoForward = getPageList().getEnd() < getPageList() .getTotalSize(); boolean canGoBack = getPageList().getStart() > 1; if (canGoForward || canGoBack) { - out.println(renderPaginationButton(FIRST, + out.append(renderPaginationButton(FIRST, "fa-fast-backward", " |< ", canGoBack)); - out.println(renderPaginationButton(PREV, "fa-backward", + out.append(renderPaginationButton(PREV, "fa-backward", " < ", canGoBack)); - out.println(renderPaginationButton(NEXT, "fa-forward", + out.append(renderPaginationButton(NEXT, "fa-forward", " > ", canGoForward)); - out.println(renderPaginationButton(LAST, + out.append(renderPaginationButton(LAST, "fa-fast-forward", " >| ", canGoForward)); } - out.println("</div>\n"); + out.append("</div>\n"); } private String renderPaginationButton(String name, String icon, @@ -719,7 +716,7 @@ public class ListDisplayTag extends ListDisplayTagBase { out.println(link.render());*/ } - private void renderAlphabar(JspWriter out) throws IOException { + private void renderAlphabar(Writer out) throws IOException { StringBuffer target = new StringBuffer(); target.append("<div class=\"spacewalk-alphabar\">"); @@ -770,8 +767,7 @@ public class ListDisplayTag extends ListDisplayTagBase { target.append(ab.getAlphaList(getPageList().getIndex())); target.append("</ul>"); target.append("</div>"); - - out.println(target.toString()); + out.append(target.toString()); } /** @@ -849,9 +845,13 @@ public class ListDisplayTag extends ListDisplayTagBase { doSort(sortedColumn); } - BodyContent topAddonsContent = pageContext.pushBody(); + out.print("<div class=\"spacewalk-list "); + out.println(type + "\""); + if (tableId != null) { + out.print(" id=\"" + tableId + "\""); + } + out.println(">"); - out.println("<div class=\"spacewalk-list-top-addons\">"); /* * If pageList contains an index and pageList.size() (what we are * displaying on the page) is less than pageList.getTotalSize() (the @@ -860,24 +860,34 @@ public class ListDisplayTag extends ListDisplayTagBase { * the entries on a single page and is similar to how the perl code * behaves. */ + StringWriter alphaBarContent = new StringWriter(); + StringWriter paginationContent = new StringWriter(); + + pageContext.pushBody(alphaBarContent); if (getPageList().getIndex().size() > 0 && getPageList().size() < getPageList().getTotalSize()) { - out.println("<div class=\"spacewalk-list-alphabar\">"); - renderViewAllLink(topAddonsContent); - renderAlphabar(topAddonsContent); - out.println("</div>"); + //renderViewAllLink(alphaBarContent); + renderAlphabar(alphaBarContent); } + pageContext.popBody(); + + pageContext.pushBody(paginationContent); if (isPaging()) { - renderPagination(topAddonsContent, true); - renderBoundsVariables(topAddonsContent); + renderPagination(paginationContent, true); + renderBoundsVariables(paginationContent); } - pageContext.popBody(); - if (topAddonsContent.getBufferSize() > 0) { - out.print("<div class=\"spacewalk-list\">"); - topAddonsContent.writeOut(out); + int topAddonsContentLen = alphaBarContent.getBuffer().length() + + paginationContent.getBuffer().length(); + + if (topAddonsContentLen > 0) { + out.println("<div class=\"spacewalk-list-top-addons\">"); + out.println("<div class=\"spacewalk-list-alphabar\">"); + out.print(alphaBarContent.getBuffer().toString()); + out.println("</div>"); + out.print(paginationContent.getBuffer().toString()); out.println("</div>"); } @@ -885,26 +895,7 @@ public class ListDisplayTag extends ListDisplayTagBase { renderPanelHeading(out); - /* If the type is list, we must set the width explicitly. Otherwise, - * it shouldn't matter - */ - if (type.equals("list")) { - out.print("<table class=\"table table-striped\""); - } - else { - out.print("<table class=\"" + type + "\""); - } - - /*if (isTransparent()) { - out.print(" style=\"border-bottom: 1px solid #ffffff;\" "); - }*/ - - if (tableId != null) { - out.print(" id=\"" + tableId + "\""); - } - - out.println(">"); - + out.print("<table class=\"table table-striped\">"); // we render the pagination controls as an additional head out.println("<thead>"); out.println("\n<tr>"); @@ -1043,7 +1034,11 @@ public class ListDisplayTag extends ListDisplayTagBase { out.println("</div>"); out.println("</div>"); - // export button goes outside of the panel + // close list + out.println("</div>"); + + // export button goes outside of the list because in the new + // implementation it is data-set dependent and not list dependent if (getExportColumns() != null) { renderExport(out); } commit cfbe11c241e0e4b362a41bb35499cff1c198af32 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 31 12:43:07 2013 +0100 move the semantics of id and style of the List tag to the div and not the inner table diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index b3cb97f..8be912f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -835,14 +835,20 @@ public class ListTag extends BodyTagSupport { ListTagUtil.write(pageContext, ""); + String listId = (getStyleId() != null) ? getStyleId() : getUniqueName(); + ListTagUtil.setCurrentCommand(pageContext, listId, + ListCommand.ENUMERATE); + for (ListDecorator dec : getDecorators()) { dec.setCurrentList(this); dec.beforeList(); } - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list\" id=\"" + getUniqueName() + "\">"); - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.ENUMERATE); + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list"); + if (styleClass != null) { + ListTagUtil.write(pageContext, " " + styleClass); + } + ListTagUtil.write(pageContext, "\" id=\"" + listId + "\">"); return BodyTagSupport.EVAL_BODY_INCLUDE; } @@ -984,15 +990,7 @@ public class ListTag extends BodyTagSupport { } private void startTable() throws JspException { - ListTagUtil.write(pageContext, "<table class=\"table table-striped "); - if (styleClass != null) { - ListTagUtil.write(pageContext, styleClass); - } - ListTagUtil.write(pageContext, "\""); - - ListTagUtil.write(pageContext, " id=\""); - ListTagUtil.write(pageContext, getStyleId()); - ListTagUtil.write(pageContext, "\""); + ListTagUtil.write(pageContext, "<table class=\"table table-striped\""); if (width != null) { ListTagUtil.write(pageContext, " width=\""); commit 404c35f713069b950e31411ea8896b05eda23c34 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 31 12:42:41 2013 +0100 set the current list for additional decorators diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 81ebcb6..b3cb97f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -672,6 +672,7 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(footAddonsContent); if (!manip.isListEmpty()) { for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); dec.onFooterExtraAddons(); dec.setCurrentList(null); } @@ -681,6 +682,7 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(footExtraContent); if (!manip.isListEmpty()) { for (ListDecorator dec : getDecorators()) { + dec.setCurrentList(this); dec.onFooterExtraContent(); dec.setCurrentList(null); } commit 6d6b3773cc22ea7bfecbf06b7d7d548db7cc5118 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Oct 31 12:40:38 2013 +0100 start with an initial ListCommand diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index 2b85f07..81ebcb6 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -99,6 +99,11 @@ public class ListTag extends BodyTagSupport { private boolean searchParent = true; private boolean searchChild; + @Override + public void setPageContext(PageContext ctx) { + super.setPageContext(ctx); + ListTagUtil.setCurrentCommand(ctx, getUniqueName(), ListCommand.ENUMERATE); + } /** * @param searchParentIn The searchParent to set. commit bbf57cbab2eb9c587a6d6f0381c0bf1dfd7ddaf9 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 30 17:09:25 2013 +0100 Don't show the top addons in the list if they have no content as the addons have padding. In theory the same should be done for the head and footer addons. diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 3b8676f..7e448b5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -849,10 +849,9 @@ public class ListDisplayTag extends ListDisplayTagBase { doSort(sortedColumn); } - out.print("<div class=\"spacewalk-list\">"); + BodyContent topAddonsContent = pageContext.pushBody(); out.println("<div class=\"spacewalk-list-top-addons\">"); - out.println("<div class=\"spacewalk-list-alphabar\">"); /* * If pageList contains an index and pageList.size() (what we are * displaying on the page) is less than pageList.getTotalSize() (the @@ -864,16 +863,23 @@ public class ListDisplayTag extends ListDisplayTagBase { if (getPageList().getIndex().size() > 0 && getPageList().size() < getPageList().getTotalSize()) { - renderViewAllLink(out); - renderAlphabar(out); + out.println("<div class=\"spacewalk-list-alphabar\">"); + renderViewAllLink(topAddonsContent); + renderAlphabar(topAddonsContent); + out.println("</div>"); } - out.println("</div>"); if (isPaging()) { - renderPagination(out, true); - renderBoundsVariables(out); + renderPagination(topAddonsContent, true); + renderBoundsVariables(topAddonsContent); } - out.println("</div>"); + pageContext.popBody(); + + if (topAddonsContent.getBufferSize() > 0) { + out.print("<div class=\"spacewalk-list\">"); + topAddonsContent.writeOut(out); + out.println("</div>"); + } out.print("<div class=\"panel panel-default\">"); commit c0959726c30a24007ba4d86877d2969800736908 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Oct 30 17:00:59 2013 +0100 remove xhtml tags diff --git a/java/code/webapp/WEB-INF/decorators/layout_equals.jsp b/java/code/webapp/WEB-INF/decorators/layout_equals.jsp index 1b6baec..e889e8d 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_equals.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_equals.jsp @@ -7,8 +7,8 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html:xhtml/> -<html:html xhtml="true"> + +<html:html > <head> <jsp:include page="layout_head.jsp" /> <decorator:head /> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp index 3233ba6..8b5d4c0 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <head> <meta name="name" value="Configuration" /> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp index 327e311..c5ca974 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <head> <script src="/javascript/config_channel_ranks.js" type="text/javascript"></script> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp index 31ce4c7..c0d4708 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <head> <meta name="name" value="activation-keys.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp index 7220d75..e028fc4 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index 9062b4c..07e99ac 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <head> <meta name="name" value="activationkeys.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp index 5ba38ae..fb88b86 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="name" value="systems" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp index 06b5cd8..c72a68d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp index e08fce7..3fef569 100644 --- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp index e2bee4f..bd19e30 100644 --- a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp index 8536e97..25334da 100644 --- a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp index 82020ff..48f76cc 100644 --- a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp index fda62ec..2f7af79 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp index c5f3584..56e3893 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> <bean:message key="general.jsp.org.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp index d62e5bf..e943e0e 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <head> <c:if test="${requestScope.restart == 'true'}"> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp index 2ff29ef..c2cf7ff 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp @@ -2,6 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> + <html> <body> <rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt"> diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp index b1da09b..6bf759b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp @@ -2,6 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> + <html> <body> <rhn:toolbar base="h1" icon="fa-user"> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp index 0e70f3b..8b80c41 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:html xhtml="true"> +<html:html > <body> <h2><bean:message key="erratalist.jsp.cloneerrata" /></h2> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp index 0eb33d2..3205727 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="Systems Affected" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp index c326300..35fa052 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp index c5cf541..cd3c050 100644 --- a/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp index f8cdf68..314ca41 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp index a67de42..3efff40 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp index 35da59e..1a82b1c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp index 4d3b830..74eaebf 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp index abf7060..e7e8286 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-info-circle"> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp index a41f3aa..dfaba09 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp index 67c7076..7df0f45 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp @@ -6,7 +6,7 @@ prefix="html"%> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-cog" diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp index 295a8d0..0759880 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp index 0a11c5e..712e29b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp index 4784eba..850eccf 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp @@ -6,7 +6,7 @@ -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp index eed3c55..86d36b3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index 846abac..afb3576 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp index 5f14f57..f5f9f4c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp index 20472a8..dca50b2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp index c3261f7..dc833c5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:html xhtml="true"> +<html:html > <head></head> <body> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp index a3c085b..be0c3ca 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:html xhtml="true"> +<html:html > <head> </head> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp index 493cb0b..786bc59 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <head> </head> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp index 01924fc..875b3de 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <head> </head> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp index 0a3e437..51409f9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <head> </head> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp index f4d6920..bc6ce53 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:html xhtml="true"> +<html:html > <head> </head> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp index f677567..3f60dcd 100644 --- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp index 38f0641..5537d0b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-tachometer" diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp index ca5d81d..023832b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp index 47e443f..48351f2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index 7e0593b..26d8070 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp index 15d31bd..847784d 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp b/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp index 5219cb2..00018e5 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp b/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp index 4623089..dff1531 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp index 2a0d1b7..50e29cd 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="name" value="Users" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp index a72b559..331ca9b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> <div class="panel panel-default"> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp index 0eeecc9..d9acc37 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp index 3cab5e8..21435ae 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index 21ad63d..09046c2 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp index 1ef92f5..c1de88f 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp index 6dbcedb..730fa1c 100644 --- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp b/java/code/webapp/WEB-INF/pages/audit/machine.jsp index 61d53cd..224a7f2 100644 --- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/audit/overview.jsp b/java/code/webapp/WEB-INF/pages/audit/overview.jsp index d5e54a7..968f703 100644 --- a/java/code/webapp/WEB-INF/pages/audit/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/overview.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp index f690af8..29ebba1 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> </head> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp index 1e57a6a..74e7680 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <style> diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp index 0f30ae9..e78ad05 100644 --- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <script language="javascript"> diff --git a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp index 6e14ae6..345de1e 100644 --- a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf-submit.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp index 3bc3add..741fe07 100644 --- a/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/ssm/ssmschedulexccdf.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp b/java/code/webapp/WEB-INF/pages/channel/all.jsp index 0ea8ce7..46b12cc 100644 --- a/java/code/webapp/WEB-INF/pages/channel/all.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp index a967c02..0f43c0d 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp index 232fad6..aecebe3 100755 --- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/custom.jsp b/java/code/webapp/WEB-INF/pages/channel/custom.jsp index ce2ceb6..d4e6e19 100644 --- a/java/code/webapp/WEB-INF/pages/channel/custom.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/custom.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp index f1fc736..14f15eb 100644 --- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp index 8d32271..a96458c 100644 --- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp index 9246106..250abbe 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index 2acd89a..e123b17 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 11ed87b..537e6a7 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index d4c72ec..0822156 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp index e08307e..55ca604 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp index 42200ca..95e738d 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 0132ce6..40fd461 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp index 8617846..be0aebe 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp index 53ffdc0..d193920 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp @@ -6,7 +6,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp index 8677c38..d8dbe13 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp @@ -6,7 +6,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp index 978d943..4e07584 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp index 9eeac59..9e3b1da 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp index 895db28..2b163ea 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapdelete.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" img="/img/rhn-icon-subscribe_replace.png" imgAlt="info.alt.img"> <bean:message key="distchannelmap.jsp.delete"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp index 0f33600..1d5f6c7 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp index 12f6c52..d30e671 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp index 9eda0ed..41d5d90 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp index 0e518a3..ddde5e5 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp index 5518825..b435103 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp index 6882127..2409e54 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp index 6e7a39c..ae4a938 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp index 9c8d55b..923350e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp index d226c0d..564762e 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp index 4ed3d6d..a628222 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp index 0cc2728..ae4eda5 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp index 68774be..a85b3ce 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp b/java/code/webapp/WEB-INF/pages/channel/popular.jsp index 6953269..de5e089 100644 --- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/channel/retired.jsp b/java/code/webapp/WEB-INF/pages/channel/retired.jsp index ffe9a5f..4fbed78 100644 --- a/java/code/webapp/WEB-INF/pages/channel/retired.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/retired.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/channel/shared.jsp b/java/code/webapp/WEB-INF/pages/channel/shared.jsp index d74e035..dc876d5 100644 --- a/java/code/webapp/WEB-INF/pages/channel/shared.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/shared.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp index 48e98c3..cbdc6d8 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp index 4b3139b..ff38210 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp index 08cbb85..aebb05a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp index 302cf24..8a09c31 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> <script type="text/javascript"> diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp index 172b13c..93a7196 100644 --- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp index a0ba6ad..ecf2716 100755 --- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp index 3599f6f..b4b98a3 100644 --- a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp index 74b3e70..2ccca13 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ page contentType="text/html; charset=UTF-8" %> -<html:xhtml/> + <page:applyDecorator name="layout_c"> <body> <c:set value="${requestScope["javax.servlet.error.request_uri"]}" var="errorUrl" /> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp index 607b225..ff9b15b 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %> <%@ page contentType="text/html; charset=UTF-8" %> -<html:xhtml/> + <page:applyDecorator name="layout_c"> <body> <h1> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp index 9cb2c3f..b685e5e 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp index 4c9d942..d4e245a 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp index f13cac4..c52094f 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp index 0d23769..570b862 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp index aabee7b..b105e3b 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp index 7fdfa9f..cc37f61 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp index 5f5a258..4a76f72 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp index 75aef04..95018cf 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp index 9ac897f..ef7284a 100644 --- a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp +++ b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf index d6d9cd8..19b821c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="name" value="groups" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf index 8f70d02..3ee4ffa 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<html:xhtml/> +  <c:choose> <c:when test='${channel != null}'> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf index 793abe5..153628d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml /> + <%-- There are many cases here, so to avoid repeating information and therefore greater possibility of typos, set a whole bunch of strings up that will be diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf index 17ef02e..c0bae0a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf @@ -3,7 +3,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml /> + <c:choose> <c:when test="${file.latestConfigRevision.directory}"> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf index 409fb85..cad05bc 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<html:xhtml/> + <c:if test="${errata.securityAdvisory}"> <rhn:toolbar base="h1" img="/img/rhn-icon-security.gif" imgAlt="errata-legend.jsp.security" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index e78d54f..f8a06bc 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -4,7 +4,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <div class="toolbar-h1"> <div class="toolbar"> <span class="toolbar"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf index a80719f..6630d07 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-rocket" imgAlt="system.common.kickstartAlt"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf index ccf4258..b356e39 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="icon-rocket" imgAlt="system.common.kickstartAlt"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index fd26029..8d20f40 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml /> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf index f3e266d..6a0a25a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf @@ -1,7 +1,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<html:xhtml/> + <rhn:toolbar base="h1" icon="spacewalk-icon-packages" imgAlt="profile.list.header.alt" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf index 3e7b83d..8aa8965 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf @@ -1,7 +1,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<html:xhtml/> + <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups" imgAlt="ssm.jsp.imgAlt" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf index 105bc8f..f852b2f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf @@ -7,7 +7,7 @@ -<html:xhtml/> + <html> <head> <meta name="name" value="System Details" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf index e8b5c1d..b61f569 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf @@ -4,7 +4,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <c:choose> <c:when test="${!inSSM}"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf index af67eed..2bc1b10 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<html:xhtml/> + <c:if test="${not targetuser.disabled}"> <c:set var="url" value="/rhn/users/DisableUser.do?uid=${param.uid}" /> <c:set var="text" value="userdetails.jsp.disable" /> diff --git a/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp b/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp index d01fab8..7014f1e 100644 --- a/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp +++ b/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp index 40ef7e5..fbfd24f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp @@ -2,7 +2,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> -<html:xhtml /> <html> <head> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp index b21f130..6a7a33a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp @@ -4,7 +4,7 @@ prefix="html"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> -<html:xhtml /> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp index 3c293d9..7421089 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp @@ -6,7 +6,7 @@ prefix="html"%> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> <%@ include diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp index bfefe8e..b3f9330 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp @@ -7,7 +7,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <html> <body> <%@ include diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp index 91dfdc8..f34ce56 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <head> <meta name="name" value="copy2channels.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp index 7ff219f..518b47d 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <head> <meta name="name" value="copy2systems.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp index 15731ca..27f8643 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> -<html:xhtml /> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp index b00062b..31e99d3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml /> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index 7028694..b825bae 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -6,7 +6,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml /> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp index 8e11270..a3a31ea 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml /> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp index e793b91..bc3d01b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp index 293ded0..dc130dd 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> <%@ include diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp index e16f345..e0c23d9 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp index 42ea416..15205d2 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp index 8e7ad87..d76fe77 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp index 5e191a9..ce679d3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp index 490d270..d95e49e 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp index 71a7a5e..bb55a26 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp index efab5cc..9458231 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp index ebc48c6..47abfe4 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index 237f162..873c419 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <head></head> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index d2311ba..2c0a7dd 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <head></head> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp index cd1efa4..cbb47a9 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/header.jspf"%> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp index 43ee18c..9d2bc6b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/header.jspf"%> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp index 1ad16d6..d4da237 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <head><style type="text/css"> .filename { diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp index 67227ac..a2cd705 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <head> </head> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index 635c648..08d1cee 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp index 4d9b7c3..41aead1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp index db1b2b8..20fb805 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp index c569266..4d4a057 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp index c2c9656..acab346 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp index 71ae941..914e4fd 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp index ff7b4ee..5f7f60f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-cogs"> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp index 8fbda89..e0756f2 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-desktop" diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp index d3bf65f..48be617 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp index 0b7c605..797507a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp index 810fe79..b392250 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp index b6a68f0..af0f667 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp index 646bf35..8a55e1f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp index 75baca1..aae9599 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp index bc9b038..b87c03f 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp index c12de0d..f341f61 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp index e9d1747..bbfdb39 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp index 3f71598..c5c67a4 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.jsp.header" /> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp index cd56e24..4b745e3 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <head> <meta name="name" value="sdc.config.subscriptions.jsp.header"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp index ee3bc91..5e3977b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp index 0200a44..8d270b5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp index 293c02b..9b8e855 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp index ef7c9f1..b414f7b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp index ba08d23..126e249 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp index b028d58..8dc64a1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp index 6af0f79..3284a16 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp index 2f82611..6129132 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp index 7501d16..9fbc03b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 27a5f48..90a7ded 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <head> <script src="/javascript/config_channel_ranks.js" type="text/javascript"> </script> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp index 8d8f18e..8f3114a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp index ac7bd90..e33d888 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp index e24bf33..5ab98da 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp index bf47bd5..5f2c3be 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp index 56b8caa..7be7205 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp index 0715513..226ce84 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-user" imgAlt="users.jsp.imgAlt" diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp index 6e28822..0315913 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp index 2eae333..4c9b080 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp index 6b92dae..6bd17b2 100644 --- a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index 76d9dfd..f26d948 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <head> <meta name="name" value="Systems Affected" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp b/java/code/webapp/WEB-INF/pages/errata/all.jsp index 8d02f5d..7db2cf8 100644 --- a/java/code/webapp/WEB-INF/pages/errata/all.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp index ed25795..36a1486 100644 --- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Errata_Management-Cloning_Errata.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp index cdb9829..257d71a 100644 --- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/details.jsp b/java/code/webapp/WEB-INF/pages/errata/details.jsp index 0a0bf62..c6a8689 100644 --- a/java/code/webapp/WEB-INF/pages/errata/details.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/details.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp b/java/code/webapp/WEB-INF/pages/errata/edit.jsp index d4ad25f..b1a26c9 100644 --- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp index db2e3c8..7d7b825 100644 --- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp index 720e7c4..4646877 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index fb714a2..a58affe 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:xhtml/> + <html> <head> <script language="javascript"> diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/webapp/WEB-INF/pages/errata/notify.jsp index c386fcf..163db82 100644 --- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp index 978d13a..93d558b 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp index c5ecea5..d79a801 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp index fd0b64b..81f3540 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp index 7d835dc..fbc0aa7 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp index d89501e..d0da53d 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp index a35fbe0..e2da3a7 100644 --- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/code/webapp/WEB-INF/pages/errata/published.jsp index 2a22f4d..af67a54 100644 --- a/java/code/webapp/WEB-INF/pages/errata/published.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:html xhtml="true"> +<html:html > <head> <meta name="page-decorator" content="none" /> </head> diff --git a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp index e98bc6e..0f7872c 100644 --- a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <meta name="page-decorator" content="none" /> diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp index 3b5a87d..3498598 100644 --- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:html xhtml="true"> +<html:html > <head> <meta name="page-decorator" content="none" /> </head> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index 0247e56..f6febb9 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> + <html> <head> <script type="text/javascript" src="/javascript/highlander.js"></script> diff --git a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp index b5156d2..92f38e8 100644 --- a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-rocket" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp index f2ee894..e06c23c 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="system.common.kickstartAlt" diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp b/java/code/webapp/WEB-INF/pages/keys/keys.jsp index c598c2a..8a1485c 100644 --- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp +++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-info-circle" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp index fada5ad..2898214 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp b/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp index d28fadc..f77688c 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <head> <meta http-equiv="Pragma" content="no-cache" /> </head> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp index 819d930..f86d0a0 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-rocket" imgAlt="kickstarts.alt.img"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp index d0d2f5b..37f9df2 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp @@ -7,7 +7,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %> </head> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" icon="fa-info-circle" imgAlt="info.alt.img"> ${requestScope.snippet.displayName} diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp index 4e41353..f5d69dd 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp index 7d2e947..e51f447 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index 64d4342..bb4f4ec 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp index 5413b0a..25b2a3f 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp index 6712aeb..d57a127 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp index dd66653..a7d4f7b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp index 6a0702a..81f285b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-rocket" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp index c60375e..49acd49 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> <rhn:dialogmenu mindepth="0" maxdepth="1" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp index deaf9b9..7614800 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" icon="fa-rocket" imgAlt="kickstarts.alt.img"> <bean:message key="kickstartranges.jsp.toolbar"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 6efa967..8e84c6a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" icon="fa-rocket" creationUrl="/rhn/kickstart/CreateProfileWizard.do" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp index e7b5f41..7b6fb6d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" icon="fa-rocket" deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstid}" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp index 3c9c528..1f8ce19 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:require acl="is_ks_raw(${ksid})" mixins="com.redhat.rhn.common.security.acl.KickstartAclHandler"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf"%> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index e4a91ce..a09b0d8 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:xhtml/> + <html> <body> <div class="toolbar-h1"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp index cfbf027..90b52f6 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp index 37b3d28..d8c2a02 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp index 4878f15..5c10a08 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp @@ -7,7 +7,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %> </head> -<html:html xhtml="true"> +<html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp index 16c3409..8e93765 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:xhtml/> + <html> <body> <rhn:toolbar base="h1" icon="fa-rocket"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp index 3c4069f..5553157 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp @@ -7,7 +7,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %> </head> -<html:xhtml/> + <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp index 12ac559..bc70e7a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp @@ -4,7 +4,7 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<html:html xhtml="true"> +<html:html > <body> <rhn:toolbar base="h1" icon="fa-rocket" creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index 1b93de0..93aa1a6 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> -<html:html xhtml="true"> +<html:html > <head> <script language="javascript" type="text/javascript"> // -<h2><bean:message key="addfiles.jsp.import.jspf.title" /> </h2> -<html:form action="/configuration/ChannelImportFilesSubmit.do?ccid=${ccid}"> - <rhn:csrf /> - <html:hidden property="submitted" value="true"/> - <rhn:list - pageList="${requestScope.pageList}" - noDataText="channelfiles.jsp.noFiles"> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="addfiles.jsp.import.jspf.title" /> </h4> + </div> + <div class="panel-body"> + <html:form action="/configuration/ChannelImportFilesSubmit.do?ccid=${ccid}"> + <rhn:csrf /> + <html:hidden property="submitted" value="true"/> + <rhn:list + pageList="${requestScope.pageList}" + noDataText="channelfiles.jsp.noFiles"> - <rhn:listdisplay filterBy="channelfiles.jsp.path" set="${requestScope.set}"> - <rhn:set value="${current.id}"/> - <rhn:column header="channelfiles.jsp.path"> - <cfg:file id="${current.id}" path="${current.path}" type="${current.type}" /> - </rhn:column> + <rhn:listdisplay filterBy="channelfiles.jsp.path" set="${requestScope.set}"> + <rhn:set value="${current.id}"/> + <rhn:column header="channelfiles.jsp.path"> + <cfg:file id="${current.id}" path="${current.path}" type="${current.type}" /> + </rhn:column> - <rhn:column header="channelfiles.jsp.channel"> - <cfg:channel id="${current.configChannelId}" name="${current.configChannelName}" type="${current.configChannelType}" /> - </rhn:column> + <rhn:column header="channelfiles.jsp.channel"> + <cfg:channel id="${current.configChannelId}" name="${current.configChannelName}" type="${current.configChannelType}" /> + </rhn:column> - <rhn:column header="channelfiles.jsp.lastmod" - url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}"> - ${current.modifiedDisplay} - </rhn:column> - </rhn:listdisplay> -</rhn:list> -<hr /> - <div class="text-right"> - <html:submit property="dispatch"> - <bean:message key="addfiles.jsp.import.jspf.submit" /> - </html:submit> - </div> -</html:form> + <rhn:column header="channelfiles.jsp.lastmod" + url="/rhn/configuration/file/FileDetails.do?cfid=${current.id}"> + ${current.modifiedDisplay} + </rhn:column> + </rhn:listdisplay> + </rhn:list> + <hr /> + <div class="text-right"> + <html:submit property="dispatch" styleClass="btn btn-default"> + <bean:message key="addfiles.jsp.import.jspf.submit" /> + </html:submit> + </div> + </html:form> + </div> +</div> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp index 357397d..bfefe8e 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp @@ -13,50 +13,52 @@ <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> -<h2><bean:message key="channelsystems.jsp.header2" /></h2> -<c:set var="beanarg" scope="request"> - <cfg:channel id="${channel.id}" - name="${channel.displayName}" - type="${channel.configChannelType.label}" /> -</c:set> -<bean:message key="channelsystems.jsp.descr" - arg0="${beanarg}" /> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="channelsystems.jsp.header2" /></h4> + </div> + <div class="panel-body"> + <c:set var="beanarg" scope="request"> + <cfg:channel id="${channel.id}" + name="${channel.displayName}" + type="${channel.configChannelType.label}" /> + </c:set> + <bean:message key="channelsystems.jsp.descr" + arg0="${beanarg}" /> + <html:form action="/configuration/channel/ChannelSystemsSubmit.do?ccid=${ccid}"> + <rhn:csrf /> + <html:hidden property="submitted" value="true" /> + <rhn:list + pageList="${requestScope.pageList}" + noDataText="channelsystems.jsp.noSystemsFound"> -<div> -<html:form action="/configuration/channel/ChannelSystemsSubmit.do?ccid=${ccid}"> - <rhn:csrf /> - <html:hidden property="submitted" value="true" /> - <rhn:list - pageList="${requestScope.pageList}" - noDataText="channelsystems.jsp.noSystemsFound"> + <rhn:listdisplay filterBy="system.common.systemName" + set="${requestScope.set}" + button="channelsystems.jsp.unsubscribe" + buttonAcl="user_role(config_admin)"> + <rhn:require acl="user_role(config_admin)"> + <rhn:set value="${current.id}"/> + </rhn:require> - <rhn:listdisplay filterBy="system.common.systemName" - set="${requestScope.set}" - button="channelsystems.jsp.unsubscribe" - buttonAcl="user_role(config_admin)"> - <rhn:require acl="user_role(config_admin)"> - <rhn:set value="${current.id}"/> - </rhn:require> + <rhn:column header="system.common.systemName" + url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> + <i class="fa fa-desktop"></i> + ${fn:escapeXml(current.name)} + </rhn:column> - <rhn:column header="system.common.systemName" - url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> - <img src="/img/rhn-listicon-system.gif" - alt="<bean:message key='system.common.systemAlt' />" /> - ${fn:escapeXml(current.name)} - </rhn:column> + <rhn:column header="channelsystems.jsp.overridden" + url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do?sid=${current.id}"> + <bean:message key="channelsystems.jsp.numfiles" arg0="${current.overriddenCount}" /> + </rhn:column> - <rhn:column header="channelsystems.jsp.overridden" - url="/rhn/systems/details/configuration/ViewModifyLocalPaths.do?sid=${current.id}"> - <bean:message key="channelsystems.jsp.numfiles" arg0="${current.overriddenCount}" /> - </rhn:column> - - <rhn:column header="channelsystems.jsp.outranked" - url="/rhn/systems/details/configuration/RankChannels.do?sid=${current.id}"> - <bean:message key="channelsystems.jsp.numfiles" arg0="${current.outrankedCount}" /> - </rhn:column> - </rhn:listdisplay> -</rhn:list> -</html:form> + <rhn:column header="channelsystems.jsp.outranked" + url="/rhn/systems/details/configuration/RankChannels.do?sid=${current.id}"> + <bean:message key="channelsystems.jsp.numfiles" arg0="${current.outrankedCount}" /> + </rhn:column> + </rhn:listdisplay> + </rhn:list> + </html:form> + </div> </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp index bb7d587..15731ca 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp @@ -10,28 +10,33 @@ <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> -<html:form action="/configuration/DeleteChannel.do?ccid=${ccid}"> - <rhn:csrf /> - <html:hidden property="submitted" value="true" /> - <p><bean:message key="channelOverview.jsp.deleteInstruction" /></p> - <table class="details"> - <tr> - <th><bean:message key="channelOverview.jsp.name" /></th> - <td><strong>${currChannel.name}</strong></td> - </tr> - <tr> - <th><bean:message key="channelOverview.jsp.descr" /></th> - <td><strong>${currChannel.description}</strong></td> - </tr> - </table> - <div class="text-right"> - <hr /> - <html:submit> - <bean:message key="channelOverview.jsp.deleteChannel" /> - </html:submit> +<div class="panel panel-danger"> + <div class="panel-heading"> + <h4><bean:message key="channelOverview.jsp.deleteInstruction" /></h4> </div> -</html:form> - + <div class="panel-body"> + <html:form action="/configuration/DeleteChannel.do?ccid=${ccid}"> + <rhn:csrf /> + <html:hidden property="submitted" value="true" /> + <table class="table"> + <tr> + <th><bean:message key="channelOverview.jsp.name" /></th> + <td><strong>${currChannel.name}</strong></td> + </tr> + <tr> + <th><bean:message key="channelOverview.jsp.descr" /></th> + <td><strong>${currChannel.description}</strong></td> + </tr> + </table> + <div class="text-right"> + <hr /> + <html:submit styleClass="btn btn-danger"> + <bean:message key="channelOverview.jsp.deleteChannel" /> + </html:submit> + </div> + </html:form> + </div> +</div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp index 40ef740..e793b91 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp @@ -6,14 +6,11 @@ <html:xhtml/> <html> <body> -<%@ include - file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> +<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> -<div class="importfragment"> <a name="import"></a> -<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/import.jspf" %> -</div> +<%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/import.jspf" %> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp index c348e43..1b9af76 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp @@ -6,17 +6,22 @@ <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> - <div class="uploadfragment"> -  - <h2><bean:message key="addfiles.jsp.upload-link" /> </h2> - <html:form - action="/configuration/ChannelUploadFiles.do?ccid=${ccid}&csrf_token=${csrfToken}" - styleClass="form-horizontal" - enctype="multipart/form-data"> - <rhn:csrf /> - <rhn:submitted /> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf" %> - </html:form> + + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="addfiles.jsp.upload-link" /> </h4> + </div> + <div class="panel-body"> +  + <html:form + action="/configuration/ChannelUploadFiles.do?ccid=${ccid}&csrf_token=${csrfToken}" + styleClass="form-horizontal" + enctype="multipart/form-data"> + <rhn:csrf /> + <rhn:submitted /> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf" %> + </html:form> + </div> </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp index 29eda33..293ded0 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp @@ -10,37 +10,41 @@ <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> -<h2><bean:message key="targetsystems.jsp.header2" /></h2> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="targetsystems.jsp.header2" /></h4> + </div> + <div class="panel-body"> + <c:set var="beanarg" scope="request"> + <cfg:channel id="${channel.id}" name="${channel.displayName}" + type="${channel.configChannelType.label}" /> + </c:set> + <bean:message key="targetsystems.jsp.descr" + arg0="${beanarg}" /> -<c:set var="beanarg" scope="request"> - <cfg:channel id="${channel.id}" name="${channel.displayName}" - type="${channel.configChannelType.label}" /> -</c:set> -<bean:message key="targetsystems.jsp.descr" - arg0="${beanarg}" /> + <html:form + action="/configuration/channel/TargetSystemsSubmit.do?ccid=${ccid}"> + <rhn:csrf /> + <html:hidden property="submitted" value="true" /> + <rhn:list + pageList="${requestScope.pageList}" + noDataText="targetsystems.jsp.noSystemsFound"> -<div> -<html:form - action="/configuration/channel/TargetSystemsSubmit.do?ccid=${ccid}"> - <rhn:csrf /> - <html:hidden property="submitted" value="true" /> - <rhn:list - pageList="${requestScope.pageList}" - noDataText="targetsystems.jsp.noSystemsFound"> - - <rhn:listdisplay filterBy="system.common.systemName" - set="${requestScope.set}" - button="targetsystems.jsp.subscribe"> - <rhn:set value="${current.id}"/> - <rhn:column header="system.common.systemName" - url="/rhn/systems/details/Overview.do?sid=${current.id}"> - <img alt="" src="/img/rhn-listicon-system.gif" /> - <c:out value="${current.name}" escapeXml="true" /> - </rhn:column> - </rhn:listdisplay> -</rhn:list> -</html:form> + <rhn:listdisplay filterBy="system.common.systemName" + set="${requestScope.set}" + button="targetsystems.jsp.subscribe"> + <rhn:set value="${current.id}"/> + <rhn:column header="system.common.systemName" + url="/rhn/systems/details/Overview.do?sid=${current.id}"> + <i class="fa fa-desktop"></i> + <c:out value="${current.name}" escapeXml="true" /> + </rhn:column> + </rhn:listdisplay> + </rhn:list> + </html:form> + </div> </div> + </body> </html> commit cdee3b5c791dd4c92d68f99f0abc983fa0995faa Author: Bo Maryniuk <bo(a)suse.de> Date: Tue Oct 29 16:51:38 2013 +0100 TB3: Address tag diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index 33fcd3c..dd6b304 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -160,12 +160,14 @@ public class AddressTag extends TagSupport { out = pageContext.getOut(); LocalizationService ls = LocalizationService.getInstance(); - StringBuffer result = new StringBuffer(); - StringBuffer key = new StringBuffer("address type "); + StringBuilder result = new StringBuilder(); + StringBuilder key = new StringBuilder("address type "); key.append(type); - result.append("<tr><th>"); + result.append("<div class=\"jumbotron\">"); + result.append("<div class=\"container\">"); + result.append("<h1>"); result.append(ls.getMessage(key.toString())); - result.append("</th>"); + result.append("</h1>"); if (user == null) { throw new IllegalArgumentException("User is null"); } @@ -174,14 +176,17 @@ public class AddressTag extends TagSupport { if (address != null && address.getCity() != null && address.getZip() != null) { - result.append("<td>"); - result.append("<div>"); + + // Address 1 and 2 + result.append("<p>"); result.append(address.getAddress1()); - result.append("<br/>"); if (address.getAddress2() != null) { - result.append(address.getAddress2()); result.append("<br/>"); + result.append(address.getAddress2()); } + result.append("<br/>"); + + // Sity result.append(address.getCity()); if (address.getState() != null) { result.append(", "); @@ -189,46 +194,56 @@ public class AddressTag extends TagSupport { } result.append(" "); result.append(address.getZip()); - result.append("</div>"); - result.append("<div>"); + result.append("</p>"); + + // Phones + result.append("<p>"); result.append(ls.getMessage("phone")); result.append(": "); result.append(address.getPhone()); - result.append("</div>"); - result.append("<div>"); + result.append("<br/>"); result.append(ls.getMessage("fax")); result.append(": "); if (address.getFax() != null) { result.append(address.getFax()); } - result.append("</div>"); - result.append("<div>"); - result.append("<a href=\"" + getActionUrl() + - "/EditAddress.do?type="); - result.append(type); - result.append("&uid="); - result.append(String.valueOf(user.getId())); - result.append("\">"); - result.append(ls.getMessage("Edit this address")); - result.append("</a>"); - result.append("</div>"); - result.append("</td>"); + result.append("</p>"); + + result.append("<p>"); + result.append("<a ") + .append("class=\"btn btn-success btn-lg\"") + .append("href=\"") + .append(getActionUrl()) + .append("/EditAddress.do?type=") + .append(type) + .append("&uid=") + .append(String.valueOf(user.getId())) + .append("\">") + .append(ls.getMessage("Edit this address")) + .append("</a>"); + result.append("</p>"); } else { - result.append("<td><div><strong>"); + result.append("<div class=\"alert alert-info\">"); result.append(ls.getMessage("address not filled out")); - result.append("</div></strong>"); - result.append("<a href=\"" + getActionUrl() + - "/EditAddress.do?type="); - result.append(type); - result.append("&uid="); - result.append(String.valueOf(user.getId())); - result.append("\">"); - result.append(ls.getMessage("Add this address")); - result.append("</a>"); - result.append("</td>"); + result.append("</div>"); + result.append("<p>"); + result.append("<a ") + .append("class=\"btn btn-success btn-lg\"") + .append(" href=\"") + .append(getActionUrl()) + .append("/EditAddress.do?type=") + .append(type) + .append("&uid=") + .append(String.valueOf(user.getId())) + .append("\">") + .append(ls.getMessage("Add this address")) + .append("</a>"); + result.append("</p>"); } - result.append("</tr>"); + result.append("</div>"); + result.append("</div>"); + out.print(result); } catch (IOException ioe) { diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp index 42a397e..98aadd1 100644 --- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp @@ -3,28 +3,17 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> -<html:xhtml/> <html> -<head> - <meta name="page-decorator" content="none" /> -</head> -<body> -<rhn:toolbar base="h1" icon="fa-user" - imgAlt="users.jsp.imgAlt" - helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"> - <bean:message key="Addresses" /> -</rhn:toolbar> - -<div class="panel panel-default"> - <div class="panel-heading"> - <h4> - <bean:message key="addresses.summary" /> - </h4> - </div> - <div class="panel-body"> - <table class="table"> - <rhn:address type="M" action="my" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> - </table> - </div> -</body> + <head> + <meta name="page-decorator" content="none" /> + </head> + <body> + <rhn:toolbar base="h1" icon="fa-user" + imgAlt="users.jsp.imgAlt" + helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"> + <bean:message key="Addresses" /> + </rhn:toolbar> + <p><bean:message key="addresses.summary" /></p> + <rhn:address type="M" action="my" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp index 3026487..76c668b 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp @@ -2,19 +2,10 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <html> -<body> - -<%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> - -<h2><bean:message key="address.jsp.addresses"/></h2> - - <div class="page-summary"> - <p> - <bean:message key="address.jsp.associated" /> - </p> - </div> - <table class="details"> - <rhn:address type="M" action="user" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> - </table> -</body> + <body> + <%@ include file="/WEB-INF/pages/common/fragments/user/user-header.jspf" %> + <h2><bean:message key="address.jsp.addresses"/></h2> + <p><bean:message key="address.jsp.associated" /></p> + <rhn:address type="M" action="user" user="${requestScope.targetuser}" address="${requestScope.addressMarketing}"/> + </body> </html> commit 5140d5f014dfc956a58dce0016d8511c382f4a28 Author: cyntss <csanchez(a)suse.com> Date: Tue Oct 29 16:10:41 2013 +0100 panels class added, tables inline code removed diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf index 9fba4e0..b6967c4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf @@ -1,49 +1,57 @@  -<h2> - <bean:message key="channelOverview.jsp.properties" /> - <rhn:require acl="config_channel_type(normal); user_role(config_admin)" - mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <c:if test="${channelOverviewForm.map.editing != 'true'}"> - (<a - href="/rhn/configuration/ChannelOverview.do?ccid=${ccid}&editing=true"><bean:message - key="channelOverview.jsp.choose-edit" /></a>) - </c:if> - </rhn:require> -</h2> -<c:choose> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4> + <bean:message key="channelOverview.jsp.properties" /> + <rhn:require acl="config_channel_type(normal); user_role(config_admin)" + mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> + <c:if test="${channelOverviewForm.map.editing != 'true'}"> + (<a + href="/rhn/configuration/ChannelOverview.do?ccid=${ccid}&editing=true"><bean:message + key="channelOverview.jsp.choose-edit" /></a>) + </c:if> + </rhn:require> + </h4> + </div> + <div class="panel-body"> + <c:choose> <c:when test="${channelOverviewForm.map.editing == 'true'}"> <p><bean:message key="channelOverview.jsp.edit-instruction" /></p> <html:form action="/configuration/ChannelOverview.do?ccid=${ccid}" styleClass="form-horizontal"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> <html:hidden property="creating" value="false"/> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf"%> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/propertybody.jspf"%> </html:form> </c:when> <c:otherwise> - <div class="form-group"> + <div class="form-group row"> <label class="col-lg-3 control-label"> <bean:message key="channelOverview.jsp.name" /> </label> - <div class="col-lg-6"> + <div class="col-lg-9"> <bean:write name="channelOverviewForm" property="cofName"></bean:write> </div> </div> - <div class="form-group"> + <div class="form-group row"> <label class="col-lg-3 control-label"> <bean:message key="channelOverview.jsp.label" /> </label> - <div class="col-lg-6"> + <div class="col-lg-9"> <bean:write name="channelOverviewForm" property="cofLabel"></bean:write> </div> </div> - <div class="form-group"> + <div class="form-group row"> <label class="col-lg-3 control-label"> <bean:message key="channelOverview.jsp.descr" /> </label> - <div class="col-lg-6"> + <div class="col-lg-9"> <bean:write name="channelOverviewForm" property="cofDescription"></bean:write> </div> </div> </c:otherwise> </c:choose> + </div> +</div> + + diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf index 7095f29..e7607b7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf @@ -1,108 +1,116 @@  -<h2><bean:message key="channelOverview.jsp.information" /></h2> -<table class="table"> - <tr> - <th><bean:message key="channelOverview.jsp.numfiles-header" /></th> - <c:choose> - <c:when test="${summary.numFiles + summary.numDirs + summary.numSymlinks > 0}"> - <td><bean:message key="channelOverview.jsp.numfiles" - arg0="${summary.numFiles}" arg1="${summary.numDirs}" arg2="${summary.numSymlinks}" /> - <br />(<a - href="/rhn/configuration/ChannelFiles.do?ccid=${channel.id}"><bean:message - key="channelOverview.jsp.numfiles-total" - arg0="${summary.numFiles + summary.numDirs + summary.numSymlinks}" /></a>)</td> - </c:when> - <c:otherwise> - <td><bean:message key="channelOverview.jsp.numfiles-none" /></td> - </c:otherwise> - </c:choose> - </tr> - <%-- If this is not a global channel, there will always be one system subscribed. --%> - <rhn:require acl="config_channel_type(normal)" - mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <tr> - <th><bean:message key="channelOverview.jsp.systems-header" /></th> - <c:choose> - <c:when test="${summary.numSystems == 1}"> - <td><a href="/rhn/configuration/channel/ChannelSystems.do?ccid=${channel.id}"><bean:message - key="onesystem.message"/></a> - <bean:message key="channelOverview.jsp.systems-subscribed" /></td> - </c:when> - <c:when test="${summary.numSystems > 1}"> - <td><a href="/rhn/configuration/channel/ChannelSystems.do?ccid=${channel.id}"><bean:message - key="manysystems.message" arg0="${summary.numSystems}" /></a> - <bean:message key="channelOverview.jsp.systems-subscribed" /></td> - </c:when> - <c:otherwise> - <td><bean:message key="channelOverview.jsp.systems-none" /></td> - </c:otherwise> - </c:choose> - </tr> - </rhn:require> - <c:if test="${channel.configChannelType.label == 'normal'}"> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="channelOverview.jsp.information" /></h4> + </div> + <div class="panel-body"> + <table class="table"> <tr> - <th><bean:message key="channelOverview.jsp.recentsystem-header" /></th> + <th><bean:message key="channelOverview.jsp.numfiles-header" /></th> <c:choose> - <c:when test="${summary.numSystems > 0}"> - <td> - <img alt='<bean:message key="system.common.systemAlt" />' src="/img/rhn-listicon-system.gif" /> - <a href="/rhn/systems/details/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}"> - <c:out value="${summary.mostRecentSystem.name}" /> - </a><br /> - ${summary.systemDate} - </td> + <c:when test="${summary.numFiles + summary.numDirs + summary.numSymlinks > 0}"> + <td><bean:message key="channelOverview.jsp.numfiles" + arg0="${summary.numFiles}" arg1="${summary.numDirs}" arg2="${summary.numSymlinks}" /> + <br />(<a + href="/rhn/configuration/ChannelFiles.do?ccid=${channel.id}"><bean:message + key="channelOverview.jsp.numfiles-total" + arg0="${summary.numFiles + summary.numDirs + summary.numSymlinks}" /></a>)</td> </c:when> <c:otherwise> - <td><bean:message key="channelOverview.jsp.recentsystem-none" /></td> + <td><bean:message key="channelOverview.jsp.numfiles-none" /></td> </c:otherwise> </c:choose> </tr> - </c:if> - <tr> - <th><bean:message key="channelOverview.jsp.recentfile-header" /></th> - <td><c:choose> - <c:when test="${summary.numFiles + summary.numDirs + summary.numSymlinks > 0}"> + <%-- If this is not a global channel, there will always be one system subscribed. --%> + <rhn:require acl="config_channel_type(normal)" + mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> + <tr> + <th><bean:message key="channelOverview.jsp.systems-header" /></th> + <c:choose> + <c:when test="${summary.numSystems == 1}"> + <td><a href="/rhn/configuration/channel/ChannelSystems.do?ccid=${channel.id}"><bean:message + key="onesystem.message"/></a> + <bean:message key="channelOverview.jsp.systems-subscribed" /></td> + </c:when> + <c:when test="${summary.numSystems > 1}"> + <td><a href="/rhn/configuration/channel/ChannelSystems.do?ccid=${channel.id}"><bean:message + key="manysystems.message" arg0="${summary.numSystems}" /></a> + <bean:message key="channelOverview.jsp.systems-subscribed" /></td> + </c:when> + <c:otherwise> + <td><bean:message key="channelOverview.jsp.systems-none" /></td> + </c:otherwise> + </c:choose> + </tr> + </rhn:require> + <c:if test="${channel.configChannelType.label == 'normal'}"> + <tr> + <th><bean:message key="channelOverview.jsp.recentsystem-header" /></th> <c:choose> - <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.directory}"> - <img alt='<bean:message key="config.common.dirAlt" />' src="/img/rhn-listicon-cfg_folder.gif" /> - </c:when> - <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.symlink}"> - <img alt='<bean:message key="config.common.symlinkAlt" />' src="/img/rhn-listicon-cfg_symlink.gif" /> + <c:when test="${summary.numSystems > 0}"> + <td> + <img alt='<bean:message key="system.common.systemAlt" />' src="/img/rhn-listicon-system.gif" /> + <a href="/rhn/systems/details/configuration/Overview.do?&sid=${summary.mostRecentSystem.id}"> + <c:out value="${summary.mostRecentSystem.name}" /> + </a><br /> + ${summary.systemDate} + </td> </c:when> <c:otherwise> - <img alt='<bean:message key="config.common.fileAlt" />' src="/img/rhn-listicon-cfg_file.gif" /> + <td><bean:message key="channelOverview.jsp.recentsystem-none" /></td> </c:otherwise> </c:choose> - <a href="/rhn/configuration/file/FileDetails.do?cfid=${summary.mostRecentMod.configFile.id}"> - <c:out value="${summary.mostRecentMod.configFile.configFileName.path}" /> - </a><br /> + </tr> + </c:if> + <tr> + <th><bean:message key="channelOverview.jsp.recentfile-header" /></th> + <td><c:choose> + <c:when test="${summary.numFiles + summary.numDirs + summary.numSymlinks > 0}"> + <c:choose> + <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.directory}"> + <img alt='<bean:message key="config.common.dirAlt" />' src="/img/rhn-listicon-cfg_folder.gif" /> + </c:when> + <c:when test="${summary.mostRecentMod.configFile.latestConfigRevision.symlink}"> + <img alt='<bean:message key="config.common.symlinkAlt" />' src="/img/rhn-listicon-cfg_symlink.gif" /> + </c:when> + <c:otherwise> + <img alt='<bean:message key="config.common.fileAlt" />' src="/img/rhn-listicon-cfg_file.gif" /> + </c:otherwise> + </c:choose> + <a href="/rhn/configuration/file/FileDetails.do?cfid=${summary.mostRecentMod.configFile.id}"> + <c:out value="${summary.mostRecentMod.configFile.configFileName.path}" /> + </a><br /> + + <c:if test="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy != null}"> + <%-- The c:set here creates an image with a user name. + It has a link around it if the logged in user is an org admin --%> + <c:set var="userbeanarg" scope="request"> + <rhn:require acl="user_role(org_admin)"> + <a href="/rhn/users/UserDetails.do?uid=${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.id}"> + </rhn:require> + <img src="/img/rhn-listicon-user.gif" + alt="<bean:message key='user.common.userAlt' />" /> + <c:out value="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.login}" /> + <rhn:require acl="user_role(org_admin)"> + </a> + </rhn:require> + </c:set> + <bean:message key="channelOverview.jsp.recentfile" + arg0="${userbeanarg}" + arg1="${summary.recentFileDate}"/> + </c:if> + <c:if test="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy == null}"> + <bean:message key="filedetails.details.jspf.modifiedBy-unknown" + arg0="${summary.recentFileDate}"/> + </c:if> + </c:when> + <c:otherwise> + <bean:message key="channelOverview.jsp.recentfile-none" /> + </c:otherwise> + </c:choose></td> + </tr> + </table> + + </div> +</div> - <c:if test="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy != null}"> - <%-- The c:set here creates an image with a user name. - It has a link around it if the logged in user is an org admin --%> - <c:set var="userbeanarg" scope="request"> - <rhn:require acl="user_role(org_admin)"> - <a href="/rhn/users/UserDetails.do?uid=${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.id}"> - </rhn:require> - <img src="/img/rhn-listicon-user.gif" - alt="<bean:message key='user.common.userAlt' />" /> - <c:out value="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy.login}" /> - <rhn:require acl="user_role(org_admin)"> - </a> - </rhn:require> - </c:set> - <bean:message key="channelOverview.jsp.recentfile" - arg0="${userbeanarg}" - arg1="${summary.recentFileDate}"/> - </c:if> - <c:if test="${summary.mostRecentMod.configFile.latestConfigRevision.changedBy == null}"> - <bean:message key="filedetails.details.jspf.modifiedBy-unknown" - arg0="${summary.recentFileDate}"/> - </c:if> - </c:when> - <c:otherwise> - <bean:message key="channelOverview.jsp.recentfile-none" /> - </c:otherwise> - </c:choose></td> - </tr> -</table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf index fec4706..b1e3584 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf @@ -1,107 +1,112 @@   -<h2><bean:message key="channelOverview.jsp.actions" /></h2> -<%-- This is here so that we can display a message if none of the following tables get shown --%> -<c:set var="tableshown" scope="request" value="false" /> +<div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="channelOverview.jsp.actions" /></h4> + </div> + <div class="panel-body"> + <%-- This is here so that we can display a message if none of the following tables get shown --%> + <c:set var="tableshown" scope="request" value="false" /> -<rhn:require acl="not config_channel_type(server_import); config_channel_has_files(); config_channel_has_systems()" - mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <c:set var="tableshown" scope="request" value="true" /> -  - <table cellspacing="0" cellpadding="0" - class="half-table half-table-right"> - <thead> - <tr> - <th style="text-align: left;"><bean:message - key="channelOverview.jsp.tasks.deploy" /></th> - </tr> - </thead> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=all2all"> <bean:message - key="channelOverview.jsp.tasks.deployAll2All" /></a></td> - </tr> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=sel2all"> <bean:message - key="channelOverview.jsp.tasks.deploySel2All" /></a></td> - </tr> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=all2sel"> <bean:message - key="channelOverview.jsp.tasks.deployAll2Sel" /></a></td> - </tr> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=sel2sel"> <bean:message - key="channelOverview.jsp.tasks.deploySel2Sel" /></a></td> - </tr> - </table> -</rhn:require> + <rhn:require acl="not config_channel_type(server_import); config_channel_has_files(); config_channel_has_systems()" + mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> + <c:set var="tableshown" scope="request" value="true" /> +  + <div class="col-md-6"> + <table class="table"> + <thead> + <tr> + <th style="text-align: left;"><bean:message + key="channelOverview.jsp.tasks.deploy" /></th> + </tr> + </thead> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=all2all"> <bean:message + key="channelOverview.jsp.tasks.deployAll2All" /></a></td> + </tr> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=sel2all"> <bean:message + key="channelOverview.jsp.tasks.deploySel2All" /></a></td> + </tr> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=all2sel"> <bean:message + key="channelOverview.jsp.tasks.deployAll2Sel" /></a></td> + </tr> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=sel2sel"> <bean:message + key="channelOverview.jsp.tasks.deploySel2Sel" /></a></td> + </tr> + </table> + </div> + </rhn:require> -<rhn:require acl="config_channel_has_files(); config_channel_has_systems()" - mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <c:set var="tableshown" scope="request" value="true" /> -  - <table cellspacing="0" cellpadding="0" - class="half-table half-table-right"> - <thead> - <th style="text-align: left;"><bean:message - key="channelOverview.jsp.tasks.compare" /></th> - </thead> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=compare"> <bean:message - key="channelOverview.jsp.tasks.compareAll" /></a></td> - </tr> - </table> -</rhn:require> + <rhn:require acl="config_channel_has_files(); config_channel_has_systems()" + mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> + <c:set var="tableshown" scope="request" value="true" /> +  + <table class="col-md-6"> + <thead> + <th class="text-left"><bean:message + key="channelOverview.jsp.tasks.compare" /></th> + </thead> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/channel/ChannelDeployTasks.do?ccid=${ccid}&mode=compare"> <bean:message + key="channelOverview.jsp.tasks.compareAll" /></a></td> + </tr> + </table> + </rhn:require> -<rhn:require acl="config_channel_editable()" - mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> - <c:set var="tableshown" scope="request" value="true" /> -  - <table cellspacing="0" cellpadding="0" - class="half-table half-table-right"> - <thead> - <th style="text-align: left;"><bean:message - key="channelOverview.jsp.tasks.modify" /></th> - </thead> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/ChannelCreateFiles.do?ccid=${ccid}"> <bean:message - key="channelOverview.jsp.tasks.modifyCreate" /></a></td> - </tr> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/ChannelUploadFiles.do?ccid=${ccid}"> <bean:message - key="channelOverview.jsp.tasks.modifyUpload" /></a></td> - </tr> - <tr class="list-row-odd"> - <td style="text-align: left;"><img - style="margin-left: 4px;" src="/img/parent_node.gif" - alt="" /> <a - href="/rhn/configuration/ChannelImportFiles.do?ccid=${ccid}"> <bean:message - key="channelOverview.jsp.tasks.modifyImport" /></a></td> - </tr> - </table> -</rhn:require> + <rhn:require acl="config_channel_editable()" + mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> + <c:set var="tableshown" scope="request" value="true" /> +  + <table class="table"> + <thead> + <th style="text-align: left;"><bean:message + key="channelOverview.jsp.tasks.modify" /></th> + </thead> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/ChannelCreateFiles.do?ccid=${ccid}"> <bean:message + key="channelOverview.jsp.tasks.modifyCreate" /></a></td> + </tr> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/ChannelUploadFiles.do?ccid=${ccid}"> <bean:message + key="channelOverview.jsp.tasks.modifyUpload" /></a></td> + </tr> + <tr class="list-row-odd"> + <td style="text-align: left;"><img + style="margin-left: 4px;" src="/img/parent_node.gif" + alt="" /> <a + href="/rhn/configuration/ChannelImportFiles.do?ccid=${ccid}"> <bean:message + key="channelOverview.jsp.tasks.modifyImport" /></a></td> + </tr> + </table> + </rhn:require> -<%-- If none of the tables got shown, show a message --%> -<c:if test="${not tableshown}"> - <bean:message key="channelOverview.jsp.tasks.noTasks" /> -</c:if> + <%-- If none of the tables got shown, show a message --%> + <c:if test="${not tableshown}"> + <bean:message key="channelOverview.jsp.tasks.noTasks" /> + </c:if> + </div> +</div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp index 6a77f57..bf7347b 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp @@ -4,7 +4,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <div class="${requestScope.inactiveSystemsClass}"> - <form method="post" name="rhn_list" action="/YourRhn.do"> + <form method="post" name="rhn_list" role="form" action="/YourRhn.do"> <rhn:list pageList="${requestScope.inactiveSystemList}" noDataText="${requestScope.inactiveSystemsEmpty}" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp index e40dae1..a5fcc52 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp @@ -5,7 +5,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <c:choose> <c:when test="${requestScope.criticalReflinkkeyarg0 != null}"> - <div class="full-width-wrapper" style="clear: both;" id="critical-probes-pane"> + <div id="critical-probes-pane"> <rl:listset name="criticalProbesSet"> <rhn:csrf /> <rl:list dataset="monitoringCriticalList" diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp index f6c98a7..40ef7e5 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp @@ -1,9 +1,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib uri="http://struts.apache.org/tags-html" - prefix="html"%> -<%@ taglib uri="http://struts.apache.org/tags-bean" - prefix="bean"%> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> <html:xhtml /> <html> @@ -11,12 +9,14 @@ </head> <body> <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> - <div class="left-column"> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf"%> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf"%> - </div> - <div class="right-column"> - <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf"%> + <div class="row-0"> + <div class="col-md-6"> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf"%> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/summary.jspf"%> + </div> + <div class="col-md-6"> + <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/tasks.jspf"%> + </div> </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp index a4aa60d..d41cab4 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp @@ -4,13 +4,17 @@ <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <html> - <body> - <%@ include - file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> +<body> +<%@ include + file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> - <div class="createfragment"> -  - <h2><bean:message key="addfiles.jsp.create.jspf.title" /> </h2> + <div class="createfragment"> +  + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="addfiles.jsp.create.jspf.title" /> </h4> + </div> + <div class="panel-body"> <html:form styleClass="form-horizontal" action="/configuration/ChannelCreateFiles.do?ccid=${ccid}"> @@ -19,7 +23,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/create.jspf" %> </html:form> </div> - - </body> - </html> - + </div> + </div> +</body> +</html> \ No newline at end of file

1 0

Changes to 'refs/tags/spacewalk-java-2.1.68-1'
by Michael Mraka 07 Nov '13

07 Nov '13

Tag 'spacewalk-java-2.1.68-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-11-07 14:37 +0000 Tagging package [spacewalk-java] version [2.1.68-1] in directory [java/]. Changes since spacewalk-java-2.1.67-1: Michael Mraka (2): 1027050 - optimized system_config_files_with_diffs eleborator for PostgreSQL Automatic commit of package [spacewalk-java] release [2.1.68-1]. Tomas Lestach (1): 1027454 - fix ISE, when renaming channel to channel name already in use --- java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 33 +++++----- java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 4 - java/spacewalk-java.spec | 6 + rel-eng/packages/spacewalk-java | 2 4 files changed, 28 insertions(+), 17 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 07 Nov '13

07 Nov '13

java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 33 +++++----- java/spacewalk-java.spec | 6 + rel-eng/packages/spacewalk-java | 2 3 files changed, 25 insertions(+), 16 deletions(-) New commits: commit 19cabfceb44af8cf8b57f1f19bf29b272730534c Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Nov 7 15:37:49 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.68-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index bdb69aa..eafc9ca 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.67 +Version: 2.1.68 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Nov 07 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.68-1 +- 1027050 - optimized system_config_files_with_diffs eleborator for PostgreSQL +- 1027454 - fix ISE, when renaming channel to channel name already in use + * Wed Nov 06 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.67-1 - ConfigTest: do not rely on hardcoded paths, preexisting files - Use kickstart icon on the snippets page diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 32506ac..73e79e8 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.67-1 java/ +2.1.68-1 java/ commit c6e300d50faf814621579daa15365b0df9745efd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Nov 7 15:34:25 2013 +0100 1027050 - optimized system_config_files_with_diffs eleborator for PostgreSQL diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml index 44f9edc..dd1417b 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml @@ -1284,21 +1284,26 @@ ORDER BY UPPER(COALESCE(SERVER_NAME, '(none)')), SERVER_ID <query name="system_config_files_with_diffs"> SELECT ACR.server_id AS ID, count(*) AS config_files_with_differences - FROM rhnActionConfigRevision ACR - INNER JOIN rhnActionConfigRevisionResult ACRR ON ACR.id = ACRR.action_config_revision_id - WHERE ACR.action_id = ( - SELECT MAX(rA.id) - FROM rhnAction rA - INNER JOIN rhnServerAction rSA ON rSA.action_id = rA.id - INNER JOIN rhnActionStatus rAS ON rAS.id = rSA.status - INNER JOIN rhnActionType rAT ON rAT.id = rA.action_type - WHERE rSA.server_id = ACR.server_id - AND rAS.name in ('Completed', 'Failed') - AND rAT.label = 'configfiles.diff' - ) - AND ACR.failure_id is null + FROM + (SELECT rSA.server_id, MAX(rA.id) + FROM rhnAction rA + JOIN rhnServerAction rSA + ON rSA.action_id = rA.id + JOIN rhnActionStatus rAS + ON rAS.id = rSA.status + JOIN rhnActionType rAT + ON rAT.id = rA.action_type + WHERE RSA.server_id in (%s) + AND rAS.name in ('Completed', 'Failed') + AND rAT.label = 'configfiles.diff' + GROUP BY rSA.server_id + ) X + JOIN rhnActionConfigRevision ACR + ON X.server_id = ACR.server_id + JOIN rhnActionConfigRevisionResult ACRR + ON ACR.id = ACRR.action_config_revision_id + WHERE ACR.failure_id is null AND ACRR.result is not null - AND ACR.server_id in (%s) GROUP BY ACR.server_id </query>

1 0

java/code
by Tomas Lestach 07 Nov '13

07 Nov '13

java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit fd2164ac7d0448d68c333ffaf614fafdf2c67882 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Nov 7 14:15:56 2013 +0100 1027454 - fix ISE, when renaming channel to channel name already in use diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java index 9c6a49c..9a28d24 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java @@ -100,7 +100,9 @@ public class UpdateChannelCommand extends CreateChannelCommand { if (ChannelFactory.doesChannelNameExist(name) && !name.equals(c.getName())) { - throw new InvalidChannelNameException(); + throw new InvalidChannelNameException(name, + InvalidChannelNameException.Reason.NAME_IN_USE, + "edit.channel.invalidchannelname.nameinuse", name); } if (ChannelFactory.findArchByLabel(archLabel) == null) {

1 0

Changes to 'refs/tags/spacewalk-java-2.1.67-1'
by Tomas Lestach 06 Nov '13

06 Nov '13

Tag 'spacewalk-java-2.1.67-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-11-06 15:23 +0000 Tagging package [spacewalk-java] version [2.1.67-1] in directory [java/]. Changes since spacewalk-java-2.1.66-1: Johannes Renner (1): Use kickstart icon on the snippets page Silvio Moioli (1): ConfigTest: do not rely on hardcoded paths, preexisting files Tomas Lestach (1): Automatic commit of package [spacewalk-java] release [2.1.67-1]. --- java/code/src/com/redhat/rhn/common/conf/test/ConfigTest.java | 25 ++++++++-- java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 2 java/spacewalk-java.spec | 6 ++ rel-eng/packages/spacewalk-java | 2 4 files changed, 29 insertions(+), 6 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 06 Nov '13

06 Nov '13

java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit a2e2db32822995ca0f2994b4bdf6dd5523457ab7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Nov 6 16:23:33 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.67-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f801a29..bdb69aa 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.66 +Version: 2.1.67 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Nov 06 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.67-1 +- ConfigTest: do not rely on hardcoded paths, preexisting files +- Use kickstart icon on the snippets page + * Wed Nov 06 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.66-1 - 1024395 - modified query to work better with PostgreSQL 8.4 optimizer - Reorder snippet tabs diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 2444a70..32506ac 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.66-1 java/ +2.1.67-1 java/

1 0

java/code
by Tomas Lestach 06 Nov '13

06 Nov '13

java/code/src/com/redhat/rhn/common/conf/test/ConfigTest.java | 25 ++++++++-- 1 file changed, 22 insertions(+), 3 deletions(-) New commits: commit dd0b273d4c5863dd42e83499294468be849f4463 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Sep 30 16:29:29 2013 +0200 ConfigTest: do not rely on hardcoded paths, preexisting files diff --git a/java/code/src/com/redhat/rhn/common/conf/test/ConfigTest.java b/java/code/src/com/redhat/rhn/common/conf/test/ConfigTest.java index 310964d..ab461a9 100644 --- a/java/code/src/com/redhat/rhn/common/conf/test/ConfigTest.java +++ b/java/code/src/com/redhat/rhn/common/conf/test/ConfigTest.java @@ -19,19 +19,38 @@ import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.TestUtils; +import java.io.File; import java.util.Iterator; import java.util.Properties; +import org.apache.commons.io.FileUtils; + public class ConfigTest extends RhnBaseTestCase { static final String TEST_KEY = "user"; static final String TEST_VALUE = "newval"; - static final String TEST_CONF_LOCATION = "/usr/share/rhn/unit-tests/conf"; private Config c; public void setUp() throws Exception { c = new Config(); - c.addPath(TEST_CONF_LOCATION + "/default"); - c.addPath(TEST_CONF_LOCATION); + + // create test config path + String confPath = "/tmp/" + TestUtils.randomString() + "/conf"; + String defaultPath = confPath + "/default"; + new File(defaultPath).mkdirs(); + + // copy test configuration files over + FileUtils.copyURLToFile(TestUtils.findTestData("conf/rhn.conf"), new File(confPath, + "rhn.conf")); + FileUtils.copyURLToFile(TestUtils.findTestData("conf/default/rhn_web.conf"), + new File(defaultPath, "rhn_web.conf")); + FileUtils.copyURLToFile(TestUtils.findTestData("conf/default/rhn_prefix.conf"), + new File(defaultPath, "rhn_prefix.conf")); + FileUtils.copyURLToFile(TestUtils + .findTestData("conf/default/bug154517.conf.rpmsave"), + new File(defaultPath, "bug154517.conf.rpmsave")); + + c.addPath(confPath); + c.addPath(defaultPath); c.parseFiles(); }

1 0

java/code
by StephenHerr 06 Nov '13

06 Nov '13

java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3784824a3bb03009c3650b55c7e06e853eca31f Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Nov 6 08:36:36 2013 -0500 Use kickstart icon on the snippets page diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp index 7a09412..ab3aa12 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp @@ -6,7 +6,7 @@ <html> <body> -<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif" +<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif" creationUrl="CobblerSnippetCreate.do" creationType="snippets" imgAlt="info.alt.img">

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits November 2013