Merge branch 'ember-cli' of github.com:travis-ci/travis-web into ember-cli

app/adapters/env-var.coffee

@@ -1,5 +1,5 @@
 `import Ember from 'ember'`
-`import ApplicationAdapter from 'adapters/application'`
+`import ApplicationAdapter from 'travis/adapters/application'`
 
 Adapter = ApplicationAdapter.extend
   namespace: 'settings'

app/adapters/ssh-key.coffee

@@ -1,5 +1,5 @@
 `import Ember from 'ember'`
-`import ApplicationAdapter from 'adapters/application'`
+`import ApplicationAdapter from 'travis/adapters/application'`
 
 Adapter = ApplicationAdapter.extend
   namespace: 'settings'

app/app.coffee

@@ -3,6 +3,19 @@
 `import loadInitializers from 'ember/load-initializers'`
 `import config from './config/environment'`
 
+`import label from 'travis/helpers/label'`
+`import travisField from 'travis/helpers/travis-field'`
+`import travisErrors from 'travis/helpers/travis-errors'`
+`import tipsy from 'travis/helpers/tipsy'`
+#`import input from 'travis/helpers/input'`
+`import filterInput from 'travis/helpers/filter-input'`
+Ember.Handlebars.registerHelper('label', label)
+Ember.Handlebars.registerHelper('travis-field', travisField)
+Ember.Handlebars.registerHelper('travis-errors', travisErrors)
+Ember.Handlebars.registerHelper('tipsy', tipsy)
+#Ember.Handlebars.registerHelper('input', input)
+Ember.Handlebars.registerHelper('filter-input', filterInput)
+
 Ember.MODEL_FACTORY_INJECTIONS = true
 
 App = Ember.Application.extend(Ember.Evented,

app/controllers/env-vars.coffee

@@ -1,6 +1,6 @@
 `import Ember from 'ember'`
 
 Controller = Ember.ArrayController.extend
-  vars: Ember.computed.filterBy('model', 'isNew', false)
+  vars: Ember.computed.alias('model')
 
 `export default Controller`

app/controllers/env-vars/new.coffee

@@ -39,6 +39,7 @@ Controller = Ember.Controller.extend Validations,
           self.transitionToRoute('env_vars')
         , =>
           @set('isSaving', false)
+      else
+        @set('isSaving', false)
 
-Travis.EnvVarsNewController = Controller
 `export default Controller`

app/helpers/travis-errors.coffee

@@ -4,11 +4,7 @@ ErrorsView = Ember.View.extend
   tagName: 'span'
   templateName: 'helpers/travis-errors'
   classNames: ['error']
-  classNameBindings: ['codes']
+  classNameBindings: ['codes', 'show']
-  attributeBindings: ['style']
-  style: (->
-    'display: none' unless @get('show')
-  ).property('show')
   codes: (->
     @get('errors').mapBy('code')
   ).property('@errors')

app/styles/app/app.sass

@@ -7,7 +7,6 @@ html, body
   padding: 0
   height: 100%
   color: $color-text
-  overflow-x: hidden
 
 a
   color: $color-link

app/styles/app/settings.sass

@@ -199,6 +199,10 @@
 
     span.error
       margin-left: 0
+      display: none
+
+      &.show
+        display: inline-block
 
     label.name, label.value
       display: none

app/templates/env-vars.hbs

@@ -2,17 +2,19 @@
 
 <ul class="env-vars">
   {{#each vars itemController="envVar"}}
-    <li class="env-var">
+    {{#unless isNew}}
-      {{#if isEditing}}
+      <li class="env-var">
-        {{partial 'env_vars/form'}}
+        {{#if isEditing}}
-      {{else}}
+          {{partial 'env_vars/form'}}
-        <a href="#" class="edit-var" {{action "edit"}}>Edit</a>
+        {{else}}
-        <a href="#" {{action "delete"}} {{bind-attr class=":delete-var isDeleting:deleting"}}>
+          <a href="#" class="edit-var" {{action "edit"}}>Edit</a>
-          Delete
+          <a href="#" {{action "delete"}} {{bind-attr class=":delete-var isDeleting:deleting"}}>
-        </a>
+            Delete
-        <span class="name">{{name}}</span>
+          </a>
-        <span {{bind-attr class=":value :value-display public::secure"}}>{{value}}</span>
+          <span class="name">{{name}}</span>
-      {{/if}}
+          <span {{bind-attr class=":value :value-display public::secure"}}>{{value}}</span>
-    </li>
+        {{/if}}
+      </li>
+    {{/unless}}
   {{/each}}
 </ul>

app/templates/env-vars/_form.hbs

@@ -12,7 +12,7 @@
   {{else}}
     <span class="value value-display secure">{{value}}</span>
   {{/if}}
-  <div style="clear: both"></div>
+  <div class="clear"></div>
   <div class="field">
     {{travis-switch active=public class="value"}}
     {{#label for="secure" class="public"}}Display value in build logs{{/label}}

app/templates/helpers/travis-errors.hbs

@@ -1 +1 @@
-{{#each view.errors}}{{message}}{{/each}}
+{{#each erorr in view.errors}}{{error.message}}{{/each}}

app/views/repo-show-tools.coffee

@@ -1,6 +1,7 @@
 `import Ember from 'ember'`
+`import BasicView from 'travis/views/basic'`
 
-View = Ember.View.extend
+View = BasicView.extend
   templateName: 'repos/show/tools'
 
   repoBinding: 'controller.repo'