Packages adjustments (#8765)

This commit is contained in:
Bjarne Fyrstenborg
2020-08-31 15:39:48 +02:00
committed by GitHub
parent dae94bd957
commit 1a4eb442e1
5 changed files with 35 additions and 35 deletions

View File

@@ -228,12 +228,11 @@
on-remove="vm.removeFile($index)">
</umb-node-preview>
<a href=""
class="umb-node-preview-add"
ng-click="vm.openFilePicker()"
prevent-default>
<button type="button"
class="umb-node-preview-add"
ng-click="vm.openFilePicker()">
<localize key="general_add">Add</localize>
</a>
</button>
</umb-control-group>
@@ -251,13 +250,12 @@
on-remove="vm.removePackageView()">
</umb-node-preview>
<a href=""
<button type="button"
ng-show="!vm.package.packageView"
class="umb-node-preview-add"
ng-click="vm.openViewPicker()"
prevent-default>
ng-click="vm.openViewPicker()">
<localize key="general_add">Add</localize>
</a>
</button>
</umb-control-group>
</div>
@@ -275,7 +273,7 @@
description="Here you can add custom installer / uninstaller events to perform certain tasks during installation and uninstallation.
All actions are formed as a xml node, containing data for the action to be performed.">
<div>
<a target="_blank" ng-href="https://our.umbraco.com/documentation/Reference/Packaging/">Documentation</a>
<a href="" ng-href="https://our.umbraco.com/documentation/Reference/Packaging/" target="_blank" rel="noopener">Documentation</a>
<div>
<textarea class="umb-property-editor" rows="10" ng-model="vm.package.actions"></textarea>
</div>

View File

@@ -25,7 +25,7 @@
<div class="umb-package-list__item-content">
<div class="umb-package-list__item-name">{{ createdPackage.name }}</div>
<div class="umb-package-list__item-description">
{{ createdPackage.version }} | <a href="{{ createdPackage.url }}" target="_blank">{{ createdPackage.url }}</a> | {{ createdPackage.author }}
{{ createdPackage.version }} | <a href="{{ createdPackage.url }}" target="_blank" rel="noopener">{{ createdPackage.url }}</a> | {{ createdPackage.author }}
</div>
</div>
</td>

View File

@@ -19,7 +19,6 @@
ngf-max-size="{{ maxFileSize }}"
ng-class="{'is-small': compact!=='false' || (done.length+queue.length) > 0 }">
<div class="content">
<!-- Drag and drop illustration -->
@@ -63,7 +62,7 @@
<div class="flex items-center justify-center">
<div class="umb-info-local-items">
<div class="umb-package-icon">
<i ng-if="!vm.localPackage.iconUrl" class="icon-box"></i>
<i ng-if="!vm.localPackage.iconUrl" class="icon-box" aria-hidden="true"></i>
</div>
<div class="umb-package-info">
@@ -101,7 +100,7 @@
<form novalidate name="localPackageForm" class="w-100">
<div class="umb-package-icon">
<i ng-if="!vm.localPackage.iconUrl" class="icon-box"></i>
<i ng-if="!vm.localPackage.iconUrl" class="icon-box" aria-hidden="true"></i>
<img ng-if="vm.localPackage.iconUrl" ng-src="{{vm.localPackage.iconUrl}}" alt="" />
</div>
@@ -110,7 +109,7 @@
<div class="umb-info-local-item">
<strong><localize key="packager_packageAuthor">Author</localize></strong><br>
<a href="{{ vm.localPackage.authorUrl }}" target="_blank">{{ vm.localPackage.author }}</a>
<a href="{{ vm.localPackage.authorUrl }}" target="_blank" rel="noopener">{{ vm.localPackage.author }}</a>
</div>
<div class="umb-info-local-item" ng-if="vm.localPackage.contributors && vm.localPackage.contributors.length > 0">
@@ -133,7 +132,7 @@
<div class="umb-info-local-item">
<strong><localize key="packager_packageLicense">License</localize></strong><br>
<a href="{{ vm.localPackage.licenseUrl }}" target="_blank">{{ vm.localPackage.license }}</a>
<a href="{{ vm.localPackage.licenseUrl }}" target="_blank" rel="noopener">{{ vm.localPackage.license }}</a>
</div>
<div class="umb-info-local-item">
@@ -142,15 +141,16 @@
</div>
<div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == '' && vm.localPackage.isCompatible">
<label for="license-accepts" class="umb-package-installer-label">
<input type="checkbox" id="license-accepts" ng-model="vm.localPackage.packageLicenseAccept" required no-dirty-check>
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="{{ vm.localPackage.licenseUrl }}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
</label>
<umb-checkbox model="vm.localPackage.packageLicenseAccept" required="true">
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="#" ng-href="{{vm.localPackage.licenseUrl}}" target="_blank" rel="noopener"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
</umb-checkbox>
<umb-button class="mt3"
type="button"
disabled="localPackageForm.$invalid"
size="m"
button-style="success"
disabled="localPackageForm.$invalid"
action="vm.installPackage()"
label-key="packager_packageInstall">
</umb-button>

View File

@@ -18,7 +18,7 @@
<div class="umb-package-list__item-content">
<div class="umb-package-list__item-name">{{ installedPackage.name }}</div>
<div class="umb-package-list__item-description">
{{ installedPackage.version }} | <a href="{{ installedPackage.url }}" target="_blank">{{ installedPackage.url }}</a> | {{ installedPackage.author }}
{{ installedPackage.version }} | <a href="{{ installedPackage.url }}" target="_blank" rel="noopener">{{ installedPackage.url }}</a> | {{ installedPackage.author }}
</div>
</div>
</td>
@@ -77,7 +77,7 @@
<div class="umb-info-local-item">
<strong><localize key="packager_packageAuthor">Author</localize></strong>
<a href="{{ vm.package.authorLink }}" target="_blank">{{ vm.package.author }}</a>
<a href="{{ vm.package.authorLink }}" target="_blank" rel="noopener">{{ vm.package.author }}</a>
</div>
<div class="umb-info-local-item">
@@ -87,7 +87,7 @@
<div class="umb-info-local-item">
<strong><localize key="packager_packageLicense">License</localize></strong>
<a href="{{ vm.package.licenseUrl }}" target="_blank">{{ vm.package.license }}</a>
<a href="{{ vm.package.licenseUrl }}" target="_blank" rel="noopener">{{ vm.package.license }}</a>
</div>
<div class="umb-info-local-item">

View File

@@ -10,16 +10,15 @@
<label for="package-query" class="sr-only">
<localize key="packager_packageSearch">Search for packages</localize>
</label>
<input
class="-full-width-input"
type="text"
name="query"
id="package-query"
localize="placeholder"
placeholder="@packager_packageSearch"
ng-model="vm.searchQuery"
ng-change="vm.search()"
no-dirty-check>
<input type="text"
class="-full-width-input"
name="query"
id="package-query"
localize="placeholder"
placeholder="@packager_packageSearch"
ng-model="vm.searchQuery"
ng-change="vm.search()"
no-dirty-check />
</div>
</div>
@@ -356,12 +355,15 @@
</div>
<div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == '' && vm.localPackage.isCompatible">
<umb-checkbox model="vm.localPackage.packageLicenseAccept" required="true">
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="#" ng-href="{{vm.localPackage.licenseUrl}}" target="_blank"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
<strong class="label-text"><localize key="packager_accept">I accept</localize> <a href="#" ng-href="{{vm.localPackage.licenseUrl}}" target="_blank" rel="noopener"><localize key="packager_termsOfUse">terms of use</localize></a></strong>
</umb-checkbox>
<umb-button ng-if="vm.installState.type !== 'error'"
class="mt3"
type="button"
size="m"
button-style="success"
disabled="localPackageForm.$invalid"
action="vm.installPackage(vm.localPackage)"