Friendly group name to display group names with spaces

.env.example

@@ -17,6 +17,7 @@ GMAIL_PASSWORD=YOU_GMAIL_PASSWORD
 DATABASE_NAME=murmur
 MYSQL_PASS=murmurdb
 DATABASE_HOST=db
+GMAIL_PORT=587
 
 # domain name used for sending emails
 DOMAIN_NAME=localhost:8000

README.md

@@ -1,5 +1,5 @@
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/haystack/murmur?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Django version](https://img.shields.io/badge/Django-1.7-blue)](https://docs.djangoproject.com/en/3.0/releases/1.7/) [![python version](https://img.shields.io/badge/python-2.7-yellowgreen.svg)](https://www.python.org/download/releases/2.7/)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/haystack/murmur?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Django version](https://img.shields.io/badge/Django-1.10-blue)](https://docs.djangoproject.com/en/3.0/releases/1.10/) [![python version](https://img.shields.io/badge/python-2.7-yellowgreen.svg)](https://www.python.org/download/releases/2.7/)
 
 Murmur
 =
@@ -34,9 +34,9 @@ Currently you need a gmail account in order for Murmur to send verification emai
 Next set up the environment variables. The only variables you should need to set are your gmail username and password.
 
 1. `cp .env.example .env`
-2. Fill in the correct values in `.env` for your gmail account. Make sure to enable insecure logins on gmail. 
+2. Fill in the correct values in `.env` for your gmail account. Put your gmail address and a google app password.
 3. Use `make` to create the database and create a superuser account to login
-4. Check it out on `localhost:8000
+4. Check it out on `localhost:8000`
 
 #### Starting and Stopping Docker 
 

browser/templates/mobile_list_groups.html

@@ -26,7 +26,11 @@ <h3>My {{ group_or_squad | title }}s</h3>
 					<a href="{{ link }}">
 					{% endif %}
 						<li class="row-item" id="{{ group.name }}">
-							<span class="strong">{{ group.name }}</span>
+							{% if group.friendly_name != "" %}
+								<span class="strong">{{ group.friendly_name }}</span>
+							{% else %}
+								<span class="strong">{{ group.name }}</span>
+							{% endif %}
 							{% if group.admin %}
 								<span class="admin label">
 								{% if website == 'murmur' %}

browser/templates/murmur/about.html

@@ -14,18 +14,8 @@
 
 {% block content %}
 
-{% if flavour != "mobile" %}
 <div class="container-home">
-{% else %}
-<div class="container">
-{% endif %}
-{% if flavour != "mobile" %}
   <div class="home-left">
-  	{% else %}
-  	<div class="home-left-mobile">
-  	{% endif %}
-
-
      <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.
@@ -63,13 +53,8 @@ <h4>Code</h4>
     </div>
 
 
-{% if flavour != "mobile" %}
   <div class="home-right">
-  	{% else %}
-  	<div class="home-right-mobile">
-  	{% endif %}
-
-
+
 	<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>

browser/templates/murmur/add_donotsend.html

@@ -1,8 +1,13 @@
 {% extends "group_container_base.html" %}
 
 {% block container-content %}
-
-	<h3>Add email addresses to do-not-send for <span id="group-name">{{ group_info.name }}</span></h3>
+
+	<p hidden id="group-name">{{ group_info.name }}</p>   
+	{% if group_info.friendly_name != '' %}
+		<h3>Add email addresses to do-not-send for <span id="group-friendly-name">{{ group_info.friendly_name }}</span></h3>
+	{% else %}
+		<h3>Add email addresses to do-not-send for <span id="group-friendly-name">{{ group_info.name }}</span></h3>
+	{% endif %}
 	<hr>
 
 	<form id="new-members-form">
@@ -20,4 +25,4 @@ <h3>Add email addresses to do-not-send for <span id="group-name">{{ group_info.n
 {% block customjs %}
 	<script type="text/javascript" src="/static/javascript/notify.js"></script>
 	<script type="text/javascript" src="/static/javascript/add_donotsend.js"></script>
-{% endblock %}
+{% endblock %}

browser/templates/murmur/add_list.html

@@ -7,18 +7,26 @@
 
 <div class="container">
   <div class="group-container">
-
-     <h3>Add New Associated Mailing List to <span id="group-name">{{ group_info.name }}</span></h3>
-
-     <hr />
+	<p hidden id="group-name">{{ group_info.name }}</p>   
+	{% if group_info.friendly_name != '' %}
+     	<h3>Add New Associated Mailing List to <span id="group-friendly-name">{{ group_info.friendly_name }}</span></h3>
+	{% else %}
+		<h3>Add New Associated Mailing List to <span id="group-friendly-name">{{ group_info.name }}</span></h3>
+	{% endif %}
+     <hr/>
         <form id="new-list-form">
 			<span class="strong">List email address: </span> <br />
 	        <input id="new-list-email" type="text" size="40"></input><br/>
 	        <span class="strong">List URL (optional): </span> <br />
 	        <input id="new-list-url" type="text" size="40"></input><br/> 
-	        <br/>
-			<input type="checkbox" id="can_post"> Allow emails from the above mailing list to be posted to {{ group_info.name }}<br/>
-			<input type="checkbox" id="can_receive"> Forward posts from {{ group_info.name }} to the above mailing list<br/>
+			<br/>
+			{% if group_info.friendly_name != '' %}
+				<input type="checkbox" id="can_post"> Allow emails from the above mailing list to be posted to {{ group_info.friendly_name }}<br/>
+				<input type="checkbox" id="can_receive"> Forward posts from {{ group_info.friendly_name }} to the above mailing list<br/>
+			{% else %}
+				<input type="checkbox" id="can_post"> Allow emails from the above mailing list to be posted to {{ group_info.name }}<br/>
+				<input type="checkbox" id="can_receive"> Forward posts from {{ group_info.name }} to the above mailing list<br/>
+			{% endif %}
 	        <br /> <br />
 			<button type="button" id="btn-add-list" style="margin-top:10px;">Add List</button>
 		</form>

browser/templates/murmur/add_members.html

@@ -1,7 +1,14 @@
 {% extends "group_container_base.html" %}
 
 {% block container-content %}
-	<h3>Add New Members to <span id="group-name">{{ group_info.name }}</span></h3>
+	<p hidden id="group-name">{{ group_info.name }}</p>
+	<h3>Add New Members to 
+		{% if group_info.friendly_name != '' %}
+			<span id="group-friendly-name">{{ group_info.friendly_name }}</span>
+		{% else %}
+			<span id="group-friendly-name">{{ group_info.name }}</span>
+		{% endif %}
+	</h3>
 	<hr />
 
 	<form id="new-members-form">

browser/templates/murmur/base.html

@@ -58,10 +58,18 @@
 
           	{% 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>
+					{% if active_group.friendly_name != '' %}
+						<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="active_group">{{ active_group.friendly_name }}</span><span class="caret"></span></a>
+					{% else %}
+						<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="active_group">{{ active_group.name }}</span><span class="caret"></span></a>
+					{% endif %}
 	              <ul class="dropdown-menu" role="menu">
-	              	{% for group in groups %}
-	                	<li><a href="/posts?group_name={{ group.name }}">{{ group.name }}</a></li>
+					  {% for group in groups %}
+					  	{% if group.friendly_name != '' %}
+							<li><a href="/posts?group_name={{ group.name }}">{{ group.friendly_name }}</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>
@@ -82,9 +90,13 @@
 	              	<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>
+							  <li><a href="/posts?group_name={{ group.name }}"><span id="active_group">{{ group.name }}</span></a></li>
+							  {% else %}
+								{% if group.friendly_name != '' %}
+									<li><a href="/posts?group_name={{ group.name }}">{{ group.friendly_name }}</a></li>
+								{% else %}
+									<li><a href="/posts?group_name={{ group.name }}">{{ group.name }}</a></li>
+								{% endif %}
 		                	{% endif %}
 						{% endfor %}
 	                <li class="divider"></li>

browser/templates/murmur/create_post.html

@@ -7,12 +7,16 @@
 
 <div class="container">
   <div class="group-container">
-
-	<h3>Send Post to <span id="group-name">{{ group_info.name }}</span></h3><hr />
+		{% if group_info.friendly_name != '' %}   
+			<h3>Send Post to <span id="friendly-group-name">{{ group_info.friendly_name }}</span></h3><hr />
+		{% else %}
+			<h3>Send Post to <span id="friendly-group-name">{{ group_info.name }}</span></h3><hr />
+		{% endif %}
    		<span class="strong">
    			To : 
-   		</span>
-   		<span id="new-post-to">{{ group_info.name }}</span>
+		</span>
+		<p hidden id="new-post-to">{{ group_info.name }}</p>   
+		<a href="mailto:{{admin_address}}" target="_newtab">{{admin_address}}</a>
    		<br>
    		<span class="strong">
    			Subject : 

browser/templates/murmur/edit_create_group.html

@@ -12,12 +12,17 @@ <h3>Create New Group</h3>
 <form id="group-form">
 	<h4 class="strong">Group Name:</h4>
 	<span class="italic-med">
-		Maximum 20 characters. Only alphanumeric characters, underscores, and dashes allowed.
+		Maximum 20 characters. Only alphanumeric characters, spaces, and dashes allowed.
 	</span>
 	<br>
 	{% if edit_page %}
-		<input id="group-name" maxlength="20" type="text" style="width: 100%; box-sizing: border-box;" value="{{group_info.name}}">
-		</input>
+		{% if group_info.friendly_name != '' %}
+			<input id="group-name" maxlength="20" type="text" style="width: 100%; box-sizing: border-box;" value="{{group_info.friendly_name}}">
+			</input>
+		{% else %}
+			<input id="group-name" maxlength="20" type="text" style="width: 100%; box-sizing: border-box;" value="{{group_info.name}}">
+			</input>
+		{% endif %}
 	{% else %}
 		<input id="group-name" maxlength="20" type="text" style="width: 100%; box-sizing: border-box;">
 		</input>
@@ -90,8 +95,9 @@ <h4 class="strong">Attachment Policy: </h4>
 {% block customjs %}
 	<script type="text/javascript" src="/static/javascript/notify.js"></script>
 	{% if edit_page %}
-		<script type="text/javascript" src="/static/javascript/edit_group_info.js"></script>
+		<script type="module" src="/static/javascript/edit_group_info.js"></script>
 	{% else %}
-		<script type="text/javascript" src="/static/javascript/create_group.js"></script>
+		<script type="module" src="/static/javascript/create_group.js"></script>
 	{% endif %}
-{% endblock %}
+{% endblock %}
+

browser/templates/murmur/edit_my_settings.html

@@ -7,9 +7,13 @@
 {% block content %}
 
 <div class="container">
+  <p hidden id="group-name"> {{group_info.name}} </p>
   <div class="group-container">
-
-	<h3>Edit My Settings for <span id="group-name">{{ group_info.name }}</span></h3><hr /><br />
+	{% if group_info.friendly_name != '' %}
+		<h3>Edit My Settings for <span id="friendly-group-name">{{ group_info.friendly_name }}</span></h3><hr /><br />
+	{% else %}
+		<h3>Edit My Settings for <span id="friendly-group-name">{{ group_info.name }}</span></h3><hr /><br />
+	{% endif %}
     <form id="group-settings-form">