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

feat: UI support for STIG/revision delete #491

Merged
merged 2 commits into from
Oct 31, 2021
Merged

feat: UI support for STIG/revision delete #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20cbd45
feat: UI support for STIG/revision delete
csmig Oct 24, 2021
52e1585
clarify remove btn's operation
csmig Oct 25, 2021
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
67 changes: 59 additions & 8 deletions clients/extjs/css/stigman.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,58 @@
.x-grid3-row-selected {
background-color: hsl(212deg 14% 85%) !important;
background-image: none;
border-color: #ACACAC;
}

.x-grid3-row-checker,.x-grid3-hd-checker {
background-image: url(../img/checkboxes.svg)
}
.x-grid3-body .x-grid3-td-checker {
background: unset;
}
.x-grid3-body .x-grid3-row-selected .x-grid3-td-checker {
background-image: unset;
}
.x-grid3-row-checker,.x-grid3-hd-checker {
width: 100%;
height: 18px;
background-position: 1px 2px;
background-repeat: no-repeat;
background-color: transparent;
}

.x-grid3-row .x-grid3-row-checker {
background-position: 1px 2px
}

.x-grid3-row-selected .x-grid3-row-checker,.x-grid3-hd-checker-on .x-grid3-hd-checker,.x-grid3-row-checked .x-grid3-row-checker {
background-position: -24px 2px
}

.x-grid3-hd-checker {
background-position: 1px 1px
}

.ext-border-box .x-grid3-hd-checker {
background-position: 1px 3px
}

.x-grid3-hd-checker-on .x-grid3-hd-checker {
background-position: -24px 1px
}

.x-grid3-hd-checker-ind .x-grid3-hd-checker {
background-position: -50px 1px
}

/* Adjust position of the grid checkbox */
/* Required by SM.SelectingGridToolbar */
.x-grid3-row-selected-checkonly .x-grid3-row-checker {
background-position: -24px 2px;
}



input.x-tree-node-cb {
margin-right: 2px;
}
Expand Down Expand Up @@ -49,6 +104,7 @@ a.x-grid3-hd-btn:hover {
background-color: transparent;
background-image:none;
display: block;
cursor: default;
}

.sm-cb .x-form-cb-label {
Expand Down Expand Up @@ -401,7 +457,7 @@ body {
.x-fieldset {
border-radius: 3px;
}
.x-body-masked .ext-el-mask {
.x-body-masked .ext-el-mask, .x-masked .ext-el-mask {
background-color: rgb(0 0 0 / 35%);
backdrop-filter: blur(1px) saturate(50%);
opacity: unset;
Expand Down Expand Up @@ -560,13 +616,13 @@ td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
border-left-color: #eee;
border-right-color: #d0d0d0;
}
.x-grid3-row {
/* .x-grid3-row {
cursor: default;
border-width: 1px 1px 1px 0px;
border-style: solid;
width: 100%;
}

*/
td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
background-color:#f0f0f0;
background-image:none;
Expand Down Expand Up @@ -690,11 +746,6 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
}


/* Adjust position of the grid checkbox */
/* Required by SM.SelectingGridToolbar */
.x-grid3-row-selected-checkonly .x-grid3-row-checker {
background-position: -22px 3px;
}

.sm-tree-node-create {
font-style: italic
Expand Down
124 changes: 124 additions & 0 deletions clients/extjs/img/checkboxes.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion clients/extjs/js/SM/ColumnFilters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ SM.ColumnFilters.GridView = Ext.extend(Ext.grid.GridView, {
},
handleHdDown: function (e, target) {
// Modifies superclass method to support lastHide

if (target.className == 'x-grid3-hd-checker') {
return
}
e.stopEvent()
if (!this.lastHide || this.lastHide.getElapsed() > 100) {
var colModel = this.cm,
Expand Down Expand Up @@ -110,7 +114,8 @@ SM.ColumnFilters.GridView = Ext.extend(Ext.grid.GridView, {
const colCount = this.cm.getColumnCount()
for (let i = 0; i < colCount; i++) {
const td = this.getHeaderCell(i)
td.getElementsByTagName("a")[0].style.height = (td.firstChild.offsetHeight - 1) + 'px'
// td.getElementsByTagName("a")[0].style.height = (td.firstChild.offsetHeight - 1) + 'px'
td.getElementsByTagName("a")[0].style.height = 0
if (this.cm.config[i].filtered) {
td.classList.add('sm-grid3-col-filtered')
}
Expand Down
Loading