Skip to content

Commit

Permalink
Merge branch 'master' into readme-update2
Browse files Browse the repository at this point in the history
  • Loading branch information
@soyapark
soyapark authored Dec 17, 2020
2 parents 452dda6 + 07d89ca commit a21e13b
Show file tree
Hide file tree
Showing 116 changed files with 53,270 additions and 7,619 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Next set up the environment variables. The only variables you should need to set
* change the root mysql account to one written in `.env`
* make sure you can log in to mysql with the password in the command line: `mysql -u root -p`


#### Starting and Stopping Docker

In order to stop docker you can simply run `make stop` and run `make start` to start it up again.
Expand Down
6 changes: 3 additions & 3 deletions browser/templates/mobile_list_groups.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h3>My {{ group_or_squad | title }}s</h3>
{% endif %}
</div>

<ul id="post-list-table">
<ul id="group-list-table">
{% for group, link in pairs %}
{% if website == 'murmur' %}
<a href="/groups/{{ group.name }}">
Expand All @@ -28,7 +28,7 @@ <h3>My {{ group_or_squad | title }}s</h3>
<li class="row-item" id="{{ group.name }}">
<span class="strong">{{ group.name }}</span>
{% if group.admin %}
<span class="admin label">
<span class="admin label text-light rounded-sm">
{% if website == 'murmur' %}
Admin
{% elif website == 'squadbox' %}
Expand All @@ -37,7 +37,7 @@ <h3>My {{ group_or_squad | title }}s</h3>
</span>
{% endif %}
{% if group.mod %}
<span class="mod label">
<span class="mod label text-light rounded-sm">
{% if website == 'murmur' %}
Mod
{% elif website == 'squadbox' %}
Expand Down
53 changes: 25 additions & 28 deletions browser/templates/murmur/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,33 @@

<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>

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.
<br /><br />
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>.
<br />
<br />

<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>

<h4>Publications</h4>
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>
In Proceedings of the ACM Conference on Human Factors in Computing Systems
(CHI 2015). Seoul, Korea. April 2015. <br />
<a href="http://people.csail.mit.edu/axz/papers/mailinglists.pdf"><button class="btn btn-xs">PDF</button></a>
<a href="http://people.csail.mit.edu/axz/mailinglists.html"><button class="btn btn-xs">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">Blog Post</button></a>


<br />
<br />
<h4>Code</h4>
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!
<br />
<br />
<br />
Still curious about Murmur? Then
<a href="/group_list">explore some public groups</a>!
<h4>Publications</h4>
<div class="d-inline-block mb-2">
<span>Amy X. Zhang, Mark S. Ackerman, David R. Karger.</span>
<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>
</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>




Expand Down
187 changes: 103 additions & 84 deletions browser/templates/murmur/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{% block customcss %}
{% endblock %}
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">

<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href='https://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'>

<link rel="apple-touch-icon" sizes="57x57" href="/static/images/favicon/apple-touch-icon-57x57.png">
Expand Down Expand Up @@ -40,88 +40,107 @@
</head>

<body>

<div id="murmur-header" class="navbar navbar-default navbar-fixed-top navlook" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" id="logo" href="/"><img class="icon" src="/static/images/favicon/favicon-194x194.png">Murmur</a>
</div>
{% if user.is_authenticated %}
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">

{% if not group_page %}
<li class="dropdown dropdown-left">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="active_group">{{ active_group.name }}</span><span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
{% for group in groups %}
<li><a href="/posts?group_name={{ group.name }}">{{ group.name }}</a></li>
{% endfor %}
<li class="divider"></li>
<li><a href="/my_groups">Manage my groups</a></li>
<li><a href="/group_list">Join/create new groups</a></li>
</ul>
</li>

<li><a href="/my_groups">My Groups</a></li>
<li><a href="/group_list">Explore Groups</a></li>

{% else %}
<li class="dropdown dropdown-left">
{% if groups %}
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span>View Posts</span><span class="caret"></span></a>
{% else %}
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span>No Groups Yet</span><span class="caret"></span></a>
{% endif %}
<ul class="dropdown-menu" role="menu" id="list-group-names">
{% for group in groups %}
{% if group.name == active_group %}
<li><a href="/posts?group_name={{ group.name }}"><span id="active_group">{{ group.name }}</span></a></li>
{% else %}
<li><a href="/posts?group_name={{ group.name }}">{{ group.name }}</a></li>
{% endif %}
{% endfor %}
<li class="divider"></li>
<li><a href="/my_groups">Manage my groups</a></li>
<li><a href="/group_list">Join/create new groups</a></li>
</ul>
</li>
{% if my_groups %}
<li class="active"><a href="/my_groups">My Groups</a></li>
<li><a href="/group_list">Explore Groups</a></li>
{% else %}
<li><a href="/my_groups">My Groups</a></li>
<li class="active"><a href="/group_list">Explore Groups</a></li>

<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top" role="navigation">
<div class="container">
<a class="navbar-brand" id="logo" href="/"><img class="icon" src="/static/images/favicon/favicon-194x194.png">Murmur</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
{% if user.is_authenticated %}
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="nav navbar-nav">

{% if not group_page %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarGroupDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span id="active_group">{{ active_group.name }}</span>
</a>
<div class="dropdown-menu" aria-labelledby="navbarGroupDropdown">
{% for group in groups %}
<a class="dropdown-item" href="/posts?group_name={{ group.name }}">{{ group.name }}</a>
{% endfor %}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="/my_groups">Manage my groups</a>
<a class="dropdown-item" href="/my_groups">Join/create new groups</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="/my_groups">My Groups</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/group_list">Explore Groups</a>
</li>
</ul>
{% else %}
<li class="nav-item dropdown">
{% if groups %}
<a class="nav-link dropdown-toggle" href="#" id="navbarNoGroupDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
View Posts
</a>
{% else %}
<a class="nav-link dropdown-toggle" href="#" id="navbarNoGroupDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
No Groups Yet
</a>
{% endif %}
<div class="dropdown-menu" id="list-group-names" aria-labelledby="navbarGroupDropdown">
{% for group in groups %}
{% if group.name == active_group %}
<a class="dropdown-item" href="/posts?group_name={{ group.name }}"><span id="active_group">{{ group.name }}</span></a>
{% else %}
<a class="dropdown-item" href="/posts?group_name={{ group.name }}">{{ group.name }}</a>
{% endif %}
{% endfor %}
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="/my_groups">Manage my groups</a>
<a class="dropdown-item" href="/my_groups">Join/create new groups</a>
</div>
</li>
</li>
{% if my_groups %}
<li class="nav-item active">
<a class="nav-link" href="/my_groups">My Groups</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/group_list">Explore Groups</a>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="/my_groups">My Groups</a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/group_list">Explore Groups</a>
</li>
{% endif %}
</ul>
{% endif %}
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown dropdown-right">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="user_email">{{ user.email|truncatechars:24 }}</span><span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="/settings">Settings</a></li>
<li><a href="/accounts/logout">Logout</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->

{% else %}
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="/accounts/login/">Login</a></li>
<li><a href="/accounts/register/">Register</a></li>
</ul>
</div>
{% endif %}
</div>
</div>
<ul class="nav navbar-nav ml-auto">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarUserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span id="user_email">{{ user.email|truncatechars:24 }}</span>
</a>
<div class="dropdown-menu" aria-labelledby="navbarUserDropdown">
<a class="dropdown-item" href="/settings">Settings</a>
<a class="dropdown-item" href="/accounts/logout">Logout</a>
</div>
</li>
</ul>
</div>

{% else %}
<div id="navbarNav" class="collapse navbar-collapse">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="/accounts/login/">Login</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/accounts/register/">Register</a>
</li>
</ul>
</div>
{% endif %}
</div>
</nav>


{% block content %}
Expand All @@ -136,7 +155,7 @@
<script type="text/javascript" src="/static/javascript/third-party/noty/jquery.noty.js"></script>
<script type="text/javascript" src="/static/javascript/third-party/noty/layouts/topRight.js"></script>
<script type="text/javascript" src="/static/javascript/third-party/noty/themes/default.js"></script>
<script type="text/javascript" src="/static/javascript/third-party/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="/static/DataTables/datatables.min.js"></script>

{% block customjs %}

Expand Down
29 changes: 18 additions & 11 deletions browser/templates/murmur/create_post.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,22 @@
<div class="group-container">

<h3>Send Post to <span id="group-name">{{ group_info.name }}</span></h3><hr />
<span class="strong">
To :
</span>
<span id="new-post-to">{{ group_info.name }}</span>
<br>
<span class="strong">
Subject :
</span>
<br>
<input id="new-post-subject" type="text" style="width: 100%; box-sizing: border-box;"></input> <br /> <br />
<p class="mb-2"><span class="strong">To : </span><span id="new-post-to">{{ group_info.name }}</span></p>
<div class="tag-subject-container mb-3">
<div class="post-tag-container">
<p class="strong mb-1">Tags : </p>
<ul class="tag-input-list m-0 mr-2">
<li class="tag-input-container">
<input id="tag-input" class="tag-input" type="text" name="tags" placeholder="Add tags">
</li>
</ul>
</div>
<div class="subject-container">
<p class="strong mb-1">Subject : </p>
<textarea id="new-post-subject" class="subject-input"></textarea>
</div>
</div>
<textarea id="new-post-text" style="height:150px;"></textarea>

<button type="button" id="btn-post" style="margin-top:10px;">Post</button>
<a href="/post_list?group_name={{ group_info.name }}"><button type="button" style="margin-top:10px;">Cancel</button></a>

Expand All @@ -32,5 +36,8 @@ <h3>Send Post to <span id="group-name">{{ group_info.name }}</span></h3><hr />
{% block customjs %}
<script type="text/javascript" src="/static/javascript/third-party/jquery-ui.min.js"></script>
<script type="text/javascript" src="/static/javascript/third-party/ckeditor/ckeditor.js"></script>
<script type="text/javascript">
django_tag_data = {{ tag_data|safe }};
</script>
<script type="text/javascript" src="/static/javascript/murmur/create_post.js"></script>
{% endblock %}
Loading

0 comments on commit a21e13b

Please sign in to comment.