Skip to content

Commit

Permalink
Address 2.0 website issues. (#224)
Browse files Browse the repository at this point in the history
* Addes styling to invalid_zip.html and already_submitted.html. made error messages clearer, put submission example on page

* Added tutorial file checks and file, updated tutorial page

* Removed old separate vision form, base/brain model option, private option on vision

* first round of PR feedback changes

* removed required model.py and setup.py in user.py

* removed boilerplate navbar code, use seb's line instead

* removed boilerplate navbar code, use seb's line instead

* tutorial changes 1

* Overhauled tutorial styling

* Overhauled quickstart styling, continued

* Overhauled quickstart styling, continued

* Finished Quickstart styling

* fixes tutorial and quickstart minor things

* minor changes

* Initial deepdive 1 page fix

* Second deepdive 1 page fix

* Second deepdive 1 page fix, 2

* fixes 1

* Finished DD1

* Finished DD1 styling

* added more styling

* Finished DD2

* Finished DD3

* Finished community page

* Added public models back in, updated submission text

* small change to user.py

* Update benchmarks/templates/benchmarks/community.html

Co-authored-by: Katherine Fairchild <[email protected]>

* updates resubmission job to score_plugins

* Katherine's PR feedback round 1

* Jim's requested changes to Footer

* Initial Sponsor page and file size check

* Added size limit

* last comments of PR

---------

Co-authored-by: Martin Schrimpf <[email protected]>
Co-authored-by: Katherine Fairchild <[email protected]>
  • Loading branch information
3 people authored Feb 15, 2024
1 parent 4eb311f commit 667711b
Show file tree
Hide file tree
Showing 44 changed files with 1,203 additions and 1,004 deletions.
14 changes: 2 additions & 12 deletions benchmarks/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,16 @@ class UploadPlaceHolder(forms.Form):


class UploadFileForm(forms.Form):
model_type = forms.ChoiceField(choices=[
("BaseModel", "Base model - to submit a standard machine learning model"),
("BrainModel", "Brain model - to change brain-transformation")])
zip_file = forms.FileField(label="", help_text='Required')
public = forms.BooleanField(label='Make model scores public (can be changed later):', required=False,
help_text='Check if you want the results of your submitted models included in the public ranking.')
help_text='Check if you want the results of your submitted models included in the '
'public ranking.')

class Meta:
model = UploadPlaceHolder
fields = ('zip_file', 'public', 'competition')


class UploadFileFormLanguage(forms.Form):
zip_file = forms.FileField(label="", help_text='Required')

class Meta:
model = UploadPlaceHolder
fields = ('zip_file', 'competition')


class ChangePasswordForm(PasswordChangeForm):
def __init__(self, *args, **kwargs):
super(ChangePasswordForm, self).__init__(*args, **kwargs)
Expand Down
44 changes: 29 additions & 15 deletions benchmarks/templates/benchmarks/already_submitted.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
{% extends 'benchmarks/base.html' %}
{% load static %}
{% load compress %}

{% block main %}
<section id="success" class="container center">
<article class="message">
<div class="message-header">
<p>Error: {{ identifier }} already exists. </p>
</div>
<div class="message-body">
There already is a {{ plugin }} plugin '{{ identifier }}' in the Brain-Score system, and you are not the owner.
Brain-Score does not allow plugins with duplicate identifiers. Please resubmit your {{ plugin }} with
a different identifier.
To resubmit, click <a href="http://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
</article>
</section>
{% endblock %}
{% block main %}
{% include 'benchmarks/components/nav-bar.html' %}
<div class="container login" style="background-image: url({% static '/benchmarks/img/login_brain.png' %});">
<div class="column is-half has-text-centered-mobile">
<div class="container login-left">
<section id="success" class="container center">
<article class="message">
<div class="message-header">
<p>Error: {{ identifier }} already exists. </p>
</div>
<div class="message-body">
There already is a {{ plugin }} plugin '{{ identifier }}' in the Brain-Score system.
As you are not the original submitter of this plugin, you do not have permission to modify it.
<br>
<br>
Brain-Score does not allow plugins with duplicate identifiers. Please resubmit your {{ plugin }} with
a different identifier.
<br>
<br>
To resubmit, click <a href="https://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
</article>
</section>
</div>
</div>
</div>
{% endblock %}
28 changes: 1 addition & 27 deletions benchmarks/templates/benchmarks/central_profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,7 @@
{% load compress %}

{% block main %}
<nav class="navbar updated is-fixed-top is-transparent">
<div class= "container my_container nav-container">
<div class="navbar-brand">
<a class="navbar-item" href="https://www.brain-score.org">
<img class="navbar_element image" id="navbar-logo-colored" src="/static/benchmarks/img/colored_logo.png"/>
</a>
<a role="button" class="navbar-burger" data-target="navMenu" aria-label="menu" aria-expanded="false">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>
<div id="navMenu" class="navbar-menu">
<div class="navbar-end">
<div class="navbar-item">
<a class="social_icon navbar-item " href="https://www.github.com/brain-score">
<img class="navbar_element image" id="github_icon" src="/static/benchmarks/img/github_icon.png" />
</a>
<a class="social_icon navbar-item" href="https://www.twitter.com/brain_score">
<img class="navbar_element image" id="twitter_icon" src="/static/benchmarks/img/twitter_icon.png"/>
</a>
</div>
</div>
</div>
</div>
</nav>

{% include 'benchmarks/components/nav-bar.html' %}

<div class="container login" style="background-image: url({% static '/benchmarks/img/login_brain.png' %});">
<div class="column is-half has-text-centered-mobile">
Expand Down
147 changes: 95 additions & 52 deletions benchmarks/templates/benchmarks/community.html
Original file line number Diff line number Diff line change
@@ -1,64 +1,107 @@
{% extends 'benchmarks/base.html' %}
{% extends "benchmarks/components/app-view.html" %}
{% load static %}
{% load compress %}

{% block main %}
{% include 'benchmarks/components/nav-bar.html' %}
{% block banner %}
<h1>Community</h1>
<p>Join the growing group of scientists, engineers, and researchers who are using and developing Brain-Score.</p>
{% endblock %}


{% block content %}

<div class="container my_container landing">
<section class="section">
<div class="container">
<div class="columns is-centered">
<div class="column is-half has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Get involved!</h3>
Whether you just want to stay on top of news and events or you're looking to roll up your sleeves and contribute to our GitHub repositories, there are many ways to participate in the active and growing Brain-Score community.
<div class="box leaderboard-table-component full">
<div class="columns is-tablet is-variable is-1-tablet">
<div class="column is-one-half">
<img class="collab_graphic_image_2" src="{% static "/benchmarks/img/collaboration.png" %}" />
</div>
<div class="column is-one-half tutorial_text">
<h3 class="benefits_heading is-size-3-mobile">Get Involved!</h3>
<p class="benefits_info is-size-5-mobile">
Brain-Score started initially out of a research lab in Cambridge, MA in 2017, and since has grown to incorporate
hundreds of users across dozens of institutions.
</p>
<p class="benefits_info is-size-5-mobile">
We also have an active support and development team that is dedicated to making Brain-Score a seamless
and fun experience. We constantly try to get community feedback on what is important, quality of life changes, and
where the platform should head. If you have thoughts about any of these points, please do not hesitate
to reach out.
</p>
<p class="benefits_info is-size-5-mobile">
Whether you just want to stay on top of news and events or you're looking to roll up your sleeves and
contribute to our GitHub repositories, there are many ways to participate in the active and growing Brain-Score community.
</p>
</div>
</div>
</div>
<div class="box leaderboard-table-component full">
<div class="columns is-tablet is-variable is-1-tablet">
<div class="column is-one-third">
<div class="box">
<div class="content">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Join Our Slack!</h3>
<p class="benefits_info is-size-5-mobile">
Join the conversation in the Brain-Score Slack workspace. Whether you're interested in planning
features or just want to hang out, you're invited.
</p>
{% if request.GET.join_slack %}
<br/>
<p class="benefits_info is-size-5-mobile">
<b>Thanks for joining! You should receive an invitation in the next 24 hours.</b>
</p>
{% else %}
<form action="{% url 'join_slack' %}" method="post" class="join-slack-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Join Slack</button>
</form>
{% endif %}
</div>
</div>
</div>
</div>
</section>

<section class="section">
<div class="container">
<div class="columns">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Mailing list signup</h3>
<p>Be the first to know about new features and keep up with news and events by joining our mailing list.
You can opt out anytme.</p>
{% if request.GET.join_mailing_list %}
<br/>
<p><b>Thanks for joining!</b></p>
{%else%}
<form action="{% url 'join_mailing_list' %}" method="post" class="join-mailing-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Sign me up</button>
</form>
{% endif %}
</div>
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Join our Slack</h3>
<p>Join the conversation in the Brain-Score Slack workspace. Whether you're interested in planning features or just want to hang out, you're invited.</p>
{% if request.GET.join_slack %}
<br/>
<p><b>Thanks for joining!</b></p>
{%else%}
<form action="{% url 'join_slack' %}" method="post" class="join-slack-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Join Slack</button>
</form>
{% endif %}
<div class="column is-one-third">
<div class="box">
<div class="content">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">Join Our Mailing List</h3>
<p class="benefits_info is-size-5-mobile">
Be the first to know about new features and keep up with news and events by joining our mailing list.
You can opt out anytime.
</p>
{% if request.GET.join_mailing_list %}
<br/>
<p class="benefits_info is-size-5-mobile">
<b>Thanks for joining!</b>
</p>
{%else%}
<form action="{% url 'join_mailing_list' %}" method="post" class="join-mailing-form">
{% csrf_token %}
<input class="input user-email" type="email" name="email" placeholder="email">
<button type="submit" class="submit button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Sign me up</button>
</form>
{% endif %}
</div>
</div>
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">GitHub</h3>
<p>Want to jump right in? Brain-Score's codebase is entirely open source and we welcome user contributions.</p>
<a href="https://github.com/brain-score" target="_blank" rel="noopener noreferrer"><button type="button" class="button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Go to GitHub</button></a>
</div>
</div>
<div class="column is-one-third">
<div class="box">
<div class="content">
<div class="column has-text-centered">
<h3 class="benefits_heading is-size-3-mobile">GitHub</h3>
<p class="benefits_info is-size-5-mobile">
Want to jump right in? Brain-Score's codebase is entirely open source and we welcome user contributions.
Feel free to open an Issue to report a bug or request a new feature.
</p>
<a href="https://github.com/brain-score" target="_blank" rel="noopener noreferrer"><button type="button" class="button new_design tutorial benefit_button is-size-7
is-size-6-widescreen" >Go to GitHub</button></a>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
{% endblock %}
1 change: 0 additions & 1 deletion benchmarks/templates/benchmarks/compare.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{% extends "benchmarks/components/app-view.html" %}

{% load static %}

{% block banner %}
Expand Down
46 changes: 30 additions & 16 deletions benchmarks/templates/benchmarks/invalid_zip.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
{% extends 'benchmarks/base.html' %}
{% load static %}
{% load compress %}

{% block main %}
<section id="success" class="container center">

<article class="message">
<div class="message-header">
<p>Error: your submission package was not in the correct format.</p>
</div>
<div class="message-body">
{{ error }}. The submission packaging rules can be found
<a href="https://brain-score.readthedocs.io/en/latest/">here</a>.
To resubmit, click <a href="http://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
</article>



</section>
{% include 'benchmarks/components/nav-bar.html' %}
<div class="container login" style="background-image: url({% static '/benchmarks/img/login_brain.png' %});">
<div class="column is-half has-text-centered-mobile">
<div class="container login-left">
<section id="success" class="container center">
<article class="message">
<div class="message-header">
<p>Error: Invalid Zip Submission</p>
</div>
<div class="message-body">
<div class="error">
{{ error }}
</div>
<br>
<div class="explanation">
Please refer to the correct submission package structure below.
To resubmit, click <a href="https://{{ request.get_host }}/profile/{{ domain }}/submit">here</a>.
</div>
<br>
<div class="submission_image">
<img class="submission example_invalid" width="500" height="auto" src="{% static "/benchmarks/img/submission_structure.png" %}" />
</div>
</div>
</article>
</section>
</div>
</div>
</div>
{% endblock %}
6 changes: 3 additions & 3 deletions benchmarks/templates/benchmarks/landing_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ <h3 class=benefits_heading>Ready to Submit?</h3>
</div>
<div class="footer_middle column has-text-centered">
<div class="column">
<button onclick="location.href='https://github.com/brain-score/brain-score/issues'" type="button" class="button simple_button" >Support</button>
<button onclick="location.href='../community'" type="button" class="button simple_button" >Support</button>
<button onclick="location.href='https://brain-score.readthedocs.io/en/latest/index.html'" type="button" class="button simple_button" >FAQ</button>
</div>
<div class="column">
Expand All @@ -145,8 +145,8 @@ <h3 class=benefits_heading>Ready to Submit?</h3>
<button onclick="location.href='https://github.com/brain-score/brain-score#license'" type="button" class="button simple_button" >License</button>
</div>
<div class="column">
<button onclick="location.href='https://www.brain-score.org'" type="button" class="button simple_button" >Sponsors</button>
<button onclick="location.href='https://github.com/brain-score/brain-score/graphs/contributors'" type="button" class="button simple_button" >Team</button>
<button onclick="location.href='../sponsors'" type="button" class="button simple_button" >Sponsors</button>
<button onclick="location.href='https://github.com/orgs/brain-score/people'" type="button" class="button simple_button" >Team</button>
</div>
</div>
</div>
Expand Down
12 changes: 10 additions & 2 deletions benchmarks/templates/benchmarks/leaderboard/info-section.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
<div class="box">
<h3 class="title">How to Interpret</h3>
<div class="content">
The leaderboard is the heart of Brain-Score. It displays scores, all ranging from 0-1, on every benchmark available. Benchmarks are arranged hierarchically, with scores for each child benchmark averaged together to create the overall score for the parent.
<p class="benefits_info is-size-5-mobile">
The leaderboard is the heart of Brain-Score. It displays scores, all ranging from 0-1 (where 1 indicates closest
alignment between model and collected data), on every benchmark available. Benchmarks are arranged hierarchically,
with scores for each child benchmark averaged together to create the overall score for the parent.
</p>
</div>
</div>

<div class="box">
<div class="title">Ready to Submit</div>
<div class="content">
If you would like to submit your own model to Brain-Score, we highly recommend you complete our tutorial series <a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/tutorial">here</a>. It covers how to score a model on a single benchmark locally, as well as how to submit both predefined models and custom ones as well.
<p class="benefits_info is-size-5-mobile">
If you would like to submit your own model to Brain-Score, we highly recommend you complete our tutorial series
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/tutorial">here</a>. It covers how
to score a model on a single benchmark locally, walkthroughs of model submission packages, and more.
</p>
</div>
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/tutorial"><button class="button button-primary">Tutorials</button></a>
<a href="http{% if request.is_secure %}s{% endif %}://{{ request.get_host }}/profile"><button class="button button-ghost">Submit</button></a>
Expand Down
Loading

0 comments on commit 667711b

Please sign in to comment.