Merge pull request #312 from Breeding-Insight/feature/BI-1764

BI-1764 - DeltaBreed logo
Breeding-Insight · May 1, 2023 · 4d003ea · 4d003ea
2 parents 24b7434 + 5f2a8d3
commit 4d003ea
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 46 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -22,7 +22,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>Breeding Insight Platform</title>
+    <title>DeltaBreed</title>
   </head>
   <body>
     <noscript>

diff --git a/src/App.vue b/src/App.vue
@@ -63,7 +63,7 @@ import Footer from "@/components/layouts/Footer.vue";
 @Component({
   watch: {
     $route(to, from) {
-      document.title = to.meta.title + ' | Breeding Insight Platform' || 'Breeding Insight Platform';
+      document.title = to.meta.title + ' | DeltaBreed' || 'DeltaBreed';
     },
     loggedIn(isLoggedIn) {
       if(!isLoggedIn) {

diff --git a/src/assets/img/bi-logo.svg b/src/assets/img/bi-logo.svg
diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
@@ -229,7 +229,7 @@ img {
 }
 
 #program-menu {
-  .dropdown-content {
+  .dropdown-content .programs {
     max-height: 50vh;
     overflow: scroll;
   }
@@ -388,7 +388,7 @@ table tr.is-edited + .detail {
 
 .header-title {
   border-bottom: 1px #363636 solid;
-  padding: 0 2.5em 0 2.5em;
+  padding: 0 2.5em 0 1.5em;
   margin-bottom: 0;
   height: 65px;
   & .navbar-hamburger {
@@ -870,5 +870,18 @@ tr:nth-child(odd) td.db-filled {
       margin-bottom: inherit;
     }
   }
+}
 
+#program-job-management {
+  .table tbody td {
+    vertical-align: top;
+  }
+
+  .truncated {
+    overflow:hidden;
+    max-height: 5rem;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 5;
+    display: block;
+  }
 }
diff --git a/src/components/layouts/BaseSideBarLayout.vue b/src/components/layouts/BaseSideBarLayout.vue
@@ -19,23 +19,23 @@
   <div class="sidebarlayout">
 
     <header class="main-header">
-      <div class="level header-title is-marginless is-mobile">
+      <div class="level header-title is-marginless">
         <div class="level-left">
-          <div class="level-item is-hidden-desktop is-pulled-left">
+          <div class="level-item is-pulled-left">
             <a role="button"
                class="navbar-hamburger has-text-dark"
                aria-label="Open Navigation Menu"
                aria-expanded="false"
                @click="toggleSidebar()"
             >
-              <MenuIcon></MenuIcon>
+              <MenuIcon v-if="showMenuToggle"></MenuIcon>
             </a>
           </div>
           <div class="level-item">
             <a href="/">
               <img
                   src="../../assets/img/bi-logo.svg"
-                  alt="Breeding Insight home"
+                  alt="DeltaBreed home"
                   width="160"
               >
             </a>
@@ -63,7 +63,7 @@
       </div>
     </header>
     <div class="columns is-marginless">
-      <div class="column is-narrow p-0" :class="{ 'is-hidden-touch': !showSidebarMobile }">
+      <div class="column is-narrow p-0" :class="{ 'is-hidden': !showMenu || !showSidebarMobile }">
         <div class="is-300px">
           <div id="sideMenu" class="menu mb-0 menu-test sidebar side-menu">
             <slot name="menu"></slot>
@@ -113,10 +113,11 @@ import UserStatusMenu from "@/components/layouts/menus/UserStatusMenu.vue";
     @Prop()
     username!: string;
 
-    @Watch('$route')
-    onUrlChange() {
-      store.commit(SHOW_SIDEBAR_MOBILE, false);
-    }
+    @Prop({default: true})
+    showMenuToggle?: boolean;
+
+    @Prop({default: true})
+    showMenu?: boolean;
 
     toggleSidebar() {
       store.commit(SHOW_SIDEBAR_MOBILE, !this.showSidebarMobile);

diff --git a/src/components/layouts/Footer.vue b/src/components/layouts/Footer.vue
@@ -19,7 +19,7 @@
     <div class="columns is-marginless">
       <div
           class="column side-menu p-0 is-narrow"
-          :class="{ 'is-hidden-mobile': true, 'is-hidden-tablet-only': !showSidebar || !showSidebarMobile, 'is-hidden-desktop': !showSidebar}"
+          :class="{ 'is-hidden': !showSidebar}"
       >
         <div class="is-300px"></div>
       </div>
@@ -36,10 +36,10 @@
                 <a href="/">Privacy Policy</a>
               </div>
               <div class="level-item">
-                <a href="/">Contact Us</a>
+                <a href="https://breedinginsight.org/contact-us/">Contact Us</a>
               </div>
               <div class="level-item">
-                <a href="/">About</a>
+                <a href="https://breedinginsight.org/about-bi/">About</a>
               </div>
             </div>
           </nav>
@@ -115,8 +115,9 @@ export default class Footer extends Vue {
   }
 
   get showSidebar() {
-    return this.$route.meta.layout == 'adminSideBar' || this.$route.meta.layout == 'userSideBar' ||
-           this.$route.meta.layout == 'infoSideBar' || this.$route.meta.layout == 'baseSideBar';
+    return this.showSidebarMobile && (this.$route.meta.layout == 'adminSideBar' || this.$route.meta.layout == 'userSideBar' ||
+        (this.$route.meta.layout == 'infoSideBar' && process.env.VUE_APP_SANDBOX !== '') || this.$route.meta.layout == 'baseSideBar');
+
   }
 }
 

diff --git a/src/components/layouts/InfoSideBarLayout.vue b/src/components/layouts/InfoSideBarLayout.vue
@@ -18,7 +18,7 @@
 <template>
   <div class="sidebarlayout">
   <!-- the redundant sidebarlayout div here fixes the vertical height issue, don't remove -->
-    <BaseSideBarLayout>
+    <BaseSideBarLayout v-bind:show-menu-toggle="false" v-bind:show-menu="sandboxConfig !== ''">
       <template v-slot:title>
         <div class="level-item">
           <b-button
@@ -167,7 +167,7 @@
           v-else
           class="is-size-5 has-text-primary"
         >
-          Welcome back to Breeding Insight!
+          Welcome back to DeltaBreed!
         </h1>
         <p>
           To access to your breeding program, please log in.

diff --git a/src/components/layouts/NoSideBarLayout.vue b/src/components/layouts/NoSideBarLayout.vue
@@ -24,7 +24,7 @@
             <a href="/">
               <img
                   src="../../assets/img/bi-logo.svg"
-                  alt="Breeding Insight home"
+                  alt="DeltaBreed home"
                   width="160"
               >
             </a>