Skip to content

Commit

Permalink
Fix badge, add unreviewed warning to activity page
Browse files Browse the repository at this point in the history
  • Loading branch information
madprime committed Mar 6, 2020
1 parent 24d500a commit 76cf1bd
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
14 changes: 12 additions & 2 deletions open_humans/templates/member/activity.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
{% block meta_description %}"{{ project.name }}" on Open Humans: {{ project.long_description }}{% endblock meta_description %}

{% block main %}
{% if not project.approved %}
<div class="alert alert-warning mt-2" role="alert">
<h3>Project In Development</h4>
<p>
<b>This project is in development.</b> It has not been
<a href="{% url 'direct-sharing:project-approval' %}">reviewed by Open Humans community &amp; staff</a>.
Only join if you know &amp; trust the coordinator, and have been invited to join for testing purposes.
</p>
</div>
{% endif %}
<div class="d-flex mt-4">
<div class="flex-grow-1 mb-3">
<div class="d-none d-sm-inline-block">
Expand All @@ -15,7 +25,7 @@ <h1>{{ project.name }}</h1>
</div>
<div class="d-flex justify-content-center d-sm-none">
<div class="w-25 m-2">
<img class="img-fluid" src="{% static 'images/default-badge.png' %}">
{% make_badge project 'img-fluid' %}
</div>
</div>
<div class="d-flex justify-content-center d-sm-none text-center">
Expand All @@ -26,7 +36,7 @@ <h1 class="justify-content-center">{{ project.name }}</h1>
</div>
</div>
<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;">
{% make_badge project 'img-fluid max-width px-sm-1 pt-sm-1 px-md-3 pt-md-2 activity-badge-maxh10rem' %}
</div>
</div>
<h2>About {{ project.name }}</h2>
Expand Down
5 changes: 5 additions & 0 deletions static/css/oh-proj-theming.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions static/scss/oh-proj-theming.scss
Original file line number Diff line number Diff line change
Expand Up @@ -323,3 +323,8 @@ btn.btn-xs {
}
}
}

/* Activity page specific */
.activity-badge-maxh10rem {
max-height:10rem;
}

0 comments on commit 76cf1bd

Please sign in to comment.