Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bootstrap updates and fixes #9089

Merged
merged 16 commits into from
Jul 24, 2024
Merged

Bootstrap updates and fixes #9089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
530546a
Review fix ssm subpages (#8899)
bisht-richa Jul 23, 2024
99d5c0a
Btn info inconsistent (#8907)
bisht-richa Jul 23, 2024
c6473f7
Fix broken layout of system formulas configuration page (#8919)
bisht-richa Jul 23, 2024
ee37324
Fixed table footer top border (#8925)
bisht-richa Jul 23, 2024
90ea8a8
Fixed broken layout of system highstate page (#8933)
bisht-richa Jul 23, 2024
6bc7cc0
Added label css (#8936)
bisht-richa Jul 23, 2024
2c8fa79
Fixed missing margins in CVE audit (#8947)
bisht-richa Jul 23, 2024
6719ea0
Fixed advanced package search page layout (#8956)
bisht-richa Jul 23, 2024
832b987
Fixed OpenSCAP search page layout (#8960)
bisht-richa Jul 23, 2024
a1dffa5
Fixed double padding in recurring actions (#8963)
bisht-richa Jul 23, 2024
b001501
Fixed missing margin between inline radio buttons (#8976)
bisht-richa Jul 23, 2024
aa301bc
Fixed broken layout in monitoring page (#8977)
bisht-richa Jul 23, 2024
89f9345
Fixed hidden section issue in new theme (#8987)
bisht-richa Jul 23, 2024
b757f16
Fixed space between radio button and label (#8996)
bisht-richa Jul 23, 2024
ebde181
Fixed build image page layout in new theme (#9004)
bisht-richa Jul 23, 2024
3f6b9fc
Fix schedule creation layouts, disabled input styles, input group ali…
Etheryte Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion java/code/src/com/suse/manager/webui/utils/ViewHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,36 @@ public enum ViewHelper {
"/rhn/manager/contentmanagement/projects",
"/rhn/kickstart/cobbler/DefaultSnippetList.do",
"/rhn/systems/details/packages/PackageList.do",
"/rhn/software/channels/All.do"
"/rhn/software/channels/All.do",
"rhn/channels/software/Search.do",
"/rhn/manager/systems/ssm/coco/settings",
"/rhn/systems/ssm/audit/ScheduleXccdf.do",
"/rhn/systems/ssm/provisioning/PowerManagementConfiguration.do",
"/rhn/systems/details/kickstart/PowerManagement.do",
"/rhn/systems/ssm/provisioning/PowerManagementOperations.do",
"/rhn/channels/ChannelDetail.do",
"/rhn/software/packages/Details.do",
"/rhn/manager/systems/details/formulas",
"/rhn/manager/cm/imagestores",
"/rhn/manager/systems/details/highstate",
"/rhn/manager/systems/keys",
"/rhn/manager/audit/cve",
"/rhn/errata/Search.do",
"/rhn/audit/scap/Search.do",
"/rhn/manager/schedule/recurring-actions",
"/rhn/manager/schedule/maintenance/calendars",
"/rhn/manager/multiorg/recurring-actions",
"/rhn/manager/schedule/maintenance/schedules",
"/rhn/manager/admin/config/monitoring",
"/rhn/admin/config/GeneralConfig.do",
"/rhn/manager/admin/config/monitoring",
"/rhn/manager/admin/setup/products",
"/rhn/systems/details/SystemRemoteCommand.do",
"/rhn/manager/systems/details/highstate",
"/rhn/manager/systems/details/recurring-actions",
"/rhn/manager/cm/build",
"/rhn/admin/ScheduleDetail.do",
"/rhn/manager/systems/cmd"
);

ViewHelper() { }
Expand Down
2 changes: 1 addition & 1 deletion java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<label for="parent" class="col-lg-3 control-label">
<bean:message key="schedule.edit.jsp.frequency"/>:
</label>
<div class="">
<div class="col-lg-9">
<jsp:include page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf">
<jsp:param name="widget" value="date"/>
</jsp:include>
Expand Down
230 changes: 124 additions & 106 deletions java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
View file
Open in desktop
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
32 changes: 27 additions & 5 deletions java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@
<div class="panel-body">
<table class="table">
<tr>
<td><bean:message key="erratasearch.jsp.searchfor"/></td>
<td>
<label class="w-100 control-label" for="searchfor">
<bean:message key="erratasearch.jsp.searchfor"/>
</label>
</td>
<td>
<div class="row-0">
<div class="col-md-5">
Expand All @@ -56,7 +60,12 @@
</div>
</td>
</tr>
<tr><td><bean:message key="erratasearch.jsp.whatsearch"/></td>
<tr>
<td>
<label class="w-100 control-label" for="whatsearch">
<bean:message key="erratasearch.jsp.whatsearch"/>
</label>
</td>
<td>
<div class="row-0">
<div class="col-md-5">
Expand All @@ -72,7 +81,12 @@
</div>
</td>
</tr>
<tr><td><bean:message key="erratasearch.jsp.types_to_search"/></td>
<tr>
<td>
<label class="w-100 control-label" for="typeToSearch">
<bean:message key="erratasearch.jsp.types_to_search"/>
</label>
</td>
<td>
<div class="checkbox icon-wrapper">
<html:checkbox property="errata_type_bug">
Expand All @@ -95,7 +109,11 @@
</td>
</tr>
<tr>
<td><bean:message key="erratasearch.jsp.issue_date"/></td>
<td>
<label class="w-100 control-label" for="issueDate">
<bean:message key="erratasearch.jsp.issue_date"/>
</label>
</td>
<td>
<div class="checkbox">
<html:checkbox styleId="issueDateOptionsCheckBox" property="optionIssueDateSearch" onclick="javascript:issueDateSearchOptions()" >
Expand Down Expand Up @@ -129,7 +147,11 @@
</td>
</tr>
<tr>
<td><label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrainedlabel"/></label></td>
<td>
<label class="w-100 control-label" for="fineGrainedlabel">
<bean:message key="systemsearch.jsp.finegrainedlabel"/>
</label>
</td>
<td>
<div class="checkbox">
<html:checkbox property="fineGrained" styleId="fineGrainedlabel"> <label for="fineGrainedlabel"><bean:message key="systemsearch.jsp.finegrained"/></label></html:checkbox>
Expand Down
1 change: 1 addition & 0 deletions java/spacewalk-java.changes.bisht-richa.fixed-advanced-package-search-layout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixed layout of advanced package search page
1 change: 1 addition & 0 deletions java/spacewalk-java.changes.eth.inputs-and-friends
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix input alignment and style issues on schedule creation page
11 changes: 11 additions & 0 deletions web/html/src/branding/css/base/fixes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,14 @@ div.checkbox.icon-wrapper i.fa {
.pull-left {
float: left !important;
}

// TODO: Need to replace .hidden class with .d-none

.hidden {
@extend .d-none;
}

.hidden-xs {
@extend .d-none;
@extend .d-md-block;
}
4 changes: 4 additions & 0 deletions web/html/src/branding/css/base/forms.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ input[type="checkbox"] {
padding-top: 8px;
margin-bottom: 0;
text-align: right;

input[type="radio"] {
margin-right: 5px;
}
}

.text {
Expand Down
Loading
Loading