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

Conflicts:
	endpoints/api.py
	static/js/app.js
	static/partials/view-repo.html
	test/data/test.db
	test/specs.py
	test/test_api_usage.py

static/partials/view-repo.html

@@ -16,11 +16,12 @@
       <div class="repo-controls">
         <!-- Builds -->
         <div class="dropdown" data-placement="top" style="display: inline-block" 
-             bs-tooltip="buildsInfo ? 'Dockerfile Builds Running: ' + (buildsInfo.length) : 'Dockerfile Build'"
-             ng-show="repo.can_write || buildsInfo.length">
+             bs-tooltip=""
+             title="{{ runningBuilds.length ? 'Dockerfile Builds Running: ' + (runningBuilds.length) : 'Dockerfile Build' }}"
+             ng-show="repo.can_write || buildHistory.length">
           <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
             <i class="fa fa-tasks fa-lg"></i>
-            <span class="count" ng-class="buildsInfo ? 'visible' : ''"><span>{{ buildsInfo ? buildsInfo.length : '' }}</span></span>
+            <span class="count" ng-class="runningBuilds.length ? 'visible' : ''"><span>{{ runningBuilds.length ? runningBuilds.length : '' }}</span></span>
             <b class="caret"></b>
           </button>
           <ul class="dropdown-menu">
@@ -32,9 +33,14 @@
                 <i class="fa fa-plus" style="margin-left: 1px; margin-right: 8px;"></i>New Dockerfile Build
               </a>
             </li>
-            <li role="presentation" class="divider" ng-show="buildsInfo && repo.can_write"></li>
-            <li role="presentation" class="dropdown-header" ng-show="buildsInfo">Current Builds</li>
-            <li ng-repeat="buildInfo in buildsInfo">
+            <li ng-show="repo.can_admin">
+              <a href="/repository/{{ repo.namespace }}/{{ repo.name }}/admin?tab=trigger">
+                <i class="fa fa-bolt" style="margin-left: 3px; margin-right: 10px;"></i>Build Triggers
+              </a>
+            </li>
+            <li role="presentation" class="divider" ng-show="buildHistory && repo.can_write"></li>
+            <li role="presentation" class="dropdown-header" ng-show="buildHistory.length">Recent Builds</li>
+            <li ng-repeat="buildInfo in buildHistory">
               <div class="build-info" ng-class="repo.can_write ? 'clickable' : ''" ng-click="repo.can_write && showBuild(buildInfo)">
                 <span class="build-status" build="buildInfo"></span>
               </div>
@@ -45,7 +51,7 @@
         <!-- Admin -->
         <a id="admin-cog" href="{{ '/repository/' + repo.namespace + '/' + repo.name + '/admin' }}"
            ng-show="repo.can_admin">
-          <button class="btn btn-default" title="Repository Settings" bs-tooltip="tooltip.title" data-placement="top">
+          <button class="btn btn-default" title="Repository Settings" bs-tooltip="tooltip" data-placement="top">
             <i class="fa fa-cog fa-lg"></i></button></a>
         
         <!-- Pull Command -->
@@ -63,7 +69,6 @@
             Copied to clipboard
           </div>
         </span>
-
       </div>
     </div>
 
@@ -78,10 +83,21 @@
       </div>
 
       <div class="empty-description" ng-show="repo.can_write">
-        To push images to this repository:<br><br>
-        <pre>sudo docker tag <i>0u123imageidgoeshere</i> quay.io/{{repo.namespace}}/{{repo.name}}
-sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
+        <div class="panel-default">
+          <div class="panel-heading">How to push a new image to this repository:</div>
+          <div class="panel-body">
+            First login to Quay.io (if you have not done so already):
+            <pre class="command">sudo docker login quay.io</pre>
+
+            Tag an image to this repository:
+            <pre class="command">sudo docker tag <i>0u123imageidgoeshere</i> quay.io/{{repo.namespace}}/{{repo.name}}</pre>
+
+            Push the image to this repository:
+            <pre class="command">sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
+          </div>
+        </div>
       </div>
+
     </div>
 
     <div class="repo-content" ng-show="!currentTag.image && repo.is_building">
@@ -159,7 +175,7 @@ sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
                     <div class="tag-image-size" ng-repeat="image in getImagesForTagBySize(currentTag) | limitTo: 10">
                       <span class="size-limiter">
                         <span class="size-bar" style="{{ 'width:' + (image.size / getTotalSize(currentTag)) * 100 + '%' }}"
-                              bs-tooltip="image.size | bytes"></span>
+                              bs-tooltip="" title="{{ image.size | bytes }}"></span>
                       </span>
                       <span class="size-title"><a href="javascript:void(0)" ng-click="setImage(image.id, true)">{{ image.id.substr(0, 12) }}</a></span>
                     </div>
@@ -223,7 +239,8 @@ sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
                     <i class="fa fa-terminal section-icon" bs-tooltip="tooltip.title" title="Image Command"></i>
                     <span class="section-info">
                       <span class="formatted-command trimmed"
-                         bs-tooltip="getTooltipCommand(currentImage)"
+                         data-html="true"
+                         bs-tooltip="" title="{{ getTooltipCommand(currentImage) }}"
                          data-placement="top">{{ getFormattedCommand(currentImage) }}</span>
                     </span>
                   </div>