rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267 from vincent99/sidekick 

Sidekick bug fixes
This commit is contained in:
Vincent Fiduccia 2015-10-05 13:00:27 -07:00
parent 6338199a1a 2c17985804
commit 11b11198b6
9 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/components/environment-header/template.hbs
View File

@ -8,11 +8,11 @@
</div>
<span class="right-divider">{{#link-to "environments"}}Stacks:{{/link-to}} {{model.displayName}}</span>
<div class="btn-group right-divider" style="margin: 0 10px 0 -5px;">
{{#link-to "environment.index" (query-params mode="dot") classNames="btn btn-sm btn-default"}}<i class="fa fa-ellipsis-h"></i>{{/link-to}}
{{#link-to "environment.index" (query-params mode="list") classNames="btn btn-sm btn-default"}}<i class="icon icon-thumbnails"></i>{{/link-to}}
{{#link-to "environment.index" (query-params mode="grouped") classNames="btn btn-sm btn-default"}}<i class="fa fa-object-group"></i>{{/link-to}}
{{#link-to "environment.graph" classNames="btn btn-sm btn-default"}}<i class="icon icon-share"></i>{{/link-to}}
{{#link-to "environment.code" classNames="btn btn-sm btn-default"}}<i class="icon icon-file"></i>{{/link-to}}
{{#link-to "environment.index" (query-params mode="dot") classNames="btn btn-sm btn-default"}}<i class="fa fa-ellipsis-h" data-placement="bottom" tooltip="Tiny Dots"></i>{{/link-to}}
{{#link-to "environment.index" (query-params mode="list") classNames="btn btn-sm btn-default"}}<i class="icon icon-thumbnails" data-placement="bottom" tooltip="Containers"></i>{{/link-to}}
{{#link-to "environment.index" (query-params mode="grouped") classNames="btn btn-sm btn-default"}}<i class="fa fa-object-group" data-placement="bottom" tooltip="Grouped Sidekicks"></i>{{/link-to}}
{{#link-to "environment.graph" classNames="btn btn-sm btn-default"}}<i class="icon icon-share" data-placement="bottom" tooltip="Link Graph"></i>{{/link-to}}
{{#link-to "environment.code" classNames="btn btn-sm btn-default"}}<i class="icon icon-file" data-placement="bottom" tooltip="Compose YAML"></i>{{/link-to}}
</div>
<div class="btn-group">
{{#link-to "service.new" (query-params environmentId=model.id) classNames="btn btn-primary btn-sm"}}Add Service{{/link-to}}

4
app/components/host-pod/template.hbs
View File

@ -87,6 +87,10 @@
{{/if}}
{{/unless}}
</div>
{{else}}
{{#if showAdd}}
{{add-subpod action="newContainer" label="Add Container" groupHasChildren=group.hasChildren}}
{{/if}}
{{/each}}
{{else}}
{{#each arrangedInstances as |item|}}

7
app/environment/index/controller.js
View File

@ -1,10 +1,9 @@
import Ember from 'ember';
export default Ember.ObjectController.extend({
mode: 'grouped',
queryParams: ['mode'],
export default Ember.Controller.extend({
needs: ['environments'],
mode: Ember.computed.alias('controllers.environments.mode'),
needs: ['environment'],
actions: {
addService: function() {
this.get('controllers.environment').send('addService');

5
app/environments/controller.js
View File

@ -1,2 +1,5 @@
import Ember from 'ember';
export default Ember.Controller.extend();
export default Ember.Controller.extend({
mode: 'grouped',
queryParams: ['mode'],
});

4
app/environments/index/controller.js
View File

@ -1,8 +1,8 @@
import Ember from 'ember';
export default Ember.Controller.extend({
mode: 'grouped',
queryParams: ['mode'],
needs: ['environments'],
mode: Ember.computed.alias('controllers.environments.mode'),
arranged: function() {
return this.get('model').sortBy('name','id');

6
app/environments/index/template.hbs
View File

@ -3,9 +3,9 @@
<span class="right-divider">Stacks</span>
<div class="btn-group right-divider" style="margin: 0 10px 0 -5px;">
{{#link-to "environments" (query-params mode="dot") classNames="btn btn-sm btn-default"}}<i class="fa fa-ellipsis-h"></i>{{/link-to}}
{{#link-to "environments" (query-params mode="list") classNames="btn btn-sm btn-default"}}<i class="icon icon-thumbnails"></i>{{/link-to}}
{{#link-to "environments" (query-params mode="grouped") classNames="btn btn-sm btn-default"}}<i class="fa fa-object-group"></i>{{/link-to}}
{{#link-to "environments" (query-params mode="dot") classNames="btn btn-sm btn-default"}}<i class="fa fa-ellipsis-h" data-placement="bottom" tooltip="Tiny Dots"></i>{{/link-to}}
{{#link-to "environments" (query-params mode="list") classNames="btn btn-sm btn-default"}}<i class="icon icon-thumbnails" data-placement="bottom" tooltip="Containers"></i>{{/link-to}}
{{#link-to "environments" (query-params mode="grouped") classNames="btn btn-sm btn-default"}}<i class="fa fa-object-group" data-placement="bottom" tooltip="Grouped Sidekicks"></i>{{/link-to}}
</div>
{{#link-to "environments.new" classNames="btn btn-sm btn-primary right-divider-btn"}}Add Stack{{/link-to}}

6
app/hosts/index/template.hbs
View File

@ -3,9 +3,9 @@
<span class="right-divider">Hosts</span>
<div class="btn-group right-divider" style="margin: 0 10px 0 -5px;">
{{#link-to "hosts" (query-params mode="dot") classNames="btn btn-sm btn-default"}}<i class="fa fa-ellipsis-h"></i>{{/link-to}}
{{#link-to "hosts" (query-params mode="list") classNames="btn btn-sm btn-default"}}<i class="icon icon-thumbnails"></i>{{/link-to}}
{{#link-to "hosts" (query-params mode="grouped") classNames="btn btn-sm btn-default"}}<i class="fa fa-object-group"></i>{{/link-to}}
{{#link-to "hosts" (query-params mode="dot") classNames="btn btn-sm btn-default"}}<i class="fa fa-ellipsis-h" data-placement="bottom" tooltip="Tiny Dots"></i>{{/link-to}}
{{#link-to "hosts" (query-params mode="list") classNames="btn btn-sm btn-default"}}<i class="icon icon-thumbnails" data-placement="bottom" tooltip="Containers"></i>{{/link-to}}
{{#link-to "hosts" (query-params mode="grouped") classNames="btn btn-sm btn-default"}}<i class="fa fa-object-group" data-placement="bottom" tooltip="Grouped Stacks &amp; Sidekicks"></i>{{/link-to}}
</div>
{{#link-to "hosts.new" classNames="btn btn-sm btn-primary right-divider-btn"}}Add Host{{/link-to}}

6
app/initializers/extend-ember-view.js
View File

@ -6,9 +6,13 @@ export function initialize(/* container, application */) {
Ember.TextField.reopen(SafeStyle);
Ember.TextArea.reopen(SafeStyle);
Ember.Checkbox.reopen(SafeStyle);
Ember.LinkView.reopen({
attributeBindings: ['tooltip'],
});
}
export default {
name: 'extend-ember-textarea',
name: 'extend-ember-view',
initialize: initialize
};

2
app/styles/pod.scss
View File

@ -220,7 +220,7 @@ $subpod-detail: #9a9a9a;
}
}
.no-touch .subpod.subpod-half-width:hover {
.no-touch .subpod.resource-action-hover.subpod-half-width:hover {
padding-right: 31px;
}