From cc46ece953b5207aa8605798c497c10367df7cf5 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Tue, 22 Sep 2015 11:25:10 -0700 Subject: [PATCH] Bunch of updates Gray out grid items that are unsupported. Fix some formatting issues. Start breaking out css into its own file. Change-Id: I736c600a76e52bf6ce44377328922dc1af5c7c2c --- .../dashboard/project/app_catalog/action.html | 4 + .../project/app_catalog/app_catalog.js | 4 + .../project/app_catalog/app_catalog.scss | 11 ++ .../project/app_catalog/main_panel.html | 128 +++++++++--------- enabled/_90_project_app_catalog_panel.py | 4 + 5 files changed, 84 insertions(+), 67 deletions(-) create mode 100644 app_catalog/static/dashboard/project/app_catalog/app_catalog.scss diff --git a/app_catalog/static/dashboard/project/app_catalog/action.html b/app_catalog/static/dashboard/project/app_catalog/action.html index d0fdc1a..690590f 100644 --- a/app_catalog/static/dashboard/project/app_catalog/action.html +++ b/app_catalog/static/dashboard/project/app_catalog/action.html @@ -30,5 +30,9 @@ Install Installed + + +
+ Unsupported
diff --git a/app_catalog/static/dashboard/project/app_catalog/app_catalog.js b/app_catalog/static/dashboard/project/app_catalog/app_catalog.js index 08f6b7d..600a2c4 100644 --- a/app_catalog/static/dashboard/project/app_catalog/app_catalog.js +++ b/app_catalog/static/dashboard/project/app_catalog/app_catalog.js @@ -233,6 +233,7 @@ notify_update(); }).error(function(data, status) { var str = 'ERROR: Could not retrieve template:'; + asset.disabled = true; asset.validated = 'unsupported'; if (status == 400 && data.slice(0, str.length) == str) { asset.validated = 'error'; @@ -247,6 +248,9 @@ process(asset); } else if (asset.service.type == 'murano') { asset.validated = true; + asset.disabled = !$scope.has_murano; + } else if (asset.service.type != 'glance' && asset.service.type != 'bundle') { + asset.disabled = true; } asset.has_murano = $scope.has_murano; } diff --git a/app_catalog/static/dashboard/project/app_catalog/app_catalog.scss b/app_catalog/static/dashboard/project/app_catalog/app_catalog.scss new file mode 100644 index 0000000..7c87bf8 --- /dev/null +++ b/app_catalog/static/dashboard/project/app_catalog/app_catalog.scss @@ -0,0 +1,11 @@ +.app_catalog_grid_item_hidden { + height: 172px; + width: 182px; + margin: -170px 0px 0px -10px; + opacity: 1; + overflow: hidden; + display: block; + position: relative; + background: rgba(0, 0, 0, .25); + z-index: 100; +} diff --git a/app_catalog/static/dashboard/project/app_catalog/main_panel.html b/app_catalog/static/dashboard/project/app_catalog/main_panel.html index 758a32f..e49cc2d 100644 --- a/app_catalog/static/dashboard/project/app_catalog/main_panel.html +++ b/app_catalog/static/dashboard/project/app_catalog/main_panel.html @@ -40,66 +40,70 @@ position: relative; ">
-
- - - -
+ +
+ + + +
- - + +
{$ asset.name $} - - + overflow: hidden; + white-space: nowrap; + position: relative; + line-height: 18px; + font-size: 16px; + "> {$ asset.name $} + +
{$ asset.provided_by.name $} - - + overflow: hidden; + white-space: nowrap; + position: relative; + line-height: 14px; + font-size: 12px; + "> {$ asset.provided_by.name $} + + +
+
+
@@ -109,16 +113,6 @@ - @@ -130,7 +124,7 @@ @@ -148,7 +142,7 @@ diff --git a/enabled/_90_project_app_catalog_panel.py b/enabled/_90_project_app_catalog_panel.py index 24edb06..c98425c 100644 --- a/enabled/_90_project_app_catalog_panel.py +++ b/enabled/_90_project_app_catalog_panel.py @@ -27,3 +27,7 @@ ADD_ANGULAR_MODULES = ['horizon.dashboard.project.app_catalog'] ADD_JS_FILES = [ 'dashboard/project/app_catalog/app_catalog.js' ] + +ADD_SCSS_FILES = [ + 'dashboard/project/app_catalog/app_catalog.scss' +]
Name
- + {$ asset.name $} {$ asset.license $}
-
+