Skip to content

Commit

Permalink
Fixed OpenSCAP search page layout (#8960)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bisht-richa
bisht-richa authored Jul 23, 2024
1 parent 6719ea0 commit 832b987
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 107 deletions.
3 changes: 2 additions & 1 deletion java/code/src/com/suse/manager/webui/utils/ViewHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ public enum ViewHelper {
"/rhn/manager/systems/details/highstate",
"/rhn/manager/systems/keys",
"/rhn/manager/audit/cve",
"/rhn/errata/Search.do"
"/rhn/errata/Search.do",
"/rhn/audit/scap/Search.do"
);

ViewHelper() { }
Expand Down
230 changes: 124 additions & 106 deletions java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,116 +26,134 @@
</rhn:toolbar>
<p><bean:message key="scapsearch.jsp.summary"/></p>
<div class="panel panel-default">
<div class="panel-heading">
<h4><bean:message key="scapsearch.jsp.instructions"/></h4>
</div>
<div class="panel-body">
<html:form styleClass="form-inline" action="/audit/scap/Search.do">
<rhn:csrf/>
<table class="table">
<div class="panel-heading">
<h4><bean:message key="scapsearch.jsp.instructions"/></h4>
</div>
<div class="panel-body">
<html:form styleClass="form-horizontal" action="/audit/scap/Search.do">
<rhn:csrf/>
<table class="table">
<tr>
<td>
<label class="w-100 control-label" for="searchfor">
<bean:message key="scapsearch.jsp.searchfor"/>:
</label>
</td>
<td>
<div class="row-0">
<div class="col-md-6">
<div class="input-group">
<html:text property="search_string" styleClass="form-control" name="search_string"
value="${search_string}" maxlength="100" accesskey="4"/>
<div class="input-group-btn">
<button type="submit" class="btn btn-default">
<rhn:icon type="header-search" />
<bean:message key="button.search"/>
</button>
</div>
</div>
</div>
<div class="col-md-6"><bean:message key="scapsearch.jsp.whatsearch.tip"/></div>
</div>
</td>
</tr>
<tr>
<td>
<label class="w-100 control-label" for="withresult">
<bean:message key="scapsearch.jsp.withresult"/>:
</label>
</td>
<td>
<div class="row-0">
<div class="col-md-6">
<html:select styleClass="form-control" property="result_filter">
<html:options collection="allResults" property="label" labelProperty="label"/>
</html:select>
</div>
</div>
</td>
</tr>
<tr>
<td>
<label class="w-100 control-label" for="wheretosearch">
<bean:message key="systemsearch.jsp.wheretosearch"/>
</label>
</td>
<td>
<div class="radio">
<label for="whereToSearch-all">
<html:radio property="whereToSearch" value="all" styleId="whereToSearch-all"/>
<bean:message key="systemsearch.jsp.searchallsystems"/>
</label>
</div>
<div class="radio">
<label for="whereToSearch-system_list">
<html:radio property="whereToSearch" value="system_list" styleId="whereToSearch-system_list"/>
<bean:message key="systemsearch.jsp.searchSSM"/>
</label>
</div>
</td>
</tr>
<tr>
<td>
<label class="w-100 control-label" for="scanDate">
<bean:message key="scapsearch.jsp.scan_date"/>:
</label>
</td>
<td>
<div class="checkbox">
<label for="scanDateOptionsCheckBox">
<html:checkbox styleId="scanDateOptionsCheckBox" property="optionScanDateSearch" onclick="javascript:scanDateSearchOptions()">
</html:checkbox>
<bean:message key="scapsearch.jsp.search_by_scan_dates"/>
</label>
</div>
</br>
<div id="scanDateOptions" class="indent">
<table class="table">
<tr>
<td class="col-xs-3">
<bean:message key="scapsearch.jsp.searchfor"/>:
</td>
<td class="col-xs-9">
<div class="row-0">
<div class="col-sm-7">
<div class="input-group">
<html:text property="search_string" styleClass="form-control" name="search_string"
value="${search_string}" maxlength="100" accesskey="4"/>
<div class="input-group-btn">
<button type="submit" class="btn btn-default">
<rhn:icon type="header-search" />
<bean:message key="button.search"/>
</button>
</div>
</div>
</div>
</div>

<small>
<bean:message key="scapsearch.jsp.whatsearch.tip"/>
</small>
</td>
</tr>
<tr>
<td><bean:message key="scapsearch.jsp.withresult"/>:</td>
<td>
<div class="form-group">
<html:select styleClass="form-control" property="result_filter">
<html:options collection="allResults" property="label" labelProperty="label"/>
</html:select>
</div>
</td>
</tr>
<tr>
<td><bean:message key="systemsearch.jsp.wheretosearch"/></td>
<td>
<div class="radio">
<label for="whereToSearch-all">
<html:radio property="whereToSearch" value="all" styleId="whereToSearch-all"/>
<bean:message key="systemsearch.jsp.searchallsystems"/>
</label>
</div>
<div class="radio">
<label for="whereToSearch-system_list">
<html:radio property="whereToSearch" value="system_list" styleId="whereToSearch-system_list"/>
<bean:message key="systemsearch.jsp.searchSSM"/>
</label>
</div>
</td>
</tr>
<tr><td><bean:message key="scapsearch.jsp.scan_date"/>:</td>
<td>
<div class="checkbox">
<label for="scanDateOptionsCheckBox">
<html:checkbox styleId="scanDateOptionsCheckBox" property="optionScanDateSearch" onclick="javascript:scanDateSearchOptions()">
</html:checkbox>
<bean:message key="scapsearch.jsp.search_by_scan_dates"/>
</label>
</div>
</br>
<div id="scanDateOptions" class="indent">
<table>
<tr>
<td><bean:message key="scapsearch.jsp.start_date"/>:</td>
<td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="start"/>
</jsp:include>
</td>
</tr>
<tr>
<td><bean:message key="scapsearch.jsp.end_date"/>:</td>
<td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="end"/>
</jsp:include>
</td>
<tr>
</table>
</div>
</td>
<td><bean:message key="scapsearch.jsp.start_date"/>:</td>
<td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="start"/>
</jsp:include>
</td>
</tr>
<tr>
<td><bean:message key="scapsearch.jsp.show_as"/>:</td>
<td>
<div class="radio">
<label for="show_as-rr">
<html:radio property="show_as" value="rr" styleId="show_as-rr"/>
<bean:message key="scapsearch.jsp.list_rr"/>
</label>
</div>
<div class="radio">
<label for="show_as-tr">
<html:radio property="show_as" value="tr" styleId="show_as-tr"/>
<bean:message key="scapsearch.jsp.list_tr"/>
</label>
</div>
</td>
<td><bean:message key="scapsearch.jsp.end_date"/>:</td>
<td><jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
<jsp:param name="widget" value="end"/>
</jsp:include>
</td>
</tr>
</table>
<html:hidden property="submitted" value="true"/>
</html:form>
</div>
</table>
</div>
</td>
</tr>
<tr>
<td>
<label class="w-100 control-label" for="showAs">
<bean:message key="scapsearch.jsp.show_as"/>:
</label>
</td>
<td>
<div class="radio">
<label for="show_as-rr">
<html:radio property="show_as" value="rr" styleId="show_as-rr"/>
<bean:message key="scapsearch.jsp.list_rr"/>
</label>
</div>
<div class="radio">
<label for="show_as-tr">
<html:radio property="show_as" value="tr" styleId="show_as-tr"/>
<bean:message key="scapsearch.jsp.list_tr"/>
</label>
</div>
</td>
</tr>
</table>
<html:hidden property="submitted" value="true"/>
</html:form>
</div>
</div>
<c:if test="${(search_string != null && search_string != '')}">
<c:set var="pageList" value="${requestScope.pageList}"/>
Expand Down
1 change: 1 addition & 0 deletions web/html/src/core/spa/view-helper.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const BOOTSTRAP_READY_PAGES: string[] = [
"/rhn/manager/systems/keys",
"/rhn/manager/audit/cve",
"/rhn/errata/Search.do",
"/rhn/audit/scap/Search.do",
];

export const onEndNavigate = () => {
Expand Down
1 change: 1 addition & 0 deletions web/spacewalk-web.changes.bisht-richa.fixed-open-scap-search-page-layout
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixed OpenSCAP search page layout

0 comments on commit 832b987

Please sign in to comment.