tmp

openshift · Aug 18, 2015 · 5d63a08 · 5d63a08
1 parent 854bd9c
commit 5d63a08
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/assets/app/views/deployments.html b/assets/app/views/deployments.html
@@ -94,7 +94,11 @@ <h3>
               </h3>
             </div>
             <div class="col-md-4 col-sm-4 col-xs-offset-1 col-xs-4 text-right">
-              <!-- TODO: logs button -->
+              <span ng-switch="deployment | annotation:'deploymentStatus'" class="hide-ng-leave">
+                <button ng-switch-when="Failed" type="button" ng-click="retryFailedDeployment(deploymentConfigName, deployment.metadata.name)" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" class="btn btn-default">Retry</button>
+                <button ng-switch-when="Complete" ng-if="!deploymentIsLatest(deploymentConfig, deployment)" type="button" ng-click="rollbackToDeployment(deploymentConfigName, deployment.metadata.name)" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" class="btn btn-default">Revert</button>
+                <button ng-switch-default type="button" ng-click="cancelRunningDeployment(deploymentConfigName, deployment.metadata.name)" class="btn btn-danger">Cancel</button>
+              </span>                
             </div>
           </div><!-- /.row -->
           <div class="row">
@@ -112,11 +116,6 @@ <h3>
                   <span ng-switch-default class="fa fa-refresh fa-spin" aria-hidden="true"></span>
                 </span>
                 {{deployment | annotation:'deploymentStatus'}}
-                <span ng-switch="deployment | annotation:'deploymentStatus'" class="hide-ng-leave">
-                  <button ng-switch-when="Failed" type="button" ng-click="retryFailedDeployment(deploymentConfigName, deployment.metadata.name)" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" class="btn btn-default btn-xs" style="margin-left:5px;">Retry</button>
-                  <button ng-switch-when="Complete" ng-if="!deploymentIsLatest(deploymentConfig, deployment)" type="button" ng-click="rollbackToDeployment(deploymentConfigName, deployment.metadata.name)" ng-disabled="(deploymentConfigDeploymentsInProgress[deploymentConfigName] | hashSize) > 0" class="btn btn-default btn-xs" style="margin-left:5px;">Rollback to this</button>
-                  <button ng-switch-default type="button" ng-click="cancelRunningDeployment(deploymentConfigName, deployment.metadata.name)" class="btn btn-danger btn-xs" style="margin-left:5px;">Cancel</button>
-                </span>                
               </div>
               <div class="deployment-detail" ng-if="deployment | annotation:'deploymentStatusReason'">
                 <span class="deployment-detail-label">Status reason:</span>