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

Display the right image for the app.

This commit is contained in:
Sean Li 2014-10-10 12:38:51 -07:00
parent fdbc38fd1f
commit dd643f6acd
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meteor/client/views/dashboard/apps/dashboard-single-app.html
View File

@ -19,7 +19,7 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<a onclick="trackLink('app detail')" href="/apps/{{name}}" class="name">{{name}}</a> <a onclick="trackLink('app detail')" href="/apps/{{name}}" class="name">{{name}}</a>
<small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{image.meta.name}}</a></small> <small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{displayTags image.tags}}</a></small>
</h5> </h5>
<div class="options"> <div class="options">
{{#if $eq status 'READY'}} {{#if $eq status 'READY'}}

2
meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
View File

@ -16,8 +16,10 @@
<a onclick="trackLink('view app')" href="{{url}}" class="btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App" data-container="body"><span class="typcn typcn-eye-outline"></span></a> <a onclick="trackLink('view app')" href="{{url}}" class="btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App" data-container="body"><span class="typcn typcn-eye-outline"></span></a>
{{/if}} {{/if}}
<a onclick="trackLink('terminal into app')" href="#" class="btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal" data-container="body"><span class="typcn typcn-device-laptop"></span></a> <a onclick="trackLink('terminal into app')" href="#" class="btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal" data-container="body"><span class="typcn typcn-device-laptop"></span></a>
{{#if image}}
<a onclick="trackLink('go to app image')" href="/images/{{image._id}}" class="btn-image" data-toggle="tooltip" data-placement="bottom" title="Image" data-container="body"><span class="typcn typcn-camera-outline"></span></a> <a onclick="trackLink('go to app image')" href="/images/{{image._id}}" class="btn-image" data-toggle="tooltip" data-placement="bottom" title="Image" data-container="body"><span class="typcn typcn-camera-outline"></span></a>
{{/if}} {{/if}}
{{/if}}
<a onclick="trackLink('open app folder')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a> <a onclick="trackLink('open app folder')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
{{#if $eq status 'READY'}} {{#if $eq status 'READY'}}
<a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-pause-outline"></span></a> <a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-pause-outline"></span></a>

4
meteor/collections/apps.js
View File

@ -24,7 +24,11 @@ Apps.allow({
Apps.helpers({ Apps.helpers({
image: function () { image: function () {
if (this.docker && this.docker.Image) {
return Images.findOne({'docker.Id': this.docker.Image});
} else {
return Images.findOne(this.imageId); return Images.findOne(this.imageId);
}
}, },
hostUrl: function () { hostUrl: function () {
return this.name + '.kite'; return this.name + '.kite';