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.

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

Editor grids permissions refactor, enhancements, and fixes #16653

Draft
wants to merge 39 commits into
base: 3.x
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
400940e
Update utilities.js
smg6511 Oct 31, 2024
d818674
Base updates
smg6511 Oct 31, 2024
9e6179e
ACL Role updates
smg6511 Oct 31, 2024
ad9be0d
Contexts update
smg6511 Oct 31, 2024
8c307ae
Media Source updates
smg6511 Nov 1, 2024
c7af676
Namespace updates
smg6511 Nov 1, 2024
e7cd446
Dashboard panel code formatting updates
smg6511 Nov 1, 2024
a94232b
Dashboard(s) updates
smg6511 Nov 2, 2024
1e5a5f8
ACL Policy & Policy Template updates
smg6511 Nov 3, 2024
7c2aede
Package Versions updates
smg6511 Nov 4, 2024
0b0e19f
Package Versions additions
smg6511 Nov 4, 2024
3627ae1
Lexicons formatting updates
smg6511 Nov 4, 2024
10eddfa
Lexicons updates
smg6511 Nov 4, 2024
6038d3d
FC Profiles and Sets
smg6511 Nov 5, 2024
de2a6b5
FC Profiles and Sets additions
smg6511 Nov 5, 2024
22461e7
Update modx.panel.fcset.js
smg6511 Nov 8, 2024
6a6fded
Update modx.panel.fcprofile.js
smg6511 Nov 8, 2024
2cf309e
FC Profiles and Sets more additions
smg6511 Nov 8, 2024
5dd6830
Update modx.grid.user.js
smg6511 Nov 8, 2024
8f4024f
Users additions
smg6511 Nov 8, 2024
745a65e
Update modx.grid.dashboard.widgets.js
smg6511 Nov 11, 2024
df04944
Update modx.grid.access.context.js
smg6511 Nov 13, 2024
13482e7
Relocate new Namespace method
smg6511 Nov 14, 2024
7bdcb55
Update modx.grid.js
smg6511 Nov 15, 2024
ae546ec
Dashboard(s) & Widgets updates
smg6511 Nov 15, 2024
3b72a6b
Update modx.panel.dashboard.js
smg6511 Nov 15, 2024
7a37bd5
Context Access updates
smg6511 Nov 15, 2024
71210c3
Update modx.grid.user.group.js
smg6511 Nov 15, 2024
480afa3
User Access updates
smg6511 Nov 19, 2024
1eec6dc
Update GetList.php
smg6511 Nov 19, 2024
076e42e
Update modx.grid.content.type.js
smg6511 Nov 19, 2024
5c41407
Content Type updates
smg6511 Nov 22, 2024
647a7c9
Update modx.panel.property.set.js
smg6511 Nov 23, 2024
e9a8bdb
Update modx.grid.element.properties.js
smg6511 Nov 25, 2024
f7d1bf9
Update modx.grid.local.property.js
smg6511 Nov 27, 2024
3d6412b
Property Sets updates
smg6511 Nov 29, 2024
fdcc10b
Minor code quality fixes
smg6511 Nov 29, 2024
e1ab50a
Update modx.grid.js
smg6511 Dec 2, 2024
8b4aa4f
User Recent Resources updates
smg6511 Dec 2, 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
109 changes: 63 additions & 46 deletions _build/templates/default/sass/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ textarea.x-form-field,
border-radius: $borderRadius;
border: 1px solid $borderColor;
position: relative;
transition: border-color .25s;
transition: border-color 0.25s;
}

.x-viewport .x-trigger-wrap-focus,
Expand Down Expand Up @@ -142,7 +142,7 @@ input::-moz-focus-inner {
padding: 0 0 0 3px;
top: 0;
right: 0;
transition: all .25s;
transition: all 0.25s;
width: 16px;
height: 16px;

Expand Down Expand Up @@ -288,7 +288,7 @@ input::-moz-focus-inner {
border: 1px solid $borderColor;
border-radius: $borderRadius;
padding: 5px;
transition: all .25s;
transition: all 0.25s;

&:focus {
border: 1px solid $borderColorFocus;
Expand Down Expand Up @@ -409,7 +409,7 @@ input::-moz-focus-inner {
}

&.toggle-slider-above {
margin: .3em 0;
margin: 0.3em 0;
padding-left: 3.9em;
}

Expand All @@ -421,15 +421,15 @@ input::-moz-focus-inner {

.example-list {
ul {
margin: .4em 0;
margin: 0.4em 0;
li {
position: relative;
margin-bottom: .25em;
margin-bottom: 0.25em;
padding-left: 1.25em;
&::before {
@extend %pseudo-font;
position: absolute;
left: .2em;
left: 0.2em;
top: 0;
content: fa-content($fa-var-angle-double-right);
color: scale-color($mediumGray, $lightness: 20%);
Expand All @@ -439,7 +439,7 @@ input::-moz-focus-inner {
}
.example-input,
.copy-this {
padding: 0 .3em;
padding: 0 0.3em;
border-radius: 2px;
transition: width 1s;
}
Expand Down Expand Up @@ -477,7 +477,14 @@ input::-moz-focus-inner {
}
}
}
}
&:active {
color: $darkGray;
&::after {
color: $darkGray;
}
}
}

.feedback {
margin-left: 1.4rem;
color: scale-color($blue, $lightness: -35%);
Expand Down Expand Up @@ -506,7 +513,7 @@ input::-moz-focus-inner {
.fs-toggle {
padding-top: 1em;
margin-top: 2em;
margin-bottom: .5em;
margin-bottom: 0.5em;
border-top: 1px dashed $borderColor;
}

Expand Down Expand Up @@ -635,7 +642,7 @@ input::-moz-focus-inner {
transform: translate(-50%, -50%);
text-align: center;
width: 30px;
transition: opacity .25s;
transition: opacity 0.25s;
}

&.x-form-trigger-over,
Expand Down Expand Up @@ -931,11 +938,11 @@ input::-moz-focus-inner {
left: unset;
}

&+.x-form-cb-label,
&+.x-fieldset-header-text {
& + .x-form-cb-label,
& + .x-fieldset-header-text {
position: relative;
padding-left: 3.6em;
padding-top: .2em;
padding-top: 0.2em;
margin-left: 0;
cursor: pointer;
box-sizing: border-box;
Expand All @@ -945,7 +952,7 @@ input::-moz-focus-inner {
&:after {
content: '';
position: absolute;
transition: all .2s ease;
transition: all 0.2s ease;
font-size: inherit;
}

Expand All @@ -962,7 +969,7 @@ input::-moz-focus-inner {
&:after {
left: 0.1em;
top: 0.8em;
margin-top: -.65em;
margin-top: -0.65em;
height: 1.3em;
width: 1.3em;
border-radius: 50%;
Expand All @@ -972,9 +979,8 @@ input::-moz-focus-inner {
}

&:checked {

&+.x-form-cb-label,
&+.x-fieldset-header-text {
& + .x-form-cb-label,
& + .x-fieldset-header-text {
&:after {
left: 1.6em;
top: 0.8em;
Expand All @@ -988,9 +994,8 @@ input::-moz-focus-inner {
}

&.danger:checked {

&+.x-form-cb-label,
&+.x-fieldset-header-text {
& + .x-form-cb-label,
& + .x-fieldset-header-text {
&:before {
background-color: $red;
border-color: $red;
Expand All @@ -999,9 +1004,8 @@ input::-moz-focus-inner {
}

&.warning:checked {

&+.x-form-cb-label,
&+.x-fieldset-header-text {
& + .x-form-cb-label,
& + .x-fieldset-header-text {
&:before {
background-color: $orange;
border-color: $orange;
Expand Down Expand Up @@ -1088,13 +1092,13 @@ input::-moz-focus-inner {
cursor: pointer;
display: inline-block; /*font-size: 1px;*/
outline: 0; /* fix firefox dotted outlines */
opacity: .6;
opacity: 0.6;
filter: alpha(opacity=60); /* for IE <= 8 */
padding: 0;
position: absolute;
top: 0;
right: 0;
transition: opacity .25s;
transition: opacity 0.25s;
width: 16px;
height: 100%;

Expand Down Expand Up @@ -1225,21 +1229,22 @@ input::-moz-focus-inner {
}

.x-editor .x-form-check-wrap {
background-color: $white
}

/* fix combo on grid editor bug */
.x-grid-editor .x-form-field-wrap {
background: #f6f2f7 url($imgPath + 'modx-theme/form/combo-bck.png') repeat-x scroll 0 100%;
background-color: $white;
}

.x-grid-editor .x-form-field-wrap input {
.x-grid-editor {
z-index: 9002 !important;
.x-form-field-wrap {
background: #f6f2f7 url($imgPath + "modx-theme/form/combo-bck.png") repeat-x
scroll 0 100%;
input {
background-color: transparent !important;
}

.x-grid-editor .x-form-field-wrap img {
img {
background-color: $white;
background-image: url($imgPath + 'modx-theme/form/trigger.png');
background-image: url($imgPath + "modx-theme/form/trigger.png");
}
}
}

.x-form-grow-sizer {
Expand Down Expand Up @@ -1373,7 +1378,7 @@ input::-moz-focus-inner {

.x-btn {
padding: 1px;
transition: color .25s;
transition: color 0.25s;

&.x-btn-over,
&:hover,
Expand All @@ -1388,7 +1393,7 @@ input::-moz-focus-inner {

&.x-item-disabled {
color: $buttonColor;
opacity: .4;
opacity: 0.4;
}

button:before {
Expand Down Expand Up @@ -1432,7 +1437,11 @@ input::-moz-focus-inner {
}

/* the second text cell, "of X" */
.x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell {
.x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell {
.xtb-text {
display: inline-block;
position: absolute;
Expand All @@ -1444,7 +1453,15 @@ input::-moz-focus-inner {
}

/* the last regular button >>, yes, I know it's ugly but tell that Microsoft and say thanks for IE8 =) */
.x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell + .x-toolbar-cell {
.x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell
+ .x-toolbar-cell {
.x-btn {
margin-right: 0;
}
Expand All @@ -1453,13 +1470,13 @@ input::-moz-focus-inner {
/* the refresh button */
.x-toolbar-cell:last-child {
opacity: 0;
transition: opacity .25s;
transition: opacity 0.25s;

.x-btn {
font-size: 12px;
line-height: 1;
margin: 0;
opacity: .4;
opacity: 0.4;
padding: 0;
position: absolute;
bottom: 2px;
Expand Down Expand Up @@ -1548,11 +1565,11 @@ input::-moz-focus-inner {
.x-date-mp-ybtn a.x-date-mp-prev,
.x-date-mp-ybtn a.x-date-mp-next {
display: inline-block;
opacity: .6;
opacity: 0.6;
filter: alpha(opacity=60); /* for IE <= 8 */
margin: 0 auto;
position: relative;
transition: opacity .25s;
transition: opacity 0.25s;

&:before {
@extend %pseudo-font;
Expand Down Expand Up @@ -1809,6 +1826,6 @@ td.x-date-mp-sep {
bottom: 0;
padding: 10px 20px;
color: #fff;
background-color: rgba(0, 0, 0, .8);
background-color: rgba(0, 0, 0, 0.8);
}
}
11 changes: 10 additions & 1 deletion _build/templates/default/sass/_utility.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@
}
}


/* Instead of writing the same code for every nav bar */
@mixin navigation-list {
list-style-type: none;
Expand Down Expand Up @@ -212,3 +211,13 @@
}
}
}

@mixin textLink {
color: $colorSplash;
text-decoration-style: dotted;
text-decoration-color: scale-color($colorSplash, $lightness: 50%);
&:hover {
color: $black;
border-bottom-color: scale-color($black, $lightness: 40%);
}
}
Loading
Loading