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

make the name of of the routing rule available for editing in the second step of the form [SDESK-6774] #4165

Merged
merged 3 commits into from
Dec 26, 2022
Merged

make the name of of the routing rule available for editing in the second step of the form [SDESK-6774] #4165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e609e40
make the name of of the routing rule available for editing in the sec…
devketanpro Dec 23, 2022
94d5df8
Addressed the comment
devketanpro Dec 23, 2022
04c0d54
refactored the code
devketanpro Dec 26, 2022
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
13 changes: 7 additions & 6 deletions scripts/apps/ingest/views/settings/ingest-routing-content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@ <h3 class="modal__heading" translate ng-hide="editScheme._id" translate>Add New
</ul>
</div>
</div>

<div class="button-toolbar" ng-if="rule">
<button class="btn" ng-click="cancelRule(rule)" translate>Cancel</button>
<button class="btn btn--primary" ng-click="save()" ng-disabled="!rule.name" translate>Save</button>
</div>
</div>
</div>
<div class="grid__item grid__item--col-8">
Expand All @@ -126,7 +121,13 @@ <h3 class="modal__heading" translate ng-hide="editScheme._id" translate>Add New
</div>
</div>
<div class="modal__body-footer">
<button class="btn btn--primary" ng-click="done()" ng-disabled="rule" translate>Done</button>
<div class="button-group button-group--end button-group--comfort" role="group">
<div class="sd-display--contents" ng-if="rule">
<button class="btn" tabindex="0" ng-click="cancelRule(rule)" translate>Cancel</button>
<button class="btn btn--primary" tabindex="0" ng-click="save()" ng-disabled="!rule.name" translate>Save</button>
</div>
<button class="btn btn--primary" tabindex="0" ng-click="done()" ng-disabled="rule" translate>Done</button>
</div>
</div>
</form>
</div>
Expand Down
6 changes: 5 additions & 1 deletion styles/sass/sf-additional.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2361,4 +2361,8 @@ sd-multi-image-edit {
justify-content: flex-end;
gap: var(--gap--small);
}
}
}

.modal.modal--tabs .modal__body-footer {
display: flex;
}