Cleanup the convert user UI a bit

static/css/directives/ui/convert-user-to-org.css

@@ -1,9 +1,14 @@
+.convert-user-to-org-element {
+  padding: 10px;
+}
+
 .convert-user-to-org .convert-form h3 {
   margin-bottom: 20px;
 }
 
 .convert-user-to-org #convertForm {
   max-width: 700px;
+  margin-top: 20px;
 }
 
 .convert-user-to-org #convertForm .form-group {
@@ -12,24 +17,53 @@
 
 .convert-user-to-org #convertForm input {
   margin-bottom: 10px;
-  margin-left: 20px;
 }
 
 .convert-user-to-org #convertForm .existing-data {
+  display: block;
   font-size: 16px;
   font-weight: bold;
 }
 
+.convert-user-to-org #convertForm .existing-data .avatar {
+  margin-right: 4px;
+}
+
+.convert-user-to-org #convertForm .existing-data .username {
+  vertical-align: middle;
+}
+
+
 .convert-user-to-org #convertForm .description {
   margin-top: 10px;
   display: block;
   color: #888;
   font-size: 12px;
-  margin-left: 20px;
 }
 
-.convert-user-to-org #convertForm .existing-data {
+.convert-user-to-org .org-list {
-  display: block;
+  list-style: none;
-  padding-left: 20px;
+}
-  margin-top: 10px;
+
+.convert-user-to-org .org-list li {
+  margin-top: 4px;
+}
+
+.convert-user-to-org .org-list li a {
+  vertical-align: middle;
+  margin-left: 6px;
+}
+
+.convert-user-to-org .fa-arrow-circle-right {
+  margin-left:  6px;
+}
+
+.convert-user-to-org .form-group-content {
+  padding-left: 10px;
+  padding-top: 10px;
+}
+
+
+.convert-user-to-org .form-group-content .co-table {
+  margin: 0px;
 }

static/css/directives/ui/plans-table.css

@@ -0,0 +1,30 @@
+.plans-table-element table {
+  margin: 20px;
+  border: 1px solid #eee;
+}
+
+.plans-table-element thead td {
+  padding-top: 10px !important;
+}
+
+.plans-table-element td {
+  vertical-align: middle !important;
+}
+
+.plans-table-element .plan-price {
+  font-size: 16px;
+}
+
+.plans-table ul {
+  margin-top: 10px;
+  padding: 0px;
+}
+
+.plans-table ul li {
+  padding: 4px;
+  margin: 0px;
+}
+
+.plans-table ul li .plan-info {
+  padding: 4px;
+}

static/css/quay.css

@@ -2819,34 +2819,6 @@ p.editable:hover i {
   margin-bottom: 20px;
 }
 
-.plans-table-element table {
-  margin: 20px;
-  border: 1px solid #eee;
-}
-
-.plans-table-element td {
-  vertical-align: middle !important;
-}
-
-.plans-table-element .plan-price {
-  font-size: 16px;
-}
-
-.plans-table ul {
-  margin-top: 10px;
-  padding: 0px;
-}
-
-.plans-table ul li {
-  padding: 4px;
-  margin: 0px;
-}
-
-.plans-table ul li .plan-info {
-  padding: 4px;
-}
-
-
 .repo-breadcrumb-element .crumb {
   cursor: pointer;
 }

static/directives/convert-user-to-org.html

@@ -3,38 +3,42 @@
   <div ng-show="convertStep == 0">
     <div ng-show="user.organizations.length > 0">
       Cannot convert this account into an organization, as it is a member of {{user.organizations.length}} other
-      organization{{user.organizations.length > 1 ? 's' : ''}}. Please leave
+      organization{{user.organizations.length > 1 ? 's' : ''}}.
-      {{user.organizations.length > 1 ? 'those organizations' : 'that organization'}} first.
+      <br><br>
-
+      Please leave the following organizations first:
-      <ul>
+      <ul class="org-list">
         <li ng-repeat="org in user.organizations">
-          {{ org.name }}
+          <span class="avatar" size="avatarSize || 16" data="org.avatar"></span>
+          <a href="/organization/{{ org.name }}">{{ org.name }}</a>
         </li>
       </ul>
     </div>
 
     <div ng-show="user.organizations.length == 0">
-      <div class="co-alert co-alert-warning">
+      <button class="btn btn-primary" ng-click="showConvertForm()">Start conversion process <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></button>
-        Note: Converting a user account into an organization <b>cannot be undone</b>
-      </div>
-
-      <button class="btn btn-primary" ng-click="showConvertForm()">Start conversion process</button>
     </div>
   </div>
 
   <!-- Step 1 -->
   <div class="convert-form" ng-show="convertStep == 1">
+    Fill out the form below to convert your current user account into an organization. Your existing repositories will be maintained under the
+    namespace. All <strong>direct</strong> permissions delegated to {{ user.username }} will be deleted.
+
     <form method="post" name="convertForm" id="convertForm" ng-submit="convertToOrg()">
       <div class="form-group">
         <label for="orgName">Organization Name</label>
+        <div class="form-group-content">
           <div class="existing-data">
             <span class="avatar" size="24" data="user.avatar"></span>
-          {{ user.username }}</div>
+            <span class="username">{{ user.username }}</span>
+          </div>
           <span class="description">This will continue to be the namespace for your repositories</span>
         </div>
+      </div>
 
       <div class="form-group">
         <label for="orgName">Admin User</label>
+        <div class="form-group-content">
           <input id="adminUsername" name="adminUsername" type="text" class="form-control" placeholder="Admin Username"
                  ng-model="org.adminUser" required autofocus>
           <input id="adminPassword" name="adminPassword" type="password" class="form-control" placeholder="Admin Password"
@@ -45,11 +49,15 @@
             trying to convert, and <b>must already exist</b>.
           </span>
         </div>
+      </div>
 
       <!-- Plans Table -->
       <div class="form-group plan-group" quay-require="['BILLING']">
         <label>Organization Plan</label>
+        <div class="form-group-content">
           <div class="plans-table" plans="orgPlans" current-plan="org.plan"></div>
+          <span class="description">The billing plan for the new organization. If private repositories are unneeded, select "Open Source".</span>
+        </div>
       </div>
 
       <div class="button-bar">
@@ -64,7 +72,7 @@
 
   <!-- Modal message dialog -->
   <div class="modal fade" id="cannotconvertModal">
-    <div class="modal-dialog">
+    <div class="modal-dialog co-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -82,8 +90,8 @@
 
 
   <!-- Modal message dialog -->
-  <div class="modal fade" id="reallyconvertModal">
+  <div class="modal co-modal fade" id="reallyconvertModal">
-    <div class="modal-dialog">
+    <div class="modal-dialog co-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

static/js/services/api-service.js

@@ -316,7 +316,7 @@ angular.module('quay').factory('ApiService', ['Restangular', '$q', 'UtilService'
 
       bootbox.dialog({
         "message": message,
-        "title": defaultMessage,
+        "title": defaultMessage || 'Request Failure',
         "buttons": {
           "close": {
             "label": "Close",