From 572f9fb60ba290258cee426e58e78bf27c5c368f Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Thu, 14 Feb 2019 06:37:35 -0800
Subject: [PATCH 01/10] Add bootstrap 4 & begin new activity page

 - new base template for bootstrap 4
 - new SCSS and CSS files for bs4 version
 - new login and signup partials for bs4 version
 - initial work on an activity page
 - a test view for checking global styles
---
 .../templates/account/login-modal-bs4.html    |  48 +++++
 .../templates/account/login-social-bs4.html   |  30 +++
 .../templates/account/signup-modal-bs4.html   |  44 ++++
 open_humans/templates/base-bs4.html           | 165 +++++++++++++++
 open_humans/templates/member/activity.html    |  32 +++
 open_humans/urls.py                           |   6 +
 open_humans/views.py                          |  26 +++
 static/css/oh-proj-theming.css                | 161 +++++++++++++++
 static/scss/oh-proj-theming.scss              | 194 ++++++++++++++++++
 9 files changed, 706 insertions(+)
 create mode 100644 open_humans/templates/account/login-modal-bs4.html
 create mode 100644 open_humans/templates/account/login-social-bs4.html
 create mode 100644 open_humans/templates/account/signup-modal-bs4.html
 create mode 100644 open_humans/templates/base-bs4.html
 create mode 100644 open_humans/templates/member/activity.html
 create mode 100644 static/css/oh-proj-theming.css
 create mode 100644 static/scss/oh-proj-theming.scss

diff --git a/open_humans/templates/account/login-modal-bs4.html b/open_humans/templates/account/login-modal-bs4.html
new file mode 100644
index 000000000..ebb8518fd
--- /dev/null
+++ b/open_humans/templates/account/login-modal-bs4.html
@@ -0,0 +1,48 @@
+{% load account %}
+{% load socialaccount %}
+{% load static %}
+{% load utilities %}
+
+<div class="modal fade" id="login-modal-bs4" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+          <h4 class="modal-title">Log in to Open Humans</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-lg">
+            {% include 'account/login-form.html' %}
+              <input type="submit" form="login-form" id="login"
+                    class="btn btn-primary redirect-storage-link"
+                    value="Log in">
+              <hr class="d-lg-none">
+            </div>
+            <div class="col-lg text-center">
+              <h4>or</h4>
+              {% include 'account/login-social-bs4.html' %}
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+      <div class="modal-footer">
+        <div class="text-center w-100">
+          <a class="redirect-storage-link"
+             href="{% url 'account_reset_password' %}">Reset&nbsp;password</a>
+          |
+          <a href="{% url 'account_signup' %}" data-dismiss="modal"
+            data-toggle="modal" data-target="#signup-modal-bs4">
+            Sign up</a>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/open_humans/templates/account/login-social-bs4.html b/open_humans/templates/account/login-social-bs4.html
new file mode 100644
index 000000000..a70ed47a4
--- /dev/null
+++ b/open_humans/templates/account/login-social-bs4.html
@@ -0,0 +1,30 @@
+{% load socialaccount %}
+{% load static %}
+{% load utilities %}
+
+<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+
+<!-- Facebook button style based on the appearance here:
+https://developers.facebook.com/docs/facebook-login/web/login-button
+
+And using image asset from here:
+https://en.facebookbrand.com/#brand-guidelines-assets -->
+
+<div class="login-button-div">
+  <a href="{% provider_login_url "facebook" method="oauth2" %}"
+     class="btn social-login-button fb-button redirect-storage-link mb-3">
+    <img alt="Facebook Login" title="Facebook login"
+        src="{% static 'images/FB-F.png' %}" width="24" height="24" style="margin-right:8px;"> Continue with Facebook
+  </a>
+</div>
+
+
+<!-- Adapted Google logo silohuette and brand colors from assets here:
+https://developers.google.com/identity/branding-guidelines -->
+<div class="login-button-div">
+  <a href="{% provider_login_url "google" %}"
+     class="btn login-button google-button redirect-storage-link mb-3">
+    <img alt="Google Login" title="Google Login"
+         src="{% static 'images/g-normal.png' %}" width="24" height="24" style="margin-right:8px;"> Continue with Google
+  </a>
+</div>
diff --git a/open_humans/templates/account/signup-modal-bs4.html b/open_humans/templates/account/signup-modal-bs4.html
new file mode 100644
index 000000000..749ed4636
--- /dev/null
+++ b/open_humans/templates/account/signup-modal-bs4.html
@@ -0,0 +1,44 @@
+{% load static %}
+
+<div class="modal fade" id="signup-modal-bs4" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-lg" role="document">
+      <div class="modal-content">
+
+        <div class="modal-header">
+            <h4 class="modal-title">Create an Open Humans account</h4>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+    
+
+        <div class="modal-body">
+          <div class="text-center">
+
+            {% include 'account/login-social-bs4.html' %}
+
+            <h4>or</h4>
+
+            <a href="{% url 'email_signup' %}"
+              class="btn btn-primary login-button redirect-storage-link mb-3">
+              <img alt="Email login" title="Email login"
+                  src="{% static 'images/email-icon.png' %}" width="24" height="24" style="margin-right:8px;">
+              Continue with Email
+            </a>
+
+          </div>
+        </div>
+
+        <div class="modal-footer">
+          <div class="text-center w-100">
+            Already have an account?
+            <a href="{% url 'account_login' %}" data-dismiss="modal"
+            data-toggle="modal" data-target="#login-modal-bs4">
+            Log&nbsp;in.</a>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/open_humans/templates/base-bs4.html b/open_humans/templates/base-bs4.html
new file mode 100644
index 000000000..e45b8f2b1
--- /dev/null
+++ b/open_humans/templates/base-bs4.html
@@ -0,0 +1,165 @@
+{% load static %}
+{% load utilities %}
+<!doctype html>
+<html lang="en" class="h-100">
+  <head>
+      <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+      <meta name="description" content="{% block meta_description %}Open Humans empowers people with their personal data. From genomes to GPS: you can explore data analyses, do citizen science, and donate data to research.{% endblock meta_description %}">
+
+      <title>{% block head_title %}{% endblock head_title %}{% block head_title_suffix %} - Open Humans{% endblock head_title_suffix %}</title>
+
+
+
+    {# Application JavaScript - Note: popper is needed by bootstrap 4 #}
+    <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/parsley.js/2.8.0/parsley.min.js" integrity="sha256-ixgfZ1KX2FiT8fYtfpU1l3NgfV4X18K1XxyQkdIAd+E=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/select2.full.min.js" integrity="sha256-FcVIknBiVRk5KLQeIBb9VQdtFRMqwffXyZ+D8q0gQro=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+
+    <script src="{% static 'js/main.js' %}"></script>
+  
+    {# Per-page JavaScript #}
+    {% page_bundle %}
+
+    {# But some URLs are dynamic, e.g. '/members/username'. #}
+    {% block extra_js %}{% endblock %}
+
+    <link rel="icon" type="image/png" href="{% static 'images/open_humans_favicon.png' %}">
+
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="https://static.openhumans.org/css/oh-fonts.css">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/oh-proj-theming.css' %}">
+
+    {# For internal CSS stylesheets. #}
+    {% block extra_css %}{% endblock %}
+
+  </head>
+
+  <body id="{% page_body_id %}-2" class="d-flex flex-column h-100 oh-proj-template {% page_body_class %}">
+
+    <header>
+      <!-- Fixed navbar -->
+      <nav class="navbar navbar-expand-md fixed-top navbar-open-humans">
+        <div class="container d-flex">
+          <a class="navbar-brand" href="/">
+            <img class="navbar-img" src="{% static 'images/open-humans-logo-horizontal-80px.png' %}">
+          </a>
+          <button class="navbar-toggler custom-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon custom-toggler"></span>
+          </button>
+          <div class="collapse navbar-collapse text-right" id="navbarCollapse">
+            <ul class="navbar-nav ml-auto">
+              <li class="nav-item mr-md-2{% active 'add-data' %}">
+                <a class="nav-link" href="{% url 'add-data' %}">Add data</a>
+              </li>
+              <li class="nav-item mr-md-2 {% active 'explore-share' %}">
+                <a class="nav-link" href="{% url 'explore-share' %}">Explore &amp; share</a>
+              </li>
+              <li class="nav-item mr-md-3 {% active 'create' %}">
+                <a class="nav-link" href="{% url 'create' %}">Create</a>
+              </li>
+              {% if user.is_authenticated %}
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle"
+                    data-toggle="dropdown" role="button"
+                    aria-haspopup="true" aria-expanded="false">My account
+                    <span class="caret"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="{% url 'my-member-dashboard' %}">Public profile</a></li>
+                  <li><a href="{% url 'my-member-joined' %}">Projects joined</a></li>
+                  <li><a href="{% url 'my-member-data' %}">My data</a></li>
+                  <li><a href="{% url 'my-member-settings' %}">Account settings</a></li>
+                  {% if user.member.datarequestproject_set.all %}
+                  <li class="divider"></li>
+                  <li><a href="{% url 'direct-sharing:manage-projects' %}">Manage projects</a></li>
+                  {% endif %}
+                  <li class="divider"></li>
+                  <li><a class="logout-link" href="{% url 'account_logout' %}">
+                    Log out</a></li>
+                </ul>
+              </li>
+              {% else %}
+              <li class="nav-item {% active 'login' %} mr-md-4 mt-2 mt-md-1">
+                <button type="button" class="btn btn-sm btn-default" data-toggle="modal" data-target="#login-modal-bs4">
+                  Log in
+                </button>
+              </li>
+
+              <li class="nav-item {% active 'signup' %} mt-3 mt-md-1 mb-2 mb-md-0">
+                <button type="button" class="btn btn-sm btn-primary signup-link"
+                  data-toggle="modal" data-target="#signup-modal-bs4">
+                  Join now!
+                </button>
+              </li>
+              {% endif %}
+            </ul>
+          </div>
+        </div>
+      </nav>
+    </header>
+
+    <!-- Page content -->
+    <main role="main" class="flex-shrink-0">
+      <div class="container">
+
+        {% if request.user.is_authenticated and not request.user.member.primary_email.verified %}
+        <div class="alert alert-error">
+          Please
+          <a href="{% url 'my-member-send-confirmation-email' %}?next={{ request.path }}">verify
+            your email address</a>! As good stewards of your data, we want to
+            be able to contact you.
+        </div>
+        {% endif %}
+        {% block messages_block %}
+          {% if messages %}
+            {% for message in messages %}
+            <div class="alert {% if message.tags %}
+                alert-{% ifequal message.tags 'error' %}danger{% else %}{{ message.tags }}{% endifequal %}
+                {% endif %}">
+              {{ message }}</div>
+            {% endfor %}
+          {% endif %}
+        {% endblock messages_block %}
+
+        {% block main %}
+        <h1 class="mt-5">Sample header</h1>
+        <p class="lead">Sample lead paragraph.</p>
+        <p>Sample standard paragraph. This <a href="#">is a sample</a> link.</a> <code>This is some code.</code></p>
+        <div>
+          <btn class="btn btn-primary">button 1</btn>
+          <btn class="btn btn-default">button 2</btn>
+          <btn class="btn btn-primary-hollow">button 3</btn>
+          <btn class="btn btn-info">button 4</btn>
+        </div>
+        {% endblock main %}
+
+      </div>
+    </main>
+
+    <footer class="footer mt-auto pb-3 pt-5">
+      <div class="container">
+        <div class="text-center">
+          <a href="{% url 'about' %}">About&nbsp;Us</a> |
+          <a href="http://blog.openhumans.org/">Blog</a> |
+          <a href="http://slackin.openhumans.org">Chat</a> |
+          <a href="{% url 'jobs' %}">Jobs</a> |
+          <a href="{% url 'member-list' %}">Member list</a></li> |
+          <a href="{% url 'statistics' %}">Statistics</a></li> |
+          <a href="https://twitter.com/OpenHumansOrg"><img src="{% static 'images/twitter-xs-logo.png' %}" alt="Twitter" style="max-height:15px"></a> |
+          <a href="https://www.facebook.com/openhumansorg/"><img src="{% static 'images/FB-f-Logo__blue_29.png' %}" alt="Facebook" style="max-height:15px"></a> |
+          <a href="{% url 'contact_us' %}">Contact&nbsp;Us</a> |
+          <a href="{% url 'community_guidelines' %}">Community&nbsp;Guidelines</a> |
+          <a href="{% url 'terms-of-use' %}">Terms&nbsp;of&nbsp;Use</a> |
+          <a href="{% url 'data-use-policy' %}">Data&nbsp;Use&nbsp;Policy</a>
+        </div>
+      </div>
+    </footer>
+
+    {% include 'account/signup-modal-bs4.html' %}
+    {% include 'account/login-modal-bs4.html' %}
+
+    {% block extra_modals %}{% endblock %}
+  </body>
+</html>
diff --git a/open_humans/templates/member/activity.html b/open_humans/templates/member/activity.html
new file mode 100644
index 000000000..00d5c24c5
--- /dev/null
+++ b/open_humans/templates/member/activity.html
@@ -0,0 +1,32 @@
+{% extends 'base-bs4.html' %}
+{% load static %}
+{% load utilities %}
+
+{% block head_title %}{{ activity.verbose_name }}{% endblock %}
+
+{% block meta_description %}&quot;{{ activity.verbose_name }}&quot; on Open Humans: {{ activity.description }}{% endblock meta_description %}
+
+{% block main %}
+<div class="d-flex">
+    <div class="flex-grow-1 mb-3">
+        <div class="d-none d-sm-inline-block">
+            <h1>{{ project.name }}</h1>
+            {% include 'partials/activity-info-table-bs4.html' %}
+        </div>
+        <div class="d-flex justify-content-center d-sm-none">
+            <img class="w-25 m-2" src="{% static 'images/default-badge.png' %}">
+        </div>
+        <div class="d-flex justify-content-center d-sm-none text-center">
+            <h1 class="justify-content-center">{{ project.name }}</h1>
+        </div>
+        <div class="d-flex justify-content-center d-sm-none">
+            {% include 'partials/activity-info-table-bs4.html' %}
+        </div>
+    </div>
+    <div class="d-none d-sm-inline-block">
+        <img class="img-fluid max-width pl-4" src="{% static 'images/default-badge.png' %}">
+    </div>
+</div>
+<h2>About {{ project.name }}</h2>
+<p>{{ project.long_description|markdown }}</p>
+{% endblock main %}
\ No newline at end of file
diff --git a/open_humans/urls.py b/open_humans/urls.py
index 6c5ed95bc..c4992405b 100644
--- a/open_humans/urls.py
+++ b/open_humans/urls.py
@@ -34,6 +34,7 @@
     path("public-data/", include(public_data.urls, namespace="public-data")),
     # Simple pages
     path("", views.HomeView.as_view(), name="home"),
+    path("testview/", views.TestView.as_view(), name="testview"),
     path(
         "statistics/",
         views.StatisticView.as_view(template_name="pages/statistics.html"),
@@ -226,6 +227,11 @@
         member_views.MemberEmailView.as_view(),
         name="member-email",
     ),
+    re_path(
+        r"^activity2/(?P<slug>[A-Za-z0-9_-]+)/$",
+        views.ActivityView.as_view(),
+        name="activity",
+    ),
     re_path(
         r"^activity/(?P<source>[A-Za-z0-9_-]+)/$",
         views.ActivityManagementView.as_view(),
diff --git a/open_humans/views.py b/open_humans/views.py
index 39e2d4c82..2a709721c 100644
--- a/open_humans/views.py
+++ b/open_humans/views.py
@@ -8,6 +8,7 @@
 from django.shortcuts import redirect, render
 from django.urls import reverse, reverse_lazy
 from django.views.generic.base import TemplateView, View
+from django.views.generic.detail import DetailView
 from django.views.generic.edit import DeleteView, FormView
 
 import feedparser
@@ -288,6 +289,31 @@ def get_context_data(self, **kwargs):
         return context
 
 
+class TestView(NeverCacheMixin, TemplateView):
+    """
+    A view testing various global styles.
+    """
+
+    def dispatch(self, request, *args, **kwargs):
+        django_messages.error(request, "Test error message.")
+        django_messages.warning(request, "Test warning message.")
+        django_messages.success(request, "Test success message.")
+        django_messages.info(request, "Test info message.")
+        return super().dispatch(request, *args, **kwargs)
+
+    template_name = "base-bs4.html"
+
+
+class ActivityView(NeverCacheMixin, DetailView):
+    """
+    A public 'home' view for current and potential project members.
+    """
+
+    model = DataRequestProject
+    context_object_name = "project"
+    template_name = "member/activity.html"
+
+
 class ActivityManagementView(NeverCacheMixin, LargePanelMixin, TemplateView):
     """
     A 'home' view for each activity, with sections for describing the activity,
diff --git a/static/css/oh-proj-theming.css b/static/css/oh-proj-theming.css
new file mode 100644
index 000000000..c19c620a5
--- /dev/null
+++ b/static/css/oh-proj-theming.css
@@ -0,0 +1,161 @@
+/*-------------------------------------------------- */
+/* Colors
+-------------------------------------------------- */
+/* Text styles */
+body {
+  font-family: "Montserrat", sans-serif;
+  font-weight: 400;
+  font-size: 0.8rem;
+  line-height: 1.4;
+}
+body h1 {
+  font-size: 1.7rem;
+}
+body h2 {
+  font-size: 1.4rem;
+}
+body h3 {
+  font-size: 1.25rem;
+}
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  color: #4d4d4d;
+  font-weight: 300;
+}
+
+@media (min-width: 768px) {
+  body {
+    font-size: 0.85rem;
+  }
+}
+footer {
+  font-size: 0.8rem;
+}
+
+code {
+  background-color: inherit;
+  color: #f7763e;
+}
+
+a {
+  color: #009fa8;
+}
+a:hover, a:focus {
+  color: #008c94;
+  text-decoration: underline;
+}
+
+/* Navbar styles */
+body.oh-proj-template > main > div.container {
+  padding-top: 4.5rem;
+}
+
+.navbar-toggler-icon.custom-toggler {
+  background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(74,193,200, 1.0)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
+}
+
+.navbar-toggler.custom-toggler {
+  border: 1px solid #009fa888;
+}
+
+.navbar.navbar-open-humans {
+  background-color: #fff;
+  border-radius: 0px;
+  border: 0px;
+  font-size: 0.9rem;
+}
+.navbar.navbar-open-humans a.navbar-brand > img {
+  height: 1.3rem;
+}
+.navbar.navbar-open-humans .nav-item.active a {
+  color: #008c94;
+  background-color: #e6f9fa;
+}
+
+/* Button styles */
+.btn-default {
+  background-color: #fff;
+  border: 2px solid #009fa8;
+  color: #009fa8;
+}
+.btn-default:hover, .btn-default:focus {
+  background-color: #e6f9fa;
+  border: 2px solid #009fa8;
+  color: #008c94;
+}
+
+.btn-primary-hollow {
+  background-color: #fff;
+  border: 2px solid #ff9161;
+  color: #009fa8;
+}
+.btn-primary-hollow:hover, .btn-primary-hollow:focus {
+  background-color: #fff1eb;
+  border: 2px solid #f7763e;
+  color: #008c94;
+}
+
+.btn-primary {
+  background-color: #ff9161;
+  border: 2px solid #ff9161;
+  color: #fff;
+}
+.btn-primary:hover, .btn-primary:focus {
+  background-color: #f7763e;
+  border-color: #f7763e;
+  color: #fff;
+}
+
+.btn-info {
+  background-color: #009fa8;
+  border: 2px solid #009fa8;
+}
+.btn-info:hover, .btn-info:focus {
+  background-color: #008c94;
+  border-color: #008c94;
+}
+
+.login-button {
+  display: inline-block;
+  text-align: left;
+  width: 16rem;
+  color: white;
+}
+.login-button:hover, .login-button:focus {
+  color: white;
+  text-decoration: none;
+}
+
+.fb-button {
+  background-color: #4267B2;
+  border-color: #4267B2;
+  color: white;
+}
+.fb-button:hover, .fb-button:focus {
+  background-color: #34518c;
+  border-color: #34518c;
+  color: white;
+}
+.fb-button:hover:active, .fb-button:hover .active, .fb-button:focus:active, .fb-button:focus .active {
+  background-color: #34518c;
+  border-color: #34518c;
+  color: white;
+}
+
+.google-button {
+  background-color: #4285F4;
+  border-color: #4285F4;
+  color: white;
+}
+.google-button:hover, .google-button:focus {
+  background-color: #3367d6;
+  border-color: #3367d6;
+  color: white;
+}
+.google-button:hover:active, .google-button:hover .active, .google-button:focus:active, .google-button:focus .active {
+  background-color: #3367d6;
+  border-color: #3367d6;
+  color: white;
+}
+
+/*# sourceMappingURL=oh-proj-theming.css.map */
diff --git a/static/scss/oh-proj-theming.scss b/static/scss/oh-proj-theming.scss
new file mode 100644
index 000000000..156ab6a2e
--- /dev/null
+++ b/static/scss/oh-proj-theming.scss
@@ -0,0 +1,194 @@
+/*-------------------------------------------------- */
+/* Colors
+-------------------------------------------------- */
+$oh-teal-verylight: #e6f9fa;
+$oh-teal-light: #c9ecef;
+$oh-teal: #4ac1c8;
+$oh-teal-dark: #009fa8;
+$oh-teal-verydark: #008c94;
+
+$oh-orange-verylight: #fff1eb;
+$oh-orange-light: #ffceb9;
+$oh-orange: #ff9161;
+$oh-orange-dark: #f7763e;
+
+$oh-gray-verydark: #4d4d4d;
+
+
+/* Text styles */
+
+body {
+  font-family: 'Montserrat', sans-serif;
+  font-weight: 400;
+  font-size: 0.8rem;
+  line-height: 1.4;
+  h1 {
+    font-size: 1.7rem;
+  }
+  
+  h2 {
+    font-size: 1.4rem;
+  }
+  
+  h3 {
+    font-size: 1.25rem;
+  }
+}
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  color: $oh-gray-verydark;
+  font-weight: 300;
+}
+
+@media (min-width: 768px) {
+  body {
+    font-size: 0.85rem;
+  }
+}
+
+
+footer {
+  font-size: 0.8rem;
+}
+
+code {
+  background-color: inherit;
+  color: $oh-orange-dark;
+}
+
+a {
+  color: $oh-teal-dark;
+
+  &:hover, &:focus {
+    color: $oh-teal-verydark;
+    text-decoration: underline;
+  }
+}
+
+/* Navbar styles */
+
+body.oh-proj-template > main > div.container {
+  padding-top: 4.5rem;
+}
+
+.navbar-toggler-icon.custom-toggler {
+  background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(74,193,200, 1.0)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E");
+}
+
+.navbar-toggler.custom-toggler {
+  border: 1px solid #009fa888;
+}
+
+.navbar.navbar-open-humans {
+  background-color: #fff;
+  border-radius: 0px;
+  border: 0px;
+  font-size: 0.9rem;
+
+  a.navbar-brand > img {
+    height: 1.3rem;
+  }
+
+  .nav-item.active {
+    a {
+      color: $oh-teal-verydark;
+      background-color: $oh-teal-verylight;
+    }
+  }
+}
+
+/* Button styles */
+
+.btn-default {
+  background-color: #fff;
+  border: 2px solid $oh-teal-dark;
+  color: $oh-teal-dark;
+
+  &:hover, &:focus {
+    background-color: $oh-teal-verylight;
+    border: 2px solid $oh-teal-dark;
+    color: $oh-teal-verydark;
+  }
+}
+
+.btn-primary-hollow {
+  background-color: #fff;
+  border: 2px solid $oh-orange;
+  color: $oh-teal-dark;
+
+  &:hover, &:focus {
+    background-color: $oh-orange-verylight;
+    border: 2px solid $oh-orange-dark;
+    color: $oh-teal-verydark;
+  }
+}
+
+.btn-primary {
+  background-color: $oh-orange;
+  border: 2px solid $oh-orange;
+  color: #fff;
+
+  &:hover, &:focus {
+    background-color: #f7763e;
+    border-color: #f7763e;
+    color: #fff;
+  }
+}
+
+.btn-info {
+  background-color: $oh-teal-dark;
+  border: 2px solid $oh-teal-dark;
+
+  &:hover, &:focus {
+    background-color: $oh-teal-verydark;
+    border-color: $oh-teal-verydark;
+  }
+}
+
+.login-button {
+  display: inline-block;
+  text-align: left;
+  width: 16rem;
+  color: white;
+
+  &:hover, &:focus {
+    color: white;
+    text-decoration: none;
+  }
+}
+
+.fb-button {
+  background-color: #4267B2;
+  border-color: #4267B2;
+  color: white;
+
+  &:hover, &:focus {
+    background-color: #34518c;
+    border-color: #34518c;
+    color: white;
+
+    &:active, .active {
+      background-color: #34518c;
+      border-color: #34518c;
+      color: white;
+    }
+  }
+}
+
+.google-button {
+  background-color: #4285F4;
+  border-color: #4285F4;
+  color: white;
+
+  &:hover, &:focus {
+    background-color: #3367d6;
+    border-color: #3367d6;
+    color: white;
+
+    &:active, .active {
+      background-color: #3367d6;
+      border-color: #3367d6;
+      color: white;
+    }
+  }
+}
\ No newline at end of file

From 665f6897b95dea6b0a4ba7f45a0e3f109ba3028b Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Wed, 20 Feb 2019 21:53:32 -0800
Subject: [PATCH 02/10] Add responsive text sizes

Also,
 - new activity badge
 - activity info and join button
 - bs4 version for main JS
---
 open_humans/templates/base-bs4.html        |   9 +-
 open_humans/templates/member/activity.html |  13 ++-
 static/css/oh-proj-theming.css             | 109 ++++++++++++++++--
 static/images/default-badge.png            | Bin 4608 -> 23351 bytes
 static/images/default-badge.svg            |  77 +++++++++++++
 static/js/main-bs4.js                      |  94 ++++++++++++++++
 static/scss/oh-proj-theming.scss           | 125 +++++++++++++++++----
 7 files changed, 388 insertions(+), 39 deletions(-)
 create mode 100644 static/images/default-badge.svg
 create mode 100644 static/js/main-bs4.js

diff --git a/open_humans/templates/base-bs4.html b/open_humans/templates/base-bs4.html
index e45b8f2b1..261640553 100644
--- a/open_humans/templates/base-bs4.html
+++ b/open_humans/templates/base-bs4.html
@@ -18,8 +18,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
-    <script src="{% static 'js/main.js' %}"></script>
-  
+    <script src="{% static 'js/main-bs4.js' %}"></script>
+
     {# Per-page JavaScript #}
     {% page_bundle %}
 
@@ -51,7 +51,7 @@
           </button>
           <div class="collapse navbar-collapse text-right" id="navbarCollapse">
             <ul class="navbar-nav ml-auto">
-              <li class="nav-item mr-md-2{% active 'add-data' %}">
+              <li class="nav-item mt-2 mt-md-0 mr-md-2{% active 'add-data' %}">
                 <a class="nav-link" href="{% url 'add-data' %}">Add data</a>
               </li>
               <li class="nav-item mr-md-2 {% active 'explore-share' %}">
@@ -82,7 +82,8 @@
               </li>
               {% else %}
               <li class="nav-item {% active 'login' %} mr-md-4 mt-2 mt-md-1">
-                <button type="button" class="btn btn-sm btn-default" data-toggle="modal" data-target="#login-modal-bs4">
+                <button type="button" class="btn btn-sm btn-default"
+                data-toggle="modal" data-target="#login-modal-bs4">
                   Log in
                 </button>
               </li>
diff --git a/open_humans/templates/member/activity.html b/open_humans/templates/member/activity.html
index 00d5c24c5..1d7e94df7 100644
--- a/open_humans/templates/member/activity.html
+++ b/open_humans/templates/member/activity.html
@@ -7,7 +7,7 @@
 {% block meta_description %}&quot;{{ activity.verbose_name }}&quot; on Open Humans: {{ activity.description }}{% endblock meta_description %}
 
 {% block main %}
-<div class="d-flex">
+<div class="d-flex mt-4">
     <div class="flex-grow-1 mb-3">
         <div class="d-none d-sm-inline-block">
             <h1>{{ project.name }}</h1>
@@ -23,10 +23,15 @@ <h1 class="justify-content-center">{{ project.name }}</h1>
             {% include 'partials/activity-info-table-bs4.html' %}
         </div>
     </div>
-    <div class="d-none d-sm-inline-block">
-        <img class="img-fluid max-width pl-4" src="{% static 'images/default-badge.png' %}">
+    <div class="d-none d-sm-inline-block w-25">
+        <img class="img-fluid max-width px-sm-1 pt-sm-1 px-md-3 pt-md-2" src="{% static 'images/default-badge.png' %}" style="max-height:10rem;">
     </div>
 </div>
 <h2>About {{ project.name }}</h2>
 <p>{{ project.long_description|markdown }}</p>
-{% endblock main %}
\ No newline at end of file
+{% if project.onsitedatarequestproject %}
+<a class="btn btn-primary btn-sm" href="{% url 'direct-sharing:join-on-site' project.slug %}">Join project</a>
+{% elif project.oauth2datarequestproject %}
+<a class="btn btn-primary btn-sm" href="{{ project.oauth2datarequestproject.enrollment_url }}">Join project</a>
+{% endif %}
+{% endblock main %}
diff --git a/static/css/oh-proj-theming.css b/static/css/oh-proj-theming.css
index c19c620a5..75002fce5 100644
--- a/static/css/oh-proj-theming.css
+++ b/static/css/oh-proj-theming.css
@@ -5,35 +5,116 @@
 body {
   font-family: "Montserrat", sans-serif;
   font-weight: 400;
-  font-size: 0.8rem;
-  line-height: 1.4;
+  font-size: 0.816rem;
 }
 body h1 {
   font-size: 1.7rem;
 }
 body h2 {
-  font-size: 1.4rem;
+  font-size: 1.36rem;
 }
 body h3 {
-  font-size: 1.25rem;
+  font-size: 1.19rem;
+}
+body h4 {
+  font-size: 1.105rem;
 }
 
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-  color: #4d4d4d;
-  font-weight: 300;
+footer {
+  font-size: 0.731rem;
 }
 
+@media (min-width: 576px) {
+  body {
+    font-size: 0.8976rem;
+  }
+  body h1 {
+    font-size: 1.87rem;
+  }
+  body h2 {
+    font-size: 1.496rem;
+  }
+  body h3 {
+    font-size: 1.309rem;
+  }
+  body h4 {
+    font-size: 1.2155rem;
+  }
+
+  footer {
+    font-size: 0.8041rem;
+  }
+}
 @media (min-width: 768px) {
   body {
-    font-size: 0.85rem;
+    font-size: 0.9792rem;
+  }
+  body h1 {
+    font-size: 2.04rem;
+  }
+  body h2 {
+    font-size: 1.632rem;
+  }
+  body h3 {
+    font-size: 1.428rem;
+  }
+  body h4 {
+    font-size: 1.326rem;
+  }
+
+  footer {
+    font-size: 0.8772rem;
   }
 }
-footer {
-  font-size: 0.8rem;
+@media (min-width: 992px) {
+  body {
+    font-size: 1.03632rem;
+  }
+  body h1 {
+    font-size: 2.159rem;
+  }
+  body h2 {
+    font-size: 1.7272rem;
+  }
+  body h3 {
+    font-size: 1.5113rem;
+  }
+  body h4 {
+    font-size: 1.40335rem;
+  }
+
+  footer {
+    font-size: 0.92837rem;
+  }
+}
+@media (min-width: 1200px) {
+  body {
+    font-size: 1.1016rem;
+  }
+  body h1 {
+    font-size: 2.295rem;
+  }
+  body h2 {
+    font-size: 1.836rem;
+  }
+  body h3 {
+    font-size: 1.6065rem;
+  }
+  body h4 {
+    font-size: 1.49175rem;
+  }
+
+  footer {
+    font-size: 0.98685rem;
+  }
+}
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  color: #4d4d4d;
+  font-weight: 300;
 }
 
 code {
-  background-color: inherit;
+  background-color: #fff1eb;
   color: #f7763e;
 }
 
@@ -47,7 +128,7 @@ a:hover, a:focus {
 
 /* Navbar styles */
 body.oh-proj-template > main > div.container {
-  padding-top: 4.5rem;
+  padding-top: 3.6rem;
 }
 
 .navbar-toggler-icon.custom-toggler {
@@ -62,6 +143,7 @@ body.oh-proj-template > main > div.container {
   background-color: #fff;
   border-radius: 0px;
   border: 0px;
+  border-bottom: 1px solid #c9ecef;
   font-size: 0.9rem;
 }
 .navbar.navbar-open-humans a.navbar-brand > img {
@@ -71,6 +153,9 @@ body.oh-proj-template > main > div.container {
   color: #008c94;
   background-color: #e6f9fa;
 }
+.navbar.navbar-open-humans .nav-link:hover {
+  text-decoration: underline;
+}
 
 /* Button styles */
 .btn-default {
diff --git a/static/images/default-badge.png b/static/images/default-badge.png
index 44f4043361d3bf22efef96389ba65502d9325779..2d596fbc11aa20fe2395075497d11f49ac5b533d 100644
GIT binary patch
literal 23351
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

delta 4592
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
a&i@0Z?GUro=BzIO0000<MNUMnLSTYXU(j6u

diff --git a/static/images/default-badge.svg b/static/images/default-badge.svg
new file mode 100644
index 000000000..99d1a8347
--- /dev/null
+++ b/static/images/default-badge.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg9259"
+   width="95.199997"
+   height="95.199997"
+   viewBox="0 0 95.199997 95.199997"
+   sodipodi:docname="default-badge.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="/home/mad/projects/open-humans/static/images/default-badge.png"
+   inkscape:export-xdpi="540.84003"
+   inkscape:export-ydpi="540.84003">
+  <metadata
+     id="metadata9265">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9263" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3066"
+     inkscape:window-height="1689"
+     id="namedview9261"
+     showgrid="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:zoom="3.8051472"
+     inkscape:cx="-109.01589"
+     inkscape:cy="73.075165"
+     inkscape:window-x="134"
+     inkscape:window-y="55"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9259">
+    <inkscape:grid
+       type="xygrid"
+       id="grid9286" />
+  </sodipodi:namedview>
+  <circle
+     style="opacity:1;fill:#ffceb9;fill-opacity:1;stroke:none;stroke-width:4.67436981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path9269"
+     cx="47.5"
+     cy="47.699997"
+     r="44.5" />
+  <ellipse
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#4ac1c8;stroke-width:7.67122459;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.41420996;stroke-dasharray:15.34244941, 15.34244941;stroke-dashoffset:0;stroke-opacity:1"
+     id="path9269-3"
+     cx="47.5"
+     cy="47.699997"
+     rx="43.664387"
+     ry="43.664391" />
+</svg>
diff --git a/static/js/main-bs4.js b/static/js/main-bs4.js
new file mode 100644
index 000000000..7cec52073
--- /dev/null
+++ b/static/js/main-bs4.js
@@ -0,0 +1,94 @@
+/*global webshim:true*/
+
+'use strict';
+
+var enableCsrf = require('./lib/enable-csrf.js');
+
+require('drmonty-garlicjs');
+require('webshim');
+
+enableCsrf($);
+
+// Specifically so IE will support the HTML5 form attribute on <input> elements
+webshim.setOptions('basePath', '/static/vendor/shims/');
+webshim.polyfill('forms');
+
+function parsleyForm(element) {
+  return $(element).parsley({
+    successClass: 'has-success',
+    errorClass: 'has-error',
+    trigger: 'change keyup focusout',
+    classHandler: function (field) {
+      if (field.$element.attr('type') === 'radio') {
+        return $('input[type=radio][name=' + field.$element.attr('name') + ']')
+          .parents('.radio');
+      }
+
+      return field.$element.parents('.form-group');
+    },
+    errorsContainer: function (field) {
+      var $field = field.$element;
+
+      if (field.$element.attr('type') === 'radio') {
+        $field = $('input[type=radio][name=' + field.$element.attr('name') +
+          ']:last').parent().parent();
+
+        return $('<span></span>').insertAfter($field);
+      }
+
+      if (field.$element.parent('.input-group')) {
+        $field = field.$element.parent('.input-group');
+      }
+
+      return $('<span></span>').insertAfter($field);
+    },
+    errorsWrapper: '<span class="help-block"></span>',
+    errorTemplate: '<div></div>'
+  });
+}
+
+function showModal(modalId) {
+  return function (e) {
+    // Allow for middle-clicking, control-clicking, and command-clicking
+    if (e.isDefaultPrevented() || e.metaKey || e.ctrlKey) {
+      return;
+    }
+
+    e.preventDefault();
+
+    $(modalId).modal({remote: false});
+  };
+}
+
+function storeRedirect(){
+  var location = window.location.href;
+
+  // Make a POST, but not asynchronously!
+  $.ajax({ type: 'POST',
+           url: '/account/storeredirect/',
+           data: {next_url: location},
+           success: function(){},
+           async:false });
+}
+
+$(function () {
+  $('[rel=persist]').garlic();
+
+  parsleyForm('form');
+
+  $('.logout-link').click(function (e) {
+    e.preventDefault();
+
+    $.post($(this).attr('href'), function () {
+      location.reload();
+    });
+  });
+
+  // Add these modals with JavaScript rather than data- attributes to prevent
+  // AJAX loading of modal content by Bootstrap.
+  $('.login-link').click(showModal('#login-modal'));
+  $('.signup-link').click(showModal('#signup-modal'));
+
+  // POST current URL to be stored as a redirect link upon login/signup
+  $('.redirect-storage-link').click(storeRedirect);
+});
diff --git a/static/scss/oh-proj-theming.scss b/static/scss/oh-proj-theming.scss
index 156ab6a2e..53176b2d2 100644
--- a/static/scss/oh-proj-theming.scss
+++ b/static/scss/oh-proj-theming.scss
@@ -14,45 +14,127 @@ $oh-orange-dark: #f7763e;
 
 $oh-gray-verydark: #4d4d4d;
 
+$h1-base: 1.70rem;
+$text-plain-mult: 0.48;
+$text-footer-mult: 0.43;
+$text-h2-mult: 0.80;
+$text-h3-mult: 0.70;
+$text-h4-mult: 0.65;
+$text-sm-mult: 1.10;
+$text-md-mult: 1.20;
+$text-lg-mult: 1.27;
+$text-xl-mult: 1.35;
 
 /* Text styles */
 
 body {
   font-family: 'Montserrat', sans-serif;
   font-weight: 400;
-  font-size: 0.8rem;
-  line-height: 1.4;
+  font-size: $h1-base * $text-plain-mult;
   h1 {
-    font-size: 1.7rem;
+    font-size: $h1-base;
   }
-  
   h2 {
-    font-size: 1.4rem;
+    font-size: $h1-base * $text-h2-mult;
   }
-  
   h3 {
-    font-size: 1.25rem;
+    font-size: $h1-base * $text-h3-mult;
+  }
+  h4 {
+    font-size: $h1-base * $text-h4-mult;
   }
 }
-
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-  color: $oh-gray-verydark;
-  font-weight: 300;
+footer {
+  font-size: $h1-base * $text-footer-mult;
+}
+@media (min-width: 576px) {
+  body {
+    font-size: $h1-base * $text-plain-mult * $text-sm-mult;
+    h1 {
+      font-size: $h1-base * 1.1;
+    }
+    h2 {
+      font-size: $h1-base * $text-h2-mult * $text-sm-mult;
+    }
+    h3 {
+      font-size: $h1-base * $text-h3-mult * $text-sm-mult;
+    }
+    h4 {
+      font-size: $h1-base * $text-h4-mult * $text-sm-mult;
+    }
+  }
+  footer {
+    font-size: $h1-base * $text-footer-mult * $text-sm-mult;
+  }
 }
-
 @media (min-width: 768px) {
   body {
-    font-size: 0.85rem;
+    font-size: $h1-base * $text-plain-mult * $text-md-mult;
+    h1 {
+      font-size: $h1-base * $text-md-mult;
+    }
+    h2 {
+      font-size: $h1-base * $text-h2-mult * $text-md-mult;
+    }
+    h3 {
+      font-size: $h1-base * $text-h3-mult * $text-md-mult;
+    }
+    h4 {
+      font-size: $h1-base * $text-h4-mult * $text-md-mult;
+    }
+  }
+  footer {
+    font-size: $h1-base * $text-footer-mult * $text-md-mult;
+  }
+}
+@media (min-width: 992px) {
+  body {
+    font-size: $h1-base * $text-plain-mult * $text-lg-mult;
+    h1 {
+      font-size: $h1-base * $text-lg-mult;
+    }
+    h2 {
+      font-size: $h1-base * $text-h2-mult * $text-lg-mult;
+    }
+    h3 {
+      font-size: $h1-base * $text-h3-mult * $text-lg-mult;
+    }
+    h4 {
+      font-size: $h1-base * $text-h4-mult * $text-lg-mult;
+    }
+  }
+  footer {
+    font-size: $h1-base * $text-footer-mult * $text-lg-mult;
+  }
+}
+@media (min-width: 1200px) {
+  body {
+    font-size: $h1-base * $text-plain-mult * $text-xl-mult;
+    h1 {
+      font-size: $h1-base * $text-xl-mult;
+    }
+    h2 {
+      font-size: $h1-base * $text-h2-mult * $text-xl-mult;
+    }
+    h3 {
+      font-size: $h1-base * $text-h3-mult * $text-xl-mult;
+    }
+    h4 {
+      font-size: $h1-base * $text-h4-mult * $text-xl-mult;
+    }
+  }
+  footer {
+    font-size: $h1-base * $text-footer-mult * $text-xl-mult;
   }
 }
 
-
-footer {
-  font-size: 0.8rem;
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  color: $oh-gray-verydark;
+  font-weight: 300;
 }
 
 code {
-  background-color: inherit;
+  background-color: $oh-orange-verylight;
   color: $oh-orange-dark;
 }
 
@@ -68,7 +150,7 @@ a {
 /* Navbar styles */
 
 body.oh-proj-template > main > div.container {
-  padding-top: 4.5rem;
+  padding-top: 3.6rem;
 }
 
 .navbar-toggler-icon.custom-toggler {
@@ -83,6 +165,7 @@ body.oh-proj-template > main > div.container {
   background-color: #fff;
   border-radius: 0px;
   border: 0px;
+  border-bottom: 1px solid $oh-teal-light;
   font-size: 0.9rem;
 
   a.navbar-brand > img {
@@ -95,6 +178,10 @@ body.oh-proj-template > main > div.container {
       background-color: $oh-teal-verylight;
     }
   }
+
+  .nav-link:hover {
+    text-decoration: underline;
+  }
 }
 
 /* Button styles */
@@ -191,4 +278,4 @@ body.oh-proj-template > main > div.container {
       color: white;
     }
   }
-}
\ No newline at end of file
+}

From 747ceea71a11b4caaa1761cc118996c8b65e2f86 Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Thu, 21 Feb 2019 15:46:18 -0800
Subject: [PATCH 03/10] Add requesting projs & notebooks to activity page
 content

---
 open_humans/templates/member/activity.html    | 124 +++++++++++++++++-
 .../partials/activity-info-table-bs4.html     |  13 ++
 open_humans/views.py                          |  14 ++
 3 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 open_humans/templates/partials/activity-info-table-bs4.html

diff --git a/open_humans/templates/member/activity.html b/open_humans/templates/member/activity.html
index 1d7e94df7..4efd694df 100644
--- a/open_humans/templates/member/activity.html
+++ b/open_humans/templates/member/activity.html
@@ -29,9 +29,123 @@ <h1 class="justify-content-center">{{ project.name }}</h1>
 </div>
 <h2>About {{ project.name }}</h2>
 <p>{{ project.long_description|markdown }}</p>
-{% if project.onsitedatarequestproject %}
-<a class="btn btn-primary btn-sm" href="{% url 'direct-sharing:join-on-site' project.slug %}">Join project</a>
-{% elif project.oauth2datarequestproject %}
-<a class="btn btn-primary btn-sm" href="{{ project.oauth2datarequestproject.enrollment_url }}">Join project</a>
-{% endif %}
+
+<hr>
+
+<div class="row">
+  <div class="col-md">
+    <h2>Project membership</h2>
+    <p>You have not joined <b>{{ project.name }}</b> yet.</p>
+    <div class="d-flex mb-3">
+      <div class="pr-3">
+        <a class="btn btn-primary btn-md" href="{{ project.join_url }}">Join&nbsp;project</a>
+      </div>
+      <div class="text-muted">
+        You'll review terms and permissions before finalizing authorization.
+      </div>
+    </div>
+    {% if project.request_username_access or project.requested_sources.exists %}
+    <h3>Permissions</h3>
+    <div class="row">
+      <div class="col">
+        <b>Requested permissions:</b>
+      </div>
+      <div class="col">
+        {% for source_project in project.requested_sources.all %}
+        <a href="{% url 'activity-management' source_project.slug %}">
+          {{ source_project.name }}</a><br>
+        {% endfor %}
+        {% if project.request_username_access %}
+          Username
+        {% endif %}
+      </div>
+    </div>
+    {% endif %}
+  </div>
+  <div class="col-md">
+    {% if requesting_projects %}
+      <h2>Projects &amp; studies</h2>
+      <p class="mb-1">
+        You can use &amp; share your data from {{ project.name }} with the
+        following other projects:
+      </p>
+      <div class="d-flex flex-wrap p-2 mb-2">
+        {% for req_project in requesting_projects %}
+        <div class="w-25">
+          <div class="d-flex justify-content-center">
+            <div>
+              <img src="{% static 'images/default-badge.png' %}" style="height:3rem;">
+            </div>
+          </div>
+          <div class="d-flex justify-content-center">
+            <div class="small text-center" style="line-height:1.2;">{{ req_project.name }}</div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+    {% endif %}
+    {% if notebooks %}
+      <h2>Notebooks</h2>
+      <p>You can explore your data from Project Name with the
+        following <a href="{% url 'activity' 'junos-personal-data-exploratory' %}">personal
+        data notebooks</a>.
+      </p>
+      <ul>
+      {% for notebook in notebooks %}
+        <li><a href="{{ notebook.details_url }}">{{ notebook.name }}</a></li>
+      {% endfor %}
+      </ul>
+    {% endif %}
+    <h2>Project Members</h2>
+    <div class="d-flex">
+      <div class="w-25">
+        <div class="d-flex justify-content-center">
+          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
+        </div>
+        <div class="d-flex justify-content-center">
+          <div class="small text-center" style="line-height:1.2;">Person Name</div>
+        </div>
+      </div>
+
+      <div class="w-25">
+        <div class="d-flex justify-content-center">
+          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
+        </div>
+        <div class="d-flex justify-content-center">
+          <div class="small text-center" style="line-height:1.2;">Person Name</div>
+        </div>
+      </div>
+
+      <div class="w-25">
+        <div class="d-flex justify-content-center">
+          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
+        </div>
+        <div class="d-flex justify-content-center">
+          <div class="small text-center" style="line-height:1.2;">Person Name</div>
+        </div>
+      </div>
+
+      <div class="w-25">
+        <div class="d-flex justify-content-center">
+          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
+        </div>
+        <div class="d-flex justify-content-center">
+          <div class="small text-center" style="line-height:1.2;">Person Name</div>
+        </div>
+      </div>
+    </div>
+    <p><a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">See all members...</a></p>
+    <h2>Project information</h2>
+    <div>
+      <b>Managed by:</b>
+      <div class="d-inline-block">
+        {{ project.leader }}
+      </div><br>
+      <b>Contact email:</b> {{ project.contact_email }}<br>
+      <b>Joined by:</b>
+        <a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">
+        {{ project.authorized_members }} members</a>
+    </div>
+  </div>
+</div>
 {% endblock main %}
diff --git a/open_humans/templates/partials/activity-info-table-bs4.html b/open_humans/templates/partials/activity-info-table-bs4.html
new file mode 100644
index 000000000..61fc7ec1e
--- /dev/null
+++ b/open_humans/templates/partials/activity-info-table-bs4.html
@@ -0,0 +1,13 @@
+<table>
+    <tr>
+        <th scope="row" class="text-right p-2 d-inline-flex">
+            <div class="align-self-start">Managed&nbsp;by:</div>
+        </th>
+        <td class="p-2">
+            {{ project.leader }}
+            {% if project.organization %}
+            <br><span class="text-muted">{{ project.organization }}</span>
+            {% endif %}
+        </td>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/open_humans/views.py b/open_humans/views.py
index 2a709721c..b5d30a6e8 100644
--- a/open_humans/views.py
+++ b/open_humans/views.py
@@ -12,6 +12,7 @@
 from django.views.generic.edit import DeleteView, FormView
 
 import feedparser
+import requests
 
 from common.activities import activity_from_data_request_project
 from common.mixins import LargePanelMixin, NeverCacheMixin, PrivateMixin
@@ -313,6 +314,19 @@ class ActivityView(NeverCacheMixin, DetailView):
     context_object_name = "project"
     template_name = "member/activity.html"
 
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context["requesting_projects"] = self.object.requesting_projects.filter(
+            active=True
+        ).filter(approved=True)
+        resp = requests.get(
+            "https://exploratory.openhumans.org/notebook_by_source/",
+            params={"source": self.object.name},
+        )
+        if resp.status_code == 200:
+            context["notebooks"] = resp.json()["notebooks"]
+        return context
+
 
 class ActivityManagementView(NeverCacheMixin, LargePanelMixin, TemplateView):
     """

From 45bf69a825b327f339cbcab5b4a7bdc16efd1ac8 Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Fri, 22 Feb 2019 12:33:17 -0800
Subject: [PATCH 04/10] Further additions to activity page (not authed)

---
 open_humans/templates/member/activity.html    | 72 ++++++++++++-------
 .../partials/activity-info-short-bs4.html     |  9 +++
 .../partials/activity-info-table-bs4.html     | 13 ----
 .../partials/activity-permissions-bs4.html    | 15 ++++
 open_humans/views.py                          | 28 ++++++--
 5 files changed, 92 insertions(+), 45 deletions(-)
 create mode 100644 open_humans/templates/partials/activity-info-short-bs4.html
 delete mode 100644 open_humans/templates/partials/activity-info-table-bs4.html
 create mode 100644 open_humans/templates/partials/activity-permissions-bs4.html

diff --git a/open_humans/templates/member/activity.html b/open_humans/templates/member/activity.html
index 4efd694df..ea8ad67a0 100644
--- a/open_humans/templates/member/activity.html
+++ b/open_humans/templates/member/activity.html
@@ -11,7 +11,7 @@
     <div class="flex-grow-1 mb-3">
         <div class="d-none d-sm-inline-block">
             <h1>{{ project.name }}</h1>
-            {% include 'partials/activity-info-table-bs4.html' %}
+            {% include 'partials/activity-info-short-bs4.html' %}
         </div>
         <div class="d-flex justify-content-center d-sm-none">
             <img class="w-25 m-2" src="{% static 'images/default-badge.png' %}">
@@ -20,7 +20,7 @@ <h1>{{ project.name }}</h1>
             <h1 class="justify-content-center">{{ project.name }}</h1>
         </div>
         <div class="d-flex justify-content-center d-sm-none">
-            {% include 'partials/activity-info-table-bs4.html' %}
+            {% include 'partials/activity-info-short-bs4.html' %}
         </div>
     </div>
     <div class="d-none d-sm-inline-block w-25">
@@ -44,23 +44,11 @@ <h2>Project membership</h2>
         You'll review terms and permissions before finalizing authorization.
       </div>
     </div>
-    {% if project.request_username_access or project.requested_sources.exists %}
+    {% if requests_permissions %}
     <h3>Permissions</h3>
-    <div class="row">
-      <div class="col">
-        <b>Requested permissions:</b>
-      </div>
-      <div class="col">
-        {% for source_project in project.requested_sources.all %}
-        <a href="{% url 'activity-management' source_project.slug %}">
-          {{ source_project.name }}</a><br>
-        {% endfor %}
-        {% if project.request_username_access %}
-          Username
-        {% endif %}
-      </div>
-    </div>
+    {% include 'partials/activity-permissions-bs4.html' %}
     {% endif %}
+    <hr class="d-md-none">
   </div>
   <div class="col-md">
     {% if requesting_projects %}
@@ -69,7 +57,7 @@ <h2>Projects &amp; studies</h2>
         You can use &amp; share your data from {{ project.name }} with the
         following other projects:
       </p>
-      <div class="d-flex flex-wrap p-2 mb-2">
+      <div class="d-flex flex-wrap p-2">
         {% for req_project in requesting_projects %}
         <div class="w-25">
           <div class="d-flex justify-content-center">
@@ -83,6 +71,7 @@ <h2>Projects &amp; studies</h2>
         </div>
         {% endfor %}
       </div>
+      <hr>
     {% endif %}
     {% if notebooks %}
       <h2>Notebooks</h2>
@@ -95,9 +84,10 @@ <h2>Notebooks</h2>
         <li><a href="{{ notebook.details_url }}">{{ notebook.name }}</a></li>
       {% endfor %}
       </ul>
+      <hr>
     {% endif %}
     <h2>Project Members</h2>
-    <div class="d-flex">
+    <div class="d-flex py-2">
       <div class="w-25">
         <div class="d-flex justify-content-center">
           <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
@@ -134,17 +124,47 @@ <h2>Project Members</h2>
         </div>
       </div>
     </div>
-    <p><a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">See all members...</a></p>
+    <p>
+      <a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">See
+        all members...</a>
+    </p>
+    <hr>
     <h2>Project information</h2>
     <div>
-      <b>Managed by:</b>
-      <div class="d-inline-block">
-        {{ project.leader }}
-      </div><br>
-      <b>Contact email:</b> {{ project.contact_email }}<br>
-      <b>Joined by:</b>
+      {% include 'partials/activity-info-short-bs4.html' %}
+      <div class="mb-1">
+        <b class="mr-2">Joined by:</b>
         <a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">
         {{ project.authorized_members }} members</a>
+      </div>
+      <div class="mb-1">
+        <b class="mr-2">Launched:</b> {{ project.project_approval_date|date }}
+      </div>
+      <div class="mb-1">
+        <b class="mr-2">Project website:</b>
+        <a href="{{ project.info_url }}">{{ project.info_url }}</a>
+      </div>
+      <div class="mb-1">
+          <b class="mr-2">Contact email:</b>
+          <a href="mailto:{{ project.contact_email }}">{{ project.contact_email }}</a>
+      </div>
+      <div class="mb-1">
+        <b class="mr-2">Project terms:</b>
+        <a href="{% if project.terms_url %}{{ project.terms_url }}{% else %}{{ project.info_url }}{% endif %}">Read here</a>
+      </div>
+      {% if requests_permissions %}
+      {% include 'partials/activity-permissions-bs4.html' %}
+      {% endif %}
+      {% if project.returned_data_description %}
+      <div class="d-flex mb-1">
+          <div class="pr-3">
+              <b>Uploaded&nbsp;data:</b>
+          </div>
+          <div class="text-muted">
+            {{ project.returned_data_description }}
+          </div>
+      </div>
+      {% endif %}
     </div>
   </div>
 </div>
diff --git a/open_humans/templates/partials/activity-info-short-bs4.html b/open_humans/templates/partials/activity-info-short-bs4.html
new file mode 100644
index 000000000..a11f972c9
--- /dev/null
+++ b/open_humans/templates/partials/activity-info-short-bs4.html
@@ -0,0 +1,9 @@
+<div class="d-flex mb-1">
+  <div class="pr-3"><b>Managed by:</b></div>
+  <div>
+    {{ project.leader }}
+    {% if project.organization %}
+    <br><span class="text-muted">{{ project.organization}}</span>
+    {% endif %}
+  </div>
+</div>
\ No newline at end of file
diff --git a/open_humans/templates/partials/activity-info-table-bs4.html b/open_humans/templates/partials/activity-info-table-bs4.html
deleted file mode 100644
index 61fc7ec1e..000000000
--- a/open_humans/templates/partials/activity-info-table-bs4.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<table>
-    <tr>
-        <th scope="row" class="text-right p-2 d-inline-flex">
-            <div class="align-self-start">Managed&nbsp;by:</div>
-        </th>
-        <td class="p-2">
-            {{ project.leader }}
-            {% if project.organization %}
-            <br><span class="text-muted">{{ project.organization }}</span>
-            {% endif %}
-        </td>
-    </tr>
-</table>
\ No newline at end of file
diff --git a/open_humans/templates/partials/activity-permissions-bs4.html b/open_humans/templates/partials/activity-permissions-bs4.html
new file mode 100644
index 000000000..e90190f05
--- /dev/null
+++ b/open_humans/templates/partials/activity-permissions-bs4.html
@@ -0,0 +1,15 @@
+<div class="d-flex mb-1">
+    <div class="pr-3">
+        <b>Requested permissions:</b>
+    </div>
+    <div>
+        {% for source_project in project.requested_sources.all %}
+        <a href="{% url 'activity-management' source_project.slug %}">
+        {{ source_project.name }}</a><br>
+        {% endfor %}
+        {% if project.request_username_access %}
+        Username
+        {% endif %}
+    </div>
+</div>
+  
\ No newline at end of file
diff --git a/open_humans/views.py b/open_humans/views.py
index b5d30a6e8..315f6a2c6 100644
--- a/open_humans/views.py
+++ b/open_humans/views.py
@@ -314,17 +314,33 @@ class ActivityView(NeverCacheMixin, DetailView):
     context_object_name = "project"
     template_name = "member/activity.html"
 
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context["requesting_projects"] = self.object.requesting_projects.filter(
-            active=True
-        ).filter(approved=True)
+    def get_notebooks(self):
         resp = requests.get(
             "https://exploratory.openhumans.org/notebook_by_source/",
             params={"source": self.object.name},
         )
         if resp.status_code == 200:
-            context["notebooks"] = resp.json()["notebooks"]
+            return resp.json()["notebooks"]
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+
+        requesting_projects_filtered = self.object.requesting_projects.filter(
+            active=True
+        ).filter(approved=True)
+        requests_permissions = (
+            self.object.request_username_access
+            or self.object.requested_sources.exists()
+        )
+
+        context.update(
+            {
+                "notebooks": self.get_notebooks(),
+                "requesting_projects": requesting_projects_filtered,
+                "requests_permissions": requests_permissions,
+            }
+        )
+
         return context
 
 

From 8a7e6cf6272cb2ba1ddd4396bf8a92391e0e9408 Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Fri, 22 Feb 2019 13:22:18 -0800
Subject: [PATCH 05/10] Remove unused Roboto import

---
 open_humans/templates/account/login-social-bs4.html | 2 --
 open_humans/templates/account/login-social.html     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/open_humans/templates/account/login-social-bs4.html b/open_humans/templates/account/login-social-bs4.html
index a70ed47a4..cbaea9e87 100644
--- a/open_humans/templates/account/login-social-bs4.html
+++ b/open_humans/templates/account/login-social-bs4.html
@@ -2,8 +2,6 @@
 {% load static %}
 {% load utilities %}
 
-<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
-
 <!-- Facebook button style based on the appearance here:
 https://developers.facebook.com/docs/facebook-login/web/login-button
 
diff --git a/open_humans/templates/account/login-social.html b/open_humans/templates/account/login-social.html
index 78ebb8595..988723733 100644
--- a/open_humans/templates/account/login-social.html
+++ b/open_humans/templates/account/login-social.html
@@ -2,8 +2,6 @@
 {% load static %}
 {% load utilities %}
 
-<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
-
 <!-- Facebook button style based on the appearance here:
 https://developers.facebook.com/docs/facebook-login/web/login-button
 

From 1ba5b2320178652b68b7845ca23c65be16433e81 Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Fri, 22 Feb 2019 13:53:25 -0800
Subject: [PATCH 06/10] Fix bs4 navbar for logged in

---
 open_humans/templates/base-bs4.html | 33 ++++++++++++++---------------
 static/css/oh-proj-theming.css      |  9 ++++++++
 static/scss/oh-proj-theming.scss    | 11 ++++++++++
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/open_humans/templates/base-bs4.html b/open_humans/templates/base-bs4.html
index 261640553..d0b7caaf3 100644
--- a/open_humans/templates/base-bs4.html
+++ b/open_humans/templates/base-bs4.html
@@ -61,24 +61,23 @@
                 <a class="nav-link" href="{% url 'create' %}">Create</a>
               </li>
               {% if user.is_authenticated %}
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle"
-                    data-toggle="dropdown" role="button"
-                    aria-haspopup="true" aria-expanded="false">My account
-                    <span class="caret"></span></a>
-                <ul class="dropdown-menu">
-                  <li><a href="{% url 'my-member-dashboard' %}">Public profile</a></li>
-                  <li><a href="{% url 'my-member-joined' %}">Projects joined</a></li>
-                  <li><a href="{% url 'my-member-data' %}">My data</a></li>
-                  <li><a href="{% url 'my-member-settings' %}">Account settings</a></li>
-                  {% if user.member.datarequestproject_set.all %}
-                  <li class="divider"></li>
-                  <li><a href="{% url 'direct-sharing:manage-projects' %}">Manage projects</a></li>
+              <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  My account
+                </a>
+                <div class="dropdown-menu dropdown-menu-right text-right" aria-labelledby="navbarDropdown">
+                  <a class="dropdown-item" href="{% url 'my-member-dashboard' %}">Public profile</a>
+                  <a class="dropdown-item" href="{% url 'my-member-joined' %}">Projects joined</a>
+                  <a class="dropdown-item" href="{% url 'my-member-data' %}">My data</a>
+                  <a class="dropdown-item" href="{% url 'my-member-settings' %}">Account settings</a>
+                  {% if user.member.datarequestproject_set.exists %}
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item" href="{% url 'direct-sharing:manage-projects' %}">Manage projects</a>
                   {% endif %}
-                  <li class="divider"></li>
-                  <li><a class="logout-link" href="{% url 'account_logout' %}">
-                    Log out</a></li>
-                </ul>
+                  <div class="dropdown-divider"></div>
+                  <a class="dropdown-item logout-link" href="{% url 'account_logout' %}">
+                      Log out</a>      
+                </div>
               </li>
               {% else %}
               <li class="nav-item {% active 'login' %} mr-md-4 mt-2 mt-md-1">
diff --git a/static/css/oh-proj-theming.css b/static/css/oh-proj-theming.css
index 75002fce5..71669d3be 100644
--- a/static/css/oh-proj-theming.css
+++ b/static/css/oh-proj-theming.css
@@ -156,6 +156,15 @@ body.oh-proj-template > main > div.container {
 .navbar.navbar-open-humans .nav-link:hover {
   text-decoration: underline;
 }
+.navbar.navbar-open-humans a.dropdown-item {
+  font-size: 0.9rem;
+  color: #009fa8;
+}
+.navbar.navbar-open-humans a.dropdown-item:hover, .navbar.navbar-open-humans a.dropdown-item:focus, .navbar.navbar-open-humans a.dropdown-item:active {
+  color: #008c94;
+  text-decoration: underline;
+  background-color: #e6f9fa;
+}
 
 /* Button styles */
 .btn-default {
diff --git a/static/scss/oh-proj-theming.scss b/static/scss/oh-proj-theming.scss
index 53176b2d2..ef9228d3a 100644
--- a/static/scss/oh-proj-theming.scss
+++ b/static/scss/oh-proj-theming.scss
@@ -182,6 +182,17 @@ body.oh-proj-template > main > div.container {
   .nav-link:hover {
     text-decoration: underline;
   }
+
+  a.dropdown-item {
+    font-size: 0.9rem;
+    color: $oh-teal-dark;
+
+    &:hover, &:focus, &:active {
+      color: $oh-teal-verydark;
+      text-decoration: underline;
+      background-color: $oh-teal-verylight;
+    }
+  }
 }
 
 /* Button styles */

From 6c7828d80b92d7029f49b2dfe3f561a76108c608 Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Fri, 22 Feb 2019 15:43:56 -0800
Subject: [PATCH 07/10] Tweak messages layout and SCSS variables

---
 open_humans/templates/base-bs4.html                | 13 ++++++++-----
 .../partials/activity-permissions-bs4.html         |  3 +--
 static/css/oh-proj-theming.css                     | 10 +++++-----
 static/js/main-bs4.js                              |  1 +
 static/scss/oh-proj-theming.scss                   | 14 +++++++-------
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/open_humans/templates/base-bs4.html b/open_humans/templates/base-bs4.html
index d0b7caaf3..cdcc52075 100644
--- a/open_humans/templates/base-bs4.html
+++ b/open_humans/templates/base-bs4.html
@@ -76,7 +76,7 @@
                   {% endif %}
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item logout-link" href="{% url 'account_logout' %}">
-                      Log out</a>      
+                      Log out</a>
                 </div>
               </li>
               {% else %}
@@ -114,12 +114,15 @@
         {% endif %}
         {% block messages_block %}
           {% if messages %}
+            <div class="mt-2">
             {% for message in messages %}
-            <div class="alert {% if message.tags %}
-                alert-{% ifequal message.tags 'error' %}danger{% else %}{{ message.tags }}{% endifequal %}
-                {% endif %}">
-              {{ message }}</div>
+              <div class="alert {% if message.tags %}
+                  alert-{% ifequal message.tags 'error' %}danger{% else %}{{ message.tags }}{% endifequal %}
+                  {% endif %}">
+                {{ message }}
+              </div>
             {% endfor %}
+            </div>
           {% endif %}
         {% endblock messages_block %}
 
diff --git a/open_humans/templates/partials/activity-permissions-bs4.html b/open_humans/templates/partials/activity-permissions-bs4.html
index e90190f05..c2390ed3e 100644
--- a/open_humans/templates/partials/activity-permissions-bs4.html
+++ b/open_humans/templates/partials/activity-permissions-bs4.html
@@ -11,5 +11,4 @@
         Username
         {% endif %}
     </div>
-</div>
-  
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/static/css/oh-proj-theming.css b/static/css/oh-proj-theming.css
index 71669d3be..0aae7cc4f 100644
--- a/static/css/oh-proj-theming.css
+++ b/static/css/oh-proj-theming.css
@@ -140,7 +140,7 @@ body.oh-proj-template > main > div.container {
 }
 
 .navbar.navbar-open-humans {
-  background-color: #fff;
+  background-color: white;
   border-radius: 0px;
   border: 0px;
   border-bottom: 1px solid #c9ecef;
@@ -168,7 +168,7 @@ body.oh-proj-template > main > div.container {
 
 /* Button styles */
 .btn-default {
-  background-color: #fff;
+  background-color: white;
   border: 2px solid #009fa8;
   color: #009fa8;
 }
@@ -179,7 +179,7 @@ body.oh-proj-template > main > div.container {
 }
 
 .btn-primary-hollow {
-  background-color: #fff;
+  background-color: white;
   border: 2px solid #ff9161;
   color: #009fa8;
 }
@@ -192,12 +192,12 @@ body.oh-proj-template > main > div.container {
 .btn-primary {
   background-color: #ff9161;
   border: 2px solid #ff9161;
-  color: #fff;
+  color: white;
 }
 .btn-primary:hover, .btn-primary:focus {
   background-color: #f7763e;
   border-color: #f7763e;
-  color: #fff;
+  color: white;
 }
 
 .btn-info {
diff --git a/static/js/main-bs4.js b/static/js/main-bs4.js
index 7cec52073..684e01754 100644
--- a/static/js/main-bs4.js
+++ b/static/js/main-bs4.js
@@ -77,6 +77,7 @@ $(function () {
   parsleyForm('form');
 
   $('.logout-link').click(function (e) {
+    console.log("Clicked logout link");
     e.preventDefault();
 
     $.post($(this).attr('href'), function () {
diff --git a/static/scss/oh-proj-theming.scss b/static/scss/oh-proj-theming.scss
index ef9228d3a..2a6c97501 100644
--- a/static/scss/oh-proj-theming.scss
+++ b/static/scss/oh-proj-theming.scss
@@ -162,7 +162,7 @@ body.oh-proj-template > main > div.container {
 }
 
 .navbar.navbar-open-humans {
-  background-color: #fff;
+  background-color: white;
   border-radius: 0px;
   border: 0px;
   border-bottom: 1px solid $oh-teal-light;
@@ -198,7 +198,7 @@ body.oh-proj-template > main > div.container {
 /* Button styles */
 
 .btn-default {
-  background-color: #fff;
+  background-color: white;
   border: 2px solid $oh-teal-dark;
   color: $oh-teal-dark;
 
@@ -210,7 +210,7 @@ body.oh-proj-template > main > div.container {
 }
 
 .btn-primary-hollow {
-  background-color: #fff;
+  background-color: white;
   border: 2px solid $oh-orange;
   color: $oh-teal-dark;
 
@@ -224,12 +224,12 @@ body.oh-proj-template > main > div.container {
 .btn-primary {
   background-color: $oh-orange;
   border: 2px solid $oh-orange;
-  color: #fff;
+  color: white;
 
   &:hover, &:focus {
-    background-color: #f7763e;
-    border-color: #f7763e;
-    color: #fff;
+    background-color: $oh-orange-dark;
+    border-color: $oh-orange-dark;
+    color: white;
   }
 }
 

From 450863a092055a9dce0896df0979a196624e3ded Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Fri, 22 Feb 2019 16:59:22 -0800
Subject: [PATCH 08/10] Tweak text sizes

---
 static/css/oh-proj-theming.css   | 60 ++++++++++++------------
 static/scss/oh-proj-theming.scss | 80 ++++++++++++++++----------------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/static/css/oh-proj-theming.css b/static/css/oh-proj-theming.css
index 0aae7cc4f..028317ea0 100644
--- a/static/css/oh-proj-theming.css
+++ b/static/css/oh-proj-theming.css
@@ -5,107 +5,107 @@
 body {
   font-family: "Montserrat", sans-serif;
   font-weight: 400;
-  font-size: 0.816rem;
+  font-size: 0.82rem;
 }
 body h1 {
-  font-size: 1.7rem;
+  font-size: 1.64rem;
 }
 body h2 {
-  font-size: 1.36rem;
+  font-size: 1.312rem;
 }
 body h3 {
-  font-size: 1.19rem;
+  font-size: 1.107rem;
 }
 body h4 {
-  font-size: 1.105rem;
+  font-size: 0.943rem;
 }
 
 footer {
-  font-size: 0.731rem;
+  font-size: 0.738rem;
 }
 
 @media (min-width: 576px) {
   body {
-    font-size: 0.8976rem;
+    font-size: 0.861rem;
   }
   body h1 {
-    font-size: 1.87rem;
+    font-size: 1.722rem;
   }
   body h2 {
-    font-size: 1.496rem;
+    font-size: 1.3776rem;
   }
   body h3 {
-    font-size: 1.309rem;
+    font-size: 1.16235rem;
   }
   body h4 {
-    font-size: 1.2155rem;
+    font-size: 0.99015rem;
   }
 
   footer {
-    font-size: 0.8041rem;
+    font-size: 0.7749rem;
   }
 }
 @media (min-width: 768px) {
   body {
-    font-size: 0.9792rem;
+    font-size: 0.902rem;
   }
   body h1 {
-    font-size: 2.04rem;
+    font-size: 1.804rem;
   }
   body h2 {
-    font-size: 1.632rem;
+    font-size: 1.4432rem;
   }
   body h3 {
-    font-size: 1.428rem;
+    font-size: 1.2177rem;
   }
   body h4 {
-    font-size: 1.326rem;
+    font-size: 1.0373rem;
   }
 
   footer {
-    font-size: 0.8772rem;
+    font-size: 0.8118rem;
   }
 }
 @media (min-width: 992px) {
   body {
-    font-size: 1.03632rem;
+    font-size: 0.943rem;
   }
   body h1 {
-    font-size: 2.159rem;
+    font-size: 1.886rem;
   }
   body h2 {
-    font-size: 1.7272rem;
+    font-size: 1.5088rem;
   }
   body h3 {
-    font-size: 1.5113rem;
+    font-size: 1.27305rem;
   }
   body h4 {
-    font-size: 1.40335rem;
+    font-size: 1.08445rem;
   }
 
   footer {
-    font-size: 0.92837rem;
+    font-size: 0.8487rem;
   }
 }
 @media (min-width: 1200px) {
   body {
-    font-size: 1.1016rem;
+    font-size: 0.984rem;
   }
   body h1 {
-    font-size: 2.295rem;
+    font-size: 1.968rem;
   }
   body h2 {
-    font-size: 1.836rem;
+    font-size: 1.5744rem;
   }
   body h3 {
-    font-size: 1.6065rem;
+    font-size: 1.3284rem;
   }
   body h4 {
-    font-size: 1.49175rem;
+    font-size: 1.1316rem;
   }
 
   footer {
-    font-size: 0.98685rem;
+    font-size: 0.8856rem;
   }
 }
 h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
diff --git a/static/scss/oh-proj-theming.scss b/static/scss/oh-proj-theming.scss
index 2a6c97501..bb699f404 100644
--- a/static/scss/oh-proj-theming.scss
+++ b/static/scss/oh-proj-theming.scss
@@ -14,117 +14,117 @@ $oh-orange-dark: #f7763e;
 
 $oh-gray-verydark: #4d4d4d;
 
-$h1-base: 1.70rem;
-$text-plain-mult: 0.48;
-$text-footer-mult: 0.43;
-$text-h2-mult: 0.80;
-$text-h3-mult: 0.70;
-$text-h4-mult: 0.65;
-$text-sm-mult: 1.10;
-$text-md-mult: 1.20;
-$text-lg-mult: 1.27;
-$text-xl-mult: 1.35;
+$xs-text-base: 0.82rem;
+$text-footer-mult: 0.9;
+$text-h1-mult: 2.0;
+$text-h2-mult: 1.6;
+$text-h3-mult: 1.35;
+$text-h4-mult: 1.15;
+$text-sm-mult: 1.05;
+$text-md-mult: 1.1;
+$text-lg-mult: 1.15;
+$text-xl-mult: 1.2;
 
 /* Text styles */
 
 body {
   font-family: 'Montserrat', sans-serif;
   font-weight: 400;
-  font-size: $h1-base * $text-plain-mult;
+  font-size: $xs-text-base;
   h1 {
-    font-size: $h1-base;
+    font-size: $xs-text-base * $text-h1-mult;
   }
   h2 {
-    font-size: $h1-base * $text-h2-mult;
+    font-size: $xs-text-base * $text-h2-mult;
   }
   h3 {
-    font-size: $h1-base * $text-h3-mult;
+    font-size: $xs-text-base * $text-h3-mult;
   }
   h4 {
-    font-size: $h1-base * $text-h4-mult;
+    font-size: $xs-text-base * $text-h4-mult;
   }
 }
 footer {
-  font-size: $h1-base * $text-footer-mult;
+  font-size: $xs-text-base * $text-footer-mult;
 }
 @media (min-width: 576px) {
   body {
-    font-size: $h1-base * $text-plain-mult * $text-sm-mult;
+    font-size: $xs-text-base * $text-sm-mult;
     h1 {
-      font-size: $h1-base * 1.1;
+      font-size: $xs-text-base * $text-h1-mult * $text-sm-mult;
     }
     h2 {
-      font-size: $h1-base * $text-h2-mult * $text-sm-mult;
+      font-size: $xs-text-base * $text-h2-mult * $text-sm-mult;
     }
     h3 {
-      font-size: $h1-base * $text-h3-mult * $text-sm-mult;
+      font-size: $xs-text-base * $text-h3-mult * $text-sm-mult;
     }
     h4 {
-      font-size: $h1-base * $text-h4-mult * $text-sm-mult;
+      font-size: $xs-text-base * $text-h4-mult * $text-sm-mult;
     }
   }
   footer {
-    font-size: $h1-base * $text-footer-mult * $text-sm-mult;
+    font-size: $xs-text-base * $text-footer-mult * $text-sm-mult;
   }
 }
 @media (min-width: 768px) {
   body {
-    font-size: $h1-base * $text-plain-mult * $text-md-mult;
+    font-size: $xs-text-base * $text-md-mult;
     h1 {
-      font-size: $h1-base * $text-md-mult;
+      font-size: $xs-text-base * $text-h1-mult  * $text-md-mult;
     }
     h2 {
-      font-size: $h1-base * $text-h2-mult * $text-md-mult;
+      font-size: $xs-text-base * $text-h2-mult * $text-md-mult;
     }
     h3 {
-      font-size: $h1-base * $text-h3-mult * $text-md-mult;
+      font-size: $xs-text-base * $text-h3-mult * $text-md-mult;
     }
     h4 {
-      font-size: $h1-base * $text-h4-mult * $text-md-mult;
+      font-size: $xs-text-base * $text-h4-mult * $text-md-mult;
     }
   }
   footer {
-    font-size: $h1-base * $text-footer-mult * $text-md-mult;
+    font-size: $xs-text-base * $text-footer-mult * $text-md-mult;
   }
 }
 @media (min-width: 992px) {
   body {
-    font-size: $h1-base * $text-plain-mult * $text-lg-mult;
+    font-size: $xs-text-base * $text-lg-mult;
     h1 {
-      font-size: $h1-base * $text-lg-mult;
+      font-size: $xs-text-base * $text-h1-mult  * $text-lg-mult;
     }
     h2 {
-      font-size: $h1-base * $text-h2-mult * $text-lg-mult;
+      font-size: $xs-text-base * $text-h2-mult * $text-lg-mult;
     }
     h3 {
-      font-size: $h1-base * $text-h3-mult * $text-lg-mult;
+      font-size: $xs-text-base * $text-h3-mult * $text-lg-mult;
     }
     h4 {
-      font-size: $h1-base * $text-h4-mult * $text-lg-mult;
+      font-size: $xs-text-base * $text-h4-mult * $text-lg-mult;
     }
   }
   footer {
-    font-size: $h1-base * $text-footer-mult * $text-lg-mult;
+    font-size: $xs-text-base * $text-footer-mult * $text-lg-mult;
   }
 }
 @media (min-width: 1200px) {
   body {
-    font-size: $h1-base * $text-plain-mult * $text-xl-mult;
+    font-size: $xs-text-base * $text-xl-mult;
     h1 {
-      font-size: $h1-base * $text-xl-mult;
+      font-size: $xs-text-base * $text-h1-mult  * $text-xl-mult;
     }
     h2 {
-      font-size: $h1-base * $text-h2-mult * $text-xl-mult;
+      font-size: $xs-text-base * $text-h2-mult * $text-xl-mult;
     }
     h3 {
-      font-size: $h1-base * $text-h3-mult * $text-xl-mult;
+      font-size: $xs-text-base * $text-h3-mult * $text-xl-mult;
     }
     h4 {
-      font-size: $h1-base * $text-h4-mult * $text-xl-mult;
+      font-size: $xs-text-base * $text-h4-mult * $text-xl-mult;
     }
   }
   footer {
-    font-size: $h1-base * $text-footer-mult * $text-xl-mult;
+    font-size: $xs-text-base * $text-footer-mult * $text-xl-mult;
   }
 }
 

From 358490b0e57eb2b2b77c3989d451ff1733a7dc7a Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Fri, 22 Feb 2019 17:11:01 -0800
Subject: [PATCH 09/10] Fix image on small display

---
 open_humans/templates/member/activity.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/open_humans/templates/member/activity.html b/open_humans/templates/member/activity.html
index ea8ad67a0..0adb02fdf 100644
--- a/open_humans/templates/member/activity.html
+++ b/open_humans/templates/member/activity.html
@@ -14,7 +14,9 @@ <h1>{{ project.name }}</h1>
             {% include 'partials/activity-info-short-bs4.html' %}
         </div>
         <div class="d-flex justify-content-center d-sm-none">
-            <img class="w-25 m-2" src="{% static 'images/default-badge.png' %}">
+          <div class="w-25 m-2">
+            <img class="img-fluid" src="{% static 'images/default-badge.png' %}">
+          </div>
         </div>
         <div class="d-flex justify-content-center d-sm-none text-center">
             <h1 class="justify-content-center">{{ project.name }}</h1>

From ea2e45cbe9306826aeb4e9fe2493382d5ff676e5 Mon Sep 17 00:00:00 2001
From: Mad Price Ball <mpball@gmail.com>
Date: Fri, 22 Feb 2019 21:17:46 -0800
Subject: [PATCH 10/10] Add public data link, recent members, tweak styles

---
 open_humans/templates/base-bs4.html        | 38 ++++++++--
 open_humans/templates/member/activity.html | 86 +++++++++++-----------
 open_humans/views.py                       | 33 ++++++++-
 static/css/oh-proj-theming.css             |  6 ++
 static/scss/oh-proj-theming.scss           | 11 ++-
 5 files changed, 122 insertions(+), 52 deletions(-)

diff --git a/open_humans/templates/base-bs4.html b/open_humans/templates/base-bs4.html
index cdcc52075..d46a20280 100644
--- a/open_humans/templates/base-bs4.html
+++ b/open_humans/templates/base-bs4.html
@@ -105,7 +105,7 @@
       <div class="container">
 
         {% if request.user.is_authenticated and not request.user.member.primary_email.verified %}
-        <div class="alert alert-error">
+        <div class="alert alert-warning">
           Please
           <a href="{% url 'my-member-send-confirmation-email' %}?next={{ request.path }}">verify
             your email address</a>! As good stewards of your data, we want to
@@ -127,15 +127,43 @@
         {% endblock messages_block %}
 
         {% block main %}
-        <h1 class="mt-5">Sample header</h1>
-        <p class="lead">Sample lead paragraph.</p>
-        <p>Sample standard paragraph. This <a href="#">is a sample</a> link.</a> <code>This is some code.</code></p>
-        <div>
+        <h1 class="mt-5">Sample top header</h1>
+        <p class="lead">Sample lead paragraph text.</p>
+        <p>Sample standard paragraph text. This <a href="#">is a sample</a> link.</a> <code>This is some code.</code></p>
+        <p>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+          tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
+          veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+          commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
+          velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
+          occaecat cupidatat non proident, sunt in culpa qui officia deserunt
+          mollit anim id est laborum.
+        </p>
+        </p>
+        <div class="mb-2">
+          <btn class="btn btn-xs btn-primary">button 1</btn>
+          <btn class="btn btn-xs btn-default">button 2</btn>
+          <btn class="btn btn-xs btn-primary-hollow">button 3</btn>
+          <btn class="btn btn-xs btn-info">button 4</btn>
+        </div>
+        <div class="mb-2">
+          <btn class="btn btn-sm btn-primary">button 1</btn>
+          <btn class="btn btn-sm btn-default">button 2</btn>
+          <btn class="btn btn-sm btn-primary-hollow">button 3</btn>
+          <btn class="btn btn-sm btn-info">button 4</btn>
+        </div>
+        <div class="mb-2">
           <btn class="btn btn-primary">button 1</btn>
           <btn class="btn btn-default">button 2</btn>
           <btn class="btn btn-primary-hollow">button 3</btn>
           <btn class="btn btn-info">button 4</btn>
         </div>
+        <div>
+          <btn class="btn btn-lg btn-primary">button 1</btn>
+          <btn class="btn btn-lg btn-default">button 2</btn>
+          <btn class="btn btn-lg btn-primary-hollow">button 3</btn>
+          <btn class="btn btn-lg btn-info">button 4</btn>
+        </div>
         {% endblock main %}
 
       </div>
diff --git a/open_humans/templates/member/activity.html b/open_humans/templates/member/activity.html
index 0adb02fdf..f4cd529c4 100644
--- a/open_humans/templates/member/activity.html
+++ b/open_humans/templates/member/activity.html
@@ -62,14 +62,16 @@ <h2>Projects &amp; studies</h2>
       <div class="d-flex flex-wrap p-2">
         {% for req_project in requesting_projects %}
         <div class="w-25">
-          <div class="d-flex justify-content-center">
-            <div>
-              <img src="{% static 'images/default-badge.png' %}" style="height:3rem;">
+          <a href="{% url 'activity' req_project.slug %}">
+            <div class="d-flex justify-content-center">
+              <div>
+                <img src="{% static 'images/default-badge.png' %}" style="height:3rem;">
+              </div>
             </div>
-          </div>
-          <div class="d-flex justify-content-center">
-            <div class="small text-center" style="line-height:1.2;">{{ req_project.name }}</div>
-          </div>
+            <div class="d-flex justify-content-center">
+              <div class="small text-center" style="line-height:1.2;">{{ req_project.name }}</div>
+            </div>
+          </a>
         </div>
         {% endfor %}
       </div>
@@ -77,54 +79,33 @@ <h2>Projects &amp; studies</h2>
     {% endif %}
     {% if notebooks %}
       <h2>Notebooks</h2>
-      <p>You can explore your data from Project Name with the
+      <p>You can explore your data from {{ project.name }} with the
         following <a href="{% url 'activity' 'junos-personal-data-exploratory' %}">personal
         data notebooks</a>.
       </p>
       <ul>
       {% for notebook in notebooks %}
-        <li><a href="{{ notebook.details_url }}">{{ notebook.name }}</a></li>
+        <li><a href="{{ notebook.details_url }}">{{ notebook.name }}</a>
+          by <a href="{% url 'member-detail-direct' notebook.user %}">{{ notebook.user }}</a>
+        </li>
       {% endfor %}
       </ul>
       <hr>
     {% endif %}
-    <h2>Project Members</h2>
+    <h2>Recent Members</h2>
     <div class="d-flex py-2">
+      {% for member in recent_members %}
       <div class="w-25">
-        <div class="d-flex justify-content-center">
-          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
-        </div>
-        <div class="d-flex justify-content-center">
-          <div class="small text-center" style="line-height:1.2;">Person Name</div>
-        </div>
-      </div>
-
-      <div class="w-25">
-        <div class="d-flex justify-content-center">
-          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
-        </div>
-        <div class="d-flex justify-content-center">
-          <div class="small text-center" style="line-height:1.2;">Person Name</div>
-        </div>
-      </div>
-
-      <div class="w-25">
-        <div class="d-flex justify-content-center">
-          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
-        </div>
-        <div class="d-flex justify-content-center">
-          <div class="small text-center" style="line-height:1.2;">Person Name</div>
-        </div>
-      </div>
-
-      <div class="w-25">
-        <div class="d-flex justify-content-center">
-          <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
-        </div>
-        <div class="d-flex justify-content-center">
-          <div class="small text-center" style="line-height:1.2;">Person Name</div>
-        </div>
+        <a href="{% url 'member-detail-direct' member.user.username %}">
+          <div class="d-flex justify-content-center">
+            <img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
+          </div>
+          <div class="d-flex justify-content-center">
+            <div class="small text-center" style="line-height:1.2;">{{ member.name }}</div>
+          </div>
+        </a>
       </div>
+      {% endfor %}
     </div>
     <p>
       <a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">See
@@ -133,12 +114,23 @@ <h2>Project Members</h2>
     <hr>
     <h2>Project information</h2>
     <div>
+
+      {# repeat short partial from above w/ coordinator #}
       {% include 'partials/activity-info-short-bs4.html' %}
+
+      {# member count, public data, launch date, info url, and contact email #}
       <div class="mb-1">
         <b class="mr-2">Joined by:</b>
         <a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">
         {{ project.authorized_members }} members</a>
       </div>
+      {% if public_count %}
+      <div class="mb-1">
+        <b class="mr-2">Public data:</b> shared by
+        <a href="{% url 'api:public-data' %}?source={{ project.id_label }}">
+          {{ public_count }} members</a>
+      </div>
+      {% endif %}
       <div class="mb-1">
         <b class="mr-2">Launched:</b> {{ project.project_approval_date|date }}
       </div>
@@ -150,13 +142,21 @@ <h2>Project information</h2>
           <b class="mr-2">Contact email:</b>
           <a href="mailto:{{ project.contact_email }}">{{ project.contact_email }}</a>
       </div>
+
+      {# terms link for OAuth2 projects #}
+      {% if project.oauth2datarequestproject %}
       <div class="mb-1">
         <b class="mr-2">Project terms:</b>
         <a href="{% if project.terms_url %}{{ project.terms_url }}{% else %}{{ project.info_url }}{% endif %}">Read here</a>
       </div>
+      {% endif %}
+
+      {# describe permissions if any are requested #}
       {% if requests_permissions %}
       {% include 'partials/activity-permissions-bs4.html' %}
       {% endif %}
+
+      {# describe returned data if source #}
       {% if project.returned_data_description %}
       <div class="d-flex mb-1">
           <div class="pr-3">
diff --git a/open_humans/views.py b/open_humans/views.py
index 315f6a2c6..472ee4734 100644
--- a/open_humans/views.py
+++ b/open_humans/views.py
@@ -319,8 +319,35 @@ def get_notebooks(self):
             "https://exploratory.openhumans.org/notebook_by_source/",
             params={"source": self.object.name},
         )
-        if resp.status_code == 200:
-            return resp.json()["notebooks"]
+        if not resp.status_code == 200:
+            return None
+
+        notebooks = resp.json()["notebooks"]
+        for notebook in notebooks:
+            if notebook["name"].endswith(".ipynb"):
+                notebook["name"] = notebook["name"][:-6]
+        return notebooks
+
+    def get_recent_members(self):
+        recent_members = self.object.project_members.filter(joined=True).order_by(
+            "-created"
+        )[:5]
+        return [pm.member for pm in recent_members]
+
+    def get_public_count(self):
+        public_users = [
+            pda.user
+            for pda in PublicDataAccess.objects.filter(data_source=self.object.id_label)
+            .filter(is_public=True)
+            .annotate(user=F("participant__member__user"))
+        ]
+        public_count = (
+            self.object.projectdatafile_set.exclude(completed=False)
+            .distinct("user")
+            .filter(user__in=public_users)
+            .count()
+        )
+        return public_count
 
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
@@ -336,6 +363,8 @@ def get_context_data(self, *args, **kwargs):
         context.update(
             {
                 "notebooks": self.get_notebooks(),
+                "public_count": self.get_public_count(),
+                "recent_members": self.get_recent_members(),
                 "requesting_projects": requesting_projects_filtered,
                 "requests_permissions": requests_permissions,
             }
diff --git a/static/css/oh-proj-theming.css b/static/css/oh-proj-theming.css
index 028317ea0..2bc195991 100644
--- a/static/css/oh-proj-theming.css
+++ b/static/css/oh-proj-theming.css
@@ -3,6 +3,7 @@
 -------------------------------------------------- */
 /* Text styles */
 body {
+  color: #333333;
   font-family: "Montserrat", sans-serif;
   font-weight: 400;
   font-size: 0.82rem;
@@ -209,6 +210,11 @@ body.oh-proj-template > main > div.container {
   border-color: #008c94;
 }
 
+.btn-xs {
+  padding: 3px 6px;
+  font-size: 0.75rem;
+}
+
 .login-button {
   display: inline-block;
   text-align: left;
diff --git a/static/scss/oh-proj-theming.scss b/static/scss/oh-proj-theming.scss
index bb699f404..11486bc94 100644
--- a/static/scss/oh-proj-theming.scss
+++ b/static/scss/oh-proj-theming.scss
@@ -12,7 +12,8 @@ $oh-orange-light: #ffceb9;
 $oh-orange: #ff9161;
 $oh-orange-dark: #f7763e;
 
-$oh-gray-verydark: #4d4d4d;
+$oh-gray-dark: #4d4d4d;
+$oh-gray-verydark: #333333;
 
 $xs-text-base: 0.82rem;
 $text-footer-mult: 0.9;
@@ -28,6 +29,7 @@ $text-xl-mult: 1.2;
 /* Text styles */
 
 body {
+  color: $oh-gray-verydark;
   font-family: 'Montserrat', sans-serif;
   font-weight: 400;
   font-size: $xs-text-base;
@@ -129,7 +131,7 @@ footer {
 }
 
 h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-  color: $oh-gray-verydark;
+  color: $oh-gray-dark;
   font-weight: 300;
 }
 
@@ -243,6 +245,11 @@ body.oh-proj-template > main > div.container {
   }
 }
 
+.btn-xs {
+  padding: 3px 6px;
+  font-size: 0.75rem;
+}
+
 .login-button {
   display: inline-block;
   text-align: left;