Skip to content

Commit

Permalink
Merge Master
Browse files Browse the repository at this point in the history
  • Loading branch information
@bisht-richa
bisht-richa committed Nov 29, 2024
1 parent 908028e commit e52bfc0
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 131 deletions.
6 changes: 6 additions & 0 deletions java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,12 @@ private String renderImgUrl() {
tag.setAttribute("src", getImg());

if (imgAlt != null) {
tag.setAttribute("alt", LocalizationService.getInstance().getMessage(imgAlt));
}
return tag.render();
}
return "";
}

private String renderIcon() {
if (assertNotEmpty(getIcon())) {
Expand Down Expand Up @@ -691,6 +696,7 @@ private String renderActionLink(String url, String text, String className,

HtmlTag a = new HtmlTag("a");
a.setAttribute("href", url);

if (isSpaOff) {
a.setAttribute("data-senna-off", "true");
}
Expand Down
125 changes: 71 additions & 54 deletions java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,82 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>

<html:html>
<html:html>
<body>
<c:choose>
<c:when test="${param.oid != 1}">
<rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
miscImg="${img}"
miscAlt="${text}"
deletionUrl="/rhn/admin/multiorg/DeleteOrg.do?oid=${param.oid}"
deletionAcl="user_role(satellite_admin)"
deletionType="org"
imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${org.name}" />
</rhn:toolbar>
</c:when>
<c:otherwise>
<rhn:toolbar base="h1" icon="header-organisation"
miscUrl="${url}"
miscAcl="user_role(org_admin)"
miscText="${text}"
miscImg="${img}"
miscAlt="${text}"
imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${org.name}" />
</rhn:toolbar>
</c:otherwise>
</c:choose>

<body>
<c:choose>
<c:when test="${param.oid != 1}">
<rhn:toolbar base="h1" icon="header-organisation" miscUrl="${url}" miscAcl="user_role(org_admin)"
miscText="${text}" miscImg="${img}" miscAlt="${text}"
deletionUrl="/rhn/admin/multiorg/DeleteOrg.do?oid=${param.oid}"
deletionAcl="user_role(satellite_admin)" deletionType="org" imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${org.name}" />
</rhn:toolbar>
</c:when>
<c:otherwise>
<rhn:toolbar base="h1" icon="header-organisation" miscUrl="${url}" miscAcl="user_role(org_admin)"
miscText="${text}" miscImg="${img}" miscAlt="${text}" imgAlt="users.jsp.imgAlt">
<c:out escapeXml="true" value="${org.name}" />
</rhn:toolbar>
</c:otherwise>
</c:choose>
<rhn:dialogmenu mindepth="0" maxdepth="2" definition="/WEB-INF/nav/org_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />

<rhn:dialogmenu mindepth="0" maxdepth="2" definition="/WEB-INF/nav/org_tabs.xml"
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />

<form method="post" class="form-horizontal" action="/rhn/admin/multiorg/OrgConfigDetails.do">
<rhn:csrf />
<rhn:submitted />
<rhn:hidden name="oid" value="${param.oid}" />
<div class="panel panel-default">
<div class="panel-heading">
<h4>
<bean:message key="satconfig.jsp.header" />
</h4>
</div>
<div class="panel-body">
<p>
<bean:message key="satconfig.jsp.description" />
</p>
<hr />
<div class="form-group">
<label class="col-lg-3 control-label">
<bean:message key="org-config.orgadm-mgmt.jsp" />
</label>
<div class="col-lg-6">
<div class="checkbox">
<input type="checkbox" name="org_admin_mgmt" value="enabled" id="org_admin_mgmt" <c:if
test="${org.orgAdminMgmt.enabled}">
checked="checked"
</c:if>/>
</div>
</div>
</div>
</div>
<form method="post"
class="form-horizontal"
action="/rhn/admin/multiorg/OrgConfigDetails.do">
<rhn:csrf />
<rhn:submitted/>
<rhn:hidden name="oid" value="${param.oid}"/>
<div class="panel panel-default">
<div class="panel-heading">
<h4><bean:message key="satconfig.jsp.header"/></h4>
</div>
<div class="panel-body">
<p><bean:message key="satconfig.jsp.description"/></p>
<hr />
<div class="form-group">
<label class="col-lg-3 control-label">
<bean:message key="org-config.orgadm-mgmt.jsp"/>
</label>
<div class="col-lg-6">
<div class="checkbox">
<input type="checkbox" name="org_admin_mgmt"
value="enabled" id="org_admin_mgmt"
<c:if test = "${org.orgAdminMgmt.enabled}">
checked="checked"
</c:if>/>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h4><bean:message key="orgconfig.jsp.header"/></h4>
</div>
<div class="panel-body">
<p><bean:message key="orgconfig.jsp.description"/></p>
<hr/>
<%@ include file="/WEB-INF/pages/common/fragments/org-config.jspf" %>
</div>
</div>
<html:submit styleClass="btn btn-primary">
<bean:message key="orgdetails.jsp.submit"/>
</html:submit> -->
</html:submit>
</form>
</body>
</html:html>
156 changes: 80 additions & 76 deletions java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,95 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>


<html>
<html>

<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>

<h2>
<rhn:icon type="header-package-upgrade" title="errata.common.upgradepackageAlt" />
<bean:message key="upgradable.jsp.header" />
</h2>
<div class="page-summary">
<p>
<bean:message key="upgradable.jsp.summary" />
</p>
</div>
<h2>
<rhn:icon type="header-package-upgrade" title="errata.common.upgradepackageAlt" />
<bean:message key="upgradable.jsp.header" />
</h2>
<div class="page-summary">
<p>
<bean:message key="upgradable.jsp.summary" />
</p>
</div>

<c:set var="pageList" value="${requestScope.all}" />
<c:set var="pageList" value="${requestScope.all}" />

<rl:listset name="packageListSet">
<rhn:csrf />
<rhn:submitted />
<c:if test="${not empty requestScope.all}">
<div class="spacewalk-section-toolbar">
<div class="action-button-wrapper">
<input type="submit" class="btn btn-default" name="dispatch"
value='<bean:message key="upgradable.jsp.upgrade"/>' />
</div>
</div>
</c:if>
<rl:list dataset="pageList" width="100%" name="packageList" emptykey="packagelist.jsp.nopackages"
alphabarcolumn="nvrea">
<rl:decorator name="PageSizeDecorator" />
<rl:decorator name="ElaborationDecorator" />
<rl:decorator name="SelectableDecorator" />
<rl:selectablecolumn value="${current.selectionKey}" selected="${current.selected}"
disabled="${not current.selectable}" />
<rl:listset name="packageListSet">
<rhn:csrf />
<rhn:submitted />
<c:if test="${not empty requestScope.all}">
<div class="spacewalk-section-toolbar">
<div class="action-button-wrapper">
<input type="submit" class="btn btn-default" name="dispatch"
value='<bean:message key="upgradable.jsp.upgrade"/>'/>
</div>
</div>
</c:if>
<rl:list dataset="pageList"
width="100%"
name="packageList"
emptykey="packagelist.jsp.nopackages"
alphabarcolumn="nvrea">
<rl:decorator name="PageSizeDecorator"/>
<rl:decorator name="ElaborationDecorator"/>
<rl:decorator name="SelectableDecorator"/>
<rl:selectablecolumn value="${current.selectionKey}"
selected="${current.selected}"
disabled="${not current.selectable}"/>

<rl:column headerkey="upgradable.jsp.latest" bound="false" sortattr="nvrea" sortable="true"
filterattr="nvrea">
<rl:column headerkey="upgradable.jsp.latest" bound="false"
sortattr="nvrea"
sortable="true" filterattr="nvrea">

<a href="/rhn/software/packages/Details.do?sid=${param.sid}&amp;id_combo=${current.idCombo}">
${current.nvrea}</a>
<c:if test="${current.appstream != null}">
<span class="label label-info" title="AppStream module: ${current.appstream}">
<c:out value="${current.appstream}" />
</span>
&nbsp;
</c:if>
<c:if test="${current.pkgReboot}">
<rhn:icon type="errata-reboot" title="errata-legend.jsp.reboot" />
</c:if>
<a href="/rhn/software/packages/Details.do?sid=${param.sid}&amp;id_combo=${current.idCombo}">
${current.nvrea}</a>
<c:if test="${current.appstream != null}">
<span class="label label-info" title="AppStream module: ${current.appstream}">
<c:out value="${current.appstream}"/>
</span>
&nbsp;
</c:if>
<c:if test="${current.pkgReboot}">
<rhn:icon type="errata-reboot" title="errata-legend.jsp.reboot" />
</c:if>
</rl:column>

<rl:column headerkey="upgradable.jsp.installed" bound="false">
${current.installedPackage}
</rl:column>

<rl:column headerkey="upgradable.jsp.errata">
<c:forEach items="${current.errata}" var="errata">
<c:if test="${not empty errata.advisory}">
<c:if test="${errata.type == 'Security Advisory'}">
<rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" />
</c:if>
<c:if test="${errata.type == 'Bug Fix Advisory'}">
<rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" />
</c:if>
<c:if test="${errata.type == 'Product Enhancement Advisory'}">
<rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" />
</c:if>
<c:if test="${current.errataReboot}">
<rhn:icon type="errata-reboot" title="errata-legend.jsp.reboot" />
</c:if>
<c:if test="${current.errataRestart}">
<rhn:icon type="errata-restart" title="errata.jsp.restart-tooltip" />
</c:if>
<a href="/rhn/errata/details/Details.do?eid=${errata.id}">${errata.advisory}</a><br />
</c:if>
</c:forEach>
${current.installedPackage}
</rl:column>
</rl:list>

</rl:listset>
</body>
<rl:column headerkey="upgradable.jsp.errata">
<c:forEach items="${current.errata}" var="errata">
<c:if test="${not empty errata.advisory}">
<c:if test="${errata.type == 'Security Advisory'}">
<rhn:icon type="errata-security" title="erratalist.jsp.securityadvisory" />
</c:if>
<c:if test="${errata.type == 'Bug Fix Advisory'}">
<rhn:icon type="errata-bugfix" title="erratalist.jsp.bugadvisory" />
</c:if>
<c:if test="${errata.type == 'Product Enhancement Advisory'}">
<rhn:icon type="errata-enhance" title="erratalist.jsp.productenhancementadvisory" />
</c:if>
<c:if test="${current.errataReboot}">
<rhn:icon type="errata-reboot" title="errata-legend.jsp.reboot" />
</c:if>
<c:if test="${current.errataRestart}">
<rhn:icon type="errata-restart" title="errata.jsp.restart-tooltip" />
</c:if>
<a href="/rhn/errata/details/Details.do?eid=${errata.id}">${errata.advisory}</a><br/>
</c:if>
</c:forEach>
</rl:column>
</rl:list>

</html>
</rl:listset>
</body>
</html>
Loading

0 comments on commit e52bfc0

Please sign in to comment.