From bf38205b27b93b47dc3f20f61d1b2eaf7f4cae88 Mon Sep 17 00:00:00 2001 From: Mike Lambert Date: Wed, 5 Aug 2020 11:09:12 -0500 Subject: [PATCH] Address SGCI Phase 2 Feedback (#324) * Hide purple boxes on landing, consistent naming for signUp * Move "See Also" from Landing to the "Help" dropdown on the navbar * Adjust hint text, make list / card buttons slightly more obvious * Highlight "Add" button, show popup when copying to clipboard, hide source when not needed * Hide "Add Application" button on Dashboard view * Increase size of Loading/Refresh icon --- gui/dashboard/catalog/CatalogController.js | 13 +++++++-- gui/dashboard/catalog/catalog.html | 31 +++++++++++++-------- gui/dashboard/dashboard/dashboard.html | 32 +++++++++------------- gui/landing/landing.html | 20 +++++++------- gui/shared/navbar/navbar.html | 2 +- 5 files changed, 54 insertions(+), 44 deletions(-) diff --git a/gui/dashboard/catalog/CatalogController.js b/gui/dashboard/catalog/CatalogController.js index 2e998ad1..1fefa786 100644 --- a/gui/dashboard/catalog/CatalogController.js +++ b/gui/dashboard/catalog/CatalogController.js @@ -22,9 +22,9 @@ angular * @author lambert8 * @see https://opensource.ncsa.illinois.edu/confluence/display/~lambert8/3.%29+Controllers%2C+Scopes%2C+and+Partial+Views */ -.controller('CatalogController', [ '$scope', '$filter', '$interval', '$uibModal', '$location', '$log', '_', 'Analytics', 'NdsLabsApi', 'Project', 'Stack', 'Stacks', +.controller('CatalogController', [ '$scope', '$filter', '$interval', '$timeout', '$uibModal', '$location', '$log', '_', 'Analytics', 'NdsLabsApi', 'Project', 'Stack', 'Stacks', 'StackService', 'Specs', 'clipboard', 'Vocabulary', 'RandomPassword', 'AuthInfo', 'ProductName', 'ApiUri', 'DashboardAppPath', 'HomePathSuffix', 'AdvancedFeatures', - function($scope, $filter, $interval, $uibModal, $location, $log, _, Analytics, NdsLabsApi, Project, Stack, Stacks, StackService, Specs, clipboard, Vocabulary, RandomPassword, AuthInfo, ProductName, ApiUri, DashboardAppPath, HomePathSuffix, AdvancedFeatures) { + function($scope, $filter, $interval, $timeout, $uibModal, $location, $log, _, Analytics, NdsLabsApi, Project, Stack, Stacks, StackService, Specs, clipboard, Vocabulary, RandomPassword, AuthInfo, ProductName, ApiUri, DashboardAppPath, HomePathSuffix, AdvancedFeatures) { "use strict"; $scope.showCreateSpec = AdvancedFeatures.showCreateSpec; @@ -97,6 +97,12 @@ angular $scope.$watch(function () { return Project.project; }, function(newValue, oldValue) { projectId = newValue.namespace; }); $scope.$watch('tags.selected', function(newValue, oldValue) { refilter($scope.specs, newValue); }, true); + $scope.showCopySuccess = false; + $scope.displayCopySuccessAlert = function() { + $scope.showCopySuccess = true; + $timeout(function() { $scope.showCopySuccess = false; }, 3000); + } + $scope.copyToClipboard = function(spec) { if (!clipboard.supported) { alert('Sorry, copy to clipboard is not supported'); @@ -131,6 +137,7 @@ angular })(specCopy); // jshint ignore:line clipboard.copyText(JSON.stringify(specCopy, null, 4)); + $scope.displayCopySuccessAlert(); }; var getQuickStartUrl = function(spec) { @@ -148,6 +155,7 @@ angular console.log("Copying to clipboard:", quickstartUrl); clipboard.copyText(quickstartUrl); Analytics.trackEvent('application', 'share-url', spec.key, 1, true); + $scope.displayCopySuccessAlert (); }; $scope.shareEmbed = function(spec) { @@ -161,6 +169,7 @@ angular console.log("Copying to clipboard:", htmlString); clipboard.copyText(htmlString); Analytics.trackEvent('application', 'share-embed', spec.key, 1, true); + $scope.displayCopySuccessAlert(); }; $scope.cloneSpec = function(spec) { diff --git a/gui/dashboard/catalog/catalog.html b/gui/dashboard/catalog/catalog.html index 1126e0ad..3e7d0854 100644 --- a/gui/dashboard/catalog/catalog.html +++ b/gui/dashboard/catalog/catalog.html @@ -28,8 +28,11 @@

Applications

- +
@@ -62,18 +65,22 @@

Applications

No applications matched your search

- Choose an application below to configure + Choose an application below

+ + - - - - + + + + @@ -82,8 +89,8 @@

Applications

{{ spec.label }} -
- + + {{ spec.key }} @@ -164,7 +171,7 @@

{{ spec.label }}

- {{ spec.key }} + {{ spec.key }}
diff --git a/gui/dashboard/dashboard/dashboard.html b/gui/dashboard/dashboard/dashboard.html index a2c995ab..f86aa358 100755 --- a/gui/dashboard/dashboard/dashboard.html +++ b/gui/dashboard/dashboard/dashboard.html @@ -1,35 +1,29 @@
-
+

{{ project.name }} Dashboard

+
-
-
- - - - - -
- -
    -
  1. {{ productName }}
    2. -
  2. Dashboard
    3. -
- -

This view shows the status of any applications that you have already added. To start an application, expand one below and then choose Launch.

-
diff --git a/gui/landing/landing.html b/gui/landing/landing.html index 7cc8d630..59c9205b 100644 --- a/gui/landing/landing.html +++ b/gui/landing/landing.html @@ -23,21 +23,21 @@

Welcome to the {{ productName }}!

- -
+ + -
+
@@ -61,7 +61,7 @@

Already have an account?

-
+
\ No newline at end of file diff --git a/gui/shared/navbar/navbar.html b/gui/shared/navbar/navbar.html index ea1224d8..8becd728 100755 --- a/gui/shared/navbar/navbar.html +++ b/gui/shared/navbar/navbar.html @@ -42,7 +42,7 @@
  • - + Help