Skip to content

Commit

Permalink
Merge pull request #347 from haystack/tag-setting-pr
Browse files Browse the repository at this point in the history
Tag setting pr
  • Loading branch information
soyapark authored Apr 23, 2021
2 parents 92f6389 + 8c2deb5 commit d10808a
Show file tree
Hide file tree
Showing 10 changed files with 432 additions and 233 deletions.
120 changes: 45 additions & 75 deletions browser/templates/murmur/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,85 +13,55 @@
{% endblock %}

{% block content %}

<div class="container-home">
<div class="home-left">
<h4>We're re-imagining mailing lists and community discourse for the age of social media.</h4>
<p>Murmur is a new tool for group communication that blends concepts from mailing lists, forums, and social media.
<div id="container-about" class="container-fluid mt-5">
<div id="about-left" class="m-5">
<h4>We're re-imagining mailing lists and community discourse for the age of social media.</h4>
<p>Murmur is a new tool for group communication that blends concepts from mailing lists, forums, and social media.
Now members can choose how they receive emails and collaboratively moderate discussion.</p>
<p>Murmur is a research project from the <a href="http://haystack.csail.mit.edu">Haystack Group</a> at <a href="http://csail.mit.edu">MIT CSAIL</a>.</p>

<p class="mb-5">Murmur is a research project from the <a href="http://haystack.csail.mit.edu">Haystack Group</a> at <a href="http://csail.mit.edu">MIT CSAIL</a>.</p>

<h4>Publications</h4>
<div class="d-inline-block mb-2">
<span>Amy X. Zhang, Mark S. Ackerman, David R. Karger.</span>
<h4>Publications</h4>
<p class="mb-4">Amy X. Zhang, Mark S. Ackerman, David R. Karger.
<span class="strong">Mailing Lists: Why Are They Still Here, What’s Wrong With Them, and How Can We Fix Them?</span>
<span>In Proceedings of the ACM Conference on Human Factors in Computing Systems
(CHI 2015). Seoul, Korea. April 2015.</span>
In Proceedings of the ACM Conference on Human Factors in Computing Systems
(CHI 2015). Seoul, Korea. April 2015.</p>
<div id="pub-links" class="mb-5">
<a href="http://people.csail.mit.edu/axz/papers/mailinglists.pdf"><button class="btn btn-xs btn-primary mr-1 mb-1">PDF</button></a>
<a href="http://people.csail.mit.edu/axz/mailinglists.html"><button class="btn btn-xs btn-primary mr-1 mb-1">Slides</button></a>
<a href="http://haystack.csail.mit.edu/blog/2015/05/05/mailing-lists-why-are-they-still-here-whats-wrong-with-them-and-how-can-we-fix-them/"><button class="btn btn-xs btn-primary mr-1 mb-1">Blog Post</button></a>
</div>
<h4>Code</h4>
<p>Check out our <a href="https://github.com/haystack/murmur">Github page</a> to run your own version, report an issue, see what we're currently
working on, or get involved!</p>
<p>Still curious about Murmur? Then
<a href="/group_list">explore some public groups</a>!</p>
</div>

<a href="http://people.csail.mit.edu/axz/papers/mailinglists.pdf"><button class="btn btn-xs btn-primary">PDF</button></a>
<a href="http://people.csail.mit.edu/axz/mailinglists.html"><button class="btn btn-xs btn-primary">Slides</button></a>
<a href="http://haystack.csail.mit.edu/blog/2015/05/05/mailing-lists-why-are-they-still-here-whats-wrong-with-them-and-how-can-we-fix-them/"><button class="btn btn-xs btn-primary">Blog Post</button></a>


<br />
<br />
<h4>Code</h4>
<p>Check out our <a href="https://github.com/haystack/murmur">Github page</a> to run your own version, report an issue, see what we're currently
working on, or get involved!</p>
<p>Still curious about Murmur? Then
<a href="/group_list">explore some public groups</a>!</p>





</div>


<div class="home-right">

<div style="text-align: center;">
<h4>Our Research Team</h4>
<img class="img-circle" src="https://raw.githubusercontent.com/haystack/website/master/images/people/KakaoTalk_Photo_2017-11-22-17-47-17.jpeg" width=70><BR>
<h5>Soya Park</h5>
Ph.D. Student,
Haystack Group<br />
MIT CSAIL<br />
<a href="http://people.csail.mit.edu/soya">website</a>

<br />
<br />
<img class="img-circle" src="http://people.csail.mit.edu/axz/img/pic2.jpg" width=70><BR>
<h5>Amy X. Zhang</h5>
Ph.D.,
Haystack and UID Group<br />
MIT CSAIL<br />
<a href="http://people.csail.mit.edu/axz">website</a>

<br />
<br />
<img class="img-circle" src="https://raw.githubusercontent.com/haystack/website/master/images/people/david-karger.jpg" width=70><BR>
<h5>David Karger</h5>
Professor, Haystack Group<br />
MIT CSAIL<br />
<a href="http://people.csail.mit.edu/karger">website</a>

<br />
<br />
</div>
</div>


</div>


<div id="image-attrib">

</div>


<div id="about-right" class="mr-5 my-5">
<h4>Research Team</h4>
<div id="soya" class="mb-4">
<img class="rounded-circle mb-2" src="https://raw.githubusercontent.com/haystack/website/master/images/people/KakaoTalk_Photo_2017-11-22-17-47-17.jpeg" width=70><BR>
<h5 class="m-0">Soya Park</h5>
<p class="m-0">Ph.D. Student, Haystack Group</p>
<p class="m-0">MIT CSAIL</p>
<p class="m-0"><a href="http://people.csail.mit.edu/soya">website</a></p>
</div>
<div id="amy" class="mb-4">
<img class="rounded-circle mb-2" src="http://people.csail.mit.edu/axz/img/pic2.jpg" width=70><BR>
<h5 class="m-0">Amy X. Zhang</h5>
<p class="m-0">Ph.D., Haystack and UID Group</p>
<p class="m-0">MIT CSAIL</p>
<p class="m-0"><a href="http://people.csail.mit.edu/axz">website</a></p>
</div>
<div id="david">
<img class="rounded-circle mb-2" src="https://raw.githubusercontent.com/haystack/website/master/images/people/david-karger.jpg" width=70><BR>
<h5 class="m-0">David Karger</h5>
<p class="m-0">Professor, Haystack Group</p>
<p class="m-0">MIT CSAIL</p>
<p class="m-0"><a href="http://people.csail.mit.edu/karger">website</a></p>
</div>
</div>
</div>
<div id="image-attrib"></div>

{% endblock %}

Expand Down
95 changes: 95 additions & 0 deletions browser/templates/murmur/demo.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{% extends "murmur/base.html" %}

{% block customcss %}
<link href="/static/DataTables/datatables.min.css" rel="stylesheet">
{% endblock %}

{% block content %}

<div id="demo-desc" class="mt-5 px-4 pt-5">
<h1 class="title mx-5">Tag Subscription Feature</h1>
<p class="mx-5 mb-0">
Murmur gives users the ability to receive their desired content in their inbox through the tag subscription settings in every mailing list.
The demo showcs an example of tags in a group (e.g. EECS mailing list) which can be configured in the settings as seen on the left. These
personal tag preferences result in the filtering of emails that enter your inbox as seen on the right.
</p>
</div>
<div id="container-demo" class="d-flex">
<div class="demo-settings m-5 p-4">
<h4>Tag Settings</h4>
<label class="d-block" for="block-mode">
<input class="mr-1" type="radio" id="block-mode" name="tag-mode" value="block-mode" checked>
Send me all emails except the following blocked tags
</label>
<label class="d-block mb-3" for="subscribe-mode">
<input class="mr-1" type="radio" id="subscribe-mode" name="tag-mode" value="subscribe-mode">
Send me no emails except the following subscribed tags
</label>
<table id="tag-demo-table" class="display" cellspacing="0" width="100%">
<thead>
<tr>
<th>Select</th>
<th>Tag</th>
<th>Description</th>
<th>Num Posts</th>
</tr>
</thead>
<tbody>
<!-- Select, Tag, Description, Number of Posts -->
<tr class="my_row">
<td align="center"><img src="/static/css/third-party/images/block.svg" class="inactive" data-type="tag-select" id="tag_1"></td>
<td><label class="tag" id="tag_{{ forloop.counter0 }}" style="background-color: skyblue">Courses</label></td>
<td>New course annoucements and logistics related to EECS courses</td>
<td><span>1 post(s)</span></td>
</tr>
<tr class="my_row">
<td align="center"><img src="/static/css/third-party/images/block.svg" class="inactive" data-type="tag-select" id="tag_2"></td>
<td><label class="tag" id="tag_{{ forloop.counter0 }}" style="background-color: darkcyan">Jobs</label></td>
<td>Any job related content such as internships, info sessions, career fair, etc.</td>
<td><span>2 post(s)</span></td>
</tr>
<tr class="my_row">
<td align="center"><img src="/static/css/third-party/images/block.svg" class="inactive" data-type="tag-select" id="tag_3"></td>
<td><label class="tag" id="tag_{{ forloop.counter0 }}" style="background-color: peru">UROPs</label></td>
<td>UROP open positions announcements</td>
<td><span>1 post(s)</span></td>
</tr>
<tr class="my_row">
<td align="center"><img src="/static/css/third-party/images/block.svg" class="inactive" data-type="tag-select" id="tag_4"></td>
<td><label class="tag" id="tag_{{ forloop.counter0 }}" style="background-color: lightcoral">Talks</label></td>
<td>Talks by professors, guests speakers, companies, etc.</td>
<td><span>1 post(s)</span></td>
</tr>
</tbody>
</table>
</div>
<ul class="demo-emails m-5">
<h1 class="title">Inbox</h1>
<li class="sample-email p-3 mb-2">
<span class="label2 mr-1" style="background-color: skyblue;">Courses</span>
<span id="demo-subject">MAS.S65 Next generation devices for Nanoelectronics and Biotechnology</span>
</li>
<li class="sample-email p-3 mb-2">
<span class="label2 mr-1" style="background-color: lightcoral;">Talks</span>
<span class="label2 mr-1" style="background-color: darkcyan;">Jobs</span>
<span id="demo-subject">Tech Talk - Accessibility in Gaming hosted by Activison</span>
</li>
<li class="sample-email p-3 mb-2">
<p id="demo-subject">Participate in a Drinking Water Study & Win a Reusable Water Bottle</p>
</li>
<li class="sample-email p-3 mb-2">
<span class="label2 mr-1" style="background-color: peru;">UROPs</span>
<span id="demo-subject">MIT Media Lab, Remote Fall UROP Opportunities in Lifelong Kindergarten Group</span>
</li>
<li class="sample-email p-3">
<span class="label2 mr-1" style="background-color: darkcyan;">Jobs</span>
<span id="demo-subject">Google Privacy Engineer Internship Opportunity</span>
</li>
</ul>
</div>

{% endblock %}

{% block customjs %}
<script type="text/javascript" src="/static/javascript/murmur/demo.js"></script>
{% endblock %}
34 changes: 19 additions & 15 deletions browser/templates/murmur/edit_my_settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

<h3>Edit My Settings for <span id="group-name">{{ group_info.name }}</span></h3>
<form id="group-settings-form" class="mt-4 mb-4">
<article id="mail-delivery-area">
<h4>Mail Delivery</h4>
<article id="email-delivery-area">
<h4>Email Delivery</h4>
<hr />
<label for="all-emails">
{% if settings.all_emails %}
<input class="" type="radio" id="all-emails" name="mail-delivery" value="all-emails" checked>
<input class="" type="radio" id="all-emails" name="email-delivery" value="all-emails" checked>
{% else %}
<input class="" type="radio" id="all-emails" name="mail-delivery" value="all-emails">
<input class="" type="radio" id="all-emails" name="email-delivery" value="all-emails">
{% endif %}
All emails
</label>
Expand All @@ -27,9 +27,9 @@ <h4>Mail Delivery</h4>
width="16" height="16" title="You will be emailed all emails on this list unless you mute a thread">
<label for="first-emails">
{% if not settings.all_emails and not settings.digest and not settings.no_emails %}
<input class="" type="radio" id="first-emails" name="mail-delivery" value="first-emails" checked>
<input class="" type="radio" id="first-emails" name="email-delivery" value="first-emails" checked>
{% else %}
<input class="" type="radio" id="first-emails" name="mail-delivery" value="first-emails">
<input class="" type="radio" id="first-emails" name="email-delivery" value="first-emails">
{% endif %}
First emails
</label>
Expand All @@ -38,17 +38,17 @@ <h4>Mail Delivery</h4>
width="16" height="16" title="You will only be emailed replies in a thread if you explicitly follow the thread. You also automatically follow a thread if you start the thread or contribute a post at any point in the thread">
<label class="mr-5" for="digest-emails">
{% if settings.digest %}
<input class="mr-1" type="radio" id="digest-emails" name="mail-delivery" value="digest-emails" checked>
<input class="mr-1" type="radio" id="digest-emails" name="email-delivery" value="digest-emails" checked>
{% else %}
<input class="mr-1" type="radio" id="digest-emails" name="mail-delivery" value="digest-emails">
<input class="mr-1" type="radio" id="digest-emails" name="email-delivery" value="digest-emails">
{% endif %}
Digest emails
</label>
<label for="no-emails">
{% if settings.no_emails %}
<input class="" type="radio" id="no-emails" name="mail-delivery" value="no-emails" checked>
<input class="" type="radio" id="no-emails" name="email-delivery" value="no-emails" checked>
{% else %}
<input class="" type="radio" id="no-emails" name="mail-delivery" value="no-emails">
<input class="" type="radio" id="no-emails" name="email-delivery" value="no-emails">
{% endif %}
No emails
</label>
Expand Down Expand Up @@ -106,20 +106,20 @@ <h4>Tag Subscription</h4>
{% if settings.tag_blocking_mode %}
<label class="d-block" for="block-mode">
<input class="mr-1" type="radio" id="block-mode" name="tag-mode" value="block-mode" checked>
Send me all except the following blocked tags
Send me all emails except the following blocked tags
</label>
<label class="d-block mb-3" for="subscribe-mode">
<input class="mr-1" type="radio" id="subscribe-mode" name="tag-mode" value="subscribe-mode">
Send me nothing except the following subscribed tags
Send me no emails except the following subscribed tags
</label>
{% else %}
<label class="d-block" for="block-mode">
<input class="mr-1" type="radio" id="block-mode" name="tag-mode" value="block-mode">
Send me all except the following blocked tags
Send me all emails except the following blocked tags
</label>
<label class="d-block mb-3" for="subscribe-mode">
<input class="mr-1" type="radio" id="subscribe-mode" name="tag-mode" value="subscribe-mode" checked>
Send me nothing except the following subscribed tags
Send me no emails except the following subscribed tags
</label>
{% endif %}
<table id="tag-subscription-table" class="display" cellspacing="0" width="100%">
Expand All @@ -136,7 +136,11 @@ <h4>Tag Subscription</h4>
{% for tag in tag_info %}
<tr class="my_row">
<!-- Select, Tag, Description, Number of Posts -->
<td><input class="checkbox checkbox-user" type="checkbox" data-type="tag-select" id ={{ tag.id }}></td>
{% if settings.tag_blocking_mode %}
<td align="center"><img src="/static/css/third-party/images/block.svg" class="inactive" data-type="tag-select" id ={{ tag.id }}></td>
{% else %}
<td align="center"><img src="/static/css/third-party/images/check.svg" class="inactive" data-type="tag-select" id ={{ tag.id }}></td>
{% endif %}
<td><label class="tag" id="tag_{{ forloop.counter0 }}" style="background-color: #{{ tag.color }}">{{ tag.name }}</label></td>
<td>Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed nulla et nulla fermentum molestie.</td>
<td><span>{{ tag.num_p }} post(s)</span></td>
Expand Down
Loading

0 comments on commit d10808a

Please sign in to comment.