Merge remote-tracking branch 'origin/master' into rustedbuilds

Conflicts:
	test/data/test.db

static/partials/build-package.html

@@ -0,0 +1,50 @@
+<div class="resource-view" resource="repository_build" error-message="'No matching repository build found'"></div>
+<div class="container repo repo-build" ng-show="accessDenied">
+  You do not have permission to view this page
+</div>
+<div class="container repo repo-build repo-build-pack" ng-show="repobuild">
+  <div class="header row">
+    <a href="{{ '/repository/' + repo.namespace + '/' + repo.name + '/build' }}" class="back"><i class="fa fa-chevron-left"></i></a>
+    <h3>
+      <span class="repo-circle no-background" repo="repo"></span>
+      <span class="repo-breadcrumb" repo="repo" subsection-icon="'fa-tasks'" subsection="repobuild.display_name"></span>
+    </h3>
+    <div class="repo-controls">
+      <a href="javascript:void(0)" ng-show="zip" ng-click="downloadForUser()">
+        <i class="fa fa-download toggle-icon" title="Download Build Package" bs-tooltip="tooltip.title" data-container="body"></i>
+      </a>
+    </div>
+  </div>
+
+  <div class="row" ng-show="downloading">
+    Downloading build pack:
+    <div class="progress" class="active progress-striped">
+      <div class="progress-bar" role="progressbar" aria-valuenow="{{ downloadProgress }}" aria-valuemin="0" aria-valuemax="100" style="{{ 'width: ' + downloadProgress + '%' }}">
+      </div>
+    </div>
+  </div>
+
+  <div class="row" ng-show="downloadError">
+    Error: Could not download the build pack
+  </div>
+
+  <div class="row" ng-show="loaded">
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="javascript:void(0)" data-toggle="tab" data-target="#dockerfile">Dockerfile</a></li>
+      <li><a href="javascript:void(0)" data-toggle="tab" data-target="#tree" ng-click="initializeTree()" ng-show="tree">All Files</a></li>
+    </ul>
+
+    <div class="tab-content">
+      <!-- Dockerfile view -->
+      <div class="tab-pane active" id="dockerfile">
+        <div class="dockerfile-view" contents="dockerFileContents"></div>
+        <span ng-show="!dockerFileContents">No Dockerfile found in the build pack</span>
+      </div>
+
+      <!-- File tree -->
+      <div class="tab-pane" id="tree">
+        <div id="file-tree-container" class="tree-container" onresize="tree && drawn && tree.notifyResized()"></div>
+      </div>
+    </div>
+  </div>
+</div>

static/partials/repo-build.html

@@ -43,6 +43,12 @@
             <div class="timing">
               <i class="fa fa-clock-o"></i>
               Started: <span am-time-ago="build.started || 0"></span>
+              <span style="display: inline-block; margin-left: 20px" ng-show="currentBuild.resource_key">
+                <i class="fa fa-archive"></i>
+                <a href="/repository/{{ repo.namespace }}/{{ repo.name }}/build/{{ currentBuild.id }}/buildpack"
+                   style="display: inline-block; margin-left: 6px" bs-tooltip="tooltip.title"
+                   title="View the uploaded build package for this build">Build Package</a>
+              </span>
             </div>
             <span class="phase-icon" ng-class="build.phase"></span>
             <span class="build-message" phase="build.phase"></span>

static/partials/user-admin.html

@@ -62,7 +62,7 @@
 
             <div class="panel" ng-show="!updatingUser">
               <div class="panel-title">Account e-mail address</div>
-              <div class="panel-setting-content">
+              <div class="panel-setting-content panel-body">
                 {{ user.email }}
               </div>
             </div>
@@ -113,14 +113,11 @@
           </div>
           <div class="row" ng-show="cuser">
             <div class="panel">
-              <div class="panel-title">GitHub Login</div>
+              <div class="panel-title">GitHub Login:</div>
               <div class="panel-body">
                 <div ng-show="githubLogin" class="lead col-md-8">
-                  <span class="fa-stack">
-                    <i class="fa fa-circle fa-stack-2x check-green"></i>
-                    <i class="fa fa-check fa-stack-1x fa-inverse"></i>
-                  </span>
-                  This account is connected with GitHub account: <b>{{githubLogin}}</b>
+                  <i class="fa fa-github fa-lg" style="margin-right: 6px;" title="GitHub" bs-tooltip="tooltip.title"></i>
+                  <b><a href="https://github.com/{{githubLogin}}" target="_blank">{{githubLogin}}</a></b>
                 </div>
                 <div ng-show="!githubLogin" class="col-md-8">
                   <a href="https://github.com/login/oauth/authorize?client_id={{ githubClientId }}&scope=user:email{{ github_state_clause }}&redirect_uri={{ githubRedirectUri }}/attach" class="btn btn-primary"><i class="fa fa-github fa-lg"></i> Connect with GitHub</a>

static/partials/view-repo.html

@@ -9,7 +9,7 @@
     <!-- Repo Header -->
     <div class="header">
       <h3>
-        <span class="repo-circle" repo="repo"></span>
+        <span class="repo-circle no-background" repo="repo"></span>
         <span class="repo-breadcrumb" repo="repo"></span>        
       </h3>