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

[SDESK-7332] and [SDESK-7333] #4573

Merged
merged 2 commits into from
Jul 16, 2024
Merged

[SDESK-7332] and [SDESK-7333] #4573

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
17b8b20
[SDESK-7332] and [SDESK-7333]
fritzSF Jul 11, 2024
25221de
undo changes to package.json and package-lock
tomaskikutis Jul 16, 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
3 changes: 2 additions & 1 deletion scripts/apps/content-filters/views/manage-filter-conditions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ <h6>{{ filterCondition.name }}</h6>
</div>
<!-- Modal - -->
<div sd-modal data-model="filterCondition" class="filter-condition-modal modal--large">
<div class="modal__header"> <a href="" class="close" ng-click="cancel()"><i class="icon-close-small"></i></a>
<div class="modal__header modal__header--flex">
<h3 class="modal__heading" ng-show="filterCondition._id"><span translate>Edit Filter Condition</span> "{{ origFilterCondition.name }}"</h3>
<h3 class="modal__heading" translate ng-hide="filterCondition._id" translate>Add New Filter Condition</h3>
<a href="" class="icn-btn" ng-click="cancel()"><i class="icon-close-small"></i></a>
</div>
<div class="modal__body">
<form name="editForm">
Expand Down
4 changes: 2 additions & 2 deletions scripts/apps/dashboard/views/workspace.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h3 class="modal__heading" translate>Add new widget</h3>
</li>
</ul>
</div>
<div class="modal__body-footer" ng-if="!dashboard.selectedWidget">
<div class="modal__footer" ng-if="!dashboard.selectedWidget">
<button class="btn btn--primary btn--large" ng-click="dashboard.add = false" translate>Done</button>
</div>
</div>
Expand All @@ -102,6 +102,6 @@ <h3 class="modal__heading" translate>Add new widget</h3>
translate>Add This Widget</button>
</div>
</div>
<div class="modal__body-footer" ng-if="dashboard.selectedWidget"></div>
<div class="modal__footer" ng-if="dashboard.selectedWidget"></div>
</div>
</div>
2 changes: 1 addition & 1 deletion scripts/apps/dictionaries/views/dictionary-config-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ <h3 class="modal__heading" ng-show="dictionary._id && !isAbbreviations()" transl
</div>

<div class="modal__footer">
<button id="cancel-edit-btn" type="button" class="btn pull-right" ng-click="cancel()" translate>Cancel</button>
<button id="save-edit-btn" type="submit" class="btn btn--primary pull-right"
ng-click="save()"
ng-disabled="editForm.$invalid || progress.width" translate>Save</button>
<button id="cancel-edit-btn" type="button" class="btn pull-right" ng-click="cancel()" translate>Cancel</button>
</div>
</div>
</form>
2 changes: 1 addition & 1 deletion 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 @@ -81,7 +81,7 @@ <h3 class="modal__heading" translate ng-hide="editScheme._id" translate>Add New
ng-if="!rule"
ng-disabled="!editScheme.name"
>
<button class="btn btn--primary btn--icon-only-circle" sd-tooltip="{{ :: 'Add Rule' | translate }}" flow="right" dropdown__toggle data-test-id="add-routing-rule-button">
<button class="btn btn--primary btn--icon-only btn--icon-only-circle" sd-tooltip="{{ :: 'Add Rule' | translate }}" flow="right" dropdown__toggle data-test-id="add-routing-rule-button">
<i class="icon-plus-large"></i>
</button>
<ul class="dropdown__menu nested-menu">
Expand Down
6 changes: 4 additions & 2 deletions scripts/apps/ingest/views/settings/ingest-rules-content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ <h3 class="modal__heading" translate ng-hide="editRuleset._id" translate>Add New
</div>
</div>
<div class="modal__body-footer">
<button class="btn" ng-click="cancel()" translate>Cancel</button>
<button class="btn btn--primary" ng-click="save(editRuleset)" ng-disabled="!rulesetForm.$valid || !rulesetForm.$dirty" translate>Save</button>
<div class="button-group button-group--end button-group--comfort" role="group">
<button class="btn" ng-click="cancel()" translate>Cancel</button>
<button class="btn btn--primary" ng-click="save(editRuleset)" ng-disabled="!rulesetForm.$valid || !rulesetForm.$dirty" translate>Save</button>
</div>
</div>
</form>
</div>
Expand Down
4 changes: 2 additions & 2 deletions scripts/apps/products/views/products-config-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h3 class="modal__heading" ng-show="product.edit._id" translate translate-params
<a href="" class="icn-btn close" ng-click="cancel()"><i class="icon-close-small"></i></a>
</div>
<div class="modal__body">
<form name="editForm">
<form name="editForm" class="d-contents">
<div class="modal__body-header">
<ul class="nav-tabs">
<li ng-class="{'nav-tabs__tab--active': modalTab === 'details'}" class="nav-tabs__tab">
Expand Down Expand Up @@ -89,7 +89,7 @@ <h3 class="modal__heading" ng-show="product.edit._id" translate translate-params
</div>
</div>
</form>
<div class="modal__body-footer">
<div class="modal__footer">
<button class="btn" ng-click="cancel()" translate>Cancel</button>
<button class="btn btn--primary" ng-click="save()" ng-disabled="editForm.$invalid || !editForm.$dirty" translate>Save</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion scripts/apps/publish/views/subscribers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ <h3 class="modal__heading" translate ng-hide="subscriber._id">Add New Subscriber

<fieldset class="separated">
<legend translate>Destinations</legend>
<div class="sd-alert sd-alert--hollow sd-alert--primary sd-alert--small">
<div class="sd-alert sd-alert--hollow sd-alert--primary sd-alert--small mb-1-5">
<span translate>For Content API only subscriber destinations are not required.</i>
</div>
<div sd-destination ng-repeat="destination in destinations" data-destination="destination"
Expand Down
2 changes: 1 addition & 1 deletion scripts/apps/search/views/multi-action-bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="multi-action-bar" ng-if="multi.count && display">
<button class="toggle" ng-click="toggleDisplay()"><i class="icon-chevron-up-thin"></i></button>
<button class="btn btn--hollow btn--icon-only btn--icon-only-circle me-1" ng-click="toggleDisplay()"><i class="icon-chevron-up-thin"></i></button>
<button class="btn" ng-click="multi.reset()">cancel</button>
<span id="multi-select-count"
translate
Expand Down
22 changes: 11 additions & 11 deletions scripts/apps/users/views/edit-form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,9 @@ <h3 class="modal__heading">Reset password</h3>
</div>

<div sd-modal data-model="features.reset_user_password && show.change_password && user._id" class="modal--tabs">
<div class="modal__header">
<button class="modal__close pull-right" ng-click="show.change_password = false"><i class="icon-close-small"></i></button>
<div class="modal__header modal__header--flex">
<h3 class="modal__heading">Change password</h3>
<button class="icn-btn" ng-click="show.change_password = false"><i class="icon-close-small"></i></button>
</div>
<div class="modal__body" sd-change-password>
<div class="modal__body-content">
Expand All @@ -397,14 +397,14 @@ <h3 class="modal__heading">Change password</h3>
</div>
</form>
</div>
<div class="modal__body-footer">
<button class="btn" ng-click="show.change_password = false" translate>Cancel</button>
<button class="btn btn--primary"
ng-click="changePasswordForm.$valid && changePassword(oldPwd, newPwd)"
ng-disabled="changePasswordForm.$invalid"
translate>
Save password
</button>
</div>
</div>
<div class="modal__footer">
<button class="btn" ng-click="show.change_password = false" translate>Cancel</button>
<button class="btn btn--primary"
ng-click="changePasswordForm.$valid && changePassword(oldPwd, newPwd)"
ng-disabled="changePasswordForm.$invalid"
translate>
Save password
</button>
</div>
</div>
7 changes: 4 additions & 3 deletions scripts/apps/users/views/settings-roles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ <h6>{{role.name}}</h6>
</div>

<div sd-modal data-model="editRole">
<div class="modal__header">
<button class="modal__close pull-right" ng-click="cancel()"><i class="icon-close-small"></i></button>
<div class="modal__header modal__header--flex">

<h3 class="modal__heading" ng-show="editRole._id" translate>Edit Role</h3>
<h3 class="modal__heading" ng-show="!editRole._id" translate>New Role</h3>
<h3 class="modal__heading" ng-show="!editRole._id" translate>New Role</h3>
<button class="icn-btn" ng-click="cancel()"><i class="icon-close-small"></i></button>
</div>
<div class="modal__body">
<form name="roleForm">
Expand Down
7 changes: 4 additions & 3 deletions scripts/apps/workspace/content/views/profile-settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ <h4 translate>Updated</h4>

<!-- Create profile modal -->
<div sd-modal class="modal--large" data-model="creating" data-close="ctrl.toggleCreate()">
<div class="modal__header"> <a href="" class="close" ng-click="ctrl.toggleCreate()"><i class="icon-close-small"></i></a>
<div class="modal__header modal__header--flex">
<h3 class="modal__heading" translate>Add New Content Profile</h3>
<a href="" class="icn-btn" ng-click="ctrl.toggleCreate()"><i class="icon-close-small"></i></a>
</div>
<div class="modal__body">
<form name="createForm">
Expand Down Expand Up @@ -125,8 +126,8 @@ <h3 class="modal__heading" translate>Add New Content Profile</h3>
</form>
</div>
<div class="modal__footer">
<button id="profile-save" class="btn btn--primary" ng-disabled="createForm.$invalid || new.type == null" ng-click="ctrl.save()" translate>Save &amp; Continue</button>
<button class="btn" ng-click="ctrl.toggleCreate()" translate>Cancel</button>
<button id="profile-save" class="btn btn--primary" ng-disabled="createForm.$invalid || new.type == null" ng-click="ctrl.save()" translate>Save &amp; Continue</button>
</div>
</div>
<!-- END Create profile modal -->
Expand Down Expand Up @@ -185,8 +186,8 @@ <h3 class="modal__heading">{{ :: 'Editing' | translate }} "{{ editing.form.label
</form>
</div>
<div class="modal__footer" data-test-id="content-profile-edit-view--footer">
<button id="profile-update" class="btn btn--primary" ng-disabled="editForm.$invalid || !editForm.$dirty || ctrl.savingInProgress" ng-click="ctrl.update()" translate>Save</button>
<button class="btn" ng-click="ctrl.toggleEdit()" translate>Cancel</button>
<button id="profile-update" class="btn btn--primary" ng-disabled="editForm.$invalid || !editForm.$dirty || ctrl.savingInProgress" ng-click="ctrl.update()" translate>Save</button>
</div>
<!-- END Edit profile modal -->
</div>
Expand Down
Loading