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/directives/application-info.html

@@ -0,0 +1,12 @@
+<div class="application-info-element" style="padding-bottom: 18px">
+  <div class="auth-header">
+    <img src="//www.gravatar.com/avatar/{{ application.gravatar }}?s=48&d=identicon">
+    <h2><a href="{{ application.url }}" target="_blank">{{ application.name }}</a></h2>
+    <h4>
+      {{ application.organization.name }}
+    </h4>
+  </div>
+  <div style="padding-top: 10px">
+    {{ application.description || '(No Description)' }}
+  </div>
+</div>

static/directives/application-manager.html

@@ -0,0 +1,24 @@
+<div class="application-manager-element">
+  <div class="quay-spinner" ng-show="loading"></div>
+
+  <div class="container" ng-show="!loading">
+    <div class="side-controls">
+      <span class="popup-input-button" placeholder="'Application Name'" submitted="createApplication(value)">
+        <i class="fa fa-plus"></i> Create New Application
+      </span>
+    </div>
+
+    <table class="table">
+      <thead>
+        <th>Application Name</th>
+        <th>Application URI</th>
+      </thead>
+              
+      <tr ng-repeat="app in applications">
+        <td><a href="/organization/{{ organization.name }}/application/{{ app.client_id }}">{{ app.name }}</a></td>
+        <td><a href="{{ app.application_uri  }}" ng-if="app.application_uri" target="_blank">{{ app.application_uri  }}</a></td>
+      </tr>
+    </table>
+  </div>
+
+</div>

static/directives/application-reference-dialog.html

@@ -0,0 +1,15 @@
+<div class="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-body" style="padding: 4px; padding-left: 20px;">
+        <button type="button" class="close" ng-click="$hide()" style="padding: 4px;">
+          &times;
+        </button>
+        <div class="application-info" application="applicationInfo"></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" ng-click="$hide()">Close</button>
+      </div>
+    </div>
+  </div>
+</div>

static/directives/application-reference.html

@@ -0,0 +1,4 @@
+<span class="application-reference-element">
+  <i class="fa fa-cloud"></i>
+  <a href="javascript:void(0)" ng-click="showAppDetails()">{{ title }}</a>
+</span>

static/directives/copy-box.html

@@ -0,0 +1,14 @@
+<div class="copy-box-element">
+  <div class="id-container">
+    <div class="input-group">
+      <input type="text" class="form-control" value="{{ value }}" readonly>
+      <span class="input-group-addon" title="Copy to Clipboard">
+        <i class="fa fa-copy"></i>
+      </span>
+    </div>
+  </div>
+
+  <div class="clipboard-copied-message" ng-class="hoveringMessage ? 'hovering' : ''" style="display: none">
+    Copied to clipboard
+  </div>
+</div>

static/directives/delete-ui.html

@@ -0,0 +1,4 @@
+<span class="delete-ui-element" ng-click="focus()">
+  <span class="delete-ui-button" ng-click="performDelete()"><button class="btn btn-danger">{{ buttonTitleInternal }}</button></span>
+  <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="left" title="{{ deleteTitle }}"></i>
+</span>

static/directives/dropdown-select-icon.html

@@ -0,0 +1 @@
+<ng-transclude>

static/directives/dropdown-select-menu.html

@@ -0,0 +1 @@
+<ul class="dropdown-menu" ng-transclude></ul>

static/directives/dropdown-select.html

@@ -0,0 +1,13 @@
+<div class="dropdown-select-element" ng-class="selectedItem ? 'has-item' : ''">
+  <div class="current-item">
+    <div class="dropdown-select-icon-transclude"></div>
+    <input type="text" class="lookahead-input form-control" placeholder="{{ placeholder }}"></input>
+  </div>
+  <div class="dropdown">
+    <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
+      <span class="caret"></span>
+    </button>    
+    <div class="dropdown-select-menu-transclude"></div>
+  </div>
+  <div class="transcluded" ng-transclude>
+</div>

static/directives/header-bar.html

@@ -1,10 +1,7 @@
 <!-- Quay -->
 <div class="navbar-header">
-  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-    <span class="sr-only">Toggle navigation</span>
-    <span class="fa-bar"></span>
-    <span class="fa-bar"></span>
-    <span class="fa-bar"></span>
+  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse" style="padding: 0px; padding-left: 4px; padding-right: 4px;">
+    <span style="font-size: 24px">&equiv;</span>
   </button>
   <a class="navbar-brand" href="/" target="{{ appLinkTarget() }}">
     <img src="/static/img/quay-logo.png">
@@ -39,11 +36,14 @@
       <a href="javascript:void(0)" class="dropdown-toggle user-dropdown" data-toggle="dropdown">
         <img src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=32&d=identicon" />
         {{ user.username }}
-        <span class="badge user-notification notification-animated" ng-show="user.askForPassword || overPlan"
-              bs-tooltip="(user.askForPassword ? 'A password is needed for this account<br>' : '') + (overPlan ? 'You are using more private repositories than your plan allows' : '')"
+        <span class="badge user-notification notification-animated"
+              ng-show="notificationService.notifications.length"
+              ng-class="notificationService.notificationClasses"
+              bs-tooltip=""
+              title="User Notifications"
               data-placement="left"
               data-container="body">
-          {{ (user.askForPassword ? 1 : 0) + (overPlan ? 1 : 0) }}
+          {{ notificationService.notifications.length }}
         </span>
         <b class="caret"></b>
       </a>
@@ -51,8 +51,16 @@
         <li>
           <a href="/user/" target="{{ appLinkTarget() }}">
             Account Settings
-            <span class="badge user-notification" ng-show="user.askForPassword || overPlan">
-              {{ (user.askForPassword ? 1 : 0) + (overPlan ? 1 : 0) }}
+          </a>
+        </li>
+        <li ng-if="notificationService.notifications.length">
+          <a href="javascript:void(0)" data-template="/static/directives/notification-bar.html"
+             data-animation="am-slide-right" bs-aside="aside" data-container="body">
+            Notifications
+            <span class="badge user-notification"
+                  ng-class="notificationService.notificationClasses"
+                  ng-show="notificationService.notifications.length">
+              {{ notificationService.notifications.length }}
             </span>
           </a>
         </li>

static/directives/logs-view.html

@@ -6,9 +6,9 @@
       <span class="entity-reference" name="performer.username" isrobot="performer.is_robot" ng-show="performer"></span>
       <span id="logs-range" class="mini">
         From
-        <input type="text" class="logs-date-picker input-sm" name="start" ng-model="logStartDate" data-date-format="mm/dd/yyyy" bs-datepicker/>
+        <input type="text" class="logs-date-picker input-sm" name="start" ng-model="logStartDate" data-max-date="{{ logEndDate }}" data-container="body" bs-datepicker/>
         <span class="add-on">to</span>
-        <input type="text" class="logs-date-picker input-sm" name="end" ng-model="logEndDate" data-date-format="mm/dd/yyyy" bs-datepicker/>
+        <input type="text" class="logs-date-picker input-sm" name="end" ng-model="logEndDate" data-min-date="{{ logStartDate }}" bs-datepicker/>
       </span>
     </span>
     <span class="right">
@@ -42,7 +42,7 @@
       <thead>
         <th>Description</th>
         <th style="min-width: 226px">Date/Time</th>
-        <th>User/Token</th>
+        <th>User/Token/App</th>
       </thead>
            
       <tbody>
@@ -53,14 +53,24 @@
           </td>
           <td>{{ log.datetime }}</td>
           <td>
-            <span class="log-performer" ng-show="log.performer">              
+            <span class="log-performer" ng-if="log.metadata.oauth_token_application">         
+              <div>
+                <span class="application-reference" title="log.metadata.oauth_token_application"
+                      client-id="log.metadata.oauth_token_application_id"></span>
+              </div>
+              <div style="text-align: center; font-size: 12px; color: #aaa; padding: 4px;">on behalf of</div>
+              <div>
+                <span class="entity-reference" entity="log.performer" namespace="organization.name"></span>
+              </div>
+            </span>
+            <span class="log-performer" ng-if="!log.metadata.oauth_token_application && log.performer">              
               <span class="entity-reference" entity="log.performer" namespace="organization.name"></span>
             </span>
-            <span class="log-performer" ng-show="!log.performer && log.metadata.token">
+            <span class="log-performer" ng-if="!log.performer && log.metadata.token">
               <i class="fa fa-key"></i>
               <span>{{ log.metadata.token }}</span>
             </span>
-            <span ng-show="!log.performer && !log.metadata.token">
+            <span ng-if="!log.performer && !log.metadata.token">
               (anonymous)
             </span>
           </td>

static/directives/notification-bar.html

@@ -0,0 +1,15 @@
+<div class="aside" tabindex="-1" role="dialog">
+  <div class="aside-dialog">
+    <div class="aside-content">
+      <div class="aside-header">
+        <button type="button" class="close" ng-click="$hide()">&times;</button>
+        <h4 class="aside-title">Notifications</h4>
+      </div>
+      <div class="aside-body">
+        <div ng-repeat="notification in notificationService.notifications">
+          <div class="notification-view" notification="notification" parent="this"></div>
+        </div>
+      </div>      
+    </div>
+  </div>
+</div>

static/directives/notification-view.html

@@ -0,0 +1,11 @@
+<div class="notification-view-element">
+  <div class="container" ng-click="showNotification();">
+    <div class="circle" ng-class="getClass(notification)"></div>
+    <div class="message" ng-bind-html="getMessage(notification)"></div>
+    <div class="orginfo" ng-if="notification.organization">
+      <img src="//www.gravatar.com/avatar/{{ getGravatar(notification.organization) }}?s=24&d=identicon" />
+      <span class="orgname">{{ notification.organization }}</span>
+    </div>
+    <div class="datetime">{{ parseDate(notification.created) | date:'medium'}}</div>
+  </div>
+</div>

static/directives/popup-input-button.html

@@ -1,5 +1,6 @@
-<button class="btn btn-success" data-trigger="click" bs-popover="'static/directives/popup-input-dialog.html'" 
-        data-placement="bottom" ng-click="popupShown()">
+<button class="btn btn-success" data-trigger="click"
+        data-content-template="static/directives/popup-input-dialog.html" 
+        data-placement="bottom" ng-click="popupShown()" bs-popover>
   <span ng-transclude></span>
 </button>
    

static/directives/popup-input-dialog.html

@@ -1,4 +1,4 @@
-<form name="popupinput" ng-submit="inputSubmit(); hide()" novalidate>
-  <input id="input-box" type="text form-control" placeholder="{{ placeholder }}" ng-blur="hide()"
+<form name="popupinput" ng-submit="inputSubmit(); $hide()" novalidate>
+  <input id="input-box" type="text form-control" placeholder="{{ placeholder }}" ng-blur="$hide()"
          ng-pattern="getRegexp(pattern)" ng-model="inputValue" ng-trim="false" ng-minlength="2" required>
 </form>

static/directives/prototype-manager.html

@@ -48,10 +48,7 @@
           <span class="role-group" current-role="prototype.role" role-changed="setRole(role, prototype)" roles="roles"></span>
         </td>
         <td>
-          <span class="delete-ui" tabindex="0">
-            <span class="delete-ui-button" ng-click="deletePrototype(prototype)"><button class="btn btn-danger">Delete</button></span>
-            <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Permission"></i>
-          </span>
+          <span class="delete-ui" delete-title="'Delete Permission'" perform-delete="deletePrototype(prototype)"></span>
         </td>
       </tr>
     </table>

static/directives/resource-view.html

@@ -1,7 +1,5 @@
 <div class="resource-view-element">
-  <div class="resource-spinner" ng-class="resource.loading ? 'visible' : ''">
-    <div class="small-spinner"></div>
-  </div>
+  <div class="quay-spinner" ng-show="resource.loading"></div>
   <div class="resource-error" ng-show="!resource.loading && resource.hasError">
     {{ errorMessage }}
   </div>

static/directives/robots-manager.html

@@ -24,10 +24,7 @@
           </a>
         </td>                
         <td>
-          <span class="delete-ui" tabindex="0">
-            <span class="delete-ui-button" ng-click="deleteRobot(robotInfo)"><button class="btn btn-danger">Delete</button></span>
-            <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Robot Account"></i>
-          </span>
+          <span class="delete-ui" delete-title="'Delete Robot Account'" perform-delete="deleteRobot(robotInfo)"></span>
         </td>
       </tr>
     </table>

static/directives/tag-specific-images-view.html

@@ -5,7 +5,8 @@
          ng-class="getImageListingClasses(image)">
       <span class="image-listing-circle"></span>
       <span class="image-listing-line"></span>
-      <span class="context-tooltip image-listing-id" bs-tooltip="getFirstTextLine(image.comment)">
+      <span class="context-tooltip image-listing-id" bs-tooltip="" title="getFirstTextLine(image.comment)"
+            data-html="true">
         {{ image.id.substr(0, 12) }}
       </span>
     </div>

static/directives/trigger-description.html

@@ -0,0 +1,23 @@
+<span class="trigger-description-element" ng-switch on="trigger.service">
+  <span ng-switch-when="github">
+    <i class="fa fa-github fa-lg" style="margin-right: 6px" title="GitHub" bs-tooltip="tooltip.title"></i>
+    Push to GitHub repository <a href="https://github.com/{{ trigger.config.build_source }}" target="_new">{{ trigger.config.build_source }}</a>
+    <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="trigger.config.subdir">
+      <span>Dockerfile:
+        <a href="https://github.com/{{ trigger.config.build_source }}/tree/{{ trigger.config.master_branch || 'master' }}/{{ trigger.config.subdir }}/Dockerfile" target="_blank">
+          //{{ trigger.config.subdir }}/Dockerfile
+        </a>
+      </span>
+    </div>
+    <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!trigger.config.subdir && !short">
+      <span>Dockerfile:
+        <a href="https://github.com/{{ trigger.config.build_source }}/tree/{{ trigger.config.master_branch || 'master' }}/Dockerfile" target="_blank">
+          //Dockerfile
+        </a>
+      </span>
+    </div>
+  </span>
+  <span ng-switch-default>
+    Unknown
+  </span>
+</span>

static/directives/trigger-setup-github.html

@@ -0,0 +1,61 @@
+<div class="trigger-setup-github-element">
+  <div ng-show="loading">
+    <span class="quay-spinner" style="vertical-align: middle; margin-right: 10px"></span>
+    Loading Repository List
+  </div>
+  <div ng-show="!loading">
+    <div style="margin-bottom: 18px">Please choose the GitHub repository that will trigger the build:</div>
+
+    <!-- Repository select -->
+    <div class="dropdown-select" placeholder="'Select a repository'" selected-item="currentRepo"
+         lookahead-items="repoLookahead">
+      <!-- Icons -->
+      <i class="dropdown-select-icon none-icon fa fa-github fa-lg"></i>
+      <img class="dropdown-select-icon github-org-icon" ng-src="{{ currentRepo.avatar_url ? currentRepo.avatar_url : '//www.gravatar.com/avatar/' }}">
+
+      <!-- Dropdown menu -->
+      <ul class="dropdown-select-menu" role="menu">
+        <li ng-repeat-start="org in orgs" role="presentation" class="dropdown-header github-org-header">
+          <img ng-src="{{ org.info.avatar_url }}" class="github-org-icon">{{ org.info.name }}
+        </li>
+        <li ng-repeat="repo in org.repos" class="github-repo-listing">
+          <a href="javascript:void(0)" ng-click="selectRepo(repo, org)"><i class="fa fa-github fa-lg"></i> {{ repo }}</a>
+        </li>
+        <li role="presentation" class="divider" ng-repeat-end ng-show="$index < orgs.length - 1"></li>
+      </ul>      
+    </div>
+    
+    <!-- Dockerfile folder select -->
+    <div class="slideinout" ng-show="currentRepo">
+      <div style="margin-top: 10px">Dockerfile Location:</div>
+      <div class="dropdown-select" placeholder="'(Repository Root)'" selected-item="currentLocation"
+           lookahead-items="locations" handle-input="handleLocationInput(input)" handle-item-selected="handleLocationSelected(datum)">
+        <!-- Icons -->
+        <i class="dropdown-select-icon none-icon fa fa-folder-o fa-lg" ng-show="isInvalidLocation"></i>
+        <i class="dropdown-select-icon none-icon fa fa-folder fa-lg" style="color: black;" ng-show="!isInvalidLocation"></i>
+        <i class="dropdown-select-icon fa fa-folder fa-lg"></i>
+        
+        <!-- Dropdown menu -->
+        <ul class="dropdown-select-menu" role="menu">
+          <li ng-repeat="location in locations">
+            <a href="javascript:void(0)" ng-click="setLocation(location)" ng-if="!location"><i class="fa fa-github fa-lg"></i> Repository Root</a>
+            <a href="javascript:void(0)" ng-click="setLocation(location)" ng-if="location"><i class="fa fa-folder fa-lg"></i> {{ location }}</a>
+          </li>
+          <li class="dropdown-header" role="presentation" ng-show="!locations.length">No Dockerfiles found in repository</li>          
+        </ul>
+      </div>
+
+      <div class="quay-spinner" ng-show="!locations && !locationError"></div>
+      <div class="alert alert-warning" ng-show="locations && !locations.length">
+        Warning: No Dockerfiles were found in {{ currentRepo.repo }}
+      </div>
+      <div class="alert alert-warning" ng-show="locationError">
+        {{ locationError }}
+      </div>
+      <div class="alert alert-info" ng-show="locations.length && isInvalidLocation">
+        Note: The folder does not currently exist or contain a Dockerfile
+      </div>
+    </div>
+
+  </div>
+</div>

static/directives/user-setup.html

@@ -3,7 +3,7 @@
     <div class="panel panel-default">
       <div class="panel-heading">
         <h4 class="panel-title accordion-title">
-          <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" data-target="#collapseSignin">
+          <a id="signinToggle" class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" data-target="#collapseSignin">
             Sign In
           </a>
         </h4>