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@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> - + <!-- Key --> <rl:column bound="true" headerkey="kickstart.activationkeys.jsp.key" attr="token" /> - +
<!-- Usage Limit --> <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">
- <!-- Organization name column --> + <!-- Organization name column --> <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">
- <!-- Organization name column --> + <!-- Organization name column --> <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">
- <!-- Username column --> + <!-- Username column --> <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 />
- + <!-- Start of active users list --> <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> - + <!-- Real name column --> <rl:column bound="false" sortable="true" @@ -47,7 +47,7 @@ sortattr="userLastName"> <c:out value="${current.userLastName}, ${current.userFirstName}" /> </rl:column> - + <!-- Roles 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> - + <!-- Channels we're allowed to subscribe to --> <rl:column bound="false" sortable="false" @@ -46,7 +46,7 @@ <c:out value="${chan}" /><br /> </c:forEach> </rl:column> - + <!-- Channels we're allowed to unsubscribe from --> <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> - + <!-- Entitlement 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}"/> - + <!--Name Column --> <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}"/> - + <!-- Channel name column --> <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> +
<!--Systems 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>
<!--USE in SSM 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> <!-- Systems-list --> <div> @@ -68,7 +68,7 @@ </rl:column> </rl:list> </div> - + <c:if test="${not empty requestScope.selectedSystems && not empty requestScope.selectedFiles}"> <!-- Date picker --> <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> <!-- Adding recent events --> <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 /> - + <!-- Start of Files list --> <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)}"/> +
- <!-- Actions --> <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> - + <!-- Actions --> <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}"/> - + <!-- File name column --> <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> - + <!-- Actions --> <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> - + <!-- Subscribed Systems 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">
- <!-- Organization name column --> + <!-- Organization name column --> <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 @@
<!-- Entitlements Section --> <c:if test="${requestScope.showCommands}"> - <hr/> + <hr/> <div class="panel panel-default"> <table class="table"> <!-- Base Entitlement Section --> @@ -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> <!-- Add On Entitlement Section --> 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> - + <!-- Entitlement 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>
spacewalk-commits@lists.fedorahosted.org
-
mkollar