Merge lp:~deadlight/canonical-identity-provider/account-activity into lp:~deadlight/canonical-identity-provider/vanilla

[Karl Williams]

Updated the account activity page to Vanilla Framework

QA:

- source env/bin/activate
- make start-db
- make run
- Visit http://[CONTAINER IP]:8000/ in your browser
- Create an account using the form
- Log out
- Log back in
- Go to http://[CONTAINER IP]:8000/activity and see that login in the table

[Barry McGee (barry-mcgee)]

lgtm

[Barry McGee (barry-mcgee)]

No QA.

[Anthony Dillon (ya-bo-ng)]

QA +1

review: Approve

=== modified file 'src/identityprovider/static_src/scss/styles.scss'
--- src/identityprovider/static_src/scss/styles.scss	2019-08-12 15:22:05 +0000
+++ src/identityprovider/static_src/scss/styles.scss	2019-08-12 15:22:05 +0000
@@ -57,3 +57,10 @@
     margin-left: $sph-inner;
   }
 }
+
+// Custom truncated table cells
+.p-table__item--truncate {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}

=== modified file 'src/webui/templates/account/auth_log.html'
--- src/webui/templates/account/auth_log.html	2016-07-06 02:49:14 +0000
+++ src/webui/templates/account/auth_log.html	2019-08-12 15:22:05 +0000
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "vanilla/base.html" %}
 {% load i18n %}
 {% comment %}
 Copyright 2015 Canonical Ltd.  This software is licensed under the
@@ -8,46 +8,48 @@
 {% block title %}{% trans "Account activity" %}{% endblock %}
 
 {% block text_title %}
-    <h1 class="u1-h-main">{% trans "Account activity" %}</h1>
+  <h1>{% trans "My account" %}</h1>
 {% endblock %}
 
 {% block content %}
+<section class="p-strip">
+  <h2>Account activity</h2>
 {% if auth_log %}
 {% if full_auth_log_length > auth_log|length %}
-<p>
-  {% blocktrans with accesses=auth_log|length%}The {{ accesses }} most recent accesses made with your account are shown here.{% endblocktrans %}
-</p>
+
+  <p>
+    {% blocktrans with accesses=auth_log|length%}The {{ accesses }} most recent accesses made with your account are shown here.{% endblocktrans %}
+  </p>
+  {% else %}
+  <p>
+    {% blocktrans %}Recent accesses made with your account are shown here.{% endblocktrans %}
+  </p>
+  {% endif %}
+  <p>
+    {% blocktrans %}This includes authentication requests made by other sites and devices.{% endblocktrans %}
+  </p>
+  <table class="p-table">
+    <thead>
+      <tr>
+        <th>{% trans "Time/date" %}</th>
+        <th>{% trans "Type" %}</th>
+        <th>{% trans "IP address" %}</th>
+        <th>{% trans "User Agent/Browser" %}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for attempt in auth_log %}
+      <tr>
+        <td class="p-table__item--truncate" title="{{ attempt.when_created }}">{{ attempt.when_created }}</td>
+        <td>{{ attempt.log_type_label }}</td>
+        <td>{{ attempt.remote_ip }}</td>
+        <td class="p-table__item--truncate" title="{{ attempt.user_agent }}">{{ attempt.user_agent }}</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
 {% else %}
-<p>
-  {% blocktrans %}Recent accesses made with your account are shown here.{% endblocktrans %}
-</p>
+<p>{% trans "Your account has no activity yet." %}</p>
 {% endif %}
-<p>
-  {% blocktrans %}This includes authentication requests made by other sites and devices.{% endblocktrans %}
-</p>
-<section class="account-activity">
-    <table class="listing">
-        <thead>
-            <tr>
-                <td class='time-date'>{% trans "Time/date" %}</td>
-                <td class='log-type'>{% trans "Type" %}</td>
-                <td class='ip-address'>{% trans "IP address" %}</td>
-                <td class='user-agent'>{% trans "User Agent/Browser" %}</td>
-            </tr>
-        </thead>
-        <tbody>
-            {% for attempt in auth_log %}
-            <tr>
-                <td class="time-date">{{ attempt.when_created }}</td>
-                <td class="log-type">{{ attempt.log_type_label }}</td>
-                <td class="ip-address">{{ attempt.remote_ip }}</td>
-                <td class="user-agent">{{ attempt.user_agent }}</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
 </section>
-{% else %}
-<p>{% trans "Your account has no activity yet." %}</p>
-{% endif %}
 {% endblock %}

=== modified file 'src/webui/templates/vanilla/widgets/personal-menu.html'
--- src/webui/templates/vanilla/widgets/personal-menu.html	2019-08-12 15:22:05 +0000
+++ src/webui/templates/vanilla/widgets/personal-menu.html	2019-08-12 15:22:05 +0000
@@ -40,7 +40,6 @@
     {% url 'auth_log' as auth_log_url %}
     {% if current_section == 'auth_log' %}
       {% menu_item "auth_log" _("Account activity") auth_log_url None "p-list__item is-active"  %}
-      {% menu_item "auth_log" _("Account activity") auth_log_url None "p-list__item is-active"  %}
     {% else %}
       {% menu_item "auth_log" _("Account activity") auth_log_url None "p-list__item"  %}
     {% endif %}