spacewalk-commits December 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
227 discussions

Start a nNew thread

Branch 'master-pxe-default-image' - 0 commits -
by Silvio Moioli 06 Dec '13

06 Dec '13

Rebased ref, commits from common ancestor:

1 0

Changes to 'refs/tags/spacewalk-search-2.1.7-1'
by Tomas Lestach 06 Dec '13

06 Dec '13

Tag 'spacewalk-search-2.1.7-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-12-06 16:04 +0000 Tagging package [spacewalk-search] version [2.1.7-1] in directory [search-server/spacewalk-search/]. Changes since spacecmd-2.1.18-1: Matej Kollar (1): removed trailing whitespaces from jsp{,f} sources Tomas Lestach (15): 1023669 - remove original setSessionTimeZone 1023669 - migrate to mybatis 1023669 - adapt code for mybatis 1023669 - replace ibatis jar with mybatis 1023669 - require and link cglib-nodep and objectweb-asm 1023669 - require and link c3p0 1023669 - link cglib-node and objectweb-asm for DelteIndexes 1023669 - introduce C3P0DataSourceFactory 1023669 - add connection customizer 1023669 - fix list iterations as query parameters 1023669 - start using errata visibility 1023669 - start using verifyServerVisibility 1023669 - remove unused logger 1023669 - have unique id for SnapshotTag Automatic commit of package [spacewalk-search] release [2.1.7-1]. --- dev/null |binary java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 8 java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 14 - java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 18 - java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 6 java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 4 java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 8 java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 8 java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 6 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 12 - java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 14 - java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 6 java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 14 - java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 8 java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4 java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 30 +-- java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 38 +-- java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 12 - java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 16 - java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 6 java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 4 java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 6 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 14 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf | 24 +- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf | 18 - java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 22 +- java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 14 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 8 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 6 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 12 - java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp | 20 +- java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp | 24 +- java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp | 12 - java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4 java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 2 java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 8 java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 8 java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp | 8 java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 8 java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 4 java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp | 2 java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 8 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 6 java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 8 java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 6 java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 4 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 4 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 18 - java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 8 java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 4 java/code/webapp/WEB-INF/pages/systems/errata.jsp | 20 +- java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/overview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/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 | 18 - java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 4 java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 6 java/code/webapp/WEB-INF/pages/yourrhn.jsp | 2 rel-eng/packages/spacewalk-search | 2 search-server/spacewalk-search/build.properties | 2 search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar |binary search-server/spacewalk-search/spacewalk-search.spec | 22 ++ search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml | 76 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 44 +--- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml | 29 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 48 ++-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 69 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml | 31 +-- search-server/spacewalk-search/src/config/rhn-search | 2 search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java | 31 +++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java | 72 +++++++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java | 97 ---------- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 52 ----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java | 19 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java | 31 +-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java | 27 +- search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java | 9 search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java | 4 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java | 5 165 files changed, 794 insertions(+), 881 deletions(-) ---

1 0

15 commits - rel-eng/packages search-server/spacewalk-search
by Tomas Lestach 06 Dec '13

06 Dec '13

dev/null |binary rel-eng/packages/spacewalk-search | 2 search-server/spacewalk-search/build.properties | 2 search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar |binary search-server/spacewalk-search/spacewalk-search.spec | 22 ++ search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml | 76 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 44 +--- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml | 29 +- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 48 ++-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 69 +++---- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml | 35 +-- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml | 31 +-- search-server/spacewalk-search/src/config/rhn-search | 2 search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java | 31 +++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java | 72 +++++++ search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java | 97 ---------- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 52 ----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java | 19 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java | 31 +-- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java | 27 +- search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java | 9 search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 6 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java | 4 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 8 search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java | 5 29 files changed, 359 insertions(+), 446 deletions(-) New commits: commit 56ae852cf76565d58ca13a6dc441265ea521f013 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 17:04:32 2013 +0100 Automatic commit of package [spacewalk-search] release [2.1.7-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 57e73af..bd48388 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.6-1 search-server/spacewalk-search/ +2.1.7-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 5cc0ee8..101e000 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 2.1.6 +Version: 2.1.7 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -186,6 +186,22 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Fri Dec 06 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.7-1 +- 1023669 - have unique id for SnapshotTag +- 1023669 - remove unused logger +- 1023669 - start using verifyServerVisibility +- 1023669 - start using errata visibility +- 1023669 - fix list iterations as query parameters +- 1023669 - add connection customizer +- 1023669 - introduce C3P0DataSourceFactory +- 1023669 - link cglib-node and objectweb-asm for DelteIndexes +- 1023669 - require and link c3p0 +- 1023669 - require and link cglib-nodep and objectweb-asm +- 1023669 - replace ibatis jar with mybatis +- 1023669 - adapt code for mybatis +- 1023669 - migrate to mybatis +- 1023669 - remove original setSessionTimeZone + * Fri Nov 15 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.6-1 - Fix custom info value index removal in advanced search commit 9c6c5ec64dffb23dea2d413acc10cd70034787e2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 14:50:39 2013 +0100 1023669 - have unique id for SnapshotTag diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java index 732f56a..a59f5bd 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/SnapshotTag.java @@ -20,7 +20,6 @@ package com.redhat.satellite.search.db.models; * @version $Rev$ */ public class SnapshotTag extends GenericRecord { - private long id; private long snapshotId; private long tagNameId; private long serverId; @@ -28,18 +27,19 @@ public class SnapshotTag extends GenericRecord { private String name; private String created; private String modified; - /** - * @return the id - */ - public long getId() { - return id; - } - /** - * @param idIn the id to set - */ - public void setId(long idIn) { - this.id = idIn; - } + + private String makeUniqId(long serverIdIn, long snapshotdIn) { + return serverIdIn + "-" + snapshotdIn; + } + + /** + * + * @return uniqId + */ + public String getUniqId() { + return makeUniqId(serverId, snapshotId); + } + /** * @return the snapshotId */ @@ -124,5 +124,4 @@ public class SnapshotTag extends GenericRecord { public void setModified(String modifiedIn) { this.modified = modifiedIn; } - } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java index 1e31647..78bc0b4 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSnapshotTagsTask.java @@ -36,6 +36,7 @@ public class IndexSnapshotTagsTask extends GenericIndexTask { throws ClassCastException { SnapshotTag sTag = (SnapshotTag)data; Map<String, String> attrs = new HashMap<String, String>(); + attrs.put("uniqId", sTag.getUniqId()); attrs.put("snapshotId", new Long(sTag.getSnapshotId()).toString()); attrs.put("tagNameId", new Long(sTag.getTagNameId()).toString()); attrs.put("serverId", new Long(sTag.getServerId()).toString()); @@ -98,9 +99,9 @@ public class IndexSnapshotTagsTask extends GenericIndexTask { * {@inheritDoc} */ public String getUniqueFieldId() { - return "tagNameId"; + return "uniqId"; } - + /** * {@inheritDoc} */ commit 6e9f2b8e96b9b9b771c2c43068430b5f1af2955f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 18:04:31 2013 +0100 1023669 - remove unused logger diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java index 60df540..adee517 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexHardwareDevicesTask.java @@ -18,8 +18,6 @@ import com.redhat.satellite.search.db.models.GenericRecord; import com.redhat.satellite.search.db.models.HardwareDevice; import com.redhat.satellite.search.index.builder.BuilderFactory; -import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.Map; @@ -29,8 +27,6 @@ import java.util.Map; */ public class IndexHardwareDevicesTask extends GenericIndexTask { - private static Logger log = Logger.getLogger(IndexHardwareDevicesTask.class); - /** * {@inheritDoc} */ commit fd0668d0e3782c29ac773ea383774112d0472ec1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 17:07:43 2013 +0100 1023669 - start using verifyServerVisibility diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index 9f761f5..a6a75ac 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -83,13 +83,14 @@ SELECT last_modified from rhnIndexerWork where object_type='server' </select> <select id="verifyServerVisibility" resultType="string"> - SELECT object_id - FROM rhnVisibleObjects - WHERE pxt_session_id = #{session_id} - AND object_type = #{object_type} - AND object_id IN + SELECT DISTINCT s.id + FROM rhnServer s + INNER JOIN rhnUserServerPerms usp ON s.id = usp.server_id + INNER JOIN pxtsessions ps ON ps.web_user_id = usp.user_id + WHERE ps.id = #{session_id} + AND s.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> <select id="maxServerId" resultType="java.lang.Long"> @@ -99,4 +100,4 @@ <select id="queryAllServerIds" resultType="Long"> SELECT id from rhnServer </select> -</mapper> \ No newline at end of file +</mapper> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java index 2e491a4..3832dff 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java @@ -150,7 +150,8 @@ public class IndexHandler { retry = false; List<Result> hits = indexManager.search(indexName, query, lang, isFineGrained); - if (indexName.equals("package") || indexName.equals("errata")) { + if (indexName.equals("package") || indexName.equals("errata") + || indexName.equals("server")) { return screenHits(sessionId, indexName, hits); } return hits; @@ -210,6 +211,9 @@ public class IndexHandler { else if ("errata".equals(indexName)) { query = databaseManager.getQuery("verifyErrataVisibility"); } + else if ("server".equals(indexName)) { + query = databaseManager.getQuery("verifyServerVisibility"); + } else { if (log.isDebugEnabled()) { log.debug("screenHits(" + indexName + commit 773441bc54f5e503f8095b44c528299ce60f8bc5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 11:58:57 2013 +0100 1023669 - start using errata visibility diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index 86736e3..8ae20ae 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -46,13 +46,13 @@ from rhnErrata e, rhnChannelErrata ce, rhnAvailableChannels ac, - pxrsessions ps, + pxtsessions ps, web_contact wc where e.id = ce.errata_id and ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #{sessionId} + ps.id = #{session_id} and e.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> #{item} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java index 26c26f7..2e491a4 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java @@ -150,7 +150,7 @@ public class IndexHandler { retry = false; List<Result> hits = indexManager.search(indexName, query, lang, isFineGrained); - if (indexName.compareTo("package") == 0) { + if (indexName.equals("package") || indexName.equals("errata")) { return screenHits(sessionId, indexName, hits); } return hits; commit fca32356713665947a21ec7b02e0ce0aea22c7cd Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 11:58:33 2013 +0100 1023669 - fix list iterations as query parameters diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index 3f6b9e7..86736e3 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -55,7 +55,7 @@ ps.id = #{sessionId} and e.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> -</mapper> \ No newline at end of file +</mapper> diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml index 61ecd4b..3643781 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml @@ -71,7 +71,7 @@ and ps.id = #{session_id} and p.id IN <foreach collection="id_list" item="item" separator="," close=")" open="("> - #{id_item} + #{item} </foreach> </select> -</mapper> \ No newline at end of file +</mapper> commit 8ad305a04ad2c87ffc1691f3749e6c66e1734db7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 12:02:43 2013 +0100 1023669 - add connection customizer diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index 906d492..bcb2e52 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -19,6 +19,7 @@ <property name="jdbcUrl" value="${search.connection.driver_proto}:${db_name}"/> <property name="user" value="${db_user}"/> <property name="password" value="${db_password}"/> + <property name="connectionCustomizerClassName" value="com.redhat.satellite.search.config.translator.RhnConnectionCustomizer" /> </dataSource> </environment> </environments> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java new file mode 100644 index 0000000..6baa29d --- /dev/null +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/RhnConnectionCustomizer.java @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.satellite.search.config.translator; + +import com.mchange.v2.c3p0.ConnectionCustomizer; +import com.redhat.satellite.search.db.DatabaseManager; + +import org.apache.log4j.Logger; + +import java.lang.reflect.Method; +import java.sql.Connection; +import java.util.TimeZone; +/** + * RhnConnectionCustomizer + * @version $Rev$ + */ +public class RhnConnectionCustomizer implements ConnectionCustomizer { + + private static final Logger LOG = Logger.getLogger(RhnConnectionCustomizer.class); + + /** + * {@inheritDoc} + */ + public void onAcquire(Connection c, String pdsIdt) throws Exception { + if (DatabaseManager.isOracle()) { + try { + Method setSessionTimeZoneMethod = Class.forName( + "oracle.jdbc.driver.OracleConnection").getMethod( + "setSessionTimeZone", String.class); + if (setSessionTimeZoneMethod != null) { + setSessionTimeZoneMethod.invoke(c, TimeZone.getDefault().getID()); + } + } + catch (Exception e) { + LOG.warn("Failed to set session time zone."); + } + } + } + + /** + * {@inheritDoc} + */ + public void onCheckIn(Connection c, String pdsIdt) throws Exception { + // empty + } + + /** + * {@inheritDoc} + */ + public void onCheckOut(Connection c, String pdsIdt) throws Exception { + // empty + } + + /** + * {@inheritDoc} + */ + public void onDestroy(Connection c, String pdsIdt) throws Exception { + // empty + } +} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index d62c0c7..01c9ed1 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -37,7 +37,7 @@ import org.apache.log4j.Logger; public class DatabaseManager { private SqlSessionFactory sessionFactory = null; - private boolean isOracle; + private static boolean isOracle; private static Logger log = Logger.getLogger(DatabaseManager.class); @@ -117,4 +117,8 @@ public class DatabaseManager { public WriteQuery getWriterQuery(String name) { return new WriteQuery(sessionFactory.openSession(), name); } + + public static boolean isOracle() { + return isOracle; + } } commit 628312a320a62114a97ce91c14b6e612287fd2c2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Dec 4 17:25:25 2013 +0100 1023669 - introduce C3P0DataSourceFactory diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index a9ebaa8..906d492 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -13,14 +13,12 @@ <environments default="default"> <environment id="default"> - <transactionManager type="JDBC"> - </transactionManager> - - <dataSource type="SIMPLE"> - <property name="JDBC.Driver" value="${search.connection.driver_class}"/> - <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> - <property name="JDBC.Username" value="${db_user}"/> - <property name="JDBC.Password" value="${db_password}"/> + <transactionManager type="JDBC" /> + <dataSource type="com.redhat.satellite.search.config.translator.C3P0DataSourceFactory"> + <property name="driverClass" value="${search.connection.driver_class}"/> + <property name="jdbcUrl" value="${search.connection.driver_proto}:${db_name}"/> + <property name="user" value="${db_user}"/> + <property name="password" value="${db_password}"/> </dataSource> </environment> </environments> @@ -35,4 +33,4 @@ <mapper resource="com/redhat/satellite/search/db/server_custom_info.xml"/> <mapper resource="com/redhat/satellite/search/db/xccdf_ident.xml"/> </mappers> - </configuration> \ No newline at end of file + </configuration> diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java new file mode 100644 index 0000000..ddf2f6a --- /dev/null +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/translator/C3P0DataSourceFactory.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2013 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.satellite.search.config.translator; + +import com.mchange.v2.c3p0.ComboPooledDataSource; +import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory; + +/** + * DataSourceFactory using c3p0 + * C3P0DataSourceFactory + * @version $Rev$ + */ +public class C3P0DataSourceFactory extends UnpooledDataSourceFactory { + + public C3P0DataSourceFactory() { + this.dataSource = new ComboPooledDataSource(); + } +} commit d0cfd085c7e09688a914d97b999e13d06505b9f1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 16:56:12 2013 +0100 1023669 - link cglib-node and objectweb-asm for DelteIndexes diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search index b00b4de..6bff688 100644 --- a/search-server/spacewalk-search/src/config/rhn-search +++ b/search-server/spacewalk-search/src/config/rhn-search @@ -76,7 +76,7 @@ unlock() { removeindex() { JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc' - SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar` + SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar /usr/share/java/cglib-nodep.jar /usr/share/java/objectweb-asm/asm.jar` CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes } commit bee0af607cb413cc6d7a1a3fb3990b4e6932e614 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Dec 5 15:00:11 2013 +0100 1023669 - require and link c3p0 diff --git a/search-server/spacewalk-search/build.properties b/search-server/spacewalk-search/build.properties index 5fa6842..2cfbe0a 100644 --- a/search-server/spacewalk-search/build.properties +++ b/search-server/spacewalk-search/build.properties @@ -19,4 +19,4 @@ javadoc.method.scope=public javadoc.type.scope=package javadoc.var.scope=package javadoc.lazy=true -jpackage.jars="commons-lang commons-logging redstone-xmlrpc redstone-xmlrpc-client quartz tanukiwrapper log4j commons-httpclient oro commons-cli commons-codec simple-core" +jpackage.jars="commons-lang commons-logging redstone-xmlrpc redstone-xmlrpc-client quartz tanukiwrapper log4j commons-httpclient oro commons-cli commons-codec simple-core c3p0" diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 621e8ac..5cc0ee8 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch #Requires: apache-ibatis-sqlmap +Requires: c3p0 Requires: cglib Requires: doc-indexes Requires: jakarta-commons-cli @@ -46,6 +47,7 @@ Requires: simple-core Obsoletes: rhn-search < 5.3.0 BuildRequires: ant #BuildRequires: apache-ibatis-sqlmap +BuildRequires: c3p0 BuildRequires: jakarta-commons-cli BuildRequires: jakarta-commons-codec BuildRequires: jakarta-commons-httpclient diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 86ec44a..5ca090d 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -45,6 +45,7 @@ wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar wrapper.java.classpath.24=/usr/share/java/cglib-nodep.jar wrapper.java.classpath.25=/usr/share/java/objectweb-asm/asm.jar +wrapper.java.classpath.26=/usr/share/java/c3p0.jar # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=/usr/lib commit 1efa3b50930d8d341032266584d90270864a9999 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 10:37:14 2013 +0100 1023669 - require and link cglib-nodep and objectweb-asm diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index ad9e0a3..621e8ac 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -17,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch #Requires: apache-ibatis-sqlmap +Requires: cglib Requires: doc-indexes Requires: jakarta-commons-cli Requires: jakarta-commons-codec @@ -35,6 +36,7 @@ Requires: jakarta-oro Requires: oro %endif #Requires: lucene +Requires: objectweb-asm Requires: quartz < 2.0 Conflicts: quartz >= 2.0 Requires: redstone-xmlrpc diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index 61e5ef0..86ec44a 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -43,6 +43,9 @@ wrapper.java.classpath.22=/usr/share/java/slf4j/jcl.jar wrapper.java.classpath.23=/usr/share/java/postgresql-jdbc.jar +wrapper.java.classpath.24=/usr/share/java/cglib-nodep.jar +wrapper.java.classpath.25=/usr/share/java/objectweb-asm/asm.jar + # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=/usr/lib wrapper.java.library.path.2=/usr/lib64 commit c8baa2b0d868f0b027a3a746653b413f4ea2548a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 10:35:29 2013 +0100 1023669 - replace ibatis jar with mybatis diff --git a/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar b/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar deleted file mode 100644 index 72dbe19..0000000 Binary files a/search-server/spacewalk-search/buildconf/tempjars/ibatis-2.3.0.677.jar and /dev/null differ diff --git a/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar b/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar new file mode 100644 index 0000000..1ac3064 Binary files /dev/null and b/search-server/spacewalk-search/buildconf/tempjars/mybatis-3.2.3.jar differ commit 8556f444b08486e6b983a64c50614c3d47b1ccf5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 16:51:45 2013 +0100 1023669 - adapt code for mybatis diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf index f2e193d..61e5ef0 100644 --- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf +++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf @@ -15,7 +15,7 @@ wrapper.java.mainclass=com.redhat.satellite.search.Main wrapper.java.classpath.1=/usr/share/rhn/search/classes/ wrapper.java.classpath.2=/usr/share/rhn/search/lib/commons-lang.jar wrapper.java.classpath.3=/usr/share/rhn/search/lib/commons-logging.jar -wrapper.java.classpath.4=/usr/share/rhn/search/lib/ibatis-2.3.0.677.jar +wrapper.java.classpath.4=/usr/share/rhn/search/lib/mybatis-3.2.3.jar wrapper.java.classpath.5=/usr/share/rhn/search/lib/log4j.jar wrapper.java.classpath.6=/usr/share/rhn/search/lib/lucene-core-2.3.2.jar wrapper.java.classpath.7=/usr/share/java/ojdbc14.jar diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java deleted file mode 100644 index e874623..0000000 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Connection.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Copyright (c) 2008--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ - -package com.redhat.satellite.search.db; - -import com.ibatis.sqlmap.client.SqlMapSession; - -import org.apache.log4j.Logger; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * Simplified connection class for executing arbitrary SQL - * - * @version $Rev$ - */ -public class Connection { - private static Logger log = Logger.getLogger(Connection.class); - - private SqlMapSession session; - - /** - * Constructor - * @param sess iBatis session to use - */ - public Connection(SqlMapSession sess) { - session = sess; - } - - /** - * Close down all resources - * @throws SQLException something bad happened - */ - public void close() throws SQLException { - session.close(); - } - - /** - * Executes a query - * @param statement string of valid SQL - * @param handler called on each row - * @throws SQLException something bad happened - */ - public void executeQuery(String statement, ResultHandler handler) throws SQLException { - java.sql.Connection cn = null; - Statement stmt = null; - ResultSet rs = null; - try { - log.warn("start transaction"); - session.startTransaction(); - log.warn("get current connection"); - cn = session.getCurrentConnection(); - log.warn("creating statement"); - stmt = cn.createStatement(); - log.warn("execute query"); - rs = stmt.executeQuery(statement); - log.warn("process resultset"); - while (rs.next()) { - handler.handleRow(rs); - } - } - finally { - try { - log.warn("commit transaction"); - session.commitTransaction(); - } - finally { - try { - if (rs != null) { - log.warn("close RS"); - rs.close(); - } - } - finally { - if (stmt != null) { - log.warn("close STMT"); - stmt.close(); - } - } - } - } - } -} diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 7991436..d62c0c7 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -22,11 +22,12 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.Properties; -import com.ibatis.sqlmap.client.SqlMapClient; -import com.ibatis.sqlmap.client.SqlMapClientBuilder; + import com.redhat.satellite.search.config.Configuration; import com.redhat.satellite.search.config.ConfigException; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.SqlSessionFactoryBuilder; import org.apache.log4j.Logger; /** @@ -35,7 +36,7 @@ import org.apache.log4j.Logger; */ public class DatabaseManager { - private SqlMapClient client = null; + private SqlSessionFactory sessionFactory = null; private boolean isOracle; private static Logger log = Logger.getLogger(DatabaseManager.class); @@ -95,7 +96,7 @@ public class DatabaseManager { } } - client = SqlMapClientBuilder.buildSqlMapClient(reader, overrides); + sessionFactory = new SqlSessionFactoryBuilder(). build(reader, overrides); } /** @@ -105,7 +106,7 @@ public class DatabaseManager { * @return query object */ public <T> Query<T> getQuery(String name) { - return new Query<T>(client.openSession(), name); + return new Query<T>(sessionFactory.openSession(), name); } /** @@ -114,14 +115,6 @@ public class DatabaseManager { * @return query object */ public WriteQuery getWriterQuery(String name) { - return new WriteQuery(client.openSession(), name); - } - - /** - * Opens a direct DB connection - * @return connection object - */ - public Connection getConnection() { - return new Connection(client.openSession()); + return new WriteQuery(sessionFactory.openSession(), name); } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java index d83e744..090aee8 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/Query.java @@ -15,7 +15,7 @@ package com.redhat.satellite.search.db; -import com.ibatis.sqlmap.client.SqlMapSession; +import org.apache.ibatis.session.SqlSession; import java.sql.SQLException; import java.util.ArrayList; @@ -29,10 +29,10 @@ import java.util.List; */ public class Query<T> { - private SqlMapSession session; + private SqlSession session; private String queryName; - Query(SqlMapSession sessionIn, String queryNameIn) { + Query(SqlSession sessionIn, String queryNameIn) { session = sessionIn; queryName = queryNameIn; } @@ -43,12 +43,7 @@ public class Query<T> { */ public void close() throws SQLException { try { - try { - session.commitTransaction(); - } - catch (SQLException e) { - session.endTransaction(); - } + session.commit(); } finally { session.close(); @@ -63,7 +58,7 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public List<T> loadList(Object param) throws SQLException { - List r = session.queryForList(queryName, param); + List r = session.selectList(queryName, param); List<Object> results = r; List<T> retval = new ArrayList<T>(results.size()); for (Object item : results) { @@ -80,7 +75,7 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public T load(Object param) throws SQLException { - return (T)session.queryForObject(queryName, param); + return (T)session.selectOne(queryName, param); } /** @@ -90,6 +85,6 @@ public class Query<T> { */ @SuppressWarnings("unchecked") public T load() throws SQLException { - return (T)session.queryForObject(queryName); + return (T)session.selectOne(queryName); } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java index 9cc76a5..acaa483 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/WriteQuery.java @@ -15,43 +15,38 @@ package com.redhat.satellite.search.db; -import com.ibatis.sqlmap.client.SqlMapSession; +import org.apache.ibatis.session.SqlSession; import java.sql.SQLException; /** * Query for writing (insert, update, delete) to a database - * + * * @version $Rev$ */ public class WriteQuery { - - private SqlMapSession session; + + private SqlSession session; private String queryName; - WriteQuery(SqlMapSession sessionIn, String queryNameIn) { + WriteQuery(SqlSession sessionIn, String queryNameIn) { session = sessionIn; queryName = queryNameIn; } - + /** * Close query and all associated resources * @throws SQLException something bad happened */ public void close() throws SQLException { try { - try { - session.commitTransaction(); - } - catch (SQLException e) { - session.endTransaction(); - } + session.commit(); } finally { session.close(); } - } - + } + /** * Execute update query * @param param query param @@ -61,22 +56,22 @@ public class WriteQuery { public int update(Object param) throws SQLException { return session.update(queryName, param); } - + /** * Execute delete query * @param param query param * @return number of rows updated * @throws SQLException something bad happened - */ + */ public int delete(Object param) throws SQLException { return session.delete(queryName, param); } - + /** * Execute insert query * @param param query param * @throws SQLException something bad happened - */ + */ public void insert(Object param) throws SQLException { session.insert(queryName, param); } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java index 376de7f..c8bd93b 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/DatabaseHandler.java @@ -22,8 +22,6 @@ import com.redhat.satellite.search.index.Result; import com.redhat.satellite.search.index.QueryParseException; import com.redhat.satellite.search.scheduler.ScheduleManager; -import com.ibatis.sqlmap.client.SqlMapException; - import org.apache.log4j.Logger; import redstone.xmlrpc.XmlRpcFault; @@ -93,11 +91,6 @@ public class DatabaseHandler { log.info("Returned " + hits.size() + " records"); return hits; } - catch (SqlMapException e) { - log.warn("Caught SqlMapException: " + e.getMessage()); - e.printStackTrace(); - throw new XmlRpcFault(IndexHandler.DB_ERROR, e.getMessage()); - } catch (SQLException e) { log.warn("Caught SQLException: " + e.getMessage()); e.printStackTrace(); @@ -161,7 +154,7 @@ public class DatabaseHandler { */ private List<Result> runQuery(Long sessionId, String namespace, String queryName, Map<String, Object> args) - throws SQLException, SqlMapException { + throws SQLException { // Look up Query in DB args.put("sessionId", sessionId); Query<Result> query = databaseManager.getQuery(queryName); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java index 9b575bf..df3bf55 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/GenericIndexTask.java @@ -14,7 +14,6 @@ */ package com.redhat.satellite.search.scheduler.tasks; -import com.ibatis.sqlmap.client.SqlMapException; import com.redhat.satellite.search.db.DatabaseManager; import com.redhat.satellite.search.db.Query; import com.redhat.satellite.search.db.WriteQuery; @@ -224,13 +223,6 @@ public abstract class GenericIndexTask implements Job { uniqField = getUniqueFieldId(); indexName = getIndexName(); } - catch (SqlMapException e) { - e.printStackTrace(); - log.info("Error with 'getQueryAllIds()' on " + - super.getClass().toString()); - //just print the warning so we know and skip this method. - return 0; - } finally { if (query != null) { query.close(); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java index a755a06..c9b9ea0 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java @@ -14,7 +14,6 @@ */ package com.redhat.satellite.search.scheduler.tasks; -import com.ibatis.sqlmap.client.SqlMapException; import com.redhat.satellite.search.db.DatabaseManager; import com.redhat.satellite.search.db.Query; import com.redhat.satellite.search.db.models.GenericRecord; @@ -67,13 +66,6 @@ public class IndexServerCustomInfoTask extends GenericIndexTask { uniqField = getUniqueFieldId(); indexName = getIndexName(); } - catch (SqlMapException e) { - e.printStackTrace(); - log.info("Error with 'getQueryAllIds()' on " + - super.getClass().toString()); - //just print the warning so we know and skip this method. - return 0; - } finally { if (query != null) { query.close(); commit 611fbe71f2d77497679a3969744d44971ac6a7a0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Dec 4 11:30:11 2013 +0100 1023669 - migrate to mybatis diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml index 655d953..a9ebaa8 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml @@ -1,39 +1,38 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMapConfig - PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-config-2.dtd"> - -<sqlMapConfig> -  - <settings - cacheModelsEnabled="true" - statementCachingEnabled="false" - enhancementEnabled="true" - lazyLoadingEnabled="true" - maxRequests="100" - maxSessions="10" - maxTransactions="10" - useStatementNamespaces="false" - /> -  - <transactionManager type="JDBC" > - <dataSource type="SIMPLE"> - <property name="JDBC.Driver" value="${search.connection.driver_class}"/> - <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> - <property name="JDBC.Username" value="${db_user}"/> - <property name="JDBC.Password" value="${db_password}"/> - </dataSource> - </transactionManager> -  - <sqlMap resource="com/redhat/satellite/search/db/package.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/errata.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/server.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/errata_handler.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/hwdevice.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/snapshot_tag.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/server_custom_info.xml" /> - <sqlMap resource="com/redhat/satellite/search/db/xccdf_ident.xml" /> -</sqlMapConfig> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD SQL Map Config 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-config.dtd"> +<configuration><settings> + <setting name="cacheEnabled" value="true"/> + <setting name="lazyLoadingEnabled" value="true"/> + </settings> + <typeAliases> + </typeAliases> + + <typeHandlers> + </typeHandlers> + + <environments default="default"> + <environment id="default"> + <transactionManager type="JDBC"> + </transactionManager> + + <dataSource type="SIMPLE"> + <property name="JDBC.Driver" value="${search.connection.driver_class}"/> + <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/> + <property name="JDBC.Username" value="${db_user}"/> + <property name="JDBC.Password" value="${db_password}"/> + </dataSource> + </environment> + </environments> + + <mappers> + <mapper resource="com/redhat/satellite/search/db/package.xml"/> + <mapper resource="com/redhat/satellite/search/db/errata.xml"/> + <mapper resource="com/redhat/satellite/search/db/server.xml"/> + <mapper resource="com/redhat/satellite/search/db/errata_handler.xml"/> + <mapper resource="com/redhat/satellite/search/db/hwdevice.xml"/> + <mapper resource="com/redhat/satellite/search/db/snapshot_tag.xml"/> + <mapper resource="com/redhat/satellite/search/db/server_custom_info.xml"/> + <mapper resource="com/redhat/satellite/search/db/xccdf_ident.xml"/> + </mappers> + </configuration> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml index d9f9d80..3f6b9e7 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="errata"> - <select id="listErrataFromId" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.Errata"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="errata"> + <select id="listErrataFromId" parameterType="long" resultType="com.redhat.satellite.search.db.models.Errata"> SELECT e.id, e.advisory, @@ -25,29 +22,26 @@ e.modified, e.last_modified as lastModified FROM rhnErrata e - WHERE e.id > #id# + WHERE e.id > #{id} ORDER by e.id ASC </select> <delete id="deleteLastErrata"> DELETE FROM rhnIndexerWork where object_type = 'errata' </delete> - <insert id="createLastErrata" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('errata', #id#, #last_modified#) + <insert id="createLastErrata" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('errata', #{id}, #{last_modified}) </insert> - <update id="updateLastErrata" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'errata' + <update id="updateLastErrata" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'errata' </update> - <select id="getLastErrataId" - resultClass="java.lang.Long"> + <select id="getLastErrataId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='errata' </select> - <select id="maxErrataId" resultClass="java.lang.Long"> + <select id="maxErrataId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnErrata </select> - <select id="verifyErrataVisibility" resultClass="string"> + <select id="verifyErrataVisibility" resultType="string"> select distinct e.id from rhnErrata e, rhnChannelErrata ce, @@ -58,10 +52,10 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# + ps.id = #{sessionId} and e.id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml index 4fa590d..850468d 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata_handler.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="errataHandler"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="errataHandler"> - <select id="listErrataByCVE" - parameterClass="Map" - resultClass="com.redhat.satellite.search.index.Result"> + <select id="listErrataByCVE" parameterType="Map" resultType="com.redhat.satellite.search.index.Result"> SELECT DISTINCT ecve.errata_id as id from rhnErrataCVE ecve, @@ -22,13 +19,11 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# and - LOWER(cve.name) like #param0# + ps.id = #{sessionId} and + LOWER(cve.name) like #{param0} </select> - <select id="listErrataByIssueDateRange" - parameterClass="Map" - resultClass="com.redhat.satellite.search.index.Result" > + <select id="listErrataByIssueDateRange" parameterType="Map" resultType="com.redhat.satellite.search.index.Result"> SELECT E.id as id FROM rhnErrata E, @@ -41,9 +36,9 @@ ce.channel_id = ac.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id and - ps.id = #sessionId# and - E.issue_date >= TO_TIMESTAMP(#param0#, 'YYYY-MM-DD HH24:MI:SS') - AND E.issue_date <= TO_TIMESTAMP(#param1#, 'YYYY-MM-DD HH24:MI:SS') + ps.id = #{sessionId} and + E.issue_date >= TO_TIMESTAMP(#{param0}, 'YYYY-MM-DD HH24:MI:SS') + AND E.issue_date <= TO_TIMESTAMP(#{param1}, 'YYYY-MM-DD HH24:MI:SS') ORDER BY E.issue_date ASC </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml index de205c5..d8326d3 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="hwdevice"> -<sqlMap namespace="hwdevice"> - - <select id="getHardwareDeviceById" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.HardwareDevice"> + <select id="getHardwareDeviceById" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.HardwareDevice"> SELECT rd.id as id, rd.server_id as serverId, @@ -22,7 +19,7 @@ rd.prop4 as subDeviceId, rd.pcitype as pciType FROM rhnDevice rd - WHERE rd.id > #id# + WHERE rd.id > #{id} ORDER by rd.id ASC </select> @@ -30,24 +27,20 @@ <delete id="deleteLastHardwareDevice"> DELETE FROM rhnIndexerWork where object_type = 'hwdevice' </delete> - <insert id="createLastHardwareDevice" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('hwdevice', #id#, #last_modified#) + <insert id="createLastHardwareDevice" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('hwdevice', #{id}, #{last_modified}) </insert> - <update id="updateLastHardwareDevice" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'hwdevice' + <update id="updateLastHardwareDevice" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'hwdevice' </update> - <select id="getLastHardwareDeviceId" - resultClass="java.lang.Long"> + <select id="getLastHardwareDeviceId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='hwdevice' </select> - <select id="getLastHardwareDeviceIndexRun" - resultClass="java.util.Date"> + <select id="getLastHardwareDeviceIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='hwdevice' </select> - <select id="queryAllHwDeviceIds" resultClass="Long"> + <select id="queryAllHwDeviceIds" resultType="Long"> SELECT id from rhnDevice </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml index 1972292..61ecd4b 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="package"> - <select id="getPackageById" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.RhnPackage"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="package"> + <select id="getPackageById" parameterType="long" resultType="com.redhat.satellite.search.db.models.RhnPackage"> SELECT p.id as id, pn.name as name, @@ -22,11 +19,9 @@ WHERE p.evr_id = pe.id and p.name_id = pn.id and p.package_arch_id = pa.id - and p.id = #id# + and p.id = #{id} </select> - <select id="listPackagesFromId" - parameterClass="long" - resultClass="com.redhat.satellite.search.db.models.RhnPackage"> + <select id="listPackagesFromId" parameterType="long" resultType="com.redhat.satellite.search.db.models.RhnPackage"> SELECT p.id as id, pn.name as name, @@ -43,29 +38,26 @@ WHERE p.evr_id = pe.id and p.name_id = pn.id and p.package_arch_id = pa.id - and p.id > #id# + and p.id > #{id} ORDER by p.id ASC </select> <delete id="deleteLastPackage"> DELETE FROM rhnIndexerWork where object_type = 'package' </delete> - <insert id="createLastPackage" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('package', #id#, #last_modified#) + <insert id="createLastPackage" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('package', #{id}, #{last_modified}) </insert> - <update id="updateLastPackage" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'package' + <update id="updateLastPackage" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'package' </update> - <select id="getLastPackageId" - resultClass="java.lang.Long"> + <select id="getLastPackageId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='package' </select> - <select id="maxPackageId" resultClass="java.lang.Long"> + <select id="maxPackageId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnPackage </select> - <select id="verifyPackageVisibility" resultClass="string"> + <select id="verifyPackageVisibility" resultType="string"> select distinct p.id from rhnPackage p, rhnAvailableChannels ac, @@ -76,10 +68,10 @@ and ac.channel_id = cp.channel_id and ac.org_id = wc.org_id and ps.web_user_id = wc.id - and ps.id = #session_id# + and ps.id = #{session_id} and p.id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index 535bcbb..9f761f5 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -1,10 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> -<sqlMap namespace="server"> - <select id="getServerByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.Server"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="server"> + <select id="getServerByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.Server"> SELECT s.id as id, s.name as name, @@ -58,51 +56,47 @@ LEFT OUTER JOIN rhnServerDmi dmi ON s.id = dmi.server_id LEFT OUTER JOIN rhnCPU cpu on s.id = cpu.server_id LEFT OUTER JOIN rhnVirtualInstance vi on s.id = vi.virtual_system_id - WHERE s.modified >= #last_modified# - or rsn.modified >= #last_modified# - or si.checkin >= #last_modified# - or rr.modified >= #last_modified# - or sl.modified >= #last_modified# - or dmi.modified >= #last_modified# - or cpu.modified >= #last_modified# - or s.id > #id# + WHERE s.modified >= #{last_modified} + or rsn.modified >= #{last_modified} + or si.checkin >= #{last_modified} + or rr.modified >= #{last_modified} + or sl.modified >= #{last_modified} + or dmi.modified >= #{last_modified} + or cpu.modified >= #{last_modified} + or s.id > #{id} ORDER by s.id ASC </select> <delete id="deleteLastServer"> DELETE FROM rhnIndexerWork where object_type = 'server' </delete> - <insert id="createLastServer" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('server', #id#, #last_modified#) + <insert id="createLastServer" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('server', #{id}, #{last_modified}) </insert> - <update id="updateLastServer" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'server' + <update id="updateLastServer" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'server' </update> - <select id="getLastServerId" - resultClass="java.lang.Long"> + <select id="getLastServerId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='server' </select> - <select id="getLastServerIndexRun" - resultClass="java.util.Date"> + <select id="getLastServerIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='server' </select> - <select id="verifyServerVisibility" resultClass="string"> + <select id="verifyServerVisibility" resultType="string"> SELECT object_id FROM rhnVisibleObjects - WHERE pxt_session_id = #session_id# - AND object_type = #object_type# + WHERE pxt_session_id = #{session_id} + AND object_type = #{object_type} AND object_id IN - <iterate property="id_list" open="(" close=")" conjunction=","> - #id_list[]# - </iterate> + <foreach collection="id_list" item="item" separator="," close=")" open="("> + #{id_item} + </foreach> </select> - <select id="maxServerId" resultClass="java.lang.Long"> + <select id="maxServerId" resultType="java.lang.Long"> SELECT MAX(ID) FROM rhnServer </select> - <select id="queryAllServerIds" resultClass="Long"> + <select id="queryAllServerIds" resultType="Long"> SELECT id from rhnServer </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml index 5e29554..90680d7 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="serverCustomInfo"> -<sqlMap namespace="serverCustomInfo"> - - <select id="getServerCustomInfoByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.ServerCustomInfo"> + <select id="getServerCustomInfoByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.ServerCustomInfo"> SELECT rscdv.key_id as keyId, @@ -19,30 +16,26 @@ TO_CHAR(rscdv.modified, 'YYYY-MM-DD HH24-MI-SS') as modified FROM rhnServerCustomDataValue rscdv INNER JOIN rhnCustomDataKey rcdk on rcdk.id = rscdv.key_id - WHERE rscdv.modified > #last_modified# + WHERE rscdv.modified > #{last_modified} ORDER by rscdv.key_id ASC </select> <delete id="deleteLastServerCustomInfo"> DELETE FROM rhnIndexerWork where object_type = 'server_custom_info' </delete> - <insert id="createLastServerCustomInfo" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('server_custom_info', #id#, #last_modified#) + <insert id="createLastServerCustomInfo" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('server_custom_info', #{id}, #{last_modified}) </insert> - <update id="updateLastServerCustomInfo" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'server_custom_info' + <update id="updateLastServerCustomInfo" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'server_custom_info' </update> - <select id="getLastServerCustomInfoId" - resultClass="java.lang.Long"> + <select id="getLastServerCustomInfoId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='server_custom_info' </select> - <select id="getLastServerCustomInfoIndexRun" - resultClass="java.util.Date"> + <select id="getLastServerCustomInfoIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='server_custom_info' </select> - <select id="queryAllServerCustomInfoIds" resultClass="com.redhat.satellite.search.db.models.ServerCustomInfo"> + <select id="queryAllServerCustomInfoIds" resultType="com.redhat.satellite.search.db.models.ServerCustomInfo"> SELECT server_id as serverId, key_id as keyId from rhnServerCustomDataValue </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml index 6266583..21c376d 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml @@ -1,12 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="snapshotTag"> -<sqlMap namespace="snapshotTag"> - - <select id="getSnapshotTagByIdOrDate" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.SnapshotTag"> + <select id="getSnapshotTagByIdOrDate" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.SnapshotTag"> SELECT rt.id as id, @@ -20,7 +17,7 @@ FROM rhnSnapshotTag rst INNER JOIN rhnTag rt on rst.tag_id = rt.id INNER JOIN rhnTagName rtn on rt.name_id = rtn.id - WHERE rst.tag_id > #id# OR rst.modified > #last_modified# + WHERE rst.tag_id > #{id} OR rst.modified > #{last_modified} ORDER by rst.snapshot_id ASC </select> @@ -28,26 +25,22 @@ <delete id="deleteLastSnapshotTag"> DELETE FROM rhnIndexerWork where object_type = 'snapshot_tag' </delete> - <insert id="createLastSnapshotTag" - parameterClass="java.util.Map"> - INSERT INTO rhnIndexerWork values ('snapshot_tag', #id#, #last_modified#) + <insert id="createLastSnapshotTag" parameterType="java.util.Map"> + INSERT INTO rhnIndexerWork values ('snapshot_tag', #{id}, #{last_modified}) </insert> - <update id="updateLastSnapshotTag" - parameterClass="java.util.Map"> - UPDATE rhnIndexerWork SET last_id = #id#, last_modified = #last_modified# where object_type = 'snapshot_tag' + <update id="updateLastSnapshotTag" parameterType="java.util.Map"> + UPDATE rhnIndexerWork SET last_id = #{id}, last_modified = #{last_modified} where object_type = 'snapshot_tag' </update> - <select id="getLastSnapshotTagId" - resultClass="java.lang.Long"> + <select id="getLastSnapshotTagId" resultType="java.lang.Long"> SELECT last_id from rhnIndexerWork where object_type='snapshot_tag' </select> - <select id="getLastSnapshotTagIndexRun" - resultClass="java.util.Date"> + <select id="getLastSnapshotTagIndexRun" resultType="java.util.Date"> SELECT last_modified from rhnIndexerWork where object_type='snapshot_tag' </select> - <select id="queryAllSnapshotTagIds" resultClass="Long"> + <select id="queryAllSnapshotTagIds" resultType="Long"> SELECT snapshot_id from rhnSnapshotTag </select> -</sqlMap> +</mapper> \ No newline at end of file diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml index ab060a6..7f111cc 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/xccdf_ident.xml @@ -1,42 +1,39 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMap - PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-2.dtd"> - -<sqlMap namespace="xccdfIdent"> - <select id="getXccdfIdentById" parameterClass="java.util.Map" - resultClass="com.redhat.satellite.search.db.models.XccdfIdent"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="xccdfIdent"> + <select id="getXccdfIdentById" parameterType="java.util.Map" resultType="com.redhat.satellite.search.db.models.XccdfIdent"> SELECT id, identifier FROM rhnXccdfIdent - WHERE id > #id# + WHERE id > #{id} ORDER BY id ASC </select> - <select id="queryAllXccdfIdentIds" resultClass="Long"> + <select id="queryAllXccdfIdentIds" resultType="Long"> SELECT id FROM rhnXccdfIdent </select> - <insert id="createLastXccdfIdent" parameterClass="java.util.Map"> + <insert id="createLastXccdfIdent" parameterType="java.util.Map"> INSERT INTO rhnIndexerWork - VALUES ('xccdf_ident', #id#, #last_modified#) + VALUES ('xccdf_ident', #{id}, #{last_modified}) </insert> - <select id="getLastXccdfIdentId" resultClass="java.lang.Long"> + <select id="getLastXccdfIdentId" resultType="java.lang.Long"> SELECT last_id FROM rhnIndexerWork WHERE object_type='xccdf_ident' </select> - <select id="getLastXccdfIdentIndexRun" resultClass="java.util.Date"> + <select id="getLastXccdfIdentIndexRun" resultType="java.util.Date"> SELECT last_modified FROM rhnIndexerWork WHERE object_type='xccdf_ident' </select> - <update id="updateLastXccdfIdent" parameterClass="java.util.Map"> + <update id="updateLastXccdfIdent" parameterType="java.util.Map"> UPDATE rhnIndexerWork - SET last_id = #id#, last_modified = #last_modified# + SET last_id = #{id}, last_modified = #{last_modified} WHERE object_type = 'xccdf_ident' </update> <delete id="deleteLastXccdfIdent"> DELETE FROM rhnIndexerWork WHERE object_type = 'xccdf_ident' </delete> -</sqlMap> +</mapper> \ No newline at end of file commit fa685be37666426aba108a7f2e39759f8ba6459a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Dec 6 16:38:24 2013 +0100 1023669 - remove original setSessionTimeZone diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java index 3cfe695..7991436 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java @@ -21,13 +21,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.lang.reflect.Method; import java.util.Properties; -import java.util.TimeZone; - import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapClientBuilder; -import com.ibatis.sqlmap.client.SqlMapSession; import com.redhat.satellite.search.config.Configuration; import com.redhat.satellite.search.config.ConfigException; @@ -109,7 +105,7 @@ public class DatabaseManager { * @return query object */ public <T> Query<T> getQuery(String name) { - return new Query<T>(openSession(), name); + return new Query<T>(client.openSession(), name); } /** @@ -118,8 +114,7 @@ public class DatabaseManager { * @return query object */ public WriteQuery getWriterQuery(String name) { - SqlMapSession session = openSession(); - return new WriteQuery(session, name); + return new WriteQuery(client.openSession(), name); } /** @@ -127,32 +122,6 @@ public class DatabaseManager { * @return connection object */ public Connection getConnection() { - return new Connection(openSession()); - } - - private SqlMapSession openSession() { - SqlMapSession session = client.openSession(); - setSessionTimeZone(); - return session; - } - - public void setSessionTimeZone() { - if (isOracle) { - try { - java.sql.Connection proxyConn = client.getDataSource().getConnection(); - // this is a trick, how to get OracleConnection from the Proxy object - java.sql.Connection oraConn = proxyConn.createStatement().getConnection(); - Method setSessionTimeZoneMethod = Class.forName( - "oracle.jdbc.driver.OracleConnection").getMethod( - "setSessionTimeZone", String.class); - if (setSessionTimeZoneMethod != null) { - setSessionTimeZoneMethod.invoke(oraConn, TimeZone.getDefault().getID()); - } - } - catch (Exception e) { - log.warn("Unable to set session timezone."); - e.printStackTrace(); - } - } + return new Connection(client.openSession()); } }

1 0

Changes to 'master-pxe-default-image'
by Silvio Moioli 06 Dec '13

06 Dec '13

New branch 'master-pxe-default-image' available with the following commits: commit 4bb95a92db63062d5bee0c397e52493e84b421a2 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 29 15:11:43 2013 +0100 Page to enable/disable bare-metal system management tests commit c074a2421a8a6236ca67b4ebb6680fb82bd6bb14 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 29 11:30:59 2013 +0100 Page to enable/disable bare-metal system management added commit 83a9955a88ef82df5a4936e4b1e57ae230c93df9 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 29 10:45:02 2013 +0100 ActivationKeyManager: find method refactored commit 9a5c5a5e16357126d8e871aded61f1617594e9bf Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 24 17:30:11 2013 +0200 Avoid showing bootstrap entitlement as selectable for unentitled servers commit 2824c733ae1edfd10e04ebda1290b5fd5e831f14 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 23 09:34:30 2013 +0200 System set manager: disable irrelevant actions if bare metal systems are in the set commit c55758cd64a9ce2729784f690fd9b78d7e164877 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Nov 26 11:11:59 2013 +0100 Bare-metal system search added in Systems list commit b1418a628d9a06317981ffa2b9e220edb739623b Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Dec 5 17:41:34 2013 +0100 ssm/provisioning/PowerManagement: allow bare-metal systems commit 8850e3570120e8ac53ffc380acf857b3413cc261 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 22 13:55:17 2013 +0200 legends/system-legend.jsp: add icon for bare-metal system commit 67ee2b7a81e0bb77d613eb050538675f15addd47 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 22 10:07:05 2013 +0200 kickstart/ScheduleWizard: avoid ISE with bare-metal systems commit 0f0f7d14df29f85060f8c187d8853a7b021f805d Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Nov 4 11:55:54 2013 +0100 kickstart/ScheduleWizard: avoid references to 'koan' for bare metal systems commit f8daf149d65f929c8d4286b134a8be887311c4c0 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Oct 22 10:05:49 2013 +0200 kickstart/ScheduleWizard: avoid references to 'scheduling' for bare metal systems commit d032462ed7128c304da0f0faff5b0920bfd037ba Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 17:33:18 2013 +0200 systems/details/SystemHardware: unnecessary elements hidden commit 379439a2e6c77e6ea4f83a200b1205a1ee294489 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 17:16:34 2013 +0200 systems/details/Edit: unnecessary elements hidden commit d64a6a8daccf09fc5fa626488ee91563a040233b Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 16:42:00 2013 +0200 fragments/systems/system-header: add bare-metal icon commit 884e9b2bc24cba28ae7093e1a3c3e26722d88e0a Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 16:25:04 2013 +0200 systems/details/Overview: unnecessary elements hidden commit ccea935ada872f31e6709d8b61b04e152abe5c21 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 12:25:02 2013 +0200 systems/Overview page icon and strings added commit ff035dc4d415dff5715768834810b0421f298ad6 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 24 17:18:52 2013 +0200 Bugfix: system migration between orgs commit 2f35dcd778d05fcead41b650755e8e9e539bab45 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 15:59:39 2013 +0100 Refactoring: Bootstrap entitlement check commit f9c602d717bed39d036f6c993d88ef1d9e374ea8 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 15:44:27 2013 +0200 Allow bare-metal systems to be added to SSM commit e6dc33da9c3e7f941f5a041c65591689d753ed9d Author: Michael Calmer <mc(a)suse.de> Date: Mon Oct 21 14:51:12 2013 +0200 add system_grouping feature to bootstrap entitlement to be able to use SSM commit 964a584d1704d903e5b42c811f88a440c00f7580 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Oct 21 12:56:31 2013 +0200 Don't show bare metal servers as unentitled commit fda6e40deba2753b91c7a81ddc9a4a2fe44de395 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 11:36:55 2013 +0100 Cobbler commands to enable/disable bare-metal system booting tests commit a8a201580fb83b92aa9ddc050fc5deb2b3369bb3 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 11:33:09 2013 +0100 Cobbler commands to enable/disable bare-metal system booting added commit e46b5aae3785e9e2afeb3240c5c6d128a03aa577 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 31 10:48:10 2013 +0100 Configuration options added commit e5fa8e6d2a4a90c89c18fe1a231393482d43aed9 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 10:57:05 2013 +0100 Check to ignore bootstrap autoinstallation profile in GUI and API tests commit 21d0cb42f527b0965a8eb02ff0d45bd83207ceea Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Oct 17 17:00:12 2013 +0200 Check to ignore bootstrap autoinstallation profile in GUI and API added commit a5e2816b38496852b3dbdc3ca96dbccd8453ac90 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 7 11:28:00 2013 +0100 Add constant names to distinguish bootstrap Cobbler objects commit a5dface16b9698d9f4dd4dbdf088f68d2f060da0 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 16 16:13:26 2013 +0200 Check to ignore bootstrap activation keys in API and GUI tests commit 8476bef316d40924799264c561c59e8c682d0cc8 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 16 16:09:45 2013 +0200 Check to ignore bootstrap activation keys in API and GUI added commit e73b481f0e9ce670ddd70e3d77dfa38b7820dad9 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Oct 16 16:02:40 2013 +0200 Add a flag to distinguish bootstrap activation keys commit 2631bba0497dddef8a1d4d5123a7b6c3b1cf7d8e Author: Michael Calmer <mc(a)suse.de> Date: Thu Oct 17 16:49:57 2013 +0200 create rhnServerGroup with bootstrap entitlements for all orgs commit c56ea7a75c0f955c022bbb9d79b8f5b6e47ef914 Author: Michael Calmer <mc(a)suse.de> Date: Thu Oct 17 13:57:35 2013 +0200 schema upgrade for pxe-default-image commit e946e82753d4458145af7701e89c325e4ca18611 Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 17:40:13 2013 +0200 limit webpage access in case of bootstrap entitled server commit f328962773f70bf1de9d3c0f72e5500a322f5853 Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 14:24:46 2013 +0200 if bootstrap_entitled, unentitle first before assign new entitlements commit 566dc55c5bc87fe76f8dbb0b5b8aed77b2d2e17b Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 13:37:26 2013 +0200 check for None value commit ffe56d8f84982ce7440510a501f28d5f40a21727 Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 13:08:13 2013 +0200 Set usage_limit of a reactivation key to 1 commit 69b7c29e66e8d909741f164e17b493e090c08f88 Author: Michael Calmer <mc(a)suse.de> Date: Wed Sep 18 13:07:16 2013 +0200 reactivation keys for a bootstrap entitled system should get enterprise entitlement commit 29e5a68f694852aa887afb6774463ae11bf90458 Author: Michael Calmer <mc(a)suse.de> Date: Tue Sep 17 15:45:09 2013 +0200 find arch without base channel commit 45a5c1cd12fdeffb2669f2ea7baa8bcd70a958c4 Author: Uwe Gansert <ug(a)suse.de> Date: Fri Jul 27 15:30:19 2012 +0200 reduce number of options when kickstarting a bootstrap systems commit 417d11b384fe79431a26b20e5889728af7677d97 Author: Uwe Gansert <ug(a)suse.de> Date: Fri Jul 27 12:47:27 2012 +0200 reduce number of options in system overview for bootstrap systems commit ff2f617e36fef9b9d1d510dec0a775234b92a49c Author: Uwe Gansert <ug(a)suse.de> Date: Tue Jul 24 15:09:27 2012 +0200 translation for bootstrap_entitled added commit 644ec9c059f352c576383ee176f89cb2850bfcd1 Author: Uwe Gansert <ug(a)suse.de> Date: Tue Apr 3 13:05:09 2012 +0200 bootstrap image patches commit b7f3f06d57f7f29d9baf4635c47f6bed11f6c8ea Author: Uwe Gansert <ug(a)suse.de> Date: Fri Mar 30 11:58:33 2012 +0200 added BootstrapEntitlement

1 0

Changes to 'master-create-cobbler-record-ssm'
by Silvio Moioli 06 Dec '13

06 Dec '13

New branch 'master-create-cobbler-record-ssm' available with the following commits: commit 3eaf222179a0aea24deba2a1ab183fdc4710e455 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 14 09:33:22 2013 +0100 ssm/kickstart/Schedule: button to create Cobbler records tests commit c4b7d738f6ce88d91a3c13dcef6b4eb8fb1a7dce Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 14 09:30:50 2013 +0100 ssm/kickstart/Schedule: button to create Cobbler records added commit e7f69e81eb31d2976319d3fb0f6dd6682532867e Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Dec 5 12:07:32 2013 +0100 ssm/kickstart/Schedule: display skipped systems in action message commit 02b94a9da781d95f710667db6b7d746cf158963d Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Nov 13 13:08:13 2013 +0100 Refactoring: extract method to add success message

1 0

Branch 'master-bootstrap-css-fixes' - 96 commits - backend/server backend/spacewalk-backend.spec branding/css branding/spacewalk-branding.spec branding/templates java/buildconf java/code java/spacewalk-java.spec projects/python-hwdata rel-eng/packages spacecmd/spacecmd.spec spacecmd/src web/html web/include web/modules web/spacewalk-web.spec
by Silvio Moioli 06 Dec '13

06 Dec '13

backend/server/handlers/xmlrpc/registration.py | 2 backend/spacewalk-backend.spec | 5 branding/css/spacewalk-theme.less | 13 branding/spacewalk-branding.spec | 11 branding/templates/c.pxt | 12 branding/templates/footer.pxt | 11 java/buildconf/apidoc/html/api_index_hdr.txt | 2 java/buildconf/apidoc/html/faqs.txt | 2 java/buildconf/apidoc/html/scripts.txt | 2 java/buildconf/apidoc/jsp/api_index_hdr.txt | 2 java/buildconf/apidoc/jsp/faqs.txt | 2 java/buildconf/apidoc/jsp/handler.txt | 2 java/buildconf/apidoc/jsp/scripts.txt | 2 java/buildconf/apidoc/singlepage/api_index_hdr.txt | 2 java/buildconf/apidoc/singlepage/faqs.txt | 2 java/buildconf/apidoc/singlepage/scripts.txt | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java | 6 java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 1 java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java | 4 java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java | 4 java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java | 2 java/code/webapp/WEB-INF/includes/footer.jsp | 2 java/code/webapp/WEB-INF/includes/header.jsp | 6 java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 4 java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 8 java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 14 java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 18 java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 6 java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 2 java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 4 java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 8 java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4 java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 8 java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 6 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 12 java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 14 java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 6 java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 14 java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 8 java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4 java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 30 java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 38 java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 12 java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 16 java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 6 java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 4 java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 6 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 14 java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf | 24 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf | 12 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf | 18 java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 22 java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 8 java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 6 java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf | 4 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 14 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 8 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 62 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 6 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 12 java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 6 java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp | 20 java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp | 4 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp | 24 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 8 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp | 12 java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4 java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 2 java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 8 java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 8 java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 12 java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp | 8 java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 8 java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp | 6 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 4 java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 106 -- java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 6 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 8 java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 6 java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 8 java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 6 java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 4 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 4 java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 18 java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 8 java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 4 java/code/webapp/WEB-INF/pages/systems/errata.jsp | 20 java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/overview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/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 | 18 java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 4 java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 499 ++++------ java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 6 java/code/webapp/WEB-INF/pages/yourrhn.jsp | 2 java/spacewalk-java.spec | 17 projects/python-hwdata/hwdata.py | 14 projects/python-hwdata/python-hwdata.spec | 50 - projects/python-hwdata/setup.py | 2 rel-eng/packages/python-hwdata | 2 rel-eng/packages/spacecmd | 2 rel-eng/packages/spacewalk-backend | 2 rel-eng/packages/spacewalk-branding | 2 rel-eng/packages/spacewalk-java | 2 rel-eng/packages/spacewalk-web | 2 spacecmd/spacecmd.spec | 12 spacecmd/src/lib/package.py | 6 spacecmd/src/lib/repo.py | 4 spacecmd/src/lib/softwarechannel.py | 88 + web/html/network/systems/groups/details.pxt | 36 web/html/network/systems/system_list | 5 web/include/network/components/legends/errata-list-legend.pxi | 6 web/include/network/components/legends/event-status.pxi | 6 web/include/network/components/legends/event-type.pxi | 8 web/include/network/components/legends/system-list-legend.pxi | 18 web/modules/pxt/PXT/HTML.pm | 18 web/modules/sniglets/Sniglets/HTML.pm | 2 web/modules/sniglets/Sniglets/ListView/ActionList.pm | 61 - web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 7 web/modules/sniglets/Sniglets/ListView/PackageList.pm | 10 web/modules/sniglets/Sniglets/ListView/Style.pm | 4 web/modules/sniglets/Sniglets/ListView/SystemList.pm | 18 web/modules/sniglets/Sniglets/ServerGroup.pm | 4 web/modules/sniglets/Sniglets/Servers.pm | 27 web/spacewalk-web.spec | 14 198 files changed, 1156 insertions(+), 965 deletions(-) New commits: commit af7fe098cd6116e8bffa6e4d763b746bce4d5a32 Merge: d5ac0fa 559ab06 Author: Silvio Moioli <smoioli(a)suse.de> Date: Fri Dec 6 15:34:40 2013 +0100 Merge branch 'master' into master-bootstrap-css-fixes Conflicts: java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp diff --cc java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index 14d57a7,20d03d6..4fde61b --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@@ -13,90 -13,99 +13,88 @@@ <h4><bean:message key="sdc.details.overview.systemstatus"/></h4> </div> <div class="panel-body"> - <c:choose> - <c:when test="${unentitled}"> - <i class="spacewalk-icon-Unentitled"></i> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> - </c:when> - - <c:when test="${systemInactive}"> - <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> - </c:when> - <c:when test="${hasUpdates}"> - <c:choose> - <c:when test="${criticalErrataCount > 0}"> - <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i> - </c:when> - <c:otherwise> - <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i> - </c:otherwise> - </c:choose> - -   <bean:message key="sdc.details.overview.updatesavailable" />    + <c:choose> + <c:when test="${unentitled}"> + <i class="spacewalk-icon-Unentitled"></i> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> + </c:when> + <c:when test="${systemInactive}"> + <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> + </c:when> + <c:when test="${hasUpdates}"> + <c:choose> + <c:when test="${criticalErrataCount > 0}"> + <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i> + </c:when> + <c:otherwise> + <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i> + </c:otherwise> + </c:choose> +   <bean:message key="sdc.details.overview.updatesavailable" />    - <c:if test="${criticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/>    - </c:if> - <c:if test="${nonCriticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/>    - </c:if> - <c:if test="${upgradablePackagesCount > 0}"> - <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> - </c:if> - </c:when> + <c:if test="${criticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/>    + </c:if> + <c:if test="${nonCriticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/>    + </c:if> + <c:if test="${upgradablePackagesCount > 0}"> + <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> + </c:if> + </c:when> - <c:otherwise> - <i class="fa fa-check-circle fa-1-5x text-success"></i> <bean:message key="sdc.details.overview.updated"/> - </c:otherwise> - </c:choose> + <c:otherwise> + <i class="fa fa-check-circle fa-1-5x text-success"></i> <bean:message key="sdc.details.overview.updated"/> + </c:otherwise> + </c:choose> - <c:if test="${rebootRequired}"> - <div class="systeminfo"> - <div class="systeminfo-full"> - <i class="fa fa-refresh text-primary"></i><bean:message key="sdc.details.overview.requires_reboot"/> - <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> - </div> + <c:if test="${rebootRequired}"> + <div class="systeminfo"> + <div class="systeminfo-full"> + <i class="fa fa-refresh text-primary"></i><bean:message key="sdc.details.overview.requires_reboot"/> + <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> </div> - </c:if> + </div> + </c:if> - <c:if test="${probeListEmpty != 'true'}"> - <div class="row-0"> - <div class="col-md-6"> + <c:if test="${probeListEmpty != 'true'}"> + <div class="row-0"> + <div class="col-md-6"> + <c:choose> + <c:when test="${probeList[0].state == 'CRITICAL'}"> + <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + </c:when> + <c:otherwise> + <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + </c:otherwise> + </c:choose> + </div> + <div class="col-md-6"> + <c:forEach items="${probeList}" var="probe"> <c:choose> - <c:when test="${probeList[0].state == 'CRITICAL'}"> - <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <c:when test="${probe.state == 'CRITICAL'}"> + <i class="fa fa-circle text-danger"></i> </c:when> <c:otherwise> - <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <i class="fa fa-warning text-warning"></i> </c:otherwise> </c:choose> - </div> - <div class="col-md-6"> - <c:forEach items="${probeList}" var="probe"> - <c:choose> - <c:when test="${probe.state == 'CRITICAL'}"> - <i class="fa fa-circle text-danger"></i> - </c:when> - <c:otherwise> - <i class="fa fa-warning text-warning"></i> - </c:otherwise> - </c:choose> - <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> - </c:forEach> - </div> + <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> + </c:forEach> </div> - </c:if> - + </div> + </c:if> </div> </div> -- - - <div class="systeminfo"> - - - - - -<div class="row-0"> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.systeminfo"/></h4> - </div> - <div class="panel-body"> + <div class="row-0"> + <div class="col-md-6"> - +  + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.systeminfo"/></h4> + </div> <table class="table"> <tr> <td><bean:message key="sdc.details.overview.hostname"/></td> commit 559ab0613bd2db2ad5b47f3c1ba70a1d064cc4b3 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Dec 5 14:06:33 2013 +0100 removed trailing whitespaces from jsp{,f} sources because it is evil diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp index 8b5d4c0..d96a107 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp @@ -49,15 +49,15 @@ <rl:column headerkey="sdc.configlist.jsp.rank" attr="position" bound="true"/> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> <hr/> - + <input type="submit" name ="dispatch" - value='<bean:message key="sdc.configlist.jsp.unsubscribe"/>'/> + value='<bean:message key="sdc.configlist.jsp.unsubscribe"/>'/> </div> </c:if> </c:when> @@ -66,7 +66,7 @@ arg0="/rhn/activationkeys/configuration/Subscribe.do?tid=${param.tid}"/></strong> </p> </c:otherwise> - </c:choose> + </c:choose> </rl:listset> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp index c0d4708..ee8f483 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp @@ -24,7 +24,7 @@ </p> <noscript> <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> - </noscript> + </noscript> <c:set var="pageList" value="${requestScope.all}" /> @@ -55,26 +55,26 @@ <rl:column headerkey="sdc.config.subscriptions.jsp.files" attr="filesAndDirsDisplayString" bound="true"/> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> <hr/> - + <input type="submit" name ="dispatch" class="btn btn-success" - value='<bean:message key="sdc.config.subscriptions.jsp.continue"/>'/> + value='<bean:message key="sdc.config.subscriptions.jsp.continue"/>'/> </div> - </c:if> + </c:if> </c:when> <c:otherwise> <p><strong><bean:message key="activation-keys.config.subscriptions.jsp.noChannels" arg0="/rhn/activationkeys/configuration/List.do?tid=${param.tid}"/> </strong></p> </c:otherwise> - </c:choose> - </rl:listset> + </c:choose> + </rl:listset> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index 07e99ac..2e882f5 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -34,7 +34,7 @@ <c:choose> <c:when test="${requestScope['default'].note != null}"> <a href="/rhn/activationkeys/Edit.do?tid=${requestScope['default'].id}"> - <c:out value="${requestScope['default'].note}"/></a> + <c:out value="${requestScope['default'].note}"/></a> </c:when> <c:otherwise> <a href="/rhn/activationkeys/Edit.do?tid=${requestScope['default'].id}"> @@ -61,7 +61,7 @@ <td> <c:choose> <c:when test="${requestScope['default'].usageLimit != null}"> - <c:out value="${requestScope['default'].usageLimit}"/> + <c:out value="${requestScope['default'].usageLimit}"/> </c:when> <c:otherwise> <bean:message key="kickstart.activationkeys.jsp.nousagelimit"/> @@ -77,7 +77,7 @@ <td> <c:choose> <c:when test="${not requestScope['default'].disabled}"> - <bean:message key="Enabled"/> + <bean:message key="Enabled"/> </c:when> <c:otherwise> <bean:message key="Disabled"/> @@ -118,7 +118,7 @@ <c:choose> <c:when test="${current.note != null}"> <a href="/rhn/activationkeys/Edit.do?tid=${current.id}"> - <c:out value="${current.note}"/></a> + <c:out value="${current.note}"/></a> </c:when> <c:otherwise> <a href="/rhn/activationkeys/Edit.do?tid=${current.id}"> @@ -127,13 +127,13 @@ </c:choose> <c:if test="${current.orgDefault}"><c:out value=" *"/></c:if> </rl:column> - +  <rl:column bound="true" headerkey="kickstart.activationkeys.jsp.key" attr="token" /> - +  <rl:column bound="false" @@ -141,14 +141,14 @@ > <c:choose> <c:when test="${current.usageLimit != null}"> - ${current.systemCount}/${current.usageLimit} + ${current.systemCount}/${current.usageLimit} </c:when> <c:otherwise> ${current.systemCount}/<bean:message key="kickstart.activationkeys.jsp.nousagelimit"/> </c:otherwise> </c:choose> - - </rl:column> + + </rl:column> </rl:list> <hr/> <div class="small-text">*<strong><bean:message key="Tip"/>:</strong> <bean:message key="activation-keys.jsp.is-default-key-tip"/></div> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp index fb88b86..f1cee44 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp @@ -51,10 +51,10 @@ <rl:column headerkey="lastCheckin"> ${requestScope.dateMap[current.id]} </rl:column> - - + + </rl:list> - + </div> </rl:listset> </body> diff --git a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp index c72a68d..ba5045c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp @@ -34,14 +34,14 @@ <rl:column sortable="true" headerkey="assignedgroups.jsp.group" sortattr="name"> - + <c:out value="<a href=\"/network/systems/groups/details.pxt?sgid=${current.id}\">${current.name}</a>" escapeXml="false" /> </rl:column> <rl:column sortable="true" headerkey="grouplist.jsp.systems" sortattr="serverCount"> - + <c:out value="<a href=\"/rhn/groups/ListRemoveSystems.do?sgid=${current.id}\">${current.serverCount}</a>" escapeXml="false" /> </rl:column> 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 c8cde87..3af8924 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -55,7 +55,7 @@ <a href="/rhn/admin/multiorg/Users.do"><bean:message key="general.jsp.org.tbl.link3"/></a>. </p> </td> - </tr> + </tr> <tr> <td colspan="3"> <p> 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 b058788..1347201 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 @@ -54,7 +54,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.UserListFilter" emptykey="org.jsp.noUsers"> -  +  <rl:column bound="false" sortable="true" headerkey="username.nopunc.displayname" @@ -67,13 +67,13 @@ ${current.login} </c:otherwise> </c:choose> - + </rl:column> <rl:column bound="false" headerkey="multiorg.jsp.email" > <c:out value="${current.address}" /> - </rl:column> + </rl:column> <rl:column bound="false" sortable="false" headerkey="realname.displayname" @@ -92,7 +92,7 @@ <img src="/img/rhn-listicon-unchecked_immutable.gif"> </c:otherwise> </c:choose> - + </rl:column> </rl:list> 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 23c24a4..756fadf 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp @@ -24,7 +24,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.OrgListFilter" emptykey="orglist.jsp.noOrgs"> -  +  <rl:column bound="false" sortable="true" headerkey="org.nopunc.displayname" 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 94cd5d4..42a44bd 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp @@ -105,8 +105,8 @@ </div> </div> </div> - - + + </html:form> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp index 01a00c1..7606e67 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp @@ -43,7 +43,7 @@ <rhn:csrf /> <rhn:submitted/> <input type="hidden" name="oid" value="${param.oid}"/> - + <rl:list dataset="pageList" name="entitlement" alphabarcolumn="name" @@ -64,7 +64,7 @@ </c:when> <c:otherwise> <c:out value="${current.currentMembers} / ${current.maxMembers}" /> - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> @@ -97,7 +97,7 @@ </c:when> <c:otherwise> <c:out value="${current.currentFlex} / ${current.maxFlex}" /> - </c:otherwise> + </c:otherwise> </c:choose> @@ -115,7 +115,7 @@ <c:when test="${param.oid != 1}"> <input name="${current.flexKey}" value="${requestScope.subscriptions[current.flexKey]}" type="text" size = "13" onkeydown="return blockEnter(event)"> - + <p><small><bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${current.maxAvailableFlex}"/></small></p> </c:when> 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 d403955..dad92db 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 @@ -35,7 +35,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.UserListFilter" emptykey="org.jsp.noUsers"> -  +  <rl:column bound="false" sortable="true" headerkey="username.nopunc.displayname" @@ -47,7 +47,7 @@ <c:otherwise> <c:out value="${current.login}" /> </c:otherwise> - </c:choose> + </c:choose> </rl:column> <rl:column bound="false" sortable="false" @@ -91,7 +91,7 @@ </c:otherwise> </c:choose> </rl:column> - + </rl:list> </rl:listset> 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 7db66c7..9b807ad 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp @@ -53,7 +53,7 @@ <c:choose> <c:when test="${empty current.total or current.total == 0}"> <bean:message key="softwareentitlements.noentitlements"/> - </c:when> + </c:when> <c:otherwise> ${current.available} / ${current.total} </c:otherwise> @@ -66,10 +66,10 @@ <c:choose> <c:when test="${empty current.allocated or current.allocated == 0}"> <bean:message key="None Allocated"/> - </c:when> + </c:when> <c:otherwise> <bean:message key="softwareentitlements.usagedata" arg0="${current.used}" arg1="${current.allocated}" arg2="${current.ratio}"/> - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> </c:if> @@ -80,7 +80,7 @@ <c:choose> <c:when test="${empty current.totalFlex or current.totalFlex == 0}"> <bean:message key="softwareentitlements.noentitlements"/> - </c:when> + </c:when> <c:otherwise> ${current.availableFlex} / ${current.totalFlex} </c:otherwise> @@ -92,13 +92,13 @@ headertext="${rhn:localize('Flex Usage')} <br/> (${rhn:localize('Used/Allotted')})**" styleclass="${usagestyle}"> <c:choose> - + <c:when test="${empty current.allocatedFlex or current.allocatedFlex == 0}"> <bean:message key="None Allocated"/> </c:when> <c:otherwise> <bean:message key="softwareentitlements.usagedata" arg0="${current.usedFlex}" arg1="${current.allocatedFlex}" arg2="${current.flexRatio}"/> - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> </c:if> 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 51409f9..3d6bec0 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp @@ -55,10 +55,10 @@ <c:choose> <c:when test="${empty current.maxMembers or current.maxMembers == 0}"> <bean:message key="None Allocated"/> - </c:when> + </c:when> <c:otherwise> ${current.currentMembers}/${current.maxMembers} - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> @@ -91,13 +91,13 @@ <c:choose> <c:when test="${empty current.maxFlex or current.maxFlex == 0}"> <bean:message key="None Allocated"/> - </c:when> + </c:when> <c:otherwise> ${current.currentFlex}/${current.maxFlex} - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> - + <rl:column headerkey="Flex Proposed Total"> <c:choose> @@ -146,7 +146,7 @@ </th> <td> ${maxMem} - + <rhn:tooltip key="softwareEntitlementSubs.systemWideCounts.totaltip"/> </span> </td> @@ -181,7 +181,7 @@ </th> <td> ${maxFlex} - + <rhn:tooltip key="softwareEntitlementSubs.systemWideCounts.totaltip"/> </td> </tr> 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 023832b..fa347b8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp @@ -22,7 +22,7 @@ <rhn:csrf /> <rhn:submitted /> - +  <rl:list dataset="pageList" width="100%" @@ -39,7 +39,7 @@ filterattr="login"> <c:out value="<a href=\"/rhn/users/UserDetails.do?uid=${current.id}\">${current.userLogin}</a>" escapeXml="false" /> </rl:column> - +  <rl:column bound="false" sortable="true" @@ -47,7 +47,7 @@ sortattr="userLastName"> <c:out value="${current.userLastName}, ${current.userFirstName}" /> </rl:column> - +  <rl:column attr="roleNames" bound="true" 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 3b405d9..c89baa9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -34,24 +34,24 @@ <rl:selectablecolumn value="${current.id}" selected="${current.selected}" disabled="${not current.selectable}"/> - + <rl:column bound="false" sortable="true" headerkey="username.nopunc.displayname" sortattr="userLogin"> <c:out value="<a href=\"UserDetails.do?uid=${current.id}\">${current.userLogin}</a>" escapeXml="false" /> - </rl:column> - - + </rl:column> + + <rl:decorator name="PageSizeDecorator"/> - + <%@ include file="/WEB-INF/pages/common/fragments/user/userlist_columns.jspf" %> <rl:column - headerkey="disabledlist.jsp.disabledBy"> + headerkey="disabledlist.jsp.disabledBy"> <c:out value="${current.changedByFirstName} ${current.changedByLastName}" escapeXml="false"/> </rl:column> - + <rl:column headerkey="disabledlist.jsp.disabledOn" bound="true" attr="changeDateString" 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 2e1c931..0d579f9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -35,16 +35,16 @@ <%@ include file="/WEB-INF/pages/common/fragments/user/userlist_columns.jspf" %> </rl:list> - + <rl:csv dataset="pageList" name="userConfirmList" exportColumns="userLogin,userLastName,userFirstName,roleNames,lastLoggedIn"/> - + <div class="text-right"> <hr /> <input type="submit" name="dispatch" value="<bean:message key='userconfirm.jsp.confirm'/>" /> </div> - + </rl:listset> </body> 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 9a6e673..bcdaaf3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -44,7 +44,7 @@ </label> </c:forEach> <c:if test="${orgAdmin}"> - + <bean:message key="userdetails.jsp.grantedByOrgAdmin"/> </c:if> </div> 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 d9acc37..5fa8206 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -29,7 +29,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.UserListFilter" emptykey="activelist.jsp.noUsers" alphabarcolumn="userLogin"> - + <rl:column bound="false" @@ -37,9 +37,9 @@ headerkey="username.nopunc.displayname" sortattr="userLogin"> <c:out value="<a href=\"UserDetails.do?uid=${current.id}\">${current.userLogin}</a>" escapeXml="false" /> - </rl:column> - - + </rl:column> + + <%@ include file="/WEB-INF/pages/common/fragments/user/userlist_columns.jspf" %> <rl:column sortable="false" headerkey="userlist.jsp.status"> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index 09046c2..1846671 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -89,7 +89,7 @@ </div> <div class="panel panel-default"> <div class="panel-heading"> - <h4>Machine / Time range</h4> + <h4>Machine / Time range</h4> </div> <div class="panel-body"> <div class="col-md-4"> @@ -178,7 +178,7 @@ </button> </div> </html:form> - </div> + </div> </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp index 39be475..5eb818a 100755 --- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp @@ -44,10 +44,10 @@ </rl:column> - + </rl:list> <rhn:submitted/> - + <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='ssmchildsubs.jsp.subscribe'/>" </input> </p> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index c94b317..883d041 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -32,7 +32,7 @@ <table class="details" width="80%"> <tr><bean:message key="channel.manage.errata.custommsg"/><br><br></tr> - + <tr> <th>Package Association:</th> <td> @@ -40,7 +40,7 @@ <bean:message key="channel.manage.errata.packageassocmsg" /> </td> </tr> - + <c:if test="${selected_channel != null}"> <input type="hidden" name="selected_channel_old" value="${selected_channel}"> </c:if> @@ -60,9 +60,9 @@ <c:otherwise> <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name}</option> </c:otherwise> - </c:choose> - </c:forEach> - </optgroup> + </c:choose> + </c:forEach> + </optgroup> </select> </td> @@ -84,10 +84,10 @@ filter="com.redhat.rhn.frontend.action.channel.manage.ErrataFilter"> <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - + <rl:column sortable="true" headerkey="exportcolumn.errataAdvisoryType" sortattr="advisoryType" @@ -102,10 +102,10 @@ <c:if test="${current.productEnhancement}"> <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> - </rl:column> - - - + </rl:column> + + + <rl:column sortable="true" headerkey="erratalist.jsp.advisory" sortattr="advisory"> @@ -113,18 +113,18 @@ <c:out value="${current.advisory}"/> </a> </rl:column> - + <rl:column sortable="true" headerkey="erratalist.jsp.synopsis" sortattr="advisorySynopsis"> <c:out value="${current.advisorySynopsis}"/> - </rl:column> + </rl:column> <rl:column sortable="true" headerkey="channel.manage.errata.updatedate" sortattr="updateDateObj"> <c:out value="${current.updateDate}"/> - </rl:column> - + </rl:column> + </rl:list> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 17b88a8..acac8dc 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -32,7 +32,7 @@ <table class="details" width="80%"> <tr><bean:message key="channel.manage.errata.redhatmsg" /><br><br></tr> - + <tr> <th>Package Association:</th> <td> @@ -40,7 +40,7 @@ <bean:message key="channel.manage.errata.packageassocmsg" /> </td> </tr> - + <tr><th width="10%">Channel Version: </th> <td width="40%"> @@ -51,9 +51,9 @@ <select name="selected_version"> <c:forEach var="option" items="${version_list}"> - <option value="${option.version}" <c:if test="${option.selected eq true}">selected = "selected"</c:if>>${option.name}</option> - </c:forEach> - </optgroup> + <option value="${option.version}" <c:if test="${option.selected eq true}">selected = "selected"</c:if>>${option.name}</option> + </c:forEach> + </optgroup> </select> </td> @@ -68,7 +68,7 @@ </c:if> <c:if test="${channel_list != null}"> - + <tr> <th width="10%">Channel:</th><td width="40%"> <select name="selected_channel"> <optgroup> @@ -82,9 +82,9 @@ <c:otherwise> <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name}</option> </c:otherwise> - </c:choose> - </c:forEach> - </optgroup> + </c:choose> + </c:forEach> + </optgroup> </select> </td> @@ -106,10 +106,10 @@ filter="com.redhat.rhn.frontend.action.channel.manage.ErrataFilter"> <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - + <rl:column sortable="true" headerkey="exportcolumn.errataAdvisoryType" sortattr="advisoryType" @@ -124,10 +124,10 @@ <c:if test="${current.productEnhancement}"> <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> - </rl:column> - - - + </rl:column> + + + <rl:column sortable="true" headerkey="erratalist.jsp.advisory" sortattr="advisory"> @@ -135,18 +135,18 @@ <c:out value="${current.advisory}"/> </a> </rl:column> - + <rl:column sortable="true" headerkey="erratalist.jsp.synopsis" sortattr="advisorySynopsis"> <c:out value="${current.advisorySynopsis}"/> - </rl:column> + </rl:column> <rl:column sortable="true" headerkey="channel.manage.errata.updatedate" sortattr="updateDateObj"> <c:out value="${current.updateDate}"/> - </rl:column> - + </rl:column> + </rl:list> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index 38ce5b8..2e87e21 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -38,14 +38,14 @@ alphabarcolumn="nvrea" filter="com.redhat.rhn.frontend.taglibs.list.filters.PackageFilter" > - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - - + + <rl:column sortable="true" bound="false" headerkey="download.jsp.package" @@ -71,8 +71,8 @@ ${current.provider} </rl:column> - - + + </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index d140851..51a5020 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -34,7 +34,7 @@ Product Enhancement Advisory: </th> <td>${enhance_count}</td> - </tr> + </tr> <tr> <th><i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> Security Advisory: @@ -44,14 +44,14 @@ <tr> <th>Total Errata:</th> <td>${bug_count + enhance_count + secure_count}</td> - </tr> + </tr> <tr> <td colspan="2" class="csv-download"> <rl:csv name="errataList" dataset="errataList" exportColumns="advisory, advisorySynopsis, advisoryType, updateDate" /> </td> </tr> </table> - + </div> <div class="right-column"> <h2>Package Summary:</h2> @@ -79,21 +79,21 @@ <td colspan="2" class="csv-download"> <rl:csv name="packageList" dataset="packageList" exportColumns="id,packageName,packageNvre,packageArch,summary" /> </td> - </tr> + </tr> </table> - - + + </div> - + <hr /> <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='Clone Errata'/>" <c:choose> <c:when test="${totalSize < 1}">disabled</c:when> - </c:choose> + </c:choose> > </p> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp index 7d9a1ec..9d43c39 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp @@ -53,9 +53,9 @@ attr="name"> <c:out value="${current.setDate}" /> </rl:column> - - - + + + </rl:list> <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='channel.manage.patchset.delete'/>" > diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp index a85b3ce..70160c1 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp @@ -58,6 +58,6 @@ exportColumns="id, nvrea, provider" /> </rl:listset> - + </body> </html:html> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp index ff38210..de8d385 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp @@ -37,7 +37,7 @@ <c:out value="${current.name}" escapeXml="true" /> </a> </rl:column> - +  <rl:column bound="false" sortable="false" @@ -46,7 +46,7 @@ <c:out value="${chan}" /><br /> </c:forEach> </rl:column> - +  <rl:column bound="false" sortable="false" diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp index aebb05a..0333a6a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp @@ -13,7 +13,7 @@ </h2> <div class="page-summary"><bean:message key="ssmchildsubs.jsp.summary"/></div> - + <rl:listset name="channellist"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp index 8a09c31..8c39884 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp @@ -131,7 +131,7 @@ </rl:list> </rl:listset> - + <html:form method="post" action="/channel/ssm/BaseChannelSubscribe.do"> <div class="text-right"> @@ -151,7 +151,7 @@ </div> </html:form> - + <span class="small-text"><bean:message key="basesub.jsp.confirm.fasTrackBetaNote"/></span> </body> diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp index 93a7196..31d770b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp @@ -29,7 +29,7 @@ alphabarcolumn="name" filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" > - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp index 693edf6..690f417 100755 --- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp @@ -58,7 +58,7 @@ headerkey="systemlist.jsp.channel" > <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_list_fragment.jspf" %> </rl:column> - +  <rl:column sortable="false" bound="false" @@ -68,10 +68,10 @@ <c:out value="${current.entitlementLevel}" escapeXml="false"/> </rl:column> - + </rl:list> <rhn:submitted/> - + <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='confirm'/>" </input> </p> 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 481f7d3..3032817 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 @@ -6,7 +6,7 @@ deletionUrl="/rhn/activationkeys/Delete.do?tid=${param.tid}" deletionType="activationkeys" - deletionAcl = "user_role(activation_key_admin)" + deletionAcl = "user_role(activation_key_admin)" > <c:out value="${requestScope.description}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf index a919f63..20b192c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf @@ -34,7 +34,7 @@ <rl:decorator name="PageSizeDecorator"/> <rl:decorator name="SelectableDecorator"/> <rl:selectablecolumn value="${current.id}"/> - +  <rl:column sortable="true" bound="false" @@ -50,18 +50,18 @@ ${current.name} </c:otherwise> </c:choose> - - </rl:column> + + </rl:column> </rl:list> - + </div> <div class="text-right"> <rhn:submitted/> <hr/> - + <input type="submit" name ="dispatch" - value='<bean:message key="${param.action_key}"/>'/> + value='<bean:message key="${param.action_key}"/>'/> </div> </c:when> @@ -71,7 +71,7 @@ </strong></p> </div> </c:otherwise> -</c:choose> +</c:choose> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf index 706a52f..45670e5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf @@ -21,7 +21,7 @@ > <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - +  <rl:column sortable="true" headerkey="sdc.config.subscriptions.jsp.channel" @@ -30,7 +30,7 @@ name = "${current.name}" type = "central"/> </rl:column> - + <rl:column bound="true" headerkey="copy2channels.jsp.total_systems" attr="systemCountString" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf index d8db56c..d12e57a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf @@ -2,13 +2,13 @@ <%@ 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:column header="system.common.systemName" url="/rhn/systems/details/Overview.do?sid=${current.id}"> <i class="fa fa-desktop"></i> ${fn:escapeXml(current.name)} </rhn:column> - + <rhn:column header="targetsystems.jsp.capable"> <c:if test="${current.capable}"> <bean:message key="yes"/> @@ -17,7 +17,7 @@ <bean:message key="no"/> </c:if> </rhn:column> - + <rhn:column header="targetsystems.jsp.action"> <rhn:require acl="not user_role(org_admin)"> <c:if test="${not current.provisioning}"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf index 7cca90d..d09ef51 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf @@ -5,7 +5,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="summary.jsp.noActions"> <rhn:listdisplay> - + <rhn:column header="summary.jsp.status"> <c:if test="${current.success}"> <i class="fa fa-check text-success" title="<bean:message key="summary.jsp.okAlt" />"></i> @@ -19,7 +19,7 @@ url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> <i class="fa fa-desktop" title=""></i> ${current.name} </rhn:column> - + <rhn:column header="summary.jsp.error"> ${current.errorDisplay} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf index 27e4a79..fb65768 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf @@ -8,13 +8,13 @@ <c:when test="${revision.configContent.binary}"> <strong><bean:message key="filedetails.contents.jspf.binary-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.binary-edit" /> - + <bean:message key="filedetails.contents.jspf.binary-canupload"/> </c:when> <c:when test="${toolarge}"> <strong><bean:message key="filedetails.contents.jspf.toolarge-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.toolarge-edit" arg0="${requestScope.maxEditBytes}"/> - + <strong><bean:message key="filedetails.contents.jspf.download-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.download" arg0="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${revision.configFile.id}" @@ -37,7 +37,7 @@ <c:when test="${toolarge}"> <strong><bean:message key="filedetails.contents.jspf.toolarge-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.toolarge-display" arg0="${requestScope.maxbytes}"/> - + <strong><bean:message key="filedetails.contents.jspf.download-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.download" arg0="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${revision.configFile.id}" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf index 6b422cb..55ca49f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf @@ -21,7 +21,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="globalDeploy.jsp.noSystems"> - + <rhn:listdisplay filterBy="system.common.systemName" set="${requestScope.set}"> <rhn:set value="${current.id}" disabled="${not current.selectable}"/> <rhn:column header="globaldeploy.jsp.systemName-header"> @@ -55,7 +55,7 @@ </rhn:listdisplay> </rhn:list> <br/> - + <div class="small-text">* <bean:message key="deployglobal.jspf.not_deployable" arg0="/rhn/configuration/system/TargetSystems.do" arg1="${rhn:localize('targetsystems.jsp.toolbar')}" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf index e60da63..25d7e79 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf @@ -13,7 +13,7 @@ <th><bean:message key="deploy.jsp.deploy-name" /></th> <td><bean:message key="deploy.jsp.deploy" arg0="${revision.revision}" arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}" - arg2="${system}" + arg2="${system}" arg3="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /></td> </tr> <tr> @@ -63,14 +63,14 @@ <hr /> <div class="text-right"><html:submit property="dispatch"> <bean:message key="deploy.jsp.deploybutton" /> - </html:submit></div> + </html:submit></div> </c:when> <c:otherwise> <p><strong><bean:message key="system.sdc.missing.config_deploy1"/></strong></p> <p><strong><bean:message key="system.sdc.missing.config_deploy2" arg0="/rhn/configuration/system/TargetSystems.do" arg1="${rhn:localize('targetsystems.jsp.toolbar')}" - arg2="${rhn:localize('targetsystems.jsp.enable')}"/></strong></p> + arg2="${rhn:localize('targetsystems.jsp.enable')}"/></strong></p> </c:otherwise> </c:choose> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp index b025fc7..c9a8a2d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp @@ -77,7 +77,7 @@ <td><strong><bean:message key="diff.jsp.selinux" /></strong></td> <td>${myrev.configInfo.selinuxCtx}</td> </tr> - </c:if> + </c:if> <c:if test="${difftargetpath== 'true'}"> <tr> @@ -85,7 +85,7 @@ <td>${myrev.configInfo.targetFileName.path}</td> </tr> </c:if> - + <c:if test="${diffdelim == 'true'}"> <tr> <td><strong><bean:message key="diff.jsp.startDelim" /></strong></td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf index e7df79d..f7aa905 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf @@ -5,7 +5,7 @@ </div> <ul class="list-group"> <li class="list-group-item"> - <bean:message key="configoverview.jsp.systemsmanaged"/> + <bean:message key="configoverview.jsp.systemsmanaged"/> <a href="/rhn/configuration/system/ManagedSystems.do"> <c:if test="${summary.systems == 1}"> <bean:message key="system.common.onesystem" /> @@ -16,7 +16,7 @@ </a> </li> <li class="list-group-item"> - <bean:message key="configoverview.jsp.configchannels"/> + <bean:message key="configoverview.jsp.configchannels"/> <a href="/rhn/configuration/GlobalConfigChannelList.do"> <c:if test="${summary.channels == 1}"> <bean:message key="configoverview.jsp.onechannel" /> @@ -27,7 +27,7 @@ </a> </li> <li class="list-group-item"> - <bean:message key="configoverview.jsp.centralfiles"/> + <bean:message key="configoverview.jsp.centralfiles"/> <a href="/rhn/configuration/file/GlobalConfigFileList.do"> <c:if test="${summary.global_files == 1}"> <bean:message key="config.common.onefile" /> @@ -38,7 +38,7 @@ </a> </li> <li class="list-group-item"> - <bean:message key="configoverview.jsp.localfiles"/> + <bean:message key="configoverview.jsp.localfiles"/> <a href="/rhn/configuration/file/LocalConfigFileList.do"> <c:if test="${summary.local_files == 1}"> <bean:message key="config.common.onefile" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf index f2e9fc4..da741cc 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf @@ -15,12 +15,12 @@ </c:otherwise> </c:choose> </rhn:column> - + <rhn:column header="sdcconfigfiles.jsp.revision" url="/rhn/configuration/file/FileDetails.do?cfid=${current.configFileId}&crid=${current.configRevisionId}"> <bean:message key="sdcconfigfiles.jsp.filerev" arg0="${current.configRevision}" /> </rhn:column> - + <rhn:column header="sdcconfigfiles.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf index 623a338..e00d559 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf @@ -12,7 +12,7 @@ value="${requestScope.copy_to_global}"/> </rhn:require> </c:if> - + <c:if test="${not requestScope.server_import}" > <input type="submit" name ="dispatch" @@ -27,8 +27,8 @@ <rhn:require acl="user_role(config_admin)"> <input type="submit" name ="dispatch" - value="${requestScope.delete_files}"/> - </rhn:require> + value="${requestScope.delete_files}"/> + </rhn:require> </c:if> </div> </c:if> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf index 81f3f52..217f5ec 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf @@ -37,7 +37,7 @@ sortattr="updateDateObj" styleclass="text-align: center;"> ${current.updateDate} - </rl:column> + </rl:column> </c:if> <c:if test="${not displayCves}"> <rl:column headerkey="erratalist.jsp.updated" @@ -45,7 +45,7 @@ sortattr="updateDateObj" styleclass="text-align: center;"> ${current.updateDate} - </rl:column> + </rl:column> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index b0530b7..67aa370 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -12,11 +12,11 @@ <i class="fa spacewalk-icon-system-groups" title="<bean:message key='toolbar.work.with.group'/>"></i> <bean:message key="toolbar.work.with.group"/> </a> - <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> + <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> <i class="fa fa-trash-o" title="<bean:message key='toolbar.delete.systemgroup'/>" ></i> <bean:message key="toolbar.delete.systemgroup"/> - </a> - + </a> + </span> </div> <h1> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf index 0ea82a5..9b2ad08 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf @@ -33,10 +33,10 @@ <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> <div class="text-right"> <rhn:submitted/> - <hr/> + <hr/> <input type="submit" name ="dispatch" - value='<bean:message key="${param.action_key}"/>'/> + value='<bean:message key="${param.action_key}"/>'/> </div> </rhn:require> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf index dc4209b..89133c8 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf @@ -1,4 +1,4 @@ -<h2 style="clear: both; width: 100%; padding-top: 20px;"><bean:message key="kickstart.jsp.current"/></h2> +<h2 style="clear: both; width: 100%; padding-top: 20px;"><bean:message key="kickstart.jsp.current"/></h2> <rl:list dataset="sysKickstarting" emptykey="kickstartoverview.jsp.nocurrentlyks" @@ -8,9 +8,9 @@ <rl:column bound="false" sortable="false" headerkey="kickstart.jsp.system" - headerclass="thin-column"> + headerclass="thin-column"> - <c:if test="${not current.isBareMetal}"> + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/Overview.do?sid=${current.serverId}"> ${current.serverName}</a> </c:if> @@ -22,26 +22,26 @@ <bean:message key="kickstart.jsp.unregistered"/> </c:if> </c:if> - + </rl:column> - + <rl:column bound="false" sortable="false" headerkey="kickstart.jsp.status"> - - <c:if test="${not current.isBareMetal}"> + + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/kickstart/SessionStatus.do?sid=${current.serverId}"> ${current.description}</a> </c:if> <c:if test="${current.isBareMetal}"> ${current.description} </c:if> - </rl:column> - + </rl:column> + <rl:column bound="false" sortable="false" - headerkey="kickstart.jsp.lastchange"> + headerkey="kickstart.jsp.lastchange"> ${current.elapsedTimeAfterModify} - </rl:column> - + </rl:column> + </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf index a46230a..0769e89 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf @@ -29,7 +29,7 @@ </a> </td> </tr> - + </table> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf index 35d44e1..85e9f5f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf @@ -12,7 +12,7 @@ headerkey="kickstartoverview.jsp.kickstartsummary"> ${current.name} </rl:column> - + <rl:column bound="false" sortable="false" headerkey="emptyspace.jsp" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf index aaa16c6..fb15a35 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf @@ -15,7 +15,7 @@ <c:set var="distro_url">(${requestScope.distro.label})</c:set> </c:otherwise> </c:choose> - + <html:radio value="distro" property="kernelParamsType" onclick="form.kernelParamsId.disabled = true;"> <bean:message key="kickstart.schedule.kernel.options.distro"/> </html:radio> ${distro_url}:<br/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf index 6f11600..dc0cee2 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf @@ -9,8 +9,8 @@ sortable="false" headerkey="kickstart.jsp.system" headerclass="thin-column"> - - <c:if test="${not current.isBareMetal}"> + + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/Overview.do?sid=${current.serverId}"> ${current.serverName}</a> </c:if> @@ -26,22 +26,22 @@ <rl:column bound="false" sortable="false" - headerkey="kickstart.jsp.status"> - <c:if test="${not current.isBareMetal}"> + headerkey="kickstart.jsp.status"> + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/kickstart/SessionStatus.do?sid=${current.serverId}"> ${current.description}</a> </c:if> <c:if test="${current.isBareMetal}"> ${current.description} - </c:if> + </c:if> </rl:column> <rl:column bound="false" sortable="false" headerkey="kickstart.jsp.lastchange" - > + > ${current.elapsedTimeAfterModify} </rl:column> - - -</rl:list> \ No newline at end of file + + +</rl:list> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf index 4723ae6..4127796 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf @@ -4,13 +4,13 @@ <c:forEach items="${items_list}" var="sublist" varStatus="loop"> <c:choose> <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-column-even"/> + <c:set var ="style_class" value="list-column-even"/> </c:when> <c:otherwise> <c:set var ="style_class" value="list-column-odd"/> </c:otherwise> </c:choose> - + <c:if test = "${loop.last}"> <c:set var ="style_class" value="${style_class} last-column"/> </c:if> @@ -22,8 +22,8 @@ <c:choose> <c:when test="${item.similar}"><li class="inactive"></c:when> <c:otherwise><li></c:otherwise> - </c:choose> - + </c:choose> + <c:choose> <c:when test="${empty item.value}"> <c:set var ="value"><bean:message key="generic.jsp.none"/></c:set> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf index fc4e33b..31ac0ca 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf @@ -3,7 +3,7 @@ <c:forEach items="${items_list}" var="item" varStatus="loop"> <c:choose> <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-column-even"/> + <c:set var ="style_class" value="list-column-even"/> </c:when> <c:otherwise> <c:set var ="style_class" value="list-column-odd"/> @@ -15,7 +15,7 @@ <c:if test = "${loop.last}"> <c:set var ="style_class" value="${style_class} last-column"/> </c:if> - + <td class="${style_class} "> <c:choose> <c:when test="${empty item.value}"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf index 485be22..a583eee 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> - + <rl:list dataset="pageList" name="groupList" @@ -43,7 +43,7 @@ </c:choose> <c:out value="</a>" escapeXml="false" /> - </rl:column> + </rl:column> <%@ include file="monitoring_status_groups.jspf" %> @@ -57,8 +57,8 @@ <c:out value="<a href=\"/network/systems/groups/details.pxt?sgid=${current.id}\">" escapeXml="false" /> <c:out value="${current.name}" escapeXml="true" /> <c:out value="</a>" escapeXml="false" /> - </rl:column> - + </rl:column> +  <rl:column sortable="true" @@ -75,7 +75,7 @@ <c:out value="<a href=\"/rhn/groups/ListRemoveSystems.do?sgid=${current.id}\">${current.serverCount}</a>" escapeXml="false" /> </c:otherwise> </c:choose> - </rl:column> + </rl:column>  @@ -85,13 +85,13 @@ styleclass="center" headerclass="center"> - + <c:out value="<a class=\"link-button\" href=\"/network/systems/ssm/work_with_group.pxt?sgid=${current.id}&pxt_trap=rhn:work_with_group_cb\"> - ${rhn:localize('grouplist.jsp.use')}</a>" escapeXml="false" /> - - </rl:column> + ${rhn:localize('grouplist.jsp.use')}</a>" escapeXml="false" /> + + </rl:column> + - </rl:list> <rl:csv dataset="pageList" @@ -101,5 +101,5 @@ <hr /> <input type="submit" name="union" value="${rhn:localize('grouplist.jsp.union')}" /> <input type="submit" name="intersection" value="${rhn:localize('grouplist.jsp.intersection')}" /> -</div> +</div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf index f852b2f..b7b9648 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf @@ -43,7 +43,7 @@ emptykey="assignedgroups.jsp.nogroups" alphabarcolumn="name"> <rl:decorator name="PageSizeDecorator"/> - + <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> <rl:decorator name="SelectableDecorator"/> <rl:selectablecolumn value="${current.id}"/> @@ -54,9 +54,9 @@ headerkey="grouplist.jsp.name" sortattr="name" defaultsort="asc" filterattr="name" styleclass="${nameStyle}"> <a href="/network/systems/groups/details.pxt?sgid=${current.id}">${current.name}</a> - </rl:column> + </rl:column> </rl:list> - + </div> <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> <div class="text-right"> @@ -74,7 +74,7 @@ </strong> </p> </div> </c:otherwise> -</c:choose> +</c:choose> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf index 41a4bb4..7e7b764 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 @@ -66,7 +66,7 @@ <c:if test="${counter == 1}"> </tr> - </c:if> + </c:if> </table> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf index ce2fb96..e5203ef 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf @@ -4,7 +4,7 @@ sortable="true" headerkey="realname.displayname" sortattr="userLastName"> - + <c:out value="${current.userLastName}, ${current.userFirstName}" escapeXml="false" /> </rl:column> @@ -13,7 +13,7 @@ headerkey="userdetails.jsp.roles" sortable="true" attr="roleNames"/> - + <rl:column bound="true" headerkey="userdetails.jsp.lastsign" sortable="true" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index 6614d36..4ebed53 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -15,29 +15,29 @@ hidepagenums="true" title="${rhn:localize('yourrhn.jsp.criticalsystems')}" > - + <rl:column headerkey="probesuitesystemsedit.jsp.systemname" headerclass="row-2"> <a href="/rhn/systems/details/Overview.do?sid=${current.id}"> <c:out value="${current.serverName}"/></a> </rl:column> - + <rl:column headerkey="yourrhn.jsp.allupdates" headerclass="row-2"> - ${current.securityErrata + current.bugErrata + current.enhancementErrata} + ${current.securityErrata + current.bugErrata + current.enhancementErrata} </rl:column> - + <%@ include file="/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf" %> - + <rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata" headerclass="row-2 text-align: center;"> - <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>${current.securityErrata} + <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>${current.securityErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata" headerclass="row-2 text-align: center;"> - <i class="fa fa-bug" title="<bean:message key='errata-legend.jsp.bugfix'/>"></i>${current.bugErrata} + <i class="fa fa-bug" title="<bean:message key='errata-legend.jsp.bugfix'/>"></i>${current.bugErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp index 15a99bd..ea23966 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp @@ -28,7 +28,7 @@ <a href="/rhn/systems/details/Overview.do?sid=${current.id}"> <c:out value="${current.serverName}"/></a> </rl:column> - + <rl:column bound="false" headerkey="systemlist.jsp.channel" > @@ -43,13 +43,13 @@ </c:otherwise> </c:choose> </rl:column> - + <rl:column bound="false" headerkey="registeredlist.jsp.date" > <fmt:formatDate value="${current.created}" type="both" dateStyle="short" timeStyle="long"/> </rl:column> - + <rl:column bound="false" headerkey="registeredlist.jsp.user" > @@ -63,7 +63,7 @@ </c:otherwise> </c:choose> </rl:column> - + <rl:column bound="true" headerkey="systemlist.jsp.entitlement" attr="entitlementLevel"/> 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 70a35c2..5e49ea5 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 @@ -36,16 +36,16 @@ <a href="/network/systems/groups/details.pxt?sgid=${current.id}"> <c:out value="${current.name}"/></a> </rl:column> - + <rl:column headerkey="grouplist.jsp.systems"> <a href="/network/systems/groups/details.pxt?sgid=${current.id}"> <c:out value="${current.serverCount}"/></a> </rl:column> - + </rl:list> <a href="/rhn/systems/SystemGroupList.do"> <div class="btn btn-default spacewalk-btn-margin-vertical"><i class="spacewalk-icon-system-groups"></i><bean:message key="yourrhn.jsp.allgroups" /></div> </a> - + </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index b6f0750..59e6fe6 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -13,11 +13,11 @@ </h3> </div> - <ul class="list-group"> + <ul class="list-group"> <rhn:require acl="not user_role(satellite_admin)"> <rhn:require acl="user_role(org_admin)"> - <li class="list-group-item"> + <li class="list-group-item"> <i class="fa fa-caret-right"></i> <a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="yourrhn.jsp.tasks.subscriptions" /> @@ -55,7 +55,7 @@ <i class="fa fa-caret-right"></i> <a href="/rhn/help/client-config/en-US/index.jsp"> <bean:message key="yourrhn.jsp.tasks.registersystem" /> - </a> + </a> </li> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp index be1ac0f..866fde7 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp @@ -43,7 +43,7 @@ <input type="submit" name="dispatch" value="${rhn:localize('copy2systems.jsp.doCopy')}" - /> + /> </div> <rhn:submitted/> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp index 31e99d3..6fb3174 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp @@ -21,7 +21,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="channelfiles.jsp.noFiles"> <rhn:listdisplay filterBy="deploy.jsp.filepath-header" set="${requestScope.set}"> <rhn:set value="${current.id}"/> - + <rhn:column header="deploy.jsp.filepath-header"> <cfg:file id="${current.id}" path="${current.path}" type="${current.type}" /> </rhn:column> @@ -31,11 +31,11 @@ | [<a href="/rhn/configuration/file/CompareRevision.do?cfid=${current.id}"><bean:message key="config.common.compare" /></a>] </rhn:column> - + <rhn:column header="deploy.jsp.lastmodified-header"> <a href="/rhn/configuration/file/FileDetails.do?cfid=${current.id}">${current.modifiedDisplay}</a> </rhn:column> - + <rhn:column header="deploy.jsp.current-header"> <a href="/rhn/configuration/file/FileDetails.do?cfid=${current.id}"> <bean:message key="config.common.revision" arg0="${current.latestConfigRevision}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index 9fb1308..9057a62 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -52,8 +52,8 @@ </rl:column> </rl:list> </div> - - + + <h2><bean:message key="deployconfirm.jsp.systems-header2" /></h2>  <div> @@ -68,7 +68,7 @@ </rl:column> </rl:list> </div> - + <c:if test="${not empty requestScope.selectedSystems && not empty requestScope.selectedFiles}">  <p><bean:message key="deployconfirm.jsp.widgetsummary" /></p> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp index 250fea1..561d261 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -27,7 +27,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="deploy.jsp.noSystems"> <rhn:listdisplay filterBy="system.common.systemName" set="${requestScope.set}"> <rhn:set value="${current.id}"/> - + <rhn:column header="system.common.systemName"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> @@ -44,4 +44,4 @@ </html:form> </body> </html> - + diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp index 1b9af76..113f893 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp @@ -6,7 +6,7 @@ <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> - + <div class="panel panel-default"> <div class="panel-heading"> <h4><bean:message key="addfiles.jsp.upload-link" /> </h4> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index 873c419..ff6b40c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -36,6 +36,6 @@ <html:submit><bean:message key="deletefile.jsp.submit" /></html:submit> </div> </html:form> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index 2c0a7dd..2143b11 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -36,6 +36,6 @@ <html:submit><bean:message key="deleterev.jsp.submit" /></html:submit> </div> </html:form> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp index cbb47a9..56508ad 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp @@ -25,7 +25,7 @@ <bean:message key="deploy.jsp.sandbox-note1" arg1="/rhn/systems/details/Overview.do?sid=${sid}" arg0="${system}"/> - + <c:set var="copyname" scope="request"> <bean:message key="copycentral.jsp.copy" /> </c:set> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp index 36f2499..9f8547c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -31,7 +31,7 @@ </rhn:column> </rhn:listdisplay> </rhn:list> - + <c:if test="${not empty requestScope.pageList}"> <div> <bean:message key="deploy.jsp.widgetsummary" /></p> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp index a2cd705..fead9da 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp @@ -15,25 +15,25 @@ <html:form action="/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - + <div class="details-column-left"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/details.jspf"%> </div> - + <div class="details-column-right"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/properties.jspf"%> </div> - + <c:if test="${revision.file}"> <div class="details-full"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf"%> </div> - + <div class="details-full"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/contents.jspf"%> </div> </c:if> - + <rhn:require acl="config_channel_editable()" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <div class="submit-bar"> @@ -44,7 +44,7 @@ </div> </rhn:require> </html:form> - + <rhn:require acl="is_file();config_channel_editable()" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/upload.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index 08d1cee..462dab6 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -23,7 +23,7 @@ mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <rhn:set value="${current.id}"/> </rhn:require> - + <rhn:column header="manage.jsp.name"> <a href="/rhn/configuration/file/FileDetails.do?crid=${current.id}&cfid=${file.id}"> <cfg:file nolink="true" id="${file.id}" revisionId="${current.id}" path="${file.configFileName.path}" type="${file.latestConfigRevision.configFileType.label}" /> @@ -31,14 +31,14 @@ arg0="${current.revisionNumber}"/> </a> </rhn:column> - + <rhn:require acl="is_file()" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <rhn:column header="manage.jsp.size"> ${current.sizeDisplay} </rhn:column> </rhn:require> - + <rhn:column header="manage.jsp.creation"> ${current.createdDisplay} </rhn:column> 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 103e930..777ae4c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp @@ -40,7 +40,7 @@ <rhn:column header="globalconfiglist.jsp.files" url="/rhn/configuration/ChannelFiles.do?ccid=${current.id}" renderUrl="${current.fileCount > 0}"> - <c:out value="${current.fileCountsMessage}"/> + <c:out value="${current.fileCountsMessage}"/> </rhn:column> <rhn:column header="globalconfiglist.jsp.systems" diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp index 20fb805..3b5de25 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp @@ -8,7 +8,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central"> <bean:message key="globalfilelist.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp index 4d4a057..a5a8bdb 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local"> <bean:message key="localfilelist.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 291e18c..48051ea 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -43,7 +43,7 @@ <h4><bean:message key="configoverview.jsp.modconfig"/></h4> </div> <div class="panel-body"> - + <rhn:list pageList="${requestScope.recentFiles}" noDataText="configoverview.jsp.noFiles"> <rhn:listdisplay> <rhn:column header="configoverview.jsp.filename" @@ -91,7 +91,7 @@ </rhn:listdisplay> </rhn:list> </div> - </div> + </div> <div class="panel panel-default"> <div class="panel-heading"> 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 f341f61..16168f1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -52,17 +52,17 @@ <rhn:listdisplay set="${requestScope.set}" filterBy="sdcimportfile.jsp.filename"> <rhn:set value="${current.id}"/> - + <rhn:column header="sdcimportfile.jsp.filename" url="/rhn/configuration/file/FileDetails.do?crid=${current.configRevisionId}&cfid=${current.configFileId}"> ${current.path} </rhn:column> - + <rhn:column header="sdcimportfile.jsp.channel"> <cfg:channel id="${current.configChannelId}" name="${current.channelNameDisplay}" type="${current.configChannelType}"/> </rhn:column> - + </rhn:listdisplay> </rhn:list> <div class="text-right"> 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 535c858..007058a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -32,7 +32,7 @@ <rhn:column header="sdcimportconfirm.jsp.filename"> ${current.path} </rhn:column> - + <rhn:column header="sdcimportconfirm.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}" renderUrl="${not empty current.configChannelType}"> @@ -54,7 +54,7 @@ </c:otherwise> </c:choose> </rhn:column> - + </rhn:listdisplay> </rhn:list> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp index c5c67a4..7c23118 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp @@ -49,11 +49,11 @@ </table>  <h2><bean:message key="sdc.config.header.recent-events"/></h2> - + <table class="details"> <tr> <th><bean:message key="sdc.config.last-config.deployment"/>:</th> - + <td><c:if test="${requestScope.deploymentTimeMessage}"> ${requestScope.deploymentTimeMessage} <br /><br /> @@ -64,17 +64,17 @@ <tr> <th><bean:message key="sdc.config.last-rhn.comparison"/>:</th> <td>${requestScope.diffTimeMessage} - + ${requestScope.diffActionMessage} - + <c:if test="${not empty requestScope.diffActionMessage}"> ${requestScope.diffDetailsMessage} </c:if> </td> - + </tr> - </table> - + </table> + </td> <td style="width: 45%"> <h2><bean:message key="sdc.config.header.actions"/></h2> @@ -106,7 +106,7 @@ <br /> </rhn:require> <rhn:require mixins="com.redhat.rhn.common.security.acl.SystemAclHandler" - acl="client_capable(configfiles.diff)"> + acl="client_capable(configfiles.diff)"> <table cellspacing="0" cellpadding="0" align="center" class="half-table"> <thead> <tr class="list-row-odd"> @@ -125,7 +125,7 @@ </tr> </table> <br /> - </rhn:require> + </rhn:require> <table cellspacing="0" cellpadding="0" align="center" class="half-table"> <thead> <tr class="list-row-odd"> @@ -163,7 +163,7 @@ <p><bean:message key="system.sdc.missing.config_deploy2" arg0="/rhn/configuration/system/TargetSystems.do" arg1="${rhn:localize('targetsystems.jsp.toolbar')}" - arg2="${rhn:localize('targetsystems.jsp.enable')}"/></p> + arg2="${rhn:localize('targetsystems.jsp.enable')}"/></p> </c:otherwise> </c:choose> </td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp index fb9f05d..1f4a12b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp @@ -13,12 +13,12 @@ <h2> <img src="${cfg:channelHeaderIcon('central')}" alt="${cfg:channelAlt('central')}"/> - <bean:message key="sdc.config.subscriptions.jsp.header"/></h2> + <bean:message key="sdc.config.subscriptions.jsp.header"/></h2> <h3><bean:message key="ssm.config.subscribe.jsp.step"/></h3> <p><bean:message key="sdc.config.subscriptions.jsp.para1" /></p> <noscript> <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> -</noscript> +</noscript> <c:choose> <c:when test="${not empty pageList}"> <html:form method="POST" action="/systems/details/configuration/SubscriptionsSubmit.do?sid=${param.sid}"> @@ -51,7 +51,7 @@ </div> </rhn:list> <rhn:noscript/> - + <rhn:submitted/> </html:form> </c:when> @@ -60,6 +60,6 @@ arg0="/rhn/systems/details/configuration/ConfigChannelList.do?sid=${param.sid}"/> </strong></p> </c:otherwise> -</c:choose> +</c:choose> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp index 107cd05..4af2a56 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp @@ -32,7 +32,7 @@ path = "${path}" type = "${revisionBean.configRevision.configFileType.label}" nolink="true" - /></strong></c:set> + /></strong></c:set> <c:set var="channel" value="${revisionBean.configRevision.configFile.configChannel}"/> @@ -76,7 +76,7 @@ <td> <pre style="overflow: scroll; width: 100%; height: 400px;"><c:out value="${revisionBean.configRevisionActionResult.resultContents}"/></pre> </td> - </tr> + </tr> </table> </p> </body> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp index 15cf352..3669d07 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp @@ -20,7 +20,7 @@ <rl:listset name="fileSet"> <rhn:csrf /> <rhn:submitted /> - +  <rl:list decorator="SelectableDecorator" width="100%" @@ -35,7 +35,7 @@ headerkey="sdc.config.file_list.name" sortattr="path"> <c:choose> - <c:when test="${current.localRevision != null}"> + <c:when test="${current.localRevision != null}"> <cfg:file path = "${current.path}" type="${current.localConfigFileType}" nolink="true"/> </c:when> @@ -47,9 +47,9 @@ </rl:column> <c:set var="fileUrl" value="${cfg:fileUrl(current.configFileId)}"/> - <c:set var="compareUrl" value="${cfg:fileCompareUrl(current.configFileId)}"/> + <c:set var="compareUrl" value="${cfg:fileCompareUrl(current.configFileId)}"/> + -  <rl:column bound="false" headerkey="sdc.config.file_list.actions" @@ -79,9 +79,9 @@ <c:when test="${current.localRevision != null}"> <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.localRevision}"/> + arg0="${current.localRevision}"/> </c:set> - + <cfg:file path ="${revisionLook}" type ="${current.localConfigFileType}" id = "${current.localConfigFileId}" @@ -101,10 +101,10 @@ <rl:column bound="false" headerkey="sdc.config.file_list.current_revision" > - + <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.configRevision}"/> + arg0="${current.configRevision}"/> </c:set> <c:set var="display"><cfg:file path ="${revisionLook}" type ="${current.configFileType}" @@ -112,14 +112,14 @@ revisionId = "${current.configRevisionId}" /> </c:set> - + <c:choose> <c:when test="${current.localRevision != null}"> - <span class="overridden-file">${display}</span> + <span class="overridden-file">${display}</span> </c:when> <c:otherwise>${display}</c:otherwise> - </c:choose> - </rl:column> + </c:choose> + </rl:column> </rl:list> <c:import url="/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf"/> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp index 2422d41..02f3c31 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp @@ -36,7 +36,7 @@ <cfg:file path="${current.path}" type ="${current.localConfigFileType}" nolink = "true"/> </rl:column> - +  <rl:column bound="false" headerkey="sdc.config.file_list.actions"> @@ -49,7 +49,7 @@ <rl:column bound="false" headerkey="sdc.config.file_list.overrides" > - <c:choose> + <c:choose> <c:when test="${current.configRevision != null}"> <c:set var="channelDisplay"><cfg:channel id = "${current.configChannelId}" name ="${current.configChannelName}" @@ -74,13 +74,13 @@ > <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.localRevision}"/> + arg0="${current.localRevision}"/> </c:set> <cfg:file path ="${revisionLook}" type ="${current.localConfigFileType}" id = "${current.localConfigFileId}" revisionId = "${current.localRevisionId}" - /> + /> </rl:column> </rl:list> <br> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp index d307528..27e0278 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp @@ -10,7 +10,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2><img class="h2-image" src="${cfg:channelHeaderIcon('sandbox')}"/> -<bean:message key="sdc.config.header.overview"/></h2> +<bean:message key="sdc.config.header.overview"/></h2> <p><bean:message key="sdc.config.file_list.sandbox_description" arg0="${fn:escapeXml(requestScope.system.name)}" arg1="${rhn:localize('sdc.config.file_list.copy_to_global')}"/></p> @@ -26,17 +26,17 @@ > <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - +  <rl:column bound = "false" sortable="true" headerkey="sdc.config.file_list.name" sortattr="path" - > + > <cfg:file path="${current.path}" - type ="${current.configFileType}" nolink = "true"/> + type ="${current.configFileType}" nolink = "true"/> </rl:column> - +  <rl:column bound="false" headerkey="sdc.config.file_list.actions"> @@ -50,7 +50,7 @@ > <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.configRevision}"/> + arg0="${current.configRevision}"/> </c:set> <cfg:file path ="${revisionLook}" type ="${current.configFileType}" diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 074c2a6..6f6d3e1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -23,7 +23,7 @@ </p> <noscript> <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> - </noscript> + </noscript> </div> <html:form method="POST" action="/systems/ssm/config/Rank.do"> @@ -51,7 +51,7 @@ </td> </tr> </table> - + <div class="text-right"> <hr /> <html:hidden property="dispatch" value="${rhn:localize('ssm.config.rank.jsp.apply')}"/> diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp index 226ce84..d6afbec 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp @@ -57,6 +57,6 @@ </div> </form> </div> - </div> + </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index be260e5..4c2c26f 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -35,7 +35,7 @@ emptykey="nosystems.message" alphabarcolumn="name" filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter"> - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="SelectableDecorator"/> <rl:decorator name="PageSizeDecorator"/> @@ -80,19 +80,19 @@ ${current.entitlementLevel} </rl:column> </rl:list> - + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="affectedsystems.jsp.apply"/> </html:submit> </div> - + <rl:csv dataset="pageList" name="systemAffectedCSVExport" exportColumns="name, status, channelLabels, entitlementLevel" header="${errata.advisoryName} - ${errata.advisoryType}" /> - + <rhn:submitted/> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index f6febb9..4007480 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -30,10 +30,10 @@ <label for="searchform"><bean:message key="docsearch.jsp.searchfor"/></label> </div> <div class="col-md-4"> - <html:text property="search_string" - name="search_string" + <html:text property="search_string" + name="search_string" styleId="searchform" - value="${search_string}" + value="${search_string}" styleClass="form-control" accesskey="4"/> </div> @@ -60,7 +60,7 @@ </div> </div> </div> - + <input type="hidden" name="submitted" value="true" /> </html:form> 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 f86d0a0..8a7b880 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp @@ -15,7 +15,7 @@ <div> <form method="post" action="/rhn/kickstart/cobbler/CobblerSnippetDelete.do"> <rhn:csrf /> -<h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> +<h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> <table class="details"> <tr> <th> 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 37f9df2..a85e2ff 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp @@ -42,7 +42,7 @@ </th> <td> <bean:message key="cobbler.snippet.default"/><br/> - <rhn:tooltip key ="cobbler.snippet.default.tip"/> + <rhn:tooltip key ="cobbler.snippet.default.tip"/> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp index d57a127..ffaebfd 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp @@ -13,7 +13,7 @@ <c:import url="/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf"> <c:param name = "range_delete_url" value="/rhn/kickstart/KickstartIpRangeDelete.do"/> - <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEdit.do"/> + <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEdit.do"/> </c:import> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp index 7614800..1d8fb28 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp @@ -47,9 +47,9 @@ </rl:list> </rl:listset> - - + + </div> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index d62e141..19c63e8 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -25,7 +25,7 @@ <rhn:submitted /> <rl:list dataset="pageList" name="ksList" emptykey="kickstart.jsp.nokickstarts" alphabarcolumn="label" - filter="com.redhat.rhn.frontend.action.kickstart.KickstartProfileFilter"> + filter="com.redhat.rhn.frontend.action.kickstart.KickstartProfileFilter"> <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> <rl:column @@ -39,7 +39,7 @@ </c:when> <c:when test="${current.cobbler}"> <c:out value="${current.label}" escapeXml="true" /> - </c:when> + </c:when> <c:otherwise> <a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${current.id}"><c:out value="${current.label}" escapeXml="true" /></a> </c:otherwise> @@ -59,7 +59,7 @@ </rl:column> <rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel"> <c:out value="${current.treeLabel}"/> - </rl:column> + </rl:column> <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler"> <c:choose> <c:when test="${current.cobbler}"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp index 1f8ce19..1d26a32 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp @@ -17,7 +17,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - + </rhn:require> <c:import url="/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf"> <c:param name = "post_url" value="/kickstart/EditVariables.do"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index bb788f2..96a3548 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -24,7 +24,7 @@ <rhn:csrf /> <rhn:submitted /> <rl:list emptykey="kickstart.distributions.jsp.nolists" - alphabarcolumn="label"> + alphabarcolumn="label"> <rl:decorator name="PageSizeDecorator"/> <rl:column bound="false" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp index 907380a..7aca435 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp @@ -11,8 +11,8 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> - - + + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> @@ -23,11 +23,11 @@ <p> <bean:message key="kickstartscript.order.summary"/> </p> - + <html:form method="post" action="/kickstart/KickstartScriptOrder.do"> <rhn:csrf /> <rhn:submitted /> - + <noscript> <p><bean:message key="kickstartscript.order.noscript"/></p> </noscript> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp index 57796cb..8934012 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp @@ -41,7 +41,7 @@ <p> <bean:message key="kickstartscript.jsp.summary2"/> </p> - + <rl:listset name="kickstartScriptsSet"> <rhn:csrf /> <rl:list dataset="kickstart_scripts" @@ -49,13 +49,13 @@ name="kickstartPreScripts" styleclass="list" emptykey="kickstartscript.jsp.noscripts"> - + <rl:column bound="false" sortable="false" headerkey="kickstartscript.jsp.type"> ${current.prettyScriptType} </rl:column> - + <rl:column bound="false" sortable="false" headerkey="kickstartscript.jsp.scriptname"> @@ -68,7 +68,7 @@ <c:out value="${current.scriptName}" escapeXml="true" /> </c:if> </rl:column> - + <rl:column bound="false" sortable="false" headerkey="kickstartscript.jsp.language"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index 93aa1a6..f0ea006 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -146,7 +146,7 @@ function clickNewestTree() { <tr> <th><bean:message key="softwareedit.jsp.repos" />:</th> <td> - + <c:forEach items="${kickstartSoftwareForm.map.possibleRepos}" var="item"> <html:multibox property="selectedRepos" disabled="${item.disabled}" value = "${item.value}" styleId="type_${item.value}"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 155b454..4d5368a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -50,9 +50,9 @@ <c:if test="${empty requestScope.isIP}"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf" %> </c:if> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> <br/> - + <h2><i class="fa fa-rocket"></i><bean:message key="kickstart.schedule.heading4.jsp" /></h2> <table class="details"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp index 5e1102f..25b6f18 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp @@ -6,7 +6,7 @@ <head> <script language="javascript" type="text/javascript"> - + function toggleIFText(ctl) { var toDisable = null; var toEnable = null; @@ -16,7 +16,7 @@ } else { toDisable = document.getElementById("dhcpNetworkIf"); - toEnable = document.getElementById("staticNetworkIf"); + toEnable = document.getElementById("staticNetworkIf"); } toDisable.disabled = true; toEnable.disabled = false; @@ -33,7 +33,7 @@ } </script> - + <% boolean dhcpIfDisabled = Boolean.valueOf( (String) request.getAttribute("dhcpIfDisabled")).booleanValue(); diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp index 7d76e0d..6db5c4c 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp @@ -2,5 +2,5 @@ <c:import url="/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf"> <c:param name = "nav" value="/WEB-INF/nav/kickstart_raw_mode.xml"/> <c:param name = "post_url" value="/kickstart/KickstartDeleteAdvanced.do"/> - <c:param name = "noComments" value="True"/> + <c:param name = "noComments" value="True"/> </c:import> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp index aede491..691bef1 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp @@ -26,9 +26,9 @@ function clickNewestTree(obj) { <c:param name = "summary_key" value="kickstartdetails.jsp.summary1"/> <c:param name = "action_key" value="message.Update"/> <c:param name = "url" value="/kickstart/AdvancedModeEdit.do"/> - <c:param name = "ksurl" value="${requestScope.ksurl}"/> - <c:param name = "usingUpdateAll" value="${requestScope.usingUpdateAll}"/> - <c:param name = "usingUpdateRedHat" value="${requestScope.usingUpdateRedHat}"/> + <c:param name = "ksurl" value="${requestScope.ksurl}"/> + <c:param name = "usingUpdateAll" value="${requestScope.usingUpdateAll}"/> + <c:param name = "usingUpdateRedHat" value="${requestScope.usingUpdateRedHat}"/> </c:import> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp index d23891d..e4111ac 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf"%> <c:import url="/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf"> <c:param name = "range_delete_url" value="/rhn/kickstart/KickstartIpRangeDeleteAdvanced.do"/> - <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEditAdvanced.do"/> + <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEditAdvanced.do"/> </c:import> </body> </html:html> 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 f1a8115..a99ed95 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -45,7 +45,7 @@ <rl:column headerkey="general.jsp.org.tbl.header1" filterattr="name"> ${current.name} </rl:column> - +  <rl:column bound="true" headerkey="org.channel.subscribed.systems" diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp index c20b9db..ed50eb3 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp @@ -27,7 +27,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.OrgListFilter" emptykey="orglist.jsp.noOrgs"> -  +  <rl:column bound="false" sortable="true" headerkey="org.nopunc.displayname" @@ -47,7 +47,7 @@ <c:out value="${current.sharedChannels}" /> </c:otherwise> </c:choose> - </rl:column> + </rl:column> </rl:list> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp index 7fc9028..3aba5f7 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp @@ -36,7 +36,7 @@ <input type="hidden" name="formvars" value="aid" /> </rhn:list> - + </form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp index ac5671a..2e7b700 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp @@ -38,7 +38,7 @@ <input type="hidden" name="formvars" value="aid" /> </rhn:list> - + </form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp index 6d05e3a..f9b2df1 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp @@ -37,6 +37,6 @@ <input type="hidden" name="aid" value="${aid}"> </rl:listset> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp index a03559e..837778f 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp @@ -63,7 +63,7 @@ <html:submit> <bean:message key="scheduleremote.jsp.schedulepackageremoval"/> </html:submit> - </c:if> + </c:if> <c:if test="${param.mode == 'upgrade'}"> <html:submit> <bean:message key="scheduleremote.jsp.schedulepackageupgrade"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp index adbead4..565de4a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp @@ -8,7 +8,7 @@ <body> <rhn:toolbar base="h1" icon="fa-key" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info"> - <bean:message key="system.jsp.customkey.createtitle"/> + <bean:message key="system.jsp.customkey.createtitle"/> </rhn:toolbar> <p> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp index 251d38d..6d258a4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp @@ -35,7 +35,7 @@ ${current.nvre}</a> </rl:column> </rl:list> - + <c:if test="${not empty requestScope.pageList}"> <div class="text-right"> <div align="left"> @@ -90,8 +90,8 @@ value='<bean:message key="installconfirm.jsp.confirm"/>'/> </div> - <input type="hidden" name="sid" value="${param.sid}" /></c:if> - + <input type="hidden" name="sid" value="${param.sid}" /></c:if> + </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp index 8aef6ac..2d39237 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp @@ -76,7 +76,7 @@ </c:choose> </rl:column> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> @@ -84,12 +84,12 @@ <rhn:require acl="system_feature(ftr_package_remove)"> <input type="submit" name ="dispatch" - value='<bean:message key="packagelist.jsp.removepackages"/>'/> + value='<bean:message key="packagelist.jsp.removepackages"/>'/> </rhn:require> </div> -</c:if> - +</c:if> + </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf index 1c1183e..92c7f3a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf @@ -43,7 +43,7 @@ <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}" disabled="${not current.selectable}"/> - + <rl:column headerkey="packagelist.jsp.packagename" bound="false" sortattr="nvre" sortable="true" filterattr="nvre" styleclass="${nameStyle}"> @@ -66,7 +66,7 @@ </rl:column> </c:if> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> @@ -75,7 +75,7 @@ name ="dispatch" value='<bean:message key="${dispatch}"/>'/> </div> -</c:if> +</c:if> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp index 3ce0e73..a1cc508 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -40,7 +40,7 @@ <rl:column headerkey="upgradable.jsp.latest" bound="false" sortattr="nvrea" sortable="true" filterattr="nvrea"> - + <a href="/rhn/software/packages/Details.do?sid=${param.sid}&id_combo=${current.idCombo}"> ${current.nvrea}</a> </rl:column> @@ -66,16 +66,16 @@ </c:forEach> </rl:column> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" name ="dispatch" - value='<bean:message key="upgradable.jsp.upgrade"/>'/> + value='<bean:message key="upgradable.jsp.upgrade"/>'/> </div> -</c:if> +</c:if> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp index 8e0fba7..8bc0e13 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp @@ -38,15 +38,15 @@ function setStep(stepName) { <rl:decorator name = "PageSizeDecorator"/> <rl:radiocolumn value="${current.cobblerId}"/> <rl:column headerkey="kickstartranges.jsp.profile" filterattr="label" sortable="true" sortattr="label"> - <a href="${current.cobblerUrl}">${fn:escapeXml(current.label)}</a> + <a href="${current.cobblerUrl}">${fn:escapeXml(current.label)}</a> </rl:column> <rl:column headerkey="kickstart.channel.label.jsp" bound="true" attr="channelLabel" sortable="true" sortattr="channelLabel"/> <rl:column headerkey="kickstart.channel.virtCpu.jsp" bound="true" attr="virtCpus"/> - <rl:column headerkey="kickstart.channel.virtDisk.jsp" bound="true" attr="virtSpace"/> + <rl:column headerkey="kickstart.channel.virtDisk.jsp" bound="true" attr="virtSpace"/> <rl:column headerkey="kickstart.channel.virtMemory.jsp" bound="true" attr="virtMemory"/> <rl:column headerkey="kickstart.channel.virtBridge.jsp" bound="true" attr="virtBridge"/> </rl:list> - + <h2><bean:message key="virtualization.provision.first.jsp.header2" /></h2> <table class="details"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp index 9af83af..9243076 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp @@ -52,7 +52,7 @@ <a href="/rhn/systems/details/Overview.do?sid=${current.virtualSystemId}"> <c:out value="${current.serverName}" escapeXml="true" /> </a> - </c:when> + </c:when> <c:otherwise> <c:out value="${current.serverName}" escapeXml="true" /> </c:otherwise> @@ -85,7 +85,7 @@ <a href="/rhn/channels/ChannelDetail.do?cid=${current.channelId}"> ${current.channelLabels} </a> - </c:when> + </c:when> <c:otherwise> ${current.channelLabels} </c:otherwise> 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 51d3a81..4df08a0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp @@ -81,7 +81,7 @@ </c:when> <c:otherwise> <rl:selectablecolumn value="${current.id}"/> - + </c:otherwise> </c:choose> @@ -104,7 +104,7 @@ </rl:column> <rl:column headerkey="systemlist.jsp.last_checked_in"> <rl:expandable><a href="/rhn/systems/DuplicateSystemsCompare.do?key=${current.key}&key_type=${key_type}"><bean:message key="Compare Systems"/></a></rl:expandable> - <rl:non-expandable>${current.lastCheckinString}</rl:non-expandable> + <rl:non-expandable>${current.lastCheckinString}</rl:non-expandable> </rl:column> </rl:list> 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 13782e4..ee16ba7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp @@ -27,15 +27,15 @@ toggleElement(document.getElementById(linkId + 'Show')); toggleElement(document.getElementById(linkId + 'Hide')); } - + function handle_delete(div_del_id, div_confirm_id, form) { var div_del = document.getElementById(div_del_id); - var div_confirm = document.getElementById(div_confirm_id); + var div_confirm = document.getElementById(div_confirm_id); div_del.style.display = 'none'; div_confirm.style.display = ''; return false; - } - + } + </script> </head> <body> @@ -52,8 +52,8 @@ <p><bean:message key="duplicate.compares.jsp.message" arg0="${requestScope.maxLimit}"/>.</p> <rl:list emptykey="nosystems.message" - alphabarcolumn="name" - filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" + alphabarcolumn="name" + filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" > <rl:decorator name="SelectableDecorator"/> <rl:decorator name="PageSizeDecorator"/> @@ -120,7 +120,7 @@ <c:set var ="key" value="row.macaddress"/> <c:set var ="items_list" value="${requestScope.systems.macAddresses}"/> <c:set var ="href" value=""/> - <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> <tr class="list-row-odd" id = "ipAddressRow"> <c:set var ="key" value="row.ip"/> @@ -158,7 +158,7 @@ <c:set var ="href" value=""/> <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf" %> </tr> - + <tr class="list-row-odd" id = "activationKeysRow"> <c:set var ="key" value="Activation Keys"/> <c:set var ="items_list" value="${requestScope.systems.activationKeys}"/> @@ -214,7 +214,7 @@ <c:set var ="href" value=""/> <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> - </tbody> + </tbody> </table> </c:when> <c:otherwise><p><bean:message key = "nosystems.message"/></p></c:otherwise> 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 8176621..55da3f0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp @@ -48,7 +48,7 @@ ${current.addOnEntitlementLevel} </rhn:column> - <rhn:column header="systemlist.jsp.channel"> + <rhn:column header="systemlist.jsp.channel"> <c:choose> <c:when test="${current.channelId == null}"> <bean:message key="none.message"/> @@ -65,7 +65,7 @@  <c:if test="${requestScope.showCommands}"> - <hr/> + <hr/> <div class="panel panel-default"> <table class="table">  @@ -82,12 +82,12 @@ <bean:message key="systementitlements.jsp.set_to_manage_entitled" /> </html:submit> </c:if> - + <c:if test="${requestScope.showUnentitled}"> <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="systementitlements.jsp.set_to_unentitled" /> </html:submit> - </c:if> + </c:if> </td> </tr>  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 5e65023..ca2d5c3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -100,8 +100,8 @@ </c:otherwise> </c:choose> - </rl:column> - + </rl:column> + <rl:column headerkey="Registered"> ${current.registeredString} </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp index 7678dbc..351bdf1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp @@ -65,7 +65,7 @@ <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <c:if test="${requestScope.showApplyErrata == 'false'}"> <rl:column headerkey="emptyspace.jsp" styleclass="text-align: center;"> <i class="fa fa-clock-o"></i> @@ -78,7 +78,7 @@ selected="${current.selected}" disabled="${not current.selectable}"/> </c:if> - + <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false"> <c:if test="${current.securityAdvisory}"> @@ -91,21 +91,21 @@ <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rl:column> - + <rl:column headerkey="erratalist.jsp.advisory" bound="false" sortattr="advisoryName" sortable="true"> <a href="/rhn/errata/details/Details.do?eid=${current.id}"> ${current.advisoryName}</a> </rl:column> - + <rl:column headerkey="erratalist.jsp.synopsis" bound="false" sortattr="advisorySynopsis" sortable="true" filterattr="advisorySynopsis"> ${current.advisorySynopsis} </rl:column> - + <rl:column headerkey="errata.jsp.status" bound="false" sortattr="currentStatusAndActionId[0]" sortable="true"> @@ -127,16 +127,16 @@ <bean:message key="affectedsystems.jsp.none"/> </c:if> </rl:column> - + <rl:column headerkey="erratalist.jsp.updated" bound="false" sortattr="updateDateObj" sortable="true" defaultsort="desc"> ${current.updateDate} - </rl:column> - + </rl:column> + </rl:list> - + <c:if test="${requestScope.showApplyErrata == 'true'}"> <div class="text-right"> <hr /> @@ -146,7 +146,7 @@ </div> </c:if> - + <c:if test="${requestScope.showApplyErrata == 'true'}"> <rl:csv name="errataList" diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp index 92e2eb4..1e499b6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp @@ -25,7 +25,7 @@ width="100%" styleclass="list" emptykey="erratalist.jsp.noerrata"> - + <rl:decorator name="PageSizeDecorator"/> <rl:decorator name="ElaborationDecorator"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp index 8f5f972..d88d267 100644 --- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp @@ -15,7 +15,7 @@ <bean:message key="inactivelist.jsp.header"/> </rhn:toolbar> <c:set var="showLastCheckinSort" value="true"/> - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp index 04fc3e7..368b990 100644 --- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp @@ -29,7 +29,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf" %> </c:if> </rl:listset> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp index 6e871b2..7d3a1f9 100644 --- a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp @@ -17,7 +17,7 @@ - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> 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 6125dce..f076d8d 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 @@ -23,7 +23,7 @@ </rhn:list> </form> - + </body> </html:html> 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 c2b471b..66702dc 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 @@ -29,7 +29,7 @@ </rhn:listdisplay> </rhn:list> </form> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp index 9534b26..b8c5a04 100644 --- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp @@ -15,7 +15,7 @@ <bean:message key="proxylist.jsp.header"/> </rhn:toolbar> - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index daa755d..b9e0a28 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -28,8 +28,8 @@ <c:otherwise> <option value="${option.value}">${option.label}</option> </c:otherwise> - </c:choose> - </c:forEach> + </c:choose> + </c:forEach> </select> <html:submit> @@ -43,13 +43,13 @@ decorator="SelectableDecorator" emptykey="nosystems.message" alphabarcolumn="name" - filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" + filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" > - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="SystemIconDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.id}" selected="${current.selected}" disabled="${not current.selectable}"/> @@ -75,7 +75,7 @@ sortattr="channelLabels" > <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_list_fragment.jspf" %> </rl:column> - + <rl:column sortable="true" bound="false" headerkey="registeredlist.jsp.date" @@ -83,7 +83,7 @@ defaultsort="desc"> <fmt:formatDate value="${current.created}" type="both" dateStyle="short" timeStyle="long"/> </rl:column> - + <rl:column sortable="true" bound="false" headerkey="registeredlist.jsp.user" @@ -98,13 +98,13 @@ </c:otherwise> </c:choose> </rl:column> - +  <rl:column sortable="false" bound="false" headerkey="systemlist.jsp.entitlement"> <c:out value="${current.entitlementLevel}" escapeXml="false"/> - </rl:column> + </rl:column> </rl:list> </rl:listset> </body> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp index e166205..a34c9c3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp @@ -109,7 +109,7 @@ <div class="page-summary"> <p> <bean:message key="sdc.channels.edit.summary2"/> - + <select name="new_base_channel_id" size="${fn:length(base_channels)+fn:length(custom_base_channels)+3}"> <option value="-1" <c:if test="${current_base_channel_id == -1}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp index 0cb6be2..712b4ea 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp @@ -28,7 +28,7 @@ </ul> </c:otherwise> </c:choose> - + <bean:message key="sdc.channels.confirmNewBase.toBeSubscribedTo"/> <c:choose> @@ -44,7 +44,7 @@ </ul> </c:otherwise> </c:choose> - + <bean:message key="sdc.channels.confirmNewBase.otherChannelsWarning"/>   diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp index 689ba73..f807423 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp @@ -6,8 +6,8 @@ <html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - - <rhn:toolbar base="h2" icon="fa-info-circle" + + <rhn:toolbar base="h2" icon="fa-info-circle" creationUrl="/rhn/systems/details/CreateCustomData.do?sid=${system.id}" creationType="customdata"> <bean:message key="sdc.details.customdata.header"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index e6e4011..20d03d6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -91,11 +91,11 @@ </div> </div> - + <div class="systeminfo"> - + diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp index 308ecb7..d66b6bd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp @@ -17,7 +17,7 @@ - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp index e187425..1e37ee6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp @@ -70,10 +70,10 @@ <a href="/rhn/systems/details/Overview.do?sid=${current.virtualSystemId}"> <c:out value="${current.serverName}" escapeXml="true" /> </a> - </c:when> + </c:when> <c:otherwise> <c:out value="${current.serverName}" escapeXml="true" /> - </c:otherwise> + </c:otherwise> </c:choose> </rhn:column> @@ -95,7 +95,7 @@ <a href="/rhn/channels/ChannelDetail.do?cid=${current.channelId}"> ${current.channelLabels} </a> - </c:when> + </c:when> <c:otherwise> ${current.channelLabels} </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index 5a58a12..f312363 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -95,7 +95,7 @@ <c:if test="${requestScope.latestErrata == 'y'}"> <div id="latest-errata-pane" class="row"> <script type="text/javascript"> - LatestErrataRenderer.renderAsync(makeAjaxCallback("latest-errata-pane", false)); + LatestErrataRenderer.renderAsync(makeAjaxCallback("latest-errata-pane", false)); </script> </div> </c:if> commit f6923dc5586b91e1157289a054769172b7130da3 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:41:44 2013 -0500 Automatic commit of package [spacecmd] release [2.1.18-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index 537accd..85e5616 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.17-1 spacecmd/ +2.1.18-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index 4ab38d8..2cf3bf4 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.17 +Version: 2.1.18 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,13 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Thu Dec 05 2013 Aron Parsons <aronparsons(a)gmail.com> 2.1.18-1 +- spacecmd: print repos in softwarechannel_getdetails +- spacecmd: add softwarechannel_listrepos +- spacecmd: add softwarechannel_removerepo +- spacecmd: add softwarechannel_addrepo +- spacecmd: fix tab completion for repo_addfilters + * Thu Dec 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.17-1 - package search: make sure the lucene search syntax works commit 79ec600cec0498d10f1650aa608fc1c0bdac4269 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:41:24 2013 -0500 spacecmd: print repos in softwarechannel_getdetails diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index 3f03c26..d755db8 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -370,6 +370,13 @@ def do_softwarechannel_details(self, args): for tree in trees: print tree.get('label') + if details.get('contentSources'): + print + print 'Repos' + print '-----' + for repo in details.get('contentSources'): + print repo.get('label') + #################### def help_softwarechannel_listerrata(self): commit b4c7af7242743962a8bd0f348a6d4591888d39e2 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:38:43 2013 -0500 spacecmd: add softwarechannel_listrepos diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index c4039c9..3f03c26 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -1651,7 +1651,7 @@ def do_softwarechannel_addrepo(self, args): #################### def help_softwarechannel_removerepo(self): - print 'softwarechannel_removerepo: Add a repo to a software channel' + print 'softwarechannel_removerepo: Remove a repo from a software channel' print 'usage: softwarechannel_removerepo CHANNEL REPO' def complete_softwarechannel_removerepo(self, text, line, beg, end): @@ -1682,4 +1682,24 @@ def do_softwarechannel_removerepo(self, args): self.client.channel.software.disassociateRepo(self.session, channel, repo) +#################### + +def help_softwarechannel_listrepos(self): + print 'softwarechannel_listrepos: List the repos for a software channel' + print 'usage: softwarechannel_listrepos CHANNEL' + +def complete_softwarechannel_listrepos(self, text, line, beg, end): + parts = line.split(' ') + + return tab_completer(self.do_softwarechannel_list('', True), text) + +def do_softwarechannel_listrepos(self, args): + (args, options) = parse_arguments(args) + + details = self.client.channel.software.getDetails(self.session, args[0]) + repos = [r.get('label') for r in details.get('contentSources')] + + if len(repos): + print '\n'.join(sorted(repos)) + # vim:ts=4:expandtab: commit a14794b6be6ffdc6513e6303f9291d371551ac59 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:35:29 2013 -0500 spacecmd: add softwarechannel_removerepo diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index 6966b79..c4039c9 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -1648,4 +1648,38 @@ def do_softwarechannel_addrepo(self, args): self.client.channel.software.associateRepo(self.session, channel, repo) +#################### + +def help_softwarechannel_removerepo(self): + print 'softwarechannel_removerepo: Add a repo to a software channel' + print 'usage: softwarechannel_removerepo CHANNEL REPO' + +def complete_softwarechannel_removerepo(self, text, line, beg, end): + parts = line.split(' ') + + if len(parts) == 2: + return tab_completer(self.do_softwarechannel_list('', True), + text) + elif len(parts) == 3: + try: + details = self.client.channel.software.getDetails(self.session, + parts[1]) + repos = [r.get('label') for r in details.get('contentSources')] + except: + return + + return tab_completer(repos, text) + +def do_softwarechannel_removerepo(self, args): + (args, options) = parse_arguments(args) + + if len(args) < 2: + self.help_softwarechannel_removerepo() + return + + channel = args[0] + repo = args[1] + + self.client.channel.software.disassociateRepo(self.session, channel, repo) + # vim:ts=4:expandtab: commit 25f4f7c2b4612b6cb9a45d9b09fd78ae22a546be Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:24:28 2013 -0500 spacecmd: add softwarechannel_addrepo diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index e4b537d..6966b79 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -1621,4 +1621,31 @@ def do_softwarechannel_setsyncschedule(self, args): self.client.channel.software.syncRepo(self.session, channel, schedule) +#################### + +def help_softwarechannel_addrepo(self): + print 'softwarechannel_addrepo: Add a repo to a software channel' + print 'usage: softwarechannel_addrepo CHANNEL REPO' + +def complete_softwarechannel_addrepo(self, text, line, beg, end): + parts = line.split(' ') + + if len(parts) == 2: + return tab_completer(self.do_softwarechannel_list('', True), + text) + elif len(parts) == 3: + return tab_completer(self.do_repo_list('', True), text) + +def do_softwarechannel_addrepo(self, args): + (args, options) = parse_arguments(args) + + if len(args) < 2: + self.help_softwarechannel_addrepo() + return + + channel = args[0] + repo = args[1] + + self.client.channel.software.associateRepo(self.session, channel, repo) + # vim:ts=4:expandtab: commit 6255363ec7ca0028d1934057d9bf8f81d156857f Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:17:56 2013 -0500 spacecmd: fix tab completion for repo_addfilters diff --git a/spacecmd/src/lib/repo.py b/spacecmd/src/lib/repo.py index d6951a1..20a2065 100644 --- a/spacecmd/src/lib/repo.py +++ b/spacecmd/src/lib/repo.py @@ -100,7 +100,9 @@ def help_repo_addfilters(self): print 'usage: repo_addfilters repo <filter ...>' def complete_repo_addfilters(self, text, line, beg, end): - return tab_completer(self.do_repo_add('', True), text) + if len(line.split(' ')) <= 2: + return tab_completer(self.do_repo_list('', True), + text) def do_repo_addfilters(self, args): # arguments can start with -, so don't parse arguments in the normal way commit 5fd803b796801d889a8ff87d4250e1a56306b81f Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:11:00 2013 -0500 Automatic commit of package [spacewalk-backend] release [2.1.38-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 98110b1..33af959 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.37 +Version: 2.1.38 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Thu Dec 05 2013 Aron Parsons <aronparsons(a)gmail.com> 2.1.38-1 +- detect RDO instances as QEMU guests + * Fri Nov 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.37-1 - convert empty uuid to None diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 7c76f20..a4b7768 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.37-1 backend/ +2.1.38-1 backend/ commit 8d7ea3db19f487d9d72436561229e8673a685258 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:09:12 2013 -0500 detect RDO instances as QEMU guests diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index 5065efb..62dcd55 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -66,6 +66,8 @@ def parse_smbios(smbios): elif (manufacturer == 'Red Hat' and product == 'RHEV Hypervisor' and uuid is not None): return (rhnVirtualization.VirtualizationType.QEMU, uuid) + elif manufacturer.startswith('Red Hat') and product == 'OpenStack Nova' and uuid is not None: + return (rhnVirtualization.VirtualizationType.QEMU, uuid) elif manufacturer == 'Microsoft Corporation' and \ product == 'Virtual Machine': if uuid is None: commit 15a71af93293cf0f9f2fba093dbbcccfdb238474 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Dec 5 18:03:47 2013 +0100 Automatic commit of package [spacecmd] release [2.1.17-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index 9c9f5df..537accd 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.16-1 spacecmd/ +2.1.17-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index 22df27c..4ab38d8 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.16 +Version: 2.1.17 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Thu Dec 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.17-1 +- package search: make sure the lucene search syntax works + * Sun Dec 01 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.16-1 - 835979 - don't double convert start time 'now' commit 4806644de1bd3a6ea94b18defcd513b7c0b71d2f Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Dec 5 18:00:51 2013 +0100 package search: make sure the lucene search syntax works There's no need to use 're' here, simple substring search here suffices; also, re would not match in case the search string contains parantheses. diff --git a/spacecmd/src/lib/package.py b/spacecmd/src/lib/package.py index e41608b..ea2f355 100644 --- a/spacecmd/src/lib/package.py +++ b/spacecmd/src/lib/package.py @@ -103,14 +103,14 @@ def do_package_search(self, args, doreturn = False): self.help_package_search() return - fields = ('name', 'epoch', 'version', 'release', - 'arch', 'description', 'summary') + fields = ('name:', 'epoch:', 'version:', 'release:', + 'arch:', 'description:', 'summary:') packages = [] advanced = False for f in fields: - if re.match('%s:' % f, args): + if args.find(f) != -1: logging.debug('Using advanced search') advanced = True break commit d5ac0fa0fa678e4f5b49dfeafa1a4cdb74c3e2d2 Author: Michael Calmer <mc(a)suse.de> Date: Thu Dec 5 17:20:04 2013 +0100 use translated text for the title diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index 25cdb85..c9c34f3 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -24,7 +24,7 @@ <bean:message key="ssm.overview.systems.list"/> </div> <div class="panel-heading"> - <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i> + <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key="ssm.overview.errata"/>"></i> <bean:message key="ssm.overview.errata"/> </div> <div class="panel-body"> commit 742472c23d67b6d62730c329d09e1bdac63bd22b Merge: e56285a d16f932 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Dec 5 12:58:58 2013 +0100 Merge branch 'master' into master-bootstrap-css-fixes Conflicts: branding/css/spacewalk-theme.less java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp diff --cc branding/css/spacewalk-theme.less index 49c86c1,9fc286c..ab1fce7 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@@ -718,8 -717,6 +718,12 @@@ ul.nav.nav-tabs:last-child } } +/* Links inside alert-info with darker colour and underline text */ +.alert-info a{ + color: darken(@brand-primary, 10%); + text-decoration: underline; +} ++ + .mail-address-border { + border: 1px solid #ccc; + } diff --cc java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index dda57d7,6e5a1b5..faa5e21 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@@ -89,25 -88,20 +88,20 @@@ public class AddressTagTest extends Rhn } private String getPopulatedReturnValue(HttpServletRequest req, Long uid) { - return "<strong>Mailing Address</strong>" + - "<address>444 Castro<br>" + - "#1<br>" + - "Mountain View, CA 94043<br>" + - "Phone: 650-555-1212<br>" + - "Fax: 650-555-1212<br>" + - "</address>" + - "<p>" + - "<a class=\"btn btn-primary\" href=\"/EditAddress.do?type=M&uid=" + uid + "\">" + - "Edit this address</a>" + - "</p>"; - return "<div class=\"jumbotron\"><div class=\"container\">" + ++ return "<div class=\"mail-address-border\"><div class=\"container\">" + + "<h1>Mailing Address</h1>" + + "<p>444 Castro<br/>#1<br/>Mountain View, CA 94043</p>" + + "<p>Phone: 650-555-1212<br/>Fax: 650-555-1212</p><p>" + + "<a class=\"btn btn-success btn-lg\"href=\"/EditAddress.do?" + + "type=M&uid=" + uid + "\">Edit this address</a></p></div></div>"; } private String getEmptyReturnValue(HttpServletRequest req, Long uid) { - return "<strong>Mailing Address</strong>" + - "<div class=\"alert alert-info\">Address not filled out</div>" + - "<p>" + - "<a class=\"btn btn-primary\" href=\"/EditAddress.do?type=M&uid=" + uid + "\">Add this address</a>" + - "</p>"; - return "<div class=\"jumbotron\"><div class=\"container\">" + ++ return "<div class=\"mail-address-border\"><div class=\"container\">" + + "<h1>Mailing Address</h1><div class=\"alert alert-info\">" + + "Address not filled out</div><p><a class=\"btn btn-success btn-lg\" " + + "href=\"/EditAddress.do?type=M&uid=" + uid + + "\">Add this address</a></p></div></div>"; } } commit e56285a2969b92dc87e5b7f4bb6990a7f1c40486 Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Dec 5 12:24:40 2013 +0100 ListTag: avoid self-closing navigation button icon tags 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 a54b0a9..dda7202 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -603,6 +603,7 @@ public class ListDisplayTag extends ListDisplayTagBase { String styleClass = "btn btn-default btn-xs"; HtmlTag iconTag = new HtmlTag("i"); iconTag.setAttribute("class", "fa " + icon); + iconTag.addBody(""); ret.addBody(iconTag); if (!active) { commit 0f49b04dc9c6062a2fd6f480449270123ff7f6b7 Merge: 11c65e6 03ee079 Author: Cynthia Sanchez <csanchez(a)suse.de> Date: Thu Dec 5 02:34:58 2013 -0800 Merge pull request #16 from SUSE/dmacvicar_master-fixes-address_page Fixes for the address editing page commit 11c65e6c18726260b3d666c5cfec1850148244a1 Merge: 2ea3e52 405dbd3 Author: Duncan Mac-Vicar P. <dmacvicar(a)gmail.com> Date: Thu Dec 5 02:07:23 2013 -0800 Merge pull request #17 from SUSE/dmacvicar_master-fixes-system_details makes the system details page to be shown in two columns, like before commit 2ea3e523627741591a3412b9951654e37ec01805 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Dec 4 18:16:20 2013 +0100 colour added to the counter in SSM diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 6c7a77d..49c86c1 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -236,7 +236,8 @@ header { display: none; } #bar .spacewalk-bar .badge { - margin-right: .5em + margin-right: .5em; + background: @spacewalk-blue } } @@ -721,4 +722,4 @@ ul.nav.nav-tabs:last-child { .alert-info a{ color: darken(@brand-primary, 10%); text-decoration: underline; -} \ No newline at end of file +} commit d16f9322dcb09f7f2964658cbfa44911daa93351 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Dec 4 17:13:13 2013 +0100 Automatic commit of package [python-hwdata] release [1.10.1-1]. diff --git a/projects/python-hwdata/python-hwdata.spec b/projects/python-hwdata/python-hwdata.spec index 4877af6..71699e7 100644 --- a/projects/python-hwdata/python-hwdata.spec +++ b/projects/python-hwdata/python-hwdata.spec @@ -9,7 +9,7 @@ %endif Name: python-hwdata -Version: 1.10.0 +Version: 1.10.1 Release: 1%{?dist} Summary: Python bindings to hwdata package BuildArch: noarch @@ -85,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Dec 04 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.10.1-1 +- create python3-hwdata subpackage +- Bumping package versions for 1.9 +- %%defattr is not needed since rpm 4.4 + * Fri Mar 02 2012 Miroslav Suchý 1.7.3-1 - 798375 - fix PCI device name translation (Joshua.Roys(a)gtri.gatech.edu) - use setup from distutils diff --git a/projects/python-hwdata/setup.py b/projects/python-hwdata/setup.py index 916a6fe..03788bb 100644 --- a/projects/python-hwdata/setup.py +++ b/projects/python-hwdata/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup, Extension setup (name = 'pciutils', - version = '1.7.3', + version = '1.10.1', description = 'Interface to pciutils', author = 'Miroslav Suchý', author_email = 'msuchy(a)redhat.com', diff --git a/rel-eng/packages/python-hwdata b/rel-eng/packages/python-hwdata index 4208eac..92c6b7c 100644 --- a/rel-eng/packages/python-hwdata +++ b/rel-eng/packages/python-hwdata @@ -1 +1 @@ -1.7.3-1 projects/python-hwdata/ +1.10.1-1 projects/python-hwdata/ commit 3afcf036cca2aae117b8396d2366ce7375684147 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Dec 4 16:13:33 2013 +0100 create python3-hwdata subpackage alter code to handle python3 leave python2 package until the Py2to3Guideline is finalized rhel{5,6} does not have python3 - leave them out diff --git a/projects/python-hwdata/hwdata.py b/projects/python-hwdata/hwdata.py index b458912..f0a2894 100644 --- a/projects/python-hwdata/hwdata.py +++ b/projects/python-hwdata/hwdata.py @@ -12,6 +12,8 @@ # granted to use or replicate Red Hat trademarks that are incorporated # in this software or its documentation. # +import sys +inPy3k = sys.version_info[0] == 3 """ Query hwdata database and return decription of vendor and/or device. """ @@ -33,7 +35,11 @@ class USB: if self.cache and not USB.devices: # parse usb.ids USB.devices = {} - for line in open(self.filename).readlines(): + if inPy3k: + f = open(self.filename, encoding='ISO8859-1') + else: + f = open(self.filename) + for line in f.readlines(): l = line.split() if line.startswith('#'): if line.startswith('# List of known device classes, subclasses and protocols'): @@ -110,7 +116,11 @@ class PCI: # parse pci.ids pcirec = {} PCI.devices = {} - for line in open(self.filename).readlines(): + if inPy3k: + f = open(self.filename, encoding='ISO8859-1') + else: + f = open(self.filename) + for line in f.readlines(): l = line.split() if line.startswith('#'): continue diff --git a/projects/python-hwdata/python-hwdata.spec b/projects/python-hwdata/python-hwdata.spec index d58549b..4877af6 100644 --- a/projects/python-hwdata/python-hwdata.spec +++ b/projects/python-hwdata/python-hwdata.spec @@ -1,6 +1,12 @@ %if ! (0%{?fedora} || 0%{?rhel} > 5) %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %endif +#%global with_python2 1 +%if (0%{?fedora} || 0%{?rhel} > 6) +%global with_python3 1 +%else +%global with_python3 0 +%endif Name: python-hwdata Version: 1.10.0 @@ -15,22 +21,53 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel Requires: hwdata +%if 0%{?with_python3} +BuildRequires: python3-devel +%endif %description Provide python interface to database stored in hwdata package. It allows you to get human readable description of USB and PCI devices. +%if 0%{?with_python3} +%package -n python3-hwdata +Summary: Python bindings to hwdata package +Group: Development/Languages + +%description -n python3-hwdata +Provide python interface to database stored in hwdata package. +It allows you to get human readable description of USB and PCI devices. + +This is the Python 3 build of the module. +%endif + %prep %setup -q +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif %build %{__python} setup.py build +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif + %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install --prefix=%{_prefix} --root=%{buildroot} +popd +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -40,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT %doc html %{python_sitelib}/* +%if 0%{?with_python3} +%files -n python3-hwdata +%doc LICENSE example.py +%doc html +%{python3_sitelib}/* +%endif %changelog * Fri Mar 02 2012 Miroslav Suchý 1.7.3-1 commit 072faac1281963a935c10ecc8092bb52be4d1176 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 16:59:09 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.39-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 613e2c1..c74b0ab 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.38-1 web/ +2.1.39-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 0a67e96..1ed4094 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.38 +Version: 2.1.39 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.39-1 +- bootstrap tuning + * Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.38-1 - bootstrap tuning commit 4058f5a06e61991543c0b1c8d9adcb0fa6d30e31 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 16:58:52 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.90-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index b13b061..0b73981 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.89 +Version: 2.1.90 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.90-1 +- bootstrap tuning + * Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.89-1 - bootstrap tuning diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 89e1826..a5a1c10 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.89-1 java/ +2.1.90-1 java/ commit 31928ce93c928792e60f03203854de2c248d3aad Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 16:50:05 2013 +0100 bootstrap tuning: icons in subscribed system list /network/systems/system_list/in_channel_family.pxt?cfam_id=1000 /network/systems/system_list/regular_in_channel_family.pxt?cfam_id=1000 diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list index 218ba0a..d473a9f 100644 --- a/web/html/network/systems/system_list +++ b/web/html/network/systems/system_list @@ -13,8 +13,9 @@ <pxt-formvar> <rhn-pathinfo-list-mode type="system"> - <h1><img src="/img/rhn-icon-system.gif" alt="system" /> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1> - + <div class="spacewalk-toolbar-h1"><div class="spacewalk-toolbar"></div> + <h1><i class="fa fa-desktop"></i> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1> + </div> <rhn-listview class="Sniglets::ListView::SystemList" mode="{pinfo_list_mode}" alphabar_column="name"> <formvars> <var name="view_mode" /> diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm index 6e2a05d..19b72c0 100644 --- a/web/modules/pxt/PXT/HTML.pm +++ b/web/modules/pxt/PXT/HTML.pm @@ -508,4 +508,22 @@ sub img { return qq{<img $inner_str />}; } +sub icon { + my $class = shift; + my %params = @_; + + if (not exists $params{-class}) { + die "classless icon"; + } + + my @inner; + for my $attr (qw/class title/) { + next unless exists $params{"-$attr"}; + push @inner, sprintf(qq{$attr="$params{-$attr}"}); + } + + my $inner_str = join(" ", @inner); + return qq{<i $inner_str></i>}; +} + 1; diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm index 020ea66..13a382c 100644 --- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm +++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm @@ -567,19 +567,15 @@ sub row_callback { my $icon_data = Sniglets::Servers::system_status_info($pxt->user, $row); - my $image = PXT::HTML->img(-src => $icon_data->{image}, - -alt => $icon_data->{status_str}, - -title => $icon_data->{status_str}, - -border => 0); + my $image = PXT::HTML->icon(-class => $icon_data->{icon}, + -title => $icon_data->{status_str}); $row->{ADVISORY_ICON} = PXT::HTML->link($icon_data->{link}, $image); my $locked_data = Sniglets::Servers::system_locked_info($pxt->user, $row); if ($locked_data->{link}) { - my $locked_image = PXT::HTML->img(-src => $locked_data->{image}, - -alt => $locked_data->{status_str}, - -title => $locked_data->{status_str}, - -border => 0); + my $locked_image = PXT::HTML->icon(-class => $locked_data->{icon}, + -title => $locked_data->{status_str}); $row->{ADVISORY_ICON} .= PXT::HTML->link($locked_data->{link}, $locked_image); } @@ -590,10 +586,8 @@ sub row_callback { if (defined $row->{MONITORING_STATUS}) { my $icon_data = Sniglets::Servers::system_monitoring_info($pxt->user, $row); - my $image = PXT::HTML->img(-src => $icon_data->{image}, - -alt => $icon_data->{status_str}, - -title => $icon_data->{status_str}, - -border => 0); + my $image = PXT::HTML->icon(-class => $icon_data->{icon}, + -title => $icon_data->{status_str}); $row->{MONITORING_ICON} = PXT::HTML->link($icon_data->{system_link}, $image); } diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 11bc1a4..8b4d249 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -191,8 +191,7 @@ sub system_locked_info { my $ret = {}; if ($data->{LOCKED}) { - $ret->{image} = '/img/icon_locked.gif'; - $ret->{image_medium} = '/img/icon_locked.gif'; + $ret->{icon} = 'fa fa-1-5x spacewalk-icon-locked-system'; $ret->{status_str} = 'System locked'; $ret->{status_class} = 'system-status-locked'; $ret->{message} = 'more info'; @@ -219,8 +218,7 @@ sub system_status_info { $ret->{$_} = '' foreach (qw/image status_str status_class message link/); if (not $data->{IS_ENTITLED}) { - $ret->{image} = '/img/icon_unentitled.gif'; - $ret->{image_medium} = '/img/icon_unentitled.gif'; + $ret->{icon} = 'fa fa-1-5x spacewalk-icon-Unentitled'; $ret->{status_str} = 'System not entitled'; $ret->{status_class} = 'system-status-unentitled'; @@ -230,8 +228,7 @@ sub system_status_info { } } elsif ($data->{LAST_CHECKIN_DAYS_AGO} > PXT::Config->get('system_checkin_threshold')) { - $ret->{image} = '/img/icon_checkin.gif'; - $ret->{image_medium} = '/img/icon_checkin.gif'; + $ret->{icon} = 'spacewalk-icon-unknown-system'; $ret->{status_str} = 'System not checking in with R H N'; $ret->{status_class} = 'system-status-awol'; $ret->{message} = 'more info'; @@ -239,46 +236,40 @@ sub system_status_info { -href => 's1-sm-systems.html#S3-SM-SYSTEM-LIST-INACT'); } elsif ($data->{KICKSTART_SESSION_ID}) { - $ret->{image} = '/img/icon_kickstart_session.gif'; - $ret->{image_medium} = '/img/icon_kickstart_session.gif'; + $ret->{icon} = 'fa fa-rocket fa-1-5x'; $ret->{status_str} = 'Kickstart in progress'; $ret->{status_class} = 'system-status-kickstart'; $ret->{message} = 'view progress'; $ret->{link} = "/rhn/systems/details/kickstart/SessionStatus.do?sid=${sid}"; } elsif (not ($errata_count or $data->{OUTDATED_PACKAGES}) and not $package_actions_count) { - $ret->{image} = '/img/icon_up2date.gif'; - $ret->{image_medium} = '/img/icon_up2date.gif'; + $ret->{icon} = 'fa fa-check-circle fa-1-5x text-success'; $ret->{status_str} = 'System is up to date'; $ret->{status_class} = 'system-status-up-to-date'; } elsif ($errata_count and not RHN::Server->unscheduled_errata($sid, $user->id)) { - $ret->{image} = '/img/icon_pending.gif'; - $ret->{image_medium} = '/img/icon_pending.gif'; + $ret->{icon} = 'fa fa-clock-o fa-1-5x'; $ret->{status_str} = 'All updates scheduled'; $ret->{status_class} = 'system-status-updates-scheduled'; $ret->{message} = 'view actions'; $ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}"; } elsif ($actions_count) { - $ret->{image} = '/img/icon_pending.gif'; - $ret->{image_medium} = '/img/icon_pending.gif'; + $ret->{icon} = 'fa fa-clock-o fa-1-5x'; $ret->{status_class} = 'system-status-updates-scheduled'; $ret->{status_str} = 'Actions scheduled'; $ret->{message} = 'view actions'; $ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}"; } elsif ($data->{SECURITY_ERRATA}) { - $ret->{image} = '/img/icon_crit_update.gif'; - $ret->{image_medium} = '/img/icon_crit_update.gif'; + $ret->{icon} = 'fa fa-exclamation-circle fa-1-5x text-danger'; $ret->{status_str} = 'Critical updates available'; $ret->{status_class} = 'system-status-critical-updates'; $ret->{message} = 'update now'; $ret->{link} = "/rhn/systems/details/ErrataConfirm.do?all=true&sid=${sid}"; } elsif ($data->{OUTDATED_PACKAGES}) { - $ret->{image} = '/img/icon_reg_update.gif'; - $ret->{image_medium} = '/img/icon_reg_update.gif'; + $ret->{icon} = 'fa fa-exclamation-triangle fa-1-5x text-warning'; $ret->{status_str} = 'Updates available'; $ret->{status_class} = 'system-status-updates'; $ret->{message} = "more info"; commit 9bbabcf7f653f53d8db1521b941accf2d57a084e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 14:22:53 2013 +0100 bootstrap tuning: icons in system ledend for pxt pages diff --git a/web/include/network/components/legends/system-list-legend.pxi b/web/include/network/components/legends/system-list-legend.pxi index 66acbcd..2c59157 100644 --- a/web/include/network/components/legends/system-list-legend.pxi +++ b/web/include/network/components/legends/system-list-legend.pxi @@ -7,20 +7,20 @@ <div class="sideleg"> <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><i class="spacewalk-icon-unknown-system" />Unknown</li> + <li><i class="fa fa-check-circle fa-1-5x text-success"></i>OK</li> + <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>Critical</li> + <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i></i>Warning</li> + <li><i class="spacewalk-icon-unknown-system"></i>Unknown</li> <rhn-require acl="org_entitlement(sw_mgr_enterprise)"> - <li><img src="/img/icon_locked.gif" alt="" />Locked</li> + <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i></i>Locked</li> </rhn-require> <rhn-require acl="org_entitlement(rhn_provisioning)"> - <li><img src="/img/icon_kickstart_session.gif" alt="" />Kickstarting</li> + <li><i class="fa fa-rocket fa-1-5x"></i>Kickstarting</li> </rhn-require> - <li><img src="/img/icon_pending.gif" alt="" />Pending Actions</li> - <li><img src="/img/icon_unentitled.gif" alt="" />Unentitled</li> + <li><i class="fa fa-clock-o fa-1-5x"></i>Pending Actions</li> + <li><i class="fa fa-1-5x spacewalk-icon-Unentitled"></i>Unentitled</li> <rhn-require acl="org_entitlement(rhn_monitor)"> - <li><img src="/img/icon_subicon_monitoring.gif" alt="" />Monitoring Status</li> + <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i>Monitoring Status</li> </rhn-require> </ul> </div> commit 148354736e84aca13f6c41d71f605474c5ea473f Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Wed Dec 4 16:44:44 2013 +0100 Links inside a alert-info have a darker blue than the text shown and have underline. It is necessary to distinguish the link over the general text diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 5321d44..6c7a77d 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -716,3 +716,9 @@ ul.nav.nav-tabs:last-child { } } } + +/* Links inside alert-info with darker colour and underline text */ +.alert-info a{ + color: darken(@brand-primary, 10%); + text-decoration: underline; +} \ No newline at end of file commit 7a7763505a9d85e0e72efdb718b684dfa8f5715b Author: Matej Kollar <mkollar(a)redhat.com> Date: Wed Dec 4 15:26:54 2013 +0100 bootstrap tuning - alt is not optional or at least so says w3c validator diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp index ce2928c..fcf9eec 100644 --- a/java/code/webapp/WEB-INF/includes/footer.jsp +++ b/java/code/webapp/WEB-INF/includes/footer.jsp @@ -15,5 +15,5 @@ </c:if> </div> <div> - <img src="/img/logo_vendor.png" /> + <img src="/img/logo_vendor.png" alt="<bean:message key='layout.jsp.vendor.name' />" /> </div> commit 0cb00ed9e28e3b35f6a5ecee1703585dc98085e0 Author: Matej Kollar <mkollar(a)redhat.com> Date: Wed Dec 4 15:01:28 2013 +0100 bootstrap tuning - tooltips for icons diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 11193c7..476c24b 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -21,7 +21,7 @@ <div class="spacewalk-header-links"> <rhn:require acl="user_authenticated()"> <ul class="nav nav-pills"> - <li class="hidden-sm hidden-xs"><a href="/rhn/account/LocalePreferences.do"><c:out value="${rhnActiveLang} "/>(<bean:message key="header.jsp.change"/>)</a></li> + <li class="hidden-sm hidden-xs"><a href="/rhn/account/LocalePreferences.do"><c:out value="${rhnActiveLang}" /> (<bean:message key="header.jsp.change"/>)</a></li> </ul> <ul class="nav nav-pills"> <li class="hidden-sm hidden-xs"><a href="http://kbase.redhat.com/"><bean:message key="header.jsp.knowledgebase" /></a></li> @@ -35,10 +35,10 @@ <span class="spacewalk-header-non-link"><i class="fa fa-sitemap"></i><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></span> </li> <li> - <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs"></i></a> + <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs" title="<bean:message key='header.jsp.preferences' />"></i></a> </li> <li> - <html:link forward="logout"><i class="fa fa-sign-out"></i></html:link> + <html:link forward="logout"><i class="fa fa-sign-out" title="<bean:message key='header.jsp.signout' />"></i></html:link> </li> </ul> commit 085462bc049fecb53ca6ebd1f80e86df03de40ba Author: Jan Dobes <jdobes(a)redhat.com> Date: Wed Dec 4 13:51:29 2013 +0100 bootstrap tuning: fix not formatted panel /rhn/kickstart/KickstartOverview.do diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf index ae722d4..a46230a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf @@ -1,8 +1,6 @@ -<div class="filter-input"> -<table cellspacing="0" cellpadding="0" width="100%"> -<tr>  </td></tr></table></div> +<div class="panel panel-default"> -<table cellspacing="0" cellpadding="0" class="half-table"> +<table cellspacing="0" cellpadding="0" class="table"> <thead> <tr> <th style="text-align: left;"> @@ -34,7 +32,5 @@ </table> -<div class="filter-input"> -<table cellspacing="0" cellpadding="0" width="100%"> -<tr>  </td></tr></table></div> +</div> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp index 81f285b..75bf60e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp @@ -20,11 +20,13 @@ <rl:listset name="ksSet"> <rhn:csrf /> <rhn:submitted /> -<div class="half-table half-table-left"> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf" %> -</div> -<div class="half-table half-table-right"> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf" %> +<div class="row-0"> + <div class="col-md-6"> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf" %> + </div> + <div class="col-md-6"> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf" %> + </div> </div> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf" %> <br><br> commit 03ee079075ec1e790da1dedc0729166b7575b63b Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Dec 4 14:15:27 2013 +0100 adapt the testcase and fix a issue catched by the testcase diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index 4dd2198..5af7c6e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -212,7 +212,7 @@ public class AddressTag extends TagSupport { result.append("<p>"); result.append("<a ") .append("class=\"btn btn-primary\"") - .append("href=\"") + .append(" href=\"") .append(getActionUrl()) .append("/EditAddress.do?type=") .append(type) diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index 6e5a1b5..dda57d7 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@ -57,6 +57,7 @@ public class AddressTagTest extends RhnBaseTestCase { // setup mock objects MockJspWriter out = (MockJspWriter)tth.getPageContext().getOut(); + String data = getPopulatedReturnValue(sah.getRequest(), sah.getUser().getId()); out.setExpectedData( getPopulatedReturnValue(sah.getRequest(), sah.getUser().getId())); addtg.setType(Address.TYPE_MARKETING); @@ -88,20 +89,25 @@ public class AddressTagTest extends RhnBaseTestCase { } private String getPopulatedReturnValue(HttpServletRequest req, Long uid) { - return "<div class=\"jumbotron\"><div class=\"container\">" + - "<h1>Mailing Address</h1>" + - "<p>444 Castro<br/>#1<br/>Mountain View, CA 94043</p>" + - "<p>Phone: 650-555-1212<br/>Fax: 650-555-1212</p><p>" + - "<a class=\"btn btn-success btn-lg\"href=\"/EditAddress.do?" + - "type=M&uid=" + uid + "\">Edit this address</a></p></div></div>"; + return "<strong>Mailing Address</strong>" + + "<address>444 Castro<br>" + + "#1<br>" + + "Mountain View, CA 94043<br>" + + "Phone: 650-555-1212<br>" + + "Fax: 650-555-1212<br>" + + "</address>" + + "<p>" + + "<a class=\"btn btn-primary\" href=\"/EditAddress.do?type=M&uid=" + uid + "\">" + + "Edit this address</a>" + + "</p>"; } private String getEmptyReturnValue(HttpServletRequest req, Long uid) { - return "<div class=\"jumbotron\"><div class=\"container\">" + - "<h1>Mailing Address</h1><div class=\"alert alert-info\">" + - "Address not filled out</div><p><a class=\"btn btn-success btn-lg\" " + - "href=\"/EditAddress.do?type=M&uid=" + uid + - "\">Add this address</a></p></div></div>"; + return "<strong>Mailing Address</strong>" + + "<div class=\"alert alert-info\">Address not filled out</div>" + + "<p>" + + "<a class=\"btn btn-primary\" href=\"/EditAddress.do?type=M&uid=" + uid + "\">Add this address</a>" + + "</p>"; } } commit 2451d49dcbdbd9731f05fcbb37badefbd6556a77 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 13:41:03 2013 +0100 Automatic commit of package [spacewalk-branding] release [2.1.13-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 43ca2dc..5f22b5a 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.12 +Version: 2.1.13 Release: 1%{?dist} Summary: Spacewalk branding data @@ -82,6 +82,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.13-1 +- bootstrap tuning + * Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.12-1 - bootstrap tuning diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index f2b7a4c..5015ed1 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.12-1 branding/ +2.1.13-1 branding/ commit e00b6ecca64dc4487e827f7abc323c18dafeb149 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 13:40:50 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.89-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index fc98504..b13b061 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.88 +Version: 2.1.89 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.89-1 +- bootstrap tuning + * Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.88-1 - bootstrap tuning - Optionally show a legal note on login/relogin diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 0539618..89e1826 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.88-1 java/ +2.1.89-1 java/ commit b2efa928f5ebbce47134aab4ddfa8858c6db010f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 13:40:34 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.38-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 8790232..613e2c1 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.37-1 web/ +2.1.38-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index e88b81b..0a67e96 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.37 +Version: 2.1.38 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.38-1 +- bootstrap tuning + * Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.37-1 - bootstrap tuning commit f068416b4dc182c0b8cd6a22b3597edfb7376937 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 13:38:05 2013 +0100 bootstrap tuning: fixed pxt page footer diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt index 7ee1502..413e695 100644 --- a/branding/templates/footer.pxt +++ b/branding/templates/footer.pxt @@ -3,12 +3,11 @@ <pxt-passthrough> <pxt-use class="Sniglets::Users" /> <div> -</div> -<div> - Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy 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> + Copyright © 2002‒13 Red Hat, Inc. All rights reserved. + <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> + : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> + : <a href="http://www.redhat.com/">redhat.com</a> + <div>Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a></div> </div> <div> <img src="/img/logo_vendor.png" /> commit cff9a22f3e09cd0ad063f8b07bb72cd47be7c08b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 12:10:48 2013 +0100 bootstrap tuning: fixed icons in event pxt pages e.g. /network/systems/details/history/pending.pxt?sid=1000010049 /network/systems/details/history/history.pxt?sid=1000010049 diff --git a/web/modules/sniglets/Sniglets/ListView/ActionList.pm b/web/modules/sniglets/Sniglets/ListView/ActionList.pm index c5bc9aa..bee505f 100644 --- a/web/modules/sniglets/Sniglets/ListView/ActionList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ActionList.pm @@ -21,7 +21,6 @@ use Sniglets::ListView::List; use RHN::Action; use RHN::DataSource::Action; -use PXT::HTML; use Data::Dumper; our @ISA = qw/Sniglets::ListView::List/; @@ -71,28 +70,28 @@ sub _register_modes { } -my %history_type_icons = ('packages.refresh_list' => 'rhn-listicon-package.gif', - 'packages.delta' => 'rhn-listicon-package.gif', - 'packages.update' => 'rhn-listicon-package.gif', - 'packages.remove' => 'rhn-listicon-package.gif', - 'packages.runTransaction' => 'rhn-listicon-package.gif', - 'up2date_config.get' => 'rhn-listicon-preferences.gif', - 'up2date_config.update' => 'rhn-listicon-preferences.gif', - 'rollback.config' => 'rhn-listicon-preferences.gif', - 'rollback.listTransactions' => 'rhn-listicon-package.gif', # bad icon for this - 'errata.update' => 'rhn-listicon-errata.gif', - 'hardware.refresh_list' => 'rhn-listicon-system.gif', # bad icon for this - 'reboot.reboot' => 'rhn-listicon-system.gif', # bad icon for this - 'configfiles.upload' => 'rhn-listicon-system.gif', - 'configfiles.deploy' => 'rhn-listicon-system.gif', - 'configfiles.verify' => 'rhn-listicon-system.gif', - 'configfiles.diff' => 'rhn-listicon-system.gif', +my %history_type_icons = ('packages.refresh_list' => 'spacewalk-icon-packages', + 'packages.delta' => 'spacewalk-icon-packages', + 'packages.update' => 'spacewalk-icon-packages', + 'packages.remove' => 'spacewalk-icon-packages', + 'packages.runTransaction' => 'spacewalk-icon-packages', + 'up2date_config.get' => 'fa-cog', + 'up2date_config.update' => 'fa-cog', + 'rollback.config' => 'fa-cog', + 'rollback.listTransactions' => 'spacewalk-icon-packages', # bad icon for this + 'errata.update' => 'spacewalk-icon-patches', + 'hardware.refresh_list' => 'fa-desktop', # bad icon for this + 'reboot.reboot' => 'fa-desktop', # bad icon for this + 'configfiles.upload' => 'fa-desktop', + 'configfiles.deploy' => 'fa-desktop', + 'configfiles.verify' => 'fa-desktop', + 'configfiles.diff' => 'fa-desktop', ); -my %history_status_icons = ('Completed' => 'rhn-listicon-ok.gif', - 'Failed' => 'rhn-listicon-error.gif', - 'Picked Up' => 'rhn-listicon-activity.gif', - ); +my %history_status_icons = ('Completed' => 'fa-check-circle-o fa-1-5x text-success', + 'Failed' => 'fa-times-circle-o fa-1-5x text-danger', + 'Picked Up' => 'fa-exchange fa-1-5x text-info', + ); sub system_history_provider { my $self = shift; @@ -118,28 +117,24 @@ sub system_history_provider { if (defined $event->{HISTORY_TYPE}) { if ($history_type_icons{$event->{HISTORY_TYPE}}) { - $event->{HISTORY_TYPE} = PXT::HTML->img(-src => '/img/' . $history_type_icons{$event->{HISTORY_TYPE}}, - -alt => $event->{HISTORY_TYPE_NAME}, - -title => $event->{HISTORY_TYPE_NAME}); + $event->{HISTORY_TYPE} = sprintf(qq{<i class="fa %s" title="%s"></i>}, + $history_type_icons{$event->{HISTORY_TYPE}}, + $event->{HISTORY_TYPE_NAME}); } else { PXT::Debug->log(2,"no icon for scheduled action type?! type: " . $event->{HISTORY_TYPE}); - $event->{HISTORY_TYPE} = PXT::HTML->img(-src => '/img/rhn-listicon-system.gif', - -alt => 'System Event', - -title => 'System Event'); + $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; } } else { - $event->{HISTORY_TYPE} = PXT::HTML->img(-src => '/img/rhn-listicon-system.gif', - -alt => 'System Event', - -title => 'System Event'); + $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; } if (defined $event->{HISTORY_STATUS}) { - $event->{HISTORY_STATUS} = PXT::HTML->img(-src => '/img/' . $history_status_icons{$event->{HISTORY_STATUS}}, - -alt => $event->{HISTORY_STATUS}, - -title => $event->{HISTORY_STATUS}); + $event->{HISTORY_STATUS} = sprintf(qq{<i class="fa %s" title="%s"></i>}, + $history_status_icons{$event->{HISTORY_STATUS}}, + $event->{HISTORY_STATUS}); } else { $event->{HISTORY_STATUS} = '<span class="no-details">(n/a)</span>'; commit 88f83e2f85e746d1429eb46b45816d8396f80215 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 11:53:28 2013 +0100 bootstrap tuning: fixed icons in events diff --git a/web/include/network/components/legends/event-status.pxi b/web/include/network/components/legends/event-status.pxi index d652f0d..1b98ff5 100644 --- a/web/include/network/components/legends/event-status.pxi +++ b/web/include/network/components/legends/event-status.pxi @@ -3,8 +3,8 @@ <div class="sideleg"> <h2>Event Status Legend</h2> <ul> - <li><img src="/img/rhn-listicon-ok.gif" alt="" />Complete</li> - <li><img src="/img/rhn-listicon-error.gif" alt="" />Failure</li> - <li><img src="/img/rhn-listicon-activity.gif" alt="" />Activity Occuring</li> + <li><i class="fa fa-check-circle-o fa-1-5x text-success"></i>Complete</li> + <li><i class="fa fa-times-circle-o fa-1-5x text-danger"></i>Failure</li> + <li><i class="fa fa-exchange fa-1-5x text-info"></i>Activity Occuring</li> </ul> </div> diff --git a/web/include/network/components/legends/event-type.pxi b/web/include/network/components/legends/event-type.pxi index 0cec63b..df25bf4 100644 --- a/web/include/network/components/legends/event-type.pxi +++ b/web/include/network/components/legends/event-type.pxi @@ -3,9 +3,9 @@ <div class="sideleg"> <h2>Event Type Legend</h2> <ul> - <li><img src="/img/rhn-listicon-package.gif" alt="" />Package Event</li> - <li><img src="/img/rhn-listicon-errata.gif" alt="" />Errata Event</li> - <li><img src="/img/rhn-listicon-preferences.gif" alt="" />Preferences Event</li> - <li><img src="/img/rhn-listicon-system.gif" alt="" />System Event</li> + <li><i class="fa spacewalk-icon-packages"></i>Package Event</li> + <li><i class="fa spacewalk-icon-patches"></i>Errata Event</li> + <li><i class="fa fa-cog"></i>Preferences Event</li> + <li><i class="fa fa-desktop"></i>System Event</li> </ul> </div> commit f57ccabbcd0f6b39f844ca372f064d3854187479 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Dec 4 10:12:05 2013 +0100 bootstrap tuning: fix big contact address diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 5321d44..9fc286c 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -716,3 +716,7 @@ ul.nav.nav-tabs:last-child { } } } + +.mail-address-border { + border: 1px solid #ccc; +} diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index dd6b304..5a2bad2 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -163,7 +163,7 @@ public class AddressTag extends TagSupport { StringBuilder result = new StringBuilder(); StringBuilder key = new StringBuilder("address type "); key.append(type); - result.append("<div class=\"jumbotron\">"); + result.append("<div class=\"mail-address-border\">"); result.append("<div class=\"container\">"); result.append("<h1>"); result.append(ls.getMessage(key.toString())); commit 405dbd36c71d93c34d446951eff9624c98fffb17 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Dec 4 10:23:03 2013 +0100 makes the system details page to be shown in two columns, with boxes at both sides instead of each of them taking the full width. 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 e6e4011..14d57a7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -13,99 +13,90 @@ <h4><bean:message key="sdc.details.overview.systemstatus"/></h4> </div> <div class="panel-body"> - <c:choose> - <c:when test="${unentitled}"> - <i class="spacewalk-icon-Unentitled"></i> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> - </c:when> - - <c:when test="${systemInactive}"> - <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> - </c:when> - <c:when test="${hasUpdates}"> - <c:choose> - <c:when test="${criticalErrataCount > 0}"> - <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i> - </c:when> - <c:otherwise> - <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i> - </c:otherwise> - </c:choose> - -   <bean:message key="sdc.details.overview.updatesavailable" />    + <c:choose> + <c:when test="${unentitled}"> + <i class="spacewalk-icon-Unentitled"></i> <bean:message key="sdc.details.overview.unentitled" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/> + </c:when> + <c:when test="${systemInactive}"> + <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> + </c:when> + <c:when test="${hasUpdates}"> + <c:choose> + <c:when test="${criticalErrataCount > 0}"> + <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i> + </c:when> + <c:otherwise> + <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i> + </c:otherwise> + </c:choose> +   <bean:message key="sdc.details.overview.updatesavailable" />    - <c:if test="${criticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/>    - </c:if> - <c:if test="${nonCriticalErrataCount > 0}"> - <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/>    - </c:if> - <c:if test="${upgradablePackagesCount > 0}"> - <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> - </c:if> - </c:when> + <c:if test="${criticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.critical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.create.securityadvisory')}" arg1="${criticalErrataCount}"/>    + </c:if> + <c:if test="${nonCriticalErrataCount > 0}"> + <bean:message key="sdc.details.overview.updates.noncritical" arg0="/rhn/systems/details/ErrataList.do?sid=${system.id}&type=${rhn:localize('errata.updates.noncritical')}" arg1="${nonCriticalErrataCount}"/>    + </c:if> + <c:if test="${upgradablePackagesCount > 0}"> + <bean:message key="sdc.details.overview.updates.packages" arg0="/rhn/systems/details/packages/UpgradableList.do?sid=${system.id}" arg1="${upgradablePackagesCount}"/> + </c:if> + </c:when> - <c:otherwise> - <i class="fa fa-check-circle fa-1-5x text-success"></i> <bean:message key="sdc.details.overview.updated"/> - </c:otherwise> - </c:choose> + <c:otherwise> + <i class="fa fa-check-circle fa-1-5x text-success"></i> <bean:message key="sdc.details.overview.updated"/> + </c:otherwise> + </c:choose> - <c:if test="${rebootRequired}"> - <div class="systeminfo"> - <div class="systeminfo-full"> - <i class="fa fa-refresh text-primary"></i><bean:message key="sdc.details.overview.requires_reboot"/> - <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> - </div> + <c:if test="${rebootRequired}"> + <div class="systeminfo"> + <div class="systeminfo-full"> + <i class="fa fa-refresh text-primary"></i><bean:message key="sdc.details.overview.requires_reboot"/> + <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> </div> - </c:if> + </div> + </c:if> - <c:if test="${probeListEmpty != 'true'}"> - <div class="row-0"> - <div class="col-md-6"> + <c:if test="${probeListEmpty != 'true'}"> + <div class="row-0"> + <div class="col-md-6"> + <c:choose> + <c:when test="${probeList[0].state == 'CRITICAL'}"> + <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + </c:when> + <c:otherwise> + <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + </c:otherwise> + </c:choose> + </div> + <div class="col-md-6"> + <c:forEach items="${probeList}" var="probe"> <c:choose> - <c:when test="${probeList[0].state == 'CRITICAL'}"> - <i class="fa spacewalk-icon-monitoring-down"></i> <bean:message key="sdc.details.overview.probes.critical" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <c:when test="${probe.state == 'CRITICAL'}"> + <i class="fa fa-circle text-danger"></i> </c:when> <c:otherwise> - <i class="fa spacewalk-icon-monitoring-warning"></i> <bean:message key="sdc.details.overview.probes.warning" arg0="/rhn/help/reference/en-US/s1-sm-monitor.jsp"/> + <i class="fa fa-warning text-warning"></i> </c:otherwise> </c:choose> - </div> - <div class="col-md-6"> - <c:forEach items="${probeList}" var="probe"> - <c:choose> - <c:when test="${probe.state == 'CRITICAL'}"> - <i class="fa fa-circle text-danger"></i> - </c:when> - <c:otherwise> - <i class="fa fa-warning text-warning"></i> - </c:otherwise> - </c:choose> - <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> - </c:forEach> - </div> + <a href="/rhn/systems/details/probes/ProbeDetails.do?sid=${system.id}&probe_id=${probe.id}">${probe.description}</a><br/> + </c:forEach> </div> - </c:if> - + </div> + </c:if> </div> </div> - - - <div class="systeminfo"> - + <div class="row-0"> + <div class="col-md-6"> - - -<div class="row-0"> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.systeminfo"/></h4> - </div> - <div class="panel-body"> +  + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.systeminfo"/></h4> + </div> <table class="table"> <tr> <td><bean:message key="sdc.details.overview.hostname"/></td> @@ -123,14 +114,14 @@ <tr> <td><bean:message key="sdc.details.overview.ipaddy"/></td> <td> - <c:choose> - <c:when test="${system.ipAddress == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.ipAddress}" /> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="${system.ipAddress == null}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${system.ipAddress}" /> + </c:otherwise> + </c:choose> </td> </tr> <tr> @@ -168,21 +159,21 @@ <tr> <td><bean:message key="sdc.details.overview.kernel"/></td> <td> - <c:choose> - <c:when test="${system.runningKernel == null}"> - <bean:message key="sdc.details.overview.unknown"/> - </c:when> - <c:otherwise> - <c:out value="${system.runningKernel}" /> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="${system.runningKernel == null}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${system.runningKernel}" /> + </c:otherwise> + </c:choose> </td> </tr> <tr> <td><bean:message key="sdc.details.overview.sysid"/></td> <td><c:out value="${system.id}" /></td> </tr> - <tr> + <tr> <td><bean:message key="sdc.details.overview.activationkey"/></td> <td> <c:forEach items="${activationKey}" var="key"> @@ -193,32 +184,63 @@ <tr> <td><bean:message key="sdc.details.overview.lockstatus"/></td> <td> - <c:choose> - <c:when test="${serverLock != null}"> - <i class="fa fa-lock"></i> - <bean:message key="sdc.details.overview.locked" - arg0="${serverLock.locker.login}" - arg1="${serverLock.reason}" /><br/> - <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> - </c:when> - <c:otherwise> + <c:choose> + <c:when test="${serverLock != null}"> + <i class="fa fa-lock"></i> + <bean:message key="sdc.details.overview.locked" + arg0="${serverLock.locker.login}" + arg1="${serverLock.reason}" /><br/> + <bean:message key="sdc.details.overview.unlock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=0"/> + </c:when> + <c:otherwise> <i class="fa fa-unlock"></i> <bean:message key="sdc.details.overview.unlocked"/><br/> <bean:message key="sdc.details.overview.lock" arg0="/rhn/systems/details/Overview.do?sid=${system.id}&lock=1"/> - </c:otherwise> - </c:choose> + </c:otherwise> + </c:choose> </td> </tr> </table> </div> - </div> - </div> - <div class="col-md-6"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.sysevents"/></h4> + +  + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.subscribedchannels" arg0="/rhn/systems/details/SystemChannels.do?sid=${system.id}"/></h4> + </div> + <div class="panel-body"> + <c:if test="${system.baseChannel != null}"> + <ul class="channel-list"> + <li> + <a href="/rhn/channels/ChannelDetail.do?cid=${baseChannel['id']}">${baseChannel['name']}</a> + <c:if test="${baseChannel['is_fve'] == 'Y'}"> +  (Flex) + </c:if> + </li> + + <c:forEach items="${childChannels}" var="childChannel"> + <li class="child-channel"> + <a href="/rhn/channels/ChannelDetail.do?cid=${childChannel['id']}">${childChannel['name']}</a> + <c:if test="${childChannel['is_fve'] == 'Y'}"> +  (Flex) + </c:if> + </li> + </c:forEach> + + </ul> + </c:if> + </div> </div> - <div class="panel-body"> + + </div> + + <div class="col-md-6"> + +  + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.sysevents"/></h4> + </div> <table class="table"> <tr> <td><bean:message key="sdc.details.overview.checkedin"/></td> @@ -247,20 +269,19 @@ <bean:message key="sdc.details.overview.osa.status.message" arg0="${system.pushClient.state.name}"/> <c:choose> - <c:when test="${system.pushClient.lastMessageTime != null}"> - <fmt:formatDate value="${system.pushClient.lastMessageTime}" type="both" dateStyle="short" timeStyle="long"/><br/> - </c:when> - <c:otherwise> - <bean:message key="sdc.details.overview.unknown" /><br/> - </c:otherwise> + <c:when test="${system.pushClient.lastMessageTime != null}"> + <fmt:formatDate value="${system.pushClient.lastMessageTime}" type="both" dateStyle="short" timeStyle="long"/><br/> + </c:when> + <c:otherwise> + <bean:message key="sdc.details.overview.unknown" /><br/> + </c:otherwise> </c:choose> <c:if test="${system.pushClient.lastPingTime != null}"> - <bean:message key="sdc.details.overview.osa.status.lastping"/> - <fmt:formatDate value="${system.pushClient.lastPingTime}" type="both" dateStyle="short" timeStyle="long"/> - <br/> + <bean:message key="sdc.details.overview.osa.status.lastping"/> + <fmt:formatDate value="${system.pushClient.lastPingTime}" type="both" dateStyle="short" timeStyle="long"/> + <br/> </c:if> - - <a href="/rhn/systems/details/Overview.do?sid=${system.id}&ping=1"><bean:message key="sdc.details.overview.osa.status.ping"/></a> + <a href="/rhn/systems/details/Overview.do?sid=${system.id}&ping=1"><bean:message key="sdc.details.overview.osa.status.ping"/></a> </c:when> <c:otherwise> <bean:message key="sdc.details.overview.unknown" /> @@ -277,7 +298,7 @@ <c:choose> <c:when test="${system.serverUuid == null}"> <bean:message key="sdc.details.overview.applet.notactivated"/><br/> - <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.activate"/></a> + <a href="/rhn/systems/details/Overview.do?sid=${system.id}&applet=1"/><bean:message key="sdc.details.overview.applet.activate"/></a> </c:when> <c:otherwise> <bean:message key="sdc.details.overview.applet.activated"/><br/> @@ -289,93 +310,88 @@ </rhn:require> </table> </div> - </div> - </div> -</div> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.sysproperties" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/></h4> - </div> - <div class="panel-body"> - <table class="table"> - <tr> - <td><bean:message key="sdc.details.overview.entitlement"/></td> - <td> - <c:choose> - <c:when test="${unentitled}"> - <bean:message key="none.message"/> - </c:when> - <c:otherwise> - - <c:forEach items="${system.entitlements}" var="entitlement"> - [${entitlement.humanReadableLabel}] - </c:forEach> - - </c:otherwise> - </c:choose> - </td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.notifications"/></td> - <td> - - <c:choose> - <c:when test="${unentitled}"> - <bean:message key="none.message"/> - </c:when> - <c:otherwise> - - <c:forEach items="${prefs}" var="pref"> - <bean:message key="${pref}"/><br/> - </c:forEach> - - </c:otherwise> - </c:choose> - </td> - </tr> - <rhn:require acl="system_feature(ftr_errata_updates)" +  + <div class="panel panel-default"> + <div class="panel-heading"> + <h4><bean:message key="sdc.details.overview.sysproperties" arg0="/rhn/systems/details/Edit.do?sid=${system.id}"/></h4> + </div> + <table class="table"> + <tr> + <td><bean:message key="sdc.details.overview.entitlement"/></td> + <td> + <c:choose> + <c:when test="${unentitled}"> + <bean:message key="none.message"/> + </c:when> + <c:otherwise> + <c:forEach items="${system.entitlements}" var="entitlement"> + [${entitlement.humanReadableLabel}] + </c:forEach> + </c:otherwise> + </c:choose> + </td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.notifications"/></td> + <td> + <c:choose> + <c:when test="${unentitled}"> + <bean:message key="none.message"/> + </c:when> + <c:otherwise> + <c:forEach items="${prefs}" var="pref"> + <bean:message key="${pref}"/><br/> + </c:forEach> + </c:otherwise> + </c:choose> + </td> + </tr> + <rhn:require acl="system_feature(ftr_errata_updates)" mixins="com.redhat.rhn.common.security.acl.SystemAclHandler"> - <tr> - <td><bean:message key="sdc.details.overview.errataupdate"/></td> - <td><c:choose> + <tr> + <td><bean:message key="sdc.details.overview.errataupdate"/></td> + <td> + <c:choose> <c:when test="${system.autoUpdate == 'Y'}"> - <bean:message key="yes"/> + <bean:message key="yes"/> </c:when> <c:otherwise> - <bean:message key="no"/> + <bean:message key="no"/> </c:otherwise> </c:choose> - </td> - </tr> - </rhn:require> - <tr> - <td><bean:message key="sdc.details.overview.sysname"/></td> - <td><c:out value="${system.name}"/></td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.description"/></td> - <td>${description}</td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.location"/></td> - <td> - <c:choose> - <c:when test="${not hasLocation}"> - <bean:message key="sdc.details.overview.location.none"/> - </c:when> - <c:otherwise> - <bean:message key="sdc.details.overview.location.room"/>: <c:out value="${system.location.room}"/><br/> - <bean:message key="sdc.details.overview.location.rack"/>: <c:out value="${system.location.rack}"/><br/> - <bean:message key="sdc.details.overview.location.building"/>: <c:out value="${system.location.building}"/><br/> - <c:out value="${system.location.address1}"/><br/> - <c:out value="${system.location.address2}"/><br/> - <c:out value="${system.location.city}"/> <c:out value="${system.location.state}"/> <c:out value="${system.location.country}"/> - </c:otherwise> - </c:choose> - </td> - </tr> - </table> + </td> + </tr> + </rhn:require> + <tr> + <td><bean:message key="sdc.details.overview.sysname"/></td> + <td><c:out value="${system.name}"/></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.description"/></td> + <td>${description}</td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.location"/></td> + <td> + <c:choose> + <c:when test="${not hasLocation}"> + <bean:message key="sdc.details.overview.location.none"/> + </c:when> + <c:otherwise> + <bean:message key="sdc.details.overview.location.room"/>: <c:out value="${system.location.room}"/><br/> + <bean:message key="sdc.details.overview.location.rack"/>: <c:out value="${system.location.rack}"/><br/> + <bean:message key="sdc.details.overview.location.building"/>: <c:out value="${system.location.building}"/><br/> + <c:out value="${system.location.address1}"/><br/> + <c:out value="${system.location.address2}"/><br/> + <c:out value="${system.location.city}"/> <c:out value="${system.location.state}"/> <c:out value="${system.location.country}"/> + </c:otherwise> + </c:choose> + </td> + </tr> + </table> + </div> + </div> </div> @@ -384,58 +400,29 @@ <div class="panel-heading"> <h4><bean:message key="sdc.details.overview.crashes.application"/></h4> </div> - <div class="panel-body"> - <table class="table"> - <c:choose> - <c:when test="${system.crashCount == null}"> - <bean:message key="sdc.details.overview.crashes.nodata"/> - </c:when> - <c:otherwise> - <tr> - <td><bean:message key="sdc.details.overview.crashes.uniquecrashcount"/></td> - <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.uniqueCrashCount}"/></a></td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.crashes.totalcrashcount"/></td> - <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.totalCrashCount}"/></a></td> - </tr> - <tr> - <td><bean:message key="sdc.details.overview.crashes.lastreport"/></td> - <td><fmt:formatDate value="${system.crashCount.lastReport}" type="both" dateStyle="short" timeStyle="long"/></td> - </tr> - - </c:otherwise> - </c:choose> - </table> - </div> + <table class="table"> + <c:choose> + <c:when test="${system.crashCount == null}"> + <bean:message key="sdc.details.overview.crashes.nodata"/> + </c:when> + <c:otherwise> + <tr> + <td><bean:message key="sdc.details.overview.crashes.uniquecrashcount"/></td> + <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.uniqueCrashCount}"/></a></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.crashes.totalcrashcount"/></td> + <td><a href="/rhn/systems/details/SoftwareCrashes.do?sid=${system.id}"><c:out value="${system.crashCount.totalCrashCount}"/></a></td> + </tr> + <tr> + <td><bean:message key="sdc.details.overview.crashes.lastreport"/></td> + <td><fmt:formatDate value="${system.crashCount.lastReport}" type="both" dateStyle="short" timeStyle="long"/></td> + </tr> + </c:otherwise> + </c:choose> + </table> </div> </rhn:require> - <div class="panel panel-default"> - <div class="panel-heading"> - <h4><bean:message key="sdc.details.overview.subscribedchannels" arg0="/rhn/systems/details/SystemChannels.do?sid=${system.id}"/></h4> - </div> - <div class="panel-body"> - <c:if test="${system.baseChannel != null}"> - <ul class="channel-list"> - <li> - <a href="/rhn/channels/ChannelDetail.do?cid=${baseChannel['id']}">${baseChannel['name']}</a> - <c:if test="${baseChannel['is_fve'] == 'Y'}"> -  (Flex) - </c:if> - </li> - - <c:forEach items="${childChannels}" var="childChannel"> - <li class="child-channel"> - <a href="/rhn/channels/ChannelDetail.do?cid=${childChannel['id']}">${childChannel['name']}</a> - <c:if test="${childChannel['is_fve'] == 'Y'}"> -  (Flex) - </c:if> - </li> - </c:forEach> - </ul> - </c:if> - </div> - </div> </body> </html:html> commit 9f41af6a4d50fd53d13425efd52923a2a4ac58e7 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Dec 4 09:15:49 2013 +0100 bootstrap tuning: provide alt value for toolbar icons adressing: [TP-Processor1] ERROR com.redhat.rhn.common.localization.LocalizationService - *** ERROR: Message with id: [null] not found.*** called by com.redhat.rhn.frontend.taglibs.ToolbarTag.renderActionLink(ToolbarTag.java:660) diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf index 38d5c43..a4342f7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf @@ -34,7 +34,7 @@ </c:choose> <rhn:toolbar base="h1" - icon="${systemIcon}" miscUrl="${actionLink}" miscIcon="${actionIcon}" miscText="${actionMessage}" + icon="${systemIcon}" miscUrl="${actionLink}" miscIcon="${actionIcon}" miscText="${actionMessage}" miscAlt="${actionMessage}" miscAcl="system_has_management_entitlement()" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-details" deletionUrl="/rhn/systems/details/DeleteConfirm.do?sid=${system.id}" commit 7eaabf32cbd631015e76ba508e0bd4dc3d0ce5f0 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Dec 4 08:57:54 2013 +0100 bootstrap tuning: icons in UserDetails.do page 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 2bc1b10..f06f8c8 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 @@ -6,12 +6,12 @@ <c:if test="${not targetuser.disabled}"> <c:set var="url" value="/rhn/users/DisableUser.do?uid=${param.uid}" /> <c:set var="text" value="userdetails.jsp.disable" /> - <c:set var="img" value="action-del.gif" /> + <c:set var="icon" value="fa-minus-circle" /> </c:if> <c:if test="${targetuser.disabled}"> <c:set var="url" value="/rhn/users/EnableUser.do?uid=${param.uid}" /> <c:set var="text" value="userdetails.jsp.enable" /> - <c:set var="img" value="action-add.gif" /> + <c:set var="icon" value="fa-plus-circle" /> </c:if> <rhn:toolbar base="h1" icon="fa-user" @@ -19,7 +19,7 @@ miscUrl="${url}" miscAcl="user_role(org_admin)" miscText="${text}" - miscImg="${img}" + miscIcon="${icon}" miscAlt="${text}" deletionUrl="/rhn/users/DeleteUser.do?uid=${param.uid}" deletionAcl="user_role(org_admin)" commit f5397686968d86e88086e0990625441305ca0ebb Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 19:39:13 2013 +0100 Automatic commit of package [spacewalk-branding] release [2.1.12-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 48a2bce..43ca2dc 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.11 +Version: 2.1.12 Release: 1%{?dist} Summary: Spacewalk branding data @@ -82,6 +82,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.12-1 +- bootstrap tuning + * Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 - bootstrap tuning diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 41a0d0e..f2b7a4c 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.11-1 branding/ +2.1.12-1 branding/ commit cfb10dc74acd532fe97e8153629a2e6078ef4469 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 19:38:30 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.88-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index dd7c245..fc98504 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.87 +Version: 2.1.88 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.88-1 +- bootstrap tuning +- Optionally show a legal note on login/relogin + * Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.87-1 - bootstrap tuning - enable setting nobase and ignoremissing for diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 26b6f20..0539618 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.87-1 java/ +2.1.88-1 java/ commit 66bc450c7b12fe5b4de93a718a67fe1b551bbfc2 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 19:37:37 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.37-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 6f1826f..8790232 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.36-1 web/ +2.1.37-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 13aaaf4..e88b81b 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.36 +Version: 2.1.37 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.37-1 +- bootstrap tuning + * Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.36-1 - bootstrap tuning: fixed doubled item separator commit e9696094bd173c0190902f7f2d3f9be9daba4b8b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 19:16:26 2013 +0100 bootstrap tuning: fixed table on systems/groups/details.pxt diff --git a/web/html/network/systems/groups/details.pxt b/web/html/network/systems/groups/details.pxt index 6dd777c..a79a200 100644 --- a/web/html/network/systems/groups/details.pxt +++ b/web/html/network/systems/groups/details.pxt @@ -12,9 +12,12 @@ <pxt-include file="/network/components/system_groups/sgdc_header.pxi" /> <rhn-admin-server-group-edit-form> -<table width="100%" class="details-2-columns"> -<tr valign="top"> -<td width="50%"> + +<div class="row-0"> +<div class="col-md-6"> +<div class="panel panel-default"> + +<div class="panel-heading"> <h2>Group Updates</h2> <rhn-system-group-status-interface> @@ -23,8 +26,11 @@ <br /> +</div> <pxt-form method="POST" action="/rhn/groups/ListRemoveSystems.do"> -<table class="details"> + +<div class="panel-body"> +<table class="table"> <tr> <th>Admins:</th> <td> @@ -43,14 +49,18 @@ <td>{systems_area}</td> </tr> </table> +</div> </pxt-form> -</td> - -<td width="50%"> +</div> +</div> +<div class="col-md-6"> +<div class="panel panel-default"> +<div class="panel-heading"> <h2>System Group Properties</h2> - - <table class="details" align="center"> +</div> + <div class="panel-body"> + <table class="table"> <tr> <th>Name:</th> <td>{name}</td> @@ -61,6 +71,7 @@ <td>{description}</td> </tr> </table> + </div> @@ -70,10 +81,9 @@ <div align="center"><a href="edit_properties.pxt?sgid={formvar:sgid}">Edit Group Properties</a></div> </pxt-formvar> </rhn-require> -</td> - -</tr> -</table> +</div> +</div> +</div> </rhn-admin-server-group-edit-form> </grail-canvas-template> commit c5be270989cd056cd51680183818af3b0d1917d8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 17:57:00 2013 +0100 bootstrap tuning: style pxt table lists diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm b/web/modules/sniglets/Sniglets/ListView/Style.pm index 2ab8fab..288c615 100644 --- a/web/modules/sniglets/Sniglets/ListView/Style.pm +++ b/web/modules/sniglets/Sniglets/ListView/Style.pm @@ -45,6 +45,7 @@ sub header { my $self = shift; my $ret =<<EOQ; +<div class="panel panel-default"> <table class="table table-striped">  <thead> @@ -79,6 +80,7 @@ sub footer { my $ret =<<EOQ; </table> +</div> EOQ return $ret; commit d6bf5754c5e5e160c830afb09a2a12f773c15ed5 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Dec 3 17:24:18 2013 +0100 use envelope icon, fits better to address diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp index 98aadd1..d7ae4e4 100644 --- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp @@ -8,7 +8,7 @@ <meta name="page-decorator" content="none" /> </head> <body> - <rhn:toolbar base="h1" icon="fa-user" + <rhn:toolbar base="h1" icon="fa-envelope" imgAlt="users.jsp.imgAlt" helpUrl="/rhn/help/reference/en-US/s1-sm-your-rhn.jsp#s2-sm-your-rhn-account"> <bean:message key="Addresses" /> commit 053146be457d8c0e856babb9e894825b5c315397 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Dec 3 17:23:35 2013 +0100 - There is no reason for address to be a jumbotron - Use the markup like documented at http://getbootstrap.com/css/#type-addresses diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index dd6b304..4dd2198 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -23,6 +23,7 @@ import java.io.IOException; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.TagSupport; +import org.apache.commons.lang.StringUtils; /** * <strong>AddressTag</strong> @@ -163,55 +164,54 @@ public class AddressTag extends TagSupport { StringBuilder result = new StringBuilder(); StringBuilder key = new StringBuilder("address type "); key.append(type); - result.append("<div class=\"jumbotron\">"); - result.append("<div class=\"container\">"); - result.append("<h1>"); + result.append("<strong>"); result.append(ls.getMessage(key.toString())); - result.append("</h1>"); + result.append("</strong>"); if (user == null) { throw new IllegalArgumentException("User is null"); } // If this Address is new if (address != null && - address.getCity() != null && - address.getZip() != null) { - + StringUtils.isNotBlank(address.getCity()) && + StringUtils.isNotBlank(address.getZip())) { + result.append("<address>"); // Address 1 and 2 - result.append("<p>"); result.append(address.getAddress1()); - if (address.getAddress2() != null) { - result.append("<br/>"); + result.append("<br>"); + if (StringUtils.isNotBlank(address.getAddress2())) { result.append(address.getAddress2()); + result.append("<br>"); } - result.append("<br/>"); - // Sity + // City result.append(address.getCity()); - if (address.getState() != null) { + if (StringUtils.isNotBlank(address.getState())) { result.append(", "); result.append(address.getState()); } + result.append(" "); result.append(address.getZip()); - result.append("</p>"); + result.append("<br>"); // Phones - result.append("<p>"); result.append(ls.getMessage("phone")); result.append(": "); result.append(address.getPhone()); - result.append("<br/>"); - result.append(ls.getMessage("fax")); - result.append(": "); - if (address.getFax() != null) { + result.append("<br>"); + if (StringUtils.isNotBlank(address.getFax())) { + result.append(ls.getMessage("fax")); + result.append(": "); result.append(address.getFax()); + result.append("<br>"); } - result.append("</p>"); + + result.append("</address>"); result.append("<p>"); result.append("<a ") - .append("class=\"btn btn-success btn-lg\"") + .append("class=\"btn btn-primary\"") .append("href=\"") .append(getActionUrl()) .append("/EditAddress.do?type=") @@ -229,7 +229,7 @@ public class AddressTag extends TagSupport { result.append("</div>"); result.append("<p>"); result.append("<a ") - .append("class=\"btn btn-success btn-lg\"") + .append("class=\"btn btn-primary\"") .append(" href=\"") .append(getActionUrl()) .append("/EditAddress.do?type=") @@ -241,8 +241,6 @@ public class AddressTag extends TagSupport { .append("</a>"); result.append("</p>"); } - result.append("</div>"); - result.append("</div>"); out.print(result); } commit c7d832db842deb09517213806540d01e923c32ae Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Dec 3 16:37:16 2013 +0100 ssmindex.jsp: remove incorrect actions diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index e0b8100..25cdb85 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -86,8 +86,6 @@ <li><bean:message key="ssm.overview.provisioning.kickstart"/></li> <li><bean:message key="ssm.overview.provisioning.rollback"/></li> <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> - <li><bean:message key="ssm.overview.provisioning.powermanagement.configure"/></li> - <li><bean:message key="ssm.overview.provisioning.powermanagement.operations"/></li> </ul> </div> </rhn:require> commit a291087ad5ef010074ad2d4b1679fcc2cdf667c5 Author: Maximilian Meister <mmeister(a)suse.de> Date: Tue Dec 3 16:31:28 2013 +0100 Fix Unit test for ProbeList diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java index 46b82bd..12d680a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeListTest.java @@ -45,8 +45,7 @@ public class ProbeListTest extends RhnMockStrutsTestCase { setRequestPathInfo("/monitoring/ProbeList"); actionPerform(); verifyPageList(ServerProbeDto.class); - assertEquals("content-nav-selected", request.getAttribute("allClass")); - assertEquals("content-nav-selected-link", request.getAttribute("allLink")); + assertEquals("active", request.getAttribute("allClass")); checkCount(ProbeList.PROBE_COUNT_ALL); checkCount(ProbeList.PROBE_COUNT_CRITICAL); @@ -58,8 +57,7 @@ public class ProbeListTest extends RhnMockStrutsTestCase { addRequestParameter(ProbeList.PROBE_STATE, MonitoringConstants.PROBE_STATE_CRITICAL); actionPerform(); - assertEquals("content-nav-selected", request.getAttribute("criticalClass")); - assertEquals("content-nav-selected-link", request.getAttribute("criticalLink")); + assertEquals("active", request.getAttribute("criticalClass")); } private void checkCount(String name) { commit 8ea182a4bedeedf6694088e8f3ee9ce4f9660eba Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 16:00:21 2013 +0100 bootstrap tuning: fixed icons in package errata list e.g. /network/systems/groups/errata_list.pxt?sgid=7 diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm index 2ba6c9c..0adce0e 100644 --- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm @@ -170,10 +170,11 @@ sub row_callback { my $row = shift; my $pxt = shift; + my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', + 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', + 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>'); if (exists $row->{ADVISORY_TYPE}) { - $row->{ADVISORY_ICON} = PXT::HTML->img(-src => '/img/wrh-' . lc ((split /[\s]/, $row->{ADVISORY_TYPE})[0]) . '.gif', - -alt => $row->{ADVISORY_TYPE}, - -title => $row->{ADVISORY_TYPE}); + $row->{ADVISORY_ICON} = $adv_icon{$row->{ADVISORY_TYPE}}; } if (exists $row->{ADVISORY_LAST_UPDATED}) { diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm index 9387d06..2f83964 100644 --- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm +++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm @@ -1382,9 +1382,9 @@ sub package_install_remote_command_cb { return 1; } -my %adv_icon = ('Bug Fix Advisory' => '/img/wrh-bug.gif', - 'Product Enhancement Advisory' => '/img/wrh-product.gif', - 'Security Advisory' => '/img/wrh-security.gif'); +my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', + 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', + 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>'); sub system_upgradable_package_provider { my $self = shift; @@ -1458,7 +1458,7 @@ sub system_upgradable_package_provider { foreach my $adv (@{$row->{ERRATA_ADVISORY}}) { my $adv_id = shift @{$row->{ERRATA_ID}}; my $adv_type = shift @adv_types; - push @errata, sprintf('<img src="%s" alt="%s" /> <a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_type, $adv_id, $adv); + push @errata, sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv); } $row->{RELATED_ERRATA} = join("<br />\n", @errata); @@ -1480,7 +1480,7 @@ sub obsoleting_packages_provider { my $adv_type = $row->{ADVISORY_TYPE}; my $adv_id = $row->{ERRATA_ID}; - $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('<img src="%s" alt="%s" /> <a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_type, $adv_id, $adv) : ''; + $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv) : ''; } return (%ret); commit bbca39a2f45bd36df0a2ba4a4f493d230ce52100 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 15:35:03 2013 +0100 bootstrap tuning: updates / security updates icons for pxt e.g. /network/systems/groups/details.pxt?sgid=7 diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm index 54f318f..a59b55b 100644 --- a/web/modules/sniglets/Sniglets/ServerGroup.pm +++ b/web/modules/sniglets/Sniglets/ServerGroup.pm @@ -70,14 +70,14 @@ sub system_group_status_interface { } elsif ($counts->{SECURITY_ERRATA}) { - $subst->{icon} = '<img src="/img/icon_crit_update.gif" alt="critical updates available" />'; + $subst->{icon} = '<i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>'; $subst->{status_str} = $counts->{SECURITY_ERRATA} . ' critical updates available'; $subst->{message} = "(<a href=\"/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "\">more info</a>)";; $subst->{status_class} = 'system-status-critical-updates'; } else { - $subst->{icon} = '<img src="/img/icon_reg_update.gif" alt="updates available" />'; + $subst->{icon} = '<i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i>'; $subst->{status_str} = ' updates available'; $subst->{message} = "(<a href=\"/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "\">more info</a>)"; $subst->{status_class} = 'system-status-updates'; commit fb8d77fa49ac14bf2b4e756188dce9384305cc82 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 15:28:41 2013 +0100 bootstrap tuning: style pxt table lists diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm b/web/modules/sniglets/Sniglets/ListView/Style.pm index 580d408..2ab8fab 100644 --- a/web/modules/sniglets/Sniglets/ListView/Style.pm +++ b/web/modules/sniglets/Sniglets/ListView/Style.pm @@ -45,7 +45,7 @@ sub header { my $self = shift; my $ret =<<EOQ; -<table width="100%" cellspacing="0" cellpadding="0" class="list" align="center"> +<table class="table table-striped">  <thead> <tr> commit 6f22cd46ae6f5c097694213e5bdced6c275d19a8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 15:03:24 2013 +0100 bootstrap tuning: fixed errata legend in pxt pages e.g. /network/systems/groups/errata_list.pxt?sgid=7 diff --git a/web/include/network/components/legends/errata-list-legend.pxi b/web/include/network/components/legends/errata-list-legend.pxi index 1de119e..de36a24 100644 --- a/web/include/network/components/legends/errata-list-legend.pxi +++ b/web/include/network/components/legends/errata-list-legend.pxi @@ -3,8 +3,8 @@ <div class="sideleg"> <h2>Errata Legend</h2> <ul> - <li><img src="/img/wrh-security.gif" alt="" />Security</li> - <li><img src="/img/wrh-bug.gif" alt="" />Bug Fix</li> - <li><img src="/img/wrh-product.gif" alt="" />Enhancement</li> + <li><i class="fa fa-shield fa-1-5x"></i>Security</li> + <li><i class="fa fa-bug fa-1-5x"></i>Bug Fix</li> + <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i>Enhancement</li> </ul> </div> commit 4bd1d1dc0abbc135c58e68364b6672053205a287 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 14:31:19 2013 +0100 bootstrap tuning: "_new" is not HTML5 valid target 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 f9f7dfe..bd51bc4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -549,7 +549,7 @@ public class ToolbarTag extends TagSupport { HtmlTag tag = new HtmlTag("a"); tag.setAttribute("href", getHelpUrl()); - tag.setAttribute("target", "_new"); + tag.setAttribute("target", "_blank"); HtmlTag stack = new HtmlTag("span"); stack.setAttribute("class", "fa-stack"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java index 5405901..4b72367 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java @@ -32,7 +32,7 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag { "<h1>" + "<img src=\"/img/rhn-icon-preferences.gif\" alt=\"Home Icon\" />" + "<a href=\"/help/provisioning/" + - "s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS\" target=\"_new\">" + + "s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS\" target=\"_blank\">" + "<span class=\"fa-stack\">" + "<i class=\"fa fa-circle fa-stack-1x\"></i>" + "<i class=\"fa fa-question fa-stack-1x fa-inverse\"></i>" + commit aa39449a9c8dd0e0b83937ff8b9db8c8b96ae4f3 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Dec 3 15:53:41 2013 +0100 Revert "bootstrap tuning: style ssm overview table" This reverts commit 710fc3e241932960e32c0c51fe2572b8ed95affe. Fine example when two people do the same thing and don't know about each other. diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index f52f16b..5321d44 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -716,13 +716,3 @@ ul.nav.nav-tabs:last-child { } } } - -.ssm-overview { - td, th { - vertical-align: top; - } - th { - padding-left: 5px; - padding-right: 10px; - } -} commit ce17fb7016c047b2194116158de691b7f931960b Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Dec 3 15:51:51 2013 +0100 Revert "bootstrap tuning: align th in ssm overview to right as it used to be" This reverts commit 857f8404f4e086085b1600121bfde0661316ad7c. Fine example when two people do the same thing and don't know about each other. diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index b68f7ec..f52f16b 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -724,6 +724,5 @@ ul.nav.nav-tabs:last-child { th { padding-left: 5px; padding-right: 10px; - text-align: right; } } commit 737f8e17793544df64b27410d35150ec2a50d308 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Dec 3 15:41:08 2013 +0100 ssmindex.jsp: remove incorrect acls diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index d3f75ec..e0b8100 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -23,61 +23,59 @@ <div class="panel-body"> <bean:message key="ssm.overview.systems.list"/> </div> - <rhn:require acl="no_bootstrap_systems_in_set()"> + <div class="panel-heading"> + <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i> + <bean:message key="ssm.overview.errata"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.errata.schedule"/> + </div> + <div class="panel-heading"> + <i class="fa spacewalk-icon-packages fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i> + <bean:message key="ssm.overview.packages"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.packages.upgrade"/> + </div> + <rhn:require acl="is(enable_solaris_support)"> <div class="panel-heading"> - <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i> - <bean:message key="ssm.overview.errata"/> + <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key='ssm.overview.patches'/>"></i> + <bean:message key="ssm.overview.patches"/> </div> <div class="panel-body"> - <bean:message key="ssm.overview.errata.schedule"/> + <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> + <bean:message key="ssm.overview.patches.patches"/> </div> <div class="panel-heading"> - <i class="fa spacewalk-icon-packages fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i> - <bean:message key="ssm.overview.packages"/> + <i class="fa spacewalk-icon-patch-set fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i> + <bean:message key="ssm.overview.patch.clusters"/> </div> <div class="panel-body"> - <bean:message key="ssm.overview.packages.upgrade"/> + <bean:message key="ssm.overview.patch.clusters.install"/> </div> - <rhn:require acl="is(enable_solaris_support)"> - <div class="panel-heading"> - <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key='ssm.overview.patches'/>"></i> - <bean:message key="ssm.overview.patches"/> - </div> - <div class="panel-body"> - <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> - <bean:message key="ssm.overview.patches.patches"/> - </div> - <div class="panel-heading"> - <i class="fa spacewalk-icon-patch-set fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i> - <bean:message key="ssm.overview.patch.clusters"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.patch.clusters.install"/> - </div> - </rhn:require> - <rhn:require acl="user_role(org_admin)"> - <div class="panel-heading"> - <i class="fa spacewalk-icon-system-groups fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i> - <bean:message key="ssm.overview.groups"/> - </div> - <div class="panel-body"> - <bean:message key="ssm.overview.groups.create"/> - </div> - </rhn:require> + </rhn:require> + <rhn:require acl="user_role(org_admin)"> <div class="panel-heading"> - <i class="fa spacewalk-icon-software-channels fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i> - <bean:message key="ssm.overview.channels"/> + <i class="fa spacewalk-icon-system-groups fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i> + <bean:message key="ssm.overview.groups"/> </div> <div class="panel-body"> - <ul> - <li><bean:message key="ssm.overview.channels.memberships"/></li> - <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> - <li><bean:message key="ssm.overview.channels.subscriptions"/></li> - <li><bean:message key="ssm.overview.channels.deploy"/></li> - </rhn:require> - </ul> + <bean:message key="ssm.overview.groups.create"/> </div> </rhn:require> + <div class="panel-heading"> + <i class="fa spacewalk-icon-software-channels fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i> + <bean:message key="ssm.overview.channels"/> + </div> + <div class="panel-body"> + <ul> + <li><bean:message key="ssm.overview.channels.memberships"/></li> + <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> + <li><bean:message key="ssm.overview.channels.subscriptions"/></li> + <li><bean:message key="ssm.overview.channels.deploy"/></li> + </rhn:require> + </ul> + </div> <rhn:require acl="org_entitlement(rhn_provisioning);"> <div class="panel-heading"> <i class="fa fa-rocket fa-fw" title="<bean:message key='ssm.overview.provisioning'/>"></i> @@ -86,10 +84,8 @@ <div class="panel-body"> <ul> <li><bean:message key="ssm.overview.provisioning.kickstart"/></li> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.provisioning.rollback"/></li> - <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> - </rhn:require> + <li><bean:message key="ssm.overview.provisioning.rollback"/></li> + <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> <li><bean:message key="ssm.overview.provisioning.powermanagement.configure"/></li> <li><bean:message key="ssm.overview.provisioning.powermanagement.operations"/></li> </ul> @@ -101,23 +97,17 @@ </div> <div class="panel-body"> <ul> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.misc.updateprofiles"/></li> - </rhn:require> - <rhn:require acl="org_entitlement(rhn_provisioning); no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.misc.updateprofiles"/></li> + <rhn:require acl="org_entitlement(rhn_provisioning)"> <li><bean:message key="ssm.overview.misc.customvalues"/></li> </rhn:require> - <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor); no_bootstrap_systems_in_set()"> + <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor)"> <li><bean:message key="ssm.overview.misc.entitlements"/></li> </rhn:require> <li><bean:message key="ssm.overview.misc.delete"/></li> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.misc.reboot"/></li> - </rhn:require> + <li><bean:message key="ssm.overview.misc.reboot"/></li> <li><bean:message key="ssm.overview.misc.migrate"/></li> - <rhn:require acl="no_bootstrap_systems_in_set()"> - <li><bean:message key="ssm.overview.misc.scap"/></li> - </rhn:require> + <li><bean:message key="ssm.overview.misc.scap"/></li> </ul> </div> </div> commit 04f4b08cddcbefff89831dfdc7b19530264d3fcc Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Dec 3 14:59:09 2013 +0100 Fix ListDisplayTagTest class after implementation changes diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java index 2b0e1e0..3aa37cf 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ListDisplayTagTest.java @@ -81,7 +81,7 @@ public class ListDisplayTagTest extends MockObjectTestCase { mcontext.expects(atLeastOnce()).method("popBody") .withNoArguments(); mcontext.expects(atLeastOnce()).method("pushBody") - .withNoArguments(); + .withAnyArguments(); mreq.expects(atLeastOnce()).method("getParameter") .with(eq(RequestContext.LIST_DISPLAY_EXPORT)).will(returnValue(null)); mreq.stubs().method("getParameter").with(eq(RequestContext.LIST_SORT)).will( @@ -131,7 +131,7 @@ public class ListDisplayTagTest extends MockObjectTestCase { mcontext.expects(atLeastOnce()).method("popBody"). withNoArguments(); mcontext.expects(atLeastOnce()).method("pushBody"). - withNoArguments(); + withAnyArguments(); mreq.expects(atLeastOnce()).method("getAttribute"). with(eq("requestedUri")).will(returnValue("/rhn/somePage.do")); mreq.expects(atLeastOnce()).method("getQueryString"). commit 857f8404f4e086085b1600121bfde0661316ad7c Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Dec 3 14:39:43 2013 +0100 bootstrap tuning: align th in ssm overview to right as it used to be diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index f52f16b..b68f7ec 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -724,5 +724,6 @@ ul.nav.nav-tabs:last-child { th { padding-left: 5px; padding-right: 10px; + text-align: right; } } commit 00a2e74a2a686a44f1c1935475bfa9206ba56fa0 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Dec 3 14:35:03 2013 +0100 Inconsistent tab vs. space 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 ecca1fa..7f8c33a 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 @@ -6,57 +6,57 @@ <c:when test="${requestScope.showPendingActions == 'true'}"> <form method="post" name="rhn_list" action="/YourRhn.do"> <rhn:list pageList="${requestScope.scheduledActionList}" - noDataText="${requestScope.scheduledActionEmpty}" - formatMessage="false"> - <rhn:listdisplay title="yourrhn.jsp.scheduledactions" - set="${requestScope.set}" - paging="false" - description="yourrhn.jsp.actions.description" - type="list"> + noDataText="${requestScope.scheduledActionEmpty}" + formatMessage="false"> + <rhn:listdisplay title="yourrhn.jsp.scheduledactions" + set="${requestScope.set}" + paging="false" + description="yourrhn.jsp.actions.description" + type="list"> <rhn:column header="schedulesync.jsp.action"> - <c:choose> - <c:when test="${current.actionStatusId == 0 || current.actionStatusId == 1}"> - <i class="fa fa-clock-o" title="<bean:message key='yourrhn.jsp.actions.pending'/>"></i> - </c:when> - <c:when test="${current.actionStatusId == 2}"> - <i class="fa fa-check-circle-o text-success" title="<bean:message key='yourrhn.jsp.actions.completed'/>"></i> - </c:when> - <c:when test="${current.actionStatusId == 3}"> - <i class="fa fa-times-circle-o text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i> - </c:when> - <c:otherwise> - <i class="spacewalk-icon-unknown-system" title="<bean:message key='yourrhn.jsp.actions.unknown'/>"></i> - </c:otherwise> - </c:choose> + <c:choose> + <c:when test="${current.actionStatusId == 0 || current.actionStatusId == 1}"> + <i class="fa fa-clock-o" title="<bean:message key='yourrhn.jsp.actions.pending'/>"></i> + </c:when> + <c:when test="${current.actionStatusId == 2}"> + <i class="fa fa-check-circle-o text-success" title="<bean:message key='yourrhn.jsp.actions.completed'/>"></i> + </c:when> + <c:when test="${current.actionStatusId == 3}"> + <i class="fa fa-times-circle-o text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i> + </c:when> + <c:otherwise> + <i class="spacewalk-icon-unknown-system" title="<bean:message key='yourrhn.jsp.actions.unknown'/>"></i> + </c:otherwise> + </c:choose> <a href="/rhn/schedule/ActionDetails.do?aid=${current.id}"><c:out value="${current.actionName}" /></a> </rhn:column> <rhn:column header="yourrhn.jsp.user" - style="text-align: center;"> + style="text-align: center;"> <c:choose> - <c:when test="${current.userName != ''}"> + <c:when test="${current.userName != ''}"> <i class="fa fa-user" title="<bean:message key='yourrhn.jsp.user.alt'/>"></i> - ${current.userName} + ${current.userName} </c:when> <c:otherwise> - <bean:message key="none.message"/> + <bean:message key="none.message"/> </c:otherwise> - </c:choose> + </c:choose> </rhn:column> <rhn:column header="yourrhn.jsp.age" - style="text-align: center;"> - ${current.ageString} + style="text-align: center;"> + ${current.ageString} </rhn:column> </rhn:listdisplay> <span class="full-width-note-right"> - <a href="/rhn/schedule/PendingActions.do"> - <bean:message key="yourrhn.jsp.allactions" /> - </a> + <a href="/rhn/schedule/PendingActions.do"> + <bean:message key="yourrhn.jsp.allactions" /> + </a> </span> </rhn:list> </form> commit fe8ada220de98e6a87b8e1e881a1912c50aecccd Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Dec 3 14:23:19 2013 +0100 bootstrap-tuning - inconsistent schedule icons on YourRhn.do vs. legend 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 f065739..b2ef929 100644 --- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp @@ -15,8 +15,8 @@ <li><i class="fa fa-rocket fa-1-5x"></i><bean:message key="system-legend.jsp.kickstarting" /></li> </rhn:require> <li><i class="fa fa-clock-o fa-1-5x"></i><bean:message key="system-legend.jsp.pending" /></li> - <li><i class="fa fa-times-circle-o fa-1-5x"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li> - <li><i class="fa fa-check-circle-o fa-1-5x"></i><bean:message key="yourrhn-legend.jsp.completedactions" /></li> + <li><i class="fa fa-times-circle-o fa-1-5x text-danger"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li> + <li><i class="fa fa-check-circle-o fa-1-5x text-success"></i><bean:message key="yourrhn-legend.jsp.completedactions" /></li> <rhn:require acl="show_monitoring();" mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler"> <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i><bean:message key="system-legend.jsp.monitoring" /></li> </rhn:require> 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 911beba..ecca1fa 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 @@ -20,10 +20,10 @@ <i class="fa fa-clock-o" title="<bean:message key='yourrhn.jsp.actions.pending'/>"></i> </c:when> <c:when test="${current.actionStatusId == 2}"> - <i class="fa fa-check text-success" title="<bean:message key='yourrhn.jsp.actions.completed'/>"></i> + <i class="fa fa-check-circle-o text-success" title="<bean:message key='yourrhn.jsp.actions.completed'/>"></i> </c:when> <c:when test="${current.actionStatusId == 3}"> - <i class="fa fa-times-circle text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i> + <i class="fa fa-times-circle-o text-danger" title="<bean:message key='yourrhn.jsp.actions.failed'/>"></i> </c:when> <c:otherwise> <i class="spacewalk-icon-unknown-system" title="<bean:message key='yourrhn.jsp.actions.unknown'/>"></i> commit 710fc3e241932960e32c0c51fe2572b8ed95affe Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Dec 3 14:30:14 2013 +0100 bootstrap tuning: style ssm overview table diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 5321d44..f52f16b 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -716,3 +716,13 @@ ul.nav.nav-tabs:last-child { } } } + +.ssm-overview { + td, th { + vertical-align: top; + } + th { + padding-left: 5px; + padding-right: 10px; + } +} commit 9e3684c1e88c592f9c805eaa3d885a03faa07078 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Dec 3 12:41:51 2013 +0100 Tag test checkstyle fixes diff --git a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java index 093a667..fb9d3ed 100644 --- a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java +++ b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java @@ -43,8 +43,8 @@ public class RendererTest extends RhnBaseTestCase { expectations.put("preNavLevel", "<ul class=\"nav nav-tabs\">"); expectations.put("preNavNode", ""); - expectations.put("navNodeActive", - "<li class=\"active\"><a href=\"http://rhn.redhat.com\">name</a></li>\n"); + expectations.put("navNodeActive", "<li class=\"active\">" + + "<a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("navNodeInactive", "<li><a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("postNavNode", ""); @@ -122,10 +122,11 @@ public class RendererTest extends RhnBaseTestCase { public void testTopnavTrue() { Map expectations = new HashMap(); - expectations.put("preNavLevel", "<ul class=\"nav navbar-nav collapse main-menu-hor\">"); + expectations.put("preNavLevel", "<ul class=\"nav navbar-nav " + + "collapse main-menu-hor\">"); expectations.put("preNavNode", ""); - expectations.put("navNodeActive", - "<li class=\"active\"><a href=\"http://rhn.redhat.com\">name</a></li>\n"); + expectations.put("navNodeActive", "<li class=\"active\">" + + "<a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("navNodeInactive", "<li><a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("postNavNode", ""); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index ac98784..6e5a1b5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@ -88,11 +88,12 @@ public class AddressTagTest extends RhnBaseTestCase { } private String getPopulatedReturnValue(HttpServletRequest req, Long uid) { - return "<div class=\"jumbotron\"><div class=\"container\"><h1>Mailing Address</h1>" + - "<p>444 Castro<br/>#1<br/>Mountain View, CA 94043</p>" + - "<p>Phone: 650-555-1212<br/>Fax: 650-555-1212</p><p>" + - "<a class=\"btn btn-success btn-lg\"href=\"/EditAddress.do?type=M&uid=" + uid + - "\">Edit this address</a></p></div></div>"; + return "<div class=\"jumbotron\"><div class=\"container\">" + + "<h1>Mailing Address</h1>" + + "<p>444 Castro<br/>#1<br/>Mountain View, CA 94043</p>" + + "<p>Phone: 650-555-1212<br/>Fax: 650-555-1212</p><p>" + + "<a class=\"btn btn-success btn-lg\"href=\"/EditAddress.do?" + + "type=M&uid=" + uid + "\">Edit this address</a></p></div></div>"; } private String getEmptyReturnValue(HttpServletRequest req, Long uid) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java index 0709a70..08b816d 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java @@ -38,8 +38,8 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + - "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div>" + - "<h1></h1></div>"; + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>" + + "clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "", "kickstart"); @@ -60,7 +60,8 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCreateAclMultipleMixinsMultipleAcls() throws Exception { String output = "<div class=\"spacewalk-toolbar-h1\">" + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + - "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>" + + "clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "first_true_acl(); second_true_acl(); is_foo(foo)", diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java index ae96661..e913903 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java @@ -59,7 +59,7 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreateAclMultipleMixinsMultipleAcls() throws Exception { String output = "<div class=\"spacewalk-toolbar-h1\">" + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + - "<i class=\"fa fa-plus\" title=\"create new user\">"+ + "<i class=\"fa fa-plus\" title=\"create new user\">" + "</i>create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java index 84b37dd..3a6e488 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java @@ -38,9 +38,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { try { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + - "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; - + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\">" + + "</i>delete user</a></div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "", "user"); @@ -69,8 +69,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { public void testCreateAclMultipleMixinsMultipleAcls() { try { String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + - "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a>" + + "</div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "first_true_acl(); second_true_acl(); is_foo(foo)", @@ -92,8 +93,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { public void testCreateAclMultipleAclsSingleMixin() { try { String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + - "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a>" + + "</div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "first_true_acl(); second_true_acl()", "user"); @@ -137,8 +139,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { try { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + - "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a>" + + "</div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "true_test()", "user"); commit e6889c281db7a56d3c88f69e06b6c3a3cadb2858 Author: Maximilian Meister <mmeister(a)suse.de> Date: Mon Dec 2 20:55:13 2013 +0100 Some indentation corrections as requested diff --git a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java index 84e6443..093a667 100644 --- a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java +++ b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java @@ -167,8 +167,8 @@ public class RendererTest extends RhnBaseTestCase { tr.navNodeInactive(buf, node2, null, null, 4); String expectation = "<li class=\"active\">" + - "<a href=\"/newlogin/index.pxt\">Sign In</a></li>\n" + - "<li><a href=\"/newlogin/index.pxt\">About</a></li>\n"; + "<a href=\"/newlogin/index.pxt\">Sign In</a></li>\n" + + "<li><a href=\"/newlogin/index.pxt\">About</a></li>\n"; assertEquals(expectation, buf.toString()); // test the case where inactive node runs first diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java index c30562e..7d6ff74 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java @@ -120,10 +120,10 @@ public class NavDialogMenuTagTest extends RhnBaseTestCase { private String getReturnValue() { return "<div class=\"spacewalk-content-nav\"><ul class=\"nav nav-tabs\">" + - "<li class=\"active\"><a href=\"/index.pxt\">Sign In</a></li>\n" + - "<li><a href=\"/help/about.pxt\">About</a></li>\n" + - "</ul>\n" + - "</div>\n"; + "<li class=\"active\"><a href=\"/index.pxt\">Sign In</a></li>\n" + + "<li><a href=\"/help/about.pxt\">About</a></li>\n" + + "</ul>\n" + + "</div>\n"; } public void testSetMaxdepth() { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java index 5db7e45..1ad1234 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java @@ -137,10 +137,10 @@ public class NavMenuTagTest extends RhnBaseTestCase { } private String getReturnValue() { - return "<ul class=\"nav navbar-nav collapse main-menu-hor\">" + - "<li class=\"active\"><a href=\"/index.pxt\">Sign In</a></li>\n" + - "<li><a href=\"/help/about.pxt\">About</a></li>\n" + - "</ul>"; + return "<ul class=\"nav navbar-nav collapse main-menu-hor\">" + + "<li class=\"active\"><a href=\"/index.pxt\">Sign In</a></li>\n" + + "<li><a href=\"/help/about.pxt\">About</a></li>\n" + + "</ul>"; } public void testSetMaxdepth() { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java index 46985c6..0709a70 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java @@ -37,9 +37,9 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneNoAcl() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + - "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div>" + - "<h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div>" + + "<h1></h1></div>"; setupCloneTag("h1", "Clone-url", "", "kickstart"); @@ -50,7 +50,7 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneWithMissingType() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "true_test()", ""); @@ -59,8 +59,8 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCreateAclMultipleMixinsMultipleAcls() throws Exception { String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + - "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "first_true_acl(); second_true_acl(); is_foo(foo)", @@ -74,8 +74,9 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCreateAclMultipleAclsSingleMixin() throws Exception { String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + - "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\">" + + "</i>clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "first_true_acl(); second_true_acl()", "kickstart"); @@ -109,8 +110,9 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneAcl() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + - "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>" + + "clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "true_test()", "kickstart"); @@ -120,10 +122,11 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneWithMissingUrl() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupCloneTag("h1", null, "true_test()", "kickstart"); verifyTag(output); } } + diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java index e855a02..ae96661 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java @@ -37,9 +37,9 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationNoAcl() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + - "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + - "create new user</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + + "create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "", "user"); @@ -49,18 +49,18 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationWithMissingType() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; - - setupCreationTag("h1", "creation-url", "true_test()", ""); + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; + + setupCreationTag("h1", "creation-url", "true_test()", ""); verifyTag(output); } public void testCreateAclMultipleMixinsMultipleAcls() throws Exception { String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + - "<i class=\"fa fa-plus\" title=\"create new user\">"+ - "</i>create new user</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\">"+ + "</i>create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "first_true_acl(); second_true_acl(); is_foo(foo)", @@ -74,9 +74,9 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreateAclMultipleAclsSingleMixin() throws Exception { String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + - "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + - "create new user</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + + "create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "first_true_acl(); second_true_acl()", "user"); @@ -110,9 +110,9 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationAcl() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + - "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + - "create new user</a></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + + "create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "true_test()", "user"); @@ -122,7 +122,7 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationWithMissingUrl() throws Exception { // setup mock objects String output = "<div class=\"spacewalk-toolbar-h1\">" + - "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupCreationTag("h1", null, "true_test()", "user"); commit 692993f0148e51d72c4e6b00b5f383482bbe5724 Author: Maximilian Meister <mmeister(a)suse.de> Date: Mon Dec 2 16:28:17 2013 +0100 Fixing expectation diff --git a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java index 2a7f7ac..84e6443 100644 --- a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java +++ b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java @@ -122,7 +122,7 @@ public class RendererTest extends RhnBaseTestCase { public void testTopnavTrue() { Map expectations = new HashMap(); - expectations.put("preNavLevel", "<ul class=\"nav navbar-nav\">"); + expectations.put("preNavLevel", "<ul class=\"nav navbar-nav collapse main-menu-hor\">"); expectations.put("preNavNode", ""); expectations.put("navNodeActive", "<li class=\"active\"><a href=\"http://rhn.redhat.com\">name</a></li>\n"); commit 86d9c5a40653f6edc6f876156465b3f0e29dc3f3 Author: Maximilian Meister <mmeister(a)suse.de> Date: Thu Nov 28 15:23:58 2013 +0100 Fixing a few JUnit Frontend Tests due to bootstrap UI changes diff --git a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java index 1c0fc74..2a7f7ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java +++ b/java/code/src/com/redhat/rhn/frontend/nav/test/RendererTest.java @@ -41,12 +41,10 @@ public class RendererTest extends RhnBaseTestCase { public void testDialognavTrue() { Map expectations = new HashMap(); expectations.put("preNavLevel", - "<ul class=\"content-nav-rowthree\">"); + "<ul class=\"nav nav-tabs\">"); expectations.put("preNavNode", ""); expectations.put("navNodeActive", - "<li class=\"content-nav-selected\"><a " + - "class=\"content-nav-selected-link\" " + - "href=\"http://rhn.redhat.com\">name</a></li>\n"); + "<li class=\"active\"><a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("navNodeInactive", "<li><a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("postNavNode", ""); @@ -57,15 +55,13 @@ public class RendererTest extends RhnBaseTestCase { rendererTest(new DialognavRenderer(), new TrueRenderGuard(), expectations, 4); // test depth 1 - expectations.put("preNavLevel", "<div class=\"contentnav-row2\">" + - "<div class=\"top\"></div><div class=\"bottom\">" + - "<ul class=\"content-nav-rowtwo\">"); - expectations.put("postNavLevel", "</ul>\n</div></div>"); + expectations.put("preNavLevel", "<ul class=\"nav nav-tabs\">"); + expectations.put("postNavLevel", "</ul>\n"); rendererTest(new DialognavRenderer(), new TrueRenderGuard(), expectations, 1); // test depth 0 expectations.put("preNavLevel", - "<ul class=\"content-nav-rowone\">"); + "<ul class=\"nav nav-tabs\">"); expectations.put("postNavLevel", "</ul>\n"); rendererTest(new DialognavRenderer(), new TrueRenderGuard(), expectations, 0); } @@ -126,12 +122,10 @@ public class RendererTest extends RhnBaseTestCase { public void testTopnavTrue() { Map expectations = new HashMap(); - expectations.put("preNavLevel", "<ul id=\"mainNav\">"); + expectations.put("preNavLevel", "<ul class=\"nav navbar-nav\">"); expectations.put("preNavNode", ""); expectations.put("navNodeActive", - "<li id=\"mainFirst-active\">" + - "<a href=\"http://rhn.redhat.com\" class=" + - "\"mainFirstLink\">name</a></li>\n"); + "<li class=\"active\"><a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("navNodeInactive", "<li><a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("postNavNode", ""); @@ -172,10 +166,9 @@ public class RendererTest extends RhnBaseTestCase { tr.navNodeActive(buf, node1, null, null, 4); tr.navNodeInactive(buf, node2, null, null, 4); - String expectation = "<li id=\"mainFirst-active\"><a href=\"" + - "/newlogin/index.pxt\" class=\"mainFirstLink\">" + - "Sign In</a></li>\n<li id=\"mainLast\"><a href=\"" + - "/newlogin/index.pxt\" class=\"mainLastLink\">About</a></li>\n"; + String expectation = "<li class=\"active\">" + + "<a href=\"/newlogin/index.pxt\">Sign In</a></li>\n" + + "<li><a href=\"/newlogin/index.pxt\">About</a></li>\n"; assertEquals(expectation, buf.toString()); // test the case where inactive node runs first @@ -183,12 +176,8 @@ public class RendererTest extends RhnBaseTestCase { tr.navNodeInactive(buf, node1, null, null, 4); tr.navNodeActive(buf, node2, null, null, 4); - String expectation2 = "<li id=\"mainFirst\">" + - "<a href=\"/newlogin/index.pxt\" class=\"mainFirstLink\">Sign In</a>" + - "</li>\n" + - "<li id=\"mainLast-active\"><a href=\"/newlogin/index.pxt\" " + - "class=\"mainLastLink\">About</a>" + - "</li>\n"; + String expectation2 = "<li><a href=\"/newlogin/index.pxt\">Sign In</a></li>\n" + + "<li class=\"active\"><a href=\"/newlogin/index.pxt\">About</a></li>\n"; assertEquals(expectation2, buf.toString()); } @@ -198,12 +187,12 @@ public class RendererTest extends RhnBaseTestCase { public void testSidenavTrue() { Map expectations = new HashMap(); - expectations.put("preNavLevel", "<ul>"); + expectations.put("preNavLevel", "<ul class=\"nav nav-pills nav-stacked\">"); expectations.put("preNavNode", ""); - expectations.put("navNodeActive", "<li class=\"sidenav-selected navparent\">" + + expectations.put("navNodeActive", "<li class=\"active\">" + "<a href=\"http://rhn.redhat.com\">name</a></li>\n"); expectations.put("navNodeInactive", - "<li class=\"navparent\"><a href=\"http://rhn.redhat.com\">" + + "<li><a href=\"http://rhn.redhat.com\">" + "name</a></li>\n"); expectations.put("postNavNode", ""); expectations.put("postNavLevel", "</ul>\n"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index ad94373..ac98784 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@ -88,16 +88,19 @@ public class AddressTagTest extends RhnBaseTestCase { } private String getPopulatedReturnValue(HttpServletRequest req, Long uid) { - return "<tr><th>Mailing Address</th><td><div>444 Castro<br/>" + - "#1<br/>Mountain View, CA 94043</div><div>Phone: 650-555-1212</div><div>Fax: " + - "650-555-1212</div><div><a href=\"/EditAddress.do?type=M&amp" + - ";uid=" + uid + "\">Edit this address</a></div></td></tr>"; + return "<div class=\"jumbotron\"><div class=\"container\"><h1>Mailing Address</h1>" + + "<p>444 Castro<br/>#1<br/>Mountain View, CA 94043</p>" + + "<p>Phone: 650-555-1212<br/>Fax: 650-555-1212</p><p>" + + "<a class=\"btn btn-success btn-lg\"href=\"/EditAddress.do?type=M&uid=" + uid + + "\">Edit this address</a></p></div></div>"; } private String getEmptyReturnValue(HttpServletRequest req, Long uid) { - return "<tr><th>Mailing Address</th><td><div><strong>Address " + - "not filled out</div></strong><a href=\"/EditAddress.do?" + - "type=M&uid=" + uid + "\">Add this address</a></td></tr>"; + return "<div class=\"jumbotron\"><div class=\"container\">" + + "<h1>Mailing Address</h1><div class=\"alert alert-info\">" + + "Address not filled out</div><p><a class=\"btn btn-success btn-lg\" " + + "href=\"/EditAddress.do?type=M&uid=" + uid + + "\">Add this address</a></p></div></div>"; } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java index bc0f0e3..c30562e 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavDialogMenuTagTest.java @@ -119,12 +119,11 @@ public class NavDialogMenuTagTest extends RhnBaseTestCase { } private String getReturnValue() { - return "<div class=\"content-nav\"><ul class=\"content-nav-rowone\">" + - "<li class=\"content-nav-selected\"><a class=\"" + - "content-nav-selected-link\" href=\"/index.pxt\">Sign In</a></li>\n" + - "<li><a href=\"/help/about.pxt\">About</a></li>\n" + - "</ul>\n" + - "</div>\n"; + return "<div class=\"spacewalk-content-nav\"><ul class=\"nav nav-tabs\">" + + "<li class=\"active\"><a href=\"/index.pxt\">Sign In</a></li>\n" + + "<li><a href=\"/help/about.pxt\">About</a></li>\n" + + "</ul>\n" + + "</div>\n"; } public void testSetMaxdepth() { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java index 7720676..5db7e45 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/NavMenuTagTest.java @@ -137,10 +137,10 @@ public class NavMenuTagTest extends RhnBaseTestCase { } private String getReturnValue() { - return "<ul id=\"mainNav\"><li id=\"mainFirst-active\"><a href=\"/index.pxt\" " + - "class=\"mainFirstLink\">Sign In</a>" + - "</li>\n<li id=\"mainLast\"><a href=\"/help/about.pxt\" " + - "class=\"mainLastLink\">About</a></li>\n</ul>"; + return "<ul class=\"nav navbar-nav collapse main-menu-hor\">" + + "<li class=\"active\"><a href=\"/index.pxt\">Sign In</a></li>\n" + + "<li><a href=\"/help/about.pxt\">About</a></li>\n" + + "</ul>"; } public void testSetMaxdepth() { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java index be09384..5405901 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java @@ -27,13 +27,16 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag { try { // setup mock objects - String output = "<div class=\"toolbar-h1\">" + - "<div class=\"toolbar\"></div>" + + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div>" + + "<h1>" + "<img src=\"/img/rhn-icon-preferences.gif\" alt=\"Home Icon\" />" + "<a href=\"/help/provisioning/" + - "s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS\" target=\"_new\" " + - "class=\"help-title\">" + - "<img src=\"/img/rhn-icon-help.gif\" alt=\"Help Icon\" /></a></div>"; + "s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS\" target=\"_new\">" + + "<span class=\"fa-stack\">" + + "<i class=\"fa fa-circle fa-stack-1x\"></i>" + + "<i class=\"fa fa-question fa-stack-1x fa-inverse\"></i>" + + "</span></a></h1></div>"; out.setExpectedData(output); tt.setBase("h1"); @@ -53,8 +56,8 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag { public void testNoImgUrl() { try { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\"><div class=\"" + + "spacewalk-toolbar\"></div><h1></h1></div>"; out.setExpectedData(output); tt.setBase("h1"); @@ -72,9 +75,9 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag { public void testImgUrl() { try { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div><img src=\"" + - "/img/rhn-icon-preferences.gif\" /></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\"><div class=\"" + + "spacewalk-toolbar\"></div><h1><img src=\"" + + "/img/rhn-icon-preferences.gif\" /></h1></div>"; out.setExpectedData(output); tt.setBase("h1"); @@ -108,9 +111,9 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag { try { // make sure we don't generate a messed up help url if // none was specified - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div><img src=\"" + - "/img/rhn-icon-preferences.gif\" /></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\"><div class=\"" + + "spacewalk-toolbar\"></div><h1><img src=\"" + + "/img/rhn-icon-preferences.gif\" /></h1></div>"; out.setExpectedData(output); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java index f610d05..46985c6 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCloneTest.java @@ -36,11 +36,10 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneNoAcl() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"Clone-url\">" + - "<img src=\"/img/action-clone.gif\" alt=\"clone kickstart\"" + - " title=\"clone kickstart\" />clone kickstart</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div>" + + "<h1></h1></div>"; setupCloneTag("h1", "Clone-url", "", "kickstart"); @@ -50,8 +49,8 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneWithMissingType() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "true_test()", ""); @@ -59,11 +58,9 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { } public void testCreateAclMultipleMixinsMultipleAcls() throws Exception { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"Clone-url\">" + - "<img src=\"/img/action-clone.gif\" alt=\"clone kickstart\"" + - " title=\"clone kickstart\" />clone kickstart</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "first_true_acl(); second_true_acl(); is_foo(foo)", @@ -76,11 +73,9 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { } public void testCreateAclMultipleAclsSingleMixin() throws Exception { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"Clone-url\">" + - "<img src=\"/img/action-clone.gif\" alt=\"clone kickstart\"" + - " title=\"clone kickstart\" />clone kickstart</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "first_true_acl(); second_true_acl()", "kickstart"); @@ -113,11 +108,9 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneAcl() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"Clone-url\">" + - "<img src=\"/img/action-clone.gif\" alt=\"clone kickstart\"" + - " title=\"clone kickstart\" />clone kickstart</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"Clone-url\">" + + "<i class=\"fa fa-files-o\" title=\"clone kickstart\"></i>clone kickstart</a></div><h1></h1></div>"; setupCloneTag("h1", "Clone-url", "true_test()", "kickstart"); @@ -126,8 +119,8 @@ public class ToolbarTagCloneTest extends BaseTestToolbarTag { public void testCloneWithMissingUrl() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupCloneTag("h1", null, "true_test()", "kickstart"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java index de1b532..e855a02 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagCreationTest.java @@ -36,12 +36,10 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationNoAcl() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"creation-url\">" + - "<img src=\"/img/action-add.gif\" alt=\"create new user\"" + - " title=\"create new user\" />create new user</a></span>" + - "</div></div>"; - + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + + "create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "", "user"); @@ -50,20 +48,19 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationWithMissingType() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; - - setupCreationTag("h1", "creation-url", "true_test()", ""); + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; + + setupCreationTag("h1", "creation-url", "true_test()", ""); verifyTag(output); } public void testCreateAclMultipleMixinsMultipleAcls() throws Exception { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"creation-url\">" + - "<img src=\"/img/action-add.gif\" alt=\"create new user\"" + - " title=\"create new user\" />create new user</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\">"+ + "</i>create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "first_true_acl(); second_true_acl(); is_foo(foo)", @@ -76,11 +73,10 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { } public void testCreateAclMultipleAclsSingleMixin() throws Exception { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"creation-url\">" + - "<img src=\"/img/action-add.gif\" alt=\"create new user\"" + - " title=\"create new user\" />create new user</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + + "create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "first_true_acl(); second_true_acl()", "user"); @@ -113,11 +109,10 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationAcl() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"creation-url\">" + - "<img src=\"/img/action-add.gif\" alt=\"create new user\"" + - " title=\"create new user\" />create new user</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"creation-url\">" + + "<i class=\"fa fa-plus\" title=\"create new user\"></i>" + + "create new user</a></div><h1></h1></div>"; setupCreationTag("h1", "creation-url", "true_test()", "user"); @@ -126,8 +121,8 @@ public class ToolbarTagCreationTest extends BaseTestToolbarTag { public void testCreationWithMissingUrl() throws Exception { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupCreationTag("h1", null, "true_test()", "user"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java index c5cea64..84b37dd 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java @@ -37,11 +37,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { public void testDeletionNoAcl() { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<i class=\"icon-trash\"" + - " title=\"delete user\" ></i>delete user</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "", "user"); @@ -56,8 +54,8 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { public void testDeletionWithMissingType() { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "true_test()", ""); @@ -70,11 +68,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { public void testCreateAclMultipleMixinsMultipleAcls() { try { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<i class=\"icon-trash\"" + - " title=\"delete user\" ></i>delete user</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "first_true_acl(); second_true_acl(); is_foo(foo)", @@ -95,11 +91,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { public void testCreateAclMultipleAclsSingleMixin() { try { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<i class=\"icon-trash\"" + - " title=\"delete user\" ></i>delete user</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "first_true_acl(); second_true_acl()", "user"); @@ -142,11 +136,9 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"deletion-url\">" + - "<i class=\"icon-trash\"" + - " title=\"delete user\" ></i>delete user</a></span>" + - "</div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"deletion-url\">" + + "<i class=\"fa fa-trash-o\" title=\"delete user\"></i>delete user</a></div><h1></h1></div>"; setupDeletionTag("h1", "deletion-url", "true_test()", "user"); @@ -160,8 +152,8 @@ public class ToolbarTagDeletionTest extends BaseTestToolbarTag { public void testDeletionWithMissingUrl() { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupDeletionTag("h1", null, "true_test()", "user"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagMiscTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagMiscTest.java index ec078a0..44c6db4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagMiscTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagMiscTest.java @@ -40,10 +40,10 @@ public class ToolbarTagMiscTest extends BaseTestToolbarTag { public void testMiscNoAcl() { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"misc-url\">" + - "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + - "ignore me</a></span></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"misc-url\">" + + "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + + "ignore me</a></div><h1></h1></div>"; setupMiscTag("h1", "misc-url", "", "jsp.testMessage", "jsp.testMessage", "foo.gif"); @@ -58,8 +58,8 @@ public class ToolbarTagMiscTest extends BaseTestToolbarTag { public void testMiscWithMissingText() { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupMiscTag("h1", "misc-url", "true_test()", "alt", "", "foo.gif"); @@ -73,10 +73,10 @@ public class ToolbarTagMiscTest extends BaseTestToolbarTag { public void testCreateAclMultipleMixinsMultipleAcls() { try { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"misc-url\">" + - "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + - "ignore me</a></span></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"misc-url\">" + + "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + + "ignore me</a></div><h1></h1></div>"; setupMiscTag("h1", "misc-url", "first_true_acl(); second_true_acl(); is_foo(foo)", @@ -97,10 +97,10 @@ public class ToolbarTagMiscTest extends BaseTestToolbarTag { public void testCreateAclMultipleAclsSingleMixin() { try { - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"misc-url\">" + - "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + - "ignore me</a></span></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"misc-url\">" + + "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + + "ignore me</a></div><h1></h1></div>"; setupMiscTag("h1", "misc-url", "first_true_acl(); second_true_acl()", "jsp.testMessage", @@ -144,10 +144,10 @@ public class ToolbarTagMiscTest extends BaseTestToolbarTag { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"><span class=\"toolbar\"><a href=\"misc-url\">" + - "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + - "ignore me</a></span></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"><a href=\"misc-url\">" + + "<img src=\"/img/foo.gif\" alt=\"ignore me\" title=\"ignore me\" />" + + "ignore me</a></div><h1></h1></div>"; setupMiscTag("h1", "misc-url", "true_test()", "jsp.testMessage", "jsp.testMessage", "foo.gif"); @@ -162,8 +162,8 @@ public class ToolbarTagMiscTest extends BaseTestToolbarTag { public void testMiscWithMissingUrl() { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupMiscTag("h1", null, "true_test()", "alt", "text", "foo.gif"); @@ -178,8 +178,8 @@ public class ToolbarTagMiscTest extends BaseTestToolbarTag { public void testMiscWithMissingImg() { try { // setup mock objects - String output = "<div class=\"toolbar-h1\"><div class=\"" + - "toolbar\"></div></div>"; + String output = "<div class=\"spacewalk-toolbar-h1\">" + + "<div class=\"spacewalk-toolbar\"></div><h1></h1></div>"; setupMiscTag("h1", "misc-url", "true_test()", "alt", "text", null); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java index 0e87628..f7f3e04 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java @@ -153,14 +153,20 @@ public class UnpagedListDisplayTagTest extends MockObjectTestCase { } private static final String EXPECTED_HTML_OUT = - "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" " + - "class=\"list\"><thead>\n" + - "<tr></tbody></table>\n"; + "<div class=\"spacewalk-list\"><div class=\"panel panel-default\">" + + "<table class=\"table table-striped\"></tbody></table>\n" + + "</div>\n" + + "</div>\n"; + private static final String EXPECTED_HTML_OUT_WITH_TITLE = - "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" " + - "class=\"list\"><thead><tr><th>**Inactive " + - "Systems**</th></tr>\n<tr></tbody></table>\n"; + "<div class=\"spacewalk-list\"><div class=\"panel panel-default\">" + + "<div class=\"panel-heading\"><h4 class=\"panel-title\">**Inactive Systems**</h4>" + + "<div class=\"spacewalk-list-head-addons\">" + + "<div class=\"spacewalk-list-head-addons-extra\"></div>" + + "</div></div><table class=\"table table-striped\"></tbody></table>\n" + + "</div>\n" + + "</div>\n"; private static final String EXPECTED_CSV_OUT = "**column1**,**column2**,**column3**\n" + commit 63df5e7ca7c17f29d7e2a69644c3ffa35ca3a224 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Dec 2 11:44:51 2013 +0100 fixed the class .glow-text-deleted diff --git a/branding/css/spacewalk-mixins.less b/branding/css/spacewalk-mixins.less index 4815b19..8524dc2 100644 --- a/branding/css/spacewalk-mixins.less +++ b/branding/css/spacewalk-mixins.less @@ -34,7 +34,7 @@ text-shadow: 1px 1px 1px #fff; } .glow-text-deleted { - text-shadow: 0 transparent; + text-shadow: 0 0 0 transparent; } .shadow-text { text-shadow: 1px 1px 1px #333; commit ec3e9388205171963dfc10bda93644dbab3583d8 Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Mon Nov 11 18:22:15 2013 +0100 less: More colours defined as variables Conflicts: branding/css/spacewalk-variables.less diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 4963cac..5321d44 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -351,7 +351,11 @@ aside .nav > li > a { } #sidenav { a { - color: #666; + color: @spacewalk-aside-menu-hyperlink; + .glow-text; + } + a:hover { + color: @spacewalk-aside-menu-hyperlink-hover; .glow-text; } a:before { @@ -375,6 +379,9 @@ aside .nav > li > a { -webkit-box-shadow: 0px 1px 1px #fefefe; box-shadow: 0px 1px 1px #fefefe; } + ul li:hover, ul li a:hover { + background: @spacewalk-list-menu-hover; + } /* ul-submenues */ /* first submenu */ @@ -395,7 +402,7 @@ aside .nav > li > a { background: @spacewalk-list-first-submenu-hover; } ul>ul li:last-child { - border-bottom: 1px solid #c6c6c6; + border-bottom: 1px solid @spacewalk-list-first-submenu-last-line; } /* second submenu */ ul>ul>ul li { diff --git a/branding/css/spacewalk-variables.less b/branding/css/spacewalk-variables.less index 7dddc50..c2ad458 100644 --- a/branding/css/spacewalk-variables.less +++ b/branding/css/spacewalk-variables.less @@ -8,7 +8,17 @@ @gray-light: lighten(#000, 80%); // #999 @gray-lighter: lighten(#000, 95%); // #eee -@spacewalk-blue: #00aad4; + +/* Colours (or img backgrounds) for Spacewalk */ +@spacewalk-blue: #00aad4; +@spacewalk-header: url('../../img/spacewalk-header-background.png') repeat-x @gray; +@spacewalk-footer: @gray-dark; +@spacewalk-aside: #eeeeee; + +// Colours for the menu in the first column on the left: +@spacewalk-aside-border: darken(@spacewalk-aside, 10%); +@spacewalk-aside-menu-hyperlink: #666; +@spacewalk-aside-menu-hyperlink-hover: #555; @state-success-text: #7ac142; @state-info-text: #4ea1ee; @@ -21,7 +31,8 @@ @spacewalk-list-menu-hover: lighten(@spacewalk-list-menu, 2%); @spacewalk-list-first-submenu: darken(@spacewalk-list-menu, 8%); @spacewalk-list-first-submenu-active: lighten(@spacewalk-list-first-submenu, 6%); -@spacewalk-list-first-submenu-hover: lighten(@spacewalk-list-first-submenu, 2%);//#f3f3f3 +@spacewalk-list-first-submenu-hover: lighten(@spacewalk-list-first-submenu, 2%); +@spacewalk-list-first-submenu-last-line: darken(@spacewalk-list-first-submenu, 8%); @spacewalk-list-second-submenu: darken(@spacewalk-list-first-submenu, 5%); @spacewalk-list-second-submenu-active: lighten(@spacewalk-list-second-submenu, 6%); @spacewalk-list-second-submenu-hover: lighten(@spacewalk-list-second-submenu, 2%); commit 82b5ccf777c48dfd44a5ce0db4dd7cef476879bd Author: Cynthia Sanchez <csanchez(a)suse.com> Date: Tue Nov 12 13:56:13 2013 +0100 changes for Icon legend in the theme diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 204afac..4963cac 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -308,8 +308,9 @@ header { /* Icons Legend */ aside .sideleg { - background: lighten(@gray-lighter, 10%); + background: @spacewalk-icon-legend; width: 90%; + color: @spacewalk-icon-legend-text; padding: .5em 1em; border-radius: 4px; margin: 2em auto; @@ -414,7 +415,7 @@ aside .nav > li > a { background: @spacewalk-list-second-submenu-hover; } ul>ul>ul li:last-child { - border-bottom: 1px solid #c4c4c4; + border-bottom: 1px solid @spacewalk-list-second-submenu-last-line; } } diff --git a/branding/css/spacewalk-variables.less b/branding/css/spacewalk-variables.less index 6445b31..7dddc50 100644 --- a/branding/css/spacewalk-variables.less +++ b/branding/css/spacewalk-variables.less @@ -25,6 +25,11 @@ @spacewalk-list-second-submenu: darken(@spacewalk-list-first-submenu, 5%); @spacewalk-list-second-submenu-active: lighten(@spacewalk-list-second-submenu, 6%); @spacewalk-list-second-submenu-hover: lighten(@spacewalk-list-second-submenu, 2%); +@spacewalk-list-second-submenu-last-line: darken(@spacewalk-list-second-submenu, 8%); + +//Icons legend: +@spacewalk-icon-legend: lighten(@spacewalk-aside, 10%); +@spacewalk-icon-legend-text: @text-color; /* Roboto variable: font variable to be applied in different text elements*/ @roboto-light: 'Roboto Light', sans-serif; commit 655b67293cc7f50818316dcc703d6f2bc939ee2b Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Nov 29 15:34:37 2013 +0100 Move the formFocus() function into spacewalk-essentials.js This makes that function available everywhere instead of on the login screen only. diff --git a/web/html/javascript/spacewalk-essentials.js b/web/html/javascript/spacewalk-essentials.js index 88f7209..220e7b4 100644 --- a/web/html/javascript/spacewalk-essentials.js +++ b/web/html/javascript/spacewalk-essentials.js @@ -105,4 +105,13 @@ $(document).on("ready", function() { } }); }); -}); \ No newline at end of file +}); + +// Put the focus on a given form element +function formFocus(form, name) { + var focusControl = document.forms[form].elements[name]; + if (focusControl.type != "hidden" && !focusControl.disabled) { + focusControl.focus(); + } +} + diff --git a/web/html/javascript/spacewalk-login.js b/web/html/javascript/spacewalk-login.js index 9593d63..b4b9545 100644 --- a/web/html/javascript/spacewalk-login.js +++ b/web/html/javascript/spacewalk-login.js @@ -7,11 +7,3 @@ $(document).on("ready", function() { formFocus('loginForm', 'username'); }); -// Put focus on a form element -function formFocus(form, name) { - var focusControl = document.forms[form].elements[name]; - if (focusControl.type != "hidden" && !focusControl.disabled) { - focusControl.focus(); - } -} - commit 4d7aadb42e14c5962f4247b937a2a5bf8ad2a8ce Author: Silvio Moioli <smoioli(a)suse.de> Date: Thu Nov 28 13:08:46 2013 +0100 ListDisplayTag: delete image-related POST parameters 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 f79e865..a54b0a9 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -814,12 +814,6 @@ public class ListDisplayTag extends ListDisplayTagBase { Set result = new HashSet(); for (int i = 0; i < keys.length; i++) { result.add(keys[i]); - //add the .x & .y's becasue these are image files - //so certain browsers may add the .x & .y's - result.add(keys[i] + ".x"); - result.add(keys[i] + ".X"); - result.add(keys[i] + ".y"); - result.add(keys[i] + ".Y"); } return Collections.unmodifiableSet(result); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java index a90dc26..fb005ff 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java @@ -279,7 +279,7 @@ public class DataSetManipulator { for (int x = 0; x < LINK_PREFIXES.length; x++) { String imgLink = "list_" + uniqueName + "_page" + - LINK_PREFIXES[x] + ".x"; + LINK_PREFIXES[x]; if (request.getParameter(imgLink) != null) { return "list_" + uniqueName + "_page" + LINK_PREFIXES[x]; commit 860a7089119ca2bed029a157bd6ad7feccafbacc Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 27 15:54:59 2013 +0100 /rhn/systems/customdata/DeleteCustomKey.do?cikid=1 style form diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index 29876a6..fbfd9e1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -12,28 +12,19 @@ </rhn:toolbar> <form action="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}" name="edit_token" method="post"> - <rhn:csrf /> - <table class="details"> - <tr> - <th><bean:message key="system.jsp.customkey.keylabel"/>:</th> - <td><input disabled="true" type="text" name="label" length="64" size="30" value="<c:out value="${label}" />"/> - </td> - </tr> - - <tr> - <th><bean:message key="system.jsp.customkey.description"/>:</th> - <td> - <textarea disabled="true" wrap="virtual" rows="6" cols="50" name="description"><c:out value="${description}" /></textarea> - </td> - </tr> - </table> + <rhn:csrf /> + <div class="form-group"> + <label for="customkey-label"><bean:message key="system.jsp.customkey.keylabel"/>:</label> + <input class="form-control" disabled="true" type="text" id="customkey-label" name="label" length="64" value="<c:out value='${label}' />"/> + </div> + <div class="form-group"> + <label for="customkey-desc"><bean:message key="system.jsp.customkey.description"/>:</label> + <textarea class="form-control" id="customkey-desc" disabled="true" wrap="virtual" rows="6" name="description"><c:out value="${description}" /></textarea> + </div> <div class="text-right"> - <hr /> - - <input type="submit" name="DeleteKey" value="Delete Key" /> - - <rhn:submitted/> + <button class="btn btn-primary" type="submit" name="DeleteKey" value="Delete Key">Delete Key</button> + <rhn:submitted/> </div> </form> </body> commit 097de63a8c56a95666fd6982fd2e6a12b8fb6ac3 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 27 15:26:47 2013 +0100 /rhn/systems/customdata/DeleteCustomKey.do use rhn:toolbar instead of handwriten html diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp index 668f9c6..29876a6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp @@ -6,26 +6,10 @@ <html:html > <body> -<br> - -<div> - - <div class="spacewalk-toolbar-h1"> - <div class="spacewalk-toolbar"></div> - <i class="fa fa-key" title=""></i> + <rhn:toolbar base="h1" icon="fa-key" + helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info"> <bean:message key="system.jsp.customkey.deletetitle"/> - - <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" - target="_new" class="help-title"> - <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span> - </a> - </div> - - <div class="page-summary"> - <p><bean:message key="system.jsp.customkey.deletemsg"/></p> - </div> - - <hr /> + </rhn:toolbar> <form action="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}" name="edit_token" method="post"> <rhn:csrf /> @@ -52,8 +36,5 @@ <rhn:submitted/> </div> </form> - - </div> - </body> </html:html> commit 16ebad1f6cac0fe47533254157b6da4e6f67e715 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 27 15:05:29 2013 +0100 /rhn/systems/customdata/UpdateCustomKey.do Use rhn:toolbar instead of custom html 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 12b1562..d5e9872 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 @@ -19120,6 +19120,9 @@ given channel.</source> <trans-unit id="toolbar.create.customkey"> <source>create new key</source> </trans-unit> + <trans-unit id="toolbar.delete.customkey"> + <source>delete key</source> + </trans-unit> <trans-unit id="system.jsp.customkey.createtitle"> <source>Create Custom Info Key</source> </trans-unit> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp index c509a0c..e775985 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp @@ -6,20 +6,12 @@ <html:html > <body> - <div class="spacewalk-toolbar-h1"> - <div class="spacewalk-toolbar"> - <span class="spacewalk-toolbar"> - <a href="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}"> - <i class="fa fa-trash-o" title="delete key"></i>delete key</a> - </span> - </div> - <i class="fa fa-key" title=""></i> + <rhn:toolbar base="h1" icon="fa-key" + helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" + deletionUrl="/rhn/systems/customdata/DeleteCustomKey.do?cikid=${cikid}" + deletionType="customkey"> <bean:message key="system.jsp.customkey.updatetitle"/> - - <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" target="_blank" class="help-title"> - <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span> - </a> - </div> + </rhn:toolbar> <div class="page-summary"> <p><bean:message key="system.jsp.customkey.updatemsg"/></p> commit b73d1b2cf1cf72c176c03efe7766ecc07759ad87 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 27 14:49:41 2013 +0100 /rhn/systems/customdata/CustomDataList.do use rhn:toolbar instead of custom html 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 89d6ce6..12b1562 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 @@ -19117,6 +19117,9 @@ given channel.</source> <trans-unit id="system.jsp.customkey.createlink"> <source>create new key</source> </trans-unit> + <trans-unit id="toolbar.create.customkey"> + <source>create new key</source> + </trans-unit> <trans-unit id="system.jsp.customkey.createtitle"> <source>Create Custom Info Key</source> </trans-unit> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp index 489a14e..d8c5fac 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp @@ -7,27 +7,16 @@ <html:html > <body> -<BR> + <rhn:toolbar base="h1" icon="fa-key" + creationUrl="/rhn/systems/customdata/CreateCustomKey.do" + creationType="customkey"> + <bean:message key="system.jsp.customkey.title"/> + </rhn:toolbar> + <p><bean:message key="system.jsp.customkey.message" arg0="<a href=\"/rhn/systems/Search.do\">" arg1="</a>"/></p> - -<div> - - <div class="spacewalk-toolbar-h1"><div class="spacewalk-toolbar"> - <span class="spacewalk-toolbar"> - <a href="/rhn/systems/customdata/CreateCustomKey.do"> - <i class="fa fa-plus-circle text-success" title="create new key"></i> - <bean:message key="system.jsp.customkey.createlink"/> - </a> - </span> - </div><i class="fa fa-key" title="keyring"></i> - <bean:message key="system.jsp.customkey.title"/> -</div> - - <bean:message key="system.jsp.customkey.message" arg0="<a href=\"/rhn/systems/Search.do\">" arg1="</a>"/> - <br><br> - <bean:message key="system.jsp.customkey.message2"/> + <p><bean:message key="system.jsp.customkey.message2"/></p> <rl:listset name="keySet"> @@ -88,7 +77,5 @@ </rl:listset> -</div> - </body> </html:html> commit 1259a6a544d99cab50c024c56ac6ed039bd285d0 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 27 12:04:22 2013 +0100 Use the toolbar jsp tag to get the right html/styles diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp index a7e639f..adbead4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp @@ -6,54 +6,48 @@ <html:html> <body> - <div> - <div class="spacewalk-toolbar-h1"> - <div class="spacewalk-toolbar"></div> - <i class="fa fa-key" title=""></i> - <h2><bean:message key="system.jsp.customkey.createtitle"/></h2> - <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info" - target="_blank" class="help-title"> - <span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span> - </a> - </div> - <p> - <bean:message key="system.jsp.customkey.createmsg"/> - </p> - <form action="/rhn/systems/customdata/CreateCustomKey.do" - class="form-horizontal" - name="edit_token" method="post"> - <rhn:csrf /> - <div class="form-group"> - <label class="col-lg-3 control-label"> - <bean:message key="system.jsp.customkey.keylabel"/>: - </label> - <div class="col-lg-6"> - <input type="text" name="label" - length="64" size="30" class="form-control" - value="<c:out value="${old_label}" />"/> - </div> + <rhn:toolbar base="h1" icon="fa-key" + helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info"> + <bean:message key="system.jsp.customkey.createtitle"/> + </rhn:toolbar> + + <p> + <bean:message key="system.jsp.customkey.createmsg"/> + </p> + <form action="/rhn/systems/customdata/CreateCustomKey.do" + class="form-horizontal" + name="edit_token" method="post"> + <rhn:csrf /> + <div class="form-group"> + <label class="col-lg-3 control-label"> + <bean:message key="system.jsp.customkey.keylabel"/>: + </label> + <div class="col-lg-6"> + <input type="text" name="label" + length="64" size="30" class="form-control" + value="<c:out value="${old_label}" />"/> </div> - <div class="form-group"> - <label class="col-lg-3 control-label" for="descr"> - <bean:message key="system.jsp.customkey.description"/>: - </label> - <div class="col-lg-6"> - <textarea id="descr" wrap="virtual" rows="6" cols="50" - class="form-control" - name="description"><c:out value="${old_description}" /></textarea> - </div> + </div> + <div class="form-group"> + <label class="col-lg-3 control-label" for="descr"> + <bean:message key="system.jsp.customkey.description"/>: + </label> + <div class="col-lg-6"> + <textarea id="descr" wrap="virtual" rows="6" cols="50" + class="form-control" + name="description"><c:out value="${old_description}" /></textarea> </div> - <div class="form-group"> - <div class="col-lg-offset-3 col-lg-6"> - <button type="submit" class="btn btn-success" - name="CreateKey" - value="Create Key" /> - <bean:message key="keycreate.jsp.submit" /> - </button> - <rhn:submitted/> - </div> + </div> + <div class="form-group"> + <div class="col-lg-offset-3 col-lg-6"> + <button type="submit" class="btn btn-success" + name="CreateKey" + value="Create Key" /> + <bean:message key="keycreate.jsp.submit" /> + </button> + <rhn:submitted/> </div> - </form> - </div> + </div> + </form> </body> </html:html> commit ba3c731c3ecc1b0df8664aea000c30f2ba711441 Author: Michael Calmer <mc(a)suse.de> Date: Wed Nov 27 12:29:28 2013 +0100 import missing taglib diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf index f9bc8a5..50cb098 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf @@ -1,3 +1,4 @@ +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <div class="form-group"> commit a390157ea142e86a4fa8080c671a21323d2678f2 Author: Michael Calmer <mc(a)suse.de> Date: Wed Nov 27 12:16:37 2013 +0100 fix tooltip diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf index 55b10f6..f9bc8a5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf @@ -15,10 +15,10 @@ <div class="form-group"> <div class="col-lg-offset-3 col-lg-6"> <div class="btn-group"> - <button type="button" title="ssm.config.rank.jsp.up" class="btn btn-default" value="up" name="dispatch" onclick="return move_selected_up('ranksWidget');"> + <button type="button" title="${rhn:localize('ssm.config.rank.jsp.up')}" class="btn btn-default" value="up" name="dispatch" onclick="return move_selected_up('ranksWidget');"> <i class="fa fa-arrow-circle-up"></i> </button> - <button type="button" title="ssm.config.rank.jsp.down" class="btn btn-default" value="down" name="dispatch" onclick="return move_selected_down('ranksWidget');"> + <button type="button" title="${rhn:localize('ssm.config.rank.jsp.down')}" class="btn btn-default" value="down" name="dispatch" onclick="return move_selected_down('ranksWidget');"> <i class="fa fa-arrow-circle-down"></i> </button> </div> commit 542939be9510406a8ffc8ec954936cb6003fadc7 Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Nov 27 11:52:22 2013 +0100 Re-add the 'name' attribute to form diff --git a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp index 5568381..bfdfb87 100644 --- a/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/system-remote-command.jsp @@ -16,7 +16,7 @@ <h4><bean:message key="ssm.overview.provisioning.remotecommand.header" arg0="${system.name}"/></h4> </div> <div class="panel-body"> - <form action="/rhn/systems/details/SystemRemoteCommand.do" method="post" class="form-horizontal" role="form"> + <form name="remoteCommandForm" action="/rhn/systems/details/SystemRemoteCommand.do" method="post" class="form-horizontal" role="form"> <rhn:csrf /> <div class="form-group"> <label class="col-lg-3 control-label" for="fUidInput"> commit 106e2a9a138561be3f6aace5f1c49e9f69fdd4bc Author: Johannes Renner <jrenner(a)suse.de> Date: Wed Nov 27 11:49:09 2013 +0100 Optionally show a legal note on login/relogin diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/webapp/WEB-INF/pages/common/login.jsp index 286e40d..e13ca8b 100644 --- a/java/code/webapp/WEB-INF/pages/common/login.jsp +++ b/java/code/webapp/WEB-INF/pages/common/login.jsp @@ -39,6 +39,13 @@ <p><bean:message key="login.jsp.satbody3"/></p> </div> </c:if> + + <c:set var="legal_note" scope="page" value="${rhn:getConfig('java.legal_note')}" /> + <c:if test="${! empty legal_note}"> + <p class="legal-note"> + <small><c:out value="${legal_note}" escapeXml="false" /></small> + </p> + </c:if> </div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/webapp/WEB-INF/pages/common/relogin.jsp index a1a904f..3398046 100644 --- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp +++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp @@ -28,6 +28,13 @@ <html:hidden property="url_bounce" /> <html:hidden property="request_method" /> </html:form> + + <c:set var="legal_note" scope="page" value="${rhn:getConfig('java.legal_note')}" /> + <c:if test="${! empty legal_note}"> + <p class="legal-note"> + <small><c:out value="${legal_note}" escapeXml="false" /></small> + </p> + </c:if> </div> </c:if> </rhn:require> diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf index d603442..4048893 100644 --- a/java/conf/rhn_java.conf +++ b/java/conf/rhn_java.conf @@ -54,6 +54,10 @@ java.custom_footer = # (join long lines with \, HTML is okay to use) java.login_banner = +# legal note to be displayed on the login page +# (join long lines with \, HTML is okay to use) +java.legal_note = + # default values for system currency multipliers # needed by spacewalk-report for system currency report commit cbbc6fbdfe20f7366680f7089f7c8ce3ab8d31b3 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 27 09:41:16 2013 +0100 fix a non-reinitialized variable in release() 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 64bc57f..05c04d1 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 @@ -934,6 +934,7 @@ public class ListTag extends BodyTagSupport { haveColHeadersRendered = false; haveTblAddonsRendered = false; haveTblFootersRendered = false; + haveTblHeadingRendered = false; getDecorators().clear(); decorators = null; decoratorName = null; commit df1e9ea6af32688add6f0cdb6793860eb16f3c4f Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Nov 27 09:40:51 2013 +0100 Decorators are specified in the body so the decorators we output in doStartTag will never be shown. Also one has to have extra care that decorators are only added during the ENUMERATE command, so we move the output of the beginning of the list to this state. 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 ee03aa9..64bc57f 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 @@ -734,6 +734,24 @@ public class ListTag extends BodyTagSupport { return BodyTagSupport.SKIP_BODY; } + private void doAfterBodyRenderListBegin() throws JspException { + ListTagUtil.write(pageContext, ""); + + String listId = (getStyleId() != null) ? getStyleId() : getUniqueName(); + + for (ListDecorator dec : getDecorators()) { + dec.beforeList(); + } + + ListTagUtil.write(pageContext, "<div class=\"spacewalk-list"); + if (styleClass != null) { + ListTagUtil.write(pageContext, " " + styleClass); + } + ListTagUtil.write(pageContext, "\" id=\"" + listId + "\">"); + ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), + ListCommand.TBL_HEADING); + } + /** * ${@inheritDoc} */ @@ -750,8 +768,7 @@ public class ListTag extends BodyTagSupport { setState(); if (haveColsEnumerated && !haveTblHeadingRendered) { - ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.TBL_HEADING); + doAfterBodyRenderListBegin(); } else if (haveColsEnumerated && !haveTblAddonsRendered) { doAfterBodyRenderTopAddons(); @@ -829,22 +846,8 @@ public class ListTag extends BodyTagSupport { manip = new DataSetManipulator(pageSize, pageData, (HttpServletRequest) pageContext.getRequest(), getUniqueName(), isParentAnElement(), searchParent, searchChild); - - ListTagUtil.write(pageContext, ""); - - String listId = (getStyleId() != null) ? getStyleId() : getUniqueName(); ListTagUtil.setCurrentCommand(pageContext, getUniqueName(), - ListCommand.ENUMERATE); - - for (ListDecorator dec : getDecorators()) { - dec.beforeList(); - } - - ListTagUtil.write(pageContext, "<div class=\"spacewalk-list"); - if (styleClass != null) { - ListTagUtil.write(pageContext, " " + styleClass); - } - ListTagUtil.write(pageContext, "\" id=\"" + listId + "\">"); + ListCommand.ENUMERATE); return BodyTagSupport.EVAL_BODY_INCLUDE; } commit ee4be7a71dee59b43b61845a3c890fc08b0951db Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Nov 26 15:37:48 2013 +0100 DataSetManipulator: backward/forward icons fixed diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java index 2aee70e..a90dc26 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java @@ -65,10 +65,10 @@ public class DataSetManipulator { private final boolean searchChild; private String defaultSortAttribute; - private static final String ICON_FIRST = "fa-fast-backward"; - private static final String ICON_PREV = "fa-backward"; - private static final String ICON_NEXT = "fa-forward"; - private static final String ICON_LAST = "fa-fast-forward"; + private static final String ICON_FIRST = "fa fa-fast-backward"; + private static final String ICON_PREV = "fa fa-backward"; + private static final String ICON_NEXT = "fa fa-forward"; + private static final String ICON_LAST = "fa fa-fast-forward"; /** commit d9560d3c86067cae067d072c13fa295f9760ccfd Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Nov 26 15:10:57 2013 +0100 Do not rely on form IDs, as <html:form> does not output them Now that the XHTML mode has been switched off, Struts' <html:form> tags will output the name attribute instead of the id attribute in <form> tags. Javascript code has been adapted accordingly. diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp index 376ff7b..c19a181 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp @@ -15,36 +15,41 @@ function swapValues(fromCtlId, toCtlId) { } function moveNext() { - var form = document.getElementById("kickstartCreateWizardForm"); + var form = $("form[name='kickstartCreateWizardForm']"); swapValues("wizard-nextstep", "wizard-curstep"); form.submit(); } function refresh() { - var form = document.getElementById("kickstartCreateWizardForm"); + var form = $("form[name='kickstartCreateWizardForm']"); form.submit(); } function toggleKSTree(what) { - var form = document.getElementById("kickstartCreateWizardForm"); + var form = $("form[name='kickstartCreateWizardForm']"); + var select = form.find("select[name='kstreeId']"); if(what.checked) { - form.kstreeId.disabled=1; + select.prop("disabled", "disabled"); } else { - form.kstreeId.disabled=0; + select.prop("disabled", false); } } function clickNewestRHTree() { - var form = document.getElementById("kickstartCreateWizardForm"); - if(form.useNewestRHTree.checked) { - form.useNewestTree.checked = false; + var form = $("form[name='kickstartCreateWizardForm']"); + var treeCheckbox = form.find("input[name='useNewestTree']") + var rhTreeCheckbox = form.find("input[name='useNewestRHTree']") + if(rhTreeCheckbox.is(':checked')) { + treeCheckbox.attr('checked', false); } } function clickNewestTree() { - var form = document.getElementById("kickstartCreateWizardForm"); - if(form.useNewestTree.checked) { - form.useNewestRHTree.checked = false; + var form = $("form[name='kickstartCreateWizardForm']"); + var treeCheckbox = form.find("input[name='useNewestTree']") + var rhTreeCheckbox = form.find("input[name='useNewestRHTree']") + if(treeCheckbox.is(':checked')) { + rhTreeCheckbox.attr('checked', false); } } </script> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp index f265b13..a17a601 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp @@ -32,13 +32,13 @@ function swapValues(fromCtlId, toCtlId) { } function moveNext() { - var form = document.getElementById("kickstartCreateWizardForm"); + var form = $("form[name='kickstartCreateWizardForm']"); swapValues("wizard-nextstep", "wizard-curstep"); form.submit(); } function movePrevious() { - var form = document.getElementById("kickstartCreateWizardForm"); + var form = $("form[name='kickstartCreateWizardForm']"); swapValues("wizard-prevstep", "wizard-curstep"); form.submit(); } diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp index 8f6b024..bfa2b87 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp @@ -16,13 +16,13 @@ function swapValues(fromCtlId, toCtlId) { } function moveNext() { - var form = document.getElementById("kickstartCreateWizardForm"); + var form = $("form[name='kickstartCreateWizardForm']"); swapValues("wizard-nextstep", "wizard-curstep"); form.submit(); } function movePrevious() { - var form = document.getElementById("kickstartCreateWizardForm"); + var form = $("form[name='kickstartCreateWizardForm']"); swapValues("wizard-prevstep", "wizard-curstep"); form.submit(); } commit 90109dc145d993502151b95af6f4d3cfcc5028a6 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Nov 26 11:24:25 2013 +0100 Set the current list for decorators as they are added in addDecorator() Even if counter-intuitive, some decorators like ElaboratorDecorator do side effects when setCurrentList is called, so we can't call it "just to be sure". On the other hand, decorators are added at different points, one as an attribute to the list tag, others after the columns therefore there is no clear place where to set the current list, why not do it when they are about to be added. 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 2f66cb9..ee03aa9 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 @@ -141,6 +141,7 @@ public class ListTag extends BodyTagSupport { ListDecorator dec = getDecorator(decName); if (dec != null) { getDecorators().add(dec); + dec.setCurrentList(this); } } @@ -420,7 +421,6 @@ public class ListTag extends BodyTagSupport { // here decorators should insert other e.g hidden input fields for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.afterList(); } @@ -449,7 +449,6 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(topPaginationContent); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.beforeTopPagination(); } } @@ -459,7 +458,6 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(topAddonsContent); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.onTopExtraAddons(); } } @@ -503,7 +501,6 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(headAddons); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.onHeadExtraAddons(); } } @@ -520,7 +517,6 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(headExtraContent); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.onHeadExtraContent(); } } @@ -645,9 +641,7 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(footAddonsContent); if (!manip.isListEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.onFooterExtraAddons(); - dec.setCurrentList(null); } } pageContext.popBody(); @@ -655,9 +649,7 @@ public class ListTag extends BodyTagSupport { pageContext.pushBody(footExtraContent); if (!manip.isListEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.onFooterExtraContent(); - dec.setCurrentList(null); } } pageContext.popBody(); @@ -722,7 +714,6 @@ public class ListTag extends BodyTagSupport { "<div class=\"spacewalk-list-bottom-addons-extra\">"); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.onBottomExtraAddons(); } } @@ -732,7 +723,6 @@ public class ListTag extends BodyTagSupport { "<div class=\"spacewalk-list-bottom-addons-extra\">"); if (!isEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.onBottomExtraContent(); } } @@ -847,7 +837,6 @@ public class ListTag extends BodyTagSupport { ListCommand.ENUMERATE); for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.beforeList(); } @@ -1040,9 +1029,7 @@ public class ListTag extends BodyTagSupport { if (!manip.isListEmpty()) { for (ListDecorator dec : getDecorators()) { - dec.setCurrentList(this); dec.afterBottomPagination(); - dec.setCurrentList(null); } } commit 6cd97c2c4b37524f55e08eec9f9a87784aa54215 Author: Silvio Moioli <smoioli(a)suse.de> Date: Tue Nov 26 07:46:16 2013 +0100 ssm/index.do: Font Awesome icon replaced diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp index 1204f28..d3f75ec 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp @@ -4,113 +4,123 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> - <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> <h2><bean:message key="ssm.overview.header"/></h2> - -<table class="ssm-overview" align="center"> <div class="page-summary"> - <p><bean:message key="ssm.overview.summary"/></p> - <p><bean:message key="ssm.overview.summary2"/></p> + <ul><bean:message key="ssm.overview.summary"/></ul> + <ul><bean:message key="ssm.overview.summary2"/></ul> </div> - <tr> - <td><i class="fa fa-desktop fa-2x fa-fw" title="<bean:message key='ssm.overview.systems' />"></i></td> - <th><b><bean:message key="ssm.overview.systems"/>:</b></th> - <td><bean:message key="ssm.overview.systems.list"/></td> - </tr> - - <tr> - <td><i class="fa spacewalk-icon-patches fa-2x fa-fw" title="Errata"></i></td> - <th><b><bean:message key="ssm.overview.errata"/>:</b></th> - <td><bean:message key="ssm.overview.errata.schedule"/></td> - </tr> - - <tr> - <td><i class="fa spacewalk-icon-packages fa-2x fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i></td> - <th><b><bean:message key="ssm.overview.packages"/>:</b></th> - <td><bean:message key="ssm.overview.packages.upgrade"/></td> - </tr> - -<rhn:require acl="is(enable_solaris_support)"> - <tr> - <td><i class="fa spacewalk-icon-patches" title="<bean:message key='ssm.overview.patches'/>"></i></td> - <th><bean:message key="ssm.overview.patches"/>:</th> - <td> -<a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> - <bean:message key="ssm.overview.patches.patches"/><br /> - </td> - </tr> - - <tr> - <td><i class="fa spacewalk-icon-patch-set fa-2x fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i></td> - <th><bean:message key="ssm.overview.patch.clusters"/>:</th> - <td> <bean:message key="ssm.overview.patch.clusters.install"/><br /> - </td> - </tr> -</rhn:require> - -<rhn:require acl="user_role(org_admin)"> - <tr> - <td><i class="fa spacewalk-icon-system-groups fa-2x fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i></td> - <th><b><bean:message key="ssm.overview.groups"/>:</b></th> - <td><bean:message key="ssm.overview.groups.create"/></td> - </tr> -</rhn:require> - - <tr> - <td><i class="fa spacewalk-icon-software-channels fa-2x fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i></td> - <th><b><bean:message key="ssm.overview.channels"/>:</b></th> - <td> - <p> - <bean:message key="ssm.overview.channels.memberships"/> - <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> - <br /> - <bean:message key="ssm.overview.channels.subscriptions"/><br /> - <bean:message key="ssm.overview.channels.deploy"/><br /> - </rhn:require> - </p> - </td> - </tr> - -<rhn:require acl="org_entitlement(rhn_provisioning)"> - <tr> - <td><i class="fa fa-rocket fa-2x fa-fw" title="<bean:message key='ssm.overview.provisioning'/>"></i></td> - <th><b><bean:message key="ssm.overview.provisioning"/>:</b></th> - <td> - <p> - <bean:message key="ssm.overview.provisioning.kickstart"/><br /> - <bean:message key="ssm.overview.provisioning.rollback"/><br /> - <bean:message key="ssm.overview.provisioning.remotecommands"/><br /> - </p> - </td> - </tr> -</rhn:require> - - <tr> - <td><i class="fa fa-suitcase fa-2x fa-fw" title="<bean:message key='ssm.overview.misc'/>"></i></td> - <th><b><bean:message key="ssm.overview.misc"/>:</b></th> - <td> - <p> - <bean:message key="ssm.overview.misc.updateprofiles"/><br /> - <rhn:require acl="org_entitlement(rhn_provisioning)"> - <bean:message key="ssm.overview.misc.customvalues"/><br /> - </rhn:require> - <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor)"> - <bean:message key="ssm.overview.misc.entitlements"/><br /> - </rhn:require> - <bean:message key="ssm.overview.misc.deletereboot"/><br /> - <bean:message key="ssm.overview.misc.migrate"/><br /> - <bean:message key="ssm.overview.misc.scap"/><br /> - </p> - </td> - </tr> - -</table> +<div class="panel panel-default"> + <div class="panel-heading"> + <i class="fa fa-desktop fa-fw" title="<bean:message key="ssm.overview.systems" />"></i> + <bean:message key="ssm.overview.systems"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.systems.list"/> + </div> + <rhn:require acl="no_bootstrap_systems_in_set()"> + <div class="panel-heading"> + <i class="fa spacewalk-icon-patches fa-fw" title="Errata"></i> + <bean:message key="ssm.overview.errata"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.errata.schedule"/> + </div> + <div class="panel-heading"> + <i class="fa spacewalk-icon-packages fa-fw" title="<bean:message key='ssm.overview.packages'/>"></i> + <bean:message key="ssm.overview.packages"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.packages.upgrade"/> + </div> + <rhn:require acl="is(enable_solaris_support)"> + <div class="panel-heading"> + <i class="fa spacewalk-icon-patches fa-fw" title="<bean:message key='ssm.overview.patches'/>"></i> + <bean:message key="ssm.overview.patches"/> + </div> + <div class="panel-body"> + <a href="/network/systems/ssm/patches/install.pxt"><bean:message key="ssm.overview.patches.install"/></a> / <a href="/network/systems/ssm/patches/remove.pxt"><bean:message key="ssm.overview.patches.remove"/></a> + <bean:message key="ssm.overview.patches.patches"/> + </div> + <div class="panel-heading"> + <i class="fa spacewalk-icon-patch-set fa-fw" title="<bean:message key='ssm.overview.patch.clusters'/>"></i> + <bean:message key="ssm.overview.patch.clusters"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.patch.clusters.install"/> + </div> + </rhn:require> + <rhn:require acl="user_role(org_admin)"> + <div class="panel-heading"> + <i class="fa spacewalk-icon-system-groups fa-fw" title="<bean:message key='ssm.overview.groups'/>"></i> + <bean:message key="ssm.overview.groups"/> + </div> + <div class="panel-body"> + <bean:message key="ssm.overview.groups.create"/> + </div> + </rhn:require> + <div class="panel-heading"> + <i class="fa spacewalk-icon-software-channels fa-fw" title="<bean:message key='ssm.overview.channels'/>"></i> + <bean:message key="ssm.overview.channels"/> + </div> + <div class="panel-body"> + <ul> + <li><bean:message key="ssm.overview.channels.memberships"/></li> + <rhn:require acl="org_entitlement(rhn_provisioning); user_role(config_admin)"> + <li><bean:message key="ssm.overview.channels.subscriptions"/></li> + <li><bean:message key="ssm.overview.channels.deploy"/></li> + </rhn:require> + </ul> + </div> + </rhn:require> + <rhn:require acl="org_entitlement(rhn_provisioning);"> + <div class="panel-heading"> + <i class="fa fa-rocket fa-fw" title="<bean:message key='ssm.overview.provisioning'/>"></i> + <bean:message key="ssm.overview.provisioning"/> + </div> + <div class="panel-body"> + <ul> + <li><bean:message key="ssm.overview.provisioning.kickstart"/></li> + <rhn:require acl="no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.provisioning.rollback"/></li> + <li><bean:message key="ssm.overview.provisioning.remotecommands"/></li> + </rhn:require> + <li><bean:message key="ssm.overview.provisioning.powermanagement.configure"/></li> + <li><bean:message key="ssm.overview.provisioning.powermanagement.operations"/></li> + </ul> + </div> + </rhn:require> + <div class="panel-heading"> + <i class="fa fa-suitcase fa-fw" title="<bean:message key='ssm.overview.misc'/>"></i> + <bean:message key="ssm.overview.misc"/> + </div> + <div class="panel-body"> + <ul> + <rhn:require acl="no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.misc.updateprofiles"/></li> + </rhn:require> + <rhn:require acl="org_entitlement(rhn_provisioning); no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.misc.customvalues"/></li> + </rhn:require> + <rhn:require acl="user_role(org_admin);org_entitlement(rhn_provisioning) or org_entitlement(rhn_monitor); no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.misc.entitlements"/></li> + </rhn:require> + <li><bean:message key="ssm.overview.misc.delete"/></li> + <rhn:require acl="no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.misc.reboot"/></li> + </rhn:require> + <li><bean:message key="ssm.overview.misc.migrate"/></li> + <rhn:require acl="no_bootstrap_systems_in_set()"> + <li><bean:message key="ssm.overview.misc.scap"/></li> + </rhn:require> + </ul> + </div> +</div> </body> </html> commit 8720ab78f177161961a375767f7653e1410aab83 Author: Michael Calmer <mc(a)suse.de> Date: Mon Nov 25 17:04:24 2013 +0100 Use translated welcome message diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/webapp/WEB-INF/pages/common/login.jsp index fed4c61..286e40d 100644 --- a/java/code/webapp/WEB-INF/pages/common/login.jsp +++ b/java/code/webapp/WEB-INF/pages/common/login.jsp @@ -23,7 +23,7 @@ <p><c:out value="${login_banner}" escapeXml="false" /></p> </c:when> <c:otherwise> - <h1>Welcome to Spacewalk</h1> + <h1><bean:message key="login.jsp.welcomemessage" /></h1> <p><bean:message key="login.jsp.satbody1" /></p> </c:otherwise> </c:choose> commit e1a9f2e7312c391005991871e69e7ca2f81227ee Author: Silvio Moioli <smoioli(a)suse.de> Date: Fri Nov 22 12:50:50 2013 +0100 Acl check restored diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf index ff1e211..38d5c43 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf @@ -6,18 +6,20 @@ -<c:choose> - <c:when test="${!inSSM}"> - <c:set var="actionLink" value="/rhn/systems/details/AddToSSM.do?sid=${system.id}"/> - <c:set var="actionMessage" value="toolbar.ssm.add"/> - <c:set var="actionIcon" value="fa-plus-circle"/> - </c:when> - <c:otherwise> - <c:set var="actionLink" value="/rhn/systems/details/RemoveFromSSM.do?sid=${system.id}"/> - <c:set var="actionMessage" value="toolbar.ssm.remove"/> - <c:set var="actionIcon" value="fa-times-circle-o"/> - </c:otherwise> -</c:choose> +<rhn:require acl="system_has_management_entitlement()"> + <c:choose> + <c:when test="${!inSSM}"> + <c:set var="actionLink" value="/rhn/systems/details/AddToSSM.do?sid=${system.id}"/> + <c:set var="actionMessage" value="toolbar.ssm.add"/> + <c:set var="actionIcon" value="fa-plus-circle"/> + </c:when> + <c:otherwise> + <c:set var="actionLink" value="/rhn/systems/details/RemoveFromSSM.do?sid=${system.id}"/> + <c:set var="actionMessage" value="toolbar.ssm.remove"/> + <c:set var="actionIcon" value="fa-times-circle-o"/> + </c:otherwise> + </c:choose> +</rhn:require> <c:choose> <c:when test="${system.virtualGuest}"> commit 0d1af366e1ac21df2acb54f7341f335400398deb Author: Silvio Moioli <smoioli(a)suse.de> Date: Fri Nov 22 11:55:45 2013 +0100 Header system deletion link fixed diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf index 97b5aef..ff1e211 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf @@ -35,7 +35,7 @@ icon="${systemIcon}" miscUrl="${actionLink}" miscIcon="${actionIcon}" miscText="${actionMessage}" miscAcl="system_has_management_entitlement()" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-details" - deletionUrl="/rhn/systems/details/RemoveFromSSM.do?sid=${system.id}" + deletionUrl="/rhn/systems/details/DeleteConfirm.do?sid=${system.id}" deletionType="system"> <c:if test="${empty system}"> <decorator:getProperty property="meta.name" /> commit 096df6fb7b63fc6c3f79c6e7850a6313f9bf190e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 13:24:58 2013 +0100 Automatic commit of package [spacewalk-branding] release [2.1.11-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index bf0b257..48a2bce 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.10 +Version: 2.1.11 Release: 1%{?dist} Summary: Spacewalk branding data @@ -82,6 +82,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1 +- bootstrap tuning + * Fri Nov 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1 - bootstrap tuning: make non-link text in header more visible - bootstrap tuning - style submit buttons diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 4b3ee60..41a0d0e 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.10-1 branding/ +2.1.11-1 branding/ commit 70ee924721306f3c7d84a4fc1db5eb949da7f3c3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 13:24:44 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.87-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 8fc8e29..dd7c245 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.86 +Version: 2.1.87 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.87-1 +- bootstrap tuning +- enable setting nobase and ignoremissing for + kickstart.profile.setAdvancedOptions API + * Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.86-1 - bootstrap tuning - Add a missing translation string: system.entitle.guestcantvirt diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index bee0b75..26b6f20 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.86-1 java/ +2.1.87-1 java/ commit 4f1e5c26e6977fef0a51316d5d30b0e5663ab794 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 13:24:21 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.36-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 781a0b4..6f1826f 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.35-1 web/ +2.1.36-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index b8ad33e..13aaaf4 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.35 +Version: 2.1.36 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Tue Dec 03 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.36-1 +- bootstrap tuning: fixed doubled item separator + * Mon Dec 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.35-1 - bootstrap tuning commit 08c9c78500676f88fe7001acd58832dddbc1f1cc Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 13:20:25 2013 +0100 bootstrap tuning: fixed user/site/search icons in pxt header diff --git a/branding/templates/c.pxt b/branding/templates/c.pxt index 5e742a9..c1a89cc 100644 --- a/branding/templates/c.pxt +++ b/branding/templates/c.pxt @@ -35,16 +35,16 @@ <rhn-display-login> <ul class="nav nav-pills"> <li> - <a href="/rhn/account/UserDetails.do"><i class="icon-user"></i>[login]</a> + <a href="/rhn/account/UserDetails.do"><i class="fa fa-user"></i>[login]</a> </li> - <li> - <a><i class="icon-sitemap"></i>[org]</a> + <li class="hidden-sm hidden-xs hidden-md"> + <span class="spacewalk-header-non-link"><i class="fa fa-sitemap"></i>[org]</span> </li> <li> - <a href="/rhn/account/UserPreferences.do"><i class="icon-cogs"></i></a> + <a href="/rhn/account/UserPreferences.do"><i class="fa fa-cogs"></i></a> </li> <li> - <a href="/rhn/Logout.do"><i class="icon-signout"></i></a> + <a href="/rhn/Logout.do"><i class="fa fa-sign-out"></i></a> </li> </ul> </rhn-display-login> @@ -66,7 +66,7 @@ <div class="form-group"> <input type="hidden" name="submitted" value="true" /> <button type="submit" class="btn btn-info input-sm"> - <i class="icon-search"></i> + <i class="fa fa-search"></i> </button> </div> </form> commit 352e4e92a814de5b9fcf4ab4655ad9511d019ac0 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 13:05:11 2013 +0100 bootstrap tuning: fixed typo diff --git a/java/buildconf/apidoc/jsp/handler.txt b/java/buildconf/apidoc/jsp/handler.txt index c688a60..dce144a 100644 --- a/java/buildconf/apidoc/jsp/handler.txt +++ b/java/buildconf/apidoc/jsp/handler.txt @@ -14,7 +14,7 @@ ul.apidoc { </head> <body> <div class="spacewalk-toolbar-h1"> -<h1><i class="fa fa-gears"><i>API Overview:<h1> +<h1><i class="fa fa-gears"></i>API Overview:<h1> $handler.desc <br /> commit d1200e8117eb900aa1633721f71f6f8ad76369e6 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 12:23:07 2013 +0100 bootstrap tuning: remove redundant link in title diff --git a/java/buildconf/apidoc/jsp/api_index_hdr.txt b/java/buildconf/apidoc/jsp/api_index_hdr.txt index 6df0ab0..95be359 100644 --- a/java/buildconf/apidoc/jsp/api_index_hdr.txt +++ b/java/buildconf/apidoc/jsp/api_index_hdr.txt @@ -9,7 +9,7 @@ ul.apidoc { </head> <body> -<h1><i class="fa fa-gears"><a href="/rhn/apidoc/index.jsp">API Overview</a></h1> +<h1><i class="fa fa-gears"></i>API Overview</h1> Welcome to the Red Hat Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <h2>Namespaces</h2> <ul class="apidoc"> diff --git a/java/buildconf/apidoc/jsp/faqs.txt b/java/buildconf/apidoc/jsp/faqs.txt index d3b05ee..7d44199 100644 --- a/java/buildconf/apidoc/jsp/faqs.txt +++ b/java/buildconf/apidoc/jsp/faqs.txt @@ -9,7 +9,7 @@ ul.apidoc { </head> <body> -<h1><i class="fa fa-gears"><a href="/rhn/apidoc/faqs.jsp">Frequently Asked Questions</a></h1> +<h1><i class="fa fa-gears"></i>Frequently Asked Questions</h1> <p /> <ul> <dt>What programming languages are supported by the Satellite's api?</dt> diff --git a/java/buildconf/apidoc/jsp/handler.txt b/java/buildconf/apidoc/jsp/handler.txt index ce1cbe2..c688a60 100644 --- a/java/buildconf/apidoc/jsp/handler.txt +++ b/java/buildconf/apidoc/jsp/handler.txt @@ -14,7 +14,7 @@ ul.apidoc { </head> <body> <div class="spacewalk-toolbar-h1"> -<i class="fa fa-gears"> <a href="/rhn/apidoc/index.jsp">API Overview</a>: +<h1><i class="fa fa-gears"><i>API Overview:<h1> $handler.desc <br /> diff --git a/java/buildconf/apidoc/jsp/scripts.txt b/java/buildconf/apidoc/jsp/scripts.txt index 93aa9b7..cd2f533 100644 --- a/java/buildconf/apidoc/jsp/scripts.txt +++ b/java/buildconf/apidoc/jsp/scripts.txt @@ -9,7 +9,7 @@ ul.apidoc { </head> <body> -<h1><i class="fa fa-gears"><a href="/rhn/apidoc/scripts.jsp">Sample Scripts</a></h1> +<h1><i class="fa fa-gears"></i>Sample Scripts</h1> <h2>Sample Scripts</h2> <h3>Perl example:</h3><BR> This Perl example shows the system.listUserSystems call being used to get a list of systems a user has access to. In the example below, the name of each system will be printed. commit 1a4b309479661a9e9a642ef83ed3080d63bb9e7f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 11:14:36 2013 +0100 bootstrap tuning: replaced API img with icon diff --git a/java/buildconf/apidoc/html/api_index_hdr.txt b/java/buildconf/apidoc/html/api_index_hdr.txt index 09a4685..46d400e 100644 --- a/java/buildconf/apidoc/html/api_index_hdr.txt +++ b/java/buildconf/apidoc/html/api_index_hdr.txt @@ -4,7 +4,7 @@ </head> <body> -<h3><img src="../img/rhn-icon-api.gif" /><a href="index.html">API Overview</a></h3> +<h3><i class="fa fa-gears"><a href="index.html">API Overview</a></h3> Welcome to the Red Hat Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <a href="faqs.html">Faqs</a> and <a href="scripts.html">example scripts</a> are available. <h2>Namespaces</h2> <ul class="apidoc"> diff --git a/java/buildconf/apidoc/html/faqs.txt b/java/buildconf/apidoc/html/faqs.txt index 6d2661d..f90e502 100644 --- a/java/buildconf/apidoc/html/faqs.txt +++ b/java/buildconf/apidoc/html/faqs.txt @@ -4,7 +4,7 @@ </head> <body> -<h1><img src="../img/rhn-icon-api.gif" alt="application program interface" /><a href="faqs.html">Frequently Asked Questions</a></h1> +<h1><i class="fa fa-gears"><a href="faqs.html">Frequently Asked Questions</a></h1> <p /> <ul> <dt>What programming languages are supported by the Satellite's api?</dt> diff --git a/java/buildconf/apidoc/html/scripts.txt b/java/buildconf/apidoc/html/scripts.txt index 3e49594..7c60b57 100644 --- a/java/buildconf/apidoc/html/scripts.txt +++ b/java/buildconf/apidoc/html/scripts.txt @@ -4,7 +4,7 @@ </head> <body> -<h1><img src="./img/rhn-icon-api.gif" alt="application program interface" /><a href="../scripts.html">Sample Scripts</a></h1> +<h1><i class="fa fa-gears"><a href="../scripts.html">Sample Scripts</a></h1> <h2>Sample Scripts</h2> <h3>Perl example:</h3><BR> This Perl example shows the system.listUserSystems call being used to get a list of systems a user has access to. In the example below, the name of each system will be printed. diff --git a/java/buildconf/apidoc/jsp/api_index_hdr.txt b/java/buildconf/apidoc/jsp/api_index_hdr.txt index eb0cd09..6df0ab0 100644 --- a/java/buildconf/apidoc/jsp/api_index_hdr.txt +++ b/java/buildconf/apidoc/jsp/api_index_hdr.txt @@ -9,7 +9,7 @@ ul.apidoc { </head> <body> -<h1><img src="/img/rhn-icon-api.gif" alt="application program interface" /><a href="/rhn/apidoc/index.jsp">API Overview</a></h1> +<h1><i class="fa fa-gears"><a href="/rhn/apidoc/index.jsp">API Overview</a></h1> Welcome to the Red Hat Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <h2>Namespaces</h2> <ul class="apidoc"> diff --git a/java/buildconf/apidoc/jsp/faqs.txt b/java/buildconf/apidoc/jsp/faqs.txt index c7eb780..d3b05ee 100644 --- a/java/buildconf/apidoc/jsp/faqs.txt +++ b/java/buildconf/apidoc/jsp/faqs.txt @@ -9,7 +9,7 @@ ul.apidoc { </head> <body> -<h1><img src="/img/rhn-icon-api.gif" alt="application program interface" /><a href="/rhn/apidoc/faqs.jsp">Frequently Asked Questions</a></h1> +<h1><i class="fa fa-gears"><a href="/rhn/apidoc/faqs.jsp">Frequently Asked Questions</a></h1> <p /> <ul> <dt>What programming languages are supported by the Satellite's api?</dt> diff --git a/java/buildconf/apidoc/jsp/handler.txt b/java/buildconf/apidoc/jsp/handler.txt index d86e9d1..ce1cbe2 100644 --- a/java/buildconf/apidoc/jsp/handler.txt +++ b/java/buildconf/apidoc/jsp/handler.txt @@ -14,7 +14,7 @@ ul.apidoc { </head> <body> <div class="spacewalk-toolbar-h1"> -<img src="/img/rhn-icon-api.gif" alt="application program interface" /> <a href="/rhn/apidoc/index.jsp">API Overview</a>: +<i class="fa fa-gears"> <a href="/rhn/apidoc/index.jsp">API Overview</a>: $handler.desc <br /> diff --git a/java/buildconf/apidoc/jsp/scripts.txt b/java/buildconf/apidoc/jsp/scripts.txt index 72d4d24..93aa9b7 100644 --- a/java/buildconf/apidoc/jsp/scripts.txt +++ b/java/buildconf/apidoc/jsp/scripts.txt @@ -9,7 +9,7 @@ ul.apidoc { </head> <body> -<h1><img src="/img/rhn-icon-api.gif" alt="application program interface" /><a href="/rhn/apidoc/scripts.jsp">Sample Scripts</a></h1> +<h1><i class="fa fa-gears"><a href="/rhn/apidoc/scripts.jsp">Sample Scripts</a></h1> <h2>Sample Scripts</h2> <h3>Perl example:</h3><BR> This Perl example shows the system.listUserSystems call being used to get a list of systems a user has access to. In the example below, the name of each system will be printed. diff --git a/java/buildconf/apidoc/singlepage/api_index_hdr.txt b/java/buildconf/apidoc/singlepage/api_index_hdr.txt index 09a4685..46d400e 100644 --- a/java/buildconf/apidoc/singlepage/api_index_hdr.txt +++ b/java/buildconf/apidoc/singlepage/api_index_hdr.txt @@ -4,7 +4,7 @@ </head> <body> -<h3><img src="../img/rhn-icon-api.gif" /><a href="index.html">API Overview</a></h3> +<h3><i class="fa fa-gears"><a href="index.html">API Overview</a></h3> Welcome to the Red Hat Satellite API. By using the included API calls, you can more easily automate many of the tasks you perform everyday. All API calls are grouped by common functionality. <a href="faqs.html">Faqs</a> and <a href="scripts.html">example scripts</a> are available. <h2>Namespaces</h2> <ul class="apidoc"> diff --git a/java/buildconf/apidoc/singlepage/faqs.txt b/java/buildconf/apidoc/singlepage/faqs.txt index 6d2661d..f90e502 100644 --- a/java/buildconf/apidoc/singlepage/faqs.txt +++ b/java/buildconf/apidoc/singlepage/faqs.txt @@ -4,7 +4,7 @@ </head> <body> -<h1><img src="../img/rhn-icon-api.gif" alt="application program interface" /><a href="faqs.html">Frequently Asked Questions</a></h1> +<h1><i class="fa fa-gears"><a href="faqs.html">Frequently Asked Questions</a></h1> <p /> <ul> <dt>What programming languages are supported by the Satellite's api?</dt> diff --git a/java/buildconf/apidoc/singlepage/scripts.txt b/java/buildconf/apidoc/singlepage/scripts.txt index caca1ce..7f8d8d2 100644 --- a/java/buildconf/apidoc/singlepage/scripts.txt +++ b/java/buildconf/apidoc/singlepage/scripts.txt @@ -4,7 +4,7 @@ </head> <body> -<h1><img src="./img/rhn-icon-api.gif" alt="application program interface" /><a href="../scripts.html">Sample Scripts</a></h1> +<h1><i class="fa fa-gears"><a href="../scripts.html">Sample Scripts</a></h1> <h2>Sample Scripts</h2> <h3>Perl example:</h3><BR> This Perl example shows the system.listUserSystems call being used to get a list of systems a user has access to. In the example below, the name of each system will be printed. commit a7408d0577427069ec31db58fb42881db30f980b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 3 09:48:41 2013 +0100 bootstrap tuning: fixed doubled item separator diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 7d662a0..28f9b29 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -125,7 +125,7 @@ sub toolbar { push @toolbar, deletion_link($pxt, (url => $params{'deletion-url'}, type => $params{'deletion-type'}) ); } - my $toolbar = join(" | ", @toolbar); + my $toolbar = join("", @toolbar); return qq{<div class="spacewalk-toolbar-$base"><div class="spacewalk-toolbar">$toolbar</div><$base>$img $icon $params{__block__}$help</$base></div>}; }

1 0

java/code
by mkollar 06 Dec '13

06 Dec '13

java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 8 +- java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 14 +-- java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 18 ++-- java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 6 - java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 4 - java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 8 +- java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4 - java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 8 +- java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 6 - java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 12 +-- java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 14 +-- java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 6 - java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 14 +-- java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 6 - java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 2 java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 8 +- java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 30 +++---- java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 38 +++++----- java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 12 +-- java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 16 ++-- java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 6 - java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 2 java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 4 - java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 6 - java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 14 +-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 6 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf | 6 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf | 6 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 4 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf | 8 +- java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf | 6 - java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 6 - java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf | 24 +++--- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf | 18 ++-- java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf | 8 +- java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 22 ++--- java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 8 +- java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf | 4 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 14 +-- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 8 +- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 6 - java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 6 - java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 6 - java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 6 - java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 4 - java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 12 +-- java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 6 - java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4 - java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 6 - java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4 - java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp | 20 ++--- java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 8 +- java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp | 4 - java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp | 24 +++--- java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 8 +- java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp | 12 +-- java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4 - java/code/webapp/WEB-INF/pages/credentials/edit.jsp | 2 java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 8 +- java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 8 +- java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 4 - java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 6 - java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp | 8 +- java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 8 +- java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4 - java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 6 - java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp | 6 - java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 4 - java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 2 java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp | 2 java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 6 - java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 8 +- java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 6 - java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 8 +- java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 6 - java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 4 - java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 4 - java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 18 ++-- java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 8 +- java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 4 - java/code/webapp/WEB-INF/pages/systems/errata.jsp | 20 ++--- java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/overview.jsp | 2 java/code/webapp/WEB-INF/pages/systems/physicallist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/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 | 18 ++-- java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 4 - java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 4 - java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 4 - java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 2 java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 6 - java/code/webapp/WEB-INF/pages/yourrhn.jsp | 2 136 files changed, 435 insertions(+), 435 deletions(-) New commits: commit 559ab0613bd2db2ad5b47f3c1ba70a1d064cc4b3 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Dec 5 14:06:33 2013 +0100 removed trailing whitespaces from jsp{,f} sources because it is evil diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp index 8b5d4c0..d96a107 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp @@ -49,15 +49,15 @@ <rl:column headerkey="sdc.configlist.jsp.rank" attr="position" bound="true"/> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> <hr/> - + <input type="submit" name ="dispatch" - value='<bean:message key="sdc.configlist.jsp.unsubscribe"/>'/> + value='<bean:message key="sdc.configlist.jsp.unsubscribe"/>'/> </div> </c:if> </c:when> @@ -66,7 +66,7 @@ arg0="/rhn/activationkeys/configuration/Subscribe.do?tid=${param.tid}"/></strong> </p> </c:otherwise> - </c:choose> + </c:choose> </rl:listset> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp index c0d4708..ee8f483 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp @@ -24,7 +24,7 @@ </p> <noscript> <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> - </noscript> + </noscript> <c:set var="pageList" value="${requestScope.all}" /> @@ -55,26 +55,26 @@ <rl:column headerkey="sdc.config.subscriptions.jsp.files" attr="filesAndDirsDisplayString" bound="true"/> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> <hr/> - + <input type="submit" name ="dispatch" class="btn btn-success" - value='<bean:message key="sdc.config.subscriptions.jsp.continue"/>'/> + value='<bean:message key="sdc.config.subscriptions.jsp.continue"/>'/> </div> - </c:if> + </c:if> </c:when> <c:otherwise> <p><strong><bean:message key="activation-keys.config.subscriptions.jsp.noChannels" arg0="/rhn/activationkeys/configuration/List.do?tid=${param.tid}"/> </strong></p> </c:otherwise> - </c:choose> - </rl:listset> + </c:choose> + </rl:listset> </div> </div> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp index 07e99ac..2e882f5 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp @@ -34,7 +34,7 @@ <c:choose> <c:when test="${requestScope['default'].note != null}"> <a href="/rhn/activationkeys/Edit.do?tid=${requestScope['default'].id}"> - <c:out value="${requestScope['default'].note}"/></a> + <c:out value="${requestScope['default'].note}"/></a> </c:when> <c:otherwise> <a href="/rhn/activationkeys/Edit.do?tid=${requestScope['default'].id}"> @@ -61,7 +61,7 @@ <td> <c:choose> <c:when test="${requestScope['default'].usageLimit != null}"> - <c:out value="${requestScope['default'].usageLimit}"/> + <c:out value="${requestScope['default'].usageLimit}"/> </c:when> <c:otherwise> <bean:message key="kickstart.activationkeys.jsp.nousagelimit"/> @@ -77,7 +77,7 @@ <td> <c:choose> <c:when test="${not requestScope['default'].disabled}"> - <bean:message key="Enabled"/> + <bean:message key="Enabled"/> </c:when> <c:otherwise> <bean:message key="Disabled"/> @@ -118,7 +118,7 @@ <c:choose> <c:when test="${current.note != null}"> <a href="/rhn/activationkeys/Edit.do?tid=${current.id}"> - <c:out value="${current.note}"/></a> + <c:out value="${current.note}"/></a> </c:when> <c:otherwise> <a href="/rhn/activationkeys/Edit.do?tid=${current.id}"> @@ -127,13 +127,13 @@ </c:choose> <c:if test="${current.orgDefault}"><c:out value=" *"/></c:if> </rl:column> - +  <rl:column bound="true" headerkey="kickstart.activationkeys.jsp.key" attr="token" /> - +  <rl:column bound="false" @@ -141,14 +141,14 @@ > <c:choose> <c:when test="${current.usageLimit != null}"> - ${current.systemCount}/${current.usageLimit} + ${current.systemCount}/${current.usageLimit} </c:when> <c:otherwise> ${current.systemCount}/<bean:message key="kickstart.activationkeys.jsp.nousagelimit"/> </c:otherwise> </c:choose> - - </rl:column> + + </rl:column> </rl:list> <hr/> <div class="small-text">*<strong><bean:message key="Tip"/>:</strong> <bean:message key="activation-keys.jsp.is-default-key-tip"/></div> diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp index fb88b86..f1cee44 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp @@ -51,10 +51,10 @@ <rl:column headerkey="lastCheckin"> ${requestScope.dateMap[current.id]} </rl:column> - - + + </rl:list> - + </div> </rl:listset> </body> diff --git a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp index c72a68d..ba5045c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp @@ -34,14 +34,14 @@ <rl:column sortable="true" headerkey="assignedgroups.jsp.group" sortattr="name"> - + <c:out value="<a href=\"/network/systems/groups/details.pxt?sgid=${current.id}\">${current.name}</a>" escapeXml="false" /> </rl:column> <rl:column sortable="true" headerkey="grouplist.jsp.systems" sortattr="serverCount"> - + <c:out value="<a href=\"/rhn/groups/ListRemoveSystems.do?sgid=${current.id}\">${current.serverCount}</a>" escapeXml="false" /> </rl:column> 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 c8cde87..3af8924 100644 --- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp @@ -55,7 +55,7 @@ <a href="/rhn/admin/multiorg/Users.do"><bean:message key="general.jsp.org.tbl.link3"/></a>. </p> </td> - </tr> + </tr> <tr> <td colspan="3"> <p> 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 b058788..1347201 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 @@ -54,7 +54,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.UserListFilter" emptykey="org.jsp.noUsers"> -  +  <rl:column bound="false" sortable="true" headerkey="username.nopunc.displayname" @@ -67,13 +67,13 @@ ${current.login} </c:otherwise> </c:choose> - + </rl:column> <rl:column bound="false" headerkey="multiorg.jsp.email" > <c:out value="${current.address}" /> - </rl:column> + </rl:column> <rl:column bound="false" sortable="false" headerkey="realname.displayname" @@ -92,7 +92,7 @@ <img src="/img/rhn-listicon-unchecked_immutable.gif"> </c:otherwise> </c:choose> - + </rl:column> </rl:list> 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 23c24a4..756fadf 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp @@ -24,7 +24,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.OrgListFilter" emptykey="orglist.jsp.noOrgs"> -  +  <rl:column bound="false" sortable="true" headerkey="org.nopunc.displayname" 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 94cd5d4..42a44bd 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp @@ -105,8 +105,8 @@ </div> </div> </div> - - + + </html:form> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp index 01a00c1..7606e67 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp @@ -43,7 +43,7 @@ <rhn:csrf /> <rhn:submitted/> <input type="hidden" name="oid" value="${param.oid}"/> - + <rl:list dataset="pageList" name="entitlement" alphabarcolumn="name" @@ -64,7 +64,7 @@ </c:when> <c:otherwise> <c:out value="${current.currentMembers} / ${current.maxMembers}" /> - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> @@ -97,7 +97,7 @@ </c:when> <c:otherwise> <c:out value="${current.currentFlex} / ${current.maxFlex}" /> - </c:otherwise> + </c:otherwise> </c:choose> @@ -115,7 +115,7 @@ <c:when test="${param.oid != 1}"> <input name="${current.flexKey}" value="${requestScope.subscriptions[current.flexKey]}" type="text" size = "13" onkeydown="return blockEnter(event)"> - + <p><small><bean:message key="orgsystemsubs.jsp.possible_vals" arg0="0" arg1="${current.maxAvailableFlex}"/></small></p> </c:when> 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 d403955..dad92db 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 @@ -35,7 +35,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.UserListFilter" emptykey="org.jsp.noUsers"> -  +  <rl:column bound="false" sortable="true" headerkey="username.nopunc.displayname" @@ -47,7 +47,7 @@ <c:otherwise> <c:out value="${current.login}" /> </c:otherwise> - </c:choose> + </c:choose> </rl:column> <rl:column bound="false" sortable="false" @@ -91,7 +91,7 @@ </c:otherwise> </c:choose> </rl:column> - + </rl:list> </rl:listset> 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 7db66c7..9b807ad 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp @@ -53,7 +53,7 @@ <c:choose> <c:when test="${empty current.total or current.total == 0}"> <bean:message key="softwareentitlements.noentitlements"/> - </c:when> + </c:when> <c:otherwise> ${current.available} / ${current.total} </c:otherwise> @@ -66,10 +66,10 @@ <c:choose> <c:when test="${empty current.allocated or current.allocated == 0}"> <bean:message key="None Allocated"/> - </c:when> + </c:when> <c:otherwise> <bean:message key="softwareentitlements.usagedata" arg0="${current.used}" arg1="${current.allocated}" arg2="${current.ratio}"/> - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> </c:if> @@ -80,7 +80,7 @@ <c:choose> <c:when test="${empty current.totalFlex or current.totalFlex == 0}"> <bean:message key="softwareentitlements.noentitlements"/> - </c:when> + </c:when> <c:otherwise> ${current.availableFlex} / ${current.totalFlex} </c:otherwise> @@ -92,13 +92,13 @@ headertext="${rhn:localize('Flex Usage')} <br/> (${rhn:localize('Used/Allotted')})**" styleclass="${usagestyle}"> <c:choose> - + <c:when test="${empty current.allocatedFlex or current.allocatedFlex == 0}"> <bean:message key="None Allocated"/> </c:when> <c:otherwise> <bean:message key="softwareentitlements.usagedata" arg0="${current.usedFlex}" arg1="${current.allocatedFlex}" arg2="${current.flexRatio}"/> - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> </c:if> 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 51409f9..3d6bec0 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp @@ -55,10 +55,10 @@ <c:choose> <c:when test="${empty current.maxMembers or current.maxMembers == 0}"> <bean:message key="None Allocated"/> - </c:when> + </c:when> <c:otherwise> ${current.currentMembers}/${current.maxMembers} - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> @@ -91,13 +91,13 @@ <c:choose> <c:when test="${empty current.maxFlex or current.maxFlex == 0}"> <bean:message key="None Allocated"/> - </c:when> + </c:when> <c:otherwise> ${current.currentFlex}/${current.maxFlex} - </c:otherwise> + </c:otherwise> </c:choose> </rl:column> - + <rl:column headerkey="Flex Proposed Total"> <c:choose> @@ -146,7 +146,7 @@ </th> <td> ${maxMem} - + <rhn:tooltip key="softwareEntitlementSubs.systemWideCounts.totaltip"/> </span> </td> @@ -181,7 +181,7 @@ </th> <td> ${maxFlex} - + <rhn:tooltip key="softwareEntitlementSubs.systemWideCounts.totaltip"/> </td> </tr> 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 023832b..fa347b8 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp @@ -22,7 +22,7 @@ <rhn:csrf /> <rhn:submitted /> - +  <rl:list dataset="pageList" width="100%" @@ -39,7 +39,7 @@ filterattr="login"> <c:out value="<a href=\"/rhn/users/UserDetails.do?uid=${current.id}\">${current.userLogin}</a>" escapeXml="false" /> </rl:column> - +  <rl:column bound="false" sortable="true" @@ -47,7 +47,7 @@ sortattr="userLastName"> <c:out value="${current.userLastName}, ${current.userFirstName}" /> </rl:column> - +  <rl:column attr="roleNames" bound="true" 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 3b405d9..c89baa9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -34,24 +34,24 @@ <rl:selectablecolumn value="${current.id}" selected="${current.selected}" disabled="${not current.selectable}"/> - + <rl:column bound="false" sortable="true" headerkey="username.nopunc.displayname" sortattr="userLogin"> <c:out value="<a href=\"UserDetails.do?uid=${current.id}\">${current.userLogin}</a>" escapeXml="false" /> - </rl:column> - - + </rl:column> + + <rl:decorator name="PageSizeDecorator"/> - + <%@ include file="/WEB-INF/pages/common/fragments/user/userlist_columns.jspf" %> <rl:column - headerkey="disabledlist.jsp.disabledBy"> + headerkey="disabledlist.jsp.disabledBy"> <c:out value="${current.changedByFirstName} ${current.changedByLastName}" escapeXml="false"/> </rl:column> - + <rl:column headerkey="disabledlist.jsp.disabledOn" bound="true" attr="changeDateString" 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 2e1c931..0d579f9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp @@ -35,16 +35,16 @@ <%@ include file="/WEB-INF/pages/common/fragments/user/userlist_columns.jspf" %> </rl:list> - + <rl:csv dataset="pageList" name="userConfirmList" exportColumns="userLogin,userLastName,userFirstName,roleNames,lastLoggedIn"/> - + <div class="text-right"> <hr /> <input type="submit" name="dispatch" value="<bean:message key='userconfirm.jsp.confirm'/>" /> </div> - + </rl:listset> </body> 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 9a6e673..bcdaaf3 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp @@ -44,7 +44,7 @@ </label> </c:forEach> <c:if test="${orgAdmin}"> - + <bean:message key="userdetails.jsp.grantedByOrgAdmin"/> </c:if> </div> 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 d9acc37..5fa8206 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -29,7 +29,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.UserListFilter" emptykey="activelist.jsp.noUsers" alphabarcolumn="userLogin"> - + <rl:column bound="false" @@ -37,9 +37,9 @@ headerkey="username.nopunc.displayname" sortattr="userLogin"> <c:out value="<a href=\"UserDetails.do?uid=${current.id}\">${current.userLogin}</a>" escapeXml="false" /> - </rl:column> - - + </rl:column> + + <%@ include file="/WEB-INF/pages/common/fragments/user/userlist_columns.jspf" %> <rl:column sortable="false" headerkey="userlist.jsp.status"> diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp index 09046c2..1846671 100644 --- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp @@ -89,7 +89,7 @@ </div> <div class="panel panel-default"> <div class="panel-heading"> - <h4>Machine / Time range</h4> + <h4>Machine / Time range</h4> </div> <div class="panel-body"> <div class="col-md-4"> @@ -178,7 +178,7 @@ </button> </div> </html:form> - </div> + </div> </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp index 39be475..5eb818a 100755 --- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp @@ -44,10 +44,10 @@ </rl:column> - + </rl:list> <rhn:submitted/> - + <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='ssmchildsubs.jsp.subscribe'/>" </input> </p> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index c94b317..883d041 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -32,7 +32,7 @@ <table class="details" width="80%"> <tr><bean:message key="channel.manage.errata.custommsg"/><br><br></tr> - + <tr> <th>Package Association:</th> <td> @@ -40,7 +40,7 @@ <bean:message key="channel.manage.errata.packageassocmsg" /> </td> </tr> - + <c:if test="${selected_channel != null}"> <input type="hidden" name="selected_channel_old" value="${selected_channel}"> </c:if> @@ -60,9 +60,9 @@ <c:otherwise> <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name}</option> </c:otherwise> - </c:choose> - </c:forEach> - </optgroup> + </c:choose> + </c:forEach> + </optgroup> </select> </td> @@ -84,10 +84,10 @@ filter="com.redhat.rhn.frontend.action.channel.manage.ErrataFilter"> <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - + <rl:column sortable="true" headerkey="exportcolumn.errataAdvisoryType" sortattr="advisoryType" @@ -102,10 +102,10 @@ <c:if test="${current.productEnhancement}"> <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> - </rl:column> - - - + </rl:column> + + + <rl:column sortable="true" headerkey="erratalist.jsp.advisory" sortattr="advisory"> @@ -113,18 +113,18 @@ <c:out value="${current.advisory}"/> </a> </rl:column> - + <rl:column sortable="true" headerkey="erratalist.jsp.synopsis" sortattr="advisorySynopsis"> <c:out value="${current.advisorySynopsis}"/> - </rl:column> + </rl:column> <rl:column sortable="true" headerkey="channel.manage.errata.updatedate" sortattr="updateDateObj"> <c:out value="${current.updateDate}"/> - </rl:column> - + </rl:column> + </rl:list> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 17b88a8..acac8dc 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -32,7 +32,7 @@ <table class="details" width="80%"> <tr><bean:message key="channel.manage.errata.redhatmsg" /><br><br></tr> - + <tr> <th>Package Association:</th> <td> @@ -40,7 +40,7 @@ <bean:message key="channel.manage.errata.packageassocmsg" /> </td> </tr> - + <tr><th width="10%">Channel Version: </th> <td width="40%"> @@ -51,9 +51,9 @@ <select name="selected_version"> <c:forEach var="option" items="${version_list}"> - <option value="${option.version}" <c:if test="${option.selected eq true}">selected = "selected"</c:if>>${option.name}</option> - </c:forEach> - </optgroup> + <option value="${option.version}" <c:if test="${option.selected eq true}">selected = "selected"</c:if>>${option.name}</option> + </c:forEach> + </optgroup> </select> </td> @@ -68,7 +68,7 @@ </c:if> <c:if test="${channel_list != null}"> - + <tr> <th width="10%">Channel:</th><td width="40%"> <select name="selected_channel"> <optgroup> @@ -82,9 +82,9 @@ <c:otherwise> <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name}</option> </c:otherwise> - </c:choose> - </c:forEach> - </optgroup> + </c:choose> + </c:forEach> + </optgroup> </select> </td> @@ -106,10 +106,10 @@ filter="com.redhat.rhn.frontend.action.channel.manage.ErrataFilter"> <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - + <rl:column sortable="true" headerkey="exportcolumn.errataAdvisoryType" sortattr="advisoryType" @@ -124,10 +124,10 @@ <c:if test="${current.productEnhancement}"> <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i> </c:if> - </rl:column> - - - + </rl:column> + + + <rl:column sortable="true" headerkey="erratalist.jsp.advisory" sortattr="advisory"> @@ -135,18 +135,18 @@ <c:out value="${current.advisory}"/> </a> </rl:column> - + <rl:column sortable="true" headerkey="erratalist.jsp.synopsis" sortattr="advisorySynopsis"> <c:out value="${current.advisorySynopsis}"/> - </rl:column> + </rl:column> <rl:column sortable="true" headerkey="channel.manage.errata.updatedate" sortattr="updateDateObj"> <c:out value="${current.updateDate}"/> - </rl:column> - + </rl:column> + </rl:list> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp index 38ce5b8..2e87e21 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp @@ -38,14 +38,14 @@ alphabarcolumn="nvrea" filter="com.redhat.rhn.frontend.taglibs.list.filters.PackageFilter" > - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - - + + <rl:column sortable="true" bound="false" headerkey="download.jsp.package" @@ -71,8 +71,8 @@ ${current.provider} </rl:column> - - + + </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index d140851..51a5020 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -34,7 +34,7 @@ Product Enhancement Advisory: </th> <td>${enhance_count}</td> - </tr> + </tr> <tr> <th><i class="fa fa-lock" title="<bean:message key='erratalist.jsp.securityadvisory'/>"></i> Security Advisory: @@ -44,14 +44,14 @@ <tr> <th>Total Errata:</th> <td>${bug_count + enhance_count + secure_count}</td> - </tr> + </tr> <tr> <td colspan="2" class="csv-download"> <rl:csv name="errataList" dataset="errataList" exportColumns="advisory, advisorySynopsis, advisoryType, updateDate" /> </td> </tr> </table> - + </div> <div class="right-column"> <h2>Package Summary:</h2> @@ -79,21 +79,21 @@ <td colspan="2" class="csv-download"> <rl:csv name="packageList" dataset="packageList" exportColumns="id,packageName,packageNvre,packageArch,summary" /> </td> - </tr> + </tr> </table> - - + + </div> - + <hr /> <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='Clone Errata'/>" <c:choose> <c:when test="${totalSize < 1}">disabled</c:when> - </c:choose> + </c:choose> > </p> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp index 7d9a1ec..9d43c39 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp @@ -53,9 +53,9 @@ attr="name"> <c:out value="${current.setDate}" /> </rl:column> - - - + + + </rl:list> <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='channel.manage.patchset.delete'/>" > diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp index a85b3ce..70160c1 100644 --- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp @@ -58,6 +58,6 @@ exportColumns="id, nvrea, provider" /> </rl:listset> - + </body> </html:html> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp index ff38210..de8d385 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp @@ -37,7 +37,7 @@ <c:out value="${current.name}" escapeXml="true" /> </a> </rl:column> - +  <rl:column bound="false" sortable="false" @@ -46,7 +46,7 @@ <c:out value="${chan}" /><br /> </c:forEach> </rl:column> - +  <rl:column bound="false" sortable="false" diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp index aebb05a..0333a6a 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp @@ -13,7 +13,7 @@ </h2> <div class="page-summary"><bean:message key="ssmchildsubs.jsp.summary"/></div> - + <rl:listset name="channellist"> <rhn:csrf /> diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp index 8a09c31..8c39884 100644 --- a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp @@ -131,7 +131,7 @@ </rl:list> </rl:listset> - + <html:form method="post" action="/channel/ssm/BaseChannelSubscribe.do"> <div class="text-right"> @@ -151,7 +151,7 @@ </div> </html:form> - + <span class="small-text"><bean:message key="basesub.jsp.confirm.fasTrackBetaNote"/></span> </body> diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp index 93a7196..31d770b 100644 --- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp @@ -29,7 +29,7 @@ alphabarcolumn="name" filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" > - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp index 693edf6..690f417 100755 --- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp @@ -58,7 +58,7 @@ headerkey="systemlist.jsp.channel" > <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_list_fragment.jspf" %> </rl:column> - +  <rl:column sortable="false" bound="false" @@ -68,10 +68,10 @@ <c:out value="${current.entitlementLevel}" escapeXml="false"/> </rl:column> - + </rl:list> <rhn:submitted/> - + <p align="right"> <input type="submit" name="dispatch" value="<bean:message key='confirm'/>" </input> </p> 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 481f7d3..3032817 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 @@ -6,7 +6,7 @@ deletionUrl="/rhn/activationkeys/Delete.do?tid=${param.tid}" deletionType="activationkeys" - deletionAcl = "user_role(activation_key_admin)" + deletionAcl = "user_role(activation_key_admin)" > <c:out value="${requestScope.description}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf index a919f63..20b192c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf @@ -34,7 +34,7 @@ <rl:decorator name="PageSizeDecorator"/> <rl:decorator name="SelectableDecorator"/> <rl:selectablecolumn value="${current.id}"/> - +  <rl:column sortable="true" bound="false" @@ -50,18 +50,18 @@ ${current.name} </c:otherwise> </c:choose> - - </rl:column> + + </rl:column> </rl:list> - + </div> <div class="text-right"> <rhn:submitted/> <hr/> - + <input type="submit" name ="dispatch" - value='<bean:message key="${param.action_key}"/>'/> + value='<bean:message key="${param.action_key}"/>'/> </div> </c:when> @@ -71,7 +71,7 @@ </strong></p> </div> </c:otherwise> -</c:choose> +</c:choose> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf index 706a52f..45670e5 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf @@ -21,7 +21,7 @@ > <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - +  <rl:column sortable="true" headerkey="sdc.config.subscriptions.jsp.channel" @@ -30,7 +30,7 @@ name = "${current.name}" type = "central"/> </rl:column> - + <rl:column bound="true" headerkey="copy2channels.jsp.total_systems" attr="systemCountString" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf index d8db56c..d12e57a 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf @@ -2,13 +2,13 @@ <%@ 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:column header="system.common.systemName" url="/rhn/systems/details/Overview.do?sid=${current.id}"> <i class="fa fa-desktop"></i> ${fn:escapeXml(current.name)} </rhn:column> - + <rhn:column header="targetsystems.jsp.capable"> <c:if test="${current.capable}"> <bean:message key="yes"/> @@ -17,7 +17,7 @@ <bean:message key="no"/> </c:if> </rhn:column> - + <rhn:column header="targetsystems.jsp.action"> <rhn:require acl="not user_role(org_admin)"> <c:if test="${not current.provisioning}"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf index 7cca90d..d09ef51 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf @@ -5,7 +5,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="summary.jsp.noActions"> <rhn:listdisplay> - + <rhn:column header="summary.jsp.status"> <c:if test="${current.success}"> <i class="fa fa-check text-success" title="<bean:message key="summary.jsp.okAlt" />"></i> @@ -19,7 +19,7 @@ url="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> <i class="fa fa-desktop" title=""></i> ${current.name} </rhn:column> - + <rhn:column header="summary.jsp.error"> ${current.errorDisplay} </rhn:column> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf index 27e4a79..fb65768 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/contents.jspf @@ -8,13 +8,13 @@ <c:when test="${revision.configContent.binary}"> <strong><bean:message key="filedetails.contents.jspf.binary-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.binary-edit" /> - + <bean:message key="filedetails.contents.jspf.binary-canupload"/> </c:when> <c:when test="${toolarge}"> <strong><bean:message key="filedetails.contents.jspf.toolarge-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.toolarge-edit" arg0="${requestScope.maxEditBytes}"/> - + <strong><bean:message key="filedetails.contents.jspf.download-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.download" arg0="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${revision.configFile.id}" @@ -37,7 +37,7 @@ <c:when test="${toolarge}"> <strong><bean:message key="filedetails.contents.jspf.toolarge-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.toolarge-display" arg0="${requestScope.maxbytes}"/> - + <strong><bean:message key="filedetails.contents.jspf.download-header"/></strong><br /> <bean:message key="filedetails.contents.jspf.download" arg0="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${revision.configFile.id}" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf index 6b422cb..55ca49f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf @@ -21,7 +21,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="globalDeploy.jsp.noSystems"> - + <rhn:listdisplay filterBy="system.common.systemName" set="${requestScope.set}"> <rhn:set value="${current.id}" disabled="${not current.selectable}"/> <rhn:column header="globaldeploy.jsp.systemName-header"> @@ -55,7 +55,7 @@ </rhn:listdisplay> </rhn:list> <br/> - + <div class="small-text">* <bean:message key="deployglobal.jspf.not_deployable" arg0="/rhn/configuration/system/TargetSystems.do" arg1="${rhn:localize('targetsystems.jsp.toolbar')}" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf index e60da63..25d7e79 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deploylocal.jspf @@ -13,7 +13,7 @@ <th><bean:message key="deploy.jsp.deploy-name" /></th> <td><bean:message key="deploy.jsp.deploy" arg0="${revision.revision}" arg1="/rhn/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}" - arg2="${system}" + arg2="${system}" arg3="/rhn/systems/details/configuration/Overview.do?system_detail_navi_node=selected_configfiles&sid=${sid}" /></td> </tr> <tr> @@ -63,14 +63,14 @@ <hr /> <div class="text-right"><html:submit property="dispatch"> <bean:message key="deploy.jsp.deploybutton" /> - </html:submit></div> + </html:submit></div> </c:when> <c:otherwise> <p><strong><bean:message key="system.sdc.missing.config_deploy1"/></strong></p> <p><strong><bean:message key="system.sdc.missing.config_deploy2" arg0="/rhn/configuration/system/TargetSystems.do" arg1="${rhn:localize('targetsystems.jsp.toolbar')}" - arg2="${rhn:localize('targetsystems.jsp.enable')}"/></strong></p> + arg2="${rhn:localize('targetsystems.jsp.enable')}"/></strong></p> </c:otherwise> </c:choose> </html:form> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp index b025fc7..c9a8a2d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp @@ -77,7 +77,7 @@ <td><strong><bean:message key="diff.jsp.selinux" /></strong></td> <td>${myrev.configInfo.selinuxCtx}</td> </tr> - </c:if> + </c:if> <c:if test="${difftargetpath== 'true'}"> <tr> @@ -85,7 +85,7 @@ <td>${myrev.configInfo.targetFileName.path}</td> </tr> </c:if> - + <c:if test="${diffdelim == 'true'}"> <tr> <td><strong><bean:message key="diff.jsp.startDelim" /></strong></td> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf index e7df79d..f7aa905 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf @@ -5,7 +5,7 @@ </div> <ul class="list-group"> <li class="list-group-item"> - <bean:message key="configoverview.jsp.systemsmanaged"/> + <bean:message key="configoverview.jsp.systemsmanaged"/> <a href="/rhn/configuration/system/ManagedSystems.do"> <c:if test="${summary.systems == 1}"> <bean:message key="system.common.onesystem" /> @@ -16,7 +16,7 @@ </a> </li> <li class="list-group-item"> - <bean:message key="configoverview.jsp.configchannels"/> + <bean:message key="configoverview.jsp.configchannels"/> <a href="/rhn/configuration/GlobalConfigChannelList.do"> <c:if test="${summary.channels == 1}"> <bean:message key="configoverview.jsp.onechannel" /> @@ -27,7 +27,7 @@ </a> </li> <li class="list-group-item"> - <bean:message key="configoverview.jsp.centralfiles"/> + <bean:message key="configoverview.jsp.centralfiles"/> <a href="/rhn/configuration/file/GlobalConfigFileList.do"> <c:if test="${summary.global_files == 1}"> <bean:message key="config.common.onefile" /> @@ -38,7 +38,7 @@ </a> </li> <li class="list-group-item"> - <bean:message key="configoverview.jsp.localfiles"/> + <bean:message key="configoverview.jsp.localfiles"/> <a href="/rhn/configuration/file/LocalConfigFileList.do"> <c:if test="${summary.local_files == 1}"> <bean:message key="config.common.onefile" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf index f2e9fc4..da741cc 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf @@ -15,12 +15,12 @@ </c:otherwise> </c:choose> </rhn:column> - + <rhn:column header="sdcconfigfiles.jsp.revision" url="/rhn/configuration/file/FileDetails.do?cfid=${current.configFileId}&crid=${current.configRevisionId}"> <bean:message key="sdcconfigfiles.jsp.filerev" arg0="${current.configRevision}" /> </rhn:column> - + <rhn:column header="sdcconfigfiles.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}"> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf index 623a338..e00d559 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf @@ -12,7 +12,7 @@ value="${requestScope.copy_to_global}"/> </rhn:require> </c:if> - + <c:if test="${not requestScope.server_import}" > <input type="submit" name ="dispatch" @@ -27,8 +27,8 @@ <rhn:require acl="user_role(config_admin)"> <input type="submit" name ="dispatch" - value="${requestScope.delete_files}"/> - </rhn:require> + value="${requestScope.delete_files}"/> + </rhn:require> </c:if> </div> </c:if> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf index 81f3f52..217f5ec 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf @@ -37,7 +37,7 @@ sortattr="updateDateObj" styleclass="text-align: center;"> ${current.updateDate} - </rl:column> + </rl:column> </c:if> <c:if test="${not displayCves}"> <rl:column headerkey="erratalist.jsp.updated" @@ -45,7 +45,7 @@ sortattr="updateDateObj" styleclass="text-align: center;"> ${current.updateDate} - </rl:column> + </rl:column> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf index b0530b7..67aa370 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf @@ -12,11 +12,11 @@ <i class="fa spacewalk-icon-system-groups" title="<bean:message key='toolbar.work.with.group'/>"></i> <bean:message key="toolbar.work.with.group"/> </a> - <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> + <a href="/network/systems/groups/delete_confirm.pxt?sgid=${systemgroup.id}"> <i class="fa fa-trash-o" title="<bean:message key='toolbar.delete.systemgroup'/>" ></i> <bean:message key="toolbar.delete.systemgroup"/> - </a> - + </a> + </span> </div> <h1> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf index 0ea82a5..9b2ad08 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf @@ -33,10 +33,10 @@ <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> <div class="text-right"> <rhn:submitted/> - <hr/> + <hr/> <input type="submit" name ="dispatch" - value='<bean:message key="${param.action_key}"/>'/> + value='<bean:message key="${param.action_key}"/>'/> </div> </rhn:require> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf index dc4209b..89133c8 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf @@ -1,4 +1,4 @@ -<h2 style="clear: both; width: 100%; padding-top: 20px;"><bean:message key="kickstart.jsp.current"/></h2> +<h2 style="clear: both; width: 100%; padding-top: 20px;"><bean:message key="kickstart.jsp.current"/></h2> <rl:list dataset="sysKickstarting" emptykey="kickstartoverview.jsp.nocurrentlyks" @@ -8,9 +8,9 @@ <rl:column bound="false" sortable="false" headerkey="kickstart.jsp.system" - headerclass="thin-column"> + headerclass="thin-column"> - <c:if test="${not current.isBareMetal}"> + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/Overview.do?sid=${current.serverId}"> ${current.serverName}</a> </c:if> @@ -22,26 +22,26 @@ <bean:message key="kickstart.jsp.unregistered"/> </c:if> </c:if> - + </rl:column> - + <rl:column bound="false" sortable="false" headerkey="kickstart.jsp.status"> - - <c:if test="${not current.isBareMetal}"> + + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/kickstart/SessionStatus.do?sid=${current.serverId}"> ${current.description}</a> </c:if> <c:if test="${current.isBareMetal}"> ${current.description} </c:if> - </rl:column> - + </rl:column> + <rl:column bound="false" sortable="false" - headerkey="kickstart.jsp.lastchange"> + headerkey="kickstart.jsp.lastchange"> ${current.elapsedTimeAfterModify} - </rl:column> - + </rl:column> + </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf index a46230a..0769e89 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-actions.jspf @@ -29,7 +29,7 @@ </a> </td> </tr> - + </table> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf index 35d44e1..85e9f5f 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-overview-summary.jspf @@ -12,7 +12,7 @@ headerkey="kickstartoverview.jsp.kickstartsummary"> ${current.name} </rl:column> - + <rl:column bound="false" sortable="false" headerkey="emptyspace.jsp" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf index aaa16c6..fb15a35 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf @@ -15,7 +15,7 @@ <c:set var="distro_url">(${requestScope.distro.label})</c:set> </c:otherwise> </c:choose> - + <html:radio value="distro" property="kernelParamsType" onclick="form.kernelParamsId.disabled = true;"> <bean:message key="kickstart.schedule.kernel.options.distro"/> </html:radio> ${distro_url}:<br/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf index 6f11600..dc0cee2 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf @@ -9,8 +9,8 @@ sortable="false" headerkey="kickstart.jsp.system" headerclass="thin-column"> - - <c:if test="${not current.isBareMetal}"> + + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/Overview.do?sid=${current.serverId}"> ${current.serverName}</a> </c:if> @@ -26,22 +26,22 @@ <rl:column bound="false" sortable="false" - headerkey="kickstart.jsp.status"> - <c:if test="${not current.isBareMetal}"> + headerkey="kickstart.jsp.status"> + <c:if test="${not current.isBareMetal}"> <a href="/rhn/systems/details/kickstart/SessionStatus.do?sid=${current.serverId}"> ${current.description}</a> </c:if> <c:if test="${current.isBareMetal}"> ${current.description} - </c:if> + </c:if> </rl:column> <rl:column bound="false" sortable="false" headerkey="kickstart.jsp.lastchange" - > + > ${current.elapsedTimeAfterModify} </rl:column> - - -</rl:list> \ No newline at end of file + + +</rl:list> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf index 4723ae6..4127796 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf @@ -4,13 +4,13 @@ <c:forEach items="${items_list}" var="sublist" varStatus="loop"> <c:choose> <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-column-even"/> + <c:set var ="style_class" value="list-column-even"/> </c:when> <c:otherwise> <c:set var ="style_class" value="list-column-odd"/> </c:otherwise> </c:choose> - + <c:if test = "${loop.last}"> <c:set var ="style_class" value="${style_class} last-column"/> </c:if> @@ -22,8 +22,8 @@ <c:choose> <c:when test="${item.similar}"><li class="inactive"></c:when> <c:otherwise><li></c:otherwise> - </c:choose> - + </c:choose> + <c:choose> <c:when test="${empty item.value}"> <c:set var ="value"><bean:message key="generic.jsp.none"/></c:set> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf index fc4e33b..31ac0ca 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf @@ -3,7 +3,7 @@ <c:forEach items="${items_list}" var="item" varStatus="loop"> <c:choose> <c:when test ="${loop.count % 2 == 0}"> - <c:set var ="style_class" value="list-column-even"/> + <c:set var ="style_class" value="list-column-even"/> </c:when> <c:otherwise> <c:set var ="style_class" value="list-column-odd"/> @@ -15,7 +15,7 @@ <c:if test = "${loop.last}"> <c:set var ="style_class" value="${style_class} last-column"/> </c:if> - + <td class="${style_class} "> <c:choose> <c:when test="${empty item.value}"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf index 485be22..a583eee 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf @@ -5,7 +5,7 @@ <%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> - + <rl:list dataset="pageList" name="groupList" @@ -43,7 +43,7 @@ </c:choose> <c:out value="</a>" escapeXml="false" /> - </rl:column> + </rl:column> <%@ include file="monitoring_status_groups.jspf" %> @@ -57,8 +57,8 @@ <c:out value="<a href=\"/network/systems/groups/details.pxt?sgid=${current.id}\">" escapeXml="false" /> <c:out value="${current.name}" escapeXml="true" /> <c:out value="</a>" escapeXml="false" /> - </rl:column> - + </rl:column> +  <rl:column sortable="true" @@ -75,7 +75,7 @@ <c:out value="<a href=\"/rhn/groups/ListRemoveSystems.do?sgid=${current.id}\">${current.serverCount}</a>" escapeXml="false" /> </c:otherwise> </c:choose> - </rl:column> + </rl:column>  @@ -85,13 +85,13 @@ styleclass="center" headerclass="center"> - + <c:out value="<a class=\"link-button\" href=\"/network/systems/ssm/work_with_group.pxt?sgid=${current.id}&pxt_trap=rhn:work_with_group_cb\"> - ${rhn:localize('grouplist.jsp.use')}</a>" escapeXml="false" /> - - </rl:column> + ${rhn:localize('grouplist.jsp.use')}</a>" escapeXml="false" /> + + </rl:column> + - </rl:list> <rl:csv dataset="pageList" @@ -101,5 +101,5 @@ <hr /> <input type="submit" name="union" value="${rhn:localize('grouplist.jsp.union')}" /> <input type="submit" name="intersection" value="${rhn:localize('grouplist.jsp.intersection')}" /> -</div> +</div> <rhn:submitted/> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf index f852b2f..b7b9648 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf @@ -43,7 +43,7 @@ emptykey="assignedgroups.jsp.nogroups" alphabarcolumn="name"> <rl:decorator name="PageSizeDecorator"/> - + <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> <rl:decorator name="SelectableDecorator"/> <rl:selectablecolumn value="${current.id}"/> @@ -54,9 +54,9 @@ headerkey="grouplist.jsp.name" sortattr="name" defaultsort="asc" filterattr="name" styleclass="${nameStyle}"> <a href="/network/systems/groups/details.pxt?sgid=${current.id}">${current.name}</a> - </rl:column> + </rl:column> </rl:list> - + </div> <rhn:require acl="user_role(org_admin) or user_role(system_group_admin)"> <div class="text-right"> @@ -74,7 +74,7 @@ </strong> </p> </div> </c:otherwise> -</c:choose> +</c:choose> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/localepreferences.jspf index 41a4bb4..7e7b764 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 @@ -66,7 +66,7 @@ <c:if test="${counter == 1}"> </tr> - </c:if> + </c:if> </table> </div> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf index ce2fb96..e5203ef 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf @@ -4,7 +4,7 @@ sortable="true" headerkey="realname.displayname" sortattr="userLastName"> - + <c:out value="${current.userLastName}, ${current.userFirstName}" escapeXml="false" /> </rl:column> @@ -13,7 +13,7 @@ headerkey="userdetails.jsp.roles" sortable="true" attr="roleNames"/> - + <rl:column bound="true" headerkey="userdetails.jsp.lastsign" sortable="true" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp index 6614d36..4ebed53 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp @@ -15,29 +15,29 @@ hidepagenums="true" title="${rhn:localize('yourrhn.jsp.criticalsystems')}" > - + <rl:column headerkey="probesuitesystemsedit.jsp.systemname" headerclass="row-2"> <a href="/rhn/systems/details/Overview.do?sid=${current.id}"> <c:out value="${current.serverName}"/></a> </rl:column> - + <rl:column headerkey="yourrhn.jsp.allupdates" headerclass="row-2"> - ${current.securityErrata + current.bugErrata + current.enhancementErrata} + ${current.securityErrata + current.bugErrata + current.enhancementErrata} </rl:column> - + <%@ include file="/WEB-INF/pages/common/fragments/systems/monitoring_status_systems.jspf" %> - + <rl:column headerkey="yourrhn.jsp.criticalsystems.securityerrata" headerclass="row-2 text-align: center;"> - <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>${current.securityErrata} + <i class="fa fa-lock" title="<bean:message key='errata-legend.jsp.security'/>"></i>${current.securityErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.bugfixerrata" headerclass="row-2 text-align: center;"> - <i class="fa fa-bug" title="<bean:message key='errata-legend.jsp.bugfix'/>"></i>${current.bugErrata} + <i class="fa fa-bug" title="<bean:message key='errata-legend.jsp.bugfix'/>"></i>${current.bugErrata} </rl:column> <rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp index 15a99bd..ea23966 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp @@ -28,7 +28,7 @@ <a href="/rhn/systems/details/Overview.do?sid=${current.id}"> <c:out value="${current.serverName}"/></a> </rl:column> - + <rl:column bound="false" headerkey="systemlist.jsp.channel" > @@ -43,13 +43,13 @@ </c:otherwise> </c:choose> </rl:column> - + <rl:column bound="false" headerkey="registeredlist.jsp.date" > <fmt:formatDate value="${current.created}" type="both" dateStyle="short" timeStyle="long"/> </rl:column> - + <rl:column bound="false" headerkey="registeredlist.jsp.user" > @@ -63,7 +63,7 @@ </c:otherwise> </c:choose> </rl:column> - + <rl:column bound="true" headerkey="systemlist.jsp.entitlement" attr="entitlementLevel"/> 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 70a35c2..5e49ea5 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 @@ -36,16 +36,16 @@ <a href="/network/systems/groups/details.pxt?sgid=${current.id}"> <c:out value="${current.name}"/></a> </rl:column> - + <rl:column headerkey="grouplist.jsp.systems"> <a href="/network/systems/groups/details.pxt?sgid=${current.id}"> <c:out value="${current.serverCount}"/></a> </rl:column> - + </rl:list> <a href="/rhn/systems/SystemGroupList.do"> <div class="btn btn-default spacewalk-btn-margin-vertical"><i class="spacewalk-icon-system-groups"></i><bean:message key="yourrhn.jsp.allgroups" /></div> </a> - + </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index b6f0750..59e6fe6 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -13,11 +13,11 @@ </h3> </div> - <ul class="list-group"> + <ul class="list-group"> <rhn:require acl="not user_role(satellite_admin)"> <rhn:require acl="user_role(org_admin)"> - <li class="list-group-item"> + <li class="list-group-item"> <i class="fa fa-caret-right"></i> <a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="yourrhn.jsp.tasks.subscriptions" /> @@ -55,7 +55,7 @@ <i class="fa fa-caret-right"></i> <a href="/rhn/help/client-config/en-US/index.jsp"> <bean:message key="yourrhn.jsp.tasks.registersystem" /> - </a> + </a> </li> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp index be1ac0f..866fde7 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp @@ -43,7 +43,7 @@ <input type="submit" name="dispatch" value="${rhn:localize('copy2systems.jsp.doCopy')}" - /> + /> </div> <rhn:submitted/> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp index 31e99d3..6fb3174 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp @@ -21,7 +21,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="channelfiles.jsp.noFiles"> <rhn:listdisplay filterBy="deploy.jsp.filepath-header" set="${requestScope.set}"> <rhn:set value="${current.id}"/> - + <rhn:column header="deploy.jsp.filepath-header"> <cfg:file id="${current.id}" path="${current.path}" type="${current.type}" /> </rhn:column> @@ -31,11 +31,11 @@ | [<a href="/rhn/configuration/file/CompareRevision.do?cfid=${current.id}"><bean:message key="config.common.compare" /></a>] </rhn:column> - + <rhn:column header="deploy.jsp.lastmodified-header"> <a href="/rhn/configuration/file/FileDetails.do?cfid=${current.id}">${current.modifiedDisplay}</a> </rhn:column> - + <rhn:column header="deploy.jsp.current-header"> <a href="/rhn/configuration/file/FileDetails.do?cfid=${current.id}"> <bean:message key="config.common.revision" arg0="${current.latestConfigRevision}"/> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp index 9fb1308..9057a62 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp @@ -52,8 +52,8 @@ </rl:column> </rl:list> </div> - - + + <h2><bean:message key="deployconfirm.jsp.systems-header2" /></h2>  <div> @@ -68,7 +68,7 @@ </rl:column> </rl:list> </div> - + <c:if test="${not empty requestScope.selectedSystems && not empty requestScope.selectedFiles}">  <p><bean:message key="deployconfirm.jsp.widgetsummary" /></p> diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp index 250fea1..561d261 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp @@ -27,7 +27,7 @@ <rhn:list pageList="${requestScope.pageList}" noDataText="deploy.jsp.noSystems"> <rhn:listdisplay filterBy="system.common.systemName" set="${requestScope.set}"> <rhn:set value="${current.id}"/> - + <rhn:column header="system.common.systemName"> <a href="/rhn/systems/details/configuration/Overview.do?sid=${current.id}"> <i class="fa fa-desktop" title="<bean:message key='system.common.systemAlt' />"></i> @@ -44,4 +44,4 @@ </html:form> </body> </html> - + diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp index 1b9af76..113f893 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp @@ -6,7 +6,7 @@ <html> <body> <%@ include file="/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf"%> - + <div class="panel panel-default"> <div class="panel-heading"> <h4><bean:message key="addfiles.jsp.upload-link" /> </h4> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp index 873c419..ff6b40c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp @@ -36,6 +36,6 @@ <html:submit><bean:message key="deletefile.jsp.submit" /></html:submit> </div> </html:form> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp index 2c0a7dd..2143b11 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp @@ -36,6 +36,6 @@ <html:submit><bean:message key="deleterev.jsp.submit" /></html:submit> </div> </html:form> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp index cbb47a9..56508ad 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp @@ -25,7 +25,7 @@ <bean:message key="deploy.jsp.sandbox-note1" arg1="/rhn/systems/details/Overview.do?sid=${sid}" arg0="${system}"/> - + <c:set var="copyname" scope="request"> <bean:message key="copycentral.jsp.copy" /> </c:set> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp index 36f2499..9f8547c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp @@ -31,7 +31,7 @@ </rhn:column> </rhn:listdisplay> </rhn:list> - + <c:if test="${not empty requestScope.pageList}"> <div> <bean:message key="deploy.jsp.widgetsummary" /></p> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp index a2cd705..fead9da 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp @@ -15,25 +15,25 @@ <html:form action="/configuration/file/FileDetails.do?cfid=${file.id}&crid=${revision.id}"> <rhn:csrf /> <html:hidden property="submitted" value="true"/> - + <div class="details-column-left"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/details.jspf"%> </div> - + <div class="details-column-right"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/properties.jspf"%> </div> - + <c:if test="${revision.file}"> <div class="details-full"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf"%> </div> - + <div class="details-full"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/contents.jspf"%> </div> </c:if> - + <rhn:require acl="config_channel_editable()" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <div class="submit-bar"> @@ -44,7 +44,7 @@ </div> </rhn:require> </html:form> - + <rhn:require acl="is_file();config_channel_editable()" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <%@ include file="/WEB-INF/pages/common/fragments/configuration/files/upload.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp index 08d1cee..462dab6 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp @@ -23,7 +23,7 @@ mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <rhn:set value="${current.id}"/> </rhn:require> - + <rhn:column header="manage.jsp.name"> <a href="/rhn/configuration/file/FileDetails.do?crid=${current.id}&cfid=${file.id}"> <cfg:file nolink="true" id="${file.id}" revisionId="${current.id}" path="${file.configFileName.path}" type="${file.latestConfigRevision.configFileType.label}" /> @@ -31,14 +31,14 @@ arg0="${current.revisionNumber}"/> </a> </rhn:column> - + <rhn:require acl="is_file()" mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> <rhn:column header="manage.jsp.size"> ${current.sizeDisplay} </rhn:column> </rhn:require> - + <rhn:column header="manage.jsp.creation"> ${current.createdDisplay} </rhn:column> 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 103e930..777ae4c 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp @@ -40,7 +40,7 @@ <rhn:column header="globalconfiglist.jsp.files" url="/rhn/configuration/ChannelFiles.do?ccid=${current.id}" renderUrl="${current.fileCount > 0}"> - <c:out value="${current.fileCountsMessage}"/> + <c:out value="${current.fileCountsMessage}"/> </rhn:column> <rhn:column header="globalconfiglist.jsp.systems" diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp index 20fb805..3b5de25 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp @@ -8,7 +8,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central"> <bean:message key="globalfilelist.jsp.toolbar"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp index 4d4a057..a5a8bdb 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp @@ -7,7 +7,7 @@ <html> <body> -<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" +<rhn:toolbar base="h1" icon="spacewalk-icon-manage-configuration-file" helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local"> <bean:message key="localfilelist.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 291e18c..48051ea 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp @@ -43,7 +43,7 @@ <h4><bean:message key="configoverview.jsp.modconfig"/></h4> </div> <div class="panel-body"> - + <rhn:list pageList="${requestScope.recentFiles}" noDataText="configoverview.jsp.noFiles"> <rhn:listdisplay> <rhn:column header="configoverview.jsp.filename" @@ -91,7 +91,7 @@ </rhn:listdisplay> </rhn:list> </div> - </div> + </div> <div class="panel panel-default"> <div class="panel-heading"> 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 f341f61..16168f1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp @@ -52,17 +52,17 @@ <rhn:listdisplay set="${requestScope.set}" filterBy="sdcimportfile.jsp.filename"> <rhn:set value="${current.id}"/> - + <rhn:column header="sdcimportfile.jsp.filename" url="/rhn/configuration/file/FileDetails.do?crid=${current.configRevisionId}&cfid=${current.configFileId}"> ${current.path} </rhn:column> - + <rhn:column header="sdcimportfile.jsp.channel"> <cfg:channel id="${current.configChannelId}" name="${current.channelNameDisplay}" type="${current.configChannelType}"/> </rhn:column> - + </rhn:listdisplay> </rhn:list> <div class="text-right"> 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 535c858..007058a 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp @@ -32,7 +32,7 @@ <rhn:column header="sdcimportconfirm.jsp.filename"> ${current.path} </rhn:column> - + <rhn:column header="sdcimportconfirm.jsp.channel" url="/rhn/configuration/ChannelOverview.do?ccid=${current.configChannelId}" renderUrl="${not empty current.configChannelType}"> @@ -54,7 +54,7 @@ </c:otherwise> </c:choose> </rhn:column> - + </rhn:listdisplay> </rhn:list> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp index c5c67a4..7c23118 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp @@ -49,11 +49,11 @@ </table>  <h2><bean:message key="sdc.config.header.recent-events"/></h2> - + <table class="details"> <tr> <th><bean:message key="sdc.config.last-config.deployment"/>:</th> - + <td><c:if test="${requestScope.deploymentTimeMessage}"> ${requestScope.deploymentTimeMessage} <br /><br /> @@ -64,17 +64,17 @@ <tr> <th><bean:message key="sdc.config.last-rhn.comparison"/>:</th> <td>${requestScope.diffTimeMessage} - + ${requestScope.diffActionMessage} - + <c:if test="${not empty requestScope.diffActionMessage}"> ${requestScope.diffDetailsMessage} </c:if> </td> - + </tr> - </table> - + </table> + </td> <td style="width: 45%"> <h2><bean:message key="sdc.config.header.actions"/></h2> @@ -106,7 +106,7 @@ <br /> </rhn:require> <rhn:require mixins="com.redhat.rhn.common.security.acl.SystemAclHandler" - acl="client_capable(configfiles.diff)"> + acl="client_capable(configfiles.diff)"> <table cellspacing="0" cellpadding="0" align="center" class="half-table"> <thead> <tr class="list-row-odd"> @@ -125,7 +125,7 @@ </tr> </table> <br /> - </rhn:require> + </rhn:require> <table cellspacing="0" cellpadding="0" align="center" class="half-table"> <thead> <tr class="list-row-odd"> @@ -163,7 +163,7 @@ <p><bean:message key="system.sdc.missing.config_deploy2" arg0="/rhn/configuration/system/TargetSystems.do" arg1="${rhn:localize('targetsystems.jsp.toolbar')}" - arg2="${rhn:localize('targetsystems.jsp.enable')}"/></p> + arg2="${rhn:localize('targetsystems.jsp.enable')}"/></p> </c:otherwise> </c:choose> </td> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp index fb9f05d..1f4a12b 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp @@ -13,12 +13,12 @@ <h2> <img src="${cfg:channelHeaderIcon('central')}" alt="${cfg:channelAlt('central')}"/> - <bean:message key="sdc.config.subscriptions.jsp.header"/></h2> + <bean:message key="sdc.config.subscriptions.jsp.header"/></h2> <h3><bean:message key="ssm.config.subscribe.jsp.step"/></h3> <p><bean:message key="sdc.config.subscriptions.jsp.para1" /></p> <noscript> <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> -</noscript> +</noscript> <c:choose> <c:when test="${not empty pageList}"> <html:form method="POST" action="/systems/details/configuration/SubscriptionsSubmit.do?sid=${param.sid}"> @@ -51,7 +51,7 @@ </div> </rhn:list> <rhn:noscript/> - + <rhn:submitted/> </html:form> </c:when> @@ -60,6 +60,6 @@ arg0="/rhn/systems/details/configuration/ConfigChannelList.do?sid=${param.sid}"/> </strong></p> </c:otherwise> -</c:choose> +</c:choose> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp index 107cd05..4af2a56 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp @@ -32,7 +32,7 @@ path = "${path}" type = "${revisionBean.configRevision.configFileType.label}" nolink="true" - /></strong></c:set> + /></strong></c:set> <c:set var="channel" value="${revisionBean.configRevision.configFile.configChannel}"/> @@ -76,7 +76,7 @@ <td> <pre style="overflow: scroll; width: 100%; height: 400px;"><c:out value="${revisionBean.configRevisionActionResult.resultContents}"/></pre> </td> - </tr> + </tr> </table> </p> </body> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp index 15cf352..3669d07 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp @@ -20,7 +20,7 @@ <rl:listset name="fileSet"> <rhn:csrf /> <rhn:submitted /> - +  <rl:list decorator="SelectableDecorator" width="100%" @@ -35,7 +35,7 @@ headerkey="sdc.config.file_list.name" sortattr="path"> <c:choose> - <c:when test="${current.localRevision != null}"> + <c:when test="${current.localRevision != null}"> <cfg:file path = "${current.path}" type="${current.localConfigFileType}" nolink="true"/> </c:when> @@ -47,9 +47,9 @@ </rl:column> <c:set var="fileUrl" value="${cfg:fileUrl(current.configFileId)}"/> - <c:set var="compareUrl" value="${cfg:fileCompareUrl(current.configFileId)}"/> + <c:set var="compareUrl" value="${cfg:fileCompareUrl(current.configFileId)}"/> + -  <rl:column bound="false" headerkey="sdc.config.file_list.actions" @@ -79,9 +79,9 @@ <c:when test="${current.localRevision != null}"> <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.localRevision}"/> + arg0="${current.localRevision}"/> </c:set> - + <cfg:file path ="${revisionLook}" type ="${current.localConfigFileType}" id = "${current.localConfigFileId}" @@ -101,10 +101,10 @@ <rl:column bound="false" headerkey="sdc.config.file_list.current_revision" > - + <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.configRevision}"/> + arg0="${current.configRevision}"/> </c:set> <c:set var="display"><cfg:file path ="${revisionLook}" type ="${current.configFileType}" @@ -112,14 +112,14 @@ revisionId = "${current.configRevisionId}" /> </c:set> - + <c:choose> <c:when test="${current.localRevision != null}"> - <span class="overridden-file">${display}</span> + <span class="overridden-file">${display}</span> </c:when> <c:otherwise>${display}</c:otherwise> - </c:choose> - </rl:column> + </c:choose> + </rl:column> </rl:list> <c:import url="/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf"/> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp index 2422d41..02f3c31 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp @@ -36,7 +36,7 @@ <cfg:file path="${current.path}" type ="${current.localConfigFileType}" nolink = "true"/> </rl:column> - +  <rl:column bound="false" headerkey="sdc.config.file_list.actions"> @@ -49,7 +49,7 @@ <rl:column bound="false" headerkey="sdc.config.file_list.overrides" > - <c:choose> + <c:choose> <c:when test="${current.configRevision != null}"> <c:set var="channelDisplay"><cfg:channel id = "${current.configChannelId}" name ="${current.configChannelName}" @@ -74,13 +74,13 @@ > <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.localRevision}"/> + arg0="${current.localRevision}"/> </c:set> <cfg:file path ="${revisionLook}" type ="${current.localConfigFileType}" id = "${current.localConfigFileId}" revisionId = "${current.localRevisionId}" - /> + /> </rl:column> </rl:list> <br> diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp index d307528..27e0278 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp @@ -10,7 +10,7 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> <h2><img class="h2-image" src="${cfg:channelHeaderIcon('sandbox')}"/> -<bean:message key="sdc.config.header.overview"/></h2> +<bean:message key="sdc.config.header.overview"/></h2> <p><bean:message key="sdc.config.file_list.sandbox_description" arg0="${fn:escapeXml(requestScope.system.name)}" arg1="${rhn:localize('sdc.config.file_list.copy_to_global')}"/></p> @@ -26,17 +26,17 @@ > <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"/> - +  <rl:column bound = "false" sortable="true" headerkey="sdc.config.file_list.name" sortattr="path" - > + > <cfg:file path="${current.path}" - type ="${current.configFileType}" nolink = "true"/> + type ="${current.configFileType}" nolink = "true"/> </rl:column> - +  <rl:column bound="false" headerkey="sdc.config.file_list.actions"> @@ -50,7 +50,7 @@ > <c:set var = "revisionLook"> <bean:message key="sdcconfigfiles.jsp.filerev" - arg0="${current.configRevision}"/> + arg0="${current.configRevision}"/> </c:set> <cfg:file path ="${revisionLook}" type ="${current.configFileType}" diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp index 074c2a6..6f6d3e1 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp @@ -23,7 +23,7 @@ </p> <noscript> <p><bean:message key="common.config.rank.jsp.warning.noscript"/></p> - </noscript> + </noscript> </div> <html:form method="POST" action="/systems/ssm/config/Rank.do"> @@ -51,7 +51,7 @@ </td> </tr> </table> - + <div class="text-right"> <hr /> <html:hidden property="dispatch" value="${rhn:localize('ssm.config.rank.jsp.apply')}"/> diff --git a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp index 226ce84..d6afbec 100644 --- a/java/code/webapp/WEB-INF/pages/credentials/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/credentials/edit.jsp @@ -57,6 +57,6 @@ </div> </form> </div> - </div> + </div> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp index be260e5..4c2c26f 100644 --- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp @@ -35,7 +35,7 @@ emptykey="nosystems.message" alphabarcolumn="name" filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter"> - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="SelectableDecorator"/> <rl:decorator name="PageSizeDecorator"/> @@ -80,19 +80,19 @@ ${current.entitlementLevel} </rl:column> </rl:list> - + <div class="text-right"> <hr /> <html:submit property="dispatch"> <bean:message key="affectedsystems.jsp.apply"/> </html:submit> </div> - + <rl:csv dataset="pageList" name="systemAffectedCSVExport" exportColumns="name, status, channelLabels, entitlementLevel" header="${errata.advisoryName} - ${errata.advisoryType}" /> - + <rhn:submitted/> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp index f6febb9..4007480 100644 --- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp +++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp @@ -30,10 +30,10 @@ <label for="searchform"><bean:message key="docsearch.jsp.searchfor"/></label> </div> <div class="col-md-4"> - <html:text property="search_string" - name="search_string" + <html:text property="search_string" + name="search_string" styleId="searchform" - value="${search_string}" + value="${search_string}" styleClass="form-control" accesskey="4"/> </div> @@ -60,7 +60,7 @@ </div> </div> </div> - + <input type="hidden" name="submitted" value="true" /> </html:form> 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 f86d0a0..8a7b880 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp @@ -15,7 +15,7 @@ <div> <form method="post" action="/rhn/kickstart/cobbler/CobblerSnippetDelete.do"> <rhn:csrf /> -<h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> +<h2><bean:message key="snippetcreate.jsp.contents.header"/></h2> <table class="details"> <tr> <th> 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 37f9df2..a85e2ff 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp @@ -42,7 +42,7 @@ </th> <td> <bean:message key="cobbler.snippet.default"/><br/> - <rhn:tooltip key ="cobbler.snippet.default.tip"/> + <rhn:tooltip key ="cobbler.snippet.default.tip"/> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp index d57a127..ffaebfd 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp @@ -13,7 +13,7 @@ <c:import url="/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf"> <c:param name = "range_delete_url" value="/rhn/kickstart/KickstartIpRangeDelete.do"/> - <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEdit.do"/> + <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEdit.do"/> </c:import> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp index 7614800..1d8fb28 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp @@ -47,9 +47,9 @@ </rl:list> </rl:listset> - - + + </div> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index d62e141..19c63e8 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -25,7 +25,7 @@ <rhn:submitted /> <rl:list dataset="pageList" name="ksList" emptykey="kickstart.jsp.nokickstarts" alphabarcolumn="label" - filter="com.redhat.rhn.frontend.action.kickstart.KickstartProfileFilter"> + filter="com.redhat.rhn.frontend.action.kickstart.KickstartProfileFilter"> <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> <rl:column @@ -39,7 +39,7 @@ </c:when> <c:when test="${current.cobbler}"> <c:out value="${current.label}" escapeXml="true" /> - </c:when> + </c:when> <c:otherwise> <a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${current.id}"><c:out value="${current.label}" escapeXml="true" /></a> </c:otherwise> @@ -59,7 +59,7 @@ </rl:column> <rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel"> <c:out value="${current.treeLabel}"/> - </rl:column> + </rl:column> <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler"> <c:choose> <c:when test="${current.cobbler}"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp index 1f8ce19..1d26a32 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp @@ -17,7 +17,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - + </rhn:require> <c:import url="/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf"> <c:param name = "post_url" value="/kickstart/EditVariables.do"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index bb788f2..96a3548 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -24,7 +24,7 @@ <rhn:csrf /> <rhn:submitted /> <rl:list emptykey="kickstart.distributions.jsp.nolists" - alphabarcolumn="label"> + alphabarcolumn="label"> <rl:decorator name="PageSizeDecorator"/> <rl:column bound="false" diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp index 907380a..7aca435 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptorder.jsp @@ -11,8 +11,8 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf" %> - - + + <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/kickstart_details.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> @@ -23,11 +23,11 @@ <p> <bean:message key="kickstartscript.order.summary"/> </p> - + <html:form method="post" action="/kickstart/KickstartScriptOrder.do"> <rhn:csrf /> <rhn:submitted /> - + <noscript> <p><bean:message key="kickstartscript.order.noscript"/></p> </noscript> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp index 57796cb..8934012 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp @@ -41,7 +41,7 @@ <p> <bean:message key="kickstartscript.jsp.summary2"/> </p> - + <rl:listset name="kickstartScriptsSet"> <rhn:csrf /> <rl:list dataset="kickstart_scripts" @@ -49,13 +49,13 @@ name="kickstartPreScripts" styleclass="list" emptykey="kickstartscript.jsp.noscripts"> - + <rl:column bound="false" sortable="false" headerkey="kickstartscript.jsp.type"> ${current.prettyScriptType} </rl:column> - + <rl:column bound="false" sortable="false" headerkey="kickstartscript.jsp.scriptname"> @@ -68,7 +68,7 @@ <c:out value="${current.scriptName}" escapeXml="true" /> </c:if> </rl:column> - + <rl:column bound="false" sortable="false" headerkey="kickstartscript.jsp.language"> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index 93aa1a6..f0ea006 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -146,7 +146,7 @@ function clickNewestTree() { <tr> <th><bean:message key="softwareedit.jsp.repos" />:</th> <td> - + <c:forEach items="${kickstartSoftwareForm.map.possibleRepos}" var="item"> <html:multibox property="selectedRepos" disabled="${item.disabled}" value = "${item.value}" styleId="type_${item.value}"/> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 155b454..4d5368a 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -50,9 +50,9 @@ <c:if test="${empty requestScope.isIP}"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf" %> </c:if> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> <br/> - + <h2><i class="fa fa-rocket"></i><bean:message key="kickstart.schedule.heading4.jsp" /></h2> <table class="details"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp index 5e1102f..25b6f18 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp @@ -6,7 +6,7 @@ <head> <script language="javascript" type="text/javascript"> - + function toggleIFText(ctl) { var toDisable = null; var toEnable = null; @@ -16,7 +16,7 @@ } else { toDisable = document.getElementById("dhcpNetworkIf"); - toEnable = document.getElementById("staticNetworkIf"); + toEnable = document.getElementById("staticNetworkIf"); } toDisable.disabled = true; toEnable.disabled = false; @@ -33,7 +33,7 @@ } </script> - + <% boolean dhcpIfDisabled = Boolean.valueOf( (String) request.getAttribute("dhcpIfDisabled")).booleanValue(); diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp index 7d76e0d..6db5c4c 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/deleteconfirm.jsp @@ -2,5 +2,5 @@ <c:import url="/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf"> <c:param name = "nav" value="/WEB-INF/nav/kickstart_raw_mode.xml"/> <c:param name = "post_url" value="/kickstart/KickstartDeleteAdvanced.do"/> - <c:param name = "noComments" value="True"/> + <c:param name = "noComments" value="True"/> </c:import> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp index aede491..691bef1 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp @@ -26,9 +26,9 @@ function clickNewestTree(obj) { <c:param name = "summary_key" value="kickstartdetails.jsp.summary1"/> <c:param name = "action_key" value="message.Update"/> <c:param name = "url" value="/kickstart/AdvancedModeEdit.do"/> - <c:param name = "ksurl" value="${requestScope.ksurl}"/> - <c:param name = "usingUpdateAll" value="${requestScope.usingUpdateAll}"/> - <c:param name = "usingUpdateRedHat" value="${requestScope.usingUpdateRedHat}"/> + <c:param name = "ksurl" value="${requestScope.ksurl}"/> + <c:param name = "usingUpdateAll" value="${requestScope.usingUpdateAll}"/> + <c:param name = "usingUpdateRedHat" value="${requestScope.usingUpdateRedHat}"/> </c:import> </body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp index d23891d..e4111ac 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp @@ -8,7 +8,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf"%> <c:import url="/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf"> <c:param name = "range_delete_url" value="/rhn/kickstart/KickstartIpRangeDeleteAdvanced.do"/> - <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEditAdvanced.do"/> + <c:param name = "range_edit_url" value="/kickstart/KickstartIpRangeEditAdvanced.do"/> </c:import> </body> </html:html> 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 f1a8115..a99ed95 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -45,7 +45,7 @@ <rl:column headerkey="general.jsp.org.tbl.header1" filterattr="name"> ${current.name} </rl:column> - +  <rl:column bound="true" headerkey="org.channel.subscribed.systems" diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp index c20b9db..ed50eb3 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp @@ -27,7 +27,7 @@ filter="com.redhat.rhn.frontend.action.multiorg.OrgListFilter" emptykey="orglist.jsp.noOrgs"> -  +  <rl:column bound="false" sortable="true" headerkey="org.nopunc.displayname" @@ -47,7 +47,7 @@ <c:out value="${current.sharedChannels}" /> </c:otherwise> </c:choose> - </rl:column> + </rl:column> </rl:list> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp index 7fc9028..3aba5f7 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp @@ -36,7 +36,7 @@ <input type="hidden" name="formvars" value="aid" /> </rhn:list> - + </form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp index ac5671a..2e7b700 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp @@ -38,7 +38,7 @@ <input type="hidden" name="formvars" value="aid" /> </rhn:list> - + </form> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp index 6d05e3a..f9b2df1 100644 --- a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp @@ -37,6 +37,6 @@ <input type="hidden" name="aid" value="${aid}"> </rl:listset> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp index a03559e..837778f 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packagescheduleremote.jsp @@ -63,7 +63,7 @@ <html:submit> <bean:message key="scheduleremote.jsp.schedulepackageremoval"/> </html:submit> - </c:if> + </c:if> <c:if test="${param.mode == 'upgrade'}"> <html:submit> <bean:message key="scheduleremote.jsp.schedulepackageupgrade"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp index adbead4..565de4a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp @@ -8,7 +8,7 @@ <body> <rhn:toolbar base="h1" icon="fa-key" helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-cust-info"> - <bean:message key="system.jsp.customkey.createtitle"/> + <bean:message key="system.jsp.customkey.createtitle"/> </rhn:toolbar> <p> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp index 251d38d..6d258a4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp @@ -35,7 +35,7 @@ ${current.nvre}</a> </rl:column> </rl:list> - + <c:if test="${not empty requestScope.pageList}"> <div class="text-right"> <div align="left"> @@ -90,8 +90,8 @@ value='<bean:message key="installconfirm.jsp.confirm"/>'/> </div> - <input type="hidden" name="sid" value="${param.sid}" /></c:if> - + <input type="hidden" name="sid" value="${param.sid}" /></c:if> + </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp index 8aef6ac..2d39237 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp @@ -76,7 +76,7 @@ </c:choose> </rl:column> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> @@ -84,12 +84,12 @@ <rhn:require acl="system_feature(ftr_package_remove)"> <input type="submit" name ="dispatch" - value='<bean:message key="packagelist.jsp.removepackages"/>'/> + value='<bean:message key="packagelist.jsp.removepackages"/>'/> </rhn:require> </div> -</c:if> - +</c:if> + </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf index 1c1183e..92c7f3a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf @@ -43,7 +43,7 @@ <rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}" disabled="${not current.selectable}"/> - + <rl:column headerkey="packagelist.jsp.packagename" bound="false" sortattr="nvre" sortable="true" filterattr="nvre" styleclass="${nameStyle}"> @@ -66,7 +66,7 @@ </rl:column> </c:if> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> @@ -75,7 +75,7 @@ name ="dispatch" value='<bean:message key="${dispatch}"/>'/> </div> -</c:if> +</c:if> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp index 3ce0e73..a1cc508 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -40,7 +40,7 @@ <rl:column headerkey="upgradable.jsp.latest" bound="false" sortattr="nvrea" sortable="true" filterattr="nvrea"> - + <a href="/rhn/software/packages/Details.do?sid=${param.sid}&id_combo=${current.idCombo}"> ${current.nvrea}</a> </rl:column> @@ -66,16 +66,16 @@ </c:forEach> </rl:column> </rl:list> - + <c:if test="${not empty requestScope.all}"> <div class="text-right"> <rhn:submitted/> <hr/> <input type="submit" name ="dispatch" - value='<bean:message key="upgradable.jsp.upgrade"/>'/> + value='<bean:message key="upgradable.jsp.upgrade"/>'/> </div> -</c:if> +</c:if> </rl:listset> </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp index 8e0fba7..8bc0e13 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp @@ -38,15 +38,15 @@ function setStep(stepName) { <rl:decorator name = "PageSizeDecorator"/> <rl:radiocolumn value="${current.cobblerId}"/> <rl:column headerkey="kickstartranges.jsp.profile" filterattr="label" sortable="true" sortattr="label"> - <a href="${current.cobblerUrl}">${fn:escapeXml(current.label)}</a> + <a href="${current.cobblerUrl}">${fn:escapeXml(current.label)}</a> </rl:column> <rl:column headerkey="kickstart.channel.label.jsp" bound="true" attr="channelLabel" sortable="true" sortattr="channelLabel"/> <rl:column headerkey="kickstart.channel.virtCpu.jsp" bound="true" attr="virtCpus"/> - <rl:column headerkey="kickstart.channel.virtDisk.jsp" bound="true" attr="virtSpace"/> + <rl:column headerkey="kickstart.channel.virtDisk.jsp" bound="true" attr="virtSpace"/> <rl:column headerkey="kickstart.channel.virtMemory.jsp" bound="true" attr="virtMemory"/> <rl:column headerkey="kickstart.channel.virtBridge.jsp" bound="true" attr="virtBridge"/> </rl:list> - + <h2><bean:message key="virtualization.provision.first.jsp.header2" /></h2> <table class="details"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp index 9af83af..9243076 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp @@ -52,7 +52,7 @@ <a href="/rhn/systems/details/Overview.do?sid=${current.virtualSystemId}"> <c:out value="${current.serverName}" escapeXml="true" /> </a> - </c:when> + </c:when> <c:otherwise> <c:out value="${current.serverName}" escapeXml="true" /> </c:otherwise> @@ -85,7 +85,7 @@ <a href="/rhn/channels/ChannelDetail.do?cid=${current.channelId}"> ${current.channelLabels} </a> - </c:when> + </c:when> <c:otherwise> ${current.channelLabels} </c:otherwise> 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 51d3a81..4df08a0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp @@ -81,7 +81,7 @@ </c:when> <c:otherwise> <rl:selectablecolumn value="${current.id}"/> - + </c:otherwise> </c:choose> @@ -104,7 +104,7 @@ </rl:column> <rl:column headerkey="systemlist.jsp.last_checked_in"> <rl:expandable><a href="/rhn/systems/DuplicateSystemsCompare.do?key=${current.key}&key_type=${key_type}"><bean:message key="Compare Systems"/></a></rl:expandable> - <rl:non-expandable>${current.lastCheckinString}</rl:non-expandable> + <rl:non-expandable>${current.lastCheckinString}</rl:non-expandable> </rl:column> </rl:list> 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 13782e4..ee16ba7 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp @@ -27,15 +27,15 @@ toggleElement(document.getElementById(linkId + 'Show')); toggleElement(document.getElementById(linkId + 'Hide')); } - + function handle_delete(div_del_id, div_confirm_id, form) { var div_del = document.getElementById(div_del_id); - var div_confirm = document.getElementById(div_confirm_id); + var div_confirm = document.getElementById(div_confirm_id); div_del.style.display = 'none'; div_confirm.style.display = ''; return false; - } - + } + </script> </head> <body> @@ -52,8 +52,8 @@ <p><bean:message key="duplicate.compares.jsp.message" arg0="${requestScope.maxLimit}"/>.</p> <rl:list emptykey="nosystems.message" - alphabarcolumn="name" - filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" + alphabarcolumn="name" + filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" > <rl:decorator name="SelectableDecorator"/> <rl:decorator name="PageSizeDecorator"/> @@ -120,7 +120,7 @@ <c:set var ="key" value="row.macaddress"/> <c:set var ="items_list" value="${requestScope.systems.macAddresses}"/> <c:set var ="href" value=""/> - <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> <tr class="list-row-odd" id = "ipAddressRow"> <c:set var ="key" value="row.ip"/> @@ -158,7 +158,7 @@ <c:set var ="href" value=""/> <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list.jspf" %> </tr> - + <tr class="list-row-odd" id = "activationKeysRow"> <c:set var ="key" value="Activation Keys"/> <c:set var ="items_list" value="${requestScope.systems.activationKeys}"/> @@ -214,7 +214,7 @@ <c:set var ="href" value=""/> <%@ include file="/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf" %> </tr> - </tbody> + </tbody> </table> </c:when> <c:otherwise><p><bean:message key = "nosystems.message"/></p></c:otherwise> 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 8176621..55da3f0 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp @@ -48,7 +48,7 @@ ${current.addOnEntitlementLevel} </rhn:column> - <rhn:column header="systemlist.jsp.channel"> + <rhn:column header="systemlist.jsp.channel"> <c:choose> <c:when test="${current.channelId == null}"> <bean:message key="none.message"/> @@ -65,7 +65,7 @@  <c:if test="${requestScope.showCommands}"> - <hr/> + <hr/> <div class="panel panel-default"> <table class="table">  @@ -82,12 +82,12 @@ <bean:message key="systementitlements.jsp.set_to_manage_entitled" /> </html:submit> </c:if> - + <c:if test="${requestScope.showUnentitled}"> <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="systementitlements.jsp.set_to_unentitled" /> </html:submit> - </c:if> + </c:if> </td> </tr>  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 5e65023..ca2d5c3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp @@ -100,8 +100,8 @@ </c:otherwise> </c:choose> - </rl:column> - + </rl:column> + <rl:column headerkey="Registered"> ${current.registeredString} </rl:column> diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp index 7678dbc..351bdf1 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp @@ -65,7 +65,7 @@ <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <c:if test="${requestScope.showApplyErrata == 'false'}"> <rl:column headerkey="emptyspace.jsp" styleclass="text-align: center;"> <i class="fa fa-clock-o"></i> @@ -78,7 +78,7 @@ selected="${current.selected}" disabled="${not current.selectable}"/> </c:if> - + <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false"> <c:if test="${current.securityAdvisory}"> @@ -91,21 +91,21 @@ <i class="fa spacewalk-icon-enhancement"></i> </c:if> </rl:column> - + <rl:column headerkey="erratalist.jsp.advisory" bound="false" sortattr="advisoryName" sortable="true"> <a href="/rhn/errata/details/Details.do?eid=${current.id}"> ${current.advisoryName}</a> </rl:column> - + <rl:column headerkey="erratalist.jsp.synopsis" bound="false" sortattr="advisorySynopsis" sortable="true" filterattr="advisorySynopsis"> ${current.advisorySynopsis} </rl:column> - + <rl:column headerkey="errata.jsp.status" bound="false" sortattr="currentStatusAndActionId[0]" sortable="true"> @@ -127,16 +127,16 @@ <bean:message key="affectedsystems.jsp.none"/> </c:if> </rl:column> - + <rl:column headerkey="erratalist.jsp.updated" bound="false" sortattr="updateDateObj" sortable="true" defaultsort="desc"> ${current.updateDate} - </rl:column> - + </rl:column> + </rl:list> - + <c:if test="${requestScope.showApplyErrata == 'true'}"> <div class="text-right"> <hr /> @@ -146,7 +146,7 @@ </div> </c:if> - + <c:if test="${requestScope.showApplyErrata == 'true'}"> <rl:csv name="errataList" diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp index 92e2eb4..1e499b6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp @@ -25,7 +25,7 @@ width="100%" styleclass="list" emptykey="erratalist.jsp.noerrata"> - + <rl:decorator name="PageSizeDecorator"/> <rl:decorator name="ElaborationDecorator"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp index 8f5f972..d88d267 100644 --- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp @@ -15,7 +15,7 @@ <bean:message key="inactivelist.jsp.header"/> </rhn:toolbar> <c:set var="showLastCheckinSort" value="true"/> - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp index 04fc3e7..368b990 100644 --- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp @@ -29,7 +29,7 @@ <%@ include file="/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf" %> </c:if> </rl:listset> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp index 6e871b2..7d3a1f9 100644 --- a/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/physicallist.jsp @@ -17,7 +17,7 @@ - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> 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 6125dce..f076d8d 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 @@ -23,7 +23,7 @@ </rhn:list> </form> - + </body> </html:html> 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 c2b471b..66702dc 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 @@ -29,7 +29,7 @@ </rhn:listdisplay> </rhn:list> </form> - + </body> </html> diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp index 9534b26..b8c5a04 100644 --- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp @@ -15,7 +15,7 @@ <bean:message key="proxylist.jsp.header"/> </rhn:toolbar> - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp index daa755d..b9e0a28 100644 --- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp @@ -28,8 +28,8 @@ <c:otherwise> <option value="${option.value}">${option.label}</option> </c:otherwise> - </c:choose> - </c:forEach> + </c:choose> + </c:forEach> </select> <html:submit> @@ -43,13 +43,13 @@ decorator="SelectableDecorator" emptykey="nosystems.message" alphabarcolumn="name" - filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" + filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" > - + <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="SystemIconDecorator"/> <rl:decorator name="PageSizeDecorator"/> - + <rl:selectablecolumn value="${current.id}" selected="${current.selected}" disabled="${not current.selectable}"/> @@ -75,7 +75,7 @@ sortattr="channelLabels" > <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_list_fragment.jspf" %> </rl:column> - + <rl:column sortable="true" bound="false" headerkey="registeredlist.jsp.date" @@ -83,7 +83,7 @@ defaultsort="desc"> <fmt:formatDate value="${current.created}" type="both" dateStyle="short" timeStyle="long"/> </rl:column> - + <rl:column sortable="true" bound="false" headerkey="registeredlist.jsp.user" @@ -98,13 +98,13 @@ </c:otherwise> </c:choose> </rl:column> - +  <rl:column sortable="false" bound="false" headerkey="systemlist.jsp.entitlement"> <c:out value="${current.entitlementLevel}" escapeXml="false"/> - </rl:column> + </rl:column> </rl:list> </rl:listset> </body> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp index e166205..a34c9c3 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp @@ -109,7 +109,7 @@ <div class="page-summary"> <p> <bean:message key="sdc.channels.edit.summary2"/> - + <select name="new_base_channel_id" size="${fn:length(base_channels)+fn:length(custom_base_channels)+3}"> <option value="-1" <c:if test="${current_base_channel_id == -1}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp index 0cb6be2..712b4ea 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp @@ -28,7 +28,7 @@ </ul> </c:otherwise> </c:choose> - + <bean:message key="sdc.channels.confirmNewBase.toBeSubscribedTo"/> <c:choose> @@ -44,7 +44,7 @@ </ul> </c:otherwise> </c:choose> - + <bean:message key="sdc.channels.confirmNewBase.otherChannelsWarning"/>   diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp index 689ba73..f807423 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp @@ -6,8 +6,8 @@ <html:html > <body> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> - - <rhn:toolbar base="h2" icon="fa-info-circle" + + <rhn:toolbar base="h2" icon="fa-info-circle" creationUrl="/rhn/systems/details/CreateCustomData.do?sid=${system.id}" creationType="customdata"> <bean:message key="sdc.details.customdata.header"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index e6e4011..20d03d6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -91,11 +91,11 @@ </div> </div> - + <div class="systeminfo"> - + diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp index 308ecb7..d66b6bd 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp @@ -17,7 +17,7 @@ - + <rl:listset name="systemListSet" legend="system"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp index e187425..1e37ee6 100644 --- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp @@ -70,10 +70,10 @@ <a href="/rhn/systems/details/Overview.do?sid=${current.virtualSystemId}"> <c:out value="${current.serverName}" escapeXml="true" /> </a> - </c:when> + </c:when> <c:otherwise> <c:out value="${current.serverName}" escapeXml="true" /> - </c:otherwise> + </c:otherwise> </c:choose> </rhn:column> @@ -95,7 +95,7 @@ <a href="/rhn/channels/ChannelDetail.do?cid=${current.channelId}"> ${current.channelLabels} </a> - </c:when> + </c:when> <c:otherwise> ${current.channelLabels} </c:otherwise> diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp index 5a58a12..f312363 100644 --- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp +++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp @@ -95,7 +95,7 @@ <c:if test="${requestScope.latestErrata == 'y'}"> <div id="latest-errata-pane" class="row"> <script type="text/javascript"> - LatestErrataRenderer.renderAsync(makeAjaxCallback("latest-errata-pane", false)); + LatestErrataRenderer.renderAsync(makeAjaxCallback("latest-errata-pane", false)); </script> </div> </c:if>

1 0

Changes to 'refs/tags/spacecmd-2.1.18-1'
by aparsons 05 Dec '13

05 Dec '13

Tag 'spacecmd-2.1.18-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2013-12-06 00:41 +0000 Tagging package [spacecmd] version [2.1.18-1] in directory [spacecmd/]. Changes since spacewalk-backend-2.1.38-1: Aron Parsons (6): spacecmd: fix tab completion for repo_addfilters spacecmd: add softwarechannel_addrepo spacecmd: add softwarechannel_removerepo spacecmd: add softwarechannel_listrepos spacecmd: print repos in softwarechannel_getdetails Automatic commit of package [spacecmd] release [2.1.18-1]. --- rel-eng/packages/spacecmd | 2 spacecmd/spacecmd.spec | 9 +++ spacecmd/src/lib/repo.py | 4 + spacecmd/src/lib/softwarechannel.py | 88 ++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 3 deletions(-) ---

1 0

6 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons 05 Dec '13

05 Dec '13

rel-eng/packages/spacecmd | 2 spacecmd/spacecmd.spec | 9 +++ spacecmd/src/lib/repo.py | 4 + spacecmd/src/lib/softwarechannel.py | 88 ++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 3 deletions(-) New commits: commit f6923dc5586b91e1157289a054769172b7130da3 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:41:44 2013 -0500 Automatic commit of package [spacecmd] release [2.1.18-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index 537accd..85e5616 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.17-1 spacecmd/ +2.1.18-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index 4ab38d8..2cf3bf4 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.17 +Version: 2.1.18 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,13 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Thu Dec 05 2013 Aron Parsons <aronparsons(a)gmail.com> 2.1.18-1 +- spacecmd: print repos in softwarechannel_getdetails +- spacecmd: add softwarechannel_listrepos +- spacecmd: add softwarechannel_removerepo +- spacecmd: add softwarechannel_addrepo +- spacecmd: fix tab completion for repo_addfilters + * Thu Dec 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.17-1 - package search: make sure the lucene search syntax works commit 79ec600cec0498d10f1650aa608fc1c0bdac4269 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:41:24 2013 -0500 spacecmd: print repos in softwarechannel_getdetails diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index 3f03c26..d755db8 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -370,6 +370,13 @@ def do_softwarechannel_details(self, args): for tree in trees: print tree.get('label') + if details.get('contentSources'): + print + print 'Repos' + print '-----' + for repo in details.get('contentSources'): + print repo.get('label') + #################### def help_softwarechannel_listerrata(self): commit b4c7af7242743962a8bd0f348a6d4591888d39e2 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:38:43 2013 -0500 spacecmd: add softwarechannel_listrepos diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index c4039c9..3f03c26 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -1651,7 +1651,7 @@ def do_softwarechannel_addrepo(self, args): #################### def help_softwarechannel_removerepo(self): - print 'softwarechannel_removerepo: Add a repo to a software channel' + print 'softwarechannel_removerepo: Remove a repo from a software channel' print 'usage: softwarechannel_removerepo CHANNEL REPO' def complete_softwarechannel_removerepo(self, text, line, beg, end): @@ -1682,4 +1682,24 @@ def do_softwarechannel_removerepo(self, args): self.client.channel.software.disassociateRepo(self.session, channel, repo) +#################### + +def help_softwarechannel_listrepos(self): + print 'softwarechannel_listrepos: List the repos for a software channel' + print 'usage: softwarechannel_listrepos CHANNEL' + +def complete_softwarechannel_listrepos(self, text, line, beg, end): + parts = line.split(' ') + + return tab_completer(self.do_softwarechannel_list('', True), text) + +def do_softwarechannel_listrepos(self, args): + (args, options) = parse_arguments(args) + + details = self.client.channel.software.getDetails(self.session, args[0]) + repos = [r.get('label') for r in details.get('contentSources')] + + if len(repos): + print '\n'.join(sorted(repos)) + # vim:ts=4:expandtab: commit a14794b6be6ffdc6513e6303f9291d371551ac59 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:35:29 2013 -0500 spacecmd: add softwarechannel_removerepo diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index 6966b79..c4039c9 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -1648,4 +1648,38 @@ def do_softwarechannel_addrepo(self, args): self.client.channel.software.associateRepo(self.session, channel, repo) +#################### + +def help_softwarechannel_removerepo(self): + print 'softwarechannel_removerepo: Add a repo to a software channel' + print 'usage: softwarechannel_removerepo CHANNEL REPO' + +def complete_softwarechannel_removerepo(self, text, line, beg, end): + parts = line.split(' ') + + if len(parts) == 2: + return tab_completer(self.do_softwarechannel_list('', True), + text) + elif len(parts) == 3: + try: + details = self.client.channel.software.getDetails(self.session, + parts[1]) + repos = [r.get('label') for r in details.get('contentSources')] + except: + return + + return tab_completer(repos, text) + +def do_softwarechannel_removerepo(self, args): + (args, options) = parse_arguments(args) + + if len(args) < 2: + self.help_softwarechannel_removerepo() + return + + channel = args[0] + repo = args[1] + + self.client.channel.software.disassociateRepo(self.session, channel, repo) + # vim:ts=4:expandtab: commit 25f4f7c2b4612b6cb9a45d9b09fd78ae22a546be Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:24:28 2013 -0500 spacecmd: add softwarechannel_addrepo diff --git a/spacecmd/src/lib/softwarechannel.py b/spacecmd/src/lib/softwarechannel.py index e4b537d..6966b79 100644 --- a/spacecmd/src/lib/softwarechannel.py +++ b/spacecmd/src/lib/softwarechannel.py @@ -1621,4 +1621,31 @@ def do_softwarechannel_setsyncschedule(self, args): self.client.channel.software.syncRepo(self.session, channel, schedule) +#################### + +def help_softwarechannel_addrepo(self): + print 'softwarechannel_addrepo: Add a repo to a software channel' + print 'usage: softwarechannel_addrepo CHANNEL REPO' + +def complete_softwarechannel_addrepo(self, text, line, beg, end): + parts = line.split(' ') + + if len(parts) == 2: + return tab_completer(self.do_softwarechannel_list('', True), + text) + elif len(parts) == 3: + return tab_completer(self.do_repo_list('', True), text) + +def do_softwarechannel_addrepo(self, args): + (args, options) = parse_arguments(args) + + if len(args) < 2: + self.help_softwarechannel_addrepo() + return + + channel = args[0] + repo = args[1] + + self.client.channel.software.associateRepo(self.session, channel, repo) + # vim:ts=4:expandtab: commit 6255363ec7ca0028d1934057d9bf8f81d156857f Author: Aron Parsons <aronparsons(a)gmail.com> Date: Thu Dec 5 19:17:56 2013 -0500 spacecmd: fix tab completion for repo_addfilters diff --git a/spacecmd/src/lib/repo.py b/spacecmd/src/lib/repo.py index d6951a1..20a2065 100644 --- a/spacecmd/src/lib/repo.py +++ b/spacecmd/src/lib/repo.py @@ -100,7 +100,9 @@ def help_repo_addfilters(self): print 'usage: repo_addfilters repo <filter ...>' def complete_repo_addfilters(self, text, line, beg, end): - return tab_completer(self.do_repo_add('', True), text) + if len(line.split(' ')) <= 2: + return tab_completer(self.do_repo_list('', True), + text) def do_repo_addfilters(self, args): # arguments can start with -, so don't parse arguments in the normal way

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.38-1'
by aparsons 05 Dec '13

05 Dec '13

Tag 'spacewalk-backend-2.1.38-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2013-12-06 00:11 +0000 Tagging package [spacewalk-backend] version [2.1.38-1] in directory [backend/]. Changes since spacecmd-2.1.17-1: Aron Parsons (2): detect RDO instances as QEMU guests Automatic commit of package [spacewalk-backend] release [2.1.38-1]. --- backend/server/handlers/xmlrpc/registration.py | 2 ++ backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits December 2013