-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
99 additions
and
98 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| # v3.800.9 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1260 | ||
| # v3.800.10 | ||
| # https://virtocommerce.atlassian.net/browse/VCST-1738 | ||
| name: Release | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| release: | ||
| uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.9 | ||
| uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.10 | ||
| secrets: | ||
| envPAT: ${{ secrets.REPO_TOKEN }} |
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
150 changes: 75 additions & 75 deletions
150
src/VirtoCommerce.StoreModule.Web/Scripts/blades/store-advanced.tpl.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 |
|---|---|---|
| @@ -1,83 +1,83 @@ | ||
| <div class="blade-static __bottom" ng-include="'$(Platform)/Scripts/common/templates/ok-cancel.tpl.html'"></div> | ||
| <div class="blade-content __medium-wide"> | ||
| <div class="blade-inner"> | ||
| <div class="inner-block"> | ||
| <form class="form" name="detailForm"> | ||
| <fieldset> | ||
| <div ng-init="setForm(detailForm)"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.description' | translate }}</label> | ||
| <div class="form-input"> | ||
| <textarea class="form-control" cols="30" rows="2" ng-model="blade.currentEntity.description" placeholder="{{ 'stores.blades.store-advanced.placeholders.description' | translate }}"></textarea> | ||
| </div> | ||
| <div class="blade-inner"> | ||
| <div class="inner-block"> | ||
| <form class="form" name="detailForm"> | ||
| <fieldset> | ||
| <div ng-init="setForm(detailForm)"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.description' | translate }}</label> | ||
| <div class="form-input"> | ||
| <textarea class="form-control" cols="30" rows="2" ng-model="blade.currentEntity.description" placeholder="{{ 'stores.blades.store-advanced.placeholders.description' | translate }}"></textarea> | ||
| </div> | ||
| </div> | ||
| <div class="form-group clearfix"> | ||
| <legend>{{ 'stores.blades.store-advanced.labels.store-regional-settings' | translate }}</legend> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-country' | translate }}</label> | ||
| <div class="form-input"> | ||
| <ui-select ng-model="blade.currentEntity.country"> | ||
| <ui-select-match placeholder="{{ 'stores.blades.store-advanced.placeholders.store-country' | translate }}">{{$select.selected.displayName}}</ui-select-match> | ||
| <ui-select-choices repeat="x.id as x in countries | filter: { displayName: $select.search }"> | ||
| <span ng-bind-html="x.displayName | highlight: $select.search"></span> | ||
| </ui-select-choices> | ||
| </ui-select> | ||
| </div> | ||
| <div class="form-group clearfix"> | ||
| <legend>{{ 'stores.blades.store-advanced.labels.store-regional-settings' | translate }}</legend> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-country' | translate }}</label> | ||
| <div class="form-input"> | ||
| <ui-select ng-model="blade.currentEntity.country"> | ||
| <ui-select-match placeholder="{{ 'stores.blades.store-advanced.placeholders.store-country' | translate }}">{{$select.selected.displayName}}</ui-select-match> | ||
| <ui-select-choices repeat="x.id as x in countries | filter: { displayName: $select.search }"> | ||
| <span ng-bind-html="x.displayName | highlight: $select.search"></span> | ||
| </ui-select-choices> | ||
| </ui-select> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-region' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.region" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-region' | translate }}" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-region' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.region" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-region' | translate }}" /> | ||
| </div> | ||
| <div class="form-group clearfix"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.operational-timezone' | translate }}</label> | ||
| <div class="form-input"> | ||
| <ui-select ng-model="blade.currentEntity.timeZone"> | ||
| <ui-select-match placeholder="{{ 'stores.blades.store-advanced.placeholders.operational-timezone' | translate }}">{{$select.selected.name}}</ui-select-match> | ||
| <ui-select-choices repeat="x.id as x in timeZones | filter: { name: $select.search }"> | ||
| <span ng-bind-html="x.name | highlight: $select.search"></span> | ||
| </ui-select-choices> | ||
| </ui-select> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="form-group clearfix"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.operational-timezone' | translate }}</label> | ||
| <div class="form-input"> | ||
| <ui-select ng-model="blade.currentEntity.timeZone"> | ||
| <ui-select-match placeholder="{{ 'stores.blades.store-advanced.placeholders.operational-timezone' | translate }}">{{$select.selected.name}}</ui-select-match> | ||
| <ui-select-choices repeat="x.id as x in timeZones | filter: { name: $select.search }"> | ||
| <span ng-bind-html="x.name | highlight: $select.search"></span> | ||
| </ui-select-choices> | ||
| </ui-select> | ||
| </div> | ||
| </div> | ||
| <div class="form-group clearfix"> | ||
| <legend>{{ 'stores.blades.store-advanced.labels.store-email-settings' | translate }}</legend> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-email-name' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.emailName" ng-pattern="/^(?!.*[*|\x22:<>[\]{}`%';@&$])/" ng-maxlength="256" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-email-name' | translate }}"> | ||
| </div> | ||
| <div class="form-group clearfix"> | ||
| <legend>{{ 'stores.blades.store-advanced.labels.store-email-settings' | translate }}</legend> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-email-name' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.emailName" ng-pattern="/^(?!.*[*|\x22:<>[\]{}`%';@&$])/" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-email-name' | translate }}"> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-admin-email-name' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.adminEmailName" ng-pattern="/^(?!.*[*|\x22:<>[\]{}`%';@&$])/" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-admin-email-name' | translate }}"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-email' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.email" type="email" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-email' | translate }}"> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-admin-email' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.adminEmail" type="email" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-admin-email' | translate }}"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-admin-email-name' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.adminEmailName" ng-pattern="/^(?!.*[*|\x22:<>[\]{}`%';@&$])/" ng-maxlength="256" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-admin-email-name' | translate }}"> | ||
| </div> | ||
| <fieldset> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="column"> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-email' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.email" type="email" ng-maxlength="128" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-email' | translate }}"> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label class="form-label">{{ 'stores.blades.store-advanced.labels.store-admin-email' | translate }}</label> | ||
| <div class="form-input"> | ||
| <input ng-model="blade.currentEntity.adminEmail" type="email" ng-maxlength="128" placeholder="{{ 'stores.blades.store-advanced.placeholders.store-admin-email' | translate }}"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </fieldset> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.