v1.5 Release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bi-web",
-  "version": "v1.4.0",
+  "version": "v1.5.0+999",
   "private": true,
   "scripts": {
     "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none",
@@ -96,5 +96,5 @@
     "vue-cli-plugin-axios": "0.0.4",
     "vue-template-compiler": "^2.7.14"
   },
-  "versionInfo": "https://github.com/Breeding-Insight/bi-web/releases/tag/v1.4.0"
+  "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/f1b555d0e86e9d66dca773b6e8b68de770a1975f"
 }

src/components/layouts/Footer.vue

@@ -51,6 +51,7 @@
         <div class="level-right">
 
           <div class="level-item">
+            <div class="level">
             <div v-if="showFullAffiliations" class="level-item">
               <img
                   src="../../assets/img/IFAS-logo.svg"
@@ -84,6 +85,7 @@
                   width="75"
               >
             </div>
+            </div>
           </div>
         </div>
       </div>

src/components/program/ProgramUsersTable.vue

@@ -115,6 +115,7 @@
         v-bind:archivable="$ability.can('archive', 'ProgramUser')"
         v-bind:pagination="paginationController"
         v-bind:data-form-state="editUserFormState"
+        v-bind:deactivate-link-text="removeUserLinkText"
         v-on:submit="updateUser($event)"
         v-on:remove="displayWarning($event)"
         v-on:show-error-notification="$emit('show-error-notification', $event)"
@@ -155,7 +156,7 @@
             You can add a user to your program from this panel. When you remove a user from your
             program, their account and membership in other programs is not affected.
           </p>
-          <p>You can add, edit, and delete users from your program from this panel.</p>
+          <p>You can add, edit, and remove users from your program from this panel.</p>
       </template>
     </ExpandableTable>
   </section>
@@ -241,6 +242,8 @@ export default class ProgramUsersTable extends Vue {
   private programUserSort!: UserSort;
   private updateSort!: (sort: UserSort) => void;
 
+  private removeUserLinkText: string = "Remove Access";
+
   newUserValidations = {
     name: {required},
     email: {required, email},
@@ -431,7 +434,7 @@ export default class ProgramUsersTable extends Vue {
 
     if (user){
       this.deleteUser = user;
-      this.deactivateWarningTitle = "Deactivate " + user.name + " from program " + this.activeProgram!.name + "?";
+      this.deactivateWarningTitle = "Remove " + user.name + " from program " + this.activeProgram!.name + "?";
       this.deactivateActive = true;
     } else {
       Vue.$log.error('Could not find object to delete')