-
Notifications
You must be signed in to change notification settings - Fork 467
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:dotCMS/core into issue-28550-create…
…-deploy-artifact-javadoc-composite-action
- Loading branch information
Showing
243 changed files
with
13,500 additions
and
3,463 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
core-web/libs/dotcms-scss/angular/dotcms-theme/components/_splitter.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| @use "variables" as *; | ||
|
|
||
| .p-splitter { | ||
| border: 1px solid $color-palette-gray-400; | ||
| background: $white; | ||
| border-radius: $border-radius-sm; | ||
|
|
||
| .p-splitter-gutter, | ||
| .p-splitter-gutter-resizing { | ||
| background: $color-palette-gray-100; | ||
|
|
||
| .p-splitter-gutter-handle { | ||
| background: $color-palette-gray-300; | ||
|
|
||
| &:focus-visible { | ||
| outline: none; | ||
| outline-offset: 0; | ||
| box-shadow: $shadow-xs; | ||
| } | ||
| } | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
core-web/libs/dotcms-scss/angular/dotcms-theme/components/form/_iconfield.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| @use "variables" as *; | ||
|
|
||
| .p-icon-field { | ||
| .p-input-icon { | ||
| position: absolute; | ||
| top: 50%; | ||
| transform: translateY(-50%); | ||
| } | ||
|
|
||
| &-left { | ||
| .p-input-icon:first-of-type { | ||
| left: $spacing-2; | ||
| color: $color-palette-gray-600; | ||
| } | ||
|
|
||
| > .p-inputtext { | ||
| padding-left: $spacing-6; | ||
| } | ||
|
|
||
| &.p-float-label > label { | ||
| left: $spacing-6; | ||
| } | ||
| } | ||
|
|
||
| &-right { | ||
| .p-input-icon:last-of-type { | ||
| right: $spacing-2; | ||
| color: $color-palette-gray-600; | ||
| } | ||
|
|
||
| > .p-inputtext { | ||
| padding-right: $spacing-6; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,4 @@ | |
| @use "selectbutton"; | ||
| @use "slider"; | ||
| @use "treeselect"; | ||
| @use "iconfield"; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...it-content-file-field/components/dot-form-file-editor/dot-form-file-editor.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <form (ngSubmit)="onSubmit()" [formGroup]="form" class="editor-mode__form"> | ||
| @if (store.allowFileNameEdit()) { | ||
| <div class="editor-mode__input-container"> | ||
| <label class="p-label-input-required" data-testId="editor-label" for="file-name"> | ||
| {{ 'dot.file.field.action.create.new.file.label' | dm }} | ||
| </label> | ||
| <input | ||
| id="file-name" | ||
| autocomplete="off" | ||
| formControlName="name" | ||
| pInputText | ||
| placeholder="Ex. template.html" | ||
| type="text" | ||
| data-testId="editor-file-name" /> | ||
| <div class="error-message"> | ||
| @let error = store.error(); | ||
| @if (error) { | ||
| <small class="p-invalid" data-testId="error-msg"> | ||
| {{ error | dm: [store.allowFiles()] }} | ||
| </small> | ||
| } @else { | ||
| <dot-field-validation-message | ||
| [field]="nameField" | ||
| [patternErrorMessage]="'dot.file.field.error.type.file.not.extension'" | ||
| data-testId="error-message" /> | ||
| } | ||
| </div> | ||
| </div> | ||
| } | ||
| <div class="file-field__editor-container"> | ||
| <ngx-monaco-editor | ||
| [class.file-field__code-editor--disabled]="form.disabled" | ||
| [options]="store.monacoConfig()" | ||
| (init)="onEditorInit($event)" | ||
| class="file-field__code-editor" | ||
| data-testId="code-editor" | ||
| formControlName="content" /> | ||
|
|
||
| @let file = store.file(); | ||
| <div [class.editor-mode__helper--visible]="file.mimeType" class="editor-mode__helper"> | ||
| <i class="pi pi-info-circle"></i> | ||
| <small>Mime Type: {{ file.mimeType }}</small> | ||
| </div> | ||
| </div> | ||
| <div class="editor-mode__actions"> | ||
| <p-button | ||
| (click)="cancelUpload()" | ||
| [label]="'dot.common.cancel' | dm" | ||
| aria-label="Cancel button" | ||
| data-testId="cancel-button" | ||
| styleClass="p-button-outlined" | ||
| type="button" /> | ||
|
|
||
| <p-button | ||
| [label]="'dot.common.save' | dm" | ||
| aria-label="Import button" | ||
| data-testId="import-button" | ||
| type="submit" /> | ||
| </div> | ||
| </form> |
93 changes: 93 additions & 0 deletions
93
...it-content-file-field/components/dot-form-file-editor/dot-form-file-editor.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| @use "variables" as *; | ||
|
|
||
| :host ::ng-deep { | ||
| .editor-container { | ||
| position: absolute !important; | ||
| top: 0; | ||
| left: 0; | ||
| right: 0; | ||
| bottom: 0; | ||
| } | ||
| } | ||
|
|
||
| .file-field__editor-container { | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: flex-start; | ||
| flex-direction: column; | ||
| flex: 1; | ||
| width: 100%; | ||
| gap: $spacing-1; | ||
| } | ||
|
|
||
| .file-field__code-editor { | ||
| border: 1px solid $color-palette-gray-400; // Input | ||
| display: block; | ||
| flex-grow: 1; | ||
| width: 100%; | ||
| min-height: 30rem; | ||
| border-radius: $border-radius-md; | ||
| overflow: auto; | ||
| position: relative; | ||
| } | ||
|
|
||
| .file-field__code-editor--disabled { | ||
| background-color: $color-palette-gray-200; | ||
| opacity: 0.5; | ||
|
|
||
| &::ng-deep { | ||
| .monaco-mouse-cursor-text, | ||
| .overflow-guard { | ||
| cursor: not-allowed; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .editor-mode__form { | ||
| height: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: flex-start; | ||
| } | ||
|
|
||
| .editor-mode__input-container { | ||
| width: 100%; | ||
| display: flex; | ||
| gap: $spacing-1; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .editor-mode__input { | ||
| width: 100%; | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .editor-mode__actions { | ||
| width: 100%; | ||
| display: flex; | ||
| gap: $spacing-1; | ||
| align-items: center; | ||
| justify-content: flex-end; | ||
| } | ||
|
|
||
| .editor-mode__helper { | ||
| display: flex; | ||
| justify-content: flex-start; | ||
| align-items: center; | ||
| gap: $spacing-1; | ||
| color: $color-palette-gray-700; | ||
| font-weight: $font-size-sm; | ||
| visibility: hidden; | ||
| } | ||
|
|
||
| .editor-mode__helper--visible { | ||
| visibility: visible; | ||
| } | ||
|
|
||
| .error-message { | ||
| min-height: $spacing-4; // Fix height to avoid jumping | ||
| justify-content: flex-start; | ||
| display: flex; | ||
| } |
Oops, something went wrong.