From 340d0eb84e6798ae91c52e09147f006be9ee07f3 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Wed, 22 Jun 2016 15:05:26 +0200 Subject: [PATCH] =?UTF-8?q?Added=20=E2=80=9CTake=20me=20back=20link?= =?UTF-8?q?=E2=80=9D=20to=20missing=20views?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/umb-package-local-install.less | 4 + .../src/less/components/umb-packages.less | 6 +- .../views/packager/views/install-local.html | 181 ++++++----- .../src/views/packager/views/repo.html | 290 +++++++++--------- 4 files changed, 255 insertions(+), 226 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less index c36184394f..9b4907e73d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-package-local-install.less @@ -67,6 +67,10 @@ font-weight: bold; color: @blue; cursor: pointer; + + &:hover { + text-decoration: underline; + } } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less index 2bff88758e..f91d386a9a 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less @@ -411,13 +411,13 @@ display: flex; } -.umb-package-details__back-link { +a.umb-package-details__back-link { font-weight: bold; - color: @grayMed; + color: @black; } .umb-package-details__back-link:hover { - color: @black; + color: @grayMed; text-decoration: none; } diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html index 64e37713e9..d367645b66 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html @@ -1,110 +1,124 @@ -
+
- -
-
+
- -
+ +
+ + + +
-
+
- - - Drop to upload + + + Drop to upload - -
- - or click here to choose files + +
+ - or click here to choose files +
-
-

Upload package

-

- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam -

+

Upload package

+

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam +

- + +
+
- -
-
+ + + ← Cancel and upload another package + + -
-
- - -
+
+ + +
+
+ + +
+ + +
-
-

{{ vm.localPackage.name }}

+
+

{{ vm.localPackage.name }}

-
- Author - {{ vm.localPackage.author }} -
+
+ Author + {{ vm.localPackage.author }} +
-
- Version - {{ vm.localPackage.version }} -
+
+ Version + {{ vm.localPackage.version }} +
-
- License - {{ vm.localPackage.license }} -
+
+ License + {{ vm.localPackage.license }} +
-
- Read me -
- -
+
+ Read me +
+ +
-
- - -
-
- This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}} -
-
-

{{vm.installState.status}}

-
+
+ + +
+
+ This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}} +
+
+

{{vm.installState.status}}

+
+ +
+
- - +
@@ -131,5 +145,4 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 813babd460..9504e11e48 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -111,7 +111,7 @@ -
+
@@ -119,21 +119,23 @@ -
+
-
+
-
{{ vm.package.name }}
+
-
+
{{ vm.package.name }}
-
-
+
+ +
+
- - + + +
-
-
- -
- -
-
-
-
+
-
+
+ +
+ +
+
+ +
-
+
+
+
{{ vm.package.ownerInfo.owner }}
+
+ {{ vm.package.ownerInfo.owner }} has {{ vm.package.ownerInfo.karma }} karma points +
+
+
+
+ +
+
Information
-
{{ vm.package.ownerInfo.owner }}
-
- {{ vm.package.ownerInfo.owner }} has {{ vm.package.ownerInfo.karma }} karma points + +
+
Owner:
+
{{vm.package.ownerInfo.owner}}
+ +
+
Contributors:
+ +
+ +
+
Created:
+
{{vm.package.created}}
+
+ +
+
Current version:
+
{{vm.package.latestVersion}}
+
+ +
+
.Net Version:
+
{{vm.package.information.netVersion}}
+
+ +
+
License:
+
{{vm.package.licenseName}}
+
+ +
+
Downloads:
+
{{vm.package.downloads}}
+
+ +
+
Karma:
+
{{vm.package.ownerInfo.karma}}
+
+
-
-
-
Information
-
- -
-
Owner:
-
{{vm.package.ownerInfo.owner}}
-
- -
-
Contributors:
-
- {{ contributor.name }},   +
+
Compatibility
+
This project is compatible with the following versions as reported by community members who have downloaded this package:
+
+
+ {{compatibility.version}} + ({{compatibility.percentage}}%)
-
- -
-
Created:
-
{{vm.package.created}}
-
- -
-
Current version:
-
{{vm.package.latestVersion}}
-
- -
-
.Net Version:
-
{{vm.package.information.netVersion}}
-
- -
-
License:
-
{{vm.package.licenseName}}
-
- -
-
Downloads:
-
{{vm.package.downloads}}
-
- -
-
Karma:
-
{{vm.package.ownerInfo.karma}}
-
- -
-
- -
-
Compatibility
-
This project is compatible with the following versions as reported by community members who have downloaded this package:
-
-
- {{compatibility.version}} - ({{compatibility.percentage}}%) -
-
-
- -
-
External sources
- +
+
External sources
+ + +
+
-
-
-
+
+ + + ← Take me back + + -
-
- - -
+
+
-
-

{{ vm.localPackage.name }}

- -
- Author - {{ vm.localPackage.author }} + +
+ +
-
- Version - {{ vm.localPackage.version }} -
-
- License - {{ vm.localPackage.license }} -
+
+

{{ vm.localPackage.name }}

-
- Read me -
- -
+
+ Author + {{ vm.localPackage.author }} +
-
- - -
-
- This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}} -
-
-

{{vm.installState.status}}

-
+
+ Version + {{ vm.localPackage.version }} +
-
- +
+ License + {{ vm.localPackage.license }} +
+
+ Read me +
+ +
+ +
+ + +
+
+ This package cannot be installed, it requires a minimum Umbraco version of {{vm.localPackage.umbracoVersion}} +
+
+

{{vm.installState.status}}

+
+ +
+ + +