diff --git a/.env.example b/.env.example index 2740505e..a454cfba 100644 --- a/.env.example +++ b/.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 diff --git a/README.md b/README.md index 89cd17de..69558d37 100644 --- a/README.md +++ b/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 diff --git a/browser/templates/mobile_list_groups.html b/browser/templates/mobile_list_groups.html index 81bdf629..8bc255e7 100644 --- a/browser/templates/mobile_list_groups.html +++ b/browser/templates/mobile_list_groups.html @@ -26,7 +26,11 @@

My {{ group_or_squad | title }}s

{% endif %}
  • - {{ group.name }} + {% if group.friendly_name != "" %} + {{ group.friendly_name }} + {% else %} + {{ group.name }} + {% endif %} {% if group.admin %} {% if website == 'murmur' %} diff --git a/browser/templates/murmur/about.html b/browser/templates/murmur/about.html index 6a178285..d4c36620 100644 --- a/browser/templates/murmur/about.html +++ b/browser/templates/murmur/about.html @@ -14,18 +14,8 @@ {% block content %} -{% if flavour != "mobile" %}
    -{% else %} -
    -{% endif %} -{% if flavour != "mobile" %}
    - {% else %} -
    - {% endif %} - -

    We're re-imagining mailing lists and community discourse for the age of social media.

    Murmur is a new tool for group communication that blends concepts from mailing lists, forums, and social media. @@ -63,13 +53,8 @@

    Code

    -{% if flavour != "mobile" %}
    - {% else %} -
    - {% endif %} - - +

    Our Research Team


    diff --git a/browser/templates/murmur/add_donotsend.html b/browser/templates/murmur/add_donotsend.html index 70b7550c..7600214b 100644 --- a/browser/templates/murmur/add_donotsend.html +++ b/browser/templates/murmur/add_donotsend.html @@ -1,8 +1,13 @@ {% extends "group_container_base.html" %} {% block container-content %} - -

    Add email addresses to do-not-send for {{ group_info.name }}

    + + + {% if group_info.friendly_name != '' %} +

    Add email addresses to do-not-send for {{ group_info.friendly_name }}

    + {% else %} +

    Add email addresses to do-not-send for {{ group_info.name }}

    + {% endif %}
    @@ -20,4 +25,4 @@

    Add email addresses to do-not-send for {{ group_info.n {% block customjs %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/browser/templates/murmur/add_list.html b/browser/templates/murmur/add_list.html index b5246118..0606d03d 100644 --- a/browser/templates/murmur/add_list.html +++ b/browser/templates/murmur/add_list.html @@ -7,18 +7,26 @@
    - -

    Add New Associated Mailing List to {{ group_info.name }}

    - -
    + + {% if group_info.friendly_name != '' %} +

    Add New Associated Mailing List to {{ group_info.friendly_name }}

    + {% else %} +

    Add New Associated Mailing List to {{ group_info.name }}

    + {% endif %} +
    List email address:

    List URL (optional):

    -
    - Allow emails from the above mailing list to be posted to {{ group_info.name }}
    - Forward posts from {{ group_info.name }} to the above mailing list
    +
    + {% if group_info.friendly_name != '' %} + Allow emails from the above mailing list to be posted to {{ group_info.friendly_name }}
    + Forward posts from {{ group_info.friendly_name }} to the above mailing list
    + {% else %} + Allow emails from the above mailing list to be posted to {{ group_info.name }}
    + Forward posts from {{ group_info.name }} to the above mailing list
    + {% endif %}

    diff --git a/browser/templates/murmur/add_members.html b/browser/templates/murmur/add_members.html index a071147e..322539cf 100644 --- a/browser/templates/murmur/add_members.html +++ b/browser/templates/murmur/add_members.html @@ -1,7 +1,14 @@ {% extends "group_container_base.html" %} {% block container-content %} -

    Add New Members to {{ group_info.name }}

    + +

    Add New Members to + {% if group_info.friendly_name != '' %} + {{ group_info.friendly_name }} + {% else %} + {{ group_info.name }} + {% endif %} +

    diff --git a/browser/templates/murmur/base.html b/browser/templates/murmur/base.html index 795f6025..fa7b56b1 100644 --- a/browser/templates/murmur/base.html +++ b/browser/templates/murmur/base.html @@ -58,10 +58,18 @@ {% if not group_page %}
  • - {{ active_group.name }} + {% if active_group.friendly_name != '' %} + {{ active_group.friendly_name }} + {% else %} + {{ active_group.name }} + {% endif %}