Merge pull request #1 from Xpirix/separated_qgis_members

Separated qgis members

Author: Xpirix

README.md

@@ -85,7 +85,7 @@ make superuser
 
 If you wish to make use of [intercom.io](https://www.intercom.io), include a
 `private.py` file in `core.settings` with your `INTERCOM_APP_ID` as a string.
-The necessary code snippet is already included in `project_base.html`.
+The necessary code snippet is already included in `base_with_sidebar.html`.
 
 **google authentication**
 

backup-qgis.org.sh

@@ -3,7 +3,7 @@
 # The first time before running this script, connect once manually to 
 # accept the ssh key:
 
-# sftp sftp://changelog.qgis.org:2222 
+# sftp sftp://members.qgis.org:2222 
 
 #First the database backups on the remote server
 SOURCE=ftp/db
@@ -32,7 +32,7 @@ shopt -u nocasematch
 echo 'Source :' $SOURCE
 echo 'Destination :' $DEST
 echo 'Objective :' $OBJECTIVE
-lftp -u kartoza, sftp://changelog.qgis.org:2222 -e "mirror $REMOVE_FILE $SOURCE $DEST; bye"
+lftp -u kartoza, sftp://members.qgis.org:2222 -e "mirror $REMOVE_FILE $SOURCE $DEST; bye"
 #Next the media backups on the remote server
 SOURCE=ftp/media
 DEST=backups/media
@@ -60,4 +60,4 @@ shopt -u nocasematch
 echo 'Source :' $SOURCE
 echo 'Destination :' $DEST
 echo 'Objective :' $OBJECTIVE
-lftp -u kartoza, sftp://changelog.qgis.org:2222 -e "mirror $REMOVE_FILE $SOURCE $DEST; bye"
+lftp -u kartoza, sftp://members.qgis.org:2222 -e "mirror $REMOVE_FILE $SOURCE $DEST; bye"

deployment/.env.example

@@ -1,5 +1,5 @@
 # Copy paste the env variable as .env to use
-COMPOSE_PROJECT_NAME=projecta
+COMPOSE_PROJECT_NAME=qgis_changelog_website
 
 ## Btsync credentials notes:
 # The environment file should define two variables:
@@ -28,11 +28,11 @@ DATABASE_HOST=db
 
 # Django env
 DJANGO_SETTINGS_MODULE=core.settings.prod_docker
-VIRTUAL_HOST=projecta.kartoza.com
+VIRTUAL_HOST=members.qgis.org
 VIRTUAL_PORT=8080
 
 # DB Backups
-DUMPPREFIX=PG_projecta
+DUMPPREFIX=PG_QGIS_CHANGELOG
 
 
 # Nginx config
@@ -45,7 +45,7 @@ STATIC_VOLUME=./static
 BACKUPS_VOLUME=./backups
 
 # VALID_DOMAIN
-VALID_DOMAIN=["localhost", "changelog.kartoza.com", "staging.changelog.kartoza.com","changelog.qgis.org", "staging.changelog.qgis.org"]
+VALID_DOMAIN=["localhost", "members.qgis.org", "staging.members.qgis.org"]
 
 # Email
 EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'

deployment/docker-compose.yml

@@ -71,7 +71,7 @@ services:
       - static-data:/home/web/static:rw
       - media-data:/home/web/media:rw
       - reports-data:/home/web/reports
-    command: bash -c "npm run build && uwsgi --ini /uwsgi.conf"
+    command: bash -c "npm install && npm run build && uwsgi --ini /uwsgi.conf"
     links:
       - db:db
       # - smtp:smtp

deployment/projecta.nginx.conf

@@ -21,7 +21,7 @@ server {
     # the port your site will be served on
     listen      80;
     # the domain name it will serve for
-    server_name staging.projecta.kartoza.com changelog.linfiniti.com changelog.kartoza.com changelog.qgis.org changelog.inasafe.org;
+    server_name staging.projecta.kartoza.com changelog.linfiniti.com changelog.kartoza.com members.qgis.org changelog.inasafe.org;
     charset     utf-8;
 
     # max upload size, adjust to taste

django_project/base/forms.py

@@ -14,11 +14,13 @@
 )
 from .models import (
     Project, ProjectScreenshot, Domain, Organisation, ProjectFlatpage)
-from certification.forms import MultiSelectWidget
 
 logger = logging.getLogger(__name__)
 
 
+class MultiSelectWidget(forms.SelectMultiple):
+    template_name = 'widgets/multiselect.html'
+
 class ProjectScreenshotForm(forms.ModelForm):
     """Form to input a screenshot linked to a project."""
 

django_project/base/static/style/scss/map.scss

@@ -0,0 +1,77 @@
+
+.legend {
+  line-height: 18px;
+  color: #555;
+}
+.legend i {
+  width: 18px;
+  height: 16px;
+  float: left;
+  margin-right: 8px;
+  opacity: 0.7;
+}
+
+.info {
+  padding: 6px 8px;
+  background: white;
+  box-shadow: 0 0 15px rgba(0,0,0,0.2);
+  border-radius: 5px;
+  max-width: 300px;
+  max-height: 600px;
+  overflow: auto;
+}
+
+.info.top {
+  min-width: 300px;
+}
+
+.info h4 {
+  margin: 0 0 5px;
+  color: #777;
+}
+
+.info-sponsor-row {
+  margin-top: 8px;
+  margin-bottom: 8px;
+  font-size: 10pt;
+}
+
+.levels {
+  display: none;
+}
+
+.levels.info-sponsor-row {
+  height: 20px;
+}
+
+.lvl-image {
+  width: 20px;
+  min-height: 15px;
+  float: left;
+}
+
+.levels.info-image img {
+  width: 15px !important;
+  height: 15px !important;
+}
+
+.info-image{
+  width: 40px;
+  min-height: 40px;
+  float: left;
+  margin-right: 10px;
+}
+
+.info-image img {
+  max-width: 40px;
+  max-height: 35px;
+}
+
+.info-sponsor-row .sub-info {
+  font-size: 8pt;
+}
+
+.info hr {
+  margin-bottom: 5px !important;
+  margin-top: 5px !important;
+}

django_project/base/static/style/scss/style.scss

@@ -2,6 +2,7 @@
 @import "custom.bulma.scss";
 @import "sustaining_members.scss";
 @import "toogle-switch.scss";
+@import "map.scss";
 @import "../../../../node_modules/@creativebulma/bulma-tooltip/src/sass/index.sass";
 
 body {
@@ -360,15 +361,20 @@ a.is-active > span {
 
 .card {
   color: inherit !important;
-  transition: all 0.3s ease;
-  border: 1px solid $border;
 
   .card-header {
     box-shadow: 0 0.02em 0.25em rgba($scheme-invert, 0.1) !important;
   }
+}
 
-  &:hover {
-    box-shadow: $shadow-hover;
-    cursor: pointer;
-  }
+.rounded .rich-right img {
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+}
+
+.truncate-td {
+  display: block;
+  white-space: nowrap;
+  width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }

django_project/base/templates/account/profile.html

@@ -1,4 +1,4 @@
-{% extends "project_base.html" %}
+{% extends "base_with_sidebar.html" %}
 {% load static %}
 {% block title %}Profile Page{% endblock %}
 

django_project/base/templates/account/update.html

@@ -1,4 +1,4 @@
-{% extends "project_base.html" %}
+{% extends "base_with_sidebar.html" %}
 {% load static %}
 {% load crispy_forms_tags %}