Merge pull request #44 from vincent99/reskin

Create Project

Author: vincent99

app/mixins/github-user-info.js

@@ -6,22 +6,45 @@ export default Ember.Mixin.create({
   login: null,
   size: 40,
 
-  name: 'Loading...',
+  name: null,
+  description: 'Loading...',
   _avatarUrl: null,
 
   loginOrTypeChanged: function() {
     var self = this;
+    var session = this.get('session');
 
-    var cache = self.get('session').get('avatarCache')||{};
-
+    var cache = session.get('avatarCache')||{};
     var login = this.get('login');
-    if ( !login )
+    var type = this.get('type');
+    var key = type + ':' + login;
+
+    if ( !type || !login )
     {
       return;
     }
 
-    var type = this.get('type');
-    var key = type + ':' + login;
+    // Teams can't be looked up without auth...
+    if ( type === 'team' )
+    {
+      var entry = (session.get('teams')||[]).filterProperty('name', login)[0];
+      this.set('_avatarUrl', null);
+      if ( entry )
+      {
+        this.set('name', entry.name);
+        this.set('description', entry.org + ' team');
+      }
+      else
+      {
+        this.set('name', '('+ login + ')');
+        this.set('description', '(Unknown team id)');
+      }
+
+      return;
+    }
+
+    this.set('name', login);
+
 
     if ( cache[key] )
     {
@@ -30,21 +53,21 @@ export default Ember.Mixin.create({
     else
     {
       var url = C.GITHUB_API_URL + type + 's/' + login;
-      Ember.$.ajax({url: url, dataType: 'json'}).then(function(body) {
+      Ember.$.ajax({url: url, dataType: 'json'}).then((body) => {
         cache[key] = body;
 
         // Sub-keys don't get automatically persisted to the session...
-        self.get('session').set('avatarCache', cache);
+       session.set('avatarCache', cache);
 
         gotInfo(body);
-      }, function() {
-        self.sendAction('notFound', login);
+      }, () => {
+        this.sendAction('notFound', login);
       });
     }
 
     function gotInfo(body)
     {
-      self.set('name', body.name);
+      self.set('description', body.name);
       self.set('_avatarUrl', body.avatar_url);
     }
   }.observes('login','type').on('init'),

app/pods/apikeys/template.hbs

@@ -16,7 +16,7 @@
   </div>
 
   <div>
-    <div class="clear-fix">
+    <div class="clearfix">
       <label><i class="fa fa-code"></i> API Keys</label>
       <div style="float: right">
         <button {{action "newApikey"}} class="btn btn-primary"><i class="fa fa-plus"></i> Create an API key</button>

app/pods/components/github-block/component.js

@@ -4,4 +4,7 @@ import GithubUserInfoMixin from 'ui/mixins/github-user-info';
 export default Ember.Component.extend(GithubUserInfoMixin,{
   classNames: ['gh-block'],
   avatar: true,
+  link: true,
+
+  isTeam: Ember.computed.equal('type','team'),
 });

app/pods/components/github-block/template.hbs

@@ -2,21 +2,39 @@
 {{#if avatar}}
   <div class="gh-avatar">
     {{#if avatarUrl}}
-      <a {{bind-attr href=url}} target="_blank">
+      {{#if link}}
+        <a {{bind-attr href=url}} target="_blank">
+          <img {{bind-attr src=avatarUrl width=size height=size}}>
+        </a>
+      {{else}}
         <img {{bind-attr src=avatarUrl width=size height=size}}>
-      </a>
+      {{/if}}
     {{else}}
-      <div class="gh-placeholder"></div>
+      {{#if isTeam}}
+        <div class="gh-placeholder">
+          <i class="fa fa-2x fa-github-alt"></i>
+        </div>
+      {{else}}
+        <div class="gh-placeholder"></div>
+      {{/if}}
     {{/if}}
   </div>
 {{/if}}
 <div class="gh-block-content">
   <div class="clip">
-    <a {{bind-attr href=url}} target="_blank">{{login}}</a>
+    {{#if isTeam}}
+      {{name}}
+    {{else}}
+      {{#if link}}
+        <a {{bind-attr href=url}} target="_blank">{{name}}</a>
+      {{else}}
+        {{name}}
+      {{/if}}
+    {{/if}}
   </div>
   <div class="text-muted clip">
-    {{#if name}}
-      {{name}}
+    {{#if description}}
+      {{description}}
     {{else}}
       <i>No Name</i>
     {{/if}}

app/pods/components/host-widget/template.hbs

@@ -1,5 +1,6 @@
 <div class="host-header">
   <div {{bind-attr class=":host-overlay stateBackground"}}>
+    <div class="host-name">{{model.displayName}}</div>
     {{resource-actions model=model choices=model.primaryActions big=true}}
   </div>
 

app/pods/components/page-header/template.hbs

@@ -52,8 +52,6 @@
                 </a>
               </li>
             {{/each}}
-            <li role="presentation" class="divider"></li>
-            <li>{{#link-to "projects"}}Manage Projects{{/link-to}}</li>
           </ul>
         </div>
       </div>

app/pods/container/controller.js

@@ -98,7 +98,7 @@ var ContainerController = Cattle.TransitioningResourceController.extend({
       choices.push(byName('purge'));
     }
 
-    choices.push({ tooltip: 'Details',         icon: 'fa-chevron-right',          action: 'detail',        enabled: true });
+    choices.push({ tooltip: 'Details',         icon: 'fa-info-circle',          action: 'detail',        enabled: true });
     return choices;
 
     function byName(name) {

app/pods/host/controller.js

@@ -61,7 +61,7 @@ var HostController = Cattle.TransitioningResourceController.extend({
       choices.push(byName('promptDelete'));
     }
 
-    choices.push({ tooltip: 'Details',         icon: 'fa-chevron-right',          action: 'detail',        enabled: true });
+    choices.push({ tooltip: 'Details',         icon: 'fa-info',          action: 'detail',        enabled: true });
     return choices;
 
     function byName(name) {

app/pods/host/template.hbs

@@ -41,7 +41,10 @@
 
 <section>
   <div class="well instances">
-    <label>Containers</label>
+    <div class="clearfix">
+      <div class="pull-right">{{#link-to "containers.new" (query-params hostId=model.id) class="btn btn-primary btn-sm"}}<i class="fa fa-plus"></i> Add a Container{{/link-to}}</div>
+      <label>Containers</label>
+    </div>
     {{#each col in view.columns}}
       <div class="instance-column">
         {{#each item in col itemController="container"}}

app/pods/host/view.js

@@ -53,13 +53,15 @@ export default Ember.View.extend({
 
     var out = [];
     var i;
+
+    for ( i = 0 ; i < columnCount ; i++ )
+    {
+      out.push([]);
+    }
+
     var instances = this.get('context.instances');
     if ( instances )
     {
-      for ( i = 0 ; i < columnCount ; i++ )
-      {
-        out.push([]);
-      }
 
       for ( i = 0 ; i < instances.get('length') ; i++ )
       {