openstack
/
app-catalog-ui
Code Issues Proposed changes

More cleanup. Reuse actions for deps too. 

See title.

Change-Id: I8ab44367a0773dc356b35bee772d20074701ff58
This commit is contained in:
Kevin Fox 2015-10-02 08:45:24 -07:00
parent c43b284f25
commit 25c8268d7b
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app_catalog/static/dashboard/project/app_catalog/_details_panel.html
View File

@ -16,7 +16,7 @@
<div>{$ asset.name $}</div>
<div>{$ asset.provided_by.company $}</div>
<div ng-switch="appaction" style="float:right">
<div ng-switch-when='true' app-action ng-scope ng-init='extraclasses="btn-lg"'></div>
<div ng-switch-when='true' app-action ng-scope ng-init='extraclasses="btn-lg";installclasses="btn-primary";launchclasses="btn-success"'></div>
</div>
</dd>
@ -36,12 +36,9 @@
<div ng-switch-default>
<table>
<tr ng-repeat="dep in asset.depends">
<td>{$ dep.name $}</td>
<td ng-switch="dep.asset.installed">
<a ng-switch-default class="btn btn-default btn-sm disabled ajax-modal" href="/}">Checking</a>
<a ng-switch-when="false" class="btn btn-default btn-sm ajax-modal" href="{$ WEBROOT $}project/images/create/?name={$ dep.asset.name | encodeURIComponent $}&source_type=url&image_url={$ dep.asset.attributes.url | encodeURIComponent $}&disk_format={$ dep.asset.service.disk_format $}&architecture={$ dep.asset.service.architecture $}&minimum_disk={$ dep.asset.service.min_disk $}&minimum_ram={$ dep.asset.service.min_ram $}&description={$ dep.asset.description $}">Install</a>
<a ng-switch-when="true" class="btn ntn-default btn-sm disbled">Installed</a>
</td>
<td>{$ dep.asset.name $}</td>
<td><div app-action ng-scope ng-init='extraclasses="btn-sm";no_launch=true;asset=dep.asset'></div></td>
</tr>
</table>
<div ng-switch-when="_undefined_"></div>

23
app_catalog/static/dashboard/project/app_catalog/action.html
View File

@ -8,25 +8,30 @@
<a ng-switch-when="error" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Error</a>
<a ng-switch-when="unsupported" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Unsupported</a>
<div ng-switch-when="true" ng-switch="asset.service.environment || '_undefined_'">
<a ng-switch-when="_undefined_" ng-class="extraclasses" class="btn btn-success btn-default ajax-modal" href="{$ WEBROOT $}project/stacks/select_template?template_source=url&template_url={$ asset.attributes.url | encodeURIComponent $}">Launch</a>
<a ng-switch-default ng-class="extraclasses" class="btn btn-success btn-default ajax-modal" href="{$ WEBROOT $}project/stacks/select_template?template_source=url&template_url={$ asset.attributes.url | encodeURIComponent $}&environment_source=raw&environment_data={$ asset.service.environment | encodeURIComponent $}">Launch</a>
<a ng-switch-when="_undefined_" ng-class="[extraclasses, launchclasses]" class="btn btn-default ajax-modal" href="{$ WEBROOT $}project/stacks/select_template?template_source=url&template_url={$ asset.attributes.url | encodeURIComponent $}">Launch</a>
<a ng-switch-default ng-class="[extraclasses, launchclasses]" class="btn btn-default ajax-modal" href="{$ WEBROOT $}project/stacks/select_template?template_source=url&template_url={$ asset.attributes.url | encodeURIComponent $}&environment_source=raw&environment_data={$ asset.service.environment | encodeURIComponent $}">Launch</a>
</div>
</div>
<div ng-switch-when="glance" ng-switch="asset.attributes.indirect_url || '_undefined_'">
<a ng-switch-default ng-class="extraclasses" class="btn btn-primary btn-default" target="_blank" href="{$ asset.attributes.indirect_url $}">Install Instructions</a>
<a ng-switch-default ng-class="[extraclasses, installclasses]" class="btn btn-default" target="_blank" href="{$ asset.attributes.indirect_url $}">Install Instructions</a>
<div ng-switch-when="_undefined_" ng-switch="asset.installed">
<a ng-switch-default ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Checking</a>
<a ng-switch-when="false" ng-class="extraclasses" class="btn btn-primary btn-default ajax-modal" href="{$ WEBROOT $}project/images/create/?name={$ asset.name | encodeURIComponent $}&source_type=url&image_url={$ asset.attributes.url | encodeURIComponent $}&disk_format={$ asset.service.disk_format $}&architecture={$ asset.service.architecture $}&minimum_disk={$ asset.service.min_disk $}&minimum_ram={$ asset.service.min_ram $}&description={$ asset.description $}">Install</a>
<a ng-switch-when="true" ng-class="extraclasses" class="btn btn-success btn-default ajax-modal" href="{$ WEBROOT $}project/instances/launch?source_type=image_id&source_id={$ asset.installed_id $}">Launch</a>
</a>
<a ng-switch-when="false" ng-class="[extraclasses, installclasses]" class="btn btn-default ajax-modal" href="{$ WEBROOT $}project/images/create/?name={$ asset.name | encodeURIComponent $}&source_type=url&image_url={$ asset.attributes.url | encodeURIComponent $}&disk_format={$ asset.service.disk_format $}&architecture={$ asset.service.architecture $}&minimum_disk={$ asset.service.min_disk $}&minimum_ram={$ asset.service.min_ram $}&description={$ asset.description $}">Install</a>
<div ng-switch-when="true" ng-switch="no_launch || '_undefined_'">
<a ng-switch-when="true" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Installed</a>
<a ng-switch-default ng-class="[extraclasses, launchclasses]" class="btn btn-default ajax-modal" href="{$ WEBROOT $}project/instances/launch?source_type=image_id&source_id={$ asset.installed_id $}">Launch</a>
</div>
</div>
</div>
<div ng-switch-when="murano" ng-switch="asset.has_murano">
<a ng-switch-when="false" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Unsupported</a>
<div ng-switch-when="true" ng-switch="asset.installed">
<a ng-switch-default ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Checking</a>
<a ng-switch-when="false" ng-class="extraclasses" class="btn btn-primary btn-default ajax-modal" href="{$ WEBROOT $}murano/packages/upload?repo_name={$ asset.service.package_name | encodeURIComponent $}&import_type=by_name">Install</a>
<a ng-switch-when="true" ng-class="extraclasses" class="btn btn-success btn-default ajax-modal" href="{$ WEBROOT $}murano/catalog/quick-add/{$ asset.service.murano_id $}">Launch</a>
<a ng-switch-when="false" ng-class="[extraclasses, installclasses]" class="btn btn-default ajax-modal" href="{$ WEBROOT $}murano/packages/upload?repo_name={$ asset.service.package_name | encodeURIComponent $}&import_type=by_name">Install</a>
<div ng-switch-when="true" ng-switch="no_launch || '_undefined_'">
<a ng-switch-when="true" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Installed</a>
<a ng-switch-default ng-class="[extraclasses, launchclasses]" class="btn btn-default ajax-modal" href="{$ WEBROOT $}murano/catalog/quick-add/{$ asset.service.murano_id $}">Launch</a>
</div>
</div>
</div>
<div ng-switch-when="bundle" ng-switch="asset.service.murano_package_name || '_undefined_'">
@ -34,7 +39,7 @@
<div ng-switch-default ng-switch="asset.has_murano">
<a ng-switch-when="false" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Unsupported</a>
<div ng-switch-when="true" ng-switch="asset.installed || '_undefined_'">
<a ng-switch-default ng-class="extraclasses" class="btn btn-primary btn-default ajax-modal" href="{$ WEBROOT $}murano/packages/import_bundle?name={$ asset.service.murano_package_name | encodeURIComponent $}&import_type=by_repo">Install</a>
<a ng-switch-default ng-class="[extraclasses, installclasses] class="btn btn-default ajax-modal" href="{$ WEBROOT $}murano/packages/import_bundle?name={$ asset.service.murano_package_name | encodeURIComponent $}&import_type=by_repo">Install</a>
<a ng-switch-when="true" ng-class="extraclasses" class="btn btn-default disabled ajax-modal" href="/">Installed</a>
</div>
</div>

2
app_catalog/static/dashboard/project/app_catalog/main_panel.html
View File

@ -128,7 +128,7 @@
</td>
<td class="rsp-p1">{$ asset.name $}</td>
<td class="rsp-p2">{$ asset.license $}</td>
<td class="rsp-p2"><div app-action ng-scope ng-init="extraclasses='btn-sm'"></div></td>
<td class="rsp-p2"><div app-action ng-scope ng-init="extraclasses='btn-sm';installclasses='btn-primary';launchclasses='btn-success'"></div></td>
</tr>
<tr ng-repeat-end class="detail-row">