branding/css/mixins.less
| 6
branding/css/roboto.less
| 14
branding/css/spacewalk.less
| 600 +++++----
branding/css/tables.less
| 16
branding/css/theme.less
| 64 +
branding/css/variables.less
| 5
branding/fonts/Roboto/LICENSE.txt
| 202 +++
branding/fonts/Roboto/Roboto-Bold.ttf
|binary
branding/fonts/Roboto/Roboto-Light.ttf
|binary
branding/spacewalk-branding.spec
| 6
branding/styles/navbar_bottom.txt
| 3
branding/styles/navbar_top.txt
| 51
branding/templates/c.pxt
| 144 +-
branding/templates/footer.pxt
| 17
branding/templates/header.pxt
| 26
java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
| 53
java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
| 5
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
| 6
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
| 8
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
| 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
| 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
| 4
java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
| 2
java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
| 4
java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java
| 2
java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
| 26
java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
| 17
java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
| 2
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
| 4
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
| 2
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java
| 1
java/code/webapp/WEB-INF/decorators/layout_c.jsp
| 10
java/code/webapp/WEB-INF/decorators/layout_head.jsp
| 17
java/code/webapp/WEB-INF/includes/footer.jsp
| 6
java/code/webapp/WEB-INF/includes/header.jsp
| 12
java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
| 2
java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
| 2
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
| 2
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
| 4
java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp
| 2
java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
| 2
java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
| 120 -
java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
| 88 -
java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
| 27
java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
| 94 -
java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
| 2
java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
| 67 -
java/code/webapp/WEB-INF/pages/admin/addresses.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
| 208 +--
java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
| 90 -
java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/general.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/disableself.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
| 74 -
java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
| 126 --
java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
| 242 +--
java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
| 185 +--
java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
| 154 +-
java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
| 119 -
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/methods.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.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
| 2
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
| 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
| 234 +--
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/deleteuser.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
| 2
java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
| 2
java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
| 4
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
| 4
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/custom.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
| 201 +--
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
| 608 +++++-----
java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
| 203 +--
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
| 2
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
| 300 ++--
java/code/webapp/WEB-INF/pages/channel/popular.jsp
| 2
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/vendor.jsp
| 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
| 258 ++--
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
| 5
java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
| 37
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.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/kickstart-toolbar.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/package/package_header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
| 152 +-
java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
| 1
java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf
| 113 +
java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
| 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
| 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
| 4
java/code/webapp/WEB-INF/pages/common/login.jsp
| 10
java/code/webapp/WEB-INF/pages/common/relogin.jsp
| 10
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
| 2
java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.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
| 2
java/code/webapp/WEB-INF/pages/credentials/delete.jsp
| 2
java/code/webapp/WEB-INF/pages/credentials/edit.jsp
| 4
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
| 4
java/code/webapp/WEB-INF/pages/help/docsearch.jsp
| 4
java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/keys/keycreate.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/cobbler/deleteconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
| 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
| 2
java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.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/treecreate.jsp
| 2
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/wizard/profile/advanced/create.jsp
| 2
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/organizations.jsp
| 2
java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
| 2
java/code/webapp/WEB-INF/pages/profiles/list.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/view-log-details.jsp
| 2
java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.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/entitlements/guestlimited.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
| 2
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
| 4
java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
| 4
java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
| 4
java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
| 2
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/systems/virtuallist.jsp
| 2
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
| 2
java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
| 2
java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
| 48
java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
| 55
java/code/webapp/WEB-INF/pages/yourrhn.jsp
| 2
web/html/javascript/channel_tree.js
| 8
web/html/javascript/check_all.js
| 22
web/html/javascript/less.js
| 11
web/html/javascript/spacewalk-essentials.js
| 84 -
web/include/network/components/legends/system-list-legend.pxi
| 4
web/include/network/components/status_bar/ssm.pxi
| 25
web/modules/sniglets/Sniglets/HTML.pm
| 23
web/modules/sniglets/Sniglets/Navi.pm
| 8
web/modules/sniglets/Sniglets/Navi/Style.pm
| 100 -
web/modules/sniglets/Sniglets/Sets.pm
| 10
273 files changed, 3234 insertions(+), 2773 deletions(-)
New commits:
commit 12ce0476ba547fade1cbe3819e77fd560de7fdb0
Author: Johannes Renner <jrenner(a)suse.de>
Date: Mon Oct 21 15:21:58 2013 +0200
Install only those *.css files on the first layer
Omit everything else: subfolders, but especially the *.less files.
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 2b7f60f..f666818 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -49,7 +49,7 @@ install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/
install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/
install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
-cp -pR css %{buildroot}/%{_var}/www/html/
+cp -p css/*.css %{buildroot}/%{_var}/www/html/
cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
# one in source:
commit cb3d206cf8c46f6afaccb03fb2060da16ab45ed8
Author: Johannes Renner <jrenner(a)suse.de>
Date: Mon Oct 21 15:13:22 2013 +0200
Use nodejs-less to compile spacewalk.less into css
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 38a93dc..2b7f60f 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -21,6 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}
-n)
BuildArch: noarch
BuildRequires: java-devel >= 1.5.0
+BuildRequires: nodejs-less
Requires: httpd
%description
@@ -35,6 +36,9 @@ javac java/code/src/com/redhat/rhn/branding/strings/StringPackage.java
rm -f java/code/src/com/redhat/rhn/branding/strings/StringPackage.java
jar -cf java-branding.jar -C java/code/src com
+# Compile less into css
+lessc css/spacewalk.less > css/spacewalk.css
+
%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{_var}/www/html
commit 9182071d2917e81f171743d46f80f181076caf1f
Author: cyntss <csanchez(a)suse.com>
Date: Mon Oct 21 14:48:00 2013 +0200
Panels added to forms inside the Your Account section
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
index 4372532..239de14 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
@@ -11,27 +11,33 @@
imgAlt="users.jsp.imgAlt">
<bean:message key="yourchangeemail.jsp.title"/>
</rhn:toolbar>
- <p class="lead">${pageinstructions}</p>
- <html:form action="/account/ChangeEmailSubmit"
- styleClass="form-horizontal">
- <rhn:csrf />
- <div class="form-group">
- <label class="col-lg-3 control-label">
- <bean:message key="channel.edit.jsp.emailaddress"
/>:
- </label>
- <div class="col-lg-6">
- <html:text property="email"
- styleClass="form-control"
- maxlength="${emailLength}" />
- </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>${pageinstructions}</h4>
</div>
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <button type="submit" class="btn btn-success"
value="${button_label}">
- ${button_label}
- </button>
- </div>
+ <div class="panel-body">
+ <html:form action="/account/ChangeEmailSubmit"
+ styleClass="form-horizontal">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.emailaddress" />:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="email"
+ styleClass="form-control"
+ maxlength="${emailLength}" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <button type="submit" class="btn
btn-success" value="${button_label}">
+ ${button_label}
+ </button>
+ </div>
+ </div>
+ </html:form>
</div>
- </html:form>
+ </div>
</body>
</html>
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 d3c6ced..946e2a3 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
@@ -14,30 +14,37 @@
imgAlt="users.jsp.imgAlt">
<bean:message key="details.jsp.account_details" />
</rhn:toolbar>
- <h2><bean:message key="details.jsp.personal_info"
/></h2>
- <p class="lead"><bean:message
key="yourdetails.jsp.summary" /></p>
- <html:form action="/account/UserDetailsSubmit"
styleClass="form-horizontal">
- <rhn:csrf />
- <%@ 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="created.displayname"/></label>
- <div class="col-lg-6">${created}</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4><bean:message key="details.jsp.personal_info"
/></h4>
</div>
- <div class="form-group">
- <label class="col-lg-3 control-label"><bean:message
key="last_sign_in.displayname"/></label>
- <div class="col-lg-6">${lastLoggedIn}</div>
+ <div class="panel-body">
+ <p><bean:message key="yourdetails.jsp.summary"
/></p>
+ <hr />
+ <html:form action="/account/UserDetailsSubmit"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <%@ 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="created.displayname"/></label>
+ <div class="col-lg-6">${created}</div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3
control-label"><bean:message
key="last_sign_in.displayname"/></label>
+ <div
class="col-lg-6">${lastLoggedIn}</div>
+ </div>
+ <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"/>"
+ <c:if test="${empty
mailableAddress}">disabled="disabled"</c:if> >
+ <bean:message key="message.Update"/>
+ </button>
+ </div>
+ </div>
+ <html:hidden property="uid"/>
+ </html:form>
</div>
- <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"/>"
- <c:if test="${empty
mailableAddress}">disabled="disabled"</c:if> >
- <bean:message key="message.Update"/>
- </button>
- </div>
- </div>
- <html:hidden property="uid"/>
- </html:form>
+ </div>
</body>
</html>
commit d8f4f9ff0df31a3f9377a9d71a6a9fd143e6cc5b
Author: Bo Maryniuk <bo(a)suse.de>
Date: Mon Oct 21 13:10:28 2013 +0200
TB3: Systems/Activation Keys/ ranking, deletion and packages forms
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 aeb3852..880403e 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
@@ -5,45 +5,53 @@
<%@ 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>
-</head>
-<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
- <html:form method="post"
- action="/activationkeys/configuration/Rank.do?tid=${param.tid}">
- <rhn:csrf />
- <h2> <img src="${cfg:channelHeaderIcon('central')}"
- alt="${cfg:channelAlt('central')}"/>
- <bean:message key="sdc.config.rank.jsp.header"/></h2>
- <c:if test="${not empty param.wizardMode}">
- <h3><bean:message key="ssm.config.rank.jsp.step"/></h3>
- <input type="hidden" name="wizardMode"
value="true"/>
- </c:if>
- <p><bean:message
key="activation-keys.config.rank.jsp.para1"/></p>
- <p><bean:message key="activation-keys.config.rank.jsp.para2"
- arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/></p>
- <c:if test="${not empty param.wizardMode}">
- <p><span class="small-text"><bean:message
key="common.config.rank.jsp.warning"
- arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/></span></p>
- </c:if>
- <noscript>
- <p><bean:message
key="common.config.rank.jsp.warning.noscript"/></p>
- </noscript>
- <h2><bean:message
key="sdc.config.rank.jsp.subscribed_channels"/></h2>
- <table style="width:50%;">
- <tr>
+ <head>
+ <script src="/javascript/config_channel_ranks.js"
type="text/javascript"></script>
+ </head>
+ <body>
+ <%@ include
file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
+ <html:form method="post"
+ styleClass="form-horizontal"
+
action="/activationkeys/configuration/Rank.do?tid=${param.tid}">
+ <rhn:csrf />
+ <h2>
+ <img src="${cfg:channelHeaderIcon('central')}"
alt="${cfg:channelAlt('central')}"/>
+ <bean:message key="sdc.config.rank.jsp.header"/>
+ </h2>
+ <c:if test="${not empty param.wizardMode}">
+ <h3><bean:message
key="ssm.config.rank.jsp.step"/></h3>
+ <input type="hidden" name="wizardMode"
value="true"/>
+ </c:if>
+ <p>
+ <bean:message
key="activation-keys.config.rank.jsp.para1"/>
+ </p>
+ <p>
+ <bean:message key="activation-keys.config.rank.jsp.para2"
+
arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/>
+ </p>
+ <c:if test="${not empty param.wizardMode}">
+ <p>
+ <span class="small-text">
+ <bean:message key="common.config.rank.jsp.warning"
+
arg0="${rhn:localize('sdc.config.rank.jsp.update')}"/>
+ </span>
+ </p>
+ </c:if>
+ <noscript>
+ <p><bean:message
key="common.config.rank.jsp.warning.noscript"/></p>
+ </noscript>
+ <h2><bean:message
key="sdc.config.rank.jsp.subscribed_channels"/></h2>
<%@ include
file="/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf" %>
- </tr>
- </table>
- <div align="right">
- <hr />
- <rhn:submitted/>
- <html:hidden property="dispatch"
value="${rhn:localize('sdc.config.rank.jsp.update')}"/>
- <input type=submit name="dispatcher"
- value="${rhn:localize('sdc.config.rank.jsp.update')}"
-
onclick="handle_config_channels_dispatch('ranksWidget','rankedValues','channelRanksForm');"/>
- </div>
- </html:form>
-</body>
+ <div class="form-group">
+ <rhn:submitted/>
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:hidden property="dispatch"
value="${rhn:localize('sdc.config.rank.jsp.update')}"/>
+ <input type=submit name="dispatcher"
+ class="btn btn-success"
+
value="${rhn:localize('sdc.config.rank.jsp.update')}"
+
onclick="handle_config_channels_dispatch('ranksWidget','rankedValues','channelRanksForm');"/>
+ </div>
+ </div>
+ </html:form>
+ </body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
index fa44887..45807a4 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
@@ -2,55 +2,47 @@
<%@ 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">
-<body>
-<rhn:toolbar base="h1" icon="icon-key"
- imgAlt="activation-keys.common.alt"
- helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
- >
- <bean:message key ="activation-key.jsp.delete.title"/>
-</rhn:toolbar>
-
-<div class="page-summary">
- <p>
- <bean:message key="activation-key.jsp.delete.para"
arg0="/rhn/activationkeys/List.do"/>
- </p>
- <p>
- <bean:message key="activation-key.jsp.delete.warning" />
- </p>
-</div>
-
-
-<hr/>
-<table class="details">
- <tr>
- <th>
- <bean:message
key="kickstart.activationkeys.jsp.description"/>
- </th>
- <td>
- <c:out value="${requestScope.activationkey.note}"/>
- </td>
- </tr>
- <tr>
- <th>
- <bean:message key="kickstart.activationkeys.jsp.key"/>
- </th>
- <td>
- <c:out value="${requestScope.activationkey.key}"/>
- </td>
- </tr>
-</table>
-
-<div align="right">
-<hr/>
- <form action="/rhn/activationkeys/Delete.do"
- id ="delete_confirm" name = "delete_confirm"
method="POST">
- <input type="hidden" name="tid"
value="${param.tid}"/>
- <rhn:csrf />
- <input type="submit" name="dispatch"
- value="${rhn:localize('activation-key.jsp.delete-key')}"
align="top" />
- <rhn:submitted/>
- </form>
-</div>
-</body>
+<html:html>
+ <body>
+ <rhn:toolbar base="h1" icon="icon-key"
+ imgAlt="activation-keys.common.alt"
+
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
+ >
+ <bean:message key ="activation-key.jsp.delete.title"/>
+ </rhn:toolbar>
+ <p><bean:message key="activation-key.jsp.delete.para"
arg0="/rhn/activationkeys/List.do"/></p>
+ <p><bean:message key="activation-key.jsp.delete.warning"
/></p>
+ <form action="/rhn/activationkeys/Delete.do"
class="form-horizontal"
+ id ="delete_confirm" name = "delete_confirm"
method="POST">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="kickstart.activationkeys.jsp.description"/>:
+ </label>
+ <div class="col-lg-6">
+ <div class="form-control">
+ <c:out
value="${requestScope.activationkey.note}"/>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="kickstart.activationkeys.jsp.key"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="form-control">
+ <c:out
value="${requestScope.activationkey.key}"/>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="hidden" name="tid"
value="${param.tid}"/>
+ <rhn:csrf />
+ <input type="submit" name="dispatch"
class="btn btn-success"
+
value="${rhn:localize('activation-key.jsp.delete-key')}"
align="top" />
+ <rhn:submitted/>
+ </div>
+ </div>
+ </form>
+ </body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
index 03a429e..f3f79e9 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
@@ -4,43 +4,32 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html>
-
-<head>
- <meta name="name" value="activationkeys.jsp.header" />
-</head>
-
-<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
-
-<html:form action="/activationkeys/packages/Packages">
-
- <rhn:csrf />
- <div class="page-summary">
- <p>
- <bean:message key="activation-key.packages.jsp.summary"/>
- </p>
- <h2><bean:message
key="activation-key.packages.jsp.enter-names"/></h2>
-
- <table class="details">
- <tr>
- <td><html:textarea property="packages"
rows="8" cols="64" />
- </tr>
- </table>
-
- <div align="right">
- <rhn:submitted/>
- <hr/>
- <input type="submit" name ="dispatch"
value='<bean:message key="keyedit.jsp.submit"/>'/>
- </div>
-
- <html:hidden property="submitted" value="true" />
- <c:if test='${not empty param.tid}'>
- <html:hidden property="tid" value="${param.tid}"
/>
- </c:if>
-
- </div>
-</html:form>
-
-</body>
+ <head>
+ <meta name="name" value="activationkeys.jsp.header" />
+ </head>
+ <body>
+ <%@ include
file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
+ <html:form action="/activationkeys/packages/Packages"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <p><bean:message
key="activation-key.packages.jsp.summary"/></p>
+ <h2><bean:message
key="activation-key.packages.jsp.enter-names"/></h2>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:textarea styleClass="form-control"
+ property="packages" rows="8"
cols="64" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <rhn:submitted/>
+ <input class="btn btn-success" type="submit"
+ name ="dispatch" value='<bean:message
key="keyedit.jsp.submit"/>'/>
+ </div>
+ </div>
+ <html:hidden property="submitted" value="true" />
+ <c:if test='${not empty param.tid}'>
+ <html:hidden property="tid" value="${param.tid}"
/>
+ </c:if>
+ </html:form>
+ </body>
</html>
-
commit 4ac405e42b61c0f656d01abc4d7e8a3c67a764c5
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Oct 21 11:52:45 2013 +0200
ssmToolbar hidden when the page loads
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 6c1a8a1..c739c2a 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -276,6 +276,7 @@ header {
#bar .spacewalk-bar {
padding: .5em 1.2em;
text-align: right;
+ display: none;
}
#bar .spacewalk-bar .badge {
margin-right: .5em
commit 5670b9b145a8a58d3519637e33ce5c9a4139031d
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Oct 18 17:24:57 2013 +0200
Generate another div element inside the filter-input
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 a714059..b50d77f 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
@@ -317,8 +317,10 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
private void renderFilterBox(JspWriter out) throws IOException {
LocalizationService ls = LocalizationService.getInstance();
- HtmlTag tag = new HtmlTag("div");
- tag.setAttribute("class", "filter-input");
+ HtmlTag tagFilterInput = new HtmlTag("div");
+ tagFilterInput.setAttribute("class", "filter-input");
+ HtmlTag tagInputGroup = new HtmlTag("div");
+ tagInputGroup.setAttribute("class", "input-group
input-group-sm");
StringBuffer buf = new StringBuffer();
HtmlTag input = new HtmlTag("input");
@@ -344,12 +346,12 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
* TODO: This is BAD. Makes the code specific to the Chanel Tree view
* Should be fixed in future versions
*/
- tag.addBody(ls.getMessage("message.filterby", ls.getMessage(filterBy))
+
- buf.toString());
-
+ tagInputGroup.addBody(ls.getMessage("message.filterby",
ls.getMessage(filterBy)) +
+ buf.toString());
+ tagFilterInput.addBody(tagInputGroup);
if (type.equals("treeview")) {
- tag.addBody("<div style=\"text-align: right;\">" +
+ tagFilterInput.addBody("<div style=\"text-align:
right;\">" +
"<a href=\"javascript:showAllRows();\"
style=\"cursor: pointer;\">" +
ls.getMessage("channels.overview.showall") +
"</a> | " +
@@ -357,8 +359,7 @@ public class UnpagedListDisplayTag extends BodyTagSupport {
ls.getMessage("channels.overview.hideall") +
"</a></div>");
}
-
- out.println(tag.render());
+ out.println(tagFilterInput.render());
}
private String getTrElement(Object o, int row) {
commit 3c8a6e11066426f1b51b1df789c144367d58ac43
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Oct 18 17:01:51 2013 +0200
TB3: Systems/Activation keys/Child channels form
diff --git
a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
index 91ab962..045c075 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
@@ -4,71 +4,57 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html>
-
-<head>
- <meta name="name" value="activationkeys.jsp.header" />
-</head>
-
-<body>
-<%@ include
file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
-
-<html:form action="/activationkeys/channels/ChildChannels">
- <rhn:csrf />
-
- <div class="page-summary">
- <p>
- <bean:message key="activation-key.childchannels.jsp.summary"/>
- </p>
- <c:if test='${not empty baseChannel}'>
- <bean:message key="activation-key.childchannels.jsp.blurb"
arg0="${baseChannel}"/>
- </c:if>
-
- <table class="details">
- <tr>
- <td>
- <select multiple="multiple" name="childChannels"
size="20">
- <c:set var="first" scope="session"
value="yes"/>
- <c:forEach items="${channels}" var="channel"
varStatus="loop">
- <c:choose>
- <c:when test="${first == 'yes'}">
- <c:set var="first" scope="session"
value="no"/>
- <c:set var="last_parent" scope="session"
value="${channel.parent}"/>
- <c:if test="${empty baseChannel}">
- <optgroup label="${channel.parent}">
- </c:if>
- </c:when>
- <c:otherwise>
- <c:if test="${(channel.parent != last_parent) && empty
baseChannel}">
- </optgroup>
- <optgroup label="${channel.parent}">
- </c:if>
- </c:otherwise>
- </c:choose>
- <option value="${channel.id}"
${channel.s}>${channel.name}</option>
- <c:set var="last_parent" scope="session"
value="${channel.parent}"/>
- </c:forEach>
- <c:if test="${empty baseChannel}">
- </optgroup>
- </c:if>
- </select>
- </td>
- </tr>
- </table>
-
- <div align="right">
- <rhn:submitted/>
- <hr/>
- <input type="submit" name ="dispatch"
value='<bean:message key="keyedit.jsp.submit"/>'/>
- </div>
-
- <html:hidden property="submitted" value="true" />
- <c:if test='${not empty param.tid}'>
- <html:hidden property="tid" value="${param.tid}" />
- </c:if>
-
- </div>
-</html:form>
-
-</body>
+ <head>
+ <meta name="name" value="activationkeys.jsp.header" />
+ </head>
+ <body>
+ <%@ include
file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
+ <html:form action="/activationkeys/channels/ChildChannels"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <p><bean:message
key="activation-key.childchannels.jsp.summary"/></p>
+ <c:if test='${not empty baseChannel}'>
+ <bean:message key="activation-key.childchannels.jsp.blurb"
arg0="${baseChannel}"/>
+ </c:if>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <select multiple="multiple" name="childChannels"
size="20" styleClass="form-control">
+ <c:set var="first" scope="session"
value="yes"/>
+ <c:forEach items="${channels}" var="channel"
varStatus="loop">
+ <c:choose>
+ <c:when test="${first == 'yes'}">
+ <c:set var="first" scope="session"
value="no"/>
+ <c:set var="last_parent"
scope="session" value="${channel.parent}"/>
+ <c:if test="${empty baseChannel}">
+ <optgroup label="${channel.parent}">
+ </c:if>
+ </c:when>
+ <c:otherwise>
+ <c:if test="${(channel.parent != last_parent)
&& empty baseChannel}">
+ </optgroup>
+ <optgroup label="${channel.parent}">
+ </c:if>
+ </c:otherwise>
+ </c:choose>
+ <option value="${channel.id}"
${channel.s}>${channel.name}</option>
+ <c:set var="last_parent" scope="session"
value="${channel.parent}"/>
+ </c:forEach>
+ <c:if test="${empty baseChannel}">
+ </optgroup>
+ </c:if>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <rhn:submitted/>
+ <input type="submit" name ="dispatch"
class="btn btn-success"
+ value='<bean:message
key="keyedit.jsp.submit"/>'/>
+ </div>
+ </div>
+ <html:hidden property="submitted" value="true" />
+ <c:if test='${not empty param.tid}'>
+ <html:hidden property="tid" value="${param.tid}"
/>
+ </c:if>
+ </html:form>
+ </body>
</html>
-
commit 64b632c7a101d854ab821721e10c273f59443ed5
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 16:59:30 2013 +0200
panel-title added to the titles in the panels
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 f1605e7..99b1f57 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,7 +2,7 @@
<div class="panel panel-default">
<div class="panel-heading">
- <h5><bean:message key="preferences.jsp.tz"/></h5>
+ <h5 class="panel-title"><bean:message
key="preferences.jsp.tz"/></h5>
</div>
<div class="panel-body">
<p><bean:message key="preferences.jsp.datestimes"/></p>
@@ -18,7 +18,7 @@
<div class="panel panel-default">
<div class="panel-heading">
- <h5><bean:message key="preferences.jsp.lang" /></h5>
+ <h5 class="panel-title"><bean:message
key="preferences.jsp.lang" /></h5>
</div>
<div class="panel-body">
<p><bean:message key="preferences.jsp.langs" /></p>
commit 5b50bb1b76624d2c083703603cb517d53cdfdc61
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 16:55:42 2013 +0200
Locale Preferences: Panels added
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 0c6a100..f1605e7 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
@@ -1,58 +1,75 @@
<html>
-<h2><bean:message key="preferences.jsp.tz"/></h2>
-<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="panel panel-default">
+ <div class="panel-heading">
+ <h5><bean:message key="preferences.jsp.tz"/></h5>
+ </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>
+ </div>
</div>
-<h2><bean:message key="preferences.jsp.lang" /></h2>
-<p><bean:message key="preferences.jsp.langs" /></p>
-<div class="preference">
-<c:set var="counter" value="0" />
-<html:hidden property="submitted" value="true" />
-<html:hidden property="uid" />
-<table width="75%" cellpadding="0">
- <tr>
- <td width="50%">
- <input type="radio" name="preferredLocale"
value="<c:out value="${noLocale.languageCode}" />"
- <c:if test="${noLocale.languageCode == currentLocale}">
- checked="checked"
- </c:if>/>
- <c:out value="${noLocale.localizedName}" />
- <br />
- <br />
- </td>
- </tr>
-<c:forEach var="item" items="${supportedLocales}">
- <c:if test="${counter == 0}">
- <tr>
- </c:if>
- <td width="50%">
- <input type="radio" name="preferredLocale"
value="<c:out value="${item.key}" />"
- <c:if test="${item.key == currentLocale}">
- checked="checked"
- </c:if>/>
- <img src="<c:out value="${item.value.imageUri}" />"
alt="<c:out value="${item.value.localizedName}" />"
/> (<c:out value="${item.value.localizedName}" />)
- </td>
- <c:if test="${counter == 1}">
- </tr>
- </c:if>
- <c:set var="counter" value="${counter + 1}" />
- <c:if test="${counter == 2}">
+<div class="panel panel-default">
+ <div class="panel-heading">
+ <h5><bean:message key="preferences.jsp.lang" /></h5>
+ </div>
+ <div class="panel-body">
+ <p><bean:message key="preferences.jsp.langs" /></p>
+
+ <div class="preference">
<c:set var="counter" value="0" />
- </c:if>
-</c:forEach>
+ <html:hidden property="submitted" value="true" />
+ <html:hidden property="uid" />
+ <table cellpadding="0">
+ <tr>
+ <td width="50%">
+ <input type="radio" name="preferredLocale"
value="<c:out value="${noLocale.languageCode}" />"
+ <c:if test="${noLocale.languageCode == currentLocale}">
+ checked="checked"
+ </c:if>/>
+ <c:out value="${noLocale.localizedName}" />
+ <br />
+ <br />
+ </td>
+ </tr>
+ <c:forEach var="item" items="${supportedLocales}">
+ <c:if test="${counter == 0}">
+ <tr>
+ </c:if>
+ <td width="50%">
+ <input type="radio" name="preferredLocale"
value="<c:out value="${item.key}" />"
+ <c:if test="${item.key == currentLocale}">
+ checked="checked"
+ </c:if>/>
+ <img src="<c:out value="${item.value.imageUri}" />"
alt="<c:out value="${item.value.localizedName}" />"
/> (<c:out value="${item.value.localizedName}" />)
+ </td>
+ <c:if test="${counter == 1}">
+ </tr>
+ </c:if>
+ <c:set var="counter" value="${counter + 1}" />
+ <c:if test="${counter == 2}">
+ <c:set var="counter" value="0" />
+ </c:if>
+ </c:forEach>
+
+ <c:if test="${counter == 1}">
+ </tr>
+ </c:if>
+ </table>
+ </div>
-<c:if test="${counter == 1}">
- </tr>
-</c:if>
-</table>
+ </div>
</div>
+
+
+
<hr/>
<div align="right">
<rhn:submit valueKey="preferences.jsp.submitvalue"/>
commit c084e7f8b31716f7f21c7bd86c3b38db321a39c2
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 16:36:31 2013 +0200
menu animation deleted
diff --git a/web/html/javascript/spacewalk-essentials.js
b/web/html/javascript/spacewalk-essentials.js
index edbe24b..61d61f8 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -5,7 +5,7 @@ $(document).on("ready", function(){
$("#sidenav ul>ul").hide();
$("#sidenav li.active").each(function() {
- $(this).next("ul").show(300);
+ $(this).next("ul").show();
});
/* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is
pressed or when
commit 8c049db45cddcbe975e6c489a291499e45d51839
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Oct 18 16:34:51 2013 +0200
TB3: Systems/Activation Keys/Create Activation Key form
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
index 79b4021..9e04ddb 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
@@ -2,18 +2,17 @@
<%@ 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">
-<body>
-<rhn:toolbar base="h1" icon="icon-key"
- imgAlt="activation-keys.common.alt"
- helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
- >
- <bean:message key ="activation-key.jsp.create"/>
-</rhn:toolbar>
-<c:import
url="/WEB-INF/pages/common/fragments/activationkeys/details.jspf">
- <c:param name = "url" value="/activationkeys/Create.do"/>
- <c:param name = "submit"
value="activation-key.jsp.create-key"/>
-</c:import>
-
-</body>
+<html:html>
+ <body>
+ <rhn:toolbar base="h1" icon="icon-key"
+ imgAlt="activation-keys.common.alt"
+
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
+ >
+ <bean:message key ="activation-key.jsp.create"/>
+ </rhn:toolbar>
+ <c:import
url="/WEB-INF/pages/common/fragments/activationkeys/details.jspf">
+ <c:param name = "url"
value="/activationkeys/Create.do"/>
+ <c:param name = "submit"
value="activation-key.jsp.create-key"/>
+ </c:import>
+ </body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
index 9af66fc..61d7244 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
@@ -3,130 +3,144 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<html:form action="${param.url}">
+<html:form action="${param.url}" styleClass="form-horizontal">
<rhn:csrf />
-<c:if test="${not empty param.tid}">
-<input type="hidden" name="tid"
value="${param.tid}"/>
-</c:if>
-<div class="page-summary">
- <h2><bean:message
key="activation-key.details.jsp.title"/></h2>
- <p>
- <bean:message key="activation-key.jsp.summary"/>
- </p>
+ <c:if test="${not empty param.tid}">
+ <input type="hidden" name="tid"
value="${param.tid}"/>
+ </c:if>
+ <h2><bean:message
key="activation-key.details.jsp.title"/></h2>
+ <p><bean:message
key="activation-key.jsp.summary"/></p>
-<table class="details">
- <tr>
- <th>
- <label for="description"><bean:message
key="kickstart.activationkeys.jsp.description"/></label>
- </th>
- <td>
- <html:text property="description"
styleId="description"/><br/>
- <rhn:tooltip>
- <bean:message
key="activation-key.jsp.edit-description-tooltip"
- arg0 = "${requestScope.blankDescription}"/>
- </rhn:tooltip>
- </td>
- </tr>
- <tr>
- <th>
- <label for="key"><bean:message
key="kickstart.activationkeys.jsp.key"/>:</label>
- </th>
- <td>
- <c:if test="${not
requestScope.unprefixed}">${requestScope.prefix}</c:if>
- <html:text property="key"
styleId="key"/><br/>
- <c:choose>
- <c:when test = "${not requestScope.unprefixed}">
- <rhn:tooltip
key="activation-key.jsp.blank.auto-generator.prefix-notice"/>
- </c:when>
- <c:otherwise>
- <rhn:tooltip
key="activation-key.jsp.blank.auto-generator"/><br/>
- <rhn:tooltip>
- <bean:message key="activation-key.jsp.org_notice"
arg0="${requestScope.prefix}"/>
- </rhn:tooltip>
- </c:otherwise>
- </c:choose>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="description">
+ <bean:message
key="kickstart.activationkeys.jsp.description"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="description"
styleClass="form-control" styleId="description"/><br/>
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.edit-description-tooltip"
+ arg0 =
"${requestScope.blankDescription}"/>
+ </span>
+ </div>
+ </div>
- </td>
- </tr>
- <tr>
- <th>
- <label for="usageLimit"><bean:message
key="kickstart.activationkeys.jsp.usagelimit"/>:</label>
- </th>
- <td>
- <html:text property="usageLimit"
styleId="usageLimit"/><br/>
- <rhn:tooltip key="activation-key.jsp.blank.unlimited-use"/>
- </td>
- </tr>
- <tr>
- <th>
- <label for="selectedChannel"><bean:message
key="activation-key.jsp.base-channels"/>:</label>
- </th>
- <td>
- <html:select property="selectedChannel"
styleId="selectedChannel">
- <html:options collection="possibleChannels"
- property="value"
- labelProperty="label" />
- </html:select><br/>
-
- <rhn:tooltip>
- <bean:message
key="activation-key.jsp.edit-basechannel-tooltip"
- arg0 =
"${rhn:localize('activation-key.jsp.rh-default')}"/>
- </rhn:tooltip>
-
- </td>
- </tr>
-
- <tr>
- <th>
- <bean:message key="activation-key.jsp.addon-entitlements"/>:
- </th>
- <td>
- <c:forEach items="${possibleEntitlements}" var="item">
- <html:multibox property="selectedEntitlements"
disabled="${item.disabled}" styleId="${item.value}"
value="${item.value}"/>
- <label for="${item.value}"><c:out
value="${item.label}"/></label>
- <br />
- </c:forEach>
-
- </td>
- </tr>
- <c:if test="${not requestScope.create}">
- <tr>
- <th>
- <label for="enable-config-auto-deploy"><bean:message
key="activation-key.jsp.enable-config-auto-deploy"/>:</label>
- </th>
- <td>
-
- <rhn:require acl="token_has_entitlement(provisioning_entitled)"
-
mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler">
- <html:checkbox property="autoDeploy"
styleId="enable-config-auto-deploy" /><br/>
- <rhn:tooltip
key="activation-key.jsp.config-auto-deploy-tooltip"/>
- </rhn:require>
- <rhn:require acl="not token_has_entitlement(provisioning_entitled)"
-
mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler">
- <input type=checkbox disabled=true/><br/>
- <rhn:tooltip><bean:message
key="activation-key.jsp.disabled-config-auto-deploy-tooltip"
- arg0="${rhn:localize('provisioning_entitled')}"
-
arg1="${rhn:localize('activation-key.jsp.addon-entitlements')}"/>
- </rhn:tooltip>
- </rhn:require>
- </td>
- </tr>
- </c:if>
- <tr>
- <th>
- <label for="universal"><bean:message
key="activation-key.jsp.universal-default"/>:</label>
- </th>
- <td>
- <html:checkbox property="universal"
styleId="universal" /><br/>
- <rhn:tooltip
key="activation-key.jsp.edit.universal-default-tooltip"/>
- </td>
- </tr>
-</table>
-<div align="right">
-<hr />
-<html:submit property="dispatch"><bean:message
key="${param.submit}"/></html:submit>
-</div>
-<rhn:submitted/>
-</div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label" for="key">
+ <bean:message key="kickstart.activationkeys.jsp.key"/>:
+ </label>
+ <div class="col-lg-6">
+ <div class="input-group">
+ <c:if test="${not requestScope.unprefixed}">
+ <span
class="input-group-addon">${requestScope.prefix}</span>
+ </c:if>
+ <html:text property="key" styleId="key"
styleClass="form-control"/>
+ </div>
+ <c:choose>
+ <c:when test = "${not requestScope.unprefixed}">
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.blank.auto-generator.prefix-notice"/>
+ </span>
+ </c:when>
+ <c:otherwise>
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.blank.auto-generator"/>
+ </span>
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.org_notice"
arg0="${requestScope.prefix}"/>
+ </span>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="usageLimit">
+ <bean:message
key="kickstart.activationkeys.jsp.usagelimit"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="usageLimit"
styleClass="form-control" styleId="usageLimit"/>
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.blank.unlimited-use"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="selectedChannel">
+ <bean:message key="activation-key.jsp.base-channels"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:select property="selectedChannel"
styleId="selectedChannel" styleClass="form-control">
+ <html:options collection="possibleChannels"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.edit-basechannel-tooltip"
+ arg0 =
"${rhn:localize('activation-key.jsp.rh-default')}"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="activation-key.jsp.addon-entitlements"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:forEach items="${possibleEntitlements}"
var="item">
+ <div class="checkbox">
+ <label>
+ <html:multibox property="selectedEntitlements"
disabled="${item.disabled}"
+ styleId="${item.value}"
value="${item.value}"/>
+ <c:out value="${item.label}"/>
+ </label>
+ </div>
+ </c:forEach>
+ </div>
+ </div>
+ <c:if test="${not requestScope.create}">
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <rhn:require
acl="token_has_entitlement(provisioning_entitled)"
+
mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler">
+ <label>
+ <html:checkbox property="autoDeploy"
styleId="enable-config-auto-deploy" />
+ <bean:message
key="activation-key.jsp.enable-config-auto-deploy"/>
+ </label>
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.config-auto-deploy-tooltip"/>
+ </span>
+ </rhn:require>
+ <rhn:require acl="not
token_has_entitlement(provisioning_entitled)"
+
mixins="com.redhat.rhn.common.security.acl.ActivationKeyAclHandler">
+ <label>
+ <input type=checkbox disabled=true/>
+ <bean:message
key="activation-key.jsp.enable-config-auto-deploy"/>
+ </label>
+ <span class="help-block">
+ <bean:message
key="activation-key.jsp.disabled-config-auto-deploy-tooltip"
+
arg0="${rhn:localize('provisioning_entitled')}"
+
arg1="${rhn:localize('activation-key.jsp.addon-entitlements')}"/>
+ </span>
+ </rhn:require>
+ </div>
+ </div>
+ </c:if>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <html:checkbox property="universal"
styleId="universal" />
+ <bean:message
key="activation-key.jsp.universal-default"/>
+ </div>
+ <span class="help-block">
+ <rhn:tooltip
key="activation-key.jsp.edit.universal-default-tooltip"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit property="dispatch" styleClass="btn
btn-success">
+ <bean:message key="${param.submit}"/>
+ </html:submit>
+ </div>
+ </div>
+ <rhn:submitted/>
</html:form>
commit 405db27eea43da199415473503933a2655d4799d
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 16:33:12 2013 +0200
button reverted and margin added to tab lists
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 5f987a1..6c1a8a1 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -504,8 +504,7 @@ h1 .icon-stack {
margin: 1em 0
}
-//button dispatch
-input[name="dispatch"]{
- .btn;
- .btn-default;
+//tabs - adding a margin button to the last UL
+ul.nav.nav-tabs:last-child{
+ margin-bottom: 1.5em
}
commit 1a3aa8f8e4ff61944b7ce3b7eab642031ad1c716
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 16:23:11 2013 +0200
clear-btn fixed
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index 7e26247..508c968 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -84,7 +84,7 @@
<span id="header_selcount">
<rhn:setdisplay user="${requestScope.session.user}" />
</span>
- <a id="clear-btn" class="button"
href="/rhn/ssm/index.do">
+ <a class="button" href="/rhn/ssm/index.do">
<bean:message key="manage"/>
</a>
<%--
@@ -99,7 +99,7 @@
<c:set var="rurl"
value="${pageContext.request.requestURI}" />
</c:otherwise>
</c:choose>
- <a class="button"
href="/rhn/systems/Overview.do?empty_set=true&return_url=${rhn:urlEncode(rurl)}">
+ <a id="clear-btn" class="button"
href="/rhn/systems/Overview.do?empty_set=true&return_url=${rhn:urlEncode(rurl)}">
<bean:message key="clear"/>
</a>
</div>
diff --git a/web/include/network/components/status_bar/ssm.pxi
b/web/include/network/components/status_bar/ssm.pxi
index 4fd4c49..1b545b7 100644
--- a/web/include/network/components/status_bar/ssm.pxi
+++ b/web/include/network/components/status_bar/ssm.pxi
@@ -11,11 +11,11 @@
<!--span id="spacewalk-ssm-counter"
class="badge">0</span>systems selected</span-->
</span>
- <a id="clear-btn" class="button"
href="/rhn/ssm/index.do">
+ <a class="button" href="/rhn/ssm/index.do">
Manage
</a>
<rhn-return-link default="/network">
- <a class="button"
href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
+ <a id="clear-btn" class="button"
href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
</rhn-return-link>
</rhn-require>
</div>
commit f7584ee2839141ec0898e08a51811dc0ae17e4ff
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 14:59:07 2013 +0200
icon added to the button Update Email in user account
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
index ecf49e4..3c6ac6d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
@@ -79,6 +79,7 @@
<c:choose>
<c:when test="${!empty mailableAddress}">
<a class="btn btn-default btn-sm" href="<c:out
value="${email_link}"/>">
+ <i class="icon-refresh"></i>
<%--
<bean:message key="${email_display}"/>
--%>
commit 4f2c08bb89736c2649bd56ff8d7d8c561cbf4e9f
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 14:58:31 2013 +0200
changes in language files to add icons in some inline code
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
index 39fca95..a474a47 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
@@ -1684,19 +1684,19 @@
<target>চিহ্নিত মান অনুসারে ফিল্টার করা হবে: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> <strong
id="list_total">{2}</strong>-র</target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> <span
id="list_total">{2}</span>-র</target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong>,
<strong>{2}</strong>-র
+ <target><span>{0}</span> -
<span>{1}</span>,
<span>{2}</span>-র
{3} প্রদর্শিত</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index 0f7973a..e4e51a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -1785,19 +1785,19 @@
<target>Filtern nach: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> von <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> von <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> von
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> von
<span>{2}</span>
{3} angezeigt</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index de21eb1..d825f63 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -1535,13 +1535,13 @@
</context-group>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
@@ -1557,7 +1557,7 @@
</context-group>
</trans-unit>
<trans-unit id="message.items.per.page">
- <source>Display {0} items per page</source>
+ <source>{0} items per page</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index 5cd62e1..93d0432 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -1785,19 +1785,19 @@
<target>Filtrar por: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> de <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> de <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> de
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> de
<span>{2}</span>
{3} mostrados</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index a742d1c..fc917f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -1787,19 +1787,19 @@ utilisateur avant de supprimer son compte.</target>
<target>Filtrer par : </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> de <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> de <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> de
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> de
<span>{2}</span>
{3} affichés</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
index 6fc087c..f6564c4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
@@ -1677,19 +1677,19 @@
<target>દ્વારા ગાળો: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{2}</strong> માંથી
<strong>{0}</strong> -
<strong>{1}</strong>
+ <target><span>{2}</span> માંથી
<span>{0}</span> -
<span>{1}</span>
{3} દર્શાવાયેલ છે</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
index 15e4689..2f03a92 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
@@ -1677,19 +1677,19 @@
<target>इसके द्वारा फ़िल्टर: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{2}</strong> में से
<strong>{0}</strong> -
<strong>{1}</strong>
+ <target><span>{2}</span> में से
<span>{0}</span> -
<span>{1}</span>
{3} प्रदर्शित</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index 04c4c5f..b3aa3af 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -1785,19 +1785,19 @@
<target>Filtra per: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> di
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> di
<span>{2}</span>
{3} visualizzati</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index 9addf59..47e2cf2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -1785,19 +1785,19 @@
<target>フィルターする: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> のうち <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> のうち <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{2}</strong> のうち
<strong>{1}</strong>
+ <target><span>{0}</span> -
<span>{2}</span> のうち
<span>{1}</span>
{3} 表示されました</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index 7bdffae..1cb5f47 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -1785,19 +1785,19 @@
<target>거르기:</target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong
id="list_total">{2}</strong> 중 <strong
id="list_min" >{0}</strong> - <strong
id="list_max">{1}</strong> </target>
+ <target><span
id="list_total">{2}</span> 중 <span
id="list_min" >{0}</span> - <span
id="list_max">{1}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{2}</strong> 중
<strong>{0}</strong> -
<strong>{1}</strong>
+ <target><span>{2}</span> 중
<span>{0}</span> -
<span>{1}</span>
{3} 출력됨 </target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
index b3a32fb..3cfe41f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
@@ -1679,19 +1679,19 @@
<target>ਰਾਹੀਂ ਫਿਲਟਰ: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{2}</strong> ਵਿੱਚੋਂ
<strong>{1}</strong>
+ <target><span>{0}</span> -
<span>{2}</span> ਵਿੱਚੋਂ
<span>{1}</span>
{3} ਵਿਖਾਇਆ ਹੈ</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index 99df77d..293f683 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -1785,19 +1785,19 @@
<target>Filtrar por: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> de <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> de <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> de
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> de
<span>{2}</span>
{3}</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index aa071ad..f85621f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -1785,19 +1785,19 @@
<target>Фильтр: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> из <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> из <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> из
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> из
<span>{2}</span>
{3}</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
index cdbb89a..e8f485d1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
@@ -1677,19 +1677,19 @@
<target>வடிப்பு: </target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} காட்டப்பட்டது</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index bbef06b..dc3164e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -1785,19 +1785,19 @@
<target>过滤器:</target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_total">{2}</strong> 的 <strong
id="list_max">{1}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_total">{2}</span> 的 <span
id="list_max">{1}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{1}</strong> 之
<strong>{2}</strong>
+ <target><span>{0}</span> -
<span>{1}</span> 之
<span>{2}</span>
{3} 被显示</target>
</trans-unit>
<trans-unit id="message.numselected">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 8ea5233..6924cee 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -1785,19 +1785,19 @@
<target>由...來篩選:</target>
</trans-unit>
<trans-unit id="message.range">
- <source><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></source>
+ <source><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong id="list_min"
>{0}</strong> - <strong
id="list_max">{1}</strong> of <strong
id="list_total">{2}</strong></target>
+ <target><span id="list_min"
>{0}</span> - <span
id="list_max">{1}</span> of <span
id="list_total">{2}</span></target>
</trans-unit>
<trans-unit id="message.range.withtypedescription">
- <source><strong>{0}</strong> -
<strong>{1}</strong> of
<strong>{2}</strong>
+ <source><span>{0}</span> -
<span>{1}</span> of
<span>{2}</span>
{3} displayed</source>
<context-group name="ctx">
<context context-type="sourcefile">on any listview page with a
set. 1 - 5 of 120</context>
</context-group>
- <target><strong>{0}</strong> -
<strong>{2}</strong> 的
<strong>{1}</strong>
+ <target><span>{0}</span> -
<span>{2}</span> 的
<span>{1}</span>
{3} 已顯示。</target>
</trans-unit>
<trans-unit id="message.numselected">
commit fb02411a48ba26ee4bb3660806da7b28f73be410
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 14:48:03 2013 +0200
systems icons changed
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
index 63df11b..fb9c5d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
@@ -58,14 +58,14 @@ public class SystemListHelper {
String message;
HtmlTag url = new HtmlTag("a");
- HtmlTag img = new HtmlTag("img");
+ HtmlTag i = new HtmlTag("i");
LocalizationService ls = LocalizationService.getInstance();
if (next.getEntitlement() == null ||
next.getEntitlement().isEmpty()) {
message = ls.getMessage("systemlist.jsp.unentitled");
- img.setAttribute("src", "/img/icon_unentitled.gif");
- img.setAttribute("title", message);
- img.setAttribute("alt", message);
+ i.setAttribute("class",
"spacewalk-icon-unknown-system");
+ //img.setAttribute("alt", message);
+ i.setAttribute("title", message);
if (user.hasRole(RoleFactory.ORG_ADMIN)) {
url.setAttribute("href",
"/rhn/systems/details/Edit.do?sid=" +
next.getId());
@@ -76,9 +76,9 @@ public class SystemListHelper {
url.setAttribute("href",
"/rhn/help/reference/en-US/s1-sm-systems.jsp");
message = ls.getMessage("systemlist.jsp.notcheckingin");
- img.setAttribute("src", "/img/icon_checkin.gif");
- img.setAttribute("alt", message);
- img.setAttribute("title", message);
+ i.setAttribute("class",
"spacewalk-icon-unknown-system");
+ //img.setAttribute("alt", message);
+ i.setAttribute("title", message);
if (makeLinks) {
makeLinks = ConfigDefaults.get().isDocAvailable();
}
@@ -90,9 +90,9 @@ public class SystemListHelper {
"/rhn/systems/details/kickstart/SessionStatus.do?sid=" +
next.getId());
message = ls.getMessage("systemlist.jsp.kickstart");
- img.setAttribute("src",
"/img/icon_kickstart_session.gif");
- img.setAttribute("title", message);
- img.setAttribute("alt", message);
+ i.setAttribute("class", "icon-rocket");
+ i.setAttribute("title", message);
+ //i.setAttribute("alt", message);
}
else if (next.getEnhancementErrata() + next.getBugErrata() +
next.getSecurityErrata() > 0 &&
@@ -103,9 +103,9 @@ public class SystemListHelper {
"/network/systems/details/history/pending.pxt?sid=" +
next.getId());
message = ls.getMessage("systemlist.jsp.updatesscheduled");
- img.setAttribute("src", "/img/icon_pending.gif");
- img.setAttribute("title", message);
- img.setAttribute("alt", message);
+ i.setAttribute("class", "icon-time");
+ i.setAttribute("title", message);
+ //i.setAttribute("alt", message);
}
else if (SystemManager.countActions(new Long(next.getId().longValue())) > 0)
{
//status = "actions scheduled";
@@ -113,9 +113,9 @@ public class SystemListHelper {
"/network/systems/details/history/pending.pxt?sid=" +
next.getId());
message = ls.getMessage("systemlist.jsp.actionsscheduled");
- img.setAttribute("src", "/img/icon_pending.gif");
- img.setAttribute("title", message);
- img.setAttribute("alt", message);
+ i.setAttribute("class", "icon-time");
+ i.setAttribute("title", message);
+ //img.setAttribute("alt", message);
}
else if ((next.getEnhancementErrata() + next.getBugErrata() +
next.getSecurityErrata()) == 0 &&
@@ -125,9 +125,9 @@ public class SystemListHelper {
//status = "up2date";
message = ls.getMessage("systemlist.jsp.up2date");
- img.setAttribute("src", "/img/icon_up2date.gif");
- img.setAttribute("title", message);
- img.setAttribute("alt", message);
+ i.setAttribute("class", "icon-ok-sign");
+ i.setAttribute("title", message);
+ //i.setAttribute("alt", message);
}
else if (next.getSecurityErrata().intValue() > 0) {
//status = "critical";
@@ -136,9 +136,8 @@ public class SystemListHelper {
next.getId() + "&type=" +
LocalizationService.getInstance().getMessage(ErrataSetupAction.SECUR));
message = ls.getMessage("systemlist.jsp.critical");
- img.setAttribute("src", "/img/icon_crit_update.gif");
- img.setAttribute("title", message);
- img.setAttribute("alt", message);
+ i.setAttribute("class", "icon-exclamation-sign");
+ i.setAttribute("title", message);
}
else if (next.getOutdatedPackages().intValue() > 0) {
//status = "updates";
@@ -146,19 +145,19 @@ public class SystemListHelper {
"/rhn/systems/details/packages/UpgradableList.do?sid=" +
next.getId());
message = ls.getMessage("systemlist.jsp.updates");
- img.setAttribute("src", "/img/icon_reg_update.gif");
- img.setAttribute("title", message);
- img.setAttribute("alt", message);
+ i.setAttribute("class", "icon-warning-sign");
+ i.setAttribute("title", message);
}
- url.addBody(img);
+ url.addBody(i.renderOpenTag());
+ url.addBody(i.renderCloseTag());
String statusDisplay;
if (makeLinks) {
statusDisplay = url.render();
}
else {
- statusDisplay = img.render();
+ statusDisplay = i.render();
}
if (next.getLocked().intValue() == 1) {
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
index 1252c40..63a4d4f 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
@@ -69,10 +69,9 @@ public class SystemListSetupActionTest extends RhnMockStrutsTestCase {
ls.getMessage("systemlist.jsp.up2date") +
"\" alt=\"" +
ls.getMessage("systemlist.jsp.up2date") +
"\" /></a>";
String awol = "<a
href=\"/rhn/help/reference/en-US/s1-sm-systems.jsp" +
- "\"><img src=\"/img/icon_checkin.gif\"
" +
- "alt=\"" +
ls.getMessage("systemlist.jsp.notcheckingin") + "\" " +
+ "\"><i
class=\"spacewalk-icon-unknown-system\" " + "\" " +
"title=\"" +
ls.getMessage("systemlist.jsp.notcheckingin") +
- "\" /></a>";
+ "\" ></i></a>";
//Page through all the systems because we don't know where our new system is
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 8028be1..0bf6ee2 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,6 +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");
for (int size : PAGE_SIZE) {
HtmlTag option = new HtmlTag("option");
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 68e478d..6fa1f3d 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
@@ -7,9 +7,8 @@
title="<bean:message
key="scapdiff.jsp.i.${current.diffIcon}"/>"/></a>
</c:when>
<c:otherwise>
- <img src="/img/icon_checkin.gif"
- alt="<bean:message
key="system.audit.xccdfdetails.jsp.nodiff"/>"
- title="<bean:message
key="system.audit.xccdfdetails.jsp.nodiff"/>"/>
+ <i class="spacewalk-icon-unknown-system"
+ 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/yourrhn/scheduledActions.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
index 68d1910..e873955 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
@@ -26,7 +26,7 @@
<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>
- <img src="/img/icon_checkin.gif" title="<bean:message
key="yourrhn.jsp.actions.unknown" />" alt="<bean:message
key="yourrhn.jsp.actions.unknown" />" />
+ <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>
diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
index 2d945a4..46b498f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
@@ -19,7 +19,7 @@
<rl:listset name="registeredSystems" legend="system">
<rhn:csrf />
<bean:message key="registeredlist.jsp.view"/>
- <select name="threshold">
+ <select name="threshold" class="view-systems-registered">
<c:forEach var="option" items="${options}">
<c:choose>
<c:when test="${recentlyRegisteredSystemsForm.map.threshold eq
option.value}">
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 758a86e..a6e6330 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -19,7 +19,7 @@
</c:when>
<c:when test="${systemInactive}">
- <img src="/img/icon_checkin.gif"/> <bean:message
key="sdc.details.overview.inactive1"/>
+ <i class="spacewalk-icon-unknown-system"/></i>
<bean:message key="sdc.details.overview.inactive1"/>
<c:if test="${documentation == 'true'}">
<bean:message key="sdc.details.overview.inactive2"
arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/>
</c:if>
diff --git a/web/include/network/components/legends/system-list-legend.pxi
b/web/include/network/components/legends/system-list-legend.pxi
index f5736ec..66acbcd 100644
--- a/web/include/network/components/legends/system-list-legend.pxi
+++ b/web/include/network/components/legends/system-list-legend.pxi
@@ -5,12 +5,12 @@
<pxt-use class="Sniglets::Users" />
<div class="sideleg">
- <h2>System Legend</h2>
+ <h4>System Legend</h4>
<ul>
<li><img src="/img/icon_up2date.gif" alt=""
/>OK</li>
<li><img src="/img/icon_crit_update.gif" alt=""
/>Critical</li>
<li><img src="/img/icon_reg_update.gif" alt=""
/>Warning</li>
- <li><img src="/img/icon_checkin.gif" alt=""
/>Unknown</li>
+ <li><i class="spacewalk-icon-unknown-system"
/>Unknown</li>
<rhn-require acl="org_entitlement(sw_mgr_enterprise)">
<li><img src="/img/icon_locked.gif" alt=""
/>Locked</li>
</rhn-require>
commit bbdba294c7ebe013857ccb51584c883518326439
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Oct 18 14:23:32 2013 +0200
TB3: Channels/Software Channels/Repositories/new repo form
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
index 614c4c4..292d06d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -3,110 +3,101 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<html:html xhtml="true">
-<body>
-<c:choose>
- <c:when test = "${not empty requestScope.create_mode}">
- <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
- <bean:message key="repos.jsp.toolbar"/>
- </rhn:toolbar>
- <h2><bean:message key="repos.jsp.header2"/></h2>
- </c:when>
- <c:otherwise>
- <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img"
- deletionUrl="RepoDelete.do?id=${requestScope.repo.id}"
- deletionType="repos">
- <c:out value="${requestScope.repo.label}"/>
- </rhn:toolbar>
- <h2><bean:message
key="repos.jsp.details.header2"/></h2>
- </c:otherwise>
-</c:choose>
-
-<c:choose>
- <c:when test="${empty requestScope.create_mode}">
- <c:set var="url" value ="/channels/manage/repos/RepoEdit"/>
- </c:when>
- <c:otherwise>
- <c:set var="url" value
="/channels/manage/repos/RepoCreate"/>
- </c:otherwise>
-</c:choose>
-
-<div>
- <html:form action="${url}">
- <rhn:csrf />
- <rhn:submitted/>
- <html:hidden property="id" value="${repo.id}"/>
- <table class="details">
- <tr>
- <th>
- <rhn:required-field key = "repos.jsp.create.label"/>
- </th>
- <td>
- <html:text property="label"/>
-
- <c:if test = "${empty requestScope.create_mode}">
- <html:hidden property="sourceid"/>
- </c:if>
- </td>
- </tr>
- <tr>
- <th>
- <rhn:required-field key = "repos.jsp.create.url"/>
- </th>
- <td>
- <html:text property="url"/>
- </td>
- </tr>
- <tr>
- <th>
- <bean:message key = "repos.jsp.ssl.ca"/>
- </th>
- <td>
- <html:select property="sslcacert">
- <html:options collection="sslcryptokeys"
labelProperty="label" property="value" />
- </html:select>
- </td>
- </tr>
- <tr>
- <th>
- <bean:message key = "repos.jsp.ssl.clientcert"/>
- </th>
- <td>
- <html:select property="sslclientcert">
- <html:options collection="sslcryptokeys"
labelProperty="label" property="value" />
- </html:select>
- </td>
- </tr>
- <tr>
- <th>
- <bean:message key = "repos.jsp.ssl.clientkey"/>
- </th>
- <td>
- <html:select property="sslclientkey">
- <html:options collection="sslcryptokeys"
labelProperty="label" property="value" />
- </html:select>
- </td>
- </tr>
- </table>
-
- <hr />
-
- <table align="right">
- <tr>
- <td></td>
- <c:choose>
- <c:when test = "${empty requestScope.create_mode}">
- <td align="right"><html:submit><bean:message
key="repos.jsp.update.submit"/></html:submit></td>
- </c:when>
- <c:otherwise>
- <td align="right"><html:submit><bean:message
key="repos.jsp.create.submit"/></html:submit></td>
- </c:otherwise>
- </c:choose>
- </tr>
- </table>
-
- </html:form>
-</div>
-
-</body>
+<html:html>
+ <body>
+ <c:choose>
+ <c:when test = "${not empty requestScope.create_mode}">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
+ <bean:message key="repos.jsp.toolbar"/>
+ </rhn:toolbar>
+ <h2><bean:message
key="repos.jsp.header2"/></h2>
+ </c:when>
+ <c:otherwise>
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img"
+
deletionUrl="RepoDelete.do?id=${requestScope.repo.id}"
+ deletionType="repos">
+ <c:out value="${requestScope.repo.label}"/>
+ </rhn:toolbar>
+ <h2><bean:message
key="repos.jsp.details.header2"/></h2>
+ </c:otherwise>
+ </c:choose>
+ <c:choose>
+ <c:when test="${empty requestScope.create_mode}">
+ <c:set var="url" value
="/channels/manage/repos/RepoEdit"/>
+ </c:when>
+ <c:otherwise>
+ <c:set var="url" value
="/channels/manage/repos/RepoCreate"/>
+ </c:otherwise>
+ </c:choose>
+ <html:form action="${url}"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <rhn:submitted/>
+ <html:hidden property="id" value="${repo.id}"/>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <rhn:required-field key =
"repos.jsp.create.label"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="label"
styleClass="form-control"/>
+ <c:if test = "${empty requestScope.create_mode}">
+ <html:hidden property="sourceid"/>
+ </c:if>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <rhn:required-field key = "repos.jsp.create.url"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="url"
styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key = "repos.jsp.ssl.ca"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:select property="sslcacert"
styleClass="form-control">
+ <html:options collection="sslcryptokeys"
labelProperty="label" property="value" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key = "repos.jsp.ssl.clientcert"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:select property="sslclientcert"
styleClass="form-control">
+ <html:options collection="sslcryptokeys"
labelProperty="label" property="value" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key = "repos.jsp.ssl.clientkey"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:select property="sslclientkey"
styleClass="form-control">
+ <html:options collection="sslcryptokeys"
labelProperty="label" property="value" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:choose>
+ <c:when test = "${empty
requestScope.create_mode}">
+ <html:submit styleClass="btn btn-success">
+ <bean:message
key="repos.jsp.update.submit"/>
+ </html:submit>
+ </c:when>
+ <c:otherwise>
+ <html:submit styleClass="btn btn-success">
+ <bean:message
key="repos.jsp.create.submit"/>
+ </html:submit>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ </html:form>
+ </body>
</html:html>
commit 7b0c2d0a34aaab44680b2f6eea653fbeb49a26cf
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 14:23:50 2013 +0200
Bug fixed: Glyphicons are not allowed - use only FontAwesome icons
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
index 441a2e4..993a49a 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
@@ -167,7 +167,7 @@
<td> </td><td> </td>
<td style="text-align: right;">
<button type="submit" class="btn btn-default
btn-sm">
- <span class="glyphicon glyphicon-search" />
+ <i class="icon-search" />
<bean:message key="button.search"/>
</button>
</td>
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 1e92221..51e52c7 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -40,7 +40,7 @@
<html:text property="search_string"
name="search_string"
value="${search_string}" maxlength="100"
accesskey="4"/>
<button type="submit" class="btn btn-default
btn-sm">
- <span class="glyphicon glyphicon-search" />
+ <i class="icon-search" />
<bean:message key="button.search"/>
</button>
<br/>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 96e8025..9c4efc2 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -48,7 +48,7 @@
<html:text property="search_string"
name="search_string"
value="${search_string}" maxlength="36"
accesskey="4"/>
<button type="submit" class="btn btn-default
btn-sm">
- <span class="glyphicon glyphicon-search" />
+ <i class="icon-search" />
<bean:message key="button.search"/>
</button>
<br />
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index 98dca42..b924ffd 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -31,7 +31,7 @@
<td>
<html:text property="search_string"
name="search_string" value="${search_string}"
accesskey="4"/>
<button type="submit" class="btn btn-default
btn-sm">
- <span class="glyphicon glyphicon-search" />
+ <i class="icon-search" />
<bean:message key="button.search"/>
</button>
</td>
commit 14b6a9650aa4eed5cc98483598e3f4a13e010bc9
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Fri Oct 18 14:17:03 2013 +0200
thead improved
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 9845b43..5f987a1 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -463,19 +463,22 @@ h1 .icon-stack {
}
/* spacewalk toolbar */
-.spacewalk-toolbar {
- .pull-right;
- padding: .5em 1em;
- a {
- border-right:1px solid @gray-light;
- padding: 0 .5em
- }
- a:hover {
- text-decoration: none;
- }
- a:last-child {
- border-right:0
- }
+.spacewalk-toolbar-h1{
+ margin-bottom: 1.5em;
+ .spacewalk-toolbar {
+ .pull-right;
+ padding: .5em 1em;
+ a {
+ border-right:1px solid @gray-light;
+ padding: 0 .5em
+ }
+ a:hover {
+ text-decoration: none;
+ }
+ a:last-child {
+ border-right:0
+ }
+ }
}
/* systems selected tool*/
@@ -500,3 +503,9 @@ h1 .icon-stack {
.btn.spacewalk-btn-margin-vertical{
margin: 1em 0
}
+
+//button dispatch
+input[name="dispatch"]{
+ .btn;
+ .btn-default;
+}
diff --git a/branding/css/tables.less b/branding/css/tables.less
index bcd2f2a..6d6134a 100644
--- a/branding/css/tables.less
+++ b/branding/css/tables.less
@@ -67,3 +67,19 @@
.table-rounded tbody tr:last-child td{
border-bottom: 1px solid @gray-light;
}
+
+
+.table thead > tr > td{
+ padding: 0
+}
+// colour to the head, except for when it is the last TR in the thead (it will be white)
+thead tr{
+ background: #e7e7e7;
+ &:last-of-type{
+ background: #ffffff;
+ }
+}
+// Colour to the tfoot
+tfoot{
+ background: #f3f3f3
+}
diff --git a/branding/css/theme.less b/branding/css/theme.less
index e98dc8d..1890e5c 100644
--- a/branding/css/theme.less
+++ b/branding/css/theme.less
@@ -2,9 +2,9 @@
.spacewalk-alphabar{
border-bottom: 1px solid #dddddd;
- margin-bottom: .8em;
+ padding: .7em;
.pagination{
- margin: .8em 0
+ margin: 0
}
.pagination > li > a, .pagination > li > span{
border-top: 1px solid #dddddd;
@@ -42,7 +42,23 @@
//Table's filters
.filter-input{
+ padding: .7em;
.col-md-3{
- padding-left: 0;
+ padding-left: 0
}
-}
\ No newline at end of file
+ .col-md-9{
+ padding-right: 0
+ }
+}
+.display-number{
+ .input-sm;
+ display: inline-block;
+ width: 5em;
+ border: 1px solid #dddddd;
+}
+.view-systems-registered{
+ .input-sm;
+ width: 10em;
+ display: inline-block;
+ border: 1px solid #dddddd;
+}
commit f8bcd3c2a2390789a13c952fcca38e00030baa35
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Oct 18 13:55:42 2013 +0200
TB3: Forgot a colon for the control label.
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index ceb71cb..034b0dc 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -240,7 +240,7 @@
</div>
<div class="form-group">
<label class="col-lg-3 control-label">
- <bean:message key="channel.edit.jsp.orgsharing"/>
+ <bean:message key="channel.edit.jsp.orgsharing"/>:
</label>
<div class="col-lg-6">
<div class="radio">
commit 4f995b494aceabe8be9e2c0b234fdc55a3987794
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Oct 18 13:53:21 2013 +0200
TB3: Channels/Manage Channels/Create channel form
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index a0780fb..ceb71cb 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -4,288 +4,330 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html>
-<body>
-
-<script type="text/javascript">
-function setChildChannelArchChecksum() {
-var baseChannelArches = {};
-<c:forEach items="${parentChannelArches}" var="parentChannel">
-baseChannelArches["<c:out value="${parentChannel.key}" />"] =
"<c:out value="${parentChannel.value}"/>";
-</c:forEach>
-
-var baseChannelChecksums = {};
-<c:forEach items="${parentChannelChecksums}"
var="parentChannel">
-baseChannelChecksums["<c:out value="${parentChannel.key}" />"]
= "<c:out value="${parentChannel.value}"/>";
-</c:forEach>
-
-document.getElementById("parentarch").value =
baseChannelArches[document.getElementById("parent").value];
-document.getElementById("checksum").value =
baseChannelChecksums[document.getElementById("parent").value];
-}
-</script>
-
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
- deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}"
- deletionAcl="user_role(channel_admin); formvar_exists(cid)"
- deletionType="software.channel">
- <bean:message key="channel.edit.jsp.toolbar"
arg0="${channel_name}"/>
-</rhn:toolbar>
-
-<rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/manage_channel.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
-
-<div>
- <html:form action="/channels/manage/Edit">
- <rhn:csrf />
-
- <h2><bean:message
key="channel.edit.jsp.basicchanneldetails"/></h2>
- <div class="page-summary">
- <bean:message key="channel.edit.jsp.introparagraph"/>
- </div>
-
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <label for="name"><rhn:required-field
key="channel.edit.jsp.name"/>:</label>
- </th>
- <td class="small-form">
- <html:text property="name" maxlength="256"
size="48" styleId="name"/>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="label"><rhn:required-field
key="channel.edit.jsp.label"/>:</label>
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test='${empty param.cid}'>
- <html:text property="label" maxlength="128"
size="32" styleId="label" />
- </c:when>
- <c:otherwise>
- <c:out value="${channel_label}"/>
- <html:hidden property="label"
value="${channel_label}" />
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="parent"><bean:message
key="channel.edit.jsp.parent"/>:</label>
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test='${empty param.cid}'>
- <html:select property="parent" styleId="parent"
- onchange="setChildChannelArchChecksum()">
- <html:options collection="parentChannels"
- property="value"
- labelProperty="label" />
- </html:select>
- </c:when>
- <c:otherwise>
- <c:out value="${parent_name}"/>
- <html:hidden property="parent"
value="${parent_id}"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="parentarch"><bean:message
key="packagelist.jsp.packagearch"/>:</label>
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test='${empty param.cid}'>
- <html:select property="arch"
styleId="parentarch">
- <html:options collection="channelArches"
- property="value"
- labelProperty="label" />
- </html:select>
- </c:when>
- <c:otherwise>
- <c:out value="${channel_arch}"/>
- <html:hidden property="arch"
value="${channel_arch_label}" />
- <html:hidden property="arch_name"
value="${channel_arch}" />
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="checksum"><bean:message
key="channel.edit.jsp.checksum"/>:</label>
- </th>
- <td class="small-form">
- <html:select property="checksum"
styleId="checksum">
- <html:options collection="checksums"
- property="value"
- labelProperty="label" />
- </html:select><br/>
- <span class="small-text"><bean:message
key="channel.edit.jsp.checksumtip"/></span>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="summary"><rhn:required-field
key="channel.edit.jsp.summary"/>:</label>
- </th>
- <td class="small-form">
- <html:text property="summary" maxlength="500"
size="40" styleId="summary" />
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="description"><bean:message
key="channel.edit.jsp.description"/>:</label>
- </th>
- <td class="small-form">
- <html:textarea property="description" cols="40"
rows="6" styleId="description"/>
- </td>
- </tr>
- <c:if test='${not empty param.cid}'>
- <tr>
- <th>
- <bean:message key="channel.edit.jsp.lastsynced"/>:
- </th>
- <td>
- <c:if test='${not empty log_url}'>
- <a href='${log_url}'><c:out
value='${last_sync}'/></a>
- </c:if>
- <c:if test='${empty log_url}'>
- <c:out value='${last_sync}'/>
- </c:if>
- </td>
- </tr>
- </c:if>
- </table>
-
-
-
- <h2><bean:message
key="channel.edit.jsp.contactsupportinfo"/></h2>
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <label for="maintainer_name"><bean:message
key="channel.edit.jsp.maintainername"/>:</label>
- </th>
- <td class="small-form">
- <html:text property="maintainer_name" maxlength="128"
size="40" styleId="maintainer_name"/>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message
key="channel.edit.jsp.maintainercontactinfo"/>:
- </th>
- <td class="small-form">
- <table>
- <tr>
- <td><label for="maintainer_email"><bean:message
key="channel.edit.jsp.emailaddress"/>:</label></td>
- <td><html:text property="maintainer_email"
size="20" styleId="maintainer_email"/></td>
- </tr><tr>
- <td><label for="maintainer_phone"><bean:message
key="channel.edit.jsp.phonenumber"/>:</label></td>
- <td><html:text property="maintainer_phone"
size="20" styleId="maintainer_phone"/></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="support_policy"><bean:message
key="channel.edit.jsp.supportpolicy"/>:</label>
- </th>
- <td class="small-form">
- <html:textarea property="support_policy" cols="40"
rows="6" styleId="support_policy"/>
- </td>
- </tr>
- </table>
- <h2><bean:message
key="channel.edit.jsp.channelaccesscontrol"/></h2>
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.perusersub"/>:
- </th>
- <td class="small-form">
- <table>
- <tr>
- <td><html:radio property="per_user_subscriptions"
value="all" styleId="allusers" /></td>
- <td><label for="allusers"><bean:message
key="channel.edit.jsp.allusers"/></label></td>
- </tr><tr>
- <td><html:radio property="per_user_subscriptions"
value="selected" styleId="selectedusers" /></td>
- <td><label for="selectedusers"><bean:message
key="channel.edit.jsp.selectedusers"/></label></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="channel.edit.jsp.orgsharing"/>
- </th>
- <td class="small-form">
- <table>
- <tr>
- <td><html:radio property="org_sharing"
value="private" styleId="private"/></td>
- <td><label for="private"><bean:message
key="channel.edit.jsp.private"
-
arg0="/rhn/multiorg/Organizations.do"/></label></td>
- </tr><tr>
- <td><html:radio property="org_sharing"
value="protected" styleId="protected" /></td>
- <td><label for="protected"><bean:message
key="channel.edit.jsp.protected"
- arg0="/rhn/multiorg/Organizations.do"/></label>
- </td>
- </tr><tr>
- <td><html:radio property="org_sharing"
value="public" styleId="public"/></td>
- <td><label for="public"><bean:message
key="channel.edit.jsp.public"
-
arg0="/rhn/multiorg/Organizations.do"/></label></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- <h2><bean:message
key="channel.edit.jsp.security.gpg"/></h2>
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <label for="gpgkeyurl"><bean:message
key="channel.edit.jsp.gpgkeyurl"/>:</label>
- </th>
- <td class="small-form">
- <html:text property="gpg_key_url" maxlength="256"
size="40" styleId="gpgkeyurl"/>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="gpgkeyid"><bean:message
key="channel.edit.jsp.gpgkeyid"/>:</label>
- </th>
- <td class="small-form">
- <html:text property="gpg_key_id" maxlength="8"
size="8" styleId="gpgkeyid"/><br />Ex: DB42A60E
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="gpgkeyfingerprint"><bean:message
key="channel.edit.jsp.gpgkeyfingerprint"/>:</label>
- </th>
- <td class="small-form">
- <html:text property="gpg_key_fingerprint"
maxlength="50" size="60"
styleId="gpgkeyfingerprint"/><br />
- Ex: CA20 8686 2BD6 9DFC 65F6 ECC4 2191 80CD DB42 A60E
- </td>
- </tr>
- </table>
- <div align="right">
- <hr />
- <c:choose>
- <c:when test='${empty param.cid}'>
- <html:submit property="create_button">
- <bean:message key="channel.edit.jsp.createchannel"/>
- </html:submit>
- </c:when>
- <c:otherwise>
- <html:submit property="edit_button">
- <bean:message key="channel.edit.jsp.editchannel"/>
- </html:submit>
- </c:otherwise>
- </c:choose>
- </div>
- <html:hidden property="submitted" value="true" />
- <c:if test='${not empty param.cid}'>
- <html:hidden property="cid" value="${param.cid}" />
- </c:if>
-</html:form>
-</div>
-
-</body>
+ <body>
+ <script type="text/javascript">
+ function setChildChannelArchChecksum() {
+ var baseChannelArches = {};
+ <c:forEach items="${parentChannelArches}"
var="parentChannel">
+ baseChannelArches["<c:out
value="${parentChannel.key}" />"] = "<c:out
value="${parentChannel.value}"/>";
+ </c:forEach>
+ var baseChannelChecksums = {};
+ <c:forEach items="${parentChannelChecksums}"
var="parentChannel">
+ baseChannelChecksums["<c:out
value="${parentChannel.key}" />"] = "<c:out
value="${parentChannel.value}"/>";
+ </c:forEach>
+ document.getElementById("parentarch").value =
baseChannelArches[document.getElementById("parent").value];
+ document.getElementById("checksum").value =
baseChannelChecksums[document.getElementById("parent").value];
+ }
+ </script>
+ <rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels"
+
deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}"
+ deletionAcl="user_role(channel_admin);
formvar_exists(cid)"
+ deletionType="software.channel">
+ <bean:message key="channel.edit.jsp.toolbar"
arg0="${channel_name}"/>
+ </rhn:toolbar>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/manage_channel.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <html:form action="/channels/manage/Edit"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <h2><bean:message
key="channel.edit.jsp.basicchanneldetails"/></h2>
+ <div class="page-summary">
+ <bean:message key="channel.edit.jsp.introparagraph"/>
+ </div>
+ <div class="form-group">
+ <label for="name" class="col-lg-3
control-label">
+ <rhn:required-field key="channel.edit.jsp.name"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="name" maxlength="256"
+ styleClass="form-control"
+ size="48" styleId="name"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="label" class="col-lg-3
control-label">
+ <rhn:required-field key="channel.edit.jsp.label"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.cid}'>
+ <html:text property="label"
maxlength="128"
+ styleClass="form-control"
+ size="32" styleId="label"
/>
+ </c:when>
+ <c:otherwise>
+ <div class="form-control">
+ <c:out value="${channel_label}"/>
+ </div>
+ <html:hidden property="label"
value="${channel_label}" />
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="parent" class="col-lg-3
control-label">
+ <bean:message key="channel.edit.jsp.parent"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.cid}'>
+ <html:select property="parent"
styleId="parent"
+ styleClass="form-control"
+
onchange="setChildChannelArchChecksum()">
+ <html:options collection="parentChannels"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ </c:when>
+ <c:otherwise>
+ <div class="form-control">
+ <c:out value="${parent_name}"/>
+ </div>
+ <html:hidden property="parent"
value="${parent_id}"/>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="parentarch" class="col-lg-3
control-label">
+ <bean:message key="packagelist.jsp.packagearch"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.cid}'>
+ <html:select property="arch"
+ styleClass="form-control"
+ styleId="parentarch">
+ <html:options collection="channelArches"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ </c:when>
+ <c:otherwise>
+ <div class="form-control">
+ <c:out value="${channel_arch}"/>
+ </div>
+ <html:hidden property="arch"
value="${channel_arch_label}" />
+ <html:hidden property="arch_name"
value="${channel_arch}" />
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="checksum">
+ <bean:message key="channel.edit.jsp.checksum"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:select property="checksum"
+ styleId="checksum"
+ styleClass="form-control">
+ <html:options collection="checksums"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ <span class="help-block">
+ <bean:message
key="channel.edit.jsp.checksumtip"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="summary" class="col-lg-3
control-label">
+ <rhn:required-field
key="channel.edit.jsp.summary"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="summary"
+ maxlength="500" size="40"
+ styleClass="form-control"
+ styleId="summary" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="description" class="col-lg-3
control-label">
+ <bean:message key="channel.edit.jsp.description"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="description"
+ styleClass="form-control"
+ cols="40" rows="6"
styleId="description"/>
+ </div>
+ </div>
+ <c:if test='${not empty param.cid}'>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.lastsynced"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:if test='${not empty log_url}'>
+ <a class="btn btn-info"
href='${log_url}'><c:out value='${last_sync}'/></a>
+ </c:if>
+ <c:if test='${empty log_url}'>
+ <div class="form-control">
+ <c:out value='${last_sync}'/>
+ </div>
+ </c:if>
+ </div>
+ </div>
+ </c:if>
+ <h2><bean:message
key="channel.edit.jsp.contactsupportinfo"/></h2>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="maintainer_name">
+ <bean:message
key="channel.edit.jsp.maintainername"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="maintainer_name"
+ maxlength="128" size="40"
+ styleClass="form-control"
+ styleId="maintainer_name"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="channel.edit.jsp.maintainercontactinfo"/>:
+ </label>
+ <div class="col-lg-6">
+ <div class="input-group">
+ <span class="input-group-addon"><bean:message
key="channel.edit.jsp.emailaddress"/>:</span>
+ <html:text property="maintainer_email"
size="20"
+ styleClass="form-control"
+ styleId="maintainer_email"/>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="input-group">
+ <span class="input-group-addon"><bean:message
key="channel.edit.jsp.phonenumber"/>:</span>
+ <html:text property="maintainer_phone"
size="20"
+ styleClass="form-control"
+ styleId="maintainer_phone"/>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="support_policy">
+ <bean:message
key="channel.edit.jsp.supportpolicy"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="support_policy"
+ cols="40" rows="6"
+ styleClass="form-control"
+ styleId="support_policy"/>
+ </div>
+ </div>
+ <h2><bean:message
key="channel.edit.jsp.channelaccesscontrol"/></h2>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.perusersub"/>:
+ </label>
+ <div class="col-lg-6">
+ <div class="radio">
+ <label>
+ <html:radio property="per_user_subscriptions"
value="all" styleId="allusers" />
+ <bean:message
key="channel.edit.jsp.allusers"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="radio">
+ <label>
+ <html:radio property="per_user_subscriptions"
value="selected" styleId="selectedusers" />
+ <bean:message
key="channel.edit.jsp.selectedusers"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="channel.edit.jsp.orgsharing"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="radio">
+ <label>
+ <html:radio property="org_sharing"
value="private" styleId="private"/>
+ <bean:message key="channel.edit.jsp.private"
+
arg0="/rhn/multiorg/Organizations.do"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="radio">
+ <label>
+ <html:radio property="org_sharing"
value="protected" styleId="protected" />
+ <bean:message key="channel.edit.jsp.protected"
+
arg0="/rhn/multiorg/Organizations.do"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="radio">
+ <label>
+ <html:radio property="org_sharing"
value="public" styleId="public"/>
+ <bean:message key="channel.edit.jsp.public"
+
arg0="/rhn/multiorg/Organizations.do"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <h2><bean:message
key="channel.edit.jsp.security.gpg"/></h2>
+ <div class="form-group">
+ <label for="gpgkeyurl" class="col-lg-3
control-label">
+ <bean:message key="channel.edit.jsp.gpgkeyurl"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="gpg_key_url"
maxlength="256" size="40"
+ styleClass="form-control"
+ styleId="gpgkeyurl"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="gpgkeyid" class="col-lg-3
control-label">
+ <bean:message key="channel.edit.jsp.gpgkeyid"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="gpg_key_id" maxlength="8"
size="8"
+ styleClass="form-control"
+ styleId="gpgkeyid"/>
+ <span class="help-block">Example:
DB42A60E</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="gpgkeyfingerprint">
+ <bean:message
key="channel.edit.jsp.gpgkeyfingerprint"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="gpg_key_fingerprint"
maxlength="50" size="60"
+ styleClass="form-control"
+ styleId="gpgkeyfingerprint"/>
+ <span class="help-block">Example: CA20 8686 2BD6 9DFC
65F6 ECC4 2191 80CD DB42 A60E</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.cid}'>
+ <html:submit property="create_button"
styleClass="btn btn-success">
+ <bean:message
key="channel.edit.jsp.createchannel"/>
+ </html:submit>
+ </c:when>
+ <c:otherwise>
+ <html:submit property="edit_button"
styleClass="btn btn-success">
+ <bean:message
key="channel.edit.jsp.editchannel"/>
+ </html:submit>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <html:hidden property="submitted" value="true" />
+ <c:if test='${not empty param.cid}'>
+ <html:hidden property="cid" value="${param.cid}"
/>
+ </c:if>
+ </html:form>
+ </body>
</html>
commit 002621bb4f7c0864bebdc93be82ccf2c0bbadc51
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Fri Oct 18 09:50:34 2013 +0200
Changed users/organizations icons.
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
index 876fee4..b82759c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
@@ -8,7 +8,7 @@
<body>
<rhn:toolbar
base="h1"
- img="/img/rhn-icon-org.gif"
+ icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 c5fe460..d5635c3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -18,7 +18,7 @@ function modifyUploadCheckbox(checkbox) {
<body>
<c:choose>
<c:when test="${param.oid != 1}">
- <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+ <rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -32,7 +32,7 @@ function modifyUploadCheckbox(checkbox) {
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+ <rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 da43bf5..af8fa3d 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
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif">
+<rhn:toolbar base="h1" icon="icon-group">
<bean:message key="orgdelete.jsp.header1"
arg0="${orgName}"/>
</rhn:toolbar>
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 8621e3d..b3b6de5 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
@@ -8,7 +8,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+<rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -22,7 +22,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+<rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
index 94ef90e..6877ff3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+<rhn:toolbar base="h1" icon="icon-group"
creationUrl="/rhn/admin/multiorg/OrgCreate.do"
creationType="org">
<bean:message key="organizations.jsp.toolbar"/>
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 7fe18db..bbbcf1d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
@@ -8,7 +8,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
- <rhn:toolbar base="h1"
img="/img/rhn-icon-org.gif"
+ <rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -22,7 +22,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1"
img="/img/rhn-icon-org.gif"
+ <rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 f5ccd61..e2d7ec2 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
@@ -8,7 +8,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+<rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -22,7 +22,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+<rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 58e0cfe..fd8b4dc 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
@@ -9,7 +9,7 @@
<body>
<c:choose>
<c:when test="${param.oid != 1}">
- <rhn:toolbar base="h1"
img="/img/rhn-icon-org.gif"
+ <rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
@@ -23,7 +23,7 @@
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1"
img="/img/rhn-icon-org.gif"
+ <rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
index 438dbe7..a0dbd51 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
@@ -7,7 +7,7 @@
<body>
<rhn:toolbar
base="h1"
- img="/img/rhn-icon-org.gif"
+ icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
index be78264..994efe5 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
@@ -8,7 +8,7 @@
<body>
<rhn:toolbar
base="h1"
- img="/img/rhn-icon-org.gif"
+ icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 0c7eb8e..270a8ea 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
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif"
+<rhn:toolbar base="h1" icon="icon-group"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
index f93a9c3..b434958 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif">
+<rhn:toolbar base="h1" icon="icon-group">
${trustorg}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
index 34c771e..60620bd 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif">
+<rhn:toolbar base="h1" icon="icon-group">
${trustorg}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
index 75c567a..3f6a849 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
@@ -9,7 +9,7 @@
<c:set var="pageList" value="${requestScope.pageList}" />
-<rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" >
+<rhn:toolbar base="h1" icon="icon-group" >
<bean:message key="organizations.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
index a72a97e..a29848f 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
@@ -5,7 +5,7 @@
<html:html xhtml="true">
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-org.gif" >
+ <rhn:toolbar base="h1" icon="icon-group" >
${orgtrust}
</rhn:toolbar>
<rhn:dialogmenu mindepth="0" maxdepth="3"
commit 0571073a059d3e57f9e68ba6cce95911e6df2a11
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Fri Oct 18 09:36:14 2013 +0200
Entitlements icon changed.
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
index ef6dae6..ee4bbc6 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
+<rhn:toolbar base="h1"
icon="spacewalk-icon-manage-entitlements-subscriptions"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
commit 5c8cdd1363e74b9713c5687bd9b48d5010fbd687
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Thu Oct 17 17:20:19 2013 +0200
Updated Admin/Spacewalk Configuration info icons.
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
index f2efc48..4ed8222 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="bootstrap.jsp.toolbar"/>
</rhn:toolbar>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
index 0297362..9d66555 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="certificate.jsp.toolbar"/>
</rhn:toolbar>
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 60c733b..21f7b26 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
@@ -6,7 +6,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="cobbler.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
index 4cfd1cd..fc57501 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="general.jsp.toolbar"/>
</rhn:toolbar>
<p><bean:message key="general.jsp.summary"/></p>
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 75a6f3b..80d643c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
@@ -5,7 +5,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="general.jsp.org.toolbar"/>
</rhn: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 8389105..f4023aa 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
@@ -11,7 +11,7 @@
</c:if>
</head>
<body <c:if test="${requestScope.restart ==
'true'}">onload="checkConnection(${requestScope.restartDelay})"</c:if>
>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="restart.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
index 622049e..c6b5cd7 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
@@ -5,7 +5,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
+ <rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="iss.confirmmasterremove.jsp.toolbar" />
</rhn:toolbar>
<p><bean:message key="iss.confirmmasterremove.jsp.areyousure"
/></p>
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 4699a13..c2626e2 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
@@ -5,7 +5,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
+ <rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="iss.confirmslaveremove.jsp.toolbar" />
</rhn:toolbar>
<p><bean:message key="iss.confirmslaveremove.jsp.areyousure"
/></p>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
index 1831564..a104ba8 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
@@ -7,14 +7,14 @@
<body>
<c:choose>
<c:when test="${requestScope.id > 0}">
- <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif"
+ <rhn:toolbar base="h1" icon="icon-info-sign"
deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}"
deletionType="master"
deletionAcl="user_role(satellite_admin)">
<bean:message key="iss.editmaster.jsp.toolbar" />
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif">
+ <rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="iss.editmaster.jsp.toolbar" />
</rhn:toolbar>
</c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
index 30821e3..b8fbe1f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
@@ -7,14 +7,14 @@
<body>
<c:choose>
<c:when test="${requestScope.sid > 0}">
- <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif"
+ <rhn:toolbar base="h1" icon="icon-info-sign"
deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}"
deletionType="slave"
deletionAcl="user_role(satellite_admin)">
<bean:message key="iss.editslave.jsp.toolbar" />
</rhn:toolbar>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif">
+ <rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="iss.editslave.jsp.toolbar" />
</rhn:toolbar>
</c:otherwise>
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 14bca4d..1d1bb1b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
@@ -6,7 +6,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
+ <rhn:toolbar base="h1" icon="icon-info-sign"
creationUrl="/rhn/admin/iss/EditSlave.do"
creationType="slave"
creationAcl="user_role(satellite_admin)">
<bean:message key="iss.master.jsp.toolbar" />
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 f726814..ba07a24 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
@@ -5,7 +5,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
+ <rhn:toolbar base="h1" icon="icon-info-sign"
creationUrl="/rhn/admin/iss/EditMaster.do"
creationType="master"
creationAcl="user_role(satellite_admin)">
<bean:message key="iss.slave.jsp.toolbar" />
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 1cd10cf..62005e5 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
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
+<rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="methods.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
index 92e8be7..ae17a41 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
@@ -6,7 +6,7 @@
<html>
<body>
<script language="javascript"
src="/javascript/display.js"></script>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
+ <rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="orgcreate.jsp.title"/>
</rhn:toolbar>
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 6c9e3cc..ca16caa 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
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<c:out value="${requestScope.label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
index 625b633..614c4c4 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -7,13 +7,13 @@
<body>
<c:choose>
<c:when test = "${not empty requestScope.create_mode}">
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="repos.jsp.toolbar"/>
</rhn:toolbar>
<h2><bean:message key="repos.jsp.header2"/></h2>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img"
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img"
deletionUrl="RepoDelete.do?id=${requestScope.repo.id}"
deletionType="repos">
<c:out value="${requestScope.repo.label}"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
index 843f636..d3a973b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
+<rhn:toolbar base="h1" icon="icon-info-sign"
creationUrl="RepoCreate.do"
creationType="repos"
imgAlt="info.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
index f9d83f1..74d502f 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="keycreate.jsp.toolbar"/>
</rhn:toolbar>
<bean:message key="keycreate.jsp.summary"/>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
index cd7da63..e911ebc 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="system.common.kickstartAlt"
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/keys/CryptoKeyDelete.do?key_id=${cryptoKey.id}"
deletionType="CryptoKeyDelete">
<bean:message key="keyedit.jsp.toolbar"/>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp
b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
index 7310ade..4e1c3fa 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
@@ -7,7 +7,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
+<rhn:toolbar base="h1" icon="icon-info-sign"
creationUrl="CryptoKeyCreate.do"
creationType="keys"
imgAlt="info.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
index 6afd6b0..3b30208 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
@@ -11,14 +11,14 @@
<body>
<c:choose>
<c:when test = "${not empty requestScope.create_mode}">
- <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif" imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="snippetcreate.jsp.toolbar"/>
</rhn:toolbar>
<h2><bean:message
key="snippetcreate.jsp.header2"/></h2>
</c:when>
<c:otherwise>
<rhn:toolbar base="h1"
- img="/img/rhn-icon-info.gif"
+ icon="icon-info-sign"
imgAlt="info.alt.img"
deletionUrl="CobblerSnippetDelete.do?name=${cobblerSnippetsForm.map.name}"
deletionType="snippets">
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..00f79a7 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" icon="icon-info-sign"
creationUrl="CobblerSnippetCreate.do"
creationType="snippets"
imgAlt="info.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 cbb2092..e565c29 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
@@ -9,7 +9,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+<rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
${requestScope.snippet.displayName}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
index 5337034..3bb22d4 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
@@ -9,7 +9,7 @@
<meta http-equiv="Pragma" content="no-cache" />
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="treecreate.jsp.toolbar"/>
</rhn:toolbar>
<bean:message key="treecreate.jsp.header1"/>
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
index 1602d54..8112142 100644
--- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
@@ -7,7 +7,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
+<rhn:toolbar base="h1" icon="icon-info-sign">
<bean:message key="probes.jsp.toolbar"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
index 72855e1..7e97460 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
@@ -5,7 +5,7 @@
<html:html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <rhn:toolbar base="h1" icon="icon-info-sign"
imgAlt="info.alt.img">
<bean:message key="preservation_create.jsp.toolbar"/>
</rhn:toolbar>
commit 3ca173ad1022de2a7d9888ab9d38866c4bf1b550
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Thu Oct 17 17:13:01 2013 +0200
Update icons of Configuration/Configuration channels.
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 b1ae6f9..8f70d02 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
@@ -35,7 +35,7 @@
</c:if>
</c:when>
<c:otherwise>
- <rhn:toolbar base="h1" img="/img/rhn-config_namespace-2.gif"
+ <rhn:toolbar base="h1"
icon="spacewalk-icon-Software-Channel-Management"
imgAlt="config.common.globalAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details">
<bean:message key="channelOverview.jsp.newToolbar" />
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 8aab5d5..7b07e22 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-config_namespace-2.gif"
imgAlt="config.jsp.imgAlt"
+<rhn:toolbar base="h1"
icon="spacewalk-icon-Software-Channel-Management"
imgAlt="config.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central"
creationUrl="/rhn/configuration/ChannelCreate.do?editing=true"
creationType="configchannel"
commit 34d1469dafe9fcae364373bdfab44c9c972d5766
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Thu Oct 17 17:07:27 2013 +0200
Updated channel icons.
diff --git a/java/code/webapp/WEB-INF/pages/channel/custom.jsp
b/java/code/webapp/WEB-INF/pages/channel/custom.jsp
index d8547dd..ce2ceb6 100644
--- a/java/code/webapp/WEB-INF/pages/channel/custom.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/custom.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channel.nav.custom"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index a325714..16760eb 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -9,7 +9,7 @@
<script type="text/javascript"
src="/javascript/highlander.js"></script>
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
imgAlt="packagesearch.jsp.imgAlt"
+ <rhn:toolbar base="h1" icon="icon-search"
imgAlt="packagesearch.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
<bean:message key="packagesearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp
b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
index ce54772..fe16d36 100644
--- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channel.nav.popular"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
index 5a6605d..3599f6f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channel.nav.vendor"/>
</rhn:toolbar>
commit 8ad61979b5c9b1b2a7e7d5fa954699b32909e7f3
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Oct 17 16:59:46 2013 +0200
Fix ISE when changing user details on /rhn/users/UserDetails.do
As reported by Tomáš Kašpárek.
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 2c581c2..fd37766 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
@@ -62,7 +62,7 @@
</label>
</div>
- <hidden name="disabledRoles"
value="${disabledRoles}"/>
+ <input type="hidden" name="disabledRoles"
value="${disabledRoles}"/>
<div class="form-group">
<div class="col-lg-offset-3 col-lg-6">
commit 41355a1d48a095beaa7264923eb7eda03b10290b
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Thu Oct 17 16:58:12 2013 +0200
Changed Kickstart icons.
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
index eed9476..8b4440b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
@@ -2,7 +2,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/kickstart/KickstartDeleteAdvanced.do?ksid=${ksdata.id}"
deletionType="kickstart"
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 3bda9a3..755d202 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
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="system.common.kickstartAlt">
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt">
<bean:message key="kickstart.clone.jsp.header1"
arg0="${ksdata.label}"/>
</rhn:toolbar>
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 4ed5f02..ccf4258 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
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="system.common.kickstartAlt">
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt">
<bean:message key="kickstartdelete.jsp.header1"
arg0="${ksdata.label}"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
index bc8dbe3..3d3c99b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
@@ -1,7 +1,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/kickstart/KickstartDelete.do?ksid=${ksdata.id}"
deletionType="kickstart"
diff --git a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
index 66f381c..25acacd 100644
--- a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="kickstarts.alt.img">
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="kickstarts.alt.img">
<bean:message key="keydelete.jsp.toolbar"/>
</rhn:toolbar>
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 56ac956..e9a81c2 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="kickstarts.alt.img">
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="kickstarts.alt.img">
<c:out value="${requestScope.snippet.displayName}"/>
</rhn:toolbar>
<h2><bean:message key="cobbler.snippet.delete"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
index 75e51db..021ea28 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
@@ -7,7 +7,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
creationUrl="/rhn/kickstart/CreateProfileWizard.do"
creationType="kickstart"
imgAlt="kickstarts.alt.img"
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
index 3b1c377..95acbbc 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
@@ -7,7 +7,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="kickstarts.alt.img">
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="kickstarts.alt.img">
<bean:message key="kickstartranges.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
index 6d64ed1..0ad1089 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
@@ -7,7 +7,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
creationUrl="/rhn/kickstart/CreateProfileWizard.do"
creationType="kickstart"
imgAlt="kickstarts.alt.img"
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
index ac63ec3..645970c 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
@@ -5,7 +5,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstid}"
deletionType="deleteTree"
imgAlt="kickstarts.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
index f239a49..5e0dcc0 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif">
+<rhn:toolbar base="h1" icon="icon-rocket">
<bean:message key="kickstartdelete.jsp.header1"
arg0="${ksdata.label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
index 8e588c6..79a7788 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
@@ -17,7 +17,7 @@
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<p>
-<rhn:toolbar base="h2" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h2" icon="icon-rocket"
deletionUrl="/rhn/kickstart/KickstartScriptDelete.do?kssid=${kssid}&ksid=${ksdata.id}"
deletionType="kickstartscript" >
<bean:message key="kickstart.script.header1"/>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
index 8be640b..3279228 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
@@ -6,7 +6,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
creationUrl="/rhn/kickstart/KickstartScriptCreate.do?ksid=${ksdata.id}"
creationType="kickstartscript"
imgAlt="kickstarts.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
index 029094c..0a4e8f4 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
@@ -15,7 +15,7 @@
</div>
</c:if>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="system.common.kickstartAlt">
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt">
<bean:message key="distro-delete.jsp.header1"
arg0="${kstree.label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
index 9ddbb99..23ffd9f 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
@@ -12,7 +12,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
deletionUrl="/rhn/kickstart/TreeDelete.do?kstid=${kstree.id}"
deletionType="deleteTree"
imgAlt="kickstarts.alt.img">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
index 192271b..2125033 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
@@ -20,7 +20,7 @@ function clickNewestTree(obj) {
</script>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt">
<bean:message key ="kickstart.advanced.jsp.create"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
index acd1ae8..03b6055 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1"
img="/img/rhn-kickstart_profile.gif"
imgAlt="system.common.kickstartAlt"
+ <rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/systems/provisioning/preservation/PreservationListDeleteSingle.do?file_list_id=${fileList.id}"
deletionType="filelist">
<bean:message key="preservation_edit.jsp.toolbar"/>
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
index 644acbb..be0850a 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
@@ -5,7 +5,7 @@
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt"
creationUrl="PreservationListCreate.do"
creationType="filelist">
diff --git
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
index 06777c6..9a7a7d6 100644
---
a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
+<rhn:toolbar base="h1" icon="icon-rocket"
imgAlt="system.common.kickstartAlt">
<bean:message key="preservation_list.jsp.toolbar"/>
</rhn:toolbar>
commit 92943ef4fe0a7b15d6e73f21a0816093994a8e42
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Thu Oct 17 16:21:53 2013 +0200
Changed a few more icons.
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
index d2c2266..cade102 100644
--- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="icon-home"
+<rhn:toolbar base="h1" icon="icon-dashboard"
helpUrl="">
<bean:message key="bunch.edit.jsp.toolbar"
arg0="${label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
index 4c5bff2..951ffdb 100644
--- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" icon="icon-home"
+<rhn:toolbar base="h1" icon="icon-dashboard"
imgAlt="channels.overview.toolbar.imgAlt"
creationUrl="/rhn/admin/ScheduleDetail.do"
creationType="schedule"
diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
index 70ef0b0..488710f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" icon="icon-home"
+<rhn:toolbar base="h1" icon="icon-dashboard"
helpUrl="">
<bean:message key="task.status.title"/>
</rhn:toolbar>
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 0b4755c..115b761 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
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif"
imgAlt="overview.jsp.alt"
+<rhn:toolbar base="h1" icon="spacewalk-icon-packages"
imgAlt="overview.jsp.alt"
helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Channel_and_Package_Management-Manage_Software_Packages.jsp">
<bean:message key="channel.jsp.manage.package.title"/>
</rhn:toolbar>
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 4c50a6c..fee77d3 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
@@ -21,7 +21,7 @@
</script>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif"
imgAlt="overview.jsp.alt"
+<rhn:toolbar base="h1" icon="spacewalk-icon-packages"
imgAlt="overview.jsp.alt"
helpUrl="/rhn/help/channel-mgmt/en-US/channel-mgmt-Custom_Channel_and_Package_Management-Manage_Software_Packages.jsp">
<bean:message key="channel.jsp.manage.package.title"/>
</rhn:toolbar>
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 24968d0..0729494 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,6 +1,6 @@
-<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif"
imgAlt="package.jsp.alt">
+<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>
</rhn:toolbar>
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 8b4b217..f3e266d 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
@@ -3,7 +3,7 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
<html:xhtml/>
<rhn:toolbar base="h1"
- img="/img/rhn-icon-packages.gif"
+ icon="spacewalk-icon-packages"
imgAlt="profile.list.header.alt"
deletionUrl="/rhn/profiles/Delete.do?prid=${param.prid}"
deletionType="profile">
diff --git a/java/code/webapp/WEB-INF/pages/profiles/list.jsp
b/java/code/webapp/WEB-INF/pages/profiles/list.jsp
index 7fe3d37..60d9eff 100644
--- a/java/code/webapp/WEB-INF/pages/profiles/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/profiles/list.jsp
@@ -8,7 +8,7 @@
<html>
<body>
<rhn:toolbar base="h1"
- img="/img/rhn-icon-packages.gif"
+ icon="spacewalk-icon-packages"
imgAlt="profile.list.header.alt">
<bean:message key="profile.list.header" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
index efece3c..2f9feba 100644
--- a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
@@ -7,7 +7,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-packages.gif"
imgAlt="packagesearch.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="spacewalk-icon-packages"
imgAlt="packagesearch.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
<bean:message key="packagesbyname.jsp.toolbar"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
index 6940356..41783db 100644
---
a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
+++
b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
@@ -9,7 +9,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" img="/img/rhn-icon-packages.gif"
+<rhn:toolbar base="h2" icon="spacewalk-icon-packages"
deletionUrl="/rhn/systems/details/packages/profiles/DeleteProfile.do?sid=${param.sid}&prid=${param.prid}"
deletionType="profile">
<bean:message key="compare.jsp.compareto"
arg0="${requestScope.profilename}" />
diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
index b75a0cd..1f045bd 100644
--- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
+++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
@@ -34,7 +34,7 @@
</c:if>
</head>
<body>
-<rhn:toolbar base="h1" icon="icon-home"
imgAlt="yourrhn.jsp.toolbar.img.alt"
+<rhn:toolbar base="h1" icon="icon-dashboard"
imgAlt="yourrhn.jsp.toolbar.img.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp">
<bean:message key="yourrhn.jsp.toolbar"/>
</rhn:toolbar>
commit 6a3fbe466acb27af26b45ba6ee0647cd275c6d23
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Oct 17 16:26:00 2013 +0200
Put the summary in the right place on Credentials page
diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
index ca31051..0164c09 100644
--- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
@@ -12,10 +12,10 @@
deletionType="credentials">
<bean:message key="Credentials"/>
</rhn:toolbar>
- <h2><bean:message key="credentials.jsp.susestudio"
/></h2>
<p class="lead">
<bean:message key="credentials.jsp.edit.summary" />
</p>
+ <h2><bean:message key="credentials.jsp.susestudio"
/></h2>
<form method="post" action="/rhn/account/Credentials.do"
class="form-horizontal" role="form">
commit 9cb3df51290623910ca0fc88fc7458e70723ad99
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Oct 17 16:19:48 2013 +0200
TB3: Channels/Distribution Channel Mapping/Create new distromap form
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 2ee25db..ba1418e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmapedit.jsp
@@ -3,107 +3,106 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<html:html xhtml="true">
-<body>
-<c:choose>
- <c:when test="${empty dcm}">
- <rhn:toolbar base="h1"
img="/img/rhn-icon-subscribe_replace.png" imgAlt="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"
- deletionUrl="DistChannelMapDelete.do?dcm=${dcm}"
- deletionType="distchannelmap">
- <bean:message key="distchannelmap.jsp.update"/>
- </rhn:toolbar>
- <h2><bean:message
key="distchannelmap.jsp.update"/></h2>
- </c:otherwise>
-</c:choose>
-
-<div class="page-summary">
- <p><bean:message
key="distchannelmap.jsp.edit.summary"/></p>
-</div>
-
-
-<html:form action="/channels/manage/DistChannelMapEdit">
- <rhn:csrf />
- <rhn:submitted/>
- <table class="details">
- <tr>
- <th>
- <label for="os">
- <rhn:required-field key = "Operating System"/>
- </label>
- </th>
- <td>
- <html:text property="os" styleId="os"/>
- </td>
- </tr>
- <tr>
- <th>
- <label for="release">
- <rhn:required-field key = "column.release"/>
- </label>
- </th>
- <td>
- <c:choose>
- <c:when test="${empty dcm}">
- <html:text property="release" styleId="release"
disabled="${not empty dcm}"/>
- </c:when>
- <c:otherwise>
- <c:out value="${release}"/>
- <html:hidden property="release"
value="${release}"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th>
- <rhn:required-field key = "column.architecture"/>
- </th>
- <td>
+<html:html>
+ <body>
<c:choose>
- <c:when test="${empty dcm}">
- <html:select property="architecture">
- <html:options collection="channelArches"
- property="value" labelProperty="label" />
- </html:select>
- </c:when>
- <c:otherwise>
- <c:out value="${architecture}"/>
- <html:hidden property="architecture"
value="${architecture}"/>
- </c:otherwise>
+ <c:when test="${empty dcm}">
+ <rhn:toolbar base="h1"
img="/img/rhn-icon-subscribe_replace.png" imgAlt="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"
+ deletionUrl="DistChannelMapDelete.do?dcm=${dcm}"
+ deletionType="distchannelmap">
+ <bean:message key="distchannelmap.jsp.update"/>
+ </rhn:toolbar>
+ <h2><bean:message
key="distchannelmap.jsp.update"/></h2>
+ </c:otherwise>
</c:choose>
- </td>
- </tr>
- <tr>
- <th>
- <rhn:required-field key = "channel.edit.jsp.label"/>
- </th>
- <td>
- <html:select property="channel_label">
- <html:options collection="channels"
- property="value" labelProperty="label" />
- </html:select>
- </td>
- </tr>
- </table>
-
- <div align="right">
- <hr />
- <c:choose>
- <c:when test="${empty dcm}">
- <html:submit><bean:message
key="distchannelmap.jsp.create.submit"/></html:submit>
- </c:when>
- <c:otherwise>
- <html:submit><bean:message
key="distchannelmap.jsp.update.submit"/></html:submit>
- </c:otherwise>
- </c:choose>
-
- <html:hidden property="dcm" value="${dcm}" />
-</html:form>
-
-</body>
+ <div class="page-summary">
+ <p><bean:message
key="distchannelmap.jsp.edit.summary"/></p>
+ </div>
+ <html:form action="/channels/manage/DistChannelMapEdit"
+ styleClass="form-horizontal">
+ <rhn:csrf />
+ <rhn:submitted/>
+ <div class="form-group">
+ <label for="os" class="col-lg-3
control-label">
+ <rhn:required-field key = "Operating System"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text property="os" styleId="os"
styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="release" class="col-lg-3
control-label">
+ <rhn:required-field key = "column.release"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${empty dcm}">
+ <html:text property="release"
styleId="release"
+ styleClass="form-control"
+ disabled="${not empty dcm}"/>
+ </c:when>
+ <c:otherwise>
+ <input class="form-control"
type="text" disabled value="<c:out
value="${release}"/>" />
+ <html:hidden property="release"
value="${release}"/>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <rhn:required-field key = "column.architecture"/>
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test="${empty dcm}">
+ <html:select property="architecture"
styleClass="form-control">
+ <html:options collection="channelArches"
+ property="value"
labelProperty="label" />
+ </html:select>
+ </c:when>
+ <c:otherwise>
+ <div class="form-control">
+ <c:out value="${architecture}"/>
+ </div>
+ <html:hidden property="architecture"
value="${architecture}"/>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <rhn:required-field key = "channel.edit.jsp.label"/>
+ </label>
+ <div class="col-lg-6">
+ <html:select property="channel_label"
styleClass="form-control">
+ <html:options collection="channels"
+ property="value"
labelProperty="label" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:choose>
+ <c:when test="${empty dcm}">
+ <html:submit styleClass="btn btn-success">
+ <bean:message
key="distchannelmap.jsp.create.submit"/>
+ </html:submit>
+ </c:when>
+ <c:otherwise>
+ <html:submit styleClass="btn btn-success">
+ <bean:message
key="distchannelmap.jsp.update.submit"/>
+ </html:submit>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ <html:hidden property="dcm" value="${dcm}" />
+ </div>
+ </html:form>
+ </body>
</html:html>
commit d80cd64c922ef2a4b82126d56fe2be6d920ad9b4
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Oct 17 15:35:37 2013 +0200
TB3: Channels/Package search form
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index 4415f53..a325714 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -4,149 +4,163 @@
<%@ 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>
-</head>
-<body>
-<rhn:toolbar base="h1" icon="icon-search"
imgAlt="packagesearch.jsp.imgAlt"
-
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
- <bean:message key="packagesearch.jsp.toolbar"/>
- </rhn:toolbar>
-
- <p><bean:message key="packagesearch.jsp.pagesummary"/></p>
-
- <p><bean:message
key="packagesearch.jsp.instructions"/></p>
-
- <html:form action="/channels/software/Search.do">
- <rhn:csrf />
-
- <!-- Search Box -->
- <div class="search-choices">
-
- <div class="search-choices-group">
- <table class="details">
- <tr><th><bean:message
key="packagesearch.jsp.searchfor"/></th>
- <td>
- <html:text property="search_string"
name="search_string" value="${search_string}"
accesskey="4"/>
- <button type="submit" class="btn btn-default
btn-sm">
- <span class="glyphicon glyphicon-search" />
- <bean:message key="button.search"/>
- </button>
- </td>
- </tr>
- <tr><th><bean:message
key="packagesearch.jsp.whatsearch"/></th>
- <td>
- <div style="text-align: left">
- <html:select property="view_mode"
value="${view_mode}" >
- <html:options collection="searchOptions"
- property="value"
- labelProperty="display" />
- </html:select>
- </div>
- </td>
- </tr>
- <tr><th><bean:message
key="packagesearch.jsp.wheresearch"/></th>
- <td>
-
- <div style="text-align: left;">
- <input type="radio" name="whereCriteria"
value="relevant" <c:if test="${whereCriteria eq
'relevant'}">checked</c:if> /><bean:message
key="packagesearch.jsp.relevant"/>
- </div>
- <div style="text-align: left;">
- <input type="radio" name="whereCriteria"
value="channel" <c:if test="${whereCriteria eq
'channel'}">checked</c:if> /><bean:message
key="packagesearch.jsp.specificchannel"/><br/>
- <div style="margin-left: 30px; margin-top: 5px;">
- <html:select property="channel_filter">
- <html:options collection="allChannels"
- property="id"
- labelProperty="name" />
- </html:select><br/>
- </div>
- </div>
- <div style="text-align: left;">
- <input type="radio" name="whereCriteria"
value="architecture" <c:if test="${whereCriteria eq
'architecture'}">checked</c:if> /><bean:message
key="packagesearch.jsp.specificarch"/><br/>
- <div style="margin-left: 30px; margin-top: 5px;">
- <html:select property="channel_arch"
multiple="multiple"
- size="5"
onclick="javascript:highlander(this);">
- <html:options collection="channelArches"
- property="value"
- labelProperty="display" />
- </html:select><br/>
-
- <bean:message
key="packagesearch.jsp.searchwherelegend"/>
+ <head>
+ <script type="text/javascript"
src="/javascript/highlander.js"></script>
+ </head>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
imgAlt="packagesearch.jsp.imgAlt"
+
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
+ <bean:message key="packagesearch.jsp.toolbar"/>
+ </rhn:toolbar>
+ <p><bean:message
key="packagesearch.jsp.pagesummary"/></p>
+ <p><bean:message
key="packagesearch.jsp.instructions"/></p>
+ <html:form action="/channels/software/Search.do"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="packagesearch.jsp.searchfor"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="input-group">
+ <html:text property="search_string"
styleClass="form-control"
+ name="search_string"
value="${search_string}" accesskey="4"/>
+ <span class="input-group-btn">
+ <button type="submit" class="btn
btn-default">
+ <i class="icon-search"></i>
+ </button>
+ </span>
</div>
- </div>
-
- </td>
- </tr>
- <tr>
- <th><label for="fineGrainedlabel"><bean:message
key="systemsearch.jsp.finegrainedlabel"/></label></th>
- <td>
- <div style="text-align: left">
- <html:checkbox property="fineGrained"
styleId="fineGrainedlabel"><label
for="fineGrainedlabel"><bean:message
key="systemsearch.jsp.finegrained"/></label></html:checkbox>
- </div>
- </td>
- </tr>
- </table>
- </div>
-
- </div>
- <input type="hidden" name="submitted" value="true"
/>
- </html:form>
-
- <c:if test="${search_string != null && search_string !=
''}">
-
- <hr />
- <c:set var="pageList" value="${requestScope.pageList}" />
- <!-- collapse the params into a string -->
- <c:forEach items="${requestScope.channel_arch}" var="item">
- <c:set var="archparams"
value="${archparams}&channel_arch=${item}"/>
- </c:forEach>
- <rl:listset name="searchSet">
- <rhn:csrf />
- <rl:list name="searchResults" dataset="pageList"
- emptykey="packagesearch.jsp.nopackages" width="100%"
-
filter="com.redhat.rhn.frontend.action.channel.PackageNameFilter">
- <rl:decorator name="PageSizeDecorator"/>
- <rl:column bound="false" sortable="false"
headerkey="packagesearch.jsp.name">
- <a
href="/rhn/software/packages/NameOverview.do?package_name=${current.urlEncodedPackageName}${archparams}&search_subscribed_channels=${requestScope.relevant}&channel_filter=${requestScope.channel_filter}">
- <rhn:highlight tag="strong"
text="${search_string}">
- ${current.packageName}
- </rhn:highlight>
- </a>
- </rl:column>
- <rl:column bound="false" sortable="false"
headerkey="packagesearch.jsp.summary">
- <c:choose>
- <c:when test="${param.view_mode != 'search_name'}">
- <rhn:highlight tag="strong"
text="${search_string}">
- ${current.summary}
- </rhn:highlight>
- </c:when>
- <c:otherwise>
- ${current.summary}
- </c:otherwise>
- </c:choose>
-
- </rl:column>
- </rl:list>
- <rl:csv dataset="pageList"
- name="searchResults"
- exportColumns="packageName,summary"/>
-
- <!-- there are two forms here, need to keep the formvars around for pagination
-->
- <input type="hidden" name="submitted" value="true"
/>
- <html:hidden property="search_string" name="search_string"
value="${search_string}" />
- <input type="hidden" name="view_mode"
value="${view_mode}" />
- <input type="hidden" name="whereCriteria"
value="${whereCriteria}" />
- <input type="hidden" name="channel_filter"
value="${channel_filter}" />
- <input type="hidden" name="fineGrained"
value="${fineGrained}" />
-
- <c:forEach items="${requestScope.channel_arch}"
var="item">
- <input type="hidden" name="channel_arch"
value="${item}" />
- </c:forEach>
-
- </rl:listset>
-
- </c:if>
-</body>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="packagesearch.jsp.whatsearch"/>
+ </label>
+ <div class="col-lg-6">
+ <html:select property="view_mode"
value="${view_mode}" styleClass="form-control" >
+ <html:options collection="searchOptions"
+ property="value"
+ labelProperty="display" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message key="packagesearch.jsp.wheresearch"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="radio"
name="whereCriteria"
+ value="relevant" <c:if
test="${whereCriteria eq 'relevant'}">checked</c:if> />
+ <bean:message
key="packagesearch.jsp.relevant"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="radio"
name="whereCriteria"
+ value="channel" <c:if
test="${whereCriteria eq 'channel'}">checked</c:if> />
+ <bean:message
key="packagesearch.jsp.specificchannel"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:select property="channel_filter"
styleClass="form-control">
+ <html:options collection="allChannels"
+ property="id"
+ labelProperty="name" />
+ </html:select>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="radio"
name="whereCriteria"
+ value="architecture" <c:if
test="${whereCriteria eq 'architecture'}">checked</c:if> />
+ <bean:message
key="packagesearch.jsp.specificarch"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:select property="channel_arch"
multiple="multiple"
+ styleClass="form-control"
+ size="5"
onclick="javascript:highlander(this);">
+ <html:options collection="channelArches"
+ property="value"
+ labelProperty="display" />
+ </html:select>
+ <span class="help-block">
+ <bean:message
key="packagesearch.jsp.searchwherelegend"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <label>
+ <html:checkbox property="fineGrained"
styleId="fineGrainedlabel" />
+ <bean:message
key="systemsearch.jsp.finegrained"/>
+ </label>
+ </div>
+ </div>
+ <input type="hidden" name="submitted"
value="true" />
+ </html:form>
+
+ <c:if test="${search_string != null && search_string !=
''}">
+ <c:set var="pageList" value="${requestScope.pageList}"
/>
+ <!-- collapse the params into a string -->
+ <c:forEach items="${requestScope.channel_arch}"
var="item">
+ <c:set var="archparams"
value="${archparams}&channel_arch=${item}"/>
+ </c:forEach>
+ <rl:listset name="searchSet">
+ <rhn:csrf />
+ <rl:list name="searchResults" dataset="pageList"
+ emptykey="packagesearch.jsp.nopackages"
width="100%"
+
filter="com.redhat.rhn.frontend.action.channel.PackageNameFilter">
+ <rl:decorator name="PageSizeDecorator"/>
+ <rl:column bound="false" sortable="false"
headerkey="packagesearch.jsp.name">
+ <a
href="/rhn/software/packages/NameOverview.do?package_name=${current.urlEncodedPackageName}${archparams}&search_subscribed_channels=${requestScope.relevant}&channel_filter=${requestScope.channel_filter}">
+ <rhn:highlight tag="strong"
text="${search_string}">
+ ${current.packageName}
+ </rhn:highlight>
+ </a>
+ </rl:column>
+ <rl:column bound="false" sortable="false"
headerkey="packagesearch.jsp.summary">
+ <c:choose>
+ <c:when test="${param.view_mode !=
'search_name'}">
+ <rhn:highlight tag="strong"
text="${search_string}">
+ ${current.summary}
+ </rhn:highlight>
+ </c:when>
+ <c:otherwise>
+ ${current.summary}
+ </c:otherwise>
+ </c:choose>
+ </rl:column>
+ </rl:list>
+ <rl:csv dataset="pageList"
+ name="searchResults"
+ exportColumns="packageName,summary"/>
+ <!-- there are two forms here, need to keep the formvars around for
pagination -->
+ <input type="hidden" name="submitted"
value="true" />
+ <html:hidden property="search_string"
name="search_string" value="${search_string}" />
+ <input type="hidden" name="view_mode"
value="${view_mode}" />
+ <input type="hidden" name="whereCriteria"
value="${whereCriteria}" />
+ <input type="hidden" name="channel_filter"
value="${channel_filter}" />
+ <input type="hidden" name="fineGrained"
value="${fineGrained}" />
+ <c:forEach items="${requestScope.channel_arch}"
var="item">
+ <input type="hidden" name="channel_arch"
value="${item}" />
+ </c:forEach>
+ </rl:listset>
+ </c:if>
+ </body>
</html>
commit d2952699ffabbc50034107cc2b2be0b909b3e5cf
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Thu Oct 17 15:23:13 2013 +0200
Changed a few icons
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
index 90de0ba..79b4021 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
@@ -4,7 +4,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif"
+<rhn:toolbar base="h1" icon="icon-key"
imgAlt="activation-keys.common.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
diff --git
a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
index a92eed7..fa44887 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
@@ -4,7 +4,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<html:html xhtml="true">
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif"
+<rhn:toolbar base="h1" icon="icon-key"
imgAlt="activation-keys.common.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
diff --git
a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
index fb45abf..594b9df 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
@@ -9,7 +9,7 @@
<meta name="name" value="activationkeys.jsp.header" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif"
+<rhn:toolbar base="h1" icon="icon-key"
imgAlt="activation-keys.common.alt"
creationUrl="/rhn/activationkeys/Create.do"
creationType="activationkeys"
diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
index b4024db..7401e8f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
+<rhn:toolbar base="h1" icon="icon-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" />
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
index 33c3f38..d2c2266 100644
--- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif"
+<rhn:toolbar base="h1" icon="icon-home"
helpUrl="">
<bean:message key="bunch.edit.jsp.toolbar"
arg0="${label}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
index b21bbeb..b980e85 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
@@ -5,7 +5,7 @@
<html>
<body>
- <rhn:toolbar base="h1"
img="/img/rhn-config_management.gif"
+ <rhn:toolbar base="h1" icon="icon-cog"
helpUrl="">
<bean:message key="generalconfig.jsp.header1"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
index cbb29b8..50dd72a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
@@ -5,7 +5,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif">
+<rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
<bean:message key="schedule.edit.jsp.toolbar"
arg0="${schedulename}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
index e9eacab..b02ed3a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
@@ -5,7 +5,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt">
+<rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt">
<bean:message key="disableself.jsp.account_deactivation" />
</rhn:toolbar>
<div class="page-summary">
diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
index 0bc17e1..427083e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
@@ -5,7 +5,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif">
+<rhn:toolbar base="h1" icon="icon-user">
<bean:message key="disableselfconfirm.jsp.warning_question" />
</rhn:toolbar>
<div class="page-summary">
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 1706861..f8cdf68 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
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif">
<bean:message key="filtercreate.jsp.header1" />
</rhn:toolbar>
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 0a34e3c..a67de42 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
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif">
<bean:message key="filteredit.jsp.header1" />
</rhn:toolbar>
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 953e00b..35da59e 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
@@ -7,7 +7,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
creationUrl="FilterCreate.do"
creationType="filter"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-notif">
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
index 875796a..ab7df8c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1"
img="/img/rhn-config_management.gif"
+ <rhn:toolbar base="h1" icon="icon-cog"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probe-create.jsp.header1"
arg0="${probeSuite.suiteName}" />
</rhn:toolbar>
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 68fdbbd..aaf183c 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
@@ -20,7 +20,7 @@
}
//-->
</script>
- <rhn:toolbar base="h1"
img="/img/rhn-config_management.gif"
+ <rhn:toolbar base="h1" icon="icon-cog"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probe-edit.jsp.header1"
arg0="${probe.description}"
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 aef9870..5ea078a 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
@@ -9,7 +9,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-config_management.gif"
+<rhn:toolbar base="h1" icon="icon-cog"
creationUrl="ProbeSuiteProbeCreate.do?suite_id=${suite_id}"
creationType="probe"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
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 4045e6e..f5c96e7 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
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuitecreate.jsp.header1" />
</rhn:toolbar>
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 72f7b8b..fde286f 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
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuiteedit.jsp.header1"
arg0="${probeSuite.suiteName}" />
</rhn:toolbar>
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 2eb7b6b..fef5805 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
@@ -9,7 +9,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
creationUrl="ProbeSuiteCreate.do"
creationType="probesuite"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
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 e21f045..eed3c55 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
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuitesremoveconfirm.jsp.header1"/>
</rhn:toolbar>
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 6946a90..b9ffc69 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
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
creationUrl="ProbeSuiteSystemsEdit.do?suite_id=${probeSuite.id}"
creationType="probesuitesystem"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
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 2ab7059..a437d55 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
@@ -7,7 +7,7 @@
<html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
+ <rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
helpUrl="/rhn/help/reference/en-US/s1-sm-monitor.jsp#s2-sm-monitor-psuites">
<bean:message key="probesuitesystemsedit.jsp.header1"
arg0="${probeSuite.suiteName}" />
</rhn:toolbar>
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 a242c3a..c1985d7 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
@@ -15,7 +15,7 @@ function setOrgClicked(target) {
</script>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 6e8cba8..493cb0b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
@@ -8,7 +8,7 @@
<head>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 827b5b8..c466791 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
@@ -8,7 +8,7 @@
<head>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 a333d66..1830b01 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
@@ -10,7 +10,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
index 767ab97..ef6dae6 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
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 d225e0c..c2e729350 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
@@ -7,7 +7,7 @@
<head>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
+<rhn:toolbar base="h1" icon="icon-desktop"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index df39e39..ad1e320 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -6,7 +6,7 @@
<html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+ <rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels"
deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}"
deletionAcl="user_role(satellite_admin);
formvar_exists(schid)"
deletionType="schedule">
diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
index 9506918..4c5bff2 100644
--- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
@@ -9,7 +9,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif"
+<rhn:toolbar base="h1" icon="icon-home"
imgAlt="channels.overview.toolbar.imgAlt"
creationUrl="/rhn/admin/ScheduleDetail.do"
creationType="schedule"
diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
index ad319bc..70ef0b0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif"
+<rhn:toolbar base="h1" icon="icon-home"
helpUrl="">
<bean:message key="task.status.title"/>
</rhn:toolbar>
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 1bea056..2d22e62 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-user-active"
creationUrl="/rhn/users/CreateUser.do?account_type=into_org"
creationType="user">
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 3457460..d296719 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt">
+<rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${targetuser.login}" />
</rhn:toolbar>
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 98d83e1..d870e07 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-deactivated"
creationUrl="/rhn/users/CreateUser.do?account_type=into_org"
creationType="user">
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 c2f328f..40c537a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt">
+<rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${targetuser.login}" />
</rhn:toolbar>
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 d2b96f5..e4d8aba 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
@@ -10,7 +10,7 @@
<meta name="name" value="Users" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
+<rhn:toolbar base="h1" icon="icon-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp">
<bean:message key="userconfirm.jsp.header" />
</rhn:toolbar>
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 fc002d8..eb4fb8a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s2-sm-users-all"
creationUrl="/rhn/users/CreateUser.do?account_type=into_org"
creationType="user">
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
index bb65df7..441a2e4 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
@@ -15,7 +15,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="auditsearch.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
index 18c43ef..a808c5e 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
@@ -15,7 +15,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="auditsearch.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
index 46f28b9..ffcd114 100644
--- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
@@ -13,7 +13,7 @@
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="audit.jsp.alt">
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="audit.jsp.alt">
<bean:message key="system.audit.listscap.jsp.overview"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
index 60767cd..f7ce1cb 100644
--- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="audit.overview.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/audit/overview.jsp
b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
index 239afbd..d581c8b 100644
--- a/java/code/webapp/WEB-INF/pages/audit/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="audit.jsp.alt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="audit.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s2-sm-system-overview.jsp">
<bean:message key="audit.overview.jsp.header"/>
</rhn:toolbar>
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 1a126a8..01fbdeb 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiff.jsp
@@ -10,7 +10,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
imgAlt="search.alt.img">
+<rhn:toolbar base="h1" icon="icon-search"
imgAlt="search.alt.img">
<bean:message key="scapdiff.jsp.toolbar"/>
</rhn:toolbar>
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 7d9fb77..1a33f68 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
@@ -21,7 +21,7 @@ div.differs {
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
imgAlt="search.alt.img">
+<rhn:toolbar base="h1" icon="icon-search"
imgAlt="search.alt.img">
<bean:message key="scapdiff.jsp.toolbar"/>
</rhn:toolbar>
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 10699dc..1e92221 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -23,7 +23,7 @@
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
imgAlt="search.alt.img">
+<rhn:toolbar base="h1" icon="icon-search"
imgAlt="search.alt.img">
<bean:message key="scapsearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp
b/java/code/webapp/WEB-INF/pages/channel/all.jsp
index f80a972..26cd8c1 100644
--- a/java/code/webapp/WEB-INF/pages/channel/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(4); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
imgAlt="channels.overview.toolbar.imgAlt"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp"
>
<bean:message key="channels.all.jsp.toolbar"/>
</rhn:toolbar>
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 dcf7721..a967c02 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
@@ -10,7 +10,7 @@
</head>
<body onLoad="onLoadStuff(3); showAllRows();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
imgAlt="channels.jsp.alt">
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.jsp.alt">
${requestScope.familyName}
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
index ca7822f..f1fc736 100644
--- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
@@ -11,7 +11,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-systems-entitlements"
imgAlt="channels.jsp.alt">
<bean:message key="entitlements.jsp.header"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
index efba69f..ac6c85f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
@@ -5,7 +5,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif">
+<rhn:toolbar base="h1"
icon="spacewalk-icon-software-channels">
<bean:message key="channel.delete.jsp.toolbar"
arg0="${channel.name}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index 3356638..a0780fb 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -23,7 +23,7 @@ document.getElementById("checksum").value =
baseChannelChecksums[document.getEle
}
</script>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}"
deletionAcl="user_role(channel_admin); formvar_exists(cid)"
deletionType="software.channel">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
index 1a2f3b9..64fec19 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
@@ -6,7 +6,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt"
creationUrl="/rhn/channels/manage/Edit.do"
creationType="channel"
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index 4cb6642..4415f53 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -10,7 +10,7 @@
<script type="text/javascript"
src="/javascript/highlander.js"></script>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
imgAlt="packagesearch.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="icon-search"
imgAlt="packagesearch.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-software-search">
<bean:message key="packagesearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/retired.jsp
b/java/code/webapp/WEB-INF/pages/channel/retired.jsp
index 5b72696..ffe9a5f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/retired.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/retired.jsp
@@ -17,7 +17,7 @@ function showFiltered() {
</head>
<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
imgAlt="channels.overview.toolbar.imgAlt">
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channels.retired.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/channel/shared.jsp
b/java/code/webapp/WEB-INF/pages/channel/shared.jsp
index 29bb4cd..d74e035 100644
--- a/java/code/webapp/WEB-INF/pages/channel/shared.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/shared.jsp
@@ -19,7 +19,7 @@ function showFiltered() {
<body onLoad="onLoadStuff(4); showFiltered();">
<rhn:toolbar
base="h1"
- img="/img/rhn-icon-channels.gif"
+ icon="spacewalk-icon-software-channels"
imgAlt="channels.overview.toolbar.imgAlt">
<bean:message key="channel.nav.shared"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
index 26faeff..aadc347 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
@@ -1,6 +1,6 @@
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif"
+<rhn:toolbar base="h1" icon="icon-key"
imgAlt="activation-keys.common.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-systems-activation-keys"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
index 004c334..a471235 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_header.jspf
@@ -1,6 +1,6 @@
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
imgAlt="channels.jsp.alt">
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="channels.jsp.alt">
<c:out value="${channel_name}" escapeXml="true"/>
</rhn:toolbar>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
index dfe216e..7b08071 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
@@ -1,4 +1,4 @@
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="overview.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-channel-manage"
deletionUrl="/rhn/channels/manage/Delete.do?cid=${cid}"
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 5c9f376..3e7b83d 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
@@ -3,7 +3,7 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
<html:xhtml/>
<rhn:toolbar base="h1"
- img="/img/rhn-icon-system_group.gif"
+ icon="spacewalk-icon-system-groups"
imgAlt="ssm.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm">
<bean:message key="ssm.jsp.header" />
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 3698327..a17b3fd 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
@@ -14,7 +14,7 @@
<c:set var="img" value="action-add.gif" />
</c:if>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
+<rhn:toolbar base="h1" icon="icon-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp#s3-sm-user-active-details"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
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 5da6529..b0dc83a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems"
>
<bean:message key="managedsystems.jsp.toolbar"/>
</rhn:toolbar>
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 b0ebef9..222fa73 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
@@ -11,7 +11,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-config_management.gif"
imgAlt="config.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="icon-cog"
imgAlt="config.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-overview"
>
<bean:message key="configoverview.jsp.toolbar"/>
</rhn:toolbar>
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 600324c..4efe5cc 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
@@ -8,7 +8,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-systems">
<bean:message key="targetsystems.jsp.toolbar" />
</rhn:toolbar>
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 091e078..aee619f 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
@@ -12,7 +12,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- img="/img/rhn-icon-system.gif"
+ icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="sdcdeployfile.jsp.header"
arg0="${system.name}"/>
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 9690d68..66c18c1 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" >
+<rhn:toolbar base="h2" icon="icon-desktop" >
<bean:message key="sdcdeployconfirm.jsp.header"/>
</rhn:toolbar>
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 7479c85..694480a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
@@ -13,7 +13,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- img="/img/rhn-icon-system.gif"
+ icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="sdcdifffile.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
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 de5bd3d..99dfb08 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
@@ -12,7 +12,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" >
+<rhn:toolbar base="h2" icon="icon-desktop" >
<bean:message key="sdcdiffconfirm.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
</rhn:toolbar>
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 bb13303..a4f1ff1 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
@@ -13,7 +13,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- img="/img/rhn-icon-system.gif"
+ icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="sdcimportfile.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
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 0086c71..d52f159 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@ -11,7 +11,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" >
+<rhn:toolbar base="h2" icon="icon-desktop" >
<bean:message key="sdcimportconfirm.jsp.header" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
index 18ccef7..162b00c 100644
--- a/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/credentials/delete.jsp
@@ -7,7 +7,7 @@
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account">
<bean:message key="credentials.jsp.delete.dispatch" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
index 400b244..ca31051 100644
--- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="users.jsp.imgAlt"
+ <rhn:toolbar base="h1" icon="icon-user"
imgAlt="users.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"
deletionUrl="/rhn/account/DeleteCredentials.do"
deletionType="credentials">
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 90258f8..96e8025 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -25,7 +25,7 @@
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
+<rhn:toolbar base="h1" icon="icon-search"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp#s2-sm-errata-search"
imgAlt="search.alt.img">
<bean:message key="erratasearch.jsp.toolbar"/>
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index 38c4f8b..98dca42 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -10,7 +10,7 @@
<script type="text/javascript"
src="/javascript/highlander.js"></script>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
imgAlt="docsearch.jsp.imgAlt"
+<rhn:toolbar base="h1" icon="icon-search"
imgAlt="docsearch.jsp.imgAlt"
helpUrl="">
<bean:message key="docsearch.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
index ad92142..93667d1 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
@@ -9,7 +9,7 @@
<meta name="name" value="activationkeys.jsp.header" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}"
deletionAcl="user_role(channel_admin); formvar_exists(cid)"
deletionType="software.channel">
diff --git a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
index 658a36a..cb83d49 100644
--- a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
@@ -9,7 +9,7 @@
<script src="/javascript/iso_download.js"
type="text/javascript"> </script>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
imgAlt="common.download.channelAlt">
+<rhn:toolbar base="h1" icon="spacewalk-icon-software-channels"
imgAlt="common.download.channelAlt">
<c:choose>
<c:when test="${empty channel}">
<decorator:getProperty property="meta.name" />
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
index 045c575..54f19f7 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
@@ -8,7 +8,7 @@
<html>
<body>
<rhn:toolbar base="h1"
- img="/img/rhn-icon-system_group.gif"
+ icon="spacewalk-icon-system-groups"
imgAlt="ssm.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm">
<bean:message key="ssm.jsp.header" />
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
index b077f80..324494d 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
@@ -8,7 +8,7 @@
<html>
<body>
<rhn:toolbar base="h1"
- img="/img/rhn-icon-system_group.gif"
+ icon="spacewalk-icon-system-groups"
imgAlt="ssm.jsp.imgAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-ssm">
<bean:message key="ssm.jsp.header" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 2444850..44a10c7 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="duplicates.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
index b7ee47b..e6f9e39 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
@@ -39,7 +39,7 @@
</script>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="duplicates.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
index 3abf1de..070474a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
@@ -7,7 +7,7 @@
<html:xhtml/>
<html>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="duplicates.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
index 7619ca2..c0d072d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none"/>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="overview.jsp.alt">
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="overview.jsp.alt">
<bean:message key="systementitlements.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
index b2b41a9..fb42ade 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
@@ -27,7 +27,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
index 6885cdc..a6bb28f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
@@ -14,7 +14,7 @@
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
<p/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
index 1a5ddc7..f393fb0 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
@@ -14,7 +14,7 @@
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
<p/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
index 9ce55e1..a63c62a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
@@ -13,7 +13,7 @@
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt">
+ <rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="virtualentitlements.toolbar" />
</rhn:toolbar>
<p/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
index e0ea646..05e8cf5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/extra-packages-systems-list.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
<bean:message key="extrapackagessystemslist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
index 0d5ac6b..a364cee 100644
--- a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system_group.gif"
imgAlt="system.common.groupAlt"
+<rhn:toolbar base="h1" icon="spacewalk-icon-system-groups"
imgAlt="system.common.groupAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list"
creationUrl="/rhn/groups/CreateGroup.do"
creationType="group"
diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
index 33774c9..440d9be 100644
--- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
<bean:message key="inactivelist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
index c451ec4..5baf16d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ood">
<bean:message key="outofdatelist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
index 89728cc..89d448d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="overview.jsp.alt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="overview.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-overview">
<bean:message key="overview.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
index ebf76a3..84832a2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp">
<bean:message key="systemlist.jsp.physicalheader"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
index e8c9e10..3e3d726 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
@@ -10,7 +10,7 @@
</head>
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
- <rhn:toolbar base="h2" img="/img/rhn-icon-system.gif">
+ <rhn:toolbar base="h2" icon="icon-desktop">
<bean:message key="probeedit.jsp.editprobe" />
</rhn:toolbar>
<html:form action="/systems/details/probes/ProbeCreate"
method="POST" styleClass="form-horizontal">
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 33208dd..7709bb7 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -12,7 +12,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<c:if test="${is_suite_probe}">
- <rhn:toolbar base="h2" img="/img/rhn-icon-system.gif"
+ <rhn:toolbar base="h2" icon="icon-desktop"
miscAlt="probedetails.jsp.editsuiteprobe"
miscImg="action-clone.gif"
miscUrl="/rhn/monitoring/config/ProbeSuiteProbeEdit.do?suite_id=${probe.templateProbe.probeSuite.id}&probe_id=${probe.templateProbe.id}"
@@ -23,7 +23,7 @@
</rhn:toolbar>
</c:if>
<c:if test="${not is_suite_probe}">
- <rhn:toolbar base="h2" img="/img/rhn-icon-system.gif"
+ <rhn:toolbar base="h2" icon="icon-desktop"
deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}"
deletionType="probe"
miscAlt="probedetails.jsp.editthisprobe"
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
index cf69df3..a268a03 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
@@ -24,7 +24,7 @@ function refreshNotifFields() {
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif"
+<rhn:toolbar base="h2" icon="icon-desktop"
deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}"
deletionType="probe">
<bean:message key="probeedit.jsp.editprobe" />
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
index 2ec3ee4..c01398d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
@@ -14,7 +14,7 @@
<body>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes"
+<rhn:toolbar base="h2" icon="icon-desktop"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s4-sm-system-details-probes"
creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}"
creationType="probe" >
<bean:message key="probes.index.jsp.toolbar"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
index 304554e..f4c9082 100644
--- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-proxy">
<bean:message key="proxylist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
index 226313e..2d945a4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
@@ -11,7 +11,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-list-rregistered">
<bean:message key="registeredlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
index d5cb310..afc2b79 100644
--- a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact">
<bean:message key="requiringrebootlist.jsp.header"/>
</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 b40949a..ff061ee 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
@@ -11,7 +11,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt">
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt">
<bean:message key="systemcurrency.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
index 0ee1b9e..7582149 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp">
<bean:message key="systemlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index 4f7f10b..46ce247 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -6,7 +6,7 @@
<html:html xhtml="true">
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-search.gif"
+ <rhn:toolbar base="h1" icon="icon-search"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-search"
imgAlt="search.alt.img">
<bean:message key="systemsearch.jsp.toolbar"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
index 0bc6837..08aa829 100644
--- a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-sstem-lists3-sm-system-list-unent">
<bean:message key="unentitledlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
index 5ad8f0e..4319e0c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
@@ -10,7 +10,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt"
+<rhn:toolbar base="h1" icon="icon-desktop"
imgAlt="system.common.systemAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-ungrp">
<bean:message key="ungroupedlist.jsp.header"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
index d4bfc38..5881a96 100644
--- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif"
+<rhn:toolbar base="h1" icon="icon-desktop"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-virtual">
<bean:message key="virtuallist.jsp.toolbar"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 35ad0d3..31d1a84 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -18,7 +18,7 @@
</c:if>
<c:if test="${account_type == 'into_org'}" >
- <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="user.common.userAlt"
+ <rhn:toolbar base="h1" icon="icon-user"
imgAlt="user.common.userAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-users.jsp">
<bean:message key="usercreate.toolbar" />
</rhn:toolbar>
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 327559c..b764a3d 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
@@ -7,7 +7,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
imgAlt="user.common.userAlt">
+ <rhn:toolbar base="h1" icon="icon-user"
imgAlt="user.common.userAlt">
<bean:message key="Addresses"/>
</rhn:toolbar>
<h2>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
index e99cb61..4372532 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
@@ -6,7 +6,7 @@
<html:xhtml/>
<html>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
+ <rhn:toolbar base="h1" icon="icon-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"
imgAlt="users.jsp.imgAlt">
<bean:message key="yourchangeemail.jsp.title"/>
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 717a50e..d3c6ced 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-users.gif"
+ <rhn:toolbar base="h1" icon="icon-user"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"
imgAlt="users.jsp.imgAlt">
<bean:message key="details.jsp.account_details" />
diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
index 2a689cb..b75a0cd 100644
--- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
+++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
@@ -34,7 +34,7 @@
</c:if>
</head>
<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif"
imgAlt="yourrhn.jsp.toolbar.img.alt"
+<rhn:toolbar base="h1" icon="icon-home"
imgAlt="yourrhn.jsp.toolbar.img.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp">
<bean:message key="yourrhn.jsp.toolbar"/>
</rhn:toolbar>
commit 1e95ed030945c0af84184038fc7b1363d54f50c8
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Thu Oct 17 15:07:45 2013 +0200
perl: port the toolbar
move the pull-right for the links to the css as a mixin (DRY)
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index c3ba95e..9845b43 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -464,6 +464,7 @@ h1 .icon-stack {
/* spacewalk toolbar */
.spacewalk-toolbar {
+ .pull-right;
padding: .5em 1em;
a {
border-right:1px solid @gray-light;
@@ -498,4 +499,4 @@ h1 .icon-stack {
/* btn with margin top and bottom */
.btn.spacewalk-btn-margin-vertical{
margin: 1em 0
-}
\ No newline at end of file
+}
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 2a204ba..109410a 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -476,7 +476,7 @@ public class ToolbarTag extends TagSupport {
baseTag.setAttribute("class", "spacewalk-toolbar-" +
getBase());
toolbarDivTag = new HtmlTag("div");
- toolbarDivTag.setAttribute("class", "spacewalk-toolbar
pull-right");
+ toolbarDivTag.setAttribute("class",
"spacewalk-toolbar");
buf.append(baseTag.renderOpenTag());
buf.append(toolbarDivTag.renderOpenTag());
diff --git a/web/modules/sniglets/Sniglets/HTML.pm
b/web/modules/sniglets/Sniglets/HTML.pm
index 681e9d2..4c162d2 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -77,6 +77,7 @@ sub toolbar {
my %params = @_;
my $img = '';
+ my $icon = '';
my $help = '';
my @toolbar;
my $base = $params{base};
@@ -87,7 +88,10 @@ sub toolbar {
$img = PXT::HTML->img(-src => $params{img},
-alt => $params{'alt'} || '');
}
-
+
+ if (defined $params{icon}) {
+ $icon= sprintf(qq{<i class="$params{icon}"></i>});
+ }
if (defined $params{'help-url'}) {
$help = rhn_help($pxt, (href => $params{'help-url'},
@@ -106,6 +110,10 @@ sub toolbar {
img => $params{'misc-img'},
alt => $params{'misc-alt'},
text => $params{'misc-text'}));
+ } elsif (defined $params{'misc-icon'} and $acl->eval_acl($pxt,
$params{'misc-acl'} || '')) {
+ push @toolbar, misc_link($pxt, (url => $params{'misc-url'},
+ img => $params{'misc-icon'},
+ text => $params{'misc-text'}));
}
if (defined $params{'creation-url'} and $acl->eval_acl($pxt,
$params{'creation-acl'} || '')) {
@@ -119,28 +127,33 @@ sub toolbar {
my $toolbar = join(" | ", @toolbar);
- return qq{<div class="toolbar-$base"><div
class="toolbar">$toolbar</div>$img
$params{__block__}$help</div>};
+ return qq{<div class="spacewalk-toolbar-$base"><div
class="spacewalk-toolbar">$toolbar</div>$img $icon
$params{__block__}$help</div>};
}
sub creation_link {
my $pxt = shift;
my %params = @_;
- return qq{<span class="toolbar"><a
href="$params{url}"><img src="/img/action-add.gif"
alt="create new $params{type}" title="add new $params{type}"
/>create new $params{type}</a></span>};
+ return qq{<a href="$params{url}"><i
class="icon-plus"></i>create new $params{type}</a>};
}
sub deletion_link {
my $pxt = shift;
my %params = @_;
- return qq{<span class="toolbar"><a
href="$params{url}"><img src="/img/action-del.gif"
alt="delete $params{type}" title="delete $params{type}" />delete
$params{type}</a></span>};
+ return qq{<a href="$params{url}"><i
class="icon-trash"></i>delete $params{type}</a>};
}
sub misc_link {
my $pxt = shift;
my %params = @_;
- return qq{<span class="toolbar"><a
href="$params{url}"><img src="$params{img}"
alt="$params{'alt'}" title="$params{'alt'}"
/>$params{text}</a></span>};
+ if (defined $params{icon}) {
+ return qq{<a href="$params{url}"><i
class="$params{icon}"></i>$params{text}</a>};
+ }
+ else {
+ return qq{<a href="$params{url}"><img src="$params{img}"
alt="$params{'alt'}" title="$params{'alt'}"
/>$params{text}</a>};
+ }
}
sub rhn_help {
commit bece236170ccefbc1dca12b9846b9413b22a6d2a
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Thu Oct 17 15:06:44 2013 +0200
port content-nav in perl
diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm
b/web/modules/sniglets/Sniglets/Navi/Style.pm
index 79b3022..7ace754 100644
--- a/web/modules/sniglets/Sniglets/Navi/Style.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Style.pm
@@ -160,7 +160,7 @@ sub recursive_type {
sub pre_nav {
my $self = shift;
- return qq{\n<div class="content-nav">};
+ return qq{\n<div class="spacewalk-content-nav">};
}
sub post_nav {
@@ -179,19 +179,10 @@ sub pre_level {
my $level_style = $self->level_style($level);
if ($level_style) {
- $ret = qq{\n<ul class="$level_style">}
+ $ret = qq{\n<ul class="nav nav-tabs $level_style">}
}
else {
- $ret = qq{\n<ul>};
- }
-
- if ($level == 1) {
-
- $ret = sprintf("%s%s",<<EOQ, $ret);
-<div class="contentnav-row2">
-<div class="top"></div>
-<div class="bottom">
-EOQ
+ $ret = qq{\n<ul class="nav nav-tabs">};
}
return $ret;
@@ -203,41 +194,17 @@ sub post_level {
my $ret = "</ul>\n";
- if ((defined $depth) and ($depth == 1)) {
- $ret .= "\n</div>\n</div>\n";
- }
-
return $ret;
}
-sub level_style {
- my $class = shift;
- my $level = shift;
-
- if ($level == 0) {
- return "content-nav-rowone";
- }
- elsif ($level == 1) {
- return "content-nav-rowtwo";
- }
- elsif ($level == 2) {
- return "content-nav-rowthree";
- }
-}
-
sub item_style_active {
- return "content-nav-selected";
+ return "active";
}
sub item_style_type {
return "class";
}
-sub link_style_active {
- return "content-nav-selected-link";
-}
-
-
package Sniglets::Navi::Style::sidenav;
use base qw/Sniglets::Navi::Style::ul/;
commit 7420a6b964ee48bc59160fd6d71f37fef98e92f9
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Thu Oct 17 15:03:53 2013 +0200
paddings deleted from header
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 9083d7e..c3ba95e 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -19,10 +19,12 @@
.make-row(0);
.spacewalk-logo {
.make-md-column(3);
+ padding-left: 0;
}
.spacewalk-header-links {
.make-md-column(9);
.text-right;
+ padding-right: 0;
}
}
commit da826ae24ba5221fd04e28a77323b6e2329bb516
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Thu Oct 17 15:02:19 2013 +0200
Language files changed: they have the style of Vew System Groups inside
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index df6e355..92af70f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>সিস্টেমের আইকন</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>সিস্টেম (<a
href="/rhn/systems/Overview.do?showgroups=true">সিস্টেম দল
প্রদর্শন</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> সিস্টেম দল
প্রদর্শন </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 1c6d391..1016dc4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -5402,11 +5402,11 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der
Standardorganisation.</
<target>System-Icon</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>Systeme (<a
href="/rhn/systems/Overview.do?showgroups=true">Systemgruppen
ansehen</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> Systemgruppen
ansehen </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 42392f6..9ed783a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -4705,7 +4705,7 @@ value for this entitlement, excluding the default organization's
consumption.</s
</context-group>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index bbc8416..97bcc51 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -5401,11 +5401,11 @@ para este derecho, excluyendo el consumo de la organización
predeterminada.</ta
<target>Icono de Sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>Sistemas (<a
href="/rhn/systems/Overview.do?showgroups=true">Ver grupos de
sistemas</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> Ver grupos de
sistemas </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index aaa819a..00736e2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -5402,11 +5402,11 @@ pour ce droit d'accès, moins la consommation par défaut de
l'organisation.</ta
<target>Icône Système</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>Systèmes (<a
href="/rhn/systems/Overview.do?showgroups=true">Afficher les groupes de
systèmes</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> Afficher les
groupes de systèmes </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 017fde5..0fafdd7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>સિસ્ટમ ચિહ્ન</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>સિસ્ટમો (<a
href="/rhn/systems/Overview.do?showgroups=true">સિસ્ટમ જૂથો
જુઓ</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> સિસ્ટમ જૂથો જુઓ
</div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 292e29c..f3f6577 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>सिस्टम प्रतीक चिह्न</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>सिस्टम (<a
href="/rhn/systems/Overview.do?showgroups=true">सिस्टम समूह
देखें</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> सिस्टम समूह
देखें </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index a272a79..167bea4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>Icona sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>Sistemi (<a
href="/rhn/systems/Overview.do?showgroups=true">Visualizza Gruppi di
sistemi</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> Visualizza
Gruppi di sistemi </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 4e49029..32e8748 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -5403,11 +5403,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>システムアイコン</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>システム (<a
href="/rhn/systems/Overview.do?showgroups=true">システムグループの表示</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> システムグループの表示
</div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index a70ff43..cd89ec4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -5400,11 +5400,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>시스템 아이콘</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>시스템 (<a
href="/rhn/systems/Overview.do?showgroups=true">시스템 그룹
보기</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> 시스템 그룹 보기
</div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 32c084b..bc200d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>ਸਿਸਟਮ ਆਈਕਾਨ</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>ਸਿਸਟਮ (<a
href="/rhn/systems/Overview.do?showgroups=true">ਸਿਸਟਮ ਗਰੁੱਪ
ਵੇਖਾਓ</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> ਸਿਸਟਮ ਗਰੁੱਪ
ਵੇਖਾਓ </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index a913255..3f7b69d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -5399,11 +5399,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>Ícone Sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>Sistemas (<a
href="/rhn/systems/Overview.do?showgroups=true">Ver Grupos de
Sistemas</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> Ver Grupos de
Sistemas </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index c664474..93e8bb9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>Значок системы</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>Системы (<a
href="/rhn/systems/Overview.do?showgroups=true">Группы
систем</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> Группы систем
</div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index 20426ee..95478bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>கணினி சின்னம்</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>கணினிகள் (<a
href="/rhn/systems/Overview.do?showgroups=true">கணினி குழுக்களை
பார்வையிடுதல்</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> கணினி குழுக்களை
பார்வையிடுதல் </div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index d3ad636..cc0bf29 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>系统图标</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>系统(<a
href="/rhn/systems/Overview.do?showgroups=true">查看系统组群</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> 查看系统组群
</div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index b026ccb..4810545 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default
organization's consumption.</s
<target>系統圖示</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source>Systems (<a
href="/rhn/systems/Overview.do?showgroups=true">View System
Groups</a>)</source>
+ <source><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> View System
Groups </div> </a></source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target>系統(<a
href="/rhn/systems/Overview.do?showgroups=true">檢視系統群組</a>)</target>
+ <target><a
href="/rhn/systems/Overview.do?showgroups=true"> <div
class="btn btn-default spacewalk-btn-margin-vertical"> <i
class="spacewalk-icon-system-groups"> </i> 檢視系統群組
</div> </a></target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a
href="/rhn/systems/Overview.do?showgroups=false">View
Systems</a>)</source>
commit 8b5e882e8297c867e9a128c57cd187767d21dd4f
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Oct 17 14:45:55 2013 +0200
Support development mode also for perl pages
Needs Sniglets::Users, because rhn-require is defined there.
diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt
index 10f24b1..7bd0ee7 100644
--- a/branding/templates/header.pxt
+++ b/branding/templates/header.pxt
@@ -1,15 +1,22 @@
<pxt-passthrough>
<head>
<pxt-use class="Sniglets::Navi" />
+ <pxt-use class="Sniglets::Users" />
<title><rhn-navi-page-title /></title>
<link rel="shortcut icon" href="/img/favicon.ico" />
<link rel="stylesheet"
href="/fonts/font-awesome/css/font-awesome.css" />
<link rel="stylesheet"
href="/fonts/font-spacewalk/css/spacewalk-font.css" />
- <link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
- <script type="text/javascript">less = { env: 'development'
};</script>
- <script src="/javascript/less.js"></script>
+ <rhn-require acl="global_config(development_environment)">
+ <link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
+ <script type="text/javascript">less = { env: 'development'
};</script>
+ <script src="/javascript/less.js"></script>
+ </rhn-require>
+ <rhn-require acl="not global_config(development_environment)">
+ <link rel="stylesheet"
href="/fonts/font-spacewalk/css/spacewalk.css" />
+ </rhn-require>
+
<script src="/javascript/jquery.js"></script>
<script src="/javascript/bootstrap.js"></script>
<script src="/javascript/spacewalk-essentials.js"></script>
commit 649a8a663b756a224cba367e80014e925ce9ef88
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Thu Oct 17 14:16:21 2013 +0200
New styles applied to the main objects in System Overview
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 b0d1638..7e602ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -594,7 +594,7 @@ public class ListDisplayTag extends BodyTagSupport {
page.append("&" + request.getQueryString());
}
out.println("<div class=\"spacewalk-csv-download
text-right\"><a href=\"" + page +
- "\"><i
class=\"icon-download-alt\"></i>" +
+ "\"><i
class=\"spacewalk-icon-download-csv\"></i>" +
LocalizationService.getInstance().getMessage("listdisplay.csv")
+
"</a></div>");
}
@@ -663,7 +663,7 @@ public class ListDisplayTag extends BodyTagSupport {
btnSpan.setAttribute("class", "input-group-btn");
HtmlTag btn = new HtmlTag("button");
- btn.setAttribute("class", "btn btn-default icon-filter");
+ btn.setAttribute("class", "btn btn-default icon-eye-open");
btn.setAttribute("type", "submit");
btn.setAttribute("name", FILTER_DISPATCH);
//input.setAttribute("value",
ls.getMessage(RequestContext.FILTER_KEY));
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 3d5202a..2a204ba 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -533,14 +533,22 @@ public class ToolbarTag extends TagSupport {
HtmlTag tag = new HtmlTag("a");
tag.setAttribute("href", getHelpUrl());
tag.setAttribute("target", "_new");
- tag.setAttribute("class", "help-title");
-
- HtmlTag i = new HtmlTag("i");
- i.setAttribute("class", "icon-question text-info");
-
- tag.addBody(i.renderOpenTag());
- tag.addBody(i.renderCloseTag());
-
+ //tag.setAttribute("class", "help-title");
+
+ HtmlTag stack = new HtmlTag("span");
+ stack.setAttribute("class", "icon-stack");
+
+ HtmlTag iBack = new HtmlTag("i");
+ iBack.setAttribute("class", "icon-circle
icon-stack-base");
+ HtmlTag iFront = new HtmlTag("i");
+ iFront.setAttribute("class", "icon-question
icon-light");
+
+ stack.addBody(iBack.renderOpenTag());
+ stack.addBody(iBack.renderCloseTag());
+ stack.addBody(iFront.renderOpenTag());
+ stack.addBody(iFront.renderCloseTag());
+
+ tag.addBody(stack);
return tag.render();
}
return "";
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
index f5f9378..0e729a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/CSVTag.java
@@ -197,7 +197,7 @@ public class CSVTag extends BodyTagSupport {
StringBuffer page = new StringBuffer(CSV_DOWNLOAD_URI);
page.append("?" + makeCSVRequestParams());
String exportLink = new String("<div class=\"spacewalk-csv-download
text-right\"><a href=\"" +
- page + "\"><i
class=\"icon-download-alt\"></i>" +
+ page + "\"><i
class=\"spacewalk-icon-download-csv\"></i>" +
LocalizationService.getInstance().getMessage(
"listdisplay.csv") +
"</a></div>");
ListTagUtil.write(pageContext, exportLink);
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 1b796f5..be4a0c5 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
@@ -483,14 +483,14 @@ public class ListTag extends BodyTagSupport {
ListTagUtil.write(pageContext, "<div class=\"filter-input
row\">");
// column with the filter
- ListTagUtil.write(pageContext, "<div class=\"col-md-4
text-left\">");
+ ListTagUtil.write(pageContext, "<div class=\"col-md-3
text-left\">");
if (filter != null && manip.getUnfilteredDataSize() != 0) {
ListTagUtil.renderFilterUI(pageContext, filter,
getUniqueName(), width, columnCount,
searchParent, searchChild);
}
ListTagUtil.write(pageContext, "</div>");
- ListTagUtil.write(pageContext, "<div class=\"col-md-8
text-right\">");
+ ListTagUtil.write(pageContext, "<div class=\"col-md-9
text-right\">");
if (!isEmpty()) {
for (ListDecorator dec : getDecorators()) {
dec.beforeTopPagination();
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index dfd31ee..f907f8b 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -691,7 +691,7 @@ public class ListTagUtil {
));
sb.append("<span class=\"input-group-btn\">");
sb.append(String.format("<button value=\"%s\"
type=\"submit\" name=\"%s\" " +
- " class=\"btn btn-default\"><i
class=\"icon-filter\"></i>",
+ " class=\"btn btn-default
spacewalk-button-filter\"><i
class=\"icon-eye-open\"></i>",
ls.getMessage(RequestContext.FILTER_KEY),
filterName));
sb.append("</button>");
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 4acef1c..67bae47 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
@@ -51,8 +51,8 @@
</rl:list>
<span class="full-width-note-right">
- <a href="/rhn/systems/SystemGroupList.do">
- <bean:message key="yourrhn.jsp.allgroups" />
+ <a href="/rhn/systems/SystemGroupList.do">
+ <div class="btn btn-default
spacewalk-btn-margin-vertical"><bean:message
key="yourrhn.jsp.allgroups" /></div>
</a>
</span>
diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
index 4e92fd7..89728cc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
@@ -20,7 +20,7 @@
<rhn:csrf />
<rhn:submitted />
<c:if test="${not groups}">
- <h2><bean:message key="overview.jsp.systems"/></h2>
+ <bean:message key="overview.jsp.systems"/>
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
</c:if>
commit 2a8f3377b772614cd2100a1de2ffb4cddd6c2fd2
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Thu Oct 17 14:14:02 2013 +0200
Less re-organized
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index be91789..9083d7e 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -149,9 +149,17 @@ i[class^="icon-"],
i[class*=" icon-"],
i[class*="spacewalk-icon"],
i[class^="spacewalk-icon"] {
- margin-right: .5em;
+ margin-right: .5em;
+}
+/* if the icon is inside a H tag we wont use a margin*/
+h1, h2, h3, h4, h5, h6{
+ i[class^="icon-"],
+ i[class*=" icon-"],
+ i[class*="spacewalk-icon"],
+ i[class^="spacewalk-icon"] {
+ margin-right: 0;
+ }
}
-
/* color for icon */
.spacewalk-icon-green {
color: @spacewalk-updates-green
@@ -403,22 +411,16 @@ aside .sideleg {
padding: .5em 1em;
border-radius: 4px;
margin: 2em auto;
- font-size: 1em
-}
-aside .sideleg:hover {
- background: @spacewalk-blue;
-}
-aside .sideleg:hover h4, aside .sideleg:hover li {
- color: #fff
-}
-aside .sideleg li {
- list-style: none;
- margin: 1em 0;
- padding:0;
-}
-aside .sideleg ul {
- margin: 0;
- padding: 0
+ font-size: 1em;
+ li {
+ list-style: none;
+ margin: 1em 0;
+ padding:0;
+ }
+ ul {
+ margin: 0;
+ padding: 0
+ }
}
@@ -429,13 +431,13 @@ aside .sideleg ul {
background: @gray-lighter;
margin-top: 2em;
margin-bottom:2em;
- padding: 1.5em
-}
-#loginForm label {
- text-align: left;
- .Roboto-thin;
- color: @gray;
- font-size: 1.1em
+ padding: 1.5em;
+ label {
+ text-align: left;
+ .Roboto-thin;
+ color: @gray;
+ font-size: 1.1em
+ }
}
#loginForm+.col-md-6.col-md-offset-3.text-left {
@@ -460,17 +462,17 @@ h1 .icon-stack {
/* spacewalk toolbar */
.spacewalk-toolbar {
- padding: .5em 1em
-}
-.spacewalk-toolbar>a {
- border-right:1px solid @gray-light;
- padding: 0 .5em
-}
-.spacewalk-toolbar>a:hover {
- text-decoration: none;
-}
-.spacewalk-toolbar>a:last-child {
- border-right:0
+ padding: .5em 1em;
+ a {
+ border-right:1px solid @gray-light;
+ padding: 0 .5em
+ }
+ a:hover {
+ text-decoration: none;
+ }
+ a:last-child {
+ border-right:0
+ }
}
/* systems selected tool*/
@@ -491,3 +493,7 @@ h1 .icon-stack {
.spacewalk-content-nav .nav.nav-tabs li.active a {
background: #dddddd;
}
+/* btn with margin top and bottom */
+.btn.spacewalk-btn-margin-vertical{
+ margin: 1em 0
+}
\ No newline at end of file
diff --git a/branding/css/theme.less b/branding/css/theme.less
index b4b81a6..e98dc8d 100644
--- a/branding/css/theme.less
+++ b/branding/css/theme.less
@@ -1,20 +1,48 @@
-.pagination > li > a, .pagination > li > span{
- border-top: 1px solid #dddddd;
+//PAGINATOR from 0 - 9 and A - Z
+
+.spacewalk-alphabar{
border-bottom: 1px solid #dddddd;
- border-left: 0;
- border-right: 0
-}
-.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{
- border-left: 1px solid #dddddd;
- padding-left: 8px;
+ margin-bottom: .8em;
+ .pagination{
+ margin: .8em 0
+ }
+ .pagination > li > a, .pagination > li > span{
+ border-top: 1px solid #dddddd;
+ border-bottom: 1px solid #dddddd;
+ border-left: 0;
+ border-right: 0;
+ }
+ .pagination-sm > li:first-child > a, .pagination-sm > li:first-child >
span{
+ border-left: 1px solid #dddddd;
+ padding-left: 8px;
+ }
+ .pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{
+ border-right: 1px solid #dddddd;
+ padding-right: 8px;
+ }
+ .pagination-sm > li > a, .pagination-sm > li > span{
+ padding: 4px 6px;
+ }
+ .pagination-sm > li:nth-child(11) > a{
+ border-left: 1px solid #dddddd;
+ padding-left: 10px;
+ }
+ .pagination-sm > li:nth-child(10) > a{
+ padding-right: 10px;
+ }
}
-.pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{
- border-right: 1px solid #dddddd;
- padding-right: 8px
-}
-.pagination-sm > li > a, .pagination-sm > li > span{
- padding: 4px 6px;
+
+// Filter by system button besides the input search
+.spacewalk-button-filter{
+ border-left: 0;
+ color: #666666;
+ background-color: #ffffff;
+ border-color: #cccccc;
}
-.pagination-sm > li:nth-child(11) > a{
- border-left: 1px solid #dddddd;
+
+//Table's filters
+.filter-input{
+ .col-md-3{
+ padding-left: 0;
+ }
}
\ No newline at end of file
commit c49078595311aec2a7402ea7878dcec488f70092
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Thu Oct 17 14:12:58 2013 +0200
Legends titles and colour changed
diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
index 9576041..7675aa2 100644
--- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
@@ -1,7 +1,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<div class="sideleg">
- <h2><bean:message key="errata-legend.jsp.title"/></h2>
+ <h4><bean:message key="errata-legend.jsp.title"/></h4>
<ul>
<li><i class="icon-shield"></i><bean:message
key="errata-legend.jsp.security"/></li>
<li><i class="icon-bug"></i><bean:message
key="errata-legend.jsp.bugfix"/></li>
diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
index 5cf4e56..b1c5173 100644
--- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
@@ -1,7 +1,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<div class="sideleg">
- <h2><bean:message
key="probes-list-legend.jsp.title"/></h2>
+ <h4><bean:message
key="probes-list-legend.jsp.title"/></h4>
<ul>
<li><i class="spacewalk-icon-health
spacewalk-icon-green"></i>
<bean:message key="probes-list-legend.jsp.ok"/>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
index 93740fd..29c1eeb 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
@@ -1,7 +1,7 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<div class="sideleg">
- <h2><bean:message
key="system-group-legend.jsp.title"/></h2>
+ <h4><bean:message
key="system-group-legend.jsp.title"/></h4>
<ul>
<li><i class="icon-ok-sign"></i><bean:message
key="system-group-legend.jsp.fully"/></li>
<li><i class="icon-exclamation-sign"></i><bean:message
key="system-group-legend.jsp.updates"/></li>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
index d927ab8..1fa91aa 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
@@ -2,7 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
- <h2><bean:message key="system-legend.jsp.title"/></h2>
+ <h4><bean:message key="system-legend.jsp.title"/></h4>
<ul>
<li><i class="icon-ok-sign"></i><bean:message
key="system-legend.jsp.fully"/></li>
<li><i class="icon-exclamation-sign"></i><bean:message
key="system-legend.jsp.critical"/></li>
diff --git a/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp
index 1c4e13f..6013106 100644
--- a/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/xccdf-legend.jsp
@@ -2,7 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
-<h2><bean:message
key="system.audit.listscap.jsp.legend"/></h2>
+<h4><bean:message
key="system.audit.listscap.jsp.legend"/></h4>
<ul>
<li><bean:message key="system.audit.listscap.jsp.pass.abb"/> -
<bean:message key="system.audit.listscap.jsp.pass"/></li>
diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
index f77b744..b88aa79 100644
--- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
@@ -2,7 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
- <h2><bean:message key="yourrhn-legend.jsp.title" /></h2>
+ <h4><bean:message key="yourrhn-legend.jsp.title" /></h4>
<ul>
<li><i class="icon-ok-sign"></i><bean:message
key="system-legend.jsp.fully" /></li>
<li><i class="icon-exclamation-sign"></i><bean:message
key="system-legend.jsp.critical" /></li>
@@ -12,7 +12,7 @@
<li><i
class="spacewalk-icon-locked-system"></i><bean:message
key="system-legend.jsp.locked" /></li>
</rhn:require>
<rhn:require acl="org_entitlement(rhn_provisioning)">
- <li><i
class="spacewalk-icon-autoinstalling"></i><bean:message
key="system-legend.jsp.kickstarting" /></li>
+ <li><i class="icon-rocket"></i><bean:message
key="system-legend.jsp.kickstarting" /></li>
</rhn:require>
<li><i class="icon-time"></i><bean:message
key="system-legend.jsp.pending" /></li>
<li><i class="icon-remove-circle"></i><bean:message
key="yourrhn-legend.jsp.failedactions" /></li>
commit 536741353b8c73c0a55b39a7cd99a5c6be031adc
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Thu Oct 17 12:38:44 2013 +0200
I had already renamed clearbtn to clear-btn in the css
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index 899eb9c..7e26247 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -84,7 +84,7 @@
<span id="header_selcount">
<rhn:setdisplay user="${requestScope.session.user}" />
</span>
- <a id="clearbtn" class="button"
href="/rhn/ssm/index.do">
+ <a id="clear-btn" class="button"
href="/rhn/ssm/index.do">
<bean:message key="manage"/>
</a>
<%--
diff --git a/web/include/network/components/status_bar/ssm.pxi
b/web/include/network/components/status_bar/ssm.pxi
index 4723974..4fd4c49 100644
--- a/web/include/network/components/status_bar/ssm.pxi
+++ b/web/include/network/components/status_bar/ssm.pxi
@@ -11,7 +11,7 @@
<!--span id="spacewalk-ssm-counter"
class="badge">0</span>systems selected</span-->
</span>
- <a id="clearbtn" class="button"
href="/rhn/ssm/index.do">
+ <a id="clear-btn" class="button"
href="/rhn/ssm/index.do">
Manage
</a>
<rhn-return-link default="/network">
commit 18f79d28bc8e21a10bfb3875d49a8ea1306c6f64
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Thu Oct 17 12:35:08 2013 +0200
Fix the System Set counter in the Perl pages.
Had to rename the spacewalk-ssm-counter class to
spacewalk-set-$name-counter, because perl has a common
code to render the html for all sets.
diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt
index 996a711..5e742a9 100644
--- a/branding/templates/c.pxt
+++ b/branding/templates/c.pxt
@@ -73,8 +73,11 @@
</div>
</div>
- <pxt-include-late file="/network/components/status_bar/main.pxi"
/>
- <rhn-navi-nav depth="0" style="spacewalk-main-nav"/>
+ <nav class="navbar navbar-inverse spacewalk-main-nav"
role="navigation">
+ <rhn-navi-nav depth="0" style="spacewalk-main-nav"/>
+ <pxt-include-late file="/network/components/status_bar/main.pxi"
/>
+ </nav>
+
</header>
<div class="spacewalk-main-column-layout">
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 b2bfd20..91b70d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java
@@ -103,7 +103,7 @@ public class DWRItemSelector {
Boolean systemsRelated = RhnSetDecl.SYSTEMS.getLabel().equals(setLabel);
if (systemsRelated) {
StringBuffer headerMessage = new StringBuffer();
- headerMessage.append("<span id='spacewalk-ssm-counter'
class='badge'>");
+ headerMessage.append("<span
id='spacewalk-set-system_list-counter' class='badge'>");
headerMessage.append(Integer.toString(setSize));
headerMessage.append("</span>");
if (setSize == 1) {
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 df5344e..281a854 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/SystemSetDisplayTag.java
@@ -54,7 +54,7 @@ public class SystemSetDisplayTag extends TagSupport {
size = rs.size();
}
StringBuilder result = new StringBuilder();
- result.append("<span id=\"spacewalk-ssm-counter\"
class=\"badge\">");
+ result.append("<span
id=\"spacewalk-set-system_list-counter\" class=\"badge\">");
result.append(Integer.toString(size));
result.append("</span>");
String msgKey;
diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js
index 7e0cfc5..c40c74e 100644
--- a/web/html/javascript/check_all.js
+++ b/web/html/javascript/check_all.js
@@ -206,7 +206,7 @@ function pageResponse(data) {
// the function we call to read the number of systems selected and hide/show the toolbar
function updateSsmToolbarOpacity() {
- var systemsSpan = $("#spacewalk-ssm-counter").text();
+ var systemsSpan = $("#spacewalk-set-system_list-counter").text();
if (systemsSpan == 0){
diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm
b/web/modules/sniglets/Sniglets/Navi/Style.pm
index 7591243..79b3022 100644
--- a/web/modules/sniglets/Sniglets/Navi/Style.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Style.pm
@@ -307,18 +307,6 @@ sub post_level {
return "</ul>";
}
-sub pre_nav {
- my $self = shift;
- my $pxt = shift;
- return qq{\n<nav class="navbar navbar-inverse spacewalk-main-nav"
role="navigation">};
-}
-
-sub post_nav {
- my $self = shift;
- my $pxt = shift;
- return qq{\n</nav>};
-}
-
#sub item_style_active {
# return "current";
#}
diff --git a/web/modules/sniglets/Sniglets/Sets.pm
b/web/modules/sniglets/Sniglets/Sets.pm
index a6a4c81..28045b1 100644
--- a/web/modules/sniglets/Sniglets/Sets.pm
+++ b/web/modules/sniglets/Sniglets/Sets.pm
@@ -36,13 +36,17 @@ sub set_totals {
if ($params{set}) {
if ($params{noun}) {
- return sprintf("%s %s%s selected",
- $sets{$params{set}} || "No",
+
+ return sprintf(qq{<span id="spacewalk-set-%s-counter"
class="badge">%s</span> %s%s selected},
+ $params{set},
+ $sets{$params{set}} || "0",
$params{noun},
((not exists $sets{$params{set}}) || $sets{$params{set}} > 1) ? "s" :
"");
}
else {
- return sprintf "%d", $sets{$params{set}} || 0;
+ return sprintf(qq{<span id="spacewalk-set-%s-counter"
class="badge">%s</span>},
+ $params{set},
+ $sets{$params{set}} || "0");
}
}
commit e4131fa072a48c2f4a3a588743890a75dc4d73c8
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Oct 17 12:17:12 2013 +0200
Make overview legend heading the same size as the other legends
diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
index 4520f92..f77b744 100644
--- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
@@ -2,7 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
- <h4><bean:message key="yourrhn-legend.jsp.title" /></h4>
+ <h2><bean:message key="yourrhn-legend.jsp.title" /></h2>
<ul>
<li><i class="icon-ok-sign"></i><bean:message
key="system-legend.jsp.fully" /></li>
<li><i class="icon-exclamation-sign"></i><bean:message
key="system-legend.jsp.critical" /></li>
commit 7c80ef1d6143c6b5dd7f94bb8867d374e2a78721
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Oct 16 23:05:51 2013 +0200
initial port of the perl pages to the new layout/css
Only interesting change is in web/modules/sniglets/Sniglets/Navi.pm
where the css class name hyphens are changed to underscores as the
css class name is used then as a perl package dynamically to call
functions there.
diff --git a/branding/styles/navbar_bottom.txt b/branding/styles/navbar_bottom.txt
deleted file mode 100644
index be52768..0000000
--- a/branding/styles/navbar_bottom.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-</div><!-- end mainNavWrap -->
-</div><!-- end navWrap -->
diff --git a/branding/styles/navbar_top.txt b/branding/styles/navbar_top.txt
deleted file mode 100644
index cb8cd30..0000000
--- a/branding/styles/navbar_top.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-
-<pxt-use class="Sniglets::Header" />
-
-<div id="utility">
- <div id="utilityLinks">
-<p id="linx"><span
class="hide"><strong>Shortcuts:</strong> </span><a
-href="http://kbase.redhat.com/">Knowledgebase</a> <span
-class="navPipe">|</span> <a
href="rhn/">Documentation</a></p>
- </div>
- <div id="utilityAccount">
-<rhn-display-login>
- <p>
- <span class="label">User:</span> <a
-href="/rhn/account/UserDetails.do">[login]</a><span
-class="navPipe">|</span>
- <span class="label">Organization:</span>
<a>[org]</a><span class="navPipe">|</span>
-<a href="/rhn/account/UserPreferences.do">Preferences</a><span
-class="navPipe">|</span><a
href="/rhn/Logout.do"><span>Sign Out</span></a>
-
- </p>
-</rhn-display-login>
- </div>
-
-</div>
-
-<div id="header">
- <a
href="http://www.redhat.com/" title="Visit
redhat.com for more
information about Red Hat products and services"><img
src="/img/logo_header_rh.gif" alt="Red Hat" width="37"
height="31" id="rhLogo" /></a><a href="/"
title="Red Hat homepage"><img src="/img/logo_header_network.gif"
alt="Red Hat" width="164" height="31" id="rhnLogo"
/></a>
- <div id="searchbar">
- <form name="form1" action="/rhn/Search.do"
method="get">
- <select name="search_type">
-
- <option value="systems">Systems</option>
-
- <option value="packages">Packages</option>
- <option value="errata">Errata</option>
- <option value="docs">Documentation</option>
- </select><input type="text" name="search_string"
maxlength="40"
-size="20" accesskey="4" autofocus="autofocus"/>
-
- <input type="hidden" name="submitted"
value="true"/>
- <input type="submit" class="button" name="image-1"
value="Search"
-align="top" /></form>
- </div>
-
-</div>
-<div id="navWrap"/>
-<div id="mainNavWrap"/>
-
-</pxt-passthrough>
diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt
index 77540f1..996a711 100644
--- a/branding/templates/c.pxt
+++ b/branding/templates/c.pxt
@@ -1,54 +1,111 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE HTML>
<pxt-passthrough>
<pxt-use class="Sniglets::Users" />
<pxt-use class="Sniglets::HTML" />
<pxt-use class="Grail::Frame" />
<pxt-use class="Sniglets::Navi" />
+ <pxt-use class="Sniglets::Header" />
-<html
xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
lang="en">
+<html lang="en">
<pxt-include-late file="/templates/header.pxt" />
- <body><div class="wrap" id="top-wrap">
- <rhn-navi-nav depth="0" style="topnav"/>
- <pxt-include-late file="/network/components/status_bar/main.pxi" />
- </div>
- <div class="wrap" id="bottom-wrap">
- <div id="content">
- <table width="100%" cellspacing="0">
- <tr>
- <td class="sidebar">
- <grail-canvas mode="left_menu_canvas">
- <rhn-navi-nav depth="1" style="sidenav"/>
- </grail-canvas>
- <grail-canvas mode="legend_canvas">
- </grail-canvas>
-
- <rhn-require acl="global_config(chat_enabled)">
- <br/>
- <a href="http://webchat.freenode.net?channels=#spacewalk"
target="_blank">
- <img src="/img/chat.png" alt=""/>
- </a>
- </rhn-require>
-
- </td>
- <td class="page-content" width="100%">
-<pxt-include-late file="/network/components/message_queues/site.pxi" />
-
-<grail-early-canvas mode="main_canvas">
-</grail-early-canvas>
-
- </td>
- </tr>
- </table>
-
- <pxt-include-late file="/templates/footer.pxt" />
- <pxt-include-late file="/templates/profile.pxt" />
-
- </div> <!-- close content -->
- </div> <!-- close wrap -->
+ <body>
+ <div class="spacewalk-top-wrap">
+ <header>
+ <div class="spacewalk-header-container">
+ <div id="logo" class="spacewalk-logo">
+ <a
href="http://www.spacewalkproject.org/" title="Visit
http://www.spacewalkproject.org/ for more information">
+ <img src="/img/logo_vendor.png" alt="Spacewalk
project" id="rhLogo" />
+ </a>
+ <a href="/" title="Spacewalk homepage">
+ <img src="/img/logo_product.png" alt="Spacewalk"
id="rhnLogo" accesskey="2"/>
+ </a>
+ </div>
+
+ <div class="spacewalk-header-links">
+ <ul class="nav nav-pills">
+ <li><a
href="/rhn/account/LocalePreferences.do">English
(change)</a></li>
+ </ul>
+ <ul class="nav nav-pills">
+ <li><a
href="http://kbase.redhat.com/">Knowledgebase</a></...
+ <li><a
href="/help">Documentation</a></li>
+ </ul>
+
+ <rhn-display-login>
+ <ul class="nav nav-pills">
+ <li>
+ <a href="/rhn/account/UserDetails.do"><i
class="icon-user"></i>[login]</a>
+ </li>
+ <li>
+ <a><i
class="icon-sitemap"></i>[org]</a>
+ </li>
+ <li>
+ <a href="/rhn/account/UserPreferences.do"><i
class="icon-cogs"></i></a>
+ </li>
+ <li>
+ <a href="/rhn/Logout.do"><i
class="icon-signout"></i></a>
+ </li>
+ </ul>
+ </rhn-display-login>
+
+ <form name="form1" class="form-inline hidden-xs"
role="form" action="/rhn/Search.do" method="get">
+ <div class="form-group">
+ <select name="search_type" class="form-control
input-sm">
+
+ <option value="systems">Systems</option>
+
+ <option value="packages">Packages</option>
+ <option value="errata">Errata</option>
+ <option value="docs">Documentation</option>
+ </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="Search"
/>
+ </div>
+ <div class="form-group">
+ <input type="hidden" name="submitted"
value="true" />
+ <button type="submit" class="btn btn-info
input-sm">
+ <i class="icon-search"></i>
+ </button>
+ </div>
+ </form>
+ </div>
+ </div>
+
+ <pxt-include-late file="/network/components/status_bar/main.pxi"
/>
+ <rhn-navi-nav depth="0" style="spacewalk-main-nav"/>
+ </header>
+ <div class="spacewalk-main-column-layout">
+
+ <aside id="spacewalk-aside">
+ <grail-canvas mode="left_menu_canvas">
+ <rhn-navi-nav depth="1" style="sidenav"/>
+ </grail-canvas>
+ <grail-canvas mode="legend_canvas">
+ </grail-canvas>
+
+ <rhn-require acl="global_config(chat_enabled)">
+ <a href="http://webchat.freenode.net?channels=#spacewalk"
target="_blank">
+ <img src="/img/chat.png" alt=""/>
+ </a>
+ </rhn-require>
+ </aside>
+
+ <section id="spacewalk-content">
+ <pxt-include-late
file="/network/components/message_queues/site.pxi" />
+ <grail-early-canvas mode="main_canvas">
+ </grail-early-canvas>
+ </section>
+ </div>
+
+ </div>
+ <footer>
+ <pxt-include-late file="/templates/footer.pxt" />
+ <pxt-include-late file="/templates/profile.pxt" />
+ </footer>
</body>
-</html>
+ </pxt-passthrough>
+
-</pxt-passthrough>
diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt
index fca438a..7ee1502 100644
--- a/branding/templates/footer.pxt
+++ b/branding/templates/footer.pxt
@@ -2,10 +2,15 @@
<pxt-passthrough>
<pxt-use class="Sniglets::Users" />
- <div id="footer">
- Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a
href="https://www.redhat.com/legal/privacy_statement.html">P...
statement</a> : <a
href="http://www.redhat.com/legal/legal_statement.html"
accesskey="8">Legal statement</a> : <a
href="http://www.redhat.com/">redhat.com</a>
- <div style="color: black">
- Spacewalk release <a
href="/rhn/help/dispatcher/release_notes"><pxt-config
var="version" /></a>
- </div>
- </div>
+<div>
+</div>
+<div>
+ Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a
href="https://www.redhat.com/legal/privacy_statement.html">P...
statement</a> : <a
href="http://www.redhat.com/legal/legal_statement.html"
accesskey="8">Legal statement</a> : <a
href="http://www.redhat.com/">redhat.com</a>
+<div style="color: black">
+ Spacewalk release <a
href="/rhn/help/dispatcher/release_notes"><pxt-config
var="version" /></a>
+</div>
+</div>
+<div>
+ <img src="/img/logo_vendor.png" />
+</div>
</pxt-passthrough>
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index 7434987..217b58c 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -42,7 +42,7 @@
</section>
</div>
</div>
- <footer class="row">
+ <footer>
<jsp:include page="/WEB-INF/includes/footer.jsp" />
</footer>
</body>
diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp
b/java/code/webapp/WEB-INF/includes/footer.jsp
index e740d86..bf7a7ed 100644
--- a/java/code/webapp/WEB-INF/includes/footer.jsp
+++ b/java/code/webapp/WEB-INF/includes/footer.jsp
@@ -2,9 +2,9 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<div class="col-xs-2">
+<div>
</div>
-<div class="col-xs-8 text-center">
+<div>
<bean:message key="footer.jsp.copyright" />
<a
href="https://www.redhat.com/legal/privacy_statement.html">&...
key="footer.jsp.privacyStatement" /></a>
: <a
href="http://www.redhat.com/legal/legal_statement.html"><...
key="footer.jsp.legalStatement" /></a>
@@ -16,7 +16,7 @@
<p><c:out value="${custom_footer}" escapeXml="false"
/></p>
</c:if>
</div>
-<div class="col-xs-2 text-right">
+<div>
<img src="/img/logo_vendor.png" />
</div>
diff --git a/web/include/network/components/status_bar/ssm.pxi
b/web/include/network/components/status_bar/ssm.pxi
index d76aa2a..4723974 100644
--- a/web/include/network/components/status_bar/ssm.pxi
+++ b/web/include/network/components/status_bar/ssm.pxi
@@ -4,16 +4,19 @@
<pxt-use class="Sniglets::Lists" />
<pxt-use class="Sniglets::HTML" />
-<div>
-<rhn-require acl="user_authenticated();
org_entitlement(sw_mgr_enterprise)">
- <span id="header_selcount"><rhn-set-totals
set="system_list" noun="system"/></span>
+<div class="spacewalk-bar pull-right">
+ <rhn-require acl="user_authenticated();
org_entitlement(sw_mgr_enterprise)">
+ <span id="header_selcount">
+ <rhn-set-totals set="system_list" noun="system"/>
+ <!--span id="spacewalk-ssm-counter"
class="badge">0</span>systems selected</span-->
+ </span>
- <a class="button"
href="/rhn/ssm/index.do">Manage</a>
-
-<rhn-return-link default="/network">
- <a class="button"
href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
-</rhn-return-link>
-
-</rhn-require>
+ <a id="clearbtn" class="button"
href="/rhn/ssm/index.do">
+ Manage
+ </a>
+ <rhn-return-link default="/network">
+ <a class="button"
href="/rhn/systems/Overview.do?empty_set=true&set_label=system_list&return_url={return_url}">Clear</a>
+ </rhn-return-link>
+ </rhn-require>
</div>
-</pxt-passthrough>
+</pxt-passthrough>
\ No newline at end of file
diff --git a/web/modules/sniglets/Sniglets/Navi.pm
b/web/modules/sniglets/Sniglets/Navi.pm
index 95ec229..6420081 100644
--- a/web/modules/sniglets/Sniglets/Navi.pm
+++ b/web/modules/sniglets/Sniglets/Navi.pm
@@ -92,7 +92,13 @@ sub navi_nav {
}
my $tree = Sniglets::Navi->load_tree($file);
- my $style = new Sniglets::Navi::Style($params{style});
+
+ # the style is used as a perl package name so
+ # remove the hyphens
+ my $ns = $params{style};
+ $ns =~ s/[\-]/_/g;
+
+ my $style = new Sniglets::Navi::Style($ns);
my $prefix = $tree->label;
$prefix = "${prefix}_";
diff --git a/web/modules/sniglets/Sniglets/Navi/Style.pm
b/web/modules/sniglets/Sniglets/Navi/Style.pm
index b1429dc..7591243 100644
--- a/web/modules/sniglets/Sniglets/Navi/Style.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Style.pm
@@ -238,21 +238,19 @@ sub link_style_active {
}
-
-
package Sniglets::Navi::Style::sidenav;
use base qw/Sniglets::Navi::Style::ul/;
-sub pre_nav { return qq{\n<div id="sidenavp">} }
-sub post_nav { return qq{\n</div>\n} }
+sub pre_nav { return qq{\n<nav id="sidenav">} }
+sub post_nav { return qq{\n</nav>\n} }
-sub pre_level { return '<ul>' }
+sub pre_level { return qq{\n<ul class="nav nav-pills nav-stacked">\n} }
sub post_level { return '</ul>' }
sub level_style { return "sidenav" }
sub item_style { return "" }
-sub item_style_active { return "sidenav-selected" }
+sub item_style_active { return "active" }
sub item_style_type { return "class" }
sub link_style {
@@ -263,7 +261,7 @@ sub link_style_active {
}
-package Sniglets::Navi::Style::topnav;
+package Sniglets::Navi::Style::spacewalk_main_nav;
use base qw/Sniglets::Navi::Style::ul/;
sub item_style_type { return 'id' }
@@ -285,24 +283,8 @@ sub pre_item {
my $item_style_type = $self->item_style_type($level);
my $item_style;
- if ($sibling_count == 1) {
- if ($active) {
- $item_style = "mainFirst-active";
- }
- else {
- $item_style = "mainFirst";
- }
- }
- elsif ($sibling_count == $num_siblings) {
- if ($active) {
- $item_style = "mainLast-active";
- }
- else {
- $item_style = "mainLast";
- }
- }
- elsif ($active) {
- $item_style = "main-active";
+ if ($active) {
+ $item_style = "active";
}
if ($item_style) {
@@ -318,7 +300,7 @@ sub post_item {
sub pre_level {
- return "<ul>";
+ return qq{<ul class="nav navbar-nav">};
}
sub post_level {
@@ -328,15 +310,13 @@ sub post_level {
sub pre_nav {
my $self = shift;
my $pxt = shift;
-
- return $pxt->include(-file => "/nav/styles/navbar_top_sat.txt");
+ return qq{\n<nav class="navbar navbar-inverse spacewalk-main-nav"
role="navigation">};
}
sub post_nav {
my $self = shift;
my $pxt = shift;
-
- return $pxt->include(-file => "/nav/styles/navbar_bottom.txt", -raw
=> 1);
+ return qq{\n</nav>};
}
#sub item_style_active {
@@ -353,21 +333,10 @@ sub render_link {
my $active = shift;
my $depth = shift;
- # what number am i...
- my $sibling_count = shift;
- # ... out of ...
- my $num_siblings = shift;
-
my $css_style;
# if ($self->link_style($depth) or $self->link_style_active($depth)) {
# $css_style = $active ? $self->link_style_active($depth) :
$self->link_style($depth);
# }
- if ($sibling_count == 1) {
- $css_style = "mainFirstLink";
- }
- elsif ($sibling_count == $num_siblings) {
- $css_style = "mainLastLink";
- }
my $url = $node->urls->[0] || '';
my $tree_formvars = $tree->formvars;
commit b717b3dcdfc1943393cd126e435f7a8ab789abde
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Oct 16 15:30:00 2013 +0200
use make-row(0) for no margin instead of a hack
make the footer semantic instead of class names
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 6175464..be91789 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -16,7 +16,7 @@
/* basic layout */
.spacewalk-header-container {
- .make-row();
+ .make-row(0);
.spacewalk-logo {
.make-md-column(3);
}
@@ -27,7 +27,7 @@
}
.spacewalk-main-column-layout {
- .make-row();
+ .make-row(0);
overflow: hidden;
min-height: 100%;
aside {
@@ -38,7 +38,6 @@
}
}
-
/* Main HTML5 tags defined for the theme */
body {
background: #f7f7f7;
@@ -57,7 +56,21 @@ footer {
font-weight: normal;
font-size: 0.9em;
height: 80px;
- clear: both
+ clear: both;
+
+ .make-row(0);
+
+ div:nth-child(1) {
+ .make-xs-column(2);
+ }
+ div:nth-child(2) {
+ .make-xs-column(8);
+ .text-center;
+ }
+ div:nth-child(3) {
+ .make-xs-column(2);
+ .text-right;
+ }
}
section {
@@ -78,7 +91,7 @@ h2 {
.spacewalk-main-column-layout {
/* override the grid row margin */
- margin-right: 0;
+ margin-right: 0;
margin-left: 0;
aside {
background: #eeeeee;
@@ -100,8 +113,8 @@ h2 {
padding-bottom: 3em;
/* some animation */
transition: width 2s, height 2s, transform 2s;
- -webkit-transition: width 2s, height 2s, -webkit-transform 2s;
- }
+ -webkit-transition: width 2s, height 2s, -webkit-transform 2s;
+ }
}
/* glow and shadow for text */
@@ -152,13 +165,14 @@ i[class^="spacewalk-icon"] {
.spacewalk-icon-blue {
color: @spacewalk-enhancement-blue
}
-/* header style */
-header .row {
- margin: 0 1em
-}
-/* undo the padding the grid columns give */
header {
+
+ .spacewalk-header-container {
+ margin: 0 1em;
+ }
+
+ /* undo the padding the grid columns give */
&#spacewalk-header {
padding-right: 0;
padding-left: 0
@@ -184,12 +198,12 @@ header {
font-weight: normal;
letter-spacing: normal;
}
-
+
.nav-pills li > a:hover {
background: none;
text-decoration: underline;
}
-
+
ul.nav-pills:nth-child(1) {
background: #000;
}
@@ -262,9 +276,9 @@ header {
/* fixing margin issue in Bootstrap 3 */
@media (min-width: 768px) {
- .row {
- margin-right: 0;
- margin-left: 0;
+ .row {
+ margin-right: 0;
+ margin-left: 0;
}
}
@@ -334,9 +348,9 @@ header {
background: @spacewalk-list-first-submenu;
border-bottom: 1px solid #ccc;
}
- ul>ul li.active,
- ul>ul li.active:hover,
- ul>ul li.active a,
+ ul>ul li.active,
+ ul>ul li.active:hover,
+ ul>ul li.active a,
ul>ul li.active a:hover {
background: @spacewalk-list-first-submenu-active;
.glow-text-deleted;
@@ -354,9 +368,9 @@ header {
background: @spacewalk-list-second-submenu;
border-bottom: 1px solid #bbb;
}
- ul>ul>ul li.active,
- ul>ul>ul li.active:hover,
- ul>ul>ul li.active a,
+ ul>ul>ul li.active,
+ ul>ul>ul li.active:hover,
+ ul>ul>ul li.active a,
ul>ul>ul li.active a:hover {
background: @spacewalk-list-second-submenu-active;
.glow-text-deleted;
commit 56c2800b80c88d21b4bd7d71a8274273451169ce
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 15 22:25:51 2013 +0200
don't use grid classes as selectors
diff --git a/web/html/javascript/spacewalk-essentials.js
b/web/html/javascript/spacewalk-essentials.js
index 975fb56..edbe24b 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -33,7 +33,7 @@ $(window).load(function () {
// On window resize
$(window).resize( function () {
- $("section.col-md-10").css("padding-bottom", "");
+ $(".spacewalk-main-column-layout section").css("padding-bottom",
"");
columnHeight();
});
@@ -42,11 +42,11 @@ function columnHeight() {
//Only if the screen size is higher than the max-width set up in the Variables.less
under the definition @screen-md:
//PLEASE: update this if you change the content of @screen-md
if ($(document).width()>992) {
- var sectionHeight = $("section.col-md-10").outerHeight();
+ var sectionHeight = $(".spacewalk-main-column-layout
section").outerHeight();
var heightDoc = $(document).height();
// Column heights should equal the document height minus the header height and footer
height
var newHeight = heightDoc - 160 - sectionHeight + "px";
- $("section.col-md-10").css("padding-bottom", newHeight);
+ $(".spacewalk-main-column-layout section").css("padding-bottom",
newHeight);
};
};
commit f87e46c28cb4be6588a6519dd4d6a54438867549
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 15 22:22:46 2013 +0200
typo, missing $
diff --git a/web/html/javascript/spacewalk-essentials.js
b/web/html/javascript/spacewalk-essentials.js
index a04dcb9..975fb56 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -7,7 +7,7 @@ $(document).on("ready", function(){
$("#sidenav li.active").each(function() {
$(this).next("ul").show(300);
});
-
+
/* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is
pressed or when
no system is selected */
@@ -24,7 +24,6 @@ $(document).on("ready", function(){
}
// See if there is a system already selected as soon as the page loads
updateSsmToolbarOpacity();
-
});
/* Getting the screen size to create a fixed padding-bottom in the Section tag to make
both columns the same size */
// On window load
commit e437fc7456763d28e2fcc2204253e3321d595477
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 15 22:01:06 2013 +0200
.wrap is not global, does not include footer: rename wrap -> spacewalk-top-wrap
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 84a1f8c..6175464 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -116,7 +116,7 @@ h2 {
}
/* fixing the footer to the bottom */
-.wrap {
+.spacewalk-top-wrap {
overflow: hidden;
margin-bottom: -80px;
padding-bottom: 80px;
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index cf030c3..7434987 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -14,7 +14,7 @@
<decorator:head />
</head>
<body onload="<decorator:getProperty property="body.onload"
/>">
- <div class="wrap">
+ <div class="spacewalk-top-wrap">
<header>
<jsp:include page="/WEB-INF/includes/header.jsp" />
</header>
commit b02746507da5dbae250cbc7ddcedf5e5693999cd
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 15 21:53:14 2013 +0200
include the right js/less in the perl pages
diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt
index afb5d34..10f24b1 100644
--- a/branding/templates/header.pxt
+++ b/branding/templates/header.pxt
@@ -3,15 +3,18 @@
<pxt-use class="Sniglets::Navi" />
<title><rhn-navi-page-title /></title>
<link rel="shortcut icon" href="/img/favicon.ico" />
- <link rel="stylesheet"
href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.cs...
type="text/css" />
- <style>
- .nav-stacked ul {
- margin-left: 15px !important;
- }
- </style>
+
+ <link rel="stylesheet"
href="/fonts/font-awesome/css/font-awesome.css" />
+ <link rel="stylesheet"
href="/fonts/font-spacewalk/css/spacewalk-font.css" />
+ <link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
+
+ <script type="text/javascript">less = { env: 'development'
};</script>
+ <script src="/javascript/less.js"></script>
+ <script src="/javascript/jquery.js"></script>
+ <script src="/javascript/bootstrap.js"></script>
+ <script src="/javascript/spacewalk-essentials.js"></script>
+
</head>
- <script src="/javascript/prototype-1.6.0.js"></script>
- <script
src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js&q...
type="text/javascript"></script>
<script src="/javascript/check_all.js"
type="text/javascript"></script>
</pxt-passthrough>
commit 3f8193cc5bbf2057f39fe28f3b3323b262812fa4
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 16 17:47:59 2013 +0200
Fix channel_tree.js in case of no channels available
diff --git a/web/html/javascript/channel_tree.js b/web/html/javascript/channel_tree.js
index 8d01acf..acc8a19 100644
--- a/web/html/javascript/channel_tree.js
+++ b/web/html/javascript/channel_tree.js
@@ -16,9 +16,11 @@ browserType = is_ie;
function onLoadStuff(columns) {
columnsPerRow = columns;
var channelTable = document.getElementById('channel-list');
- createParentRows(channelTable, rowHash);
- reuniteChildrenWithParents(channelTable, rowHash);
- iconifyChildlessParents(rowHash);
+ if (channelTable) {
+ createParentRows(channelTable, rowHash);
+ reuniteChildrenWithParents(channelTable, rowHash);
+ iconifyChildlessParents(rowHash);
+ }
}
function iconifyChildlessParents(rowHash) {
commit 15d273557b47dc90b729d06576079649ce8caea6
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 16 16:52:29 2013 +0200
Go back to loading check_all.js in <head>
Apparently loading it in the footer is not enough, actually I would say
this script needs to be refactored.
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index 0f0832f..b2decfe 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -41,6 +41,7 @@
<script src="/javascript/jquery.js"></script>
<script src="/javascript/bootstrap.js"></script>
<script src="/javascript/spacewalk-essentials.js"></script>
+ <script src="/javascript/check_all.js"></script>
<script src="/rhn/dwr/engine.js"></script>
<script src="/rhn/dwr/util.js"></script>
commit 00c1a8351c9d76df2acceb2630b94f794e65449d
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Wed Oct 16 16:47:21 2013 +0200
paginator styled and icon fixed in systems legend
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index a373522..84a1f8c 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -11,7 +11,8 @@
@import url(mixins.less);
/*Import of Tables style*/
@import url(tables.less);
-
+/* Import of the Theme */
+@import url(theme.less);
/* basic layout */
.spacewalk-header-container {
@@ -388,7 +389,7 @@ aside .sideleg {
padding: .5em 1em;
border-radius: 4px;
margin: 2em auto;
- font-size: .8em
+ font-size: 1em
}
aside .sideleg:hover {
background: @spacewalk-blue;
diff --git a/branding/css/theme.less b/branding/css/theme.less
new file mode 100644
index 0000000..b4b81a6
--- /dev/null
+++ b/branding/css/theme.less
@@ -0,0 +1,20 @@
+.pagination > li > a, .pagination > li > span{
+ border-top: 1px solid #dddddd;
+ border-bottom: 1px solid #dddddd;
+ border-left: 0;
+ border-right: 0
+}
+.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span{
+ border-left: 1px solid #dddddd;
+ padding-left: 8px;
+}
+.pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span{
+ border-right: 1px solid #dddddd;
+ padding-right: 8px
+}
+.pagination-sm > li > a, .pagination-sm > li > span{
+ padding: 4px 6px;
+}
+.pagination-sm > li:nth-child(11) > a{
+ border-left: 1px solid #dddddd;
+}
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
index 7aa0be7..d927ab8 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
@@ -12,7 +12,7 @@
<li><i
class="spacewalk-icon-locked-system"></i><bean:message
key="system-legend.jsp.locked"/></li>
</rhn:require>
<rhn:require acl="org_entitlement(rhn_provisioning)">
- <li><img src="/img/icon_kickstart_session.gif" alt=""
/><bean:message key="system-legend.jsp.kickstarting"/></li>
+ <li><i class="icon-rocket"></i><bean:message
key="system-legend.jsp.kickstarting"/></li>
</rhn:require>
<li><i class="icon-time"></i><bean:message
key="system-legend.jsp.pending"/></li>
<li><i
class="spacewalk-icon-Unentitled"></i><bean:message
key="system-legend.jsp.unentitled"/></li>
commit b0eec2f68f3ca6c5c6cc95028a6d8fbbeb377493
Author: Bo Maryniuk <bo(a)suse.de>
Date: Wed Oct 16 16:24:22 2013 +0200
TB3: Admin/Task Schedules/Schedule task form
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index d214234..df39e39 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -5,126 +5,124 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
%>
<html>
-<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
- deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}"
- deletionAcl="user_role(satellite_admin); formvar_exists(schid)"
- deletionType="schedule">
- <bean:message key="schedule.edit.jsp.toolbar"
arg0="${schedulename}"/>
-</rhn:toolbar>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+
deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}"
+ deletionAcl="user_role(satellite_admin);
formvar_exists(schid)"
+ deletionType="schedule">
+ <bean:message key="schedule.edit.jsp.toolbar"
arg0="${schedulename}"/>
+ </rhn:toolbar>
+ <html:form action="/admin/ScheduleDetail"
styleClass="form-horizontal">
+ <rhn:csrf/>
+ <h2><bean:message
key="schedule.edit.jsp.basicscheduledetails"/></h2>
+ <p>
+ <c:if test="${empty param.schid or active}">
+ <bean:message
key="schedule.edit.jsp.introparagraph"/>
+ </c:if>
+ <c:if test="${not empty param.schid and not active}">
+ <bean:message key="schedule.edit.jsp.notactive"/>
+ </c:if>
+ </p>
-<div>
- <html:form action="/admin/ScheduleDetail">
- <rhn:csrf/>
+ <div class="form-group">
+ <label for="joblabel" class="col-lg-3
control-label">
+ <rhn:required-field key="schedule.edit.jsp.name"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.schid}'>
+ <html:text property="schedulename"
maxlength="256"
+ styleClass="form-control"
+ size="48" styleId="name"/>
+ </c:when>
+ <c:otherwise>
+ <div class="form-control">
+ <c:out value="${schedulename}"/>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="bunch" class="col-lg-3
control-label">
+ <rhn:required-field key="schedule.edit.jsp.bunch"/>:
+ </label>
+ <div class="col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.schid}'>
+ <html:select property="bunch"
styleClass="form-control">
+ <html:options collection="bunches"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ </c:when>
+ <c:otherwise>
+ <a
href="/rhn/admin/BunchDetail.do?label=${bunch}" class="btn
btn-default">${bunch}</a>
+ </c:otherwise>
+ </c:choose>
+ <html:hidden property="bunch" value="${bunch}"
/>
+ </div>
+ </div>
- <h2><bean:message
key="schedule.edit.jsp.basicscheduledetails"/></h2>
- <div class="page-summary">
- <c:if test="${empty param.schid or active}">
- <bean:message key="schedule.edit.jsp.introparagraph"/>
- </c:if>
- <c:if test="${not empty param.schid and not active}">
- <bean:message key="schedule.edit.jsp.notactive"/>
- </c:if>
- </div>
-
- <br/>
-
- <table class="details">
- <tr>
- <th nowrap="nowrap">
- <label for="joblabel"><rhn:required-field
key="schedule.edit.jsp.name"/>:</label>
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test='${empty param.schid}'>
- <html:text property="schedulename" maxlength="256"
size="48" styleId="name"/>
- </c:when>
- <c:otherwise>
- <c:out value="${schedulename}"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <th nowrap="nowrap">
- <label for="bunch"><rhn:required-field
key="schedule.edit.jsp.bunch"/>:</label>
- </th>
- <td class="small-form">
- <c:choose>
- <c:when test='${empty param.schid}'>
- <html:select property="bunch" >
- <html:options collection="bunches"
- property="value"
- labelProperty="label" />
- </html:select>
- </c:when>
- <c:otherwise>
- <a
href="/rhn/admin/BunchDetail.do?label=${bunch}">${bunch}</a>
- </c:otherwise>
- </c:choose>
- <html:hidden property="bunch" value="${bunch}" />
- </td>
- </tr>
- <c:if test="${empty param.schid or active}">
- <tr>
- <th nowrap="nowrap">
- <label for="parent"><bean:message
key="schedule.edit.jsp.frequency"/>:</label>
- </th>
- <td class="small-form">
- <jsp:include
page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </c:if>
- <c:if test="${not active}">
- <c:if test="${cron}">
- <tr>
- <th nowrap="nowrap">
- <bean:message key="schedule.edit.jsp.frequency"/>
- </th>
- <td class="small-form">
- <c:out value="${cronexpr}"/>
- </td>
- </tr>
- </c:if>
- <c:if test='${not empty param.schid}'>
- <tr>
- <th nowrap="nowrap">
- <bean:message key="schedule.edit.jsp.activetill"/>:
- </th>
- <td class="small-form">
- <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z"
value="${activetill}"/>
- </td>
- </tr>
- </c:if>
- </c:if>
- </table>
-
- <div align="right">
- <hr />
- <c:choose>
- <c:when test='${empty param.schid}'>
- <html:submit property="create_button">
- <bean:message key="schedule.edit.jsp.createschedule"/>
- </html:submit>
- </c:when>
- <c:otherwise>
- <c:if test="${active}">
- <html:submit property="edit_button">
- <bean:message key="schedule.edit.jsp.editschedule"/>
- </html:submit>
+ <c:if test="${empty param.schid or active}">
+ <div class="form-group">
+ <label for="parent" class="col-lg-3
control-label">
+ <bean:message
key="schedule.edit.jsp.frequency"/>:
+ </label>
+ <div class="">
+ <jsp:include
page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf">
+ <jsp:param name="widget"
value="date"/>
+ </jsp:include>
+ </div>
+ </div>
</c:if>
- </c:otherwise>
- </c:choose>
- </div>
-
- <html:hidden property="submitted" value="true" />
- <c:if test='${not empty param.schid}'>
- <html:hidden property="schid" value="${param.schid}" />
- </c:if>
-</html:form>
-</div>
+ <c:if test="${not active}">
+ <c:if test="${cron}">
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="schedule.edit.jsp.frequency"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="form-control">
+ <c:out value="${cronexpr}"/>
+ </div>
+ </div>
+ </div>
+ </c:if>
+ <c:if test='${not empty param.schid}'>
+ <div class="form-group">
+ <label class="col-lg-3 control-label">
+ <bean:message
key="schedule.edit.jsp.activetill"/>:
+ </label>
+ <div class="col-lg-6">
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss
z" value="${activetill}"/>
+ </div>
+ </div>
+ </c:if>
+ </c:if>
-</body>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.schid}'>
+ <html:submit property="create_button"
styleClass="btn btn-success">
+ <bean:message
key="schedule.edit.jsp.createschedule"/>
+ </html:submit>
+ </c:when>
+ <c:otherwise>
+ <c:if test="${active}">
+ <html:submit property="edit_button"
styleClass="btn btn-success">
+ <bean:message
key="schedule.edit.jsp.editschedule"/>
+ </html:submit>
+ </c:if>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <html:hidden property="submitted" value="true"
/>
+ <c:if test='${not empty param.schid}'>
+ <html:hidden property="schid"
value="${param.schid}" />
+ </c:if>
+ </html:form>
+ </body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
index 8093e4e..4267433 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
@@ -4,20 +4,23 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-
-<select name='${picker.name}_${timeName}_hour' size="1">
-<c:forEach var="hourLabel" begin="0" end="23">
- <option <c:if test="${picker.hourLong ==
hourLabel}">selected="selected"</c:if>
value='${hourLabel}'>${hourLabel}</option>
-</c:forEach>
-</select>:<select name='${picker.name}_${timeName}_minute'
size="1">
-<c:forEach var="minLabel" begin="0" end="9">
- <option <c:if test="${minLabel ==
picker.minuteLong}">selected="selected"</c:if>
value='${minLabel}'>
- 0${minLabel}
- </option>
-</c:forEach>
-<c:forEach var="minLabel" begin="10" end="59">
- <option <c:if test="${minLabel ==
picker.minuteLong}">selected="selected"</c:if>
value='${minLabel}'>
- ${minLabel}
- </option>
-</c:forEach>
-</select>
\ No newline at end of file
+<div class="input-group">
+ <select name='${picker.name}_${timeName}_hour' size="1"
class="form-control">
+ <c:forEach var="hourLabel" begin="0"
end="23">
+ <option <c:if test="${picker.hourLong ==
hourLabel}">selected="selected"</c:if>
value='${hourLabel}'>${hourLabel}</option>
+ </c:forEach>
+ </select>
+ <strong class="input-group-addon">:</strong>
+ <select name='${picker.name}_${timeName}_minute' size="1"
class="form-control">
+ <c:forEach var="minLabel" begin="0" end="9">
+ <option <c:if test="${minLabel ==
picker.minuteLong}">selected="selected"</c:if>
value='${minLabel}'>
+ 0${minLabel}
+ </option>
+ </c:forEach>
+ <c:forEach var="minLabel" begin="10"
end="59">
+ <option <c:if test="${minLabel ==
picker.minuteLong}">selected="selected"</c:if>
value='${minLabel}'>
+ ${minLabel}
+ </option>
+ </c:forEach>
+ </select>
+</div>
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
index ce6ed6b..fc5fff0 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
@@ -3,64 +3,104 @@
<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-
<c:set value="${requestScope[param.widget]}" var="picker"/>
-<bean:message key="schedule.header"/><br/><br/>
-
-
-
-<input type="radio" name="${picker.name}_status"
value="disabled" id="disabled"
- <c:if test="${picker.status ==
'disabled'}">checked="true"</c:if> />
- <label for="disabled"><bean:message
key="schedule.disabled"/></label>
-<br/>
-
-<input type="radio" name="${picker.name}_status"
value="daily" id="daily"
-<c:if test="${picker.status ==
'daily'}">checked="true"</c:if> />
- <label for="daily"><bean:message
key="schedule.daily"/>:
-
- <c:set var="timeName" value="daily" />
- <%@ include
file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
- </label>
- <br/>
-
-<input type="radio" name="${picker.name}_status"
value="weekly" id="weekly"
-<c:if test="${picker.status ==
'weekly'}">checked="true"</c:if> />
- <label for="weekly"><bean:message
key="schedule.weekly"/>:
- <bean:message key="schedule.weekly.every"/>
- <select name='${picker.name}_day_week' size="1">
- <c:forEach var="day" begin="0" end="6">
- <option <c:if test="${picker.dayNames[day] eq
picker.dayOfWeekString}">selected="selected"</c:if>
value='${day+1}'>${picker.dayNames[day]}</option>
- </c:forEach>
- </select>
-
- <bean:message key="schedule.weekly.at"/>
-
- <c:set var="timeName" value="weekly" />
- <%@ include
file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
- </label>
- <br/>
-
-<input type="radio" name="${picker.name}_status"
value="monthly" id="monthly"
-<c:if test="${picker.status ==
'monthly'}">checked="true"</c:if> />
- <label for="monthly"><bean:message
key="schedule.monthly"/>:
-
- <bean:message key="schedule.monthly.day"/>
+<span class="help-block"><bean:message
key="schedule.header"/></span>
- <select name='${picker.name}_day_month' size="1">
- <c:forEach var="day" begin="1" end="28">
- <option <c:if test="${picker.dayOfMonthLong ==
day}">selected="selected"</c:if>
value='${day}'>${day}</option>
- </c:forEach>
- </select>
- <bean:message key="schedule.weekly.at"/>
- <c:set var="timeName" value="monthly" />
- <%@ include
file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
- </label>
- <br/>
-
-<input type="radio" name="${picker.name}_status"
value="cron" id="cron"
-<c:if test="${picker.status ==
'cron'}">checked="true"</c:if> />
- <label for="cron"><bean:message
key="schedule.cron"/>:</label>
- <input type="text" size="20" name="${picker.name}_cron"
value="${picker.cronEntry}" />
+<div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="radio" name="${picker.name}_status"
value="disabled" id="disabled"
+ <c:if test="${picker.status ==
'disabled'}">checked="true"</c:if> />
+ <bean:message key="schedule.disabled"/>
+ </label>
+ </div>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="row">
+ <div class="checkbox">
+ <label>
+ <input type="radio"
name="${picker.name}_status" value="daily" id="daily"
+ <c:if test="${picker.status ==
'daily'}">checked="true"</c:if> />
+ <strong><bean:message
key="schedule.daily"/></strong>
+ </label>
+ </div>
+ <div class="col-lg-5">
+ <bean:message key="schedule.weekly.at"/>
+ <c:set var="timeName" value="daily" />
+ <%@ include
file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="row">
+ <div class="checkbox">
+ <label>
+ <input type="radio"
name="${picker.name}_status" value="weekly" id="weekly"
+ <c:if test="${picker.status ==
'weekly'}">checked="true"</c:if> />
+ <strong><bean:message
key="schedule.weekly"/></strong>
+ </label>
+ </div>
+ <div class="col-lg-5">
+ <bean:message key="schedule.weekly.every"/>
+ <select name='${picker.name}_day_week' size="1"
class="form-control">
+ <c:forEach var="day" begin="0"
end="6">
+ <option <c:if test="${picker.dayNames[day] eq
picker.dayOfWeekString}">selected="selected"</c:if>
value='${day+1}'>${picker.dayNames[day]}</option>
+ </c:forEach>
+ </select>
+ </div>
+ <div class="col-lg-5">
+ <bean:message key="schedule.weekly.at"/>
+ <c:set var="timeName" value="weekly" />
+ <%@ include
file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="row">
+ <div class="checkbox">
+ <label>
+ <input type="radio"
name="${picker.name}_status" value="monthly" id="monthly"
+ <c:if test="${picker.status ==
'monthly'}">checked="true"</c:if> />
+ <strong><bean:message
key="schedule.monthly"/></strong>
+ </label>
+ </div>
+ <div class="col-lg-5">
+ <bean:message key="schedule.monthly.day"/>
+ <select name='${picker.name}_day_month' size="1"
class="form-control">
+ <c:forEach var="day" begin="1"
end="28">
+ <option <c:if test="${picker.dayOfMonthLong ==
day}">selected="selected"</c:if>
value='${day}'>${day}</option>
+ </c:forEach>
+ </select>
+ </div>
+ <div class="col-lg-5">
+ <bean:message key="schedule.weekly.at"/>
+ <c:set var="timeName" value="monthly" />
+ <%@ include
file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <input type="radio" name="${picker.name}_status"
value="cron" id="cron"
+ <c:if test="${picker.status ==
'cron'}">checked="true"</c:if> />
+ <strong><bean:message
key="schedule.cron"/></strong>
+ </lable>
+ </div>
+ <div class="col-lg-5">
+ <input type="text" size="20"
name="${picker.name}_cron" value="${picker.cronEntry}"
class="form-control" />
+ </div>
+ </div>
+</div>
commit 8afc9b1069e54e1cfb32426c9e54b3afed8c21ab
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 16 16:06:03 2013 +0200
Require "development_environment = 1"
Otherwise reference the lessc compiled spacewalk.css file.
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index d4bdabe..0f0832f 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -28,10 +28,16 @@
<link rel="stylesheet"
href="/fonts/font-awesome/css/font-awesome.css" />
<link rel="stylesheet"
href="/fonts/font-spacewalk/css/spacewalk-font.css" />
- <link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
- <script type="text/javascript">less = { env: 'development'
};</script>
- <script src="/javascript/less.js"></script>
+ <rhn:require acl="is(development_environment)">
+ <link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
+ <script>less = { env: 'development' };</script>
+ <script src="/javascript/less.js"></script>
+ </rhn:require>
+ <rhn:require acl="not is(development_environment)">
+ <link rel="stylesheet" href="/css/spacewalk.css" />
+ </rhn:require>
+
<script src="/javascript/jquery.js"></script>
<script src="/javascript/bootstrap.js"></script>
<script src="/javascript/spacewalk-essentials.js"></script>
commit 9de73a93a2e7dced4ed4a036579a3eb7f5fe6a1d
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Wed Oct 16 14:40:45 2013 +0200
Selected Systems Toolbar
diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js
index f0d9267..7e0cfc5 100644
--- a/web/html/javascript/check_all.js
+++ b/web/html/javascript/check_all.js
@@ -201,6 +201,28 @@ function pageResponse(data) {
dwr.util.setValue("pagination_selcount_top", resp.pagination);
dwr.util.setValue("pagination_selcount_bottom", resp.pagination);
}
+ updateSsmToolbarOpacity();
+}
+
+// the function we call to read the number of systems selected and hide/show the toolbar
+function updateSsmToolbarOpacity() {
+ var systemsSpan = $("#spacewalk-ssm-counter").text();
+
+ if (systemsSpan == 0){
+
+ $(".spacewalk-bar").animate({"opacity": "0"}, 300,
function() {
+ /* stuff to do after animation is complete */
+ $(this).hide();
+ });
+ }
+ else{
+
+ $(".spacewalk-bar").animate({"opacity":"100"}, 300,
+ function(){
+ /* stuff to do after animation is complete */
+ $(this).show();
+ });
+ }
}
function sortColumn(sortByWidget, sortByValue, sortDirWidget, sortDirValue) {
diff --git a/web/html/javascript/spacewalk-essentials.js
b/web/html/javascript/spacewalk-essentials.js
index 5cd6ef4..a04dcb9 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -10,7 +10,9 @@ $(document).on("ready", function(){
/* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is
pressed or when
no system is selected */
- $("#clearbtn").click(hidesystemtool);
+
+ $("#clear-btn").click(hidesystemtool);
+
function hidesystemtool(){
$(".spacewalk-bar").animate({
"right": "-=50px",
@@ -20,22 +22,9 @@ $(document).on("ready", function(){
$(this).hide();
});
}
- // See if there is a system selected
- ssmToolbar();
-
- $("#spacewalk-ssm-counter").on("change", ssmToolbar);
- function ssmToolbar(){
- console.log("entro");
- var systemsSpan = $("#spacewalk-ssm-counter").text();
- if (systemsSpan == 0){
- $(".spacewalk-bar").animate({"opacity": "0"}, 300,
function() {
- /* stuff to do after animation is complete */
- //$(this).hide();
- });
- }else{
- (".spacewalk-bar").animate({"opacity":"100"}, 300);
- }
- }
+ // See if there is a system already selected as soon as the page loads
+ updateSsmToolbarOpacity();
+
});
/* Getting the screen size to create a fixed padding-bottom in the Section tag to make
both columns the same size */
// On window load
commit 5f26905080240ef735941ef36a58ccda89f4246b
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 15 21:48:40 2013 +0200
better name for the content wrapper
fix some typos in the less
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 10ccdb3..a373522 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -25,7 +25,7 @@
}
}
-.spacewalk-aside-content-layout {
+.spacewalk-main-column-layout {
.make-row();
overflow: hidden;
min-height: 100%;
@@ -75,10 +75,10 @@ h2 {
font-size: 1.7em;
}
-.spacewalk-aside-content-layout {
+.spacewalk-main-column-layout {
/* override the grid row margin */
margin-right: 0;
- margin-left: 0;
+ margin-left: 0;
aside {
background: #eeeeee;
border-right: 1px solid #d5d5d5;
@@ -99,13 +99,7 @@ h2 {
padding-bottom: 3em;
/* some animation */
transition: width 2s, height 2s, transform 2s;
- -webkit-transition: width 2s, height 2s, -webkit-transform 2s;
- &:first-child {
- padding-left:0;
- }
- &:last-child {
- padding-right: 0
- }
+ -webkit-transition: width 2s, height 2s, -webkit-transform 2s;
}
}
@@ -177,7 +171,7 @@ header {
padding-top: 1.4em;
}
- header .nav-pills {
+ .nav-pills {
display: inline-block;
border-radius: 0 0 4px 4px
}
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index 7e1625a..cf030c3 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -18,7 +18,7 @@
<header>
<jsp:include page="/WEB-INF/includes/header.jsp" />
</header>
- <div class="spacewalk-aside-content-layout">
+ <div class="spacewalk-main-column-layout">
<aside id="spacewalk-aside">
<jsp:include page="/WEB-INF/includes/leftnav.jsp" />
<jsp:include page="/WEB-INF/includes/legends.jsp" />
commit 38d29e773acee64967825a23eff79fc07f8cab05
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 15 18:18:23 2013 +0200
make the layout semantic... now col-md-X and row classes in the html
See
http://getbootstrap.com/css/#grid-less
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index 12482b7..10ccdb3 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -12,18 +12,44 @@
/*Import of Tables style*/
@import url(tables.less);
+/* basic layout */
+
+.spacewalk-header-container {
+ .make-row();
+ .spacewalk-logo {
+ .make-md-column(3);
+ }
+ .spacewalk-header-links {
+ .make-md-column(9);
+ .text-right;
+ }
+}
+
+.spacewalk-aside-content-layout {
+ .make-row();
+ overflow: hidden;
+ min-height: 100%;
+ aside {
+ .make-md-column(2);
+ }
+ section {
+ .make-md-column(10);
+ }
+}
+
+
/* Main HTML5 tags defined for the theme */
-body{
+body {
background: #f7f7f7;
}
-html, body{
+html, body {
height: 100%
}
-header{
+header {
width: 100%;
background: url('../../img/spacewalk-header-background.png') repeat-x @gray;
}
-footer{
+footer {
padding: 1.2em 0;
background: @gray-dark;
color: #fff;
@@ -32,19 +58,8 @@ footer{
height: 80px;
clear: both
}
-aside.col-md-2{
- background: #eeeeee;
- border-right: 1px solid #d5d5d5;
- height: auto;
- min-height: 100%;
- /* 100% height */
- margin-bottom: -9999px;
- padding-bottom: 9999px;
- /* errasing the predefined paddings in the columns */
- padding-right: 0;
- padding-left: 0;
-}
-section{
+
+section {
/* for the body div to make both columns the same size*/
height: auto;
min-height: 100%;
@@ -53,29 +68,60 @@ section{
h1, h2, h3, h4 {
.Roboto-thin
}
-h1{
+h1 {
font-size: 2em
}
-h2{
+h2 {
font-size: 1.7em;
}
+
+.spacewalk-aside-content-layout {
+ /* override the grid row margin */
+ margin-right: 0;
+ margin-left: 0;
+ aside {
+ background: #eeeeee;
+ border-right: 1px solid #d5d5d5;
+ height: auto;
+ min-height: 100%;
+ /* 100% height */
+ margin-bottom: -9999px;
+ padding-bottom: 9999px;
+ /* erasing the predefined paddings in the columns */
+ padding-right: 0;
+ padding-left: 0;
+ }
+
+ /* fixing margins in the 1st and last columns */
+ section {
+ padding-left:2em;
+ padding-right: 2em;
+ padding-bottom: 3em;
+ /* some animation */
+ transition: width 2s, height 2s, transform 2s;
+ -webkit-transition: width 2s, height 2s, -webkit-transform 2s;
+ &:first-child {
+ padding-left:0;
+ }
+ &:last-child {
+ padding-right: 0
+ }
+ }
+}
+
/* glow and shadow for text */
-.glow-text{
+.glow-text {
text-shadow: 1px 1px 1px #fff;
}
-.glow-text-deleted{
+.glow-text-deleted {
text-shadow: 0 transparent;
}
-.shadow-text{
+.shadow-text {
text-shadow: 1px 1px 1px #333;
}
-/* for the body div to make both columns the same size*/
-.row.body-container{
- overflow: hidden;
- min-height: 100%;
-}
+
/* fixing the footer to the bottom */
-.wrap{
+.wrap {
overflow: hidden;
margin-bottom: -80px;
padding-bottom: 80px;
@@ -83,7 +129,7 @@ h2{
min-height: 100%
}
/* style for the login page */
-.login-page{
+.login-page {
width: 70%;
text-align: center;
margin-right: auto;
@@ -99,83 +145,125 @@ i[class^="spacewalk-icon"] {
}
/* color for icon */
-.spacewalk-icon-green{
+.spacewalk-icon-green {
color: @spacewalk-updates-green
}
-.spacewalk-icon-red{
+.spacewalk-icon-red {
color: @spacewalk-security-red
}
-.spacewalk-icon-yellow{
+.spacewalk-icon-yellow {
color: @spacewalk-bugs-yellow;
}
-.spacewalk-icon-blue{
+.spacewalk-icon-blue {
color: @spacewalk-enhancement-blue
}
/* header style */
-header .row{
+header .row {
margin: 0 1em
}
-header .row [class*="col-md"]{
- padding-right: 0;
- padding-left: 0
-}
-header .logo{
- padding-top: 1.4em;
-}
-header form{
- margin: .9em 0 1em 0
-}
-header .nav-pills{
- display: inline-block;
- border-radius: 0 0 4px 4px
-}
-header .nav-pills li > a{
- padding: .3em 1em;
- font-size: .85em;
- color: #fff;
- font-weight: normal;
- letter-spacing: normal;
-}
-header .nav-pills li > a:hover{
- background: none;
- text-decoration: underline;
-}
-header ul.nav-pills:nth-child(1){
- background: #000;
-}
-header ul.nav-pills:nth-child(2){
- background: #333;
-}
-header ul.nav-pills:nth-child(3){
- background: #666;
-}
-header ul.nav-pills:nth-child(2) li{
- border-left: 1px #222 solid
-}
-header ul.nav-pills:nth-child(3) li{
- border-left: 1px #555 solid
-}
-header ul.nav-pills li:first-child {
- border-left: 0
-}
-header .navbar-nav > li > a{
- padding: .5em 1.2em;
-}
-header .navbar-nav > li:hover{
- background: @spacewalk-blue;
- border-radius: 4px 4px 0 0
-}
-header form input[type="search"]{
- padding: 0px 10px;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-header .btn.btn-info.input-sm{
- padding-top: 4px
+/* undo the padding the grid columns give */
+header {
+ &#spacewalk-header {
+ padding-right: 0;
+ padding-left: 0
+ }
+
+ .spacewalk-logo {
+ padding-top: 1.4em;
+ }
+
+ .spacewalk-logo {
+ padding-top: 1.4em;
+ }
+
+ header .nav-pills {
+ display: inline-block;
+ border-radius: 0 0 4px 4px
+ }
+
+ .nav-pills li > a {
+ padding: .3em 1em;
+ font-size: .85em;
+ color: #fff;
+ font-weight: normal;
+ letter-spacing: normal;
+ }
+
+ .nav-pills li > a:hover {
+ background: none;
+ text-decoration: underline;
+ }
+
+ ul.nav-pills:nth-child(1) {
+ background: #000;
+ }
+
+ ul.nav-pills:nth-child(2) {
+ background: #333;
+ }
+
+ ul.nav-pills:nth-child(3) {
+ background: #666;
+ }
+
+ ul.nav-pills:nth-child(2) li {
+ border-left: 1px #222 solid
+ }
+
+ ul.nav-pills:nth-child(3) li {
+ border-left: 1px #555 solid
+ }
+
+ ul.nav-pills li:first-child {
+ border-left: 0
+ }
+
+ .navbar-nav > li > a {
+ padding: .5em 1.2em;
+
+ }
+
+ .navbar-nav > li:hover {
+ background: @spacewalk-blue;
+ border-radius: 4px 4px 0 0
+ }
+
+ form input[type="search"] {
+ padding: 0px 10px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+
+ .btn.btn-info.input-sm {
+ padding-top: 4px
+ }
+
+ /* reseting navbar styles for the main menu */
+ .spacewalk-main-nav {
+ margin: 0;
+ border-radius: 0
+ }
+
+ .navbar {
+ min-height: .5em;
+ }
+
+ /* Systems selector inside the main menu in the header */
+ #bar {
+ color: #fff;
+ }
+ #bar .spacewalk-bar {
+ padding: .5em 1.2em;
+ text-align: right;
+ }
+ #bar .spacewalk-bar .badge {
+ margin-right: .5em
+ }
}
+
/* fixing margin issue in Bootstrap 3 */
@media (min-width: 768px) {
@@ -184,53 +272,19 @@ header .btn.btn-info.input-sm{
margin-left: 0;
}
}
-/* fixing margins in the 1st and last columns */
-section.col-md-10{
- padding-left:2em;
- padding-right: 2em;
- padding-bottom: 3em;
- /* some animation */
- transition: width 2s, height 2s, transform 2s;
- -webkit-transition: width 2s, height 2s, -webkit-transform 2s;
-}
-section [class*=col-md]:first-child{
- padding-left:0;
-}
-section [class*=col-md]:last-child{
- padding-right: 0
-}
-/* reseting navbar styles for the main menu */
-header .spacewalk-main-nav{
- margin: 0;
- border-radius: 0
-}
-.spacewalk-main-nav{
+
+.spacewalk-main-nav {
border: 0
}
-.spacewalk-main-nav:after{
+.spacewalk-main-nav:after {
height: 4px;
background: @spacewalk-blue ;
width: 100%
}
-header .navbar{
- min-height: .5em;
-}
-
-/* Systems selector inside the main menu in the header */
-header #bar{
- color: #fff;
-}
-header #bar .spacewalk-bar{
- padding: .5em 1.2em;
- text-align: right;
-}
-header #bar .spacewalk-bar .badge{
- margin-right: .5em
-}
/* systems selector */
-.spacewalk-bar a.button:first-of-type{
+.spacewalk-bar a.button:first-of-type {
color: #ffffff;
background-color: #5bc0de;
border-color: #46b8da;
@@ -238,7 +292,7 @@ header #bar .spacewalk-bar .badge{
border-radius: 4px;
margin: 0 .2em
}
-.spacewalk-bar a.button:last-of-type{
+.spacewalk-bar a.button:last-of-type {
color: #333;
background-color: #e2e2e2;
border-color: #d4d4d4;
@@ -246,91 +300,95 @@ header #bar .spacewalk-bar .badge{
border-radius: 4px
}
/* style for Menu in the left column */
-.nav-stacked > li + li{
+.nav-stacked > li + li {
margin-top: 0;
}
-#sidenav a{
- color: #666;
- .glow-text;
-}
-#sidenav a:before{
- content: "\f105 ";
- font-family: 'FontAwesome';
- margin-right: .5em
-}
-#sidenav li{
- border-bottom: 1px solid #d8d8d8;
+
+#sidenav {
+ a {
+ color: #666;
+ .glow-text;
+ }
+ a:before {
+ content: "\f105 ";
+ font-family: 'FontAwesome';
+ margin-right: .5em
+ }
+ li {
+ border-bottom: 1px solid #d8d8d8;
+ }
+ li.active > a, #sidenav li.active > a:hover {
+ color: @spacewalk-blue;
+ background: @spacewalk-list-menu-active;
+ }
+ li > a {
+ border-radius: 0
+ }
+ ul li:last-child {
+ border-bottom: 1px solid #ccc;
+ -moz-box-shadow: 0px 1px 1px #fefefe;
+ -webkit-box-shadow: 0px 1px 1px #fefefe;
+ box-shadow: 0px 1px 1px #fefefe;
+ }
+
+ /* ul-submenues */
+ /* first submenu */
+ ul>ul li {
+ padding: 0 0 0 1em !important;
+ margin: 0;
+ background: @spacewalk-list-first-submenu;
+ border-bottom: 1px solid #ccc;
+ }
+ ul>ul li.active,
+ ul>ul li.active:hover,
+ ul>ul li.active a,
+ ul>ul li.active a:hover {
+ background: @spacewalk-list-first-submenu-active;
+ .glow-text-deleted;
+ }
+ ul>ul li:hover, ul>ul li a:hover {
+ background: @spacewalk-list-first-submenu-hover;
+ }
+ ul>ul li:last-child {
+ border-bottom: 1px solid #c6c6c6;
+ }
+ /* second submenu */
+ ul>ul>ul li {
+ padding: 0 0 0 1.5em !important;
+ margin: 0;
+ background: @spacewalk-list-second-submenu;
+ border-bottom: 1px solid #bbb;
+ }
+ ul>ul>ul li.active,
+ ul>ul>ul li.active:hover,
+ ul>ul>ul li.active a,
+ ul>ul>ul li.active a:hover {
+ background: @spacewalk-list-second-submenu-active;
+ .glow-text-deleted;
+ }
+ ul>ul>ul li:hover, ul>ul>ul li a:hover {
+ background: @spacewalk-list-second-submenu-hover;
+ }
+ ul>ul>ul li:last-child {
+ border-bottom: 1px solid #c4c4c4;
+ }
}
-#sidenav li.active > a, #sidenav li.active > a:hover{
- color: @spacewalk-blue;
- background: @spacewalk-list-menu-active;
-}
-#sidenav li > a{
- border-radius: 0
-}
-#sidenav ul li:last-child{
- border-bottom: 1px solid #ccc;
- -moz-box-shadow: 0px 1px 1px #fefefe;
- -webkit-box-shadow: 0px 1px 1px #fefefe;
- box-shadow: 0px 1px 1px #fefefe;
-}
-
-/* ul-submenues */
-/* first submenu */
-#sidenav ul>ul li{
- padding: 0 0 0 1em !important;
- margin: 0;
- background: @spacewalk-list-first-submenu;
- border-bottom: 1px solid #ccc;
-}
-#sidenav ul>ul li.active,
-#sidenav ul>ul li.active:hover,
-#sidenav ul>ul li.active a,
-#sidenav ul>ul li.active a:hover{
- background: @spacewalk-list-first-submenu-active;
- .glow-text-deleted;
-}
-#sidenav ul>ul li:hover, #sidenav ul>ul li a:hover{
- background: @spacewalk-list-first-submenu-hover;
-}
-#sidenav ul>ul li:last-child{
- border-bottom: 1px solid #c6c6c6;
-}
-/* second submenu */
-#sidenav ul>ul>ul li{
- padding: 0 0 0 1.5em !important;
- margin: 0;
- background: @spacewalk-list-second-submenu;
- border-bottom: 1px solid #bbb;
-}
-#sidenav ul>ul>ul li.active,
-#sidenav ul>ul>ul li.active:hover,
-#sidenav ul>ul>ul li.active a,
-#sidenav ul>ul>ul li.active a:hover{
- background: @spacewalk-list-second-submenu-active;
- .glow-text-deleted;
-}
-#sidenav ul>ul>ul li:hover, #sidenav ul>ul>ul li a:hover{
- background: @spacewalk-list-second-submenu-hover;
-}
-#sidenav ul>ul>ul li:last-child{
- border-bottom: 1px solid #c4c4c4;
-}
-aside ul > ul li{
+
+aside ul > ul li {
list-style: none;
padding: 0
}
-aside .nav > li > a{
+aside .nav > li > a {
padding: .4em 1em
}
/* TABLES */
-.table > thead > tr.active > th{
+.table > thead > tr.active > th {
background: @gray-lighter;
}
/* Icons Legend */
-aside .sideleg{
+aside .sideleg {
background: lighten(@gray-lighter, 10%);
width: 90%;
padding: .5em 1em;
@@ -338,25 +396,25 @@ aside .sideleg{
margin: 2em auto;
font-size: .8em
}
-aside .sideleg:hover{
+aside .sideleg:hover {
background: @spacewalk-blue;
}
-aside .sideleg:hover h4, aside .sideleg:hover li{
+aside .sideleg:hover h4, aside .sideleg:hover li {
color: #fff
}
-aside .sideleg li{
+aside .sideleg li {
list-style: none;
margin: 1em 0;
padding:0;
}
-aside .sideleg ul{
+aside .sideleg ul {
margin: 0;
padding: 0
}
/* login form */
-#loginForm{
+#loginForm {
border: 1px solid @gray-light;
border-radius: @border-radius-base;
background: @gray-lighter;
@@ -364,55 +422,56 @@ aside .sideleg ul{
margin-bottom:2em;
padding: 1.5em
}
-#loginForm label{
+#loginForm label {
text-align: left;
.Roboto-thin;
color: @gray;
font-size: 1.1em
}
-#loginForm+.col-md-6.col-md-offset-3.text-left{
+
+#loginForm+.col-md-6.col-md-offset-3.text-left {
font-size:.8em;
margin-bottom:2em;
}
/* question symbol for help pop up*/
-h1 .icon-stack .icon-question{
+h1 .icon-stack .icon-question {
font-size: .6em;
}
-h1 .icon-stack{
+h1 .icon-stack {
width: 1em;
height: 1em;
line-height: .7em;
}
-.icon-stack .icon-stack-base.icon-circle{
+.icon-stack .icon-stack-base.icon-circle {
font-size: .7em;
color: @spacewalk-blue;
}
/* spacewalk toolbar */
-.spacewalk-toolbar{
+.spacewalk-toolbar {
padding: .5em 1em
}
-.spacewalk-toolbar>a{
+.spacewalk-toolbar>a {
border-right:1px solid @gray-light;
padding: 0 .5em
}
-.spacewalk-toolbar>a:hover{
+.spacewalk-toolbar>a:hover {
text-decoration: none;
}
-.spacewalk-toolbar>a:last-child{
+.spacewalk-toolbar>a:last-child {
border-right:0
}
/* systems selected tool*/
-.spacewalk-bar i, .spacewalk-toolbar>a, #spacewalk-bar-off i{
+.spacewalk-bar i, .spacewalk-toolbar>a, #spacewalk-bar-off i {
cursor: pointer;
}
-.spacewalk-bar i{
+.spacewalk-bar i {
padding: 0 .3em;
}
-#show-systems-bar{
+#show-systems-bar {
padding: .5em 1.2em;
background: #fff;
border:1px solid #ccc;
@@ -420,6 +479,6 @@ h1 .icon-stack{
}
/* tab nav */
-.spacewalk-content-nav .nav.nav-tabs li.active a{
+.spacewalk-content-nav .nav.nav-tabs li.active a {
background: #dddddd;
}
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index 0eeca48..7e1625a 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -18,13 +18,13 @@
<header>
<jsp:include page="/WEB-INF/includes/header.jsp" />
</header>
- <div class="body-container row">
- <aside class="col-md-2">
+ <div class="spacewalk-aside-content-layout">
+ <aside id="spacewalk-aside">
<jsp:include page="/WEB-INF/includes/leftnav.jsp" />
<jsp:include page="/WEB-INF/includes/legends.jsp" />
<jsp:include page="/WEB-INF/includes/advertisements.jsp" />
</aside>
- <section class="col-md-10">
+ <section id="spacewalk-content">
<!-- Alerts and messages -->
<logic:messagesPresent>
<div class="alert alert-info">
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index 0fe4ffe..899eb9c 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -9,8 +9,8 @@
<center><p><c:out value="${custom_header}"
escapeXml="false"/></p></center>
</c:if>
-<div class="row">
- <div id="logo" class="col-md-3 logo">
+<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>
@@ -18,7 +18,7 @@
<img src="/img/logo_product.png" alt="<bean:message
key="layout.jsp.productname"/>" id="rhnLogo"
accesskey="2"/>
</a>
</div>
- <div class="col-md-9 text-right">
+ <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>
commit bef94a5854bea07cb2e9b6310d519f498a565e42
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Oct 15 18:17:29 2013 +0200
enable less.js debug/error messages
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index b498cfb..d4bdabe 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -30,6 +30,7 @@
<link rel="stylesheet"
href="/fonts/font-spacewalk/css/spacewalk-font.css" />
<link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
+ <script type="text/javascript">less = { env: 'development'
};</script>
<script src="/javascript/less.js"></script>
<script src="/javascript/jquery.js"></script>
<script src="/javascript/bootstrap.js"></script>
commit 62745edd15f834ae5411e56d89fb811818934431
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 15 17:54:33 2013 +0200
Re-order javascript references
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index 1939eee..b498cfb 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -30,12 +30,11 @@
<link rel="stylesheet"
href="/fonts/font-spacewalk/css/spacewalk-font.css" />
<link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
- <script src="/javascript/jquery.js"></script>
<script src="/javascript/less.js"></script>
+ <script src="/javascript/jquery.js"></script>
+ <script src="/javascript/bootstrap.js"></script>
+ <script src="/javascript/spacewalk-essentials.js"></script>
<script src="/rhn/dwr/engine.js"></script>
<script src="/rhn/dwr/util.js"></script>
<script src="/rhn/dwr/interface/DWRItemSelector.js"></script>
-
- <script src="/javascript/bootstrap.js"></script>
- <script src="/javascript/spacewalk-essentials.js"></script>
commit 9fc3864c6e523aa01158fd2a670f3c8492d9f10f
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 15 17:44:14 2013 +0200
Provide a static version of less version 1.4.1
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index 272e535..1939eee 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -31,7 +31,7 @@
<link rel="stylesheet/less" type="text/css"
href="/css/spacewalk.less" />
<script src="/javascript/jquery.js"></script>
- <script
src="//cdnjs.cloudflare.com/ajax/libs/less.js/1.4.1/less.min.js"...
+ <script src="/javascript/less.js"></script>
<script src="/rhn/dwr/engine.js"></script>
<script src="/rhn/dwr/util.js"></script>
diff --git a/web/html/javascript/less.js b/web/html/javascript/less.js
new file mode 100644
index 0000000..5aaea85
--- /dev/null
+++ b/web/html/javascript/less.js
@@ -0,0 +1,11 @@
+/*
+ * LESS - Leaner CSS v1.4.1
+ *
http://lesscss.org
+ *
+ * Copyright (c) 2009-2013, Alexis Sellier
+ * Licensed under the Apache 2.0 License.
+ *
+ * @licence
+ */(function(e,t){function n(t){return e.less[t.split("/")[1]]}function
f(){r.env==="development"?(r.optimization=0,r.watchTimer=setInterval(function(){r.watchMode&&g(function(e,t,n,i,s){e?k(e,i.href):t&&S(t.toCSS(r),i,s.lastModified)})},r.poll)):r.optimization=3}function
m(){var e=document.getElementsByTagName("style");for(var
t=0;t<e.length;t++)if(e[t].type.match(p)){var n=new
r.tree.parseEnv(r);n.filename=document.location.href.replace(/#.*$/,""),(new
r.Parser(n)).parse(e[t].innerHTML||"",function(n,i){if(n)return
k(n,"inline");var
s=i.toCSS(r),o=e[t];o.type="text/css",o.styleSheet?o.styleSheet.cssText=s:o.innerHTML=s})}}function
g(e,t){for(var
n=0;n<r.sheets.length;n++)w(r.sheets[n],e,t,r.sheets.length-(n+1))}function y(e,t){var
n=b(e),r=b(t),i,s,o,u,a="";if(n.hostPart!==r.hostPart)return"";s=Math.max(r.directories.length,n.directories.length);for(i=0;i<s;i++)if(r.directories[i]!==n.directories[i])break;u=r.directories.slice(i),o=n.directories.slice(i);for(i=0;i<u.length
-1;i++)a+="../";for(i=0;i<o.length-1;i++)a+=o[i]+"/";return
a}function b(e,t){var
n=/^((?:[a-z-]+:)?\/+?(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/,r=e.match(n),i={},s=[],o,u;if(!r)throw
new Error("Could not parse sheet href -
'"+e+"'");if(!r[1]||r[2]){u=t.match(n);if(!u)throw new
Error("Could not parse page url -
'"+t+"'");r[1]=r[1]||u[1]||"",r[2]||(r[3]=u[3]+r[3])}if(r[3]){s=r[3].replace("\\","/").split("/");for(o=0;o<s.length;o++)s[o]==="."&&(s.splice(o,1),o-=1);for(o=0;o<s.length;o++)s[o]===".."&&o>0&&(s.splice(o-1,2),o-=2)}return
i.hostPart=r[1],i.directories=s,i.path=r[1]+s.join("/"),i.fileUrl=i.path+(r[4]||""),i.url=i.fileUrl+(r[5]||""),i}function
w(t,n,i,s){var
o=b(t.href,e.location.href),u=o.url,a=l&&l.getItem(u),f=l&&l.getItem(u+":timestamp"),c={css:a,timestamp:f},h,p={relativeUrls:r.relativeUrls,currentDirectory:o.path,filename:u};t
instanceof r.tree.parseEnv?(h=new
r.tree.parseEnv(t),p.entryPath=h.currentFileInfo.entryPath,p.rootpa
th=h.currentFileInfo.rootpath,p.rootFilename=h.currentFileInfo.rootFilename):(h=new
r.tree.parseEnv(r),h.mime=t.type,p.entryPath=o.path,p.rootpath=r.rootpath||o.path,p.rootFilename=u),h.relativeUrls&&(r.rootpath?p.rootpath=b(r.rootpath+y(o.path,p.entryPath)).path:p.rootpath=o.path),x(u,t.type,function(e,a){v+=e.replace(/@import
.+?;/ig,"");if(!i&&c&&a&&(new Date(a)).valueOf()===(new
Date(c.timestamp)).valueOf())S(c.css,t),n(null,null,e,t,{local:!0,remaining:s},u);else
try{h.contents[u]=e,h.paths=[o.path],h.currentFileInfo=p,(new
r.Parser(h)).parse(e,function(r,i){if(r)return
n(r,null,null,t);try{n(r,i,e,t,{local:!1,lastModified:a,remaining:s},u),h.currentFileInfo.rootFilename===u&&N(document.getElementById("less-error-message:"+E(u)))}catch(r){n(r,null,null,t)}})}catch(f){n(f,null,null,t)}},function(e,r){n({type:"File",message:"'"+r+"'
wasn't found ("+e+")"},null,null,t)})}function E(e){return
e.replace(/^[a-z-]+:\/+?[^\/]+/,"").replace(/^\//,"").replace(/\.[a-zA-Z]+$/,"").r
eplace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function S(e,t,n){var
r=t.href||"",i="less:"+(t.title||E(r)),s=document.getElementById(i),o=!1,u=document.createElement("style");u.setAttribute("type","text/css"),t.media&&u.setAttribute("media",t.media),u.id=i;if(u.styleSheet)try{u.styleSheet.cssText=e}catch(a){throw
new Error("Couldn't reassign styleSheet.cssText.")}else
u.appendChild(document.createTextNode(e)),o=s!==null&&s.childNodes.length>0&&u.childNodes.length>0&&s.firstChild.nodeValue===u.firstChild.nodeValue;var
f=document.getElementsByTagName("head")[0];if(s==null||o===!1){var
c=t&&t.nextSibling||null;(c||document.getElementsByTagName("head")[0]).parentNode.insertBefore(u,c)}s&&o===!1&&f.removeChild(s);if(n&&l){C("saving
"+r+" to
cache.");try{l.setItem(r,e),l.setItem(r+":timestamp",n)}catch(a){C("failed
to save")}}}function x(e,t,n,i){function
a(t,n,r){t.status>=200&&t.status<300?n(t.responseText,t.getResponseHeader("Last-Modified")):typeof
r=="function"&&r(t.status,e)}v
ar s=T(),u=o?r.fileAsync:r.async;typeof
s.overrideMimeType=="function"&&s.overrideMimeType("text/css"),s.open("GET",e,u),s.setRequestHeader("Accept",t||"text/x-less,
text/css; q=0.9, */*;
q=0.5"),s.send(null),o&&!r.fileAsync?s.status===0||s.status>=200&&s.status<300?n(s.responseText):i(s.status,e):u?s.onreadystatechange=function(){s.readyState==4&&a(s,n,i)}:a(s,n,i)}function
T(){if(e.XMLHttpRequest)return new XMLHttpRequest;try{return new
ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(t){return C("browser doesn't
support AJAX."),null}}function N(e){return
e&&e.parentNode.removeChild(e)}function
C(e){r.env=="development"&&typeof
console!="undefined"&&console.log("less: "+e)}function
k(e,n){var
i="less-error-message:"+E(n||""),s='<li><label>{line}</label><pre
class="{class}">{content}</pre></li>',o=document.createElement("div"),u,a,f=[],l=e.filename||n,c=l.match(/([^\/]+(\?.*)?)$/)[1];o.id=i,o.className="less-error-message",a="<h3>"+(e.type||"Syntax")+"Error:
"+(e.message||"There i
s an error in your .less file")+"</h3>"+'<p>in <a
href="'+l+'">'+c+"</a> ";var
h=function(e,n,r){e.extract[n]!=t&&f.push(s.replace(/\{line\}/,(parseInt(e.line)||0)+(n-1)).replace(/\{class\}/,r).replace(/\{content\}/,e.extract[n]))};e.extract?(h(e,0,""),h(e,1,"line"),h(e,2,""),a+="on
line "+e.line+", column
"+(e.column+1)+":</p>"+"<ul>"+f.join("")+"</ul>"):e.stack&&(a+="<br/>"+e.stack.split("\n").slice(1).join("<br/>")),o.innerHTML=a,S([".less-error-message
ul, .less-error-message li {","list-style-type: none;","margin-right:
15px;","padding: 4px 0;","margin:
0;","}",".less-error-message label {","font-size:
12px;","margin-right: 15px;","padding: 4px 0;","color:
#cc7777;","}",".less-error-message pre {","color:
#dd6666;","padding: 4px 0;","margin: 0;","display:
inline-block;","}",".less-error-message pre.line {","color:
#ff0000;","}",".less-error-message h3 {","font-size:
20px;","font-weight: bold;","padding: 15px 0 5px
0;","margin: 0;","}",".less-error-message a
{","color: #
10a","}",".less-error-message .error {","color:
red;","font-weight: bold;","padding-bottom:
2px;","border-bottom: 1px dashed
red;","}"].join("\n"),{title:"error-message"}),o.style.cssText=["font-family:
Arial, sans-serif","border: 1px solid #e00","background-color:
#eee","border-radius: 5px","-webkit-border-radius:
5px","-moz-border-radius: 5px","color: #e00","padding:
15px","margin-bottom:
15px"].join(";"),r.env=="development"&&(u=setInterval(function(){document.body&&(document.getElementById(i)?document.body.replaceChild(o,document.getElementById(i)):document.body.insertBefore(o,document.body.firstChild),clearInterval(u))},10))}var
r,i,s;typeof
environment=="object"&&{}.toString.call(environment)==="[object
Environment]"?(typeof
e=="undefined"?r={}:r=e.less={},i=r.tree={},r.mode="rhino"):typeof
e=="undefined"?(r=exports,i=n("./tree"),r.mode="node"):(typeof
e.less=="undefined"&&(e.less={}),r=e.less,i=e.less.tree={},r.mode="browser"),r.Parser=function(t){function
m(){a=c[u],
f=o,h=o}function g(){c[u]=a,o=f,h=o}function
y(){o>h&&(c[u]=c[u].slice(o-h),h=o)}function b(e){var t=e.charCodeAt(0);return
t===32||t===10||t===9}function w(e){var t,n,r,i,a;if(e instanceof Function)return
e.call(p.parsers);if(typeof
e=="string")t=s.charAt(o)===e?e:null,r=1,y();else{y();if(!(t=e.exec(c[u])))return
null;r=t[0].length}if(t)return E(r),typeof
t=="string"?t:t.length===1?t[0]:t}function E(e){var
t=o,n=u,r=o+c[u].length,i=o+=e;while(o<r){if(!b(s.charAt(o)))break;o++}return
c[u]=c[u].slice(e+(o-i)),h=o,c[u].length===0&&u<c.length-1&&u++,t!==o||n!==u}function
S(e,t){var n=w(e);if(!!n)return n;x(t||(typeof e=="string"?"expected
'"+e+"' got '"+s.charAt(o)+"'":"unexpected
token"))}function x(e,t){var n=new Error(e);throw
n.index=o,n.type=t||"Syntax",n}function T(e){return typeof
e=="string"?s.charAt(o)===e:e.test(c[u])?!0:!1}function N(e,t){return
e.filename&&t.currentFileInfo.filename&&e.filename!==t.currentFileInfo.filename?p.imports.contents[e.filename]:s}function
C
(e,t){for(var
n=e,r=-1;n>=0&&t.charAt(n)!=="\n";n--)r++;return{line:typeof
e=="number"?(t.slice(0,e).match(/\n/g)||"").length:null,column:r}}function
k(e,t,i){var s=i.currentFileInfo.filename;return
r.mode!=="browser"&&r.mode!=="rhino"&&(s=n("path").resolve(s)),{lineNumber:C(e,t).line+1,fileName:s}}function
L(e,t){var
n=N(e,t),r=C(e.index,n),i=r.line,s=r.column,o=n.split("\n");this.type=e.type||"Syntax",this.message=e.message,this.filename=e.filename||t.currentFileInfo.filename,this.index=e.index,this.line=typeof
i=="number"?i+1:null,this.callLine=e.call&&C(e.call,n).line+1,this.callExtract=o[C(e.call,n).line],this.stack=e.stack,this.column=s,this.extract=[o[i-1],o[i],o[i+1]]}var
s,o,u,a,f,l,c,h,p,d=this;t instanceof i.parseEnv||(t=new i.parseEnv(t));var
v=this.imports={paths:t.paths||[],queue:[],files:t.files,contents:t.contents,mime:t.mime,error:null,push:function(e,n,i){var
s=this;this.queue.push(e),r.Parser.importer(e,n,function(t,n,r){s.queue.splice(s.queue.indexOf(e),1
);var o=r in
s.files;s.files[r]=n,t&&!s.error&&(s.error=t),i(t,n,o)},t)}};return
L.prototype=new
Error,L.prototype.constructor=L,this.env=t=t||{},this.optimization="optimization"in
this.env?this.env.optimization:1,p={imports:v,parse:function(e,a){var
f,d,v,m,g,y,b=[],E,S=null;o=u=h=l=0,s=e.replace(/\r\n/g,"\n"),s=s.replace(/^\uFEFF/,""),c=function(e){var
n=0,r=/(?:@\{[\w-]+\}|[^"'`\{\}\/\(\)\\])+/g,i=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,o=/"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`]|\\.)*)`/g,u=0,a,f=e[0],l;for(var
c=0,h,p;c<s.length;){r.lastIndex=c,(a=r.exec(s))&&a.index===c&&(c+=a[0].length,f.push(a[0])),h=s.charAt(c),i.lastIndex=o.lastIndex=c;if(a=o.exec(s))if(a.index===c){c+=a[0].length,f.push(a[0]);continue}if(!l&&h==="/"){p=s.charAt(c+1);if(p==="/"||p==="*")if(a=i.exec(s))if(a.index===c){c+=a[0].length,f.push(a[0]);continue}}switch(h){case"{":if(!l){u++,f.push(h);break};case"}":if(!l){u--,f.push(h),e[++n]=f=[];break};case"(":if(!l){l=!0,f.push(h);break}
;case")":if(l){l=!1,f.push(h);break};default:f.push(h)}c++}return
u!=0&&(S=new L({index:c-1,type:"Parse",message:u>0?"missing
closing `}`":"missing opening
`{`",filename:t.currentFileInfo.filename},t)),e.map(function(e){return
e.join("")})}([[]]);if(S)return a(new L(S,t));try{f=new
i.Ruleset([],w(this.parsers.primary)),f.root=!0,f.firstRoot=!0}catch(x){return a(new
L(x,t))}f.toCSS=function(e){var s,o,u;return function(s,o){s=s||{};var u,a=new
i.evalEnv(s);typeof
o=="object"&&!Array.isArray(o)&&(o=Object.keys(o).map(function(e){var
t=o[e];return t instanceof i.Value||(t instanceof i.Expression||(t=new
i.Expression([t])),t=new i.Value([t])),new i.Rule("(a)"+e,t,!1,0)}),a.frames=[new
i.Ruleset(null,o)]);try{var f=e.call(this,a);(new i.joinSelectorVisitor).run(f),(new
i.processExtendsVisitor).run(f);var
l=f.toCSS({compress:Boolean(s.compress),dumpLineNumbers:t.dumpLineNumbers,strictUnits:Boolean(s.strictUnits)})}catch(c){throw
new L(c,t)}return s.yuicompress&&r.mode==="node"?n("yc
ssmin").cssmin(l,s.maxLineLen):s.compress?l.replace(/(\s)+/g,"$1"):l}}(f.eval);if(o<s.length-1){o=l,y=s.split("\n"),g=(s.slice(0,o).match(/\n/g)||"").length+1;for(var
T=o,N=-1;T>=0&&s.charAt(T)!=="\n";T--)N++;S={type:"Parse",message:"Unrecognised
input",index:o,filename:t.currentFileInfo.filename,line:g,column:N,extract:[y[g-2],y[g-1],y[g]]}}var
C=function(e){e=S||e||p.imports.error,e?(e instanceof L||(e=new
L(e,t)),a(e)):a(null,f)};t.processImports!==!1?(new
i.importVisitor(this.imports,C)).run(f):C()},parsers:{primary:function(){var
e,t=[];while((e=w(this.extendRule)||w(this.mixin.definition)||w(this.rule)||w(this.ruleset)||w(this.mixin.call)||w(this.comment)||w(this.directive))||w(/^[\s\n]+/)||w(/^;+/))e&&t.push(e);return
t},comment:function(){var
e;if(s.charAt(o)!=="/")return;if(s.charAt(o+1)==="/")return new
i.Comment(w(/^\/\/.*/),!0);if(e=w(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new
i.Comment(e)},entities:{quoted:function(){var
e,n=o,r,u=o;s.charAt(n)==="~"&&(n++,r
=!0);if(s.charAt(n)!=='"'&&s.charAt(n)!=="'")return;r&&w("~");if(e=w(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return
new i.Quoted(e[0],e[1]||e[2],r,u,t.currentFileInfo)},keyword:function(){var
e;if(e=w(/^[_A-Za-z-][_A-Za-z0-9-]*/))return i.colors.hasOwnProperty(e)?new
i.Color(i.colors[e].slice(1)):new i.Keyword(e)},call:function(){var
e,n,r,s,a=o;if(!(e=/^([\w-]+|%|progid:[\w\.]+)\(/.exec(c[u])))return;e=e[1],n=e.toLowerCase();if(n==="url")return
null;o+=e.length;if(n==="alpha"){s=w(this.alpha);if(typeof
s!="undefined")return
s}w("("),r=w(this.entities.arguments);if(!w(")"))return;if(e)return
new i.Call(e,r,a,t.currentFileInfo)},arguments:function(){var
e=[],t;while(t=w(this.entities.assignment)||w(this.expression)){e.push(t);if(!w(","))break}return
e},literal:function(){return
w(this.entities.dimension)||w(this.entities.color)||w(this.entities.quoted)||w(this.entities.unicodeDescriptor)},assignment:function(){var
e,t;if((e=w(/^\w+(?=\s?=)/i))&&w("=")&&(t=w(this.e
ntity)))return new i.Assignment(e,t)},url:function(){var
e;if(s.charAt(o)!=="u"||!w(/^url\(/))return;return
e=w(this.entities.quoted)||w(this.entities.variable)||w(/^(?:(?:\\[\(\)'"])|[^\(\)'"])+/)||"",S(")"),new
i.URL(e.value!=null||e instanceof i.Variable?e:new
i.Anonymous(e),t.currentFileInfo)},variable:function(){var
e,n=o;if(s.charAt(o)==="@"&&(e=w(/^@@?[\w-]+/)))return new
i.Variable(e,n,t.currentFileInfo)},variableCurly:function(){var
e,n,r=o;if(s.charAt(o)==="@"&&(n=w(/^@\{([\w-]+)\}/)))return new
i.Variable("@"+n[1],r,t.currentFileInfo)},color:function(){var
e;if(s.charAt(o)==="#"&&(e=w(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/)))return
new i.Color(e[1])},dimension:function(){var
e,t=s.charCodeAt(o);if(t>57||t<43||t===47||t==44)return;if(e=w(/^([+-]?\d*\.?\d+)(%|[a-z]+)?/))return
new i.Dimension(e[1],e[2])},unicodeDescriptor:function(){var
e;if(e=w(/^U\+[0-9a-fA-F?]+(\-[0-9a-fA-F?]+)?/))return new
i.UnicodeDescriptor(e[0])},javascript:function(){var e,t=o,n;s.charAt(t)===
"~"&&(t++,n=!0);if(s.charAt(t)!=="`")return;n&&w("~");if(e=w(/^`([^`]*)`/))return
new i.JavaScript(e[1],o,n)}},variable:function(){var
e;if(s.charAt(o)==="@"&&(e=w(/^(@[\w-]+)\s*:/)))return
e[1]},extend:function(e){var
t,n,r=o,s,u=[];if(!w(e?/^&:extend\(/:/^:extend\(/))return;do{s=null,t=[];for(;;){s=w(/^(all)(?=\s*(\)|,))/);if(s)break;n=w(this.element);if(!n)break;t.push(n)}s=s&&s[1],u.push(new
i.Extend(new i.Selector(t),s,r))}while(w(","));return
S(/^\)/),e&&S(/^;/),u},extendRule:function(){return
this.extend(!0)},mixin:{call:function(){var
e=[],n,r,u,a,f,l=o,c=s.charAt(o),h=!1;if(c!=="."&&c!=="#")return;m();while(n=w(/^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6}
?|[^A-Fa-f0-9]))+/))e.push(new
i.Element(r,n,o)),r=w(">");w("(")&&(u=this.mixin.args.call(this,!0).args,S(")")),u=u||[],w(this.important)&&(h=!0);if(e.length>0&&(w(";")||T("}")))return
new i.mixin.Call(e,u,l,t.currentFileInfo,h);g()},args:function(e){var
t=[],n=[],r,u=[],a,f,l,c,h,p={args:null,variadic:!1};for(;;){if(e)h=w
(this.expression);else{w(this.comment);if(s.charAt(o)==="."&&w(/^\.{3}/)){p.variadic=!0,w(";")&&!r&&(r=!0),(r?n:u).push({variadic:!0});break}h=w(this.entities.variable)||w(this.entities.literal)||w(this.entities.keyword)}if(!h)break;l=null,h.throwAwayComments&&h.throwAwayComments(),c=h;var
d=null;if(e){if(h.value.length==1)var d=h.value[0]}else d=h;if(d&&d instanceof
i.Variable)if(w(":"))t.length>0&&(r&&x("Cannot mix ; and
, as delimiter
types"),a=!0),c=S(this.expression),l=f=d.name;else{if(!e&&w(/^\.{3}/)){p.variadic=!0,w(";")&&!r&&(r=!0),(r?n:u).push({name:h.name,variadic:!0});break}e||(f=l=d.name,c=null)}c&&t.push(c),u.push({name:l,value:c});if(w(","))continue;if(w(";")||r)a&&x("Cannot
mix ; and , as delimiter types"),r=!0,t.length>1&&(c=new
i.Value(t)),n.push({name:f,value:c}),f=null,t=[],a=!1}return
p.args=r?n:u,p},definition:function(){var
e,t=[],n,r,u,a,f,c=!1;if(s.charAt(o)!=="."&&s.charAt(o)!=="#"||T(/^[^{]*\}/))return;m();if(n=w(/^([#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6
} ?|[^A-Fa-f0-9]))+)\s*\(/)){e=n[1];var
h=this.mixin.args.call(this,!1);t=h.args,c=h.variadic,w(")")||(l=o,g()),w(this.comment),w(/^when/)&&(f=S(this.conditions,"expected
condition")),r=w(this.block);if(r)return new
i.mixin.Definition(e,t,r,f,c);g()}}},entity:function(){return
w(this.entities.literal)||w(this.entities.variable)||w(this.entities.url)||w(this.entities.call)||w(this.entities.keyword)||w(this.entities.javascript)||w(this.comment)},end:function(){return
w(";")||T("}")},alpha:function(){var
e;if(!w(/^\(opacity=/i))return;if(e=w(/^\d+/)||w(this.entities.variable))return
S(")"),new i.Alpha(e)},element:function(){var
e,t,n,r;n=w(this.combinator),e=w(/^(?:\d+\.\d+|\d+)%/)||w(/^(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\(?:[A-Fa-f0-9]{1,6}
?|[^A-Fa-f0-9]))+/)||w("*")||w("&")||w(this.attribute)||w(/^\([^()@]+\)/)||w(/^[\.#](?=(a))/)||w(this.entities.variableCurly),e||w("(")&&(r=w(this.selector))&&w(")")&&(e=new
i.Paren(r));if(e)return new i.Element(n,e,o)},combinator:function(){
var
e=s.charAt(o);if(e===">"||e==="+"||e==="~"||e==="|"){o++;while(s.charAt(o).match(/\s/))o++;return
new i.Combinator(e)}return s.charAt(o-1).match(/\s/)?new i.Combinator(" "):new
i.Combinator(null)},selector:function(){var
e,t,n=[],r,u,a=[];while((u=w(this.extend))||(t=w(this.element))){u?a.push.apply(a,u):(a.length&&x("Extend
can only be used at the end of
selector"),r=s.charAt(o),n.push(t),t=null);if(r==="{"||r==="}"||r===";"||r===","||r===")")break}if(n.length>0)return
new i.Selector(n,a);a.length&&x("Extend must be used to extend a selector, it
cannot be used on its own")},attribute:function(){var
e="",t,n,r;if(!w("["))return;(t=w(this.entities.variableCurly))||(t=S(/^(?:[_A-Za-z0-9-\*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/));if(r=w(/^[|~*$^]?=/))n=w(this.entities.quoted)||w(/^[\w-]+/)||w(this.entities.variableCurly);return
S("]"),new i.Attribute(t,r,n)},block:function(){var
e;if(w("{")&&(e=w(this.primary))&&w("}"))return
e},ruleset:function(){var e=[],n,r,u;m(),t.dumpLineNumber
s&&(u=k(o,s,t));while(n=w(this.selector)){e.push(n),w(this.comment);if(!w(","))break;w(this.comment)}if(e.length>0&&(r=w(this.block))){var
a=new i.Ruleset(e,r,t.strictImports);return
t.dumpLineNumbers&&(a.debugInfo=u),a}l=o,g()},rule:function(e){var
n,r,u=s.charAt(o),a;m();if(u==="."||u==="#"||u==="&")return;if(n=w(this.variable)||w(this.property)){r=!e&&(t.compress||n.charAt(0)==="@")?w(this.value)||w(this.anonymousValue):w(this.anonymousValue)||w(this.value),a=w(this.important);if(r&&w(this.end))return
new i.Rule(n,r,a,f,t.currentFileInfo);l=o,g();if(r&&!e)return
this.rule(!0)}},anonymousValue:function(){var
e;if(e=/^([^(a)+\/'"*`(;{}-]*);/.exec(c[u]))return o+=e[0].length-1,new
i.Anonymous(e[1])},"import":function(){var e,n,r=o;m();var
s=w(/^@import?\s+/),u=(s?w(this.importOptions):null)||{};if(s&&(e=w(this.entities.quoted)||w(this.entities.url))){n=w(this.mediaFeatures);if(w(";"))return
n=n&&new i.Value(n),new
i.Import(e,n,u,r,t.currentFileInfo)}g()},importOptions:function
(){var e,t={},n,r;if(!w("("))return null;do
if(e=w(this.importOption)){n=e,r=!0;switch(n){case"css":n="less",r=!1;break;case"once":n="multiple",r=!1}t[n]=r;if(!w(","))break}while(e);return
S(")"),t},importOption:function(){var
e=w(/^(less|css|multiple|once)/);if(e)return e[1]},mediaFeature:function(){var e,n,r=[];do
if(e=w(this.entities.keyword))r.push(e);else
if(w("(")){n=w(this.property),e=w(this.value);if(!w(")"))return
null;if(n&&e)r.push(new i.Paren(new
i.Rule(n,e,null,o,t.currentFileInfo,!0)));else{if(!e)return null;r.push(new
i.Paren(e))}}while(e);if(r.length>0)return new
i.Expression(r)},mediaFeatures:function(){var e,t=[];do
if(e=w(this.mediaFeature)){t.push(e);if(!w(","))break}else
if(e=w(this.entities.variable)){t.push(e);if(!w(","))break}while(e);return
t.length>0?t:null},media:function(){var
e,n,r,u;t.dumpLineNumbers&&(u=k(o,s,t));if(w(/^(a)media/)){e=w(this.mediaFeatures);if(n=w(this.block))return
r=new i.Media(n,e),t.dumpLineNumbers&&(r.debugInfo=u),r}},directiv
e:function(){var
e,n,r,u,a,f,l,c,h,p;if(s.charAt(o)!=="(a)")return;if(n=w(this["import"])||w(this.media))return
n;m(),e=w(/^@[a-z-]+/);if(!e)return;l=e,e.charAt(1)=="-"&&e.indexOf("-",2)>0&&(l="@"+e.slice(e.indexOf("-",2)+1));switch(l){case"@font-face":c=!0;break;case"@viewport":case"@top-left":case"@top-left-corner":case"@top-center":case"@top-right":case"@top-right-corner":case"@bottom-left":case"@bottom-left-corner":case"@bottom-center":case"@bottom-right":case"@bottom-right-corner":case"@left-top":case"@left-middle":case"@left-bottom":case"@right-top":case"@right-middle":case"@right-bottom":c=!0;break;case"@page":case"@document":case"@supports":case"@keyframes":c=!0,h=!0;break;case"@namespace":p=!0}h&&(e+="
"+(w(/^[^{]+/)||"").trim());if(c){if(r=w(this.block))return new
i.Directive(e,r)}else
if((n=p?w(this.expression):w(this.entity))&&w(";")){var d=new
i.Directive(e,n);return
t.dumpLineNumbers&&(d.debugInfo=k(o,s,t)),d}g()},value:function(){var
e,t=[],n;while(e=w(this.expr
ession)){t.push(e);if(!w(","))break}if(t.length>0)return new
i.Value(t)},important:function(){if(s.charAt(o)==="!")return w(/^!
*important/)},sub:function(){var e,t;if(w("("))if(e=w(this.addition))return
t=new i.Expression([e]),S(")"),t.parens=!0,t},multiplication:function(){var
e,t,n,r,u,a=[];if(e=w(this.operand)){u=b(s.charAt(o-1));while(!T(/^\/[*\/]/)&&(n=w("/")||w("*"))){if(!(t=w(this.operand)))break;e.parensInOp=!0,t.parensInOp=!0,r=new
i.Operation(n,[r||e,t],u),u=b(s.charAt(o-1))}return r||e}},addition:function(){var
e,t,n,r,u;if(e=w(this.multiplication)){u=b(s.charAt(o-1));while((n=w(/^[-+]\s+/)||!u&&(w("+")||w("-")))&&(t=w(this.multiplication)))e.parensInOp=!0,t.parensInOp=!0,r=new
i.Operation(n,[r||e,t],u),u=b(s.charAt(o-1));return r||e}},conditions:function(){var
e,t,n=o,r;if(e=w(this.condition)){while(w(",")&&(t=w(this.condition)))r=new
i.Condition("or",r||e,t,n);return r||e}},condition:function(){var
e,t,n,r,s=o,u=!1;w(/^not/)&&(u=!0),S("(");if(e=w(this.addition)
||w(this.entities.keyword)||w(this.entities.quoted))return(r=w(/^(?:>=|=<|[<=>])/))?(t=w(this.addition)||w(this.entities.keyword)||w(this.entities.quoted))?n=new
i.Condition(r,e,t,s,u):x("expected expression"):n=new
i.Condition("=",e,new
i.Keyword("true"),s,u),S(")"),w(/^and/)?new
i.Condition("and",n,w(this.condition)):n},operand:function(){var
e,t=s.charAt(o+1);s.charAt(o)==="-"&&(t==="@"||t==="(")&&(e=w("-"));var
n=w(this.sub)||w(this.entities.dimension)||w(this.entities.color)||w(this.entities.variable)||w(this.entities.call);return
e&&(n.parensInOp=!0,n=new i.Negative(n)),n},expression:function(){var
e,t,n=[],r;while(e=w(this.addition)||w(this.entity))n.push(e),!T(/^\/[\/*]/)&&(t=w("/"))&&n.push(new
i.Anonymous(t));if(n.length>0)return new i.Expression(n)},property:function(){var
e;if(e=w(/^(\*?-?[_a-z0-9-]+)\s*:/))return
e[1]}}}};if(r.mode==="browser"||r.mode==="rhino")r.Parser.importer=function(e,t,n,r){!/^([a-z-]+:)?\//.test(e)&&t.currentDirectory&&(e=t.currentDirecto
ry+e);var
i=r.toSheet(e);i.processImports=!1,i.currentFileInfo=t,w(i,function(e,t,r,i,s,o){n.call(null,e,t,o)},!0)};(function(r){function
u(e){return r.functions.hsla(e.h,e.s,e.l,e.a)}function a(e,t){return e instanceof
r.Dimension&&e.unit.is("%")?parseFloat(e.value*t/100):f(e)}function
f(e){if(e instanceof r.Dimension)return
parseFloat(e.unit.is("%")?e.value/100:e.value);if(typeof
e=="number")return e;throw{error:"RuntimeError",message:"color
functions take numbers as parameters"}}function l(e){return
Math.min(1,Math.max(0,e))}r.functions={rgb:function(e,t,n){return
this.rgba(e,t,n,1)},rgba:function(e,t,n,i){var s=[e,t,n].map(function(e){return
a(e,256)});return i=f(i),new r.Color(s,i)},hsl:function(e,t,n){return
this.hsla(e,t,n,1)},hsla:function(e,t,n,r){function o(e){return
e=e<0?e+1:e>1?e-1:e,e*6<1?s+(i-s)*e*6:e*2<1?i:e*3<2?s+(i-s)*(2/3-e)*6:s}e=f(e)%360/360,t=l(f(t)),n=l(f(n)),r=l(f(r));var
i=n<=.5?n*(t+1):n+t-n*t,s=n*2-i;return this.rgba(o(e+1/3)*255,o(e)*255,o(e-1/3)*
255,r)},hsv:function(e,t,n){return
this.hsva(e,t,n,1)},hsva:function(e,t,n,r){e=f(e)%360/360*360,t=f(t),n=f(n),r=f(r);var
i,s;i=Math.floor(e/60%6),s=e/60-i;var
o=[n,n*(1-t),n*(1-s*t),n*(1-(1-s)*t)],u=[[0,3,1],[2,0,1],[1,0,3],[1,2,0],[3,1,0],[0,1,2]];return
this.rgba(o[u[i][0]]*255,o[u[i][1]]*255,o[u[i][2]]*255,r)},hue:function(e){return new
r.Dimension(Math.round(e.toHSL().h))},saturation:function(e){return new
r.Dimension(Math.round(e.toHSL().s*100),"%")},lightness:function(e){return new
r.Dimension(Math.round(e.toHSL().l*100),"%")},hsvhue:function(e){return new
r.Dimension(Math.round(e.toHSV().h))},hsvsaturation:function(e){return new
r.Dimension(Math.round(e.toHSV().s*100),"%")},hsvvalue:function(e){return new
r.Dimension(Math.round(e.toHSV().v*100),"%")},red:function(e){return new
r.Dimension(e.rgb[0])},green:function(e){return new
r.Dimension(e.rgb[1])},blue:function(e){return new
r.Dimension(e.rgb[2])},alpha:function(e){return new
r.Dimension(e.toHSL().a)},luma:functio
n(e){return new
r.Dimension(Math.round(e.luma()*e.alpha*100),"%")},saturate:function(e,t){var
n=e.toHSL();return n.s+=t.value/100,n.s=l(n.s),u(n)},desaturate:function(e,t){var
n=e.toHSL();return n.s-=t.value/100,n.s=l(n.s),u(n)},lighten:function(e,t){var
n=e.toHSL();return n.l+=t.value/100,n.l=l(n.l),u(n)},darken:function(e,t){var
n=e.toHSL();return n.l-=t.value/100,n.l=l(n.l),u(n)},fadein:function(e,t){var
n=e.toHSL();return n.a+=t.value/100,n.a=l(n.a),u(n)},fadeout:function(e,t){var
n=e.toHSL();return n.a-=t.value/100,n.a=l(n.a),u(n)},fade:function(e,t){var
n=e.toHSL();return n.a=t.value/100,n.a=l(n.a),u(n)},spin:function(e,t){var
n=e.toHSL(),r=(n.h+t.value)%360;return
n.h=r<0?360+r:r,u(n)},mix:function(e,t,n){n||(n=new r.Dimension(50));var
i=n.value/100,s=i*2-1,o=e.toHSL().a-t.toHSL().a,u=((s*o==-1?s:(s+o)/(1+s*o))+1)/2,a=1-u,f=[e.rgb[0]*u+t.rgb[0]*a,e.rgb[1]*u+t.rgb[1]*a,e.rgb[2]*u+t.rgb[2]*a],l=e.alpha*i+t.alpha*(1-i);return
new r.Color(f,l)},greyscale:function(e){retur
n this.desaturate(e,new r.Dimension(100))},contrast:function(e,t,n,r){if(!e.rgb)return
null;typeof n=="undefined"&&(n=this.rgba(255,255,255,1)),typeof
t=="undefined"&&(t=this.rgba(0,0,0,1));if(t.luma()>n.luma()){var
i=n;n=t,t=i}return typeof
r=="undefined"?r=.43:r=f(r),e.luma()*e.alpha<r?n:t},e:function(e){return new
r.Anonymous(e instanceof r.JavaScript?e.evaluated:e)},escape:function(e){return new
r.Anonymous(encodeURI(e.value).replace(/=/g,"%3D").replace(/:/g,"%3A").replace(/#/g,"%23").replace(/;/g,"%3B").replace(/\(/g,"%28").replace(/\)/g,"%29"))},"%":function(e){var
t=Array.prototype.slice.call(arguments,1),n=e.value;for(var
i=0;i<t.length;i++)n=n.replace(/%[sda]/i,function(e){var
n=e.match(/s/i)?t[i].value:t[i].toCSS();return
e.match(/[A-Z]$/)?encodeURIComponent(n):n});return n=n.replace(/%%/g,"%"),new
r.Quoted('"'+n+'"',n)},unit:function(e,t){return new
r.Dimension(e.value,t?t.toCSS():"")},convert:function(e,t){return
e.convertTo(t.value)},round:function(e,t){var n=ty
peof t=="undefined"?0:t.value;return this._math(function(e){return
e.toFixed(n)},null,e)},pi:function(){return new
r.Dimension(Math.PI)},mod:function(e,t){return new
r.Dimension(e.value%t.value,e.unit)},pow:function(e,t){if(typeof
e=="number"&&typeof t=="number")e=new r.Dimension(e),t=new
r.Dimension(t);else if(!(e instanceof r.Dimension)||!(t instanceof
r.Dimension))throw{type:"Argument",message:"arguments must be
numbers"};return new
r.Dimension(Math.pow(e.value,t.value),e.unit)},_math:function(e,t,n){if(n instanceof
r.Dimension)return new r.Dimension(e(parseFloat(n.value)),t==null?n.unit:t);if(typeof
n=="number")return e(n);throw{type:"Argument",message:"argument
must be a number"}},argb:function(e){return new
r.Anonymous(e.toARGB())},percentage:function(e){return new
r.Dimension(e.value*100,"%")},color:function(e){if(e instanceof r.Quoted)return
new r.Color(e.value.slice(1));throw{type:"Argument",message:"argument must
be a string"}},iscolor:function(e){return this._isa(
e,r.Color)},isnumber:function(e){return
this._isa(e,r.Dimension)},isstring:function(e){return
this._isa(e,r.Quoted)},iskeyword:function(e){return
this._isa(e,r.Keyword)},isurl:function(e){return
this._isa(e,r.URL)},ispixel:function(e){return
this.isunit(e,"px")},ispercentage:function(e){return
this.isunit(e,"%")},isem:function(e){return
this.isunit(e,"em")},isunit:function(e,t){return e instanceof
r.Dimension&&e.unit.is(t.value||t)?r.True:r.False},_isa:function(e,t){return e
instanceof t?r.True:r.False},multiply:function(e,t){var
n=e.rgb[0]*t.rgb[0]/255,r=e.rgb[1]*t.rgb[1]/255,i=e.rgb[2]*t.rgb[2]/255;return
this.rgb(n,r,i)},screen:function(e,t){var
n=255-(255-e.rgb[0])*(255-t.rgb[0])/255,r=255-(255-e.rgb[1])*(255-t.rgb[1])/255,i=255-(255-e.rgb[2])*(255-t.rgb[2])/255;return
this.rgb(n,r,i)},overlay:function(e,t){var
n=e.rgb[0]<128?2*e.rgb[0]*t.rgb[0]/255:255-2*(255-e.rgb[0])*(255-t.rgb[0])/255,r=e.rgb[1]<128?2*e.rgb[1]*t.rgb[1]/255:255-2*(255-e.rgb[1])*(255-t.rgb[1])/255,i=e.
rgb[2]<128?2*e.rgb[2]*t.rgb[2]/255:255-2*(255-e.rgb[2])*(255-t.rgb[2])/255;return
this.rgb(n,r,i)},softlight:function(e,t){var
n=t.rgb[0]*e.rgb[0]/255,r=n+e.rgb[0]*(255-(255-e.rgb[0])*(255-t.rgb[0])/255-n)/255;n=t.rgb[1]*e.rgb[1]/255;var
i=n+e.rgb[1]*(255-(255-e.rgb[1])*(255-t.rgb[1])/255-n)/255;n=t.rgb[2]*e.rgb[2]/255;var
s=n+e.rgb[2]*(255-(255-e.rgb[2])*(255-t.rgb[2])/255-n)/255;return
this.rgb(r,i,s)},hardlight:function(e,t){var
n=t.rgb[0]<128?2*t.rgb[0]*e.rgb[0]/255:255-2*(255-t.rgb[0])*(255-e.rgb[0])/255,r=t.rgb[1]<128?2*t.rgb[1]*e.rgb[1]/255:255-2*(255-t.rgb[1])*(255-e.rgb[1])/255,i=t.rgb[2]<128?2*t.rgb[2]*e.rgb[2]/255:255-2*(255-t.rgb[2])*(255-e.rgb[2])/255;return
this.rgb(n,r,i)},difference:function(e,t){var
n=Math.abs(e.rgb[0]-t.rgb[0]),r=Math.abs(e.rgb[1]-t.rgb[1]),i=Math.abs(e.rgb[2]-t.rgb[2]);return
this.rgb(n,r,i)},exclusion:function(e,t){var
n=e.rgb[0]+t.rgb[0]*(255-e.rgb[0]-e.rgb[0])/255,r=e.rgb[1]+t.rgb[1]*(255-e.rgb[1]-e.rgb[1])/255,i=e.rgb[2]+t.rgb[2]*(255-
e.rgb[2]-e.rgb[2])/255;return this.rgb(n,r,i)},average:function(e,t){var
n=(e.rgb[0]+t.rgb[0])/2,r=(e.rgb[1]+t.rgb[1])/2,i=(e.rgb[2]+t.rgb[2])/2;return
this.rgb(n,r,i)},negation:function(e,t){var
n=255-Math.abs(255-t.rgb[0]-e.rgb[0]),r=255-Math.abs(255-t.rgb[1]-e.rgb[1]),i=255-Math.abs(255-t.rgb[2]-e.rgb[2]);return
this.rgb(n,r,i)},tint:function(e,t){return
this.mix(this.rgb(255,255,255),e,t)},shade:function(e,t){return
this.mix(this.rgb(0,0,0),e,t)},extract:function(e,t){return
t=t.value-1,e.value[t]},"data-uri":function(t,i){if(typeof
e!="undefined")return(new r.URL(i||t,this.currentFileInfo)).eval(this.env);var
s=t.value,o=i&&i.value,u=n("fs"),a=n("path"),f=!1;arguments.length<2&&(o=s),this.env.isPathRelative(o)&&(this.currentFileInfo.relativeUrls?o=a.join(this.currentFileInfo.currentDirectory,o):o=a.join(this.currentFileInfo.entryPath,o));if(arguments.length<2){var
l;try{l=n("mime")}catch(c){l=r._mime}s=l.lookup(o);var
h=l.charsets.lookup(s);f=["US-ASCII","UTF-8"].indexO
f(h)<0,f&&(s+=";base64")}else f=/;base64$/.test(s);var
p=u.readFileSync(o),d=32,v=parseInt(p.length/1024,10);if(v>=d){if(this.env.ieCompat!==!1)return
this.env.silent||console.warn("Skipped data-uri embedding of %s because its size
(%dKB) exceeds IE8-safe %dKB!",o,v,d),(new
r.URL(i||t,this.currentFileInfo)).eval(this.env);this.env.silent||console.warn("WARNING:
Embedding %s (%dKB) exceeds IE8's data-uri size limit of
%dKB!",o,v,d)}p=f?p.toString("base64"):encodeURIComponent(p);var
m="'data:"+s+","+p+"'";return new r.URL(new
r.Anonymous(m))}},r._mime={_types:{".htm":"text/html",".html":"text/html",".gif":"image/gif",".jpg":"image/jpeg",".jpeg":"image/jpeg",".png":"image/png"},lookup:function(e){var
i=n("path").extname(e),s=r._mime._types[i];if(s===t)throw new
Error('Optional dependency "mime" is required for '+i);return
s},charsets:{lookup:function(e){return
e&&/^text\//.test(e)?"UTF-8":""}}};var
i=[{name:"ceil"},{name:"floor"},{name:"sqrt"},{name:"abs"},{name:"tan",unit:""},
{name:"sin",unit:""},{name:"cos",unit:""},{name:"atan",unit:"rad"},{name:"asin",unit:"rad"},{name:"acos",unit:"rad"}],s=function(e,t){return
function(n){return t!=null&&(n=n.unify()),this._math(Math[e],t,n)}};for(var
o=0;o<i.length;o++)r.functions[i[o].name]=s(i[o].name,i[o].unit);r.functionCall=function(e,t){this.env=e,this.currentFileInfo=t},r.functionCall.prototype=r.functions})(n("./tree")),function(e){e.colors={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgrey:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta
+:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",grey:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2a
a",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460
",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"}}(n("./tree")),function(e){e.Alpha=function(e){this.value=e},e.Alpha.prototype={type:"Alpha",accept:function(e){this.value=e.visit(this.value)},eval:function(e){return
this.value.eval&&(this.value=this.value.eval(e)),this},toCSS:function(){return"alpha(opacity="+(this.value.toCSS?this.value.toCSS():this.value)+")"}}}(n("../tree")),function(e){e.Anonymous=function(e){this.value=e.value||e},e.Anonymous.prototype={type:"Anonymous",toCSS:function(){return
this.value},eval:function(){return this},compare:function(e){if(!e.toCSS)return-1;var
t=this.toCSS(),n=e.toCSS();return t===n?0:t<n
?-1:1}}}(n("../tree")),function(e){e.Assignment=function(e,t){this.key=e,this.value=t},e.Assignment.prototype={type:"Assignment",accept:function(e){this.value=e.visit(this.value)},toCSS:function(){return
this.key+"="+(this.value.toCSS?this.value.toCSS():this.value)},eval:function(t){return
this.value.eval?new
e.Assignment(this.key,this.value.eval(t)):this}}}(n("../tree")),function(e){e.Call=function(e,t,n,r){this.name=e,this.args=t,this.index=n,this.currentFileInfo=r},e.Call.prototype={type:"Call",accept:function(e){this.args=e.visit(this.args)},eval:function(t){var
n=this.args.map(function(e){return e.eval(t)}),r=this.name.toLowerCase(),i,s;if(r in
e.functions)try{s=new
e.functionCall(t,this.currentFileInfo),i=s[r].apply(s,n);if(i!=null)return
i}catch(o){throw{type:o.type||"Runtime",message:"error evaluating function
`"+this.name+"`"+(o.message?":
"+o.message:""),index:this.index,filename:this.currentFileInfo.filename}}return
new e.Anonymous(this.name+"("+n.map(function(e){
return e.toCSS(t)}).join(", ")+")")},toCSS:function(e){return
this.eval(e).toCSS()}}}(n("../tree")),function(e){e.Color=function(e,t){Array.isArray(e)?this.rgb=e:e.length==6?this.rgb=e.match(/.{2}/g).map(function(e){return
parseInt(e,16)}):this.rgb=e.split("").map(function(e){return
parseInt(e+e,16)}),this.alpha=typeof
t=="number"?t:1},e.Color.prototype={type:"Color",eval:function(){return
this},luma:function(){return.2126*this.rgb[0]/255+.7152*this.rgb[1]/255+.0722*this.rgb[2]/255},toCSS:function(e,t){var
n=e&&e.compress&&!t;if(this.alpha<1)return"rgba("+this.rgb.map(function(e){return
Math.round(e)}).concat(this.alpha).join(","+(n?"":"
"))+")";var r=this.rgb.map(function(e){return
e=Math.round(e),e=(e>255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("");return
n&&(r=r.split(""),r[0]==r[1]&&r[2]==r[3]&&r[4]==r[5]?r=r[0]+r[2]+r[4]:r=r.join("")),"#"+r},operate:function(t,n,r){var
i=[];r instanceof e.Color||(r=r.toColor());for(var
s=0;s<3;s++)i[s]=e.operate(t,n,this.r
gb[s],r.rgb[s]);return new e.Color(i,this.alpha+r.alpha)},toHSL:function(){var
e=this.rgb[0]/255,t=this.rgb[1]/255,n=this.rgb[2]/255,r=this.alpha,i=Math.max(e,t,n),s=Math.min(e,t,n),o,u,a=(i+s)/2,f=i-s;if(i===s)o=u=0;else{u=a>.5?f/(2-i-s):f/(i+s);switch(i){case
e:o=(t-n)/f+(t<n?6:0);break;case t:o=(n-e)/f+2;break;case
n:o=(e-t)/f+4}o/=6}return{h:o*360,s:u,l:a,a:r}},toHSV:function(){var
e=this.rgb[0]/255,t=this.rgb[1]/255,n=this.rgb[2]/255,r=this.alpha,i=Math.max(e,t,n),s=Math.min(e,t,n),o,u,a=i,f=i-s;i===0?u=0:u=f/i;if(i===s)o=0;else{switch(i){case
e:o=(t-n)/f+(t<n?6:0);break;case t:o=(n-e)/f+2;break;case
n:o=(e-t)/f+4}o/=6}return{h:o*360,s:u,v:a,a:r}},toARGB:function(){var
e=[Math.round(this.alpha*255)].concat(this.rgb);return"#"+e.map(function(e){return
e=Math.round(e),e=(e>255?255:e<0?0:e).toString(16),e.length===1?"0"+e:e}).join("")},compare:function(e){return
e.rgb?e.rgb[0]===this.rgb[0]&&e.rgb[1]===this.rgb[1]&&e.rgb[2]===this.rgb[2]&&e.alpha===this.alpha?0:-1:-1}}}(n(
"../tree")),function(e){e.Comment=function(e,t){this.value=e,this.silent=!!t},e.Comment.prototype={type:"Comment",toCSS:function(e){return
e.compress?"":this.value},eval:function(){return
this}}}(n("../tree")),function(e){e.Condition=function(e,t,n,r,i){this.op=e.trim(),this.lvalue=t,this.rvalue=n,this.index=r,this.negate=i},e.Condition.prototype={type:"Condition",accept:function(e){this.lvalue=e.visit(this.lvalue),this.rvalue=e.visit(this.rvalue)},eval:function(e){var
t=this.lvalue.eval(e),n=this.rvalue.eval(e),r=this.index,i,i=function(e){switch(e){case"and":return
t&&n;case"or":return
t||n;default:if(t.compare)i=t.compare(n);else{if(!n.compare)throw{type:"Type",message:"Unable
to perform comparison",index:r};i=n.compare(t)}switch(i){case-1:return
e==="<"||e==="=<";case 0:return
e==="="||e===">="||e==="=<";case 1:return
e===">"||e===">="}}}(this.op);return
this.negate?!i:i}}}(n("../tree")),function(e){e.Dimension=function(n,r){this.value=parseFloat(n),this.unit=r&&r
instan
ceof e.Unit?r:new
e.Unit(r?[r]:t)},e.Dimension.prototype={type:"Dimension",accept:function(e){this.unit=e.visit(this.unit)},eval:function(e){return
this},toColor:function(){return new
e.Color([this.value,this.value,this.value])},toCSS:function(e){if(e&&e.strictUnits&&!this.unit.isSingular())throw
new Error("Multiple units in dimension. Correct the units or use the unit function.
Bad unit: "+this.unit.toString());var
t=this.value,n=String(t);t!==0&&t<1e-6&&t>-0.000001&&(n=t.toFixed(20).replace(/0+$/,""));if(e&&e.compress){if(t===0&&!this.unit.isAngle())return
n;t>0&&t<1&&(n=n.substr(1))}return
n+this.unit.toCSS(e)},operate:function(t,n,r){var
i=e.operate(t,n,this.value,r.value),s=this.unit.clone();if(n==="+"||n==="-"){if(s.numerator.length===0&&s.denominator.length===0)s.numerator=r.unit.numerator.slice(0),s.denominator=r.unit.denominator.slice(0);else
if(r.unit.numerator.length!=0||s.denominator.length!=0){r=r.convertTo(this.unit.usedUnits());if(t.strictUnits&&r.unit.toStrin
g()!==s.toString())throw new Error("Incompatible units. Change the units or use the
unit function. Bad units: '"+s.toString()+"' and
'"+r.unit.toString()+"'.");i=e.operate(t,n,this.value,r.value)}}else
n==="*"?(s.numerator=s.numerator.concat(r.unit.numerator).sort(),s.denominator=s.denominator.concat(r.unit.denominator).sort(),s.cancel()):n==="/"&&(s.numerator=s.numerator.concat(r.unit.denominator).sort(),s.denominator=s.denominator.concat(r.unit.numerator).sort(),s.cancel());return
new e.Dimension(i,s)},compare:function(t){if(t instanceof e.Dimension){var
n=this.unify(),r=t.unify(),i=n.value,s=r.value;return
s>i?-1:s<i?1:!r.unit.isEmpty()&&n.unit.compare(r.unit)!==0?-1:0}return-1},unify:function(){return
this.convertTo({length:"m",duration:"s",angle:"rad"})},convertTo:function(t){var
n=this.value,r=this.unit.clone(),i,s,o,u,a,f={};if(typeof t=="string"){for(i in
e.UnitConversions)e.UnitConversions[i].hasOwnProperty(t)&&(f={},f[i]=t);t=f}for(s
in t)t.hasOwnProperty(s)&&(a=t[
s],o=e.UnitConversions[s],r.map(function(e,t){return
o.hasOwnProperty(e)?(t?n/=o[e]/o[a]:n*=o[e]/o[a],a):e}));return r.cancel(),new
e.Dimension(n,r)}},e.UnitConversions={length:{m:1,cm:.01,mm:.001,"in":.0254,pt:.0254/72,pc:.0254/72*12},duration:{s:1,ms:.001},angle:{rad:1/(2*Math.PI),deg:1/360,grad:.0025,turn:1}},e.Unit=function(e,t,n){this.numerator=e?e.slice(0).sort():[],this.denominator=t?t.slice(0).sort():[],this.backupUnit=n},e.Unit.prototype={type:"Unit",clone:function(){return
new
e.Unit(this.numerator.slice(0),this.denominator.slice(0),this.backupUnit)},toCSS:function(e){return
this.numerator.length>=1?this.numerator[0]:this.denominator.length>=1?this.denominator[0]:(!e||!e.strictUnits)&&this.backupUnit?this.backupUnit:""},toString:function(){var
e,t=this.numerator.join("*");for(e=0;e<this.denominator.length;e++)t+="/"+this.denominator[e];return
t},compare:function(e){return this.is(e.toString())?0:-1},is:function(e){return
this.toString()===e},isAngle:function(){retu
rn e.UnitConversions.angle.hasOwnProperty(this.toCSS())},isEmpty:function(){return
this.numerator.length==0&&this.denominator.length==0},isSingular:function(){return
this.numerator.length<=1&&this.denominator.length==0},map:function(e){var
t;for(t=0;t<this.numerator.length;t++)this.numerator[t]=e(this.numerator[t],!1);for(t=0;t<this.denominator.length;t++)this.denominator[t]=e(this.denominator[t],!0)},usedUnits:function(){var
t,n,r={};for(n in
e.UnitConversions)e.UnitConversions.hasOwnProperty(n)&&(t=e.UnitConversions[n],this.map(function(e){return
t.hasOwnProperty(e)&&!r[n]&&(r[n]=e),e}));return r},cancel:function(){var
e={},t,n,r;for(n=0;n<this.numerator.length;n++)t=this.numerator[n],r||(r=t),e[t]=(e[t]||0)+1;for(n=0;n<this.denominator.length;n++)t=this.denominator[n],r||(r=t),e[t]=(e[t]||0)-1;this.numerator=[],this.denominator=[];for(t
in e)if(e.hasOwnProperty(t)){var
i=e[t];if(i>0)for(n=0;n<i;n++)this.numerator.push(t);else
if(i<0)for(n=0;n<-i;n++)this.denominator.push(
t)}this.numerator.length===0&&this.denominator.length===0&&r&&(this.backupUnit=r),this.numerator.sort(),this.denominator.sort()}}}(n("../tree")),function(e){e.Directive=function(t,n){this.name=t,Array.isArray(n)?(this.ruleset=new
e.Ruleset([],n),this.ruleset.allowImports=!0):this.value=n},e.Directive.prototype={type:"Directive",accept:function(e){this.ruleset=e.visit(this.ruleset),this.value=e.visit(this.value)},toCSS:function(e){return
this.ruleset?(this.ruleset.root=!0,this.name+(e.compress?"{":" {\n
")+this.ruleset.toCSS(e).trim().replace(/\n/g,"\n
")+(e.compress?"}":"\n}\n")):this.name+"
"+this.value.toCSS()+";\n"},eval:function(t){var n=this;return
this.ruleset&&(t.frames.unshift(this),n=new
e.Directive(this.name),n.ruleset=this.ruleset.eval(t),t.frames.shift()),n},variable:function(t){return
e.Ruleset.prototype.variable.call(this.ruleset,t)},find:function(){return
e.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return
e.Ruleset.prototype.r
ulesets.apply(this.ruleset)}}}(n("../tree")),function(e){e.Element=function(t,n,r){this.combinator=t
instanceof e.Combinator?t:new e.Combinator(t),typeof
n=="string"?this.value=n.trim():n?this.value=n:this.value="",this.index=r},e.Element.prototype={type:"Element",accept:function(e){this.combinator=e.visit(this.combinator),this.value=e.visit(this.value)},eval:function(t){return
new
e.Element(this.combinator,this.value.eval?this.value.eval(t):this.value,this.index)},toCSS:function(e){var
t=this.value.toCSS?this.value.toCSS(e):this.value;return
t==""&&this.combinator.value.charAt(0)=="&"?"":this.combinator.toCSS(e||{})+t}},e.Attribute=function(e,t,n){this.key=e,this.op=t,this.value=n},e.Attribute.prototype={type:"Attribute",accept:function(e){this.value=e.visit(this.value)},eval:function(t){return
new
e.Attribute(this.key.eval?this.key.eval(t):this.key,this.op,this.value&&this.value.eval?this.value.eval(t):this.value)},toCSS:function(e){var
t=this.key.toCSS?this.key.toCSS(e):t
his.key;return
this.op&&(t+=this.op,t+=this.value.toCSS?this.value.toCSS(e):this.value),"["+t+"]"}},e.Combinator=function(e){e==="
"?this.value="
":this.value=e?e.trim():""},e.Combinator.prototype={type:"Combinator",toCSS:function(e){return{"":"","
":" ",":":"
:","+":e.compress?"+":" +
","~":e.compress?"~":" ~
",">":e.compress?">":" >
","|":e.compress?"|":" |
"}[this.value]}}}(n("../tree")),function(e){e.Expression=function(e){this.value=e},e.Expression.prototype={type:"Expression",accept:function(e){this.value=e.visit(this.value)},eval:function(t){var
n,r=this.parens&&!this.parensInOp,i=!1;return
r&&t.inParenthesis(),this.value.length>1?n=new
e.Expression(this.value.map(function(e){return
e.eval(t)})):this.value.length===1?(this.value[0].parens&&!this.value[0].parensInOp&&(i=!0),n=this.value[0].eval(t)):n=this,r&&t.outOfParenthesis(),this.parens&&this.parensInOp&&!t.isMathOn()&&!i&&(n=new
e.Paren(n)),n},toCSS:function(e){return this.value.map(function(t){return t.toCSS?t.to
CSS(e):""}).join("
")},throwAwayComments:function(){this.value=this.value.filter(function(t){return!(t
instanceof
e.Comment)})}}}(n("../tree")),function(e){e.Extend=function(t,n,r){this.selector=t,this.option=n,this.index=r;switch(n){case"all":this.allowBefore=!0,this.allowAfter=!0;break;default:this.allowBefore=!1,this.allowAfter=!1}},e.Extend.prototype={type:"Extend",accept:function(e){this.selector=e.visit(this.selector)},eval:function(t){return
new e.Extend(this.selector.eval(t),this.option,this.index)},clone:function(t){return new
e.Extend(this.selector,this.option,this.index)},findSelfSelectors:function(e){var
t=[],n;for(n=0;n<e.length;n++)t=t.concat(e[n].elements);this.selfSelectors=[{elements:t}]}}}(n("../tree")),function(e){e.Import=function(e,n,r,i,s){var
o=this;this.options=r,this.index=i,this.path=e,this.features=n,this.currentFileInfo=s;if(this.options.less!==t)this.css=!this.options.less;else{var
u=this.getPath();u&&/css([\?;].*)?$/.test(u)&&(this.css=!0)}},e.I
mport.prototype={type:"Import",accept:function(e){this.features=e.visit(this.features),this.path=e.visit(this.path),this.root=e.visit(this.root)},toCSS:function(e){var
t=this.features?" "+this.features.toCSS(e):"";return
this.css?"@import
"+this.path.toCSS()+t+";\n":""},getPath:function(){if(this.path
instanceof e.Quoted){var n=this.path.value;return
this.css!==t||/(\.[a-z]*$)|([\?;].*)$/.test(n)?n:n+".less"}return this.path
instanceof e.URL?this.path.value.value:null},evalForImport:function(t){return new
e.Import(this.path.eval(t),this.features,this.options,this.index,this.currentFileInfo)},evalPath:function(t){var
n=this.path.eval(t),r=this.currentFileInfo&&this.currentFileInfo.rootpath;if(r&&!(n
instanceof e.URL)){var
i=n.value;i&&t.isPathRelative(i)&&(n.value=r+i)}return
n},eval:function(t){var
n,r=this.features&&this.features.eval(t);if(this.skip)return[];if(this.css){var
i=new
e.Import(this.evalPath(t),r,this.options,this.index);if(!i.css&&this.error)throw
this.error;r
eturn i}return n=new
e.Ruleset([],this.root.rules.slice(0)),n.evalImports(t),this.features?new
e.Media(n.rules,this.features.value):n.rules}}}(n("../tree")),function(e){e.JavaScript=function(e,t,n){this.escaped=n,this.expression=e,this.index=t},e.JavaScript.prototype={type:"JavaScript",eval:function(t){var
n,r=this,i={},s=this.expression.replace(/@\{([\w-]+)\}/g,function(n,i){return e.jsify((new
e.Variable("(a)"+i,r.index)).eval(t))});try{s=new Function("return
("+s+")")}catch(o){throw{message:"JavaScript evaluation error:
`"+s+"`",index:this.index}}for(var u in
t.frames[0].variables())i[u.slice(1)]={value:t.frames[0].variables()[u].value,toJS:function(){return
this.value.eval(t).toCSS()}};try{n=s.call(i)}catch(o){throw{message:"JavaScript
evaluation error: '"+o.name+":
"+o.message+"'",index:this.index}}return typeof
n=="string"?new
e.Quoted('"'+n+'"',n,this.escaped,this.index):Array.isArray(n)?new
e.Anonymous(n.join(", ")):new
e.Anonymous(n)}}}(n("../tree")),function(e){e.Key
word=function(e){this.value=e},e.Keyword.prototype={type:"Keyword",eval:function(){return
this},toCSS:function(){return this.value},compare:function(t){return t instanceof
e.Keyword?t.value===this.value?0:1:-1}},e.True=new e.Keyword("true"),e.False=new
e.Keyword("false")}(n("../tree")),function(e){e.Media=function(t,n){var
r=this.emptySelectors();this.features=new e.Value(n),this.ruleset=new
e.Ruleset(r,t),this.ruleset.allowImports=!0},e.Media.prototype={type:"Media",accept:function(e){this.features=e.visit(this.features),this.ruleset=e.visit(this.ruleset)},toCSS:function(e){var
t=this.features.toCSS(e);return"@media "+t+(e.compress?"{":" {\n
")+this.ruleset.toCSS(e).trim().replace(/\n/g,"\n
")+(e.compress?"}":"\n}\n")},eval:function(t){t.mediaBlocks||(t.mediaBlocks=[],t.mediaPath=[]);var
n=new
e.Media([],[]);this.debugInfo&&(this.ruleset.debugInfo=this.debugInfo,n.debugInfo=this.debugInfo);var
r=!1;t.strictMath||(r=!0,t.strictMath=!0);try{n.features=this.features.eval(t)}
finally{r&&(t.strictMath=!1)}return
t.mediaPath.push(n),t.mediaBlocks.push(n),t.frames.unshift(this.ruleset),n.ruleset=this.ruleset.eval(t),t.frames.shift(),t.mediaPath.pop(),t.mediaPath.length===0?n.evalTop(t):n.evalNested(t)},variable:function(t){return
e.Ruleset.prototype.variable.call(this.ruleset,t)},find:function(){return
e.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return
e.Ruleset.prototype.rulesets.apply(this.ruleset)},emptySelectors:function(){var t=new
e.Element("","&",0);return[new
e.Selector([t])]},evalTop:function(t){var n=this;if(t.mediaBlocks.length>1){var
r=this.emptySelectors();n=new e.Ruleset(r,t.mediaBlocks),n.multiMedia=!0}return delete
t.mediaBlocks,delete t.mediaPath,n},evalNested:function(t){var
n,r,i=t.mediaPath.concat([this]);for(n=0;n<i.length;n++)r=i[n].features instanceof
e.Value?i[n].features.value:i[n].features,i[n]=Array.isArray(r)?r:[r];return
this.features=new e.Value(this.permute(i).map(function(t){t=t.map(fun
ction(t){return t.toCSS?t:new
e.Anonymous(t)});for(n=t.length-1;n>0;n--)t.splice(n,0,new
e.Anonymous("and"));return new e.Expression(t)})),new
e.Ruleset([],[])},permute:function(e){if(e.length===0)return[];if(e.length===1)return
e[0];var t=[],n=this.permute(e.slice(1));for(var r=0;r<n.length;r++)for(var
i=0;i<e[0].length;i++)t.push([e[0][i]].concat(n[r]));return
t},bubbleSelectors:function(t){this.ruleset=new
e.Ruleset(t.slice(0),[this.ruleset])}}}(n("../tree")),function(e){e.mixin={},e.mixin.Call=function(t,n,r,i,s){this.selector=new
e.Selector(t),this.arguments=n,this.index=r,this.currentFileInfo=i,this.important=s},e.mixin.Call.prototype={type:"MixinCall",accept:function(e){this.selector=e.visit(this.selector),this.arguments=e.visit(this.arguments)},eval:function(t){var
n,r,i,s=[],o=!1,u,a,f,l,c;i=this.arguments&&this.arguments.map(function(e){return{name:e.name,value:e.value.eval(t)}});for(u=0;u<t.frames.length;u++)if((n=t.frames[u].find(this.selector)).length>0){c=!0;fo
r(a=0;a<n.length;a++){r=n[a],l=!1;for(f=0;f<t.frames.length;f++)if(!(r instanceof
e.mixin.Definition)&&r===(t.frames[f].originalRuleset||t.frames[f])){l=!0;break}if(l)continue;if(r.matchArgs(i,t)){if(!r.matchCondition||r.matchCondition(i,t))try{Array.prototype.push.apply(s,r.eval(t,i,this.important).rules)}catch(h){throw{message:h.message,index:this.index,filename:this.currentFileInfo.filename,stack:h.stack}}o=!0}}if(o)return
s}throw c?{type:"Runtime",message:"No matching definition was found for
`"+this.selector.toCSS().trim()+"("+(i?i.map(function(e){var
t="";return
e.name&&(t+=e.name+":"),e.value.toCSS?t+=e.value.toCSS():t+="???",t}).join(",
"):"")+")`",index:this.index,filename:this.currentFileInfo.filename}:{type:"Name",message:this.selector.toCSS().trim()+"
is
undefined",index:this.index,filename:this.currentFileInfo.filename}}},e.mixin.Definition=function(t,n,r,i,s){this.name=t,this.selectors=[new
e.Selector([new e.Element(null,t)])],this.params=n,this.condition=i,thi
s.variadic=s,this.arity=n.length,this.rules=r,this._lookups={},this.required=n.reduce(function(e,t){return!t.name||t.name&&!t.value?e+1:e},0),this.parent=e.Ruleset.prototype,this.frames=[]},e.mixin.Definition.prototype={type:"MixinDefinition",accept:function(e){this.params=e.visit(this.params),this.rules=e.visit(this.rules),this.condition=e.visit(this.condition)},toCSS:function(){return""},variable:function(e){return
this.parent.variable.call(this,e)},variables:function(){return
this.parent.variables.call(this)},find:function(){return
this.parent.find.apply(this,arguments)},rulesets:function(){return
this.parent.rulesets.apply(this)},evalParams:function(t,n,r,i){var s=new
e.Ruleset(null,[]),o,u,a=this.params.slice(0),f,l,c,h,p,d;n=new
e.evalEnv(n,[s].concat(n.frames));if(r){r=r.slice(0);for(f=0;f<r.length;f++){u=r[f];if(h=u&&u.name){p=!1;for(l=0;l<a.length;l++)if(!i[l]&&h===a[l].name){i[l]=u.value.eval(t),s.rules.unshift(new
e.Rule(h,u.value.eval(t))),p=!0;break}if(p){r.spli
ce(f,1),f--;continue}throw{type:"Runtime",message:"Named argument for
"+this.name+" "+r[f].name+" not
found"}}}}d=0;for(f=0;f<a.length;f++){if(i[f])continue;u=r&&r[d];if(h=a[f].name)if(a[f].variadic&&r){o=[];for(l=d;l<r.length;l++)o.push(r[l].value.eval(t));s.rules.unshift(new
e.Rule(h,(new
e.Expression(o)).eval(t)))}else{c=u&&u.value;if(c)c=c.eval(t);else{if(!a[f].value)throw{type:"Runtime",message:"wrong
number of arguments for "+this.name+" ("+r.length+" for
"+this.arity+")"};c=a[f].value.eval(n),s.resetCache()}s.rules.unshift(new
e.Rule(h,c)),i[f]=c}if(a[f].variadic&&r)for(l=d;l<r.length;l++)i[l]=r[l].value.eval(t);d++}return
s},eval:function(t,n,r){var i=[],s=this.frames.concat(t.frames),o=this.evalParams(t,new
e.evalEnv(t,s),n,i),u,a,f,l;return o.rules.unshift(new e.Rule("@arguments",(new
e.Expression(i)).eval(t))),a=r?this.parent.makeImportant.apply(this).rules:this.rules.slice(0),l=(new
e.Ruleset(null,a)).eval(new e.evalEnv(t,[this,o].concat(s))),l.originalRuleset=th
is,l},matchCondition:function(t,n){return
this.condition&&!this.condition.eval(new e.evalEnv(n,[this.evalParams(n,new
e.evalEnv(n,this.frames.concat(n.frames)),t,[])].concat(n.frames)))?!1:!0},matchArgs:function(e,t){var
n=e&&e.length||0,r,i;if(!this.variadic){if(n<this.required)return!1;if(n>this.params.length)return!1;if(this.required>0&&n>this.params.length)return!1}r=Math.min(n,this.arity);for(var
s=0;s<r;s++)if(!this.params[s].name&&!this.params[s].variadic&&e[s].value.eval(t).toCSS()!=this.params[s].value.eval(t).toCSS())return!1;return!0}}}(n("../tree")),function(e){e.Negative=function(e){this.value=e},e.Negative.prototype={type:"Negative",accept:function(e){this.value=e.visit(this.value)},toCSS:function(e){return"-"+this.value.toCSS(e)},eval:function(t){return
t.isMathOn()?(new e.Operation("*",[new e.Dimension(-1),this.value])).eval(t):new
e.Negative(this.value.eval(t))}}}(n("../tree")),function(e){e.Operation=function(e,t,n){this.op=e.trim(),this.operands=t,this.isS
paced=n},e.Operation.prototype={type:"Operation",accept:function(e){this.operands=e.visit(this.operands)},eval:function(t){var
n=this.operands[0].eval(t),r=this.operands[1].eval(t),i;if(t.isMathOn()){if(n instanceof
e.Dimension&&r instanceof
e.Color){if(this.op!=="*"&&this.op!=="+")throw{type:"Operation",message:"Can't
substract or divide a color from a
number"};i=r,r=n,n=i}if(!n.operate)throw{type:"Operation",message:"Operation
on an invalid type"};return n.operate(t,this.op,r)}return new
e.Operation(this.op,[n,r],this.isSpaced)},toCSS:function(e){var t=this.isSpaced?"
":"";return
this.operands[0].toCSS()+t+this.op+t+this.operands[1].toCSS()}},e.operate=function(e,t,n,r){switch(t){case"+":return
n+r;case"-":return n-r;case"*":return n*r;case"/":return
n/r}}}(n("../tree")),function(e){e.Paren=function(e){this.value=e},e.Paren.prototype={type:"Paren",accept:function(e){this.value=e.visit(this.value)},toCSS:function(e){return"("+this.value.toCSS(e).trim()+")"},eval:function(t)
{return new
e.Paren(this.value.eval(t))}}}(n("../tree")),function(e){e.Quoted=function(e,t,n,r,i){this.escaped=n,this.value=t||"",this.quote=e.charAt(0),this.index=r,this.currentFileInfo=i},e.Quoted.prototype={type:"Quoted",toCSS:function(){return
this.escaped?this.value:this.quote+this.value+this.quote},eval:function(t){var
n=this,r=this.value.replace(/`([^`]+)`/g,function(r,i){return(new
e.JavaScript(i,n.index,!0)).eval(t).value}).replace(/@\{([\w-]+)\}/g,function(r,i){var
s=(new e.Variable("(a)"+i,n.index,n.currentFileInfo)).eval(t,!0);return s
instanceof e.Quoted?s.value:s.toCSS()});return new
e.Quoted(this.quote+r+this.quote,r,this.escaped,this.index)},compare:function(e){if(!e.toCSS)return-1;var
t=this.toCSS(),n=e.toCSS();return
t===n?0:t<n?-1:1}}}(n("../tree")),function(e){e.Rule=function(t,n,r,i,s,o){this.name=t,this.value=n
instanceof e.Value?n:new e.Value([n]),this.important=r?"
"+r.trim():"",this.index=i,this.currentFileInfo=s,this.inline=o||!1,t.charAt(0)==="@"?thi
s.variable=!0:this.variable=!1},e.Rule.prototype={type:"Rule",accept:function(e){this.value=e.visit(this.value)},toCSS:function(e){if(this.variable)return"";try{return
this.name+(e.compress?":":":
")+this.value.toCSS(e)+this.important+(this.inline?"":";")}catch(t){throw
t.index=this.index,t.filename=this.currentFileInfo.filename,t}},eval:function(t){var
n=!1;this.name==="font"&&t.strictMath===!1&&(n=!0,t.strictMath=!0);try{return
new
e.Rule(this.name,this.value.eval(t),this.important,this.index,this.currentFileInfo,this.inline)}finally{n&&(t.strictMath=!1)}},makeImportant:function(){return
new
e.Rule(this.name,this.value,"!important",this.index,this.currentFileInfo,this.inline)}}}(n("../tree")),function(e){e.Ruleset=function(e,t,n){this.selectors=e,this.rules=t,this._lookups={},this.strictImports=n},e.Ruleset.prototype={type:"Ruleset",accept:function(e){this.selectors=e.visit(this.selectors),this.rules=e.visit(this.rules)},eval:function(t){var
n=this.selectors&&this.selector
s.map(function(e){return e.eval(t)}),r=new
e.Ruleset(n,this.rules.slice(0),this.strictImports),i;r.originalRuleset=this,r.root=this.root,r.firstRoot=this.firstRoot,r.allowImports=this.allowImports,this.debugInfo&&(r.debugInfo=this.debugInfo),t.frames.unshift(r),t.selectors||(t.selectors=[]),t.selectors.unshift(this.selectors),(r.root||r.allowImports||!r.strictImports)&&r.evalImports(t);for(var
s=0;s<r.rules.length;s++)r.rules[s]instanceof
e.mixin.Definition&&(r.rules[s].frames=t.frames.slice(0));var
o=t.mediaBlocks&&t.mediaBlocks.length||0;for(var
s=0;s<r.rules.length;s++)r.rules[s]instanceof
e.mixin.Call&&(i=r.rules[s].eval(t).filter(function(t){return t instanceof
e.Rule&&t.variable?!r.variable(t.name):!0}),r.rules.splice.apply(r.rules,[s,1].concat(i)),s+=i.length-1,r.resetCache());for(var
s=0,u;s<r.rules.length;s++)u=r.rules[s],u instanceof
e.mixin.Definition||(r.rules[s]=u.eval?u.eval(t):u);t.frames.shift(),t.selectors.shift();if(t.mediaBlocks)for(var
s=o;s<t.mediaBlocks
.length;s++)t.mediaBlocks[s].bubbleSelectors(n);return r},evalImports:function(t){var
n,r;for(n=0;n<this.rules.length;n++)this.rules[n]instanceof
e.Import&&(r=this.rules[n].eval(t),typeof
r.length=="number"?(this.rules.splice.apply(this.rules,[n,1].concat(r)),n+=r.length-1):this.rules.splice(n,1,r),this.resetCache())},makeImportant:function(){return
new e.Ruleset(this.selectors,this.rules.map(function(e){return
e.makeImportant?e.makeImportant():e}),this.strictImports)},matchArgs:function(e){return!e||e.length===0},resetCache:function(){this._rulesets=null,this._variables=null,this._lookups={}},variables:function(){return
this._variables?this._variables:this._variables=this.rules.reduce(function(t,n){return n
instanceof
e.Rule&&n.variable===!0&&(t[n.name]=n),t},{})},variable:function(e){return
this.variables()[e]},rulesets:function(){return this.rules.filter(function(t){return t
instanceof e.Ruleset||t instanceof e.mixin.Definition})},find:function(t,n){n=n||this;var
r=[],i,s
,o=t.toCSS();return o in
this._lookups?this._lookups[o]:(this.rulesets().forEach(function(i){if(i!==n)for(var
o=0;o<i.selectors.length;o++)if(s=t.match(i.selectors[o])){t.elements.length>i.selectors[o].elements.length?Array.prototype.push.apply(r,i.find(new
e.Selector(t.elements.slice(1)),n)):r.push(i);break}}),this._lookups[o]=r)},toCSS:function(t){var
n=[],r=[],i=[],s=[],o,u,a;for(var
f=0;f<this.rules.length;f++){a=this.rules[f];if(a.rules||a instanceof
e.Media)s.push(a.toCSS(t));else if(a instanceof e.Directive){var
l=a.toCSS(t);if(a.name==="(a)charset"){if(t.charset){a.debugInfo&&(s.push(e.debugInfo(t,a)),s.push((new
e.Comment("/* "+l.replace(/\n/g,"")+"
*/\n")).toCSS(t)));continue}t.charset=!0}s.push(l)}else if(a instanceof
e.Comment)a.silent||(this.root?s.push(a.toCSS(t)):r.push(a.toCSS(t)));else
if(a.toCSS&&!a.variable){if(this.firstRoot&&a instanceof
e.Rule)throw{message:"properties must be inside selector blocks, they cannot be in
the root.",index:a.index,filename:a.c
urrentFileInfo?a.currentFileInfo.filename:null};r.push(a.toCSS(t))}else
a.value&&!a.variable&&r.push(a.value.toString())}t.compress&&r.length&&(a=r[r.length-1],a.charAt(a.length-1)===";"&&(r[r.length-1]=a.substring(0,a.length-1))),s=s.join("");if(this.root)n.push(r.join(t.compress?"":"\n"));else
if(r.length>0){u=e.debugInfo(t,this),o=this.paths.map(function(e){return
e.map(function(e){return
e.toCSS(t)}).join("").trim()}).join(t.compress?",":",\n");for(var
f=r.length-1;f>=0;f--)(r[f].slice(0,2)==="/*"||i.indexOf(r[f])===-1)&&i.unshift(r[f]);r=i,n.push(u+o+(t.compress?"{":"
{\n ")+r.join(t.compress?"":"\n
")+(t.compress?"}":"\n}\n"))}return
n.push(s),n.join("")+(t.compress?"\n":"")},joinSelectors:function(e,t,n){for(var
r=0;r<n.length;r++)this.joinSelector(e,t,n[r])},joinSelector:function(t,n,r){var
i,s,o,u,a,f,l,c,h,p,d,v,m,g,y;for(i=0;i<r.elements.length;i++)f=r.elements[i],f.value==="&"&&(u=!0);if(!u){if(n.length>0)for(i=0;i<n.length;i++)t.push(n[i].concat(r));else
t.pus
h([r]);return}g=[],a=[[]];for(i=0;i<r.elements.length;i++){f=r.elements[i];if(f.value!=="&")g.push(f);else{y=[],g.length>0&&this.mergeElementsOnToSelectors(g,a);for(s=0;s<a.length;s++){l=a[s];if(n.length==0)l.length>0&&(l[0].elements=l[0].elements.slice(0),l[0].elements.push(new
e.Element(f.combinator,"",0))),y.push(l);else
for(o=0;o<n.length;o++)c=n[o],h=[],p=[],v=!0,l.length>0?(h=l.slice(0),m=h.pop(),d=new
e.Selector(m.elements.slice(0),r.extendList),v=!1):d=new
e.Selector([],r.extendList),c.length>1&&(p=p.concat(c.slice(1))),c.length>0&&(v=!1,d.elements.push(new
e.Element(f.combinator,c[0].elements[0].value,0)),d.elements=d.elements.concat(c[0].elements.slice(1))),v||h.push(d),h=h.concat(p),y.push(h)}a=y,g=[]}}g.length>0&&this.mergeElementsOnToSelectors(g,a);for(i=0;i<a.length;i++)a[i].length>0&&t.push(a[i])},mergeElementsOnToSelectors:function(t,n){var
r,i,s;if(n.length==0){n.push([new
e.Selector(t)]);return}for(r=0;r<n.length;r++)i=n[r],i.length>0?i[i.length-1]=new
e.Se
lector(i[i.length-1].elements.concat(t),i[i.length-1].extendList):i.push(new
e.Selector(t))}}}(n("../tree")),function(e){e.Selector=function(e,t){this.elements=e,this.extendList=t||[]},e.Selector.prototype={type:"Selector",accept:function(e){this.elements=e.visit(this.elements),this.extendList=e.visit(this.extendList)},match:function(e){var
t=this.elements,n=t.length,r,i,s,o;r=e.elements.slice(e.elements.length&&e.elements[0].value==="&"?1:0),i=r.length,s=Math.min(n,i);if(i===0||n<i)return!1;for(o=0;o<s;o++)if(t[o].value!==r[o].value)return!1;return!0},eval:function(t){return
new e.Selector(this.elements.map(function(e){return
e.eval(t)}),this.extendList.map(function(e){return e.eval(t)}))},toCSS:function(e){return
this._css?this._css:(this.elements[0].combinator.value===""?this._css="
":this._css="",this._css+=this.elements.map(function(t){return typeof
t=="string"?"
"+t.trim():t.toCSS(e)}).join(""),this._css)}}}(n("../tree")),function(e){e.UnicodeDescriptor=function(e){thi
s.value=e},e.UnicodeDescriptor.prototype={type:"UnicodeDescriptor",toCSS:function(e){return
this.value},eval:function(){return this}
+}}(n("../tree")),function(e){e.URL=function(e,t){this.value=e,this.currentFileInfo=t},e.URL.prototype={type:"Url",accept:function(e){this.value=e.visit(this.value)},toCSS:function(){return"url("+this.value.toCSS()+")"},eval:function(t){var
n=this.value.eval(t),r;return
r=this.currentFileInfo&&this.currentFileInfo.rootpath,r&&typeof
n.value=="string"&&t.isPathRelative(n.value)&&(n.quote||(r=r.replace(/[\(\)'"\s]/g,function(e){return"\\"+e})),n.value=r+n.value),new
e.URL(n,null)}}}(n("../tree")),function(e){e.Value=function(e){this.value=e},e.Value.prototype={type:"Value",accept:function(e){this.value=e.visit(this.value)},eval:function(t){return
this.value.length===1?this.value[0].eval(t):new e.Value(this.value.map(function(e){return
e.eval(t)}))},toCSS:function(e){return this.value.map(function(t){return
t.toCSS(e)}).join(e.compress?",":",
")}}}(n("../tree")),function(e){e.Variable=function(e,t,n){this.name=e,this.index=t,this.currentFileInfo=n},e.Variable.prototype={type:"Va
riable",eval:function(t){var
n,r,i=this.name;i.indexOf("@@")==0&&(i="@"+(new
e.Variable(i.slice(1))).eval(t).value);if(this.evaluating)throw{type:"Name",message:"Recursive
variable definition for
"+i,filename:this.currentFileInfo.file,index:this.index};this.evaluating=!0;if(n=e.find(t.frames,function(e){if(r=e.variable(i))return
r.value.eval(t)}))return
this.evaluating=!1,n;throw{type:"Name",message:"variable "+i+" is
undefined",filename:this.currentFileInfo.filename,index:this.index}}}}(n("../tree")),function(e){e.debugInfo=function(t,n){var
r="";if(t.dumpLineNumbers&&!t.compress)switch(t.dumpLineNumbers){case"comments":r=e.debugInfo.asComment(n);break;case"mediaquery":r=e.debugInfo.asMediaQuery(n);break;case"all":r=e.debugInfo.asComment(n)+e.debugInfo.asMediaQuery(n)}return
r},e.debugInfo.asComment=function(e){return"/* line
"+e.debugInfo.lineNumber+", "+e.debugInfo.fileName+"
*/\n"},e.debugInfo.asMediaQuery=function(e){return"@media
-sass-debug-info{filename{font-family:"
+("file://"+e.debugInfo.fileName).replace(/([.:/\\])/g,function(e){return
e=="\\"&&(e="/"),"\\"+e})+"}line{font-family:\\00003"+e.debugInfo.lineNumber+"}}\n"},e.find=function(e,t){for(var
n=0,r;n<e.length;n++)if(r=t.call(e,e[n]))return r;return
null},e.jsify=function(e){return
Array.isArray(e.value)&&e.value.length>1?"["+e.value.map(function(e){return
e.toCSS(!1)}).join(",
")+"]":e.toCSS(!1)}}(n("./tree")),function(e){var
t=["paths","optimization","files","contents","relativeUrls","strictImports","dumpLineNumbers","compress","processImports","syncImport","mime","currentFileInfo"];e.parseEnv=function(e){r(e,this,t),this.contents||(this.contents={}),this.files||(this.files={});if(!this.currentFileInfo){var
n=e&&e.filename||"input",i=n.replace(/[^\/\\]*$/,"");e&&(e.filename=null),this.currentFileInfo={filename:n,relativeUrls:this.relativeUrls,rootpath:e&&e.rootpath||"",currentDirectory:i,entryPath:i,rootFilename:n}}},e.parseEnv.prototype.toSheet=function(t){var
n=new e.parseEnv
(this);return n.href=t,n.type=this.mime,n};var
n=["silent","verbose","compress","yuicompress","ieCompat","strictMath","strictUnits"];e.evalEnv=function(e,t){r(e,this,n),this.frames=t||[]},e.evalEnv.prototype.inParenthesis=function(){this.parensStack||(this.parensStack=[]),this.parensStack.push(!0)},e.evalEnv.prototype.outOfParenthesis=function(){this.parensStack.pop()},e.evalEnv.prototype.isMathOn=function(){return
this.strictMath?this.parensStack&&this.parensStack.length:!0},e.evalEnv.prototype.isPathRelative=function(e){return!/^(?:[a-z-]+:|\/)/.test(e)};var
r=function(e,t,n){if(!e)return;for(var
r=0;r<n.length;r++)e.hasOwnProperty(n[r])&&(t[n[r]]=e[n[r]])}}(n("./tree")),function(e){e.visitor=function(e){this._implementation=e},e.visitor.prototype={visit:function(e){if(e
instanceof Array)return this.visitArray(e);if(!e||!e.type)return e;var
t="visit"+e.type,n=this._implementation[t],r,i;return
n&&(r={visitDeeper:!0},i=n.call(this._implementation,e,r),this._implementation.i
sReplacing&&(e=i)),(!r||r.visitDeeper)&&e&&e.accept&&e.accept(this),t+="Out",this._implementation[t]&&this._implementation[t](e),e},visitArray:function(e){var
t,n=[];for(t=0;t<e.length;t++){var r=this.visit(e[t]);r instanceof
Array?n=n.concat(r):n.push(r)}return
this._implementation.isReplacing?n:e}}}(n("./tree")),function(e){e.importVisitor=function(t,n,r){this._visitor=new
e.visitor(this),this._importer=t,this._finish=n,this.env=r||new
e.evalEnv,this.importCount=0},e.importVisitor.prototype={isReplacing:!0,run:function(e){var
t;try{this._visitor.visit(e)}catch(n){t=n}this.isFinished=!0,this.importCount===0&&this._finish(t)},visitImport:function(t,n){var
r=this,i;if(!t.css){try{i=t.evalForImport(this.env)}catch(s){s.filename||(s.index=t.index,s.filename=t.currentFileInfo.filename),t.css=!0,t.error=s}if(i&&!i.css){t=i,this.importCount++;var
o=new
e.evalEnv(this.env,this.env.frames.slice(0));this._importer.push(t.getPath(),t.currentFileInfo,function(n,i,s){n&&!n.filename&&(n.
index=t.index,n.filename=t.currentFileInfo.filename),s&&!t.options.multiple&&(t.skip=s);var
u=function(e){r.importCount--,r.importCount===0&&r.isFinished&&r._finish(e)};i?(t.root=i,(new
e.importVisitor(r._importer,u,o)).run(i)):u()})}}return
n.visitDeeper=!1,t},visitRule:function(e,t){return
t.visitDeeper=!1,e},visitDirective:function(e,t){return
this.env.frames.unshift(e),e},visitDirectiveOut:function(e){this.env.frames.shift()},visitMixinDefinition:function(e,t){return
this.env.frames.unshift(e),e},visitMixinDefinitionOut:function(e){this.env.frames.shift()},visitRuleset:function(e,t){return
this.env.frames.unshift(e),e},visitRulesetOut:function(e){this.env.frames.shift()},visitMedia:function(e,t){return
this.env.frames.unshift(e.ruleset),e},visitMediaOut:function(e){this.env.frames.shift()}}}(n("./tree")),function(e){e.joinSelectorVisitor=function(){this.contexts=[[]],this._visitor=new
e.visitor(this)},e.joinSelectorVisitor.prototype={run:function(e){return this._visitor.
visit(e)},visitRule:function(e,t){t.visitDeeper=!1},visitMixinDefinition:function(e,t){t.visitDeeper=!1},visitRuleset:function(e,t){var
n=this.contexts[this.contexts.length-1],r=[];this.contexts.push(r),e.root||(e.joinSelectors(r,n,e.selectors),e.paths=r)},visitRulesetOut:function(e){this.contexts.length=this.contexts.length-1},visitMedia:function(e,t){var
n=this.contexts[this.contexts.length-1];e.ruleset.root=n.length===0||n[0].multiMedia}}}(n("./tree")),function(e){e.extendFinderVisitor=function(){this._visitor=new
e.visitor(this),this.contexts=[],this.allExtendsStack=[[]]},e.extendFinderVisitor.prototype={run:function(e){return
e=this._visitor.visit(e),e.allExtends=this.allExtendsStack[0],e},visitRule:function(e,t){t.visitDeeper=!1},visitMixinDefinition:function(e,t){t.visitDeeper=!1},visitRuleset:function(t,n){if(t.root)return;var
r,i,s,o=[],u;for(r=0;r<t.rules.length;r++)t.rules[r]instanceof
e.Extend&&o.push(t.rules[r]);for(r=0;r<t.paths.length;r++){var
a=t.paths[r],f=a
[a.length-1];u=f.extendList.slice(0).concat(o).map(function(e){return
e.clone()});for(i=0;i<u.length;i++)this.foundExtends=!0,s=u[i],s.findSelfSelectors(a),s.ruleset=t,i===0&&(s.firstExtendOnThisSelectorPath=!0),this.allExtendsStack[this.allExtendsStack.length-1].push(s)}this.contexts.push(t.selectors)},visitRulesetOut:function(e){e.root||(this.contexts.length=this.contexts.length-1)},visitMedia:function(e,t){e.allExtends=[],this.allExtendsStack.push(e.allExtends)},visitMediaOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1},visitDirective:function(e,t){e.allExtends=[],this.allExtendsStack.push(e.allExtends)},visitDirectiveOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1}},e.processExtendsVisitor=function(){this._visitor=new
e.visitor(this)},e.processExtendsVisitor.prototype={run:function(t){var n=new
e.extendFinderVisitor;return
n.run(t),n.foundExtends?(t.allExtends=t.allExtends.concat(this.doExtendChaining(t.allExtends,t.all
Extends)),this.allExtendsStack=[t.allExtends],this._visitor.visit(t)):t},doExtendChaining:function(t,n,r){var
i,s,o,u=[],a,f=this,l,c,h,p;r=r||0;for(i=0;i<t.length;i++)for(s=0;s<n.length;s++){c=t[i],h=n[s];if(this.inInheritanceChain(h,c))continue;l=[h.selfSelectors[0]],o=f.findMatch(c,l),o.length&&c.selfSelectors.forEach(function(t){a=f.extendSelector(o,l,t),p=new
e.Extend(h.selector,h.option,0),p.selfSelectors=a,a[a.length-1].extendList=[p],u.push(p),p.ruleset=h.ruleset,p.parents=[h,c],h.firstExtendOnThisSelectorPath&&(p.firstExtendOnThisSelectorPath=!0,h.ruleset.paths.push(a))})}if(u.length){this.extendChainCount++;if(r>100){var
d="{unable to calculate}",v="{unable to
calculate}";try{d=u[0].selfSelectors[0].toCSS(),v=u[0].selector.toCSS()}catch(m){}throw{message:"extend
circular reference detected. One of the circular extends is
currently:"+d+":extend("+v+")"}}return
u.concat(f.doExtendChaining(u,n,r+1))}return
u},inInheritanceChain:function(e,t){if(e===t)return!0;if(t.par
ents){if(this.inInheritanceChain(e,t.parents[0]))return!0;if(this.inInheritanceChain(e,t.parents[1]))return!0}return!1},visitRule:function(e,t){t.visitDeeper=!1},visitMixinDefinition:function(e,t){t.visitDeeper=!1},visitSelector:function(e,t){t.visitDeeper=!1},visitRuleset:function(e,t){if(e.root)return;var
n,r,i,s=this.allExtendsStack[this.allExtendsStack.length-1],o=[],u=this,a;for(i=0;i<s.length;i++)for(r=0;r<e.paths.length;r++){a=e.paths[r];if(a[a.length-1].extendList.length)continue;n=this.findMatch(s[i],a),n.length&&s[i].selfSelectors.forEach(function(e){o.push(u.extendSelector(n,a,e))})}e.paths=e.paths.concat(o)},findMatch:function(e,t){var
n,r,i,s,o,u,a=this,f=e.selector.elements,l=[],c,h=[];for(n=0;n<t.length;n++){r=t[n];for(i=0;i<r.elements.length;i++){s=r.elements[i],(e.allowBefore||n==0&&i==0)&&l.push({pathIndex:n,index:i,matched:0,initialCombinator:s.combinator});for(u=0;u<l.length;u++)c=l[u],o=s.combinator.value,o==""&&i===0&&(o="
"),!a.isElementValuesEqual(f[c
.matched].value,s.value)||c.matched>0&&f[c.matched].combinator.value!==o?c=null:c.matched++,c&&(c.finished=c.matched===f.length,c.finished&&!e.allowAfter&&(i+1<r.elements.length||n+1<t.length)&&(c=null)),c?c.finished&&(c.length=f.length,c.endPathIndex=n,c.endPathElementIndex=i+1,l.length=0,h.push(c)):(l.splice(u,1),u--)}}return
h},isElementValuesEqual:function(t,n){if(typeof t=="string"||typeof
n=="string")return t===n;if(t instanceof e.Attribute)return
t.op!==n.op||t.key!==n.key?!1:!t.value||!n.value?t.value||n.value?!1:!0:(t=t.value.value||t.value,n=n.value.value||n.value,t===n);return!1},extendSelector:function(t,n,r){var
i=0,s=0,o=[],u,a,f,l;for(u=0;u<t.length;u++)l=t[u],a=n[l.pathIndex],f=new
e.Element(l.initialCombinator,r.elements[0].value,r.elements[0].index),l.pathIndex>i&&s>0&&(o[o.length-1].elements=o[o.length-1].elements.concat(n[i].elements.slice(s)),s=0,i++),o=o.concat(n.slice(i,l.pathIndex)),o.push(new
e.Selector(a.elements.slice(s,l.index).concat([f]).concat(
r.elements.slice(1)))),i=l.endPathIndex,s=l.endPathElementIndex,s>=a.elements.length&&(s=0,i++);return
i<n.length&&s>0&&(o[o.length-1].elements=o[o.length-1].elements.concat(n[i].elements.slice(s)),s=0,i++),o=o.concat(n.slice(i,n.length)),o},visitRulesetOut:function(e){},visitMedia:function(e,t){var
n=e.allExtends.concat(this.allExtendsStack[this.allExtendsStack.length-1]);n=n.concat(this.doExtendChaining(n,e.allExtends)),this.allExtendsStack.push(n)},visitMediaOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1},visitDirective:function(e,t){var
n=e.allExtends.concat(this.allExtendsStack[this.allExtendsStack.length-1]);n=n.concat(this.doExtendChaining(n,e.allExtends)),this.allExtendsStack.push(n)},visitDirectiveOut:function(e){this.allExtendsStack.length=this.allExtendsStack.length-1}}}(n("./tree"));var
o=/^(file|chrome(-extension)?|resource|qrc|app):/.test(location.protocol);r.env=r.env||(location.hostname=="127.0.0.1"||location.hostname=="0.0.0.0"||lo
cation.hostname=="localhost"||location.port.length>0||o?"development":"production"),r.async=r.async||!1,r.fileAsync=r.fileAsync||!1,r.poll=r.poll||(o?1e3:1500);if(r.functions)for(var
u in r.functions)r.tree.functions[u]=r.functions[u];var
a=/!dumpLineNumbers:(comments|mediaquery|all)/.exec(location.hash);a&&(r.dumpLineNumbers=a[1]),r.watch=function(){return
r.watchMode||(r.env="development",f()),this.watchMode=!0},r.unwatch=function(){return
clearInterval(r.watchTimer),this.watchMode=!1},/!watch/.test(location.hash)&&r.watch();var
l=null;if(r.env!="development")try{l=typeof
e.localStorage=="undefined"?null:e.localStorage}catch(c){}var
h=document.getElementsByTagName("link"),p=/^text\/(x-)?less$/;r.sheets=[];for(var
d=0;d<h.length;d++)(h[d].rel==="stylesheet/less"||h[d].rel.match(/stylesheet/)&&h[d].type.match(p))&&r.sheets.push(h[d]);var
v="";r.modifyVars=function(e){var t=v;for(var n in
e)t+=(n.slice(0,1)==="@"?"":"@")+n+":
"+(e[n].slice(-1)===";"?e[n]:e[n]+";");(new r.Pars
er(new
r.tree.parseEnv(r))).parse(t,function(e,t){e?k(e,"session_cache"):S(t.toCSS(r),r.sheets[r.sheets.length-1])})},r.refresh=function(e){var
t,n;t=n=new Date,g(function(e,i,s,o,u){if(e)return k(e,o.href);u.local?C("loading
"+o.href+" from cache."):(C("parsed "+o.href+"
successfully."),S(i.toCSS(r),o,u.lastModified)),C("css for "+o.href+"
generated in "+(new Date-n)+"ms"),u.remaining===0&&C("css
generated in "+(new Date-t)+"ms"),n=new
Date},e),m()},r.refreshStyles=m,r.refresh(r.env==="development"),typeof
define=="function"&&define.amd&&define(function(){return
r})})(window);
\ No newline at end of file
commit fa8752b4da7d639a05bcbcf9e9e0cada4c55afcc
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Oct 15 17:05:55 2013 +0200
TB3: Admin/ISS Configuraion (all)
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
index e192eca..622049e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmmastersremove.jsp
@@ -3,47 +3,35 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
<%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<html:html xhtml="true">
-<body>
-
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
- <bean:message key="iss.confirmmasterremove.jsp.toolbar" />
- </rhn:toolbar>
-
- <p>
- <bean:message key="iss.confirmmasterremove.jsp.areyousure" />
- </p>
-
- <rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/iss_config.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <c:set var="pageList" value="${requestScope.all}" />
-
- <h2>
- <bean:message key="iss.confirmmasterremove.jsp.header2" />
- </h2>
-
- <rl:listset name="issMasterListSet">
- <rhn:csrf />
- <rhn:submitted />
- <rl:list dataset="pageList" name="issMasterList"
- emptykey="iss.slave.jsp.nomasters">
- <rl:column sortable="true" headerkey="iss.master.label"
sortattr="label">
- <html:link href="/rhn/admin/iss/EditMaster.do?mid=${current.id}">
- <c:out value="${current.label}" />
- </html:link>
- </rl:column>
- </rl:list>
- <c:if test="${not empty requestScope.all}">
- <div align="right">
- <rhn:submitted />
- <hr />
- <hr />
- <input type="submit" name="dispatch"
- value='<bean:message key="iss.confirm.remove.masters"/>'
/>
- </div>
- </c:if>
- </rl:listset>
-
-</body>
+<html:html>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
+ <bean:message key="iss.confirmmasterremove.jsp.toolbar" />
+ </rhn:toolbar>
+ <p><bean:message key="iss.confirmmasterremove.jsp.areyousure"
/></p>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/iss_config.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <c:set var="pageList" value="${requestScope.all}" />
+ <h2><bean:message key="iss.confirmmasterremove.jsp.header2"
/></h2>
+ <rl:listset name="issMasterListSet">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list dataset="pageList" name="issMasterList"
+ emptykey="iss.slave.jsp.nomasters">
+ <rl:column sortable="true"
headerkey="iss.master.label" sortattr="label">
+ <html:link
href="/rhn/admin/iss/EditMaster.do?mid=${current.id}">
+ <c:out value="${current.label}" />
+ </html:link>
+ </rl:column>
+ </rl:list>
+ <c:if test="${not empty requestScope.all}">
+ <div align="right">
+ <rhn:submitted />
+ <input type="submit" name="dispatch"
class="btn btn-success"
+ value='<bean:message
key="iss.confirm.remove.masters"/>' />
+ </div>
+ </c:if>
+ </rl:listset>
+ </body>
</html:html>
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 94390f2..4699a13 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/confirmslaveremove.jsp
@@ -3,73 +3,61 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
<%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<html:html xhtml="true">
-<body>
-
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
- <bean:message key="iss.confirmslaveremove.jsp.toolbar" />
- </rhn:toolbar>
-
- <p>
- <bean:message key="iss.confirmslaveremove.jsp.areyousure" />
- </p>
-
- <rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/iss_config.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <c:set var="pageList" value="${requestScope.all}" />
-
- <h2>
- <bean:message key="iss.confirmslaveremove.jsp.header2" />
- </h2>
-
- <rl:listset name="issSlaveListSet">
- <rhn:csrf />
- <rhn:submitted />
- <rl:list dataset="pageList" name="issSlaveList"
- emptykey="iss.confirmslaveremove.jsp.nomasters">
- <rl:column sortable="true" headerkey="iss.slave.name"
sortattr="slave">
- <html:link href="/rhn/admin/iss/EditSlave.do?sid=${current.id}">
- <c:out value="${current.slave}" />
- </html:link>
- </rl:column>
- <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"/>" />
- </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"/>" />
- </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"/>" />
- </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"/>" />
- </c:if>
- </rl:column>
- </rl:list>
- <c:if test="${not empty requestScope.all}">
- <div align="right">
- <rhn:submitted />
- <hr />
- <hr />
- <input type="submit" name="dispatch"
- value='<bean:message key="iss.confirm.remove.slaves"/>'
/>
- </div>
- </c:if>
- </rl:listset>
-
-</body>
+<html:html>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
+ <bean:message key="iss.confirmslaveremove.jsp.toolbar" />
+ </rhn:toolbar>
+ <p><bean:message key="iss.confirmslaveremove.jsp.areyousure"
/></p>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/iss_config.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <c:set var="pageList" value="${requestScope.all}" />
+ <h2><bean:message key="iss.confirmslaveremove.jsp.header2"
/></h2>
+ <rl:listset name="issSlaveListSet">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list dataset="pageList" name="issSlaveList"
+ emptykey="iss.confirmslaveremove.jsp.nomasters">
+ <rl:column sortable="true"
headerkey="iss.slave.name" sortattr="slave">
+ <html:link
href="/rhn/admin/iss/EditSlave.do?sid=${current.id}">
+ <c:out value="${current.slave}" />
+ </html:link>
+ </rl:column>
+ <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"/>" />
+ </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"/>" />
+ </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"/>" />
+ </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"/>" />
+ </c:if>
+ </rl:column>
+ </rl:list>
+ <c:if test="${not empty requestScope.all}">
+ <div align="right">
+ <rhn:submitted />
+ <input type="submit" name="dispatch"
class="btn btn-success"
+ value='<bean:message
key="iss.confirm.remove.slaves"/>' />
+ </div>
+ </c:if>
+ </rl:listset>
+ </body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
index 24ec437..1831564 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/editmaster.jsp
@@ -3,128 +3,126 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
<%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<html:html xhtml="true">
-<body>
+<html:html>
+ <body>
+ <c:choose>
+ <c:when test="${requestScope.id > 0}">
+ <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif"
+
deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}"
+ deletionType="master"
deletionAcl="user_role(satellite_admin)">
+ <bean:message key="iss.editmaster.jsp.toolbar" />
+ </rhn:toolbar>
+ </c:when>
+ <c:otherwise>
+ <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif">
+ <bean:message key="iss.editmaster.jsp.toolbar" />
+ </rhn:toolbar>
+ </c:otherwise>
+ </c:choose>
+ <p><bean:message key="iss.editmaster.jsp.explanation"
/></p>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/iss_config.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <html:form action="/admin/iss/UpdateMaster.do"
styleClass="form-horizontal">
+ <rhn:csrf />
+ <html:hidden property="id" />
+ <rhn:submitted />
+ <h2>
+ <c:choose>
+ <c:when test="${requestScope.id > 0}">
+ <bean:message
key="iss.editmaster.jsp.details.header" arg0="${requestScope.master}"
/>
+ </c:when>
+ <c:otherwise>
+ <bean:message
key="iss.editmaster.jsp.newmaster.details.header" />
+ </c:otherwise>
+ </c:choose>
+ </h2>
+ <c:choose>
+ <c:when test="${empty requestScope.id or requestScope.id <
0}">
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="label">
+ <rhn:required-field key="iss.master.label"
/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="label"
styleId="label" styleClass="form-control" />
+ </div>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <html:hidden property="label" />
+ </c:otherwise>
+ </c:choose>
- <c:choose>
- <c:when test="${requestScope.id > 0}">
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
- deletionUrl="/rhn/admin/iss/RemoveMasterConfirm.do?mid=${requestScope.id}"
- deletionType="master"
deletionAcl="user_role(satellite_admin)">
- <bean:message key="iss.editmaster.jsp.toolbar" />
- </rhn:toolbar>
- </c:when>
- <c:otherwise>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
- <bean:message key="iss.editmaster.jsp.toolbar" />
- </rhn:toolbar>
- </c:otherwise>
- </c:choose>
+ <div class="form-group">
+ <label for="caCert" class="col-lg-3
control-label">
+ <bean:message key="iss.master.cacert" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="caCert" styleId="caCert"
maxlength="1024" size="50" styleClass="form-control" />
+ <span class="help-block">
+ <bean:message key="iss.master.cacert.note"/>
+ </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="defaultMaster"
+ styleId="defaultMaster" />
+ <bean:message key="iss.master.isDefault" />
+ </label>
+ </div>
+ </div>
+ </div>
- <p>
- <bean:message key="iss.editmaster.jsp.explanation" />
- </p>
-
- <rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/iss_config.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
- <html:form action="/admin/iss/UpdateMaster.do">
- <rhn:csrf />
- <html:hidden property="id" />
- <rhn:submitted />
- <h2>
- <c:choose>
- <c:when test="${requestScope.id > 0}">
- <bean:message key="iss.editmaster.jsp.details.header"
arg0="${requestScope.master}" />
- </c:when>
- <c:otherwise>
- <bean:message key="iss.editmaster.jsp.newmaster.details.header" />
- </c:otherwise>
- </c:choose>
- </h2>
- <table class="details" align="center">
- <c:choose>
- <c:when test="${empty requestScope.id or requestScope.id < 0}">
- <tr>
- <th><label for="label"><rhn:required-field
key="iss.master.label" /></label></th>
- <td><html:text property="label" styleId="label"
/></td>
- </tr>
- </c:when>
- <c:otherwise>
- <html:hidden property="label" />
- </c:otherwise>
- </c:choose>
-
- <tr>
- <th><label for="defaultMaster">
- <bean:message key="iss.master.isDefault"
/></label></th>
- <td><html:checkbox property="defaultMaster"
- styleId="defaultMaster" /></td>
- </tr>
- <tr>
- <th><label for="caCert"><bean:message
- key="iss.master.cacert" /></label></th>
- <td><html:text property="caCert" styleId="caCert"
maxlength="1024" size="50" />
- <div>
- </div>
- <span class="small-text">
- <bean:message key="iss.master.cacert.note"/>
- </span>
- </div>
- </td>
- </tr>
- </table>
-
- <c:choose>
- <c:when test="${requestScope.id > 0}">
- <h2>
- <bean:message key="iss.editmaster.jsp.maporgs.header"
arg0="${requestScope.master}" />
- </h2>
- <p>
- <bean:message key="iss.editmaster.jsp.maporgs.explanation" />
- </p>
- <rl:listset name="issMasterListSet">
- <rl:list dataset="all" name="issMasterList"
- emptykey="iss.editmaster.jsp.nomasterorgs">
- <rl:column sortable="true" headerkey="iss.master.org.name"
- sortattr="sourceOrgName">
- <c:out value="${current.masterOrgName}" />
- </rl:column>
- <rl:column headerkey="iss.slave.orgs" styleclass="center"
- headerclass="center">
- <select name="${current.id}">
- <c:forEach var="localOrg"
items="${requestScope.slave_org_list}">
- <c:choose>
- <c:when test="${localOrg.id == current.localOrg.id}">
- <option value="${localOrg.id}" selected>
- </c:when>
- <c:otherwise>
- <option value="${localOrg.id}">
- </c:otherwise>
- </c:choose>
- <c:out value="${localOrg.name}" />
- </option>
- </c:forEach>
- </select>
- </rl:column>
- </rl:list>
-
- <div align="right">
- <hr />
- <input type="submit" name="dispatch"
- value='<bean:message key="iss.master.update"/>' />
- </div>
- </rl:listset>
- </c:when>
- <c:otherwise>
- <div align="right">
- <hr />
- <html:submit><bean:message key="iss.master.create"
/></html:submit>
- </div>
- </c:otherwise>
- </c:choose>
-
- </html:form>
-</body>
+ <c:choose>
+ <c:when test="${requestScope.id > 0}">
+ <h2><bean:message
key="iss.editmaster.jsp.maporgs.header" arg0="${requestScope.master}"
/></h2>
+ <p><bean:message
key="iss.editmaster.jsp.maporgs.explanation" /></p>
+ <rl:listset name="issMasterListSet">
+ <rl:list dataset="all"
name="issMasterList"
+
emptykey="iss.editmaster.jsp.nomasterorgs">
+ <rl:column sortable="true"
headerkey="iss.master.org.name"
+ sortattr="sourceOrgName">
+ <c:out value="${current.masterOrgName}"
/>
+ </rl:column>
+ <rl:column headerkey="iss.slave.orgs"
styleclass="center"
+ headerclass="center">
+ <select name="${current.id}"
class="form-control">
+ <c:forEach var="localOrg"
items="${requestScope.slave_org_list}">
+ <c:choose>
+ <c:when test="${localOrg.id ==
current.localOrg.id}">
+ <option
value="${localOrg.id}" selected>
+ </c:when>
+ <c:otherwise>
+ <option
value="${localOrg.id}">
+ </c:otherwise>
+ </c:choose>
+ <c:out value="${localOrg.name}"
/>
+ </option>
+ </c:forEach>
+ </select>
+ </rl:column>
+ </rl:list>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <input type="submit"
name="dispatch" class="btn btn-success"
+ value='<bean:message
key="iss.master.update"/>' />
+ </div>
+ </div>
+ </rl:listset>
+ </c:when>
+ <c:otherwise>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="iss.master.create" />
+ </html:submit>
+ </div>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </html:form>
+ </body>
</html:html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
index 967af9e..30821e3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/editslave.jsp
@@ -3,97 +3,100 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
<%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<html:html xhtml="true">
-<body>
+<html:html>
+ <body>
+ <c:choose>
+ <c:when test="${requestScope.sid > 0}">
+ <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif"
+
deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}"
+ deletionType="slave"
deletionAcl="user_role(satellite_admin)">
+ <bean:message key="iss.editslave.jsp.toolbar" />
+ </rhn:toolbar>
+ </c:when>
+ <c:otherwise>
+ <rhn:toolbar base="h1"
img="/img/rhn-icon-info.gif">
+ <bean:message key="iss.editslave.jsp.toolbar" />
+ </rhn:toolbar>
+ </c:otherwise>
+ </c:choose>
+ <p><bean:message key="iss.editslave.jsp.explanation"
/></p>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/iss_config.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <h2><bean:message key="iss.editslave.jsp.header2"
/></h2>
+ <html:form action="/admin/iss/UpdateSlave"
styleClass="form-horizontal" >
+ <rhn:csrf />
+ <html:hidden property="submitted" value="true" />
+ <html:hidden property="id" />
+ <div class="form-group">
+ <label for="slave" class="col-lg-3
control-label">
+ <rhn:required-field key="iss.slave.name" />
+ </label>
+ <div class="col-lg-6">
+ <html:text property="slave" size="45"
maxlength="256"
+ styleId="slave"
styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="enabled"
styleId="enabled" />
+ <bean:message key="iss.slave.isEnabled" />
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="allowAllOrgs"
+ styleId="allowAllOrgs" />
+ <bean:message key="iss.slave.toAll" />
+ </label>
+ </div>
+ </div>
+ </div>
- <c:choose>
- <c:when test="${requestScope.sid > 0}">
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
- deletionUrl="/rhn/admin/iss/RemoveSlaveConfirm.do?sid=${requestScope.sid}"
- deletionType="slave" deletionAcl="user_role(satellite_admin)">
- <bean:message key="iss.editslave.jsp.toolbar" />
- </rhn:toolbar>
- </c:when>
- <c:otherwise>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif">
- <bean:message key="iss.editslave.jsp.toolbar" />
- </rhn:toolbar>
- </c:otherwise>
- </c:choose>
-
- <p>
- <bean:message key="iss.editslave.jsp.explanation" />
- </p>
-
- <rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/iss_config.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
- <h2>
- <bean:message key="iss.editslave.jsp.header2" />
- </h2>
-
- <html:form action="/admin/iss/UpdateSlave">
- <rhn:csrf />
- <html:hidden property="submitted" value="true" />
- <html:hidden property="id" />
- <table class="details" align="center">
- <tr>
- <th><label for="slave"><rhn:required-field
key="iss.slave.name" /></label></th>
- <td><html:text property="slave" size="45"
maxlength="256"
- styleId="slave" /></td>
- </tr>
- <tr>
- <th><label for="enabled"><bean:message
key="iss.slave.isEnabled" /></label>
- </th>
- <td><html:checkbox property="enabled" styleId="enabled"
/></td>
- </tr>
- <tr>
- <th><label for="allowAllOrgs"><bean:message
key="iss.slave.toAll" /></label></th>
- <td><html:checkbox property="allowAllOrgs"
- styleId="allowAllOrgs" /> </td>
- </tr>
- </table>
- <div align="right">
-
- <html:submit>
- <c:choose>
- <c:when test="${requestScope.sid > 0}">
- <bean:message key="iss.slave.edit" />
- </c:when>
- <c:otherwise>
- <bean:message key="iss.slave.create" />
- </c:otherwise>
- </c:choose>
- </html:submit>
- </div>
-
- </html:form>
- <c:if test="${requestScope.sid > 0}">
- <h2>
- <bean:message key="iss.editslave.jsp.allowed.orgs.header" />
- </h2>
- <rl:listset name="localOrgsListSet">
- <rhn:csrf />
- <rhn:submitted />
- <rl:list dataset="localOrgsList" name="localOrgsList"
- emptykey="editslave.jsp.nolocalorgs">
- <rl:decorator name="SelectableDecorator" />
- <rl:selectablecolumn value="${current.selectionKey}"
- selected="${current.selected}" />
- <rl:column sortable="true" headerkey="iss.localorg.name"
sortattr="name">
- <c:out value="${current.name}" />
- </rl:column>
- </rl:list>
- <div align="right">
- <rhn:submitted />
- <hr />
- <input type="submit" name="dispatch"
- value='<bean:message key="iss.slave.associate"/>' />
- </div>
- </rl:listset>
- </c:if>
-
-</body>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <c:choose>
+ <c:when test="${requestScope.sid > 0}">
+ <bean:message key="iss.slave.edit" />
+ </c:when>
+ <c:otherwise>
+ <bean:message key="iss.slave.create" />
+ </c:otherwise>
+ </c:choose>
+ </html:submit>
+ </div>
+ </div>
+ </html:form>
+ <c:if test="${requestScope.sid > 0}">
+ <h2><bean:message
key="iss.editslave.jsp.allowed.orgs.header" /></h2>
+ <rl:listset name="localOrgsListSet">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list dataset="localOrgsList"
name="localOrgsList"
+ emptykey="editslave.jsp.nolocalorgs">
+ <rl:decorator name="SelectableDecorator" />
+ <rl:selectablecolumn value="${current.selectionKey}"
+ selected="${current.selected}" />
+ <rl:column sortable="true"
headerkey="iss.localorg.name" sortattr="name">
+ <c:out value="${current.name}" />
+ </rl:column>
+ </rl:list>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <rhn:submitted />
+ <input type="submit" name="dispatch"
class="btn btn-success"
+ value='<bean:message
key="iss.slave.associate"/>' />
+ </div>
+ </div>
+ </rl:listset>
+ </c:if>
+ </body>
</html:html>
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 043ddea..14bca4d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/master.jsp
@@ -3,88 +3,86 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
<%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<html:html xhtml="true">
-<body>
+<html:html>
+ <body>
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
- creationUrl="/rhn/admin/iss/EditSlave.do" creationType="slave"
- creationAcl="user_role(satellite_admin)">
- <bean:message key="iss.master.jsp.toolbar" />
- </rhn:toolbar>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
+ creationUrl="/rhn/admin/iss/EditSlave.do"
creationType="slave"
+ creationAcl="user_role(satellite_admin)">
+ <bean:message key="iss.master.jsp.toolbar" />
+ </rhn:toolbar>
-<p><bean:message key="iss.master.jsp.explanation" /></p>
+ <p><bean:message key="iss.master.jsp.explanation"
/></p>
- <rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/iss_config.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <c:set var="pageList" value="${requestScope.all}" />
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/iss_config.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <c:set var="pageList" value="${requestScope.all}" />
- <h2>
- <bean:message key="iss.master.jsp.header2" />
- </h2>
+ <h2>
+ <bean:message key="iss.master.jsp.header2" />
+ </h2>
- <rl:listset name="issSlaveListSet">
- <rhn:csrf />
- <rhn:submitted />
- <rl:list dataset="pageList" name="issSlaveList"
- emptykey="iss.master.jsp.noslaves">
- <rl:decorator name="SelectableDecorator" />
- <rl:selectablecolumn value="${current.selectionKey}"
- selected="${current.selected}" />
- <rl:column sortable="true" headerkey="iss.slave.name"
sortattr="slave">
- <html:link href="/rhn/admin/iss/EditSlave.do?sid=${current.id}">
- <c:out value="${current.slave}" />
- </html:link>
- </rl:column>
- <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"/>" />
- </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"/>" />
- </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"/>" />
- </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"/>" />
- </c:if>
- </rl:column>
- <rl:column bound="false"
headerkey="iss.slave.num-orgs-allowed"
- styleclass="center" headerclass="center">
- <c:if test="${current.enabled != 'Y'}">
- <bean:message key="iss.slave.disabled"/>
- </c:if>
- <c:if test="${current.enabled == 'Y' && current.allowAllOrgs
== 'Y'}">
- <bean:message key="iss.slave.all-allowed"/>
- </c:if>
- <c:if test="${current.enabled == 'Y' && current.allowAllOrgs
!= 'Y'}">
- <c:out value="${current.numAllowedOrgs}" />
- </c:if>
- </rl:column>
+ <rl:listset name="issSlaveListSet">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list dataset="pageList" name="issSlaveList"
+ emptykey="iss.master.jsp.noslaves">
+ <rl:decorator name="SelectableDecorator" />
+ <rl:selectablecolumn value="${current.selectionKey}"
+ selected="${current.selected}" />
+ <rl:column sortable="true"
headerkey="iss.slave.name" sortattr="slave">
+ <html:link
href="/rhn/admin/iss/EditSlave.do?sid=${current.id}">
+ <c:out value="${current.slave}" />
+ </html:link>
+ </rl:column>
+ <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"/>" />
+ </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"/>" />
+ </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"/>" />
+ </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"/>" />
+ </c:if>
+ </rl:column>
+ <rl:column bound="false"
headerkey="iss.slave.num-orgs-allowed"
+ styleclass="center"
headerclass="center">
+ <c:if test="${current.enabled != 'Y'}">
+ <bean:message key="iss.slave.disabled"/>
+ </c:if>
+ <c:if test="${current.enabled == 'Y' &&
current.allowAllOrgs == 'Y'}">
+ <bean:message key="iss.slave.all-allowed"/>
+ </c:if>
+ <c:if test="${current.enabled == 'Y' &&
current.allowAllOrgs != 'Y'}">
+ <c:out value="${current.numAllowedOrgs}" />
+ </c:if>
+ </rl:column>
- </rl:list>
- <c:if test="${not empty requestScope.all}">
- <div align="right">
- <rhn:submitted />
- <hr />
- <input type="submit" name="dispatch"
- value='<bean:message key="iss.slave.remove"/>' />
- </div>
- </c:if>
- </rl:listset>
-
-</body>
+ </rl:list>
+ <c:if test="${not empty requestScope.all}">
+ <div align="right">
+ <rhn:submitted />
+ <input type="submit" name="dispatch"
class="btn btn-default"
+ value='<bean:message
key="iss.slave.remove"/>' />
+ </div>
+ </c:if>
+ </rl:listset>
+ </body>
</html:html>
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 445eff3..f726814 100644
--- a/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/iss/slave.jsp
@@ -3,68 +3,59 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
<%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<html:html xhtml="true">
-<body>
-
- <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
- creationUrl="/rhn/admin/iss/EditMaster.do" creationType="master"
- creationAcl="user_role(satellite_admin)">
- <bean:message key="iss.slave.jsp.toolbar" />
- </rhn:toolbar>
-
-<p><bean:message key="iss.slave.jsp.explanation" /></p>
-
- <rhn:dialogmenu mindepth="0" maxdepth="1"
- definition="/WEB-INF/nav/iss_config.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
- <c:set var="pageList" value="${requestScope.all}" />
-
- <h2>
- <bean:message key="iss.slave.jsp.header2" />
- </h2>
-
- <rl:listset name="issMasterListSet">
- <rhn:csrf />
- <rhn:submitted />
- <rl:list dataset="pageList" name="issMasterList"
- emptykey="iss.slave.jsp.nomasters">
- <rl:decorator name="SelectableDecorator" />
- <rl:selectablecolumn value="${current.selectionKey}"
- selected="${current.selected}" />
- <rl:column sortable="true" headerkey="iss.master.label"
sortattr="label">
- <html:link href="/rhn/admin/iss/EditMaster.do?id=${current.id}">
- <c:out value="${current.label}" />
- </html:link>
- </rl:column>
- <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"/>" />
- </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"/>"
/>
- </c:if>
- </rl:column>
- <rl:column headerkey="iss.num.master.orgs" styleclass="center"
headerclass="center">
- <c:out value="${current.numMasterOrgs}" />
- </rl:column>
- <rl:column headerkey="iss.num.unmapped.orgs"
styleclass="center" headerclass="center">
- <c:out value="${current.numMasterOrgs - current.numMappedMasterOrgs}"
/>
- </rl:column>
- </rl:list>
- <c:if test="${not empty requestScope.all}">
- <div align="right">
- <rhn:submitted />
- <hr />
- <input type="submit" name="dispatch"
- value='<bean:message key="iss.master.remove"/>' />
- </div>
- </c:if>
- </rl:listset>
-
-</body>
+<html:html>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
+ creationUrl="/rhn/admin/iss/EditMaster.do"
creationType="master"
+ creationAcl="user_role(satellite_admin)">
+ <bean:message key="iss.slave.jsp.toolbar" />
+ </rhn:toolbar>
+ <p><bean:message key="iss.slave.jsp.explanation"
/></p>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
+ definition="/WEB-INF/nav/iss_config.xml"
+
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <c:set var="pageList" value="${requestScope.all}" />
+ <h2><bean:message key="iss.slave.jsp.header2"
/></h2>
+ <rl:listset name="issMasterListSet">
+ <rhn:csrf />
+ <rhn:submitted />
+ <rl:list dataset="pageList" name="issMasterList"
+ emptykey="iss.slave.jsp.nomasters">
+ <rl:decorator name="SelectableDecorator" />
+ <rl:selectablecolumn value="${current.selectionKey}"
+ selected="${current.selected}" />
+ <rl:column sortable="true"
headerkey="iss.master.label" sortattr="label">
+ <html:link
href="/rhn/admin/iss/EditMaster.do?id=${current.id}">
+ <c:out value="${current.label}" />
+ </html:link>
+ </rl:column>
+ <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"/>" />
+ </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"/>" />
+ </c:if>
+ </rl:column>
+ <rl:column headerkey="iss.num.master.orgs"
styleclass="center" headerclass="center">
+ <c:out value="${current.numMasterOrgs}" />
+ </rl:column>
+ <rl:column headerkey="iss.num.unmapped.orgs"
styleclass="center" headerclass="center">
+ <c:out value="${current.numMasterOrgs -
current.numMappedMasterOrgs}" />
+ </rl:column>
+ </rl:list>
+ <c:if test="${not empty requestScope.all}">
+ <div align="right">
+ <rhn:submitted />
+ <input type="submit" name="dispatch"
class="btn btn-default"
+ value='<bean:message
key="iss.master.remove"/>' />
+ </div>
+ </c:if>
+ </rl:listset>
+ </body>
</html:html>
commit 2e0c0e51abbb1d3d35d35709f7b470a513fd455b
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Tue Oct 15 16:39:24 2013 +0200
Systems Selected Toolbar function to hide the tooldbar when there is no systems
selected
diff --git a/web/html/javascript/spacewalk-essentials.js
b/web/html/javascript/spacewalk-essentials.js
index e693ab0..5cd6ef4 100644
--- a/web/html/javascript/spacewalk-essentials.js
+++ b/web/html/javascript/spacewalk-essentials.js
@@ -1,27 +1,43 @@
$(document).on("ready", function(){
- /* Menu in the left column - actions to hide submenu and create animation when a
- menu only has submenues and doesnt have a URL */
- $("#sidenav ul>ul").hide();
+ /* Menu in the left column - actions to hide submenu and create animation when a
+ menu only has submenues and doesnt have a URL */
+ $("#sidenav ul>ul").hide();
- $("#sidenav li.active").each(function() {
- $(this).next("ul").show(300);
- });
+ $("#sidenav li.active").each(function() {
+ $(this).next("ul").show(300);
+ });
- /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is
pressed or when
- no system is selected */
- $("#clearbtn").click(hidesystemtool);
- function hidesystemtool(){
- $(".spacewalk-bar").animate({
- "right": "-=50px",
- "opacity": "0"},
- 300, function() {
- /* after animation is complete we hide the element */
- $(this).hide();
- });
- }
-});
+ /* Systems Selected Toolbar - actions to hide the toolbar when th Clear button is
pressed or when
+ no system is selected */
+ $("#clearbtn").click(hidesystemtool);
+ function hidesystemtool(){
+ $(".spacewalk-bar").animate({
+ "right": "-=50px",
+ "opacity": "0"},
+ 300, function() {
+ /* after animation is complete we hide the element */
+ $(this).hide();
+ });
+ }
+ // See if there is a system selected
+ ssmToolbar();
+ $("#spacewalk-ssm-counter").on("change", ssmToolbar);
+ function ssmToolbar(){
+ console.log("entro");
+ var systemsSpan = $("#spacewalk-ssm-counter").text();
+ if (systemsSpan == 0){
+ $(".spacewalk-bar").animate({"opacity": "0"}, 300,
function() {
+ /* stuff to do after animation is complete */
+ //$(this).hide();
+ });
+ }else{
+ (".spacewalk-bar").animate({"opacity":"100"}, 300);
+ }
+ }
+});
+/* Getting the screen size to create a fixed padding-bottom in the Section tag to make
both columns the same size */
// On window load
$(window).load(function () {
columnHeight();
@@ -29,35 +45,33 @@ $(window).load(function () {
// On window resize
$(window).resize( function () {
- $("section.col-md-10").css("padding-bottom", "");
- columnHeight();
+ $("section.col-md-10").css("padding-bottom", "");
+ columnHeight();
});
// Make columns 100% in height
function columnHeight() {
//Only if the screen size is higher than the max-width set up in the Variables.less
under the definition @screen-md:
//PLEASE: update this if you change the content of @screen-md
- //if ($(document).width()>992) {
- var sectionHeight = $("section.col-md-10").outerHeight();
- var heightDoc = $(document).height();
- // Column heights should equal the document height minus the header height and
footer height
- var newHeight = heightDoc - 160 - sectionHeight + "px";
- $("section.col-md-10").animate({
- "padding-bottom": newHeight},
- 200);
- //};
+ if ($(document).width()>992) {
+ var sectionHeight = $("section.col-md-10").outerHeight();
+ var heightDoc = $(document).height();
+ // Column heights should equal the document height minus the header height and footer
height
+ var newHeight = heightDoc - 160 - sectionHeight + "px";
+ $("section.col-md-10").css("padding-bottom", newHeight);
+ };
};
// Render page fragments loaded via DWR
function makeAjaxCallback(divId, debug) {
- cb = function(text) {
- if (debug) {
- alert(text);
- }
- $('#' + divId).html(text);
- $('#' + divId).fadeIn();
- columnHeight();
- };
- return cb;
+ cb = function(text) {
+ if (debug) {
+ alert(text);
+ }
+ $('#' + divId).html(text);
+ $('#' + divId).fadeIn();
+ columnHeight();
+ };
+ return cb;
}
commit 829a5dfaea20df63c757dddae50d8d2077efce86
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Tue Oct 15 16:38:16 2013 +0200
spacewalk-bar pushed to the right
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp
b/java/code/webapp/WEB-INF/includes/header.jsp
index d5d9867..0fe4ffe 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -80,7 +80,7 @@
</rhn:require>
<rhn:require acl="user_authenticated()">
<div id="bar">
- <div class="spacewalk-bar">
+ <div class="spacewalk-bar pull-right">
<span id="header_selcount">
<rhn:setdisplay user="${requestScope.session.user}" />
</span>
commit 7babf831d133584dcd7529f8322fae4e52c4e8c7
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Tue Oct 15 16:27:28 2013 +0200
Roboto loaded locally
diff --git a/branding/css/mixins.less b/branding/css/mixins.less
index e0daa17..1347e24 100644
--- a/branding/css/mixins.less
+++ b/branding/css/mixins.less
@@ -1,10 +1,8 @@
.Roboto-thin{
- font-family: @roboto-font;
- font-weight: 300;
+ font-family: @roboto-light;
}
.Roboto-strong{
- font-family: @roboto-font;
- font-weight: 700;
+ font-family: @roboto-bold;
}
/* Mixings */
diff --git a/branding/css/roboto.less b/branding/css/roboto.less
new file mode 100644
index 0000000..ee4a6ac
--- /dev/null
+++ b/branding/css/roboto.less
@@ -0,0 +1,14 @@
+@font-face {
+ font-family: 'Roboto Light';
+ font-style: normal;
+ font-weight: 300;
+ //src: url('Roboto/Roboto-Light.eot');
+ src: local('Roboto Light'), local('RobotoLight'),
url('../fonts/Roboto/Roboto-Light.ttf') format('truetype');
+}
+@font-face {
+ font-family: 'Roboto Bold';
+ font-style: normal;
+ font-weight: 300;
+ //src: url('Roboto/Roboto-Light.eot');
+ src: local('Roboto Bold'), local('RobotoBold'),
url('../fonts/Roboto/Roboto-Bold.ttf') format('truetype');
+}
\ No newline at end of file
diff --git a/branding/css/spacewalk.less b/branding/css/spacewalk.less
index a4f797b..12482b7 100644
--- a/branding/css/spacewalk.less
+++ b/branding/css/spacewalk.less
@@ -3,8 +3,8 @@
/* Here begins the spacewalk css theme */
-/* Import of Roboto font */
-@import
url(http://fonts.googleapis.com/css?family=Roboto:300,700);
+/* Roboto font */
+@import url(roboto.less);
/* Spacewalk variables */
@import url(variables.less);
/* Spacewalk mixins */
diff --git a/branding/css/variables.less b/branding/css/variables.less
index fbda6a6..112839e 100644
--- a/branding/css/variables.less
+++ b/branding/css/variables.less
@@ -8,7 +8,7 @@
@gray-light: lighten(#000, 80%); // #999
@gray-lighter: lighten(#000, 95%); // #eee
-@spacewalk-blue: #00aad4;
+@spacewalk-blue: #00aad4;
@spacewalk-updates-green: #7ac142;
@spacewalk-security-red: #a81a1a;
@@ -28,4 +28,5 @@
@spacewalk-list-second-submenu-hover: lighten(@spacewalk-list-second-submenu, 2%);
/* Roboto variable: font variable to be applied in different text elements*/
-@roboto-font: 'Roboto', sans-serif;
\ No newline at end of file
+@roboto-light: 'Roboto Light', sans-serif;
+@roboto-bold: 'Roboto Bold', sans-serif;
\ No newline at end of file
diff --git a/branding/fonts/Roboto/LICENSE.txt b/branding/fonts/Roboto/LICENSE.txt
new file mode 100755
index 0000000..d645695
--- /dev/null
+++ b/branding/fonts/Roboto/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+
http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+
http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/branding/fonts/Roboto/Roboto-Bold.ttf
b/branding/fonts/Roboto/Roboto-Bold.ttf
new file mode 100755
index 0000000..aaf374d
Binary files /dev/null and b/branding/fonts/Roboto/Roboto-Bold.ttf differ
diff --git a/branding/fonts/Roboto/Roboto-Light.ttf
b/branding/fonts/Roboto/Roboto-Light.ttf
new file mode 100755
index 0000000..664e1b2
Binary files /dev/null and b/branding/fonts/Roboto/Roboto-Light.ttf differ
commit a1c9db750f7ecc4f3b001e8b346ee0f1356b3418
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Oct 15 15:40:32 2013 +0200
TB3: Admin/Config/Boostrap form
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
index 1e33640..f2efc48 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
@@ -3,108 +3,110 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<html:html xhtml="true">
-<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
- <bean:message key="bootstrap.jsp.toolbar"/>
-</rhn:toolbar>
-
-<div class="page-summary">
- <p>
- <bean:message key="bootstrap.jsp.summary"/>
- </p>
-</div>
-
-
-<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
-<h2><bean:message key="bootstrap.jsp.header2"/></h2>
-
-<div>
-<html:form action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}"
enctype="multipart/form-data">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th>
- <label for="hostname"><rhn:required-field
key="bootstrap.jsp.hostname"/>:</label>
- </th>
- <td>
- <html:text size="32" property="hostname"
styleId="hostname" />
- </td>
- </tr>
- <tr>
- <th>
- <label for="ssl-cert"><rhn:required-field
key="bootstrap.jsp.ssl-cert"/>:</label>
- </th>
- <td>
- <html:text size="32" property="ssl-cert"
styleId="ssl-cert" />
- </td>
- </tr>
- <tr>
- <th>
- <label for="ssl"><bean:message
key="bootstrap.jsp.ssl"/></label>
- </th>
- <td>
- <html:checkbox property="ssl" styleId="ssl" />
- </td>
- </tr>
- <tr>
- <th>
- <label for="gpg"><bean:message
key="bootstrap.jsp.gpg"/></label>
- </th>
- <td>
- <html:checkbox property="gpg" styleId="gpg" />
- </td>
- </tr>
- <tr>
- <th>
- <label for="allow-config-actions"><bean:message
key="bootstrap.jsp.allow-config-actions"/></label>
- </th>
- <td>
- <html:checkbox property="allow-config-actions"
styleId="allow-config-actions"/>
- </td>
- </tr>
- <tr>
- <th>
- <label for="allow-remote-commands"><bean:message
key="bootstrap.jsp.allow-remote-commands"/></label>
- </th>
- <td>
- <html:checkbox property="allow-remote-commands"
styleId="allow-remote-commands" />
- </td>
- </tr>
- <tr>
- <th>
- <label for="http-proxy"><bean:message
key="bootstrap.jsp.http-proxy"/></label>
- </th>
- <td>
- <html:text size="32" property="http-proxy"
styleId="http-proxy" />
- </td>
- </tr>
- <tr>
- <th>
- <label for="http-proxy-username"><bean:message
key="bootstrap.jsp.http-proxy-username"/></label>
- </th>
- <td>
- <html:text size="32" property="http-proxy-username"
styleId="http-proxy-username" />
- </td>
- </tr>
- <tr>
- <th>
- <label for="http-proxy-password"><bean:message
key="bootstrap.jsp.http-proxy-password"/></label>
- </th>
- <td>
- <html:text size="32" property="http-proxy-password"
styleId="http-proxy-password" />
- </td>
- </tr>
-
- </table>
- <hr/>
- <div align="right"><html:submit><bean:message
key="config.update"/></html:submit></div>
- <html:hidden property="suite_id"
value="${probeSuite.id}"/>
- <html:hidden property="submitted" value="true"/>
-</html:form>
-</div>
-
-</body>
+<html:html>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <bean:message key="bootstrap.jsp.toolbar"/>
+ </rhn:toolbar>
+ <div class="page-summary">
+ <p><bean:message
key="bootstrap.jsp.summary"/></p>
+ </div>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <h2><bean:message key="bootstrap.jsp.header2"/></h2>
+ <html:form
action="/admin/config/BootstrapConfig?csrf_token=${csrfToken}"
+ styleClass="form-horizontal"
+ enctype="multipart/form-data">
+ <rhn:csrf />
+ <div class="form-group">
+ <label for="hostname" class="col-lg-3
control-label">
+ <rhn:required-field key="bootstrap.jsp.hostname"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text size="32" property="hostname"
styleId="hostname" styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="ssl-cert">
+ <rhn:required-field key="bootstrap.jsp.ssl-cert"/>:
+ </label>
+ <div class="col-lg-6">
+ <html:text size="32" property="ssl-cert"
styleId="ssl-cert" styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="ssl"
styleId="ssl" />
+ <bean:message key="bootstrap.jsp.ssl"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="gpg"
styleId="gpg" />
+ <bean:message key="bootstrap.jsp.gpg"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="allow-config-actions"
styleId="allow-config-actions"/>
+ <bean:message
key="bootstrap.jsp.allow-config-actions"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <div class="checkbox">
+ <label>
+ <html:checkbox property="allow-remote-commands"
styleId="allow-remote-commands" />
+ <bean:message
key="bootstrap.jsp.allow-remote-commands"/>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="http-proxy">
+ <bean:message key="bootstrap.jsp.http-proxy"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text size="32" property="http-proxy"
styleId="http-proxy" styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="http-proxy-username" class="col-lg-3
control-label">
+ <bean:message
key="bootstrap.jsp.http-proxy-username"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text size="32"
property="http-proxy-username" styleClass="form-control"
styleId="http-proxy-username" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="http-proxy-password">
+ <bean:message
key="bootstrap.jsp.http-proxy-password"/>
+ </label>
+ <div class="col-lg-6">
+ <html:text size="32"
property="http-proxy-password" styleId="http-proxy-password"
styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="config.update"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="suite_id"
value="${probeSuite.id}"/>
+ <html:hidden property="submitted" value="true"/>
+ </html:form>
+ </body>
</html:html>
commit 4de5cd6c6c1647bae17aee58befa694f285fb983
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Oct 15 14:36:12 2013 +0200
Remove obsolete inline script (replaced by code in spacewalk-login.js)
diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp
b/java/code/webapp/WEB-INF/pages/common/login.jsp
index 784c6af..f850de8 100644
--- a/java/code/webapp/WEB-INF/pages/common/login.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/login.jsp
@@ -7,16 +7,8 @@
<meta name="decorator" content="layout_c" />
<script src="/javascript/focus.js"></script>
<script src="/javascript/spacewalk-login.js"></script>
- <script>
- // Remove the aside to center the login
- function setupLogin() {
- $$("aside").invoke("remove");
- $$("section").invoke("removeClassName",
"col-md-10");
- $$("section").invoke("addClassName", "col-md-8
col-md-offset-2");
- }
- </script>
</head>
-<body onLoad="formFocus('loginForm',
'username');setupLogin();">
+<body onLoad="formFocus('loginForm', 'username');">
<c:if test="${schemaUpgradeRequired == 'true'}">
<div class="site-alert">
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index 0d07a47..a3d0131 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -6,16 +6,8 @@
<head>
<script src="/javascript/focus.js"></script>
<script src="/javascript/spacewalk-login.js"></script>
- <script>
- // Remove the aside to center the login
- function setupLogin() {
- $$("aside").invoke("remove");
- $$("section").invoke("removeClassName",
"col-md-10");
- $$("section").invoke("addClassName", "col-md-8
col-md-offset-2");
- }
- </script>
</head>
-<body onLoad="formFocus('loginForm',
'username');setupLogin();">
+<body onLoad="formFocus('loginForm', 'username');">
<c:if test="${schemaUpgradeRequired == 'true'}">
<div class="site-alert">
commit 73969c6826ace5650a6693c32742e1025694694a
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Oct 15 13:57:43 2013 +0200
TB3: Admin/Configuration/Certificate form
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
index 70a7891..0297362 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
@@ -3,51 +3,47 @@
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<html:html xhtml="true">
-<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
- <bean:message key="certificate.jsp.toolbar"/>
-</rhn:toolbar>
-
-<div class="page-summary">
- <p>
- <bean:message key="certificate.jsp.summary"/>
- </p>
-</div>
-
-
-<rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
-<h2><bean:message key="certificate.jsp.header2"/></h2>
-
-<div>
-<html:form action="/admin/config/CertificateConfig?csrf_token=${csrfToken}"
enctype="multipart/form-data">
- <rhn:csrf />
- <table class="details">
- <tr>
- <th>
- <rhn:required-field key="certificate.jsp.cert_file"/>
- </th>
- <td>
- <html:file property="cert_file"/>
- </td>
- </tr>
- <tr>
- <th>
- <rhn:required-field key="certificate.jsp.cert_text"/>
- </th>
- <td>
- <html:textarea cols="80" rows="24"
property="cert_text" />
- </td>
- </tr>
- </table>
- <hr/>
- <div align="right"><html:submit><bean:message
key="config.update"/></html:submit></div>
- <html:hidden property="suite_id"
value="${probeSuite.id}"/>
- <html:hidden property="submitted" value="true"/>
-</html:form>
-</div>
-
-</body>
+<html:html>
+ <body>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <bean:message key="certificate.jsp.toolbar"/>
+ </rhn:toolbar>
+
+ <div class="page-summary">
+ <p><bean:message
key="certificate.jsp.summary"/></p>
+ </div>
+ <rhn:dialogmenu mindepth="0" maxdepth="1"
definition="/WEB-INF/nav/sat_config.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+ <h2><bean:message
key="certificate.jsp.header2"/></h2>
+ <html:form
action="/admin/config/CertificateConfig?csrf_token=${csrfToken}"
+ styleClass="form-horizontal"
+ enctype="multipart/form-data">
+ <rhn:csrf />
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="certfile">
+ <rhn:required-field
key="certificate.jsp.cert_file"/>
+ </label>
+ <div class="col-lg-6">
+ <html:file property="cert_file"
styleId="certfile" styleClass="form-control"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label"
for="certtext">
+ <rhn:required-field
key="certificate.jsp.cert_text"/>
+ </label>
+ <div class="col-lg-6">
+ <html:textarea cols="80" rows="24"
property="cert_text" styleClass="form-control"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <html:submit styleClass="btn btn-success">
+ <bean:message key="config.update"/>
+ </html:submit>
+ </div>
+ </div>
+ <html:hidden property="suite_id"
value="${probeSuite.id}"/>
+ <html:hidden property="submitted" value="true"/>
+ </html:form>
+ </body>
</html:html>
-