diff --git a/styles/sections/_request_approval.scss b/styles/sections/_request_approval.scss index 7011d745..f4b36140 100644 --- a/styles/sections/_request_approval.scss +++ b/styles/sections/_request_approval.scss @@ -49,7 +49,7 @@ border-top: 1px dashed $color-gray-light; &:first-child { - border-top-style: solid; + border-top: none; } @include media($medium-screen) { diff --git a/templates/requests/approval.html b/templates/requests/approval.html index 1af2d43c..d93a0f1d 100644 --- a/templates/requests/approval.html +++ b/templates/requests/approval.html @@ -154,58 +154,57 @@
- {% if reviews %} -
-
-

CCPO Activity Log

-
+
+
+

CCPO Activity Log

+
-
-
    - {% for review in reviews %} -
  1. -
    -
    - {{ review.log_name }} -

    {{ review.status.log_name }} by {{ review.full_name_reviewer }}

    - {% if review.comment %} -

    {{ review.comment }}

    +
    + {% if reviews %} +
      + {% for review in reviews %} +
    1. +
      +
      + {{ review.log_name }} +

      {{ review.status.log_name }} by {{ review.full_name_reviewer }}

      + {% if review.comment %} +

      {{ review.comment }}

      + {% endif %} + +
      + {% if review.lname_mao %} +
      +

      Mission Owner approval on behalf of:

      + {{ review.full_name_mao }} + {{ review.email_mao }} + {{ review.phone_mao }} +
      {% endif %} -
      - {% if review.lname_mao %} -
      -

      Mission Owner approval on behalf of:

      - {{ review.full_name_mao }} - {{ review.email_mao }} - {{ review.phone_mao }} -
      - {% endif %} - - {% if review.lname_ccpo %} -
      -

      CCPO approval on behalf of:

      - {{ review.full_name_ccpo }} -
      - {% endif %} -
      + {% if review.lname_ccpo %} +
      +

      CCPO approval on behalf of:

      + {{ review.full_name_ccpo }} +
      + {% endif %}
      - {% set timestamp=review.status.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %} -
      - -
      -
      -
    2. - {% endfor %} -
    -
    +
    + {% set timestamp=review.status.time_created | formattedDate("%Y-%m-%d %H:%M:%S %Z") %} +
    + +
    +
    +
  2. + {% endfor %} +
+ {% else %} +
+

No CCPO approvals or request changes have been recorded yet.

+
+ {% endif %}
- {% else %} - {{ Alert('CCPO Activity Log', - message='No CCPO approvals or request changes have been recorded yet.', - level='warning' - ) }} - {% endif %} +