Merge branch 'release/v23.1.13'

uwcirg · Jan 13, 2023 · 2afe8cf · 2afe8cf
2 parents 29e1e23 + 559414b
commit 2afe8cf
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 54 deletions.
diff --git a/.github/workflows/build-deliver.yaml b/.github/workflows/build-deliver.yaml
@@ -17,7 +17,7 @@ jobs:
 
       - name: Publish to GitHub Container Registry
         # TODO: pin to hash
-        uses: elgohr/Publish-Docker-Github-Action@master
+        uses: elgohr/Publish-Docker-Github-Action@main
         with:
           name: ${{ github.repository }}
           registry: ghcr.io

diff --git a/portal/static/less/eproms.less b/portal/static/less/eproms.less
@@ -3960,7 +3960,7 @@ section.header {
     .choice {
       margin-bottom: 12px;
       display: flex;
-      flex-wrap: wrap;
+      align-items: flex-start;
       .text {
         margin-left: 8px;
       }

diff --git a/portal/static/less/topnav.less b/portal/static/less/topnav.less
@@ -114,15 +114,35 @@
   max-width: 100%;
   background-color: @defaultBackgroundColor;
   background-image: url('../img/header_background.jpg');
-  height: 135px;
+  height: 136px;
   background-size: cover;
   margin: 0;
-  padding: 30px;
+  padding: 16px 24px;
 }
 #tnthNavMainContainer {
-  max-width: 720px;
   position: relative;
   margin: 0 auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  #tnthLogo {
+    flex: 1;
+  }
+  #tnthTopLinks {
+    width: 35%;
+  }
+  .spacer {
+    width: 35%;
+  }
+  .text-container {
+    color: #FFF;
+    display: none;
+  }
+  @media (min-width: 992px) {
+    .text-container {
+      display: block;
+    }
+  }
 }
 #tnthNavXs {
   display: none;
@@ -178,14 +198,14 @@
 }
 @media (min-width: 699px) {
   #tnthNavXs {
-    min-height: 72px;
+    min-height: 86px;
+    padding: 16px;
   }
 }
 
 /** Logo **/
 #tnthLogo {
-  width: 500px;
-  margin: 4px auto;
+  margin: 16px auto;
   transition: margin 10ms ease-in;
   text-align: center;
 }
@@ -205,18 +225,23 @@
   }
 }
 #tnthTopLinks {
-  position: absolute;
-  top: 0;
-  left: 0;
+  line-height: 1.65;
+  white-space: normal;
 }
 
 /** Buttons **/
 .tnth-btn-group {
   position: relative;
-  display: inline-block;
-  vertical-align: middle; // match .btn alignment given font-size hack above
+  display: flex;
+  flex-direction: column;
+  align-items: center;
   margin-left: 0.2em;
 }
+@media (min-width: 786px) {
+  .tnth-btn-group {
+    flex-direction: row;
+  }
+}
 .tnth-nav-btn {
   display: inline-block;
   height: inherit;
@@ -237,11 +262,20 @@
   }
 }
 #tnthUserBtn {
-padding: 0 6px;
+  padding: 0 6px;
+  display: flex;
+  align-items: center;
+  .menu-text {
+    display: inline-block;
+    margin-right: 4px;
+  }
+  .profile-img {
+    margin-left: 12px;
+  }
 }
 @media (min-width: 992px) {
   #tnthUserBtn {
-    padding: 0 14px 0 0;
+    padding: 0 16px 0 0;
     height: inherit;
   }
 }
@@ -353,6 +387,23 @@ padding: 0 6px;
 .welcome-text {
   display: block;
   margin: 0.2em 0;
+  white-space: normal;
+  word-break: break-word;
+  .prompt {
+    display: inline-block;
+  }
+}
+@media (min-width: 992px) {
+  .welcome-text {
+    .prompt {
+      display: block;
+    }
+  }
+}
+@media (min-width: 1600px) {
+  .welcome-text {
+    white-space: nowrap;
+  }
 }
 @media all and (-ms-high-contrast: none),(-ms-high-contrast: active) {
   /* IE10+ */
@@ -446,7 +497,7 @@ padding: 0 6px;
 #tnthNavXs {
   display: block;
 }
-@media (min-width: 768px) {
+@media (min-width: 992px) {
   #tnthNavMain {
     display: block;
   }
@@ -460,19 +511,8 @@ padding: 0 6px;
   }
 }
 @media (min-width: 992px) {
-  #tnthNavMainContainer {
-    max-width: 940px;
-  }
   #tnthNavWrapper img {
     margin: 0 0.5em;
-    vertical-align: middle;
-  }
-}
-@media (min-width: 1220px) {
-  #tnthNavMainContainer {
-    max-width: 100%;
-  }
-  .welcome-text {
-    display: inline-block;
+    vertical-align: top;
   }
 }
diff --git a/portal/templates/portal_wrapper.html b/portal/templates/portal_wrapper.html
@@ -50,14 +50,6 @@
 <div id="tnthNavWrapper">
     <div id="tnthNavMain">
         <div id="tnthNavMainContainer">
-            <div id="tnthLogo">
-                {% if enable_links %}<a href="{{PORTAL}}">{% endif %}
-                    <img class="tnth-topnav-wordmark" src="{{PORTAL}}/{{config.BANNER_LOGOS['desktop']}}" alt="{{_('TrueNTH logo')}}"/>
-                {% if enable_links %}</a>{% endif %}
-                {% if branded_logos %}
-                    <img src="{{ branded_logos[0] }}" alt="{{_('brand logo')}}"></img>
-                {% endif %}
-            </div>
             <div id="tnthTopLinks">
                 <div class="tnth-btn-group">
                     {% if user %}
@@ -100,24 +92,35 @@
                         </ul>
                         {% endif %}
                          <button id="tnthUserBtn" type="button" class="tnth-nav-btn tnth-white tnth-dropdown-toggle" data-toggle="tnth-dropdown">
-                            {% if enable_links %}&nbsp;&nbsp; {{ _("MENU") }} <i class="fa fa-bars"></i>{% endif %}
+                            {% if enable_links %}<span class="menu-text">{{ _("MENU") }}</span> <i class="fa fa-bars"></i>{% endif %}
                             <img class="profile-img" src="{{movember_profile}}" width="50" height="50" alt="{{_('Profile image')}}"/>
+                         </button>
+                         <div class="text-container">
                             {% if user.current_encounter().auth_method != 'url_authenticated' %}
-                                <span class="welcome-text portal-weak-auth-hide"><em>{{ _("Welcome") }}</em>{% if user.display_name != "Anonymous" %}, {{ user.display_name }}{% endif %}</span>
+                                <span class="welcome-text portal-weak-auth-hide"><span class="prompt"><em>{{ _("Welcome") }}</em></span>{% if user.display_name != "Anonymous" %} {{ user.display_name }}{% endif %}</span>
                             {% endif %}
-                            {% if config.DEBUG_TIMEOUTS %}({{ expires_in }} seconds remaining){% endif %}
-                         </button>
-                            {% elif login_url %}<ul class="tnth-dropdown-menu" role="menu"><li><a href="{{ login_url }}">{{ _("Log In to TrueNTH") }}</a></li></ul>
+                            {% if config.DEBUG_TIMEOUTS %}<span class="debug-text">({{ expires_in }} seconds remaining)</span>{% endif %}
+                        </div>
+                        {% elif login_url %}<ul class="tnth-dropdown-menu" role="menu"><li><a href="{{ login_url }}">{{ _("Log In to TrueNTH") }}</a></li></ul>
                         <button type="button" class="tnth-nav-btn tnth-white tnth-dropdown-toggle" data-toggle="tnth-dropdown">{{ _("Welcome") }}</button>
                     {% endif %}
                 </div>
             </div>
+            <div id="tnthLogo">
+                {% if enable_links %}<a href="{{PORTAL}}">{% endif %}
+                    <img class="tnth-topnav-wordmark" src="{{PORTAL}}/{{config.BANNER_LOGOS['desktop']}}" alt="{{_('TrueNTH logo')}}"/>
+                {% if enable_links %}</a>{% endif %}
+                {% if branded_logos %}
+                    <img src="{{ branded_logos[0] }}" alt="{{_('brand logo')}}"></img>
+                {% endif %}
+            </div>
+            <div class="spacer"></div>
         </div>
     </div>
     <div id="tnthNavXs">
         <div class="tnth-container-fluid">
             <div class="tnth-navbar-header">
-                <div class="tnth-white tnth-navbar-toggle tnth-nav-btn {% if not user %}tnth-navbar-no-profile{% endif %}">{{ _("MENU") }} <img src="{{movember_profile}}" width="45" height="45" class="profile-img" alt="{{_('Profile image')}}" /></div>
+                <div class="tnth-white tnth-navbar-toggle tnth-nav-btn {% if not user %}tnth-navbar-no-profile{% endif %}"><span class="menu-text">{{ _("MENU") }}</span> <img src="{{movember_profile}}" width="45" height="45" class="profile-img" alt="{{_('Profile image')}}" /></div>
                 {% if enable_links %}<a id="tnthLogoXs" href="{{PORTAL}}" title="{{ _('Return to TrueNTH home') }}">{% endif %}
                 <img src="{{PORTAL}}/{{config.BANNER_LOGOS['mobile']}}" alt="{{_('TrueNTH logo')}}"/>
                 {% if enable_links %}</a>{% endif %}

diff --git a/portal/templates/profile/profile_macros.html b/portal/templates/profile/profile_macros.html
@@ -931,18 +931,20 @@ <h5 class="muted" v-show="!isSubStudyTriggersResolved()">{{_("Actions Required (
                             v-if="item.type == 'boolean'">
                         <!-- open-choice (checkboxes) type answer -->
                         <div class="choices answer" v-if="item.type == 'open-choice'">
-                            <div class="choice" v-for="option in item.option">
-                                <input
-                                    type="checkbox"
-                                    :code="option.valueCoding.code"
-                                    :class="{other: /other/gi.test(option.valueCoding.display)}"
-                                    :dataType="item.type"
-                                    :linkId="item.linkId"
-                                    :value="option.valueCoding.display"
-                                    @change="onResponseChangeFieldEvent"
-                                >
-                                <span class="text" v-text="option.valueCoding.display"></span>
-                                <textarea
+                            <div v-for="option in item.option">
+                                <div class="choice">
+                                    <input
+                                        type="checkbox"
+                                        :code="option.valueCoding.code"
+                                        :class="{other: /other/gi.test(option.valueCoding.display)}"
+                                        :dataType="item.type"
+                                        :linkId="item.linkId"
+                                        :value="option.valueCoding.display"
+                                        @change="onResponseChangeFieldEvent"
+                                    >
+                                    <span class="text" v-text="option.valueCoding.display"></span>
+                                </div>
+                                 <textarea
                                     class="form-control addl-text other-text"
                                     dataType="string"
                                     :code="option.valueCoding.code"