diff --git a/requirements/dev.txt b/requirements/dev.txt index 997e4b27..40e73ff0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,6 +10,6 @@ pytest-cov==2.5.1 pytest-django==3.2.1 pytest-pylint==0.9.0 selenium==3.12.0 -djangorestframework==3.8.2 +djangorestframework==3.11.0 geopy==1.15.0 -pinax-notifications==5.0.3 +pinax-notifications==6.0.0 diff --git a/requirements/prod.txt b/requirements/prod.txt index 7f046f9d..f53db3f6 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,10 +1,10 @@ -Django==2.2.14 +Django==3.0.8 Pillow==7.2.0 django-allauth==0.42.0 django-braces==1.14.0 django-cities-light==3.6.0 django-ckeditor==5.9.0 -django-crispy-forms==1.7.0 +django-crispy-forms==1.9.2 django-guardian==2.3.0 django-imagekit==4.0.1 djangocms-admin-style==1.2.7 diff --git a/systers_portal/templates/account/login.html b/systers_portal/templates/account/login.html index 4bd81caa..96d8794c 100644 --- a/systers_portal/templates/account/login.html +++ b/systers_portal/templates/account/login.html @@ -7,35 +7,34 @@ {% load crispy_forms_tags %} {% block content %} {% load socialaccount %} -{% load staticfiles %} -
-
-
-

Sign In Using - - -

-
-
- {% csrf_token %} - {{ form|crispy }} - {% if redirect_field_value %} - - {% endif %} - Forgot Password? - -

or

- -

Sign in with one of your existing third party accounts.

-
-
- {% include "socialaccount/snippets/provider_list.html" with process="login" %} +{% load static %} +
+ + +
-
-{% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/systers_portal/templates/account/signup.html b/systers_portal/templates/account/signup.html index e9ec8553..5e47b7c0 100644 --- a/systers_portal/templates/account/signup.html +++ b/systers_portal/templates/account/signup.html @@ -7,29 +7,29 @@ {% load crispy_forms_tags %} {% block content %} {% load socialaccount %} -{% load staticfiles %} -
- -
+{% load static %} +
+ +
-
-{% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/systers_portal/templates/base.html b/systers_portal/templates/base.html index 85757d5e..21ea6c66 100644 --- a/systers_portal/templates/base.html +++ b/systers_portal/templates/base.html @@ -1,5 +1,6 @@ + @@ -9,10 +10,10 @@ Systers Portal{% block title %}{% endblock %} - {% load staticfiles %} + {% load static %} - - + + @@ -20,191 +21,195 @@ -
- -
-
-{% if messages %} -
- {% for message in messages %} + {% if messages %} +
+ {% for message in messages %} - {% endfor %} -
-{% endif %} + {% endfor %} +
+ {% endif %} -
- {% block content %}{% endblock %} -
+
+ {% block content %}{% endblock %} +
-
-
-

- {% block community_footer %}© Systers, an Anita Borg Community{% endblock %} -

+
+
+

+ {% block community_footer %}© Systers, an Anita Borg Community{% endblock %} +

+
+
-
-
- - - - - -{% block scripts %}{% endblock %} + + + + + + {% block scripts %}{% endblock %} - + + \ No newline at end of file diff --git a/systers_portal/templates/common/about_us.html b/systers_portal/templates/common/about_us.html index 4d9caca4..af3b8b17 100644 --- a/systers_portal/templates/common/about_us.html +++ b/systers_portal/templates/common/about_us.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% block content %}
@@ -7,22 +7,28 @@

About Systers

Systers Communities + alt="Systers Communities">

- It’s important to know that you are not alone. Systers is a forum for all women involved in the technical aspects of computing. - The list has over 4,000 members from at least 54 countries around the world. We welcome the participation of women technologists of - all ages and at any stage of their studies or careers. Systers is the world’s largest email community of women in technical roles in - computing. It was founded by Anita Borg in 1987 together with 12 other women as a small electronic mailing list for women in + It’s important to know that you are not alone. Systers is a forum for all women involved in the technical aspects + of computing. + The list has over 4,000 members from at least 54 countries around the world. We welcome the participation of women + technologists of + all ages and at any stage of their studies or careers. Systers is the world’s largest email community of women in + technical roles in + computing. It was founded by Anita Borg in 1987 together with 12 other women as a small electronic mailing list + for women in “systems”.

- Systers Portal is a unified platform for Systers and its sub-groups to share information and get the latest news. Special Interest - communities are also offered where Systers can identify themselves culturally to share and offer support in challenges within + Systers Portal is a unified platform for Systers and its sub-groups to share information and get the latest news. + Special Interest + communities are also offered where Systers can identify themselves culturally to share and offer support in + challenges within their communities.

-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/systers_portal/templates/common/contact.html b/systers_portal/templates/common/contact.html index 17f9d062..dfee6a8f 100644 --- a/systers_portal/templates/common/contact.html +++ b/systers_portal/templates/common/contact.html @@ -1,22 +1,25 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% block content %} -
-

Contact Systers

-
-

- Systers is curated by the current Systers-keeper, Rose Robinson. -

-

- You can also connect with Systers on our social networks. -

-
- - - - -
-
+
+

Contact Systers

+
+

+ Systers is curated by the current Systers-keeper, Rose Robinson. +

+

+ You can also connect with Systers on our social networks. +

+
+ + + +
-{% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/systers_portal/templates/common/index.html b/systers_portal/templates/common/index.html index be5ac5f1..7640d23f 100644 --- a/systers_portal/templates/common/index.html +++ b/systers_portal/templates/common/index.html @@ -1,89 +1,86 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% block content %} -
-

Welcome to Systers Portal!

+
+

Welcome to Systers Portal!

-

Systers is the world’s largest email community of women in - technical roles in computing. Systers Portal is a unified platform for - Systers and its sub-groups to share information and get the latest news.

-

- {% if not user.is_authenticated %} - Join Systers - {% endif %} -

-
-
-
-
-

Systers Communities

+

Systers is the world’s largest email community of women in + technical roles in computing. Systers Portal is a unified platform for + Systers and its sub-groups to share information and get the latest news.

+

+ {% if not user.is_authenticated %} + Join Systers + {% endif %} +

+
+
+
+
+

Systers Communities

-

Special Interest communities are those communities where - Systers can identify themselves culturally to share and offer support in - challenges within their communities.

- Read more -
-
- Systers Communities -
+

Special Interest communities are those communities where + Systers can identify themselves culturally to share and offer support in + challenges within their communities.

+ Read more +
+
+ Systers Communities
+
-
+
-
-
- Systers Initiatives -
-
-

Systers Initiatives

+
+
+ Systers Initiatives +
+
+

Systers Initiatives

-

In order to honor Anita’s desire to create a network of women - in computing actively helping each another, members of the Systers community - created the Anita Borg Systers Pass-It-On Awards program.

- Read more -
+

In order to honor Anita’s desire to create a network of women + in computing actively helping each another, members of the Systers community + created the Anita Borg Systers Pass-It-On Awards program.

+ Read more
+
-
+
-
-
-

Systers and CRA-W

+
+
+

Systers and CRA-W

-

CRA-W is the Computing - Research Association’s (CRA) committee on the Status of Women in Computing - research. CRA was the founding sponsor of the Institute’s flagship Conference, - the Grace Hopper Celebration of Women in Computing.

- Read more -
-
- Systers and CRA-W -
+

CRA-W is the Computing + Research Association’s (CRA) committee on the Status of Women in Computing + research. CRA was the founding sponsor of the Institute’s flagship Conference, + the Grace Hopper Celebration of Women in Computing.

+ Read more
+
+ Systers and CRA-W +
+
-
+
-
-
- Systers Technical Interests -
-
-

Systers Technical Interests

+
+
+ Systers Technical Interests +
+
+

Systers Technical Interests

-

Systers Technical Interests include Entrepreneurs, Systers-TechTalk, - Systers-IETF, Systers-FOSS, Systers-Dev, Student-ResearcHers.

- Read more -
+

Systers Technical Interests include Entrepreneurs, Systers-TechTalk, + Systers-IETF, Systers-FOSS, Systers-Dev, Student-ResearcHers.

+ Read more
+
-
-{% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/systers_portal/templates/common/new_community_proposal.html b/systers_portal/templates/common/new_community_proposal.html index 5929186e..b62d56f8 100644 --- a/systers_portal/templates/common/new_community_proposal.html +++ b/systers_portal/templates/common/new_community_proposal.html @@ -1,5 +1,7 @@ {% extends "base.html" %} -{% load staticfiles %} +{% load static %} {% block content %} - + {% endblock %} \ No newline at end of file diff --git a/systers_portal/templates/meetup/snippets/user-cell.html b/systers_portal/templates/meetup/snippets/user-cell.html index 9d926718..f734fa71 100644 --- a/systers_portal/templates/meetup/snippets/user-cell.html +++ b/systers_portal/templates/meetup/snippets/user-cell.html @@ -1,38 +1,41 @@ -{% load staticfiles %} +{% load static %} {% load guardian_tags %} {% if user.is_authenticated and user.is_active %} - {% get_obj_perms user for meetup_location as "meetup_location_perms" %} +{% get_obj_perms user for meetup_location as "meetup_location_perms" %} {% endif %}
{% if systersuser.profile_picture.name and systersuser.profile_picture.name != "False" %} - - {{ systersuser }} profile picture - + + {{ systersuser }} profile picture + {% else %} - - {{ systersuser }} profile picture - + + {{ systersuser }} profile picture + {% endif %}

{{ systersuser }}

{% if "delete_meetup_location_member" in meetup_location_perms %} - - Remove - + + Remove + {% endif %} {% if users == "Members" and "add_meetup_location_moderator" in meetup_location_perms %} - - Make Moderator - + + Make Moderator + {% endif %} {% if users == "Moderators" and "delete_meetup_location_moderator" in meetup_location_perms %} - - Remove Moderator - + + Remove Moderator + {% endif %} -
+
\ No newline at end of file