diff --git a/cleanup_dev_files.sh b/cleanup_dev_files.sh new file mode 100755 index 0000000000000000000000000000000000000000..dc7235faceedb67105ad59f8760953457efe9b70 --- /dev/null +++ b/cleanup_dev_files.sh @@ -0,0 +1,9 @@ +rm .gitignore +rm .gitlab-ci.yml +rm ./*.md +rm ./*.rst +rm ./*.txt +rm setup.py +rm -r .git +rm -r docs +rm -r tests diff --git a/docs/administrator_manual.rst b/docs/administrator_manual.rst index 2da8c0de18ec1c3f97e582f5f24d812a771842b9..e4841c978396a9f869ab3efcef5e514d10f71275 100644 --- a/docs/administrator_manual.rst +++ b/docs/administrator_manual.rst @@ -70,10 +70,81 @@ where ``cc`` is the country code and ``nnn`` is the national phone number). deactivate also the `Staff status` checkbox (to prevent that a member account gets access to the admin area). then, in the `GROUPS` section of the `user edit form`, associate the `members` group to the new member, by selecting -the group in the `AVAILABLE GROUPS` list and click on the right-arrow to move it to the `CHOSEN GROUPS` list. +the group in the `AVAILABLE GROUPS` list and click on the right-arrow to move it to the `CHOSEN GROUPS` list. more +member permissions can be granted individually (see next section) .. hint:: see the :ref:`programmer manual` on how to bulk create and update members on your website. +after a new member gets activated we normally sending a message to the member with his initial password +and some information on how to use our website - an example:: + + A warm Welcome to Kairos! + + My name is Andi and I look after our website at Kairos, which can be accessed + at https://kairos-gomera.org. + + To authenticate yourself, click on the bust symbol (top right of our website, in the menu). + Then, in the form that appears, please enter your membership number (___) in the Username + field, and in the field below your initial password (_______) (case sensitive!). + + After your authentication you can add your offers and requests in the menus 'Messages' and + 'Announcements' and view the contact details of all other members in the menu 'Members'. + Please do not forget to change your initial password. + + Further information on how to use our website can be found here: + https://kairos.readthedocs.io/en/latest/member_manual.html. + + If you have any problems, questions or suggestions about the website, I would be very happy + to receive a message/call (+34 608 697 146) or email (aecker2@gmail.com). + + +an example of a welcome message in Spanish:: + + ¡Bienvenido a Kairos! + + Mi nombre es Andi y me ocupo de nuestro sitio web en Kairos, + a la que puedes acceder en https://kairos-gomera.org. + + Para autentificarte, primero haz clic en el símbolo del busto/maniquí + (en la parte superior derecha de nuestro sitio web, en el menú). + A continuación, en el formulario que aparece, introduzca en el campo Nombre de usuario tu + número de socio (___) y en el campo debajo tu contraseña inicial (_______) + (tenga en cuenta que distingue entre mayúsculas y minúsculas). + + Una vez autentificado, podrás añadir tus ofertas y solicitudes en los menús "Mensajes" + y "Anuncios", y ver los datos de contacto de todos los demás miembros en el + menú "Miembros". No olvides cambiar tu contraseña inicial. + + Encontrarás más información para el usuario - lamentablemente hasta ahora sólo en + inglés - aquí: https://kairos.readthedocs.io/en/latest/member_manual.html. + + Si tienes algún problema, una pregunta o una sugerencia sobre el sitio web le agradecería si + me envias un mensaje/llamada (+34 608 69 71 46) o un correo electrónico (aecker2@gmail.com). + + +an example of a welcome message in German:: + + Herzlich willkommen zu Kairos! + + Mein Name ist Andi und ich kümmere mich bei Kairos um unsere Website, + die unter https://kairos-gomera.org erreichbar ist. + + Zur Authentifizierung klicke zuerst auf das Büste-/Männchen-Symbol + (oben rechts auf unserer Website, im Menü). + Gib dann bitte im daraufhin erscheinenden Formular, in das Feld Benutzername, deine + Mitgliedsnummer (___) und darunter Dein initiales Passwort (_______) + ein (bitte Groß-/Kleinschreibung beachten!). + + Nach Deiner Authentifizierung kannst Du in den Menüs `Mitteilungen` und `Inserate` + Deine Angebote und Nachfragen hinzufügen und im Menü `Mitglieder` die Kontaktdaten + aller anderen Mitglieder einsehen. Vergiss bitte nicht Dein initiales Passwort zu ändern. + + Weitere Benutzer-Infos findest Du - leider bisher nur in Englisch - hier: + https://kairos.readthedocs.io/en/latest/member_manual.html. + + Falls Du Probleme, Fragen oder Anregungen zur Website hast, würde ich mich über eine + Nachricht/Anruf (+34 608 69 71 46) oder Email (aecker2@gmail.com) sehr freuen. + member permissions ------------------ @@ -128,6 +199,8 @@ only in the edit mode the page structure button |page_structure_button|, situate ``admin toolbar``, gets enabled. after a click on this button a drop-down window is displaying the structure of the page content and allows you to reorder and edit the parts of the currently selected CMS page. +.. note:: don't forget to publish the changes from within the `pages` admin page. + check out the `page admin documentation of the Django CMS `__ for more information on changing the attribute settings, structure and content of a CMS page. diff --git a/docs/member_manual.rst b/docs/member_manual.rst index 57ed7af2e323af731f29ced162d35ac0798225ce..d1ac74e2e099e3bcd5f582b46e381cd2b903eb89 100644 --- a/docs/member_manual.rst +++ b/docs/member_manual.rst @@ -53,8 +53,8 @@ the navigation bar of this website: :scale: 120 % -member announces -================ +member announcements +==================== all announcements are grouped into categories, like for example `Care`, `Coaching`, `Everyday Help` or `Handicraft`. diff --git a/docs/programmer_manual.rst b/docs/programmer_manual.rst index aecebac4019d6c52179c136e30f922dd1d9749c2..878e631e40a6e547b9460d05e4b485b73a202e16 100644 --- a/docs/programmer_manual.rst +++ b/docs/programmer_manual.rst @@ -301,10 +301,18 @@ update from version Vx.x.xx to Vx.x.yy on pythonanywhere mv kairos kairos_Vx.x.yy git clone https://gitlab.com/ae-group/kairos cp kairos_Vx.x.yy/project.db kairos + cp -r kairos_Vx.x.yy/media kairos/media + cp -r kairos_Vx.x.yy/static kairos/static - .. hint:: ``x.x.xx`` is the penultimate and ``x.x.yy`` is the ultimate/last version. + .. note:: ``x.x.xx`` is the penultimate and ``x.x.yy`` is the ultimate/last web project version. -* go to the Web tab in pythonanywhere and reload the app (especially if you updated the gettext translation .mo files). + .. hint:: + optionally, to save disk space on your host, change the cwd to the project root folder and then + run the script ``./cleanup_dev_files.sh``. if you get a permission error then first make + the script executable with ``chmod +x cleanup_dev_files.sh``. when the script runs, you may need + to confirm the deletion of write-protected files (mostly under the .git/ folder) by hitting the `y` key. + +* go to the Web tab in pythonanywhere and reload the app. backup database, static and media files diff --git a/kairos/__init__.py b/kairos/__init__.py index 0abb3d4f648e090fdf364acf31edaaac5aba7d88..3765eaa4bc5c937a9226ebcf8d2b75f299f931d8 100644 --- a/kairos/__init__.py +++ b/kairos/__init__.py @@ -63,4 +63,4 @@ TODO: """ -__version__ = '0.3.84' +__version__ = '0.3.85'