Merge pull request #627 from dod-ccpo/portfolio-admin-reskin

Portfolio admin reskin

templates/fragments/audit_events_log.html

@@ -1,10 +1,7 @@
 {% from "components/pagination.html" import Pagination %}
 
-<section class="block-list">
-  <header class="block-list__header">
-    <h1 class="block-list__title">{{ "audit_log.header_title" | translate }}</h1>
-  </header>
-
+<section class="block-list activity-log">
+  <div class='subheading'>{{ "portfolios.admin.activity_log_title" | translate }}</div>
   <ul>
     {% for event in audit_events %}
       <li class="block-list__item">

templates/portfolios/admin.html

@@ -0,0 +1,33 @@
+{% extends "portfolios/base.html" %}
+
+{% from "components/pagination.html" import Pagination %}
+{% from "components/icon.html" import Icon %}
+{% from "components/text_input.html" import TextInput %}
+
+{% set secondary_breadcrumb = "navigation.portfolio_navigation.portfolio_admin" | translate %}
+
+{% block portfolio_content %}
+
+  {% include "fragments/flash.html" %}
+
+  <div v-cloak class="portfolio-admin portfolio-content">
+
+
+    <form method="POST" action="{{ url_for('portfolios.edit_portfolio', portfolio_id=portfolio.id) }}" autocomplete="false">
+      {{ form.csrf_token }}
+      <div class='form-row'>
+        <div class='form-col form-col--half'>
+          {{ TextInput(form.name, validation="portfolioName") }}
+        </div>
+
+        <div class='edit-portfolio-name action-group'>
+          <button type="submit" class="usa-button usa-button-big usa-button-primary" tabindex="0">Save</button>
+        </div>
+      </div>
+    </form>
+
+    {% include "fragments/audit_events_log.html" %}
+
+    {{ Pagination(audit_events, 'portfolios.portfolio_activity', portfolio_id=portfolio_id) }}
+  </div>
+{% endblock %}

templates/portfolios/edit.html

@@ -1,38 +0,0 @@
-{% extends "portfolios/base.html" %}
-
-{% from "components/icon.html" import Icon %}
-{% from "components/text_input.html" import TextInput %}
-
-{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.admin" | translate %}
-
-{% block portfolio_content %}
-
-{% include "fragments/flash.html" %}
-
-<form method="POST" action="{{ url_for('portfolios.edit_portfolio', portfolio_id=portfolio.id) }}" autocomplete="false">
-  {{ form.csrf_token }}
-
-  <div class="panel">
-
-    <div class="panel__heading">
-      <h1>Portfolio Settings</h1>
-    </div>
-
-    <div class="panel__content">
-      {{ TextInput(form.name, validation="portfolioName") }}
-    </div>
-  </div>
-
-
-  <div class='action-group'>
-    <button type="submit" class="usa-button usa-button-big usa-button-primary" tabindex="0">Save</button>
-    <a href='{{ url_for("portfolios.portfolio_applications", portfolio_id=portfolio.id) }}' class='action-group__action icon-link'>
-      {{ Icon('x') }}
-      <span>Cancel</span>
-    </a>
-  </div>
-
-
-</form>
-
-{% endblock %}