140 - UI Styling for Application details -Summary view #153
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,73 @@ | ||
| @import "view/applications/applications"; | ||
|
|
||
| // TODO may need to move these rule out to helio-ui-theme | ||
| .action-bar { | ||
| height: $hpe-unit-space * 3; | ||
| line-height: $hpe-unit-space * 3; | ||
| vertical-align: middle; | ||
| margin-top: $hpe-unit-space; | ||
| padding-left: $hpe-unit-space; | ||
| padding-right: $hpe-unit-space; | ||
|
|
||
| .action-target-name { | ||
| display: inline-block; | ||
| font-size: $hpe-unit-space - 3px; | ||
| margin-left: $hpe-unit-space * .75; | ||
| } | ||
|
|
||
| .action-target-state { | ||
| color: $brand-primary; | ||
| display: inline-block; | ||
| font-size: $hpe-unit-space + 3px; | ||
| } | ||
|
|
||
| .btn { | ||
| margin-left: $hpe-unit-space / 3; | ||
| } | ||
| } | ||
|
|
||
| table.table { | ||
| > thead > tr > th, | ||
| > tbody > tr:not([table-inline-message]) > td, | ||
| > tfoot > tr > td { | ||
|
|
||
| .icon-link { | ||
| color: $text-color; | ||
| text-decoration: none; | ||
|
|
||
| &:hover, | ||
| &:active { | ||
| color: $link-color; | ||
| text-decoration: none; | ||
| } | ||
| } | ||
|
|
||
| .helion-icon { | ||
| line-height: 0; | ||
| font-size: $hpe-unit-space; | ||
| vertical-align: middle; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .action-header { | ||
|
|
||
| &.panel-heading { | ||
| line-height: 1; | ||
| padding-top: $hpe-unit-space * 1.1; | ||
| padding-bottom: $hpe-unit-space * .5; | ||
| } | ||
|
|
||
| .btn { | ||
| line-height: 1; | ||
| text-transform: capitalize; | ||
|
|
||
| * { | ||
| line-height: 0; | ||
| } | ||
|
|
||
| .helion-icon { | ||
| margin-right: $hpe-unit-space / 3 | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,18 @@ | |
| angular.extend(ApplicationController.prototype, { | ||
| init: function () { | ||
| this.model.getAppSummary(this.id); | ||
| }, | ||
|
|
||
| launch: function () { | ||
|
Contributor
There was a problem hiding this comment. Is this going away in the next PR?
Contributor
There was a problem hiding this comment. unknown. this was based on seans work as of yesterday
Contributor
There was a problem hiding this comment. Ah wait, I see it removed here: https://github.com/hpcloud/stratos-ui/pull/154 |
||
| this.model.launch(this.id); | ||
| }, | ||
|
|
||
| restart: function () { | ||
| this.model.restart(this.id); | ||
| }, | ||
|
|
||
| stop: function () { | ||
| this.model.stop(this.id); | ||
| } | ||
| }); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @import "summary/summary"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,129 @@ | ||
| <div class="panel panel-default summary"> | ||
| <div class="panel-heading action-header"> | ||
| <span translate>Summary</span> | ||
| <a class="btn btn-link"> | ||
| <i class="helion-icon helion-icon-Right_Arrow"></i> | ||
| <span translate>Edit</span> | ||
| </a> | ||
| </div> | ||
|
|
||
| <div class="row data-body"> | ||
| <div class="col-md-6"> | ||
| <dl class="dl-horizontal"> | ||
| <dt translate>MEMORY UTILIZATION</dt> | ||
| <dd class="pull-right">0 / {{ appCtrl.model.application.summary.memory }} <span translate>MB</span></dd> | ||
|
|
||
| <dt translate>INSTANCES</dt> | ||
| <dd class="pull-right">{{ appCtrl.model.application.summary.running_instances }} / {{ appCtrl.model.application.summary.instances }}</dd> | ||
|
|
||
| <dt translate>DISK QUOTA</dt> | ||
| <dd class="pull-right">0 / {{ appCtrl.model.application.summary.disk_quota }} <span translate>MB</span></dd> | ||
|
|
||
| <dt translate>STATE</dt> | ||
| <dd class="pull-right"></dd> | ||
|
|
||
| <dt translate>MODIFIED</dt> | ||
| <dd class="pull-right"></dd> | ||
| </dl> | ||
| </div> | ||
| <div class="col-md-6"> | ||
| <dl class="dl-horizontal"> | ||
| <dt translate>BUILDPACK</dt> | ||
| <dd class="pull-right">{{ appCtrl.model.application.summary.buildpack }}</dd> | ||
|
|
||
| <dt translate>CF TARGET</dt> | ||
| <dd class="pull-right"></dd> | ||
|
|
||
| <dt translate>CF LOGIN</dt> | ||
| <dd class="pull-right"></dd> | ||
| </dl> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div> | ||
| <div class="action-header"> | ||
| <span translate>Service Instances</span> | ||
| <a class="btn btn-link"> | ||
| <i class="helion-icon helion-icon-Right_Arrow"></i> | ||
| <span translate>Add service</span> | ||
| </a> | ||
| </div> | ||
| <div class="panel panel-default"> | ||
| <table class="table"> | ||
| <thead> | ||
| <tr> | ||
| <th translate>Name</th> | ||
| <th translate>Service</th> | ||
| <th translate>Plan</th> | ||
| <th translate>ENV.VARIABLES</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr ng-repeat="service in appCtrl.model.application.summary.services"> | ||
| <td>{{ service.name }}</td> | ||
| <td>{{ service.service_plan.service.label }}</td> | ||
| <td>{{ service.service_plan.name }}</td> | ||
| <td> | ||
| <a class="icon-link" href="http://yahoo.com" target="_blank"><i class="helion-icon helion-icon-Share"></i></a> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div> | ||
| <div class="action-header"> | ||
| <span translate>Routes</span> | ||
| <a class="btn btn-link"> | ||
| <i class="helion-icon helion-icon-Right_Arrow"></i> | ||
| <span translate>Add routes</span> | ||
| </a> | ||
| </div> | ||
| <div class="panel panel-default"> | ||
| <table class="table"> | ||
| <thead> | ||
| <tr> | ||
| <th translate>Route</th> | ||
| <th translate>Actions</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr ng-repeat="route in appCtrl.model.application.summary.routes"> | ||
| <td>{{ route.host + '.' + route.domain.name + '/' + route.path }}</td> | ||
| <td></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div> | ||
| <div class="action-header"> | ||
| <span translate>Instances</span> | ||
| <a class="btn btn-link"> | ||
| <i class="helion-icon helion-icon-Right_Arrow"></i> | ||
| <span translate>Add instances</span> | ||
| </a> | ||
| </div> | ||
| <div class="panel panel-default"> | ||
| <table class="table"> | ||
| <thead> | ||
| <tr> | ||
| <th translate>Index</th> | ||
| <th translate>Status</th> | ||
| <th></th> | ||
| </tr> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr ng-repeat="instance in appCtrl.model.application.summary.running_instances"> | ||
| <td>{{ $index }}</td> | ||
| <td>{{ instance.name }}</td> | ||
| <td></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| .application-details .summary .data-body { | ||
| padding: $hpe-unit-space * .75 $hpe-unit-space; | ||
|
|
||
| .dl-horizontal > * { | ||
| margin-bottom: $hpe-unit-space * .5; | ||
| margin-left: auto; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @import "application/application"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,15 @@ | ||
| <gallery-card card-data="applicationGalleryCardCtrl.cardData" | ||
| on-card-click="applicationGalleryCardCtrl.goToApp()"> | ||
| <dl class="dl-horizontal"> | ||
| <dt>Memory Utilization</dt> | ||
| <dd>{{applicationGalleryCardCtrl.app.entity.memory}} MB</dd> | ||
| <dt>Instances</dt> | ||
| <dd>{{applicationGalleryCardCtrl.app.entity.instances}}</dd> | ||
| <dt>Disk Quota</dt> | ||
| <dd>{{applicationGalleryCardCtrl.app.entity.disk_quota}}</dd> | ||
| <dt>State</dt> | ||
| <dd>{{applicationGalleryCardCtrl.app.entity.state}}</dd> | ||
| <dt>Modified</dt> | ||
| <dd>{{applicationGalleryCardCtrl.app.metadata.updated_at | date : 'M/d/yy h:mm:ss a'}}</dd> | ||
| </dl> | ||
| </gallery-card> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was thinking that as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are still new styles on notification coming, I'd like to refactor them out once get them done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good