From ccec9c0be71c4b9ae8d2ec7b2b34609e046123cd Mon Sep 17 00:00:00 2001 From: VJ pixel Date: Mon, 24 Jun 2019 19:19:43 -0300 Subject: [PATCH 01/76] Update home text --- src/ARte/core/jinja2/core/home.jinja2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/ARte/core/jinja2/core/home.jinja2 index eb5921d9..1f5ff040 100644 --- a/src/ARte/core/jinja2/core/home.jinja2 +++ b/src/ARte/core/jinja2/core/home.jinja2 @@ -27,8 +27,8 @@

Welcome to Jandig

- an opensource Augmented Reality art gallery and community -

First of all, you need to grant camera access to the app.

+ An open source Augmented Reality art community. +

To see the artworks you need to grant camera access to the app.

{{ _('Authorize camera') }}
@@ -37,4 +37,4 @@ {% endif %} {% include "core/footer.jinja2" %} - \ No newline at end of file + From d0d6027b3e5f758a6eb750abb4543b2d979e3fac Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Mon, 24 Jun 2019 23:56:38 -0300 Subject: [PATCH 02/76] Fix media url config --- src/ARte/config/urls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ARte/config/urls.py b/src/ARte/config/urls.py index 717e91a4..2a8bfaaf 100644 --- a/src/ARte/config/urls.py +++ b/src/ARte/config/urls.py @@ -11,5 +11,4 @@ path('docs/', include('docs.urls'), name='docs'), ] -if settings.DEBUG: - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file From c0cb185df783e5e24e2a0677a3d3e04ebd1049cf Mon Sep 17 00:00:00 2001 From: rodrigocam Date: Tue, 25 Jun 2019 10:41:37 -0300 Subject: [PATCH 03/76] Update all .po --- locale/en_US/LC_MESSAGES/django.po | 422 +++++++++++++++++++++++++++- locale/pt_BR/LC_MESSAGES/django.po | 407 +++++++++++++++++++++++---- locale/pt_BR/LC_MESSAGES/django.po~ | 67 ----- 3 files changed, 766 insertions(+), 130 deletions(-) delete mode 100644 locale/pt_BR/LC_MESSAGES/django.po~ diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index ff92d9f4..5a40018d 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-18 14:16-0300\n" +"POT-Creation-Date: 2019-06-25 10:40-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,42 +17,442 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/ARte/config/settings.py:136 +#: src/ARte/config/settings.py:137 msgid "English" msgstr "" -#: src/ARte/config/settings.py:137 +#: src/ARte/config/settings.py:138 msgid "Brazilian Portuguese" msgstr "" -#: src/ARte/users/forms.py:15 +#: src/ARte/users/forms.py:20 src/ARte/users/forms.py:81 msgid "Your e-mail address" msgstr "" -#: src/ARte/users/forms.py:20 +#: src/ARte/users/forms.py:25 src/ARte/users/forms.py:85 msgid "Your username" msgstr "" -#: src/ARte/users/forms.py:26 +#: src/ARte/users/forms.py:31 msgid "email" msgstr "" -#: src/ARte/users/forms.py:27 +#: src/ARte/users/forms.py:32 msgid "chosen username" msgstr "" -#: src/ARte/users/forms.py:28 src/ARte/users/forms.py:50 +#: src/ARte/users/forms.py:33 src/ARte/users/forms.py:121 msgid "password" msgstr "" -#: src/ARte/users/forms.py:29 +#: src/ARte/users/forms.py:34 msgid "confirm password" msgstr "" -#: src/ARte/users/forms.py:39 +#: src/ARte/users/forms.py:44 +msgid "E-mail taken" +msgstr "" + +#: src/ARte/users/forms.py:53 +msgid "Old Password" +msgstr "" + +#: src/ARte/users/forms.py:54 +msgid "New Password" +msgstr "" + +#: src/ARte/users/forms.py:55 +msgid "New Password Again" +msgstr "" + +#: src/ARte/users/forms.py:74 +msgid "E-mail" +msgstr "" + +#: src/ARte/users/forms.py:75 +msgid "Username" +msgstr "" + +#: src/ARte/users/forms.py:76 src/ARte/users/forms.py:95 +msgid "Personal Bio / Description" +msgstr "" + +#: src/ARte/users/forms.py:77 src/ARte/users/forms.py:99 +msgid "Personal Website" +msgstr "" + +#: src/ARte/users/forms.py:105 +msgid "Username already in use" +msgstr "" + +#: src/ARte/users/forms.py:111 msgid "Email address must be unique" msgstr "" -#: src/ARte/users/forms.py:49 +#: src/ARte/users/forms.py:120 msgid "username / email" msgstr "" + +#: src/ARte/users/forms.py:138 src/ARte/users/forms.py:139 +#: src/ARte/users/forms.py:152 +msgid "browse file" +msgstr "" + +#: src/ARte/users/forms.py:140 src/ARte/users/forms.py:153 +#: src/ARte/users/forms.py:174 src/ARte/users/forms.py:175 +msgid "declare different author name" +msgstr "" + +#: src/ARte/users/forms.py:176 +msgid "artwork title" +msgstr "" + +#: src/ARte/users/forms.py:177 +msgid "artwork description" +msgstr "" + +#: src/ARte/users/forms.py:197 +msgid "Exhibit Title" +msgstr "" + +#: src/ARte/users/forms.py:198 +msgid "Exhibit URL" +msgstr "" + +#: src/ARte/users/views.py:158 +msgid "marker" +msgstr "" + +#: src/ARte/users/views.py:202 +msgid "object" +msgstr "" + +#: src/ARte/core/jinja2/core/base.jinja2:33 +msgid "Please override the \"content\" block of your template!" +msgstr "" + +#: src/ARte/core/jinja2/core/collection.jinja2:11 +msgid "Jandig Exhibitions" +msgstr "" + +#: src/ARte/core/jinja2/core/collection.jinja2:17 +msgid "Jandig Artworks" +msgstr "" + +#: src/ARte/core/jinja2/core/collection.jinja2:23 +msgid "Jandig Markers" +msgstr "" + +#: src/ARte/core/jinja2/core/collection.jinja2:29 +msgid "Jandig Objects" +msgstr "" + +#: src/ARte/core/jinja2/core/exhibit_detail.jinja2:9 +msgid "Created by " +msgstr "" + +#: src/ARte/core/jinja2/core/exhibit_detail.jinja2:12 +msgid "Artworks" +msgstr "" + +#: src/ARte/core/jinja2/core/exhibit_select.jinja2:23 +#: src/ARte/users/jinja2/users/login.jinja2:26 +#: src/ARte/users/jinja2/users/profile-edit.jinja2:26 +#: src/ARte/users/jinja2/users/signup.jinja2:30 +#: src/ARte/users/jinja2/users/upload.jinja2:43 +msgid "Submit" +msgstr "" + +#: src/ARte/core/jinja2/core/footer.jinja2:3 +msgid "About us" +msgstr "" + +#: src/ARte/core/jinja2/core/footer.jinja2:4 +msgid "Jandig on Github" +msgstr "" + +#: src/ARte/core/jinja2/core/footer.jinja2:6 +msgid "Jandig on Instagram" +msgstr "" + +#: src/ARte/core/jinja2/core/footer.jinja2:10 +msgid "All content shared under this license." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:21 +msgid "No uploads yet." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:23 +#: src/ARte/core/jinja2/core/header.jinja2:25 +msgid " markers" +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:23 +#: src/ARte/core/jinja2/core/header.jinja2:27 +msgid " objects" +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:25 +msgid "No objects yet." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:27 +msgid "No markers yet." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:32 +msgid "No exhibits yet." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:34 +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:37 +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:46 +msgid " exhibits" +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:42 +#: src/ARte/users/jinja2/users/login.jinja2:10 +#: src/ARte/users/jinja2/users/signup.jinja2:8 +msgid "Sign up" +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:45 +#: src/ARte/users/jinja2/users/signup.jinja2:9 +msgid "Log in" +msgstr "" + +#: src/ARte/core/jinja2/core/home.jinja2:33 +msgid "Authorize camera" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:5 +msgid "AR Viewer" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:9 +msgid "Collection" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:12 +msgid "My Stuff" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:15 +msgid "About Us" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:9 +#: src/ARte/users/jinja2/users/profile.jinja2:82 +msgid "Create Jandig artwork" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:11 +msgid "select marker" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:14 +msgid "select object" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:20 +msgid "Select marker (1/3" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:27 +msgid "I'm this marker author" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:40 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:74 +#: src/ARte/users/jinja2/users/signup.jinja2:23 +msgid "Legal agreement" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:43 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:77 +msgid "Or choose one from our repository" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:50 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:84 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:31 +msgid "Next" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:54 +msgid "Select object (2/3" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:61 +msgid "I'm this object author" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:88 +msgid "About your artwork (3/3" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:97 +msgid "Publish Artwork" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:10 +msgid "Create Jandig exhibit" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:12 +msgid "select artworks" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:18 +msgid "Select Artworks (1/2" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:20 +msgid "Choose from your repository" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:35 +msgid "Exhibit Information (2/2" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:44 +msgid "Publish Exhibit" +msgstr "" + +#: src/ARte/users/jinja2/users/login.jinja2:9 +msgid "Login to continue" +msgstr "" + +#: src/ARte/users/jinja2/users/login.jinja2:29 +msgid "Recover password" +msgstr "" + +#: src/ARte/users/jinja2/users/profile-edit.jinja2:14 +msgid "Change Password" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:14 +msgid "Your Exhibitions" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:21 +msgid "You have no exhibits :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:22 +#: src/ARte/users/jinja2/users/profile.jinja2:33 +#: src/ARte/users/jinja2/users/profile.jinja2:44 +msgid "Create" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:25 +msgid "Your Artworks" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:32 +msgid "You have no artworks :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:36 +msgid "Your Markers" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:43 +msgid "You have no markers :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:47 +msgid "Your Objects" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:54 +msgid "You have no objects :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:55 +msgid "create" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:65 +msgid "Edit personal info" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:74 +msgid "Upload marker" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:77 +msgid "Upload object" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:85 +msgid "Create exhibition" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:90 +msgid "Log out" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:92 +msgid "Remove account" +msgstr "" + +#: src/ARte/users/jinja2/users/signup.jinja2:27 +msgid "Remember me" +msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:8 +msgid "Upload " +msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:31 +msgid "I'm this " +msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:31 +msgid " author" +msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:40 +msgid "" +"I agree to have this content on CC BY-SA 3.0" +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:20 +msgid "by " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:25 +msgid "Uploaded by " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:27 +msgid "in " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:34 +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:44 +msgid " Used in " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:35 +msgid " artworks" +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:36 +msgid " and in " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:74 +msgid "This is a Jandig " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:81 +msgid "Share this " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:84 +msgid "Create artwork with this " +msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index fd8b2ef4..30cafec7 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-18 16:31-0300\n" +"POT-Creation-Date: 2019-06-25 10:39-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,139 +18,442 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/ARte/config/settings.py:136 +#: src/ARte/config/settings.py:137 msgid "English" msgstr "" -#: src/ARte/config/settings.py:137 +#: src/ARte/config/settings.py:138 msgid "Brazilian Portuguese" msgstr "" -#: src/ARte/users/forms.py:17 +#: src/ARte/users/forms.py:20 src/ARte/users/forms.py:81 msgid "Your e-mail address" msgstr "" -#: src/ARte/users/forms.py:22 +#: src/ARte/users/forms.py:25 src/ARte/users/forms.py:85 msgid "Your username" msgstr "" -#: src/ARte/users/forms.py:28 +#: src/ARte/users/forms.py:31 msgid "email" msgstr "" -#: src/ARte/users/forms.py:29 +#: src/ARte/users/forms.py:32 msgid "chosen username" msgstr "" -#: src/ARte/users/forms.py:30 src/ARte/users/forms.py:52 +#: src/ARte/users/forms.py:33 src/ARte/users/forms.py:121 msgid "password" msgstr "" -#: src/ARte/users/forms.py:31 +#: src/ARte/users/forms.py:34 msgid "confirm password" msgstr "" -#: src/ARte/users/forms.py:41 +#: src/ARte/users/forms.py:44 +msgid "E-mail taken" +msgstr "" + +#: src/ARte/users/forms.py:53 +msgid "Old Password" +msgstr "" + +#: src/ARte/users/forms.py:54 +msgid "New Password" +msgstr "" + +#: src/ARte/users/forms.py:55 +msgid "New Password Again" +msgstr "" + +#: src/ARte/users/forms.py:74 +msgid "E-mail" +msgstr "" + +#: src/ARte/users/forms.py:75 +msgid "Username" +msgstr "" + +#: src/ARte/users/forms.py:76 src/ARte/users/forms.py:95 +msgid "Personal Bio / Description" +msgstr "" + +#: src/ARte/users/forms.py:77 src/ARte/users/forms.py:99 +msgid "Personal Website" +msgstr "" + +#: src/ARte/users/forms.py:105 +msgid "Username already in use" +msgstr "" + +#: src/ARte/users/forms.py:111 msgid "Email address must be unique" msgstr "" -#: src/ARte/users/forms.py:51 +#: src/ARte/users/forms.py:120 msgid "username / email" msgstr "" -#: src/ARte/users/forms.py:69 +#: src/ARte/users/forms.py:138 src/ARte/users/forms.py:139 +#: src/ARte/users/forms.py:152 msgid "browse file" msgstr "" -#: src/ARte/users/forms.py:70 +#: src/ARte/users/forms.py:140 src/ARte/users/forms.py:153 +#: src/ARte/users/forms.py:174 src/ARte/users/forms.py:175 msgid "declare different author name" msgstr "" -#: src/ARte/core/jinja2/core/base.jinja2:30 -#: src/ARte/core/jinja2/core/base2.jinja2:21 -msgid "Please override the \"content\" block of your template!" +#: src/ARte/users/forms.py:176 +msgid "artwork title" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:26 -#: src/ARte/users/jinja2/users/login.jinja2:9 -#: src/ARte/users/jinja2/users/signup.jinja2:8 -msgid "Sign up" +#: src/ARte/users/forms.py:177 +msgid "artwork description" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:33 -msgid "Repository" +#: src/ARte/users/forms.py:197 +msgid "Exhibit Title" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:34 -msgid "Get involved" +#: src/ARte/users/forms.py:198 +msgid "Exhibit URL" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:35 -msgid "Documentation" +#: src/ARte/users/views.py:158 +msgid "marker" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:55 -msgid "Authorize camera" +#: src/ARte/users/views.py:202 +msgid "object" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:63 -msgid "Legal text" +#: src/ARte/core/jinja2/core/base.jinja2:33 +msgid "Please override the \"content\" block of your template!" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:64 -msgid "Footer links" +#: src/ARte/core/jinja2/core/collection.jinja2:11 +msgid "Jandig Exhibitions" msgstr "" -#: src/ARte/users/jinja2/users/login.jinja2:8 -msgid "Login to continue" +#: src/ARte/core/jinja2/core/collection.jinja2:17 +msgid "Jandig Artworks" +msgstr "" + +#: src/ARte/core/jinja2/core/collection.jinja2:23 +msgid "Jandig Markers" +msgstr "" + +#: src/ARte/core/jinja2/core/collection.jinja2:29 +msgid "Jandig Objects" +msgstr "" + +#: src/ARte/core/jinja2/core/exhibit_detail.jinja2:9 +msgid "Created by " msgstr "" -#: src/ARte/users/jinja2/users/login.jinja2:25 +#: src/ARte/core/jinja2/core/exhibit_detail.jinja2:12 +msgid "Artworks" +msgstr "" + +#: src/ARte/core/jinja2/core/exhibit_select.jinja2:23 +#: src/ARte/users/jinja2/users/login.jinja2:26 +#: src/ARte/users/jinja2/users/profile-edit.jinja2:26 #: src/ARte/users/jinja2/users/signup.jinja2:30 +#: src/ARte/users/jinja2/users/upload.jinja2:43 msgid "Submit" msgstr "" -#: src/ARte/users/jinja2/users/login.jinja2:28 -msgid "Recover password" +#: src/ARte/core/jinja2/core/footer.jinja2:3 +msgid "About us" msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:9 -msgid "Edit personal info" +#: src/ARte/core/jinja2/core/footer.jinja2:4 +msgid "Jandig on Github" msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:10 -#: src/ARte/users/jinja2/users/upload-marker.jinja2:4 -msgid "Upload marker" +#: src/ARte/core/jinja2/core/footer.jinja2:6 +msgid "Jandig on Instagram" msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:11 -msgid "Upload object" +#: src/ARte/core/jinja2/core/footer.jinja2:10 +msgid "All content shared under this license." msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:12 -msgid "Create Jandig artwork" +#: src/ARte/core/jinja2/core/header.jinja2:21 +msgid "No uploads yet." msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:13 -msgid "Create exhibit" +#: src/ARte/core/jinja2/core/header.jinja2:23 +#: src/ARte/core/jinja2/core/header.jinja2:25 +msgid " markers" msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:16 -msgid "Log out" +#: src/ARte/core/jinja2/core/header.jinja2:23 +#: src/ARte/core/jinja2/core/header.jinja2:27 +msgid " objects" msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:17 -msgid "Remove account" +#: src/ARte/core/jinja2/core/header.jinja2:25 +msgid "No objects yet." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:27 +msgid "No markers yet." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:32 +msgid "No exhibits yet." +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:34 +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:37 +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:46 +msgid " exhibits" +msgstr "" + +#: src/ARte/core/jinja2/core/header.jinja2:42 +#: src/ARte/users/jinja2/users/login.jinja2:10 +#: src/ARte/users/jinja2/users/signup.jinja2:8 +msgid "Sign up" msgstr "" +#: src/ARte/core/jinja2/core/header.jinja2:45 #: src/ARte/users/jinja2/users/signup.jinja2:9 msgid "Log in" msgstr "" +#: src/ARte/core/jinja2/core/home.jinja2:33 +msgid "Authorize camera" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:5 +msgid "AR Viewer" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:9 +msgid "Collection" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:12 +msgid "My Stuff" +msgstr "" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:15 +msgid "About Us" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:9 +#: src/ARte/users/jinja2/users/profile.jinja2:82 +msgid "Create Jandig artwork" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:11 +msgid "select marker" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:14 +msgid "select object" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:20 +msgid "Select marker (1/3" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:27 +msgid "I'm this marker author" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:40 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:74 #: src/ARte/users/jinja2/users/signup.jinja2:23 msgid "Legal agreement" msgstr "" +#: src/ARte/users/jinja2/users/artwork-create.jinja2:43 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:77 +msgid "Or choose one from our repository" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:50 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:84 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:31 +msgid "Next" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:54 +msgid "Select object (2/3" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:61 +msgid "I'm this object author" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:88 +msgid "About your artwork (3/3" +msgstr "" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:97 +msgid "Publish Artwork" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:10 +msgid "Create Jandig exhibit" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:12 +msgid "select artworks" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:18 +msgid "Select Artworks (1/2" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:20 +msgid "Choose from your repository" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:35 +msgid "Exhibit Information (2/2" +msgstr "" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:44 +msgid "Publish Exhibit" +msgstr "" + +#: src/ARte/users/jinja2/users/login.jinja2:9 +msgid "Login to continue" +msgstr "" + +#: src/ARte/users/jinja2/users/login.jinja2:29 +msgid "Recover password" +msgstr "" + +#: src/ARte/users/jinja2/users/profile-edit.jinja2:14 +msgid "Change Password" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:14 +msgid "Your Exhibitions" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:21 +msgid "You have no exhibits :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:22 +#: src/ARte/users/jinja2/users/profile.jinja2:33 +#: src/ARte/users/jinja2/users/profile.jinja2:44 +msgid "Create" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:25 +msgid "Your Artworks" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:32 +msgid "You have no artworks :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:36 +msgid "Your Markers" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:43 +msgid "You have no markers :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:47 +msgid "Your Objects" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:54 +msgid "You have no objects :c" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:55 +msgid "create" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:65 +msgid "Edit personal info" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:74 +msgid "Upload marker" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:77 +msgid "Upload object" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:85 +msgid "Create exhibition" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:90 +msgid "Log out" +msgstr "" + +#: src/ARte/users/jinja2/users/profile.jinja2:92 +msgid "Remove account" +msgstr "" + #: src/ARte/users/jinja2/users/signup.jinja2:27 msgid "Remember me" msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:8 +msgid "Upload " +msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:31 +msgid "I'm this " +msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:31 +msgid " author" +msgstr "" + +#: src/ARte/users/jinja2/users/upload.jinja2:40 +msgid "" +"I agree to have this content on CC BY-SA 3.0" +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:20 +msgid "by " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:25 +msgid "Uploaded by " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:27 +msgid "in " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:34 +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:44 +msgid " Used in " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:35 +msgid " artworks" +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:36 +msgid " and in " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:74 +msgid "This is a Jandig " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:81 +msgid "Share this " +msgstr "" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:84 +msgid "Create artwork with this " +msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/django.po~ b/locale/pt_BR/LC_MESSAGES/django.po~ deleted file mode 100644 index 063c8e97..00000000 --- a/locale/pt_BR/LC_MESSAGES/django.po~ +++ /dev/null @@ -1,67 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-18 16:31-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: src/ARte/config/settings.py:136 -msgid "English" -msgstr "" - -#: src/ARte/config/settings.py:137 -msgid "Brazilian Portuguese" -msgstr "" - -#: src/ARte/users/forms.py:17 -msgid "Your e-mail address" -msgstr "" - -#: src/ARte/users/forms.py:22 -msgid "Your username" -msgstr "" - -#: src/ARte/users/forms.py:28 -msgid "email" -msgstr "" - -#: src/ARte/users/forms.py:29 -msgid "chosen username" -msgstr "" - -#: src/ARte/users/forms.py:30 src/ARte/users/forms.py:52 -msgid "password" -msgstr "" - -#: src/ARte/users/forms.py:31 -msgid "confirm password" -msgstr "" - -#: src/ARte/users/forms.py:41 -msgid "Email address must be unique" -msgstr "" - -#: src/ARte/users/forms.py:51 -msgid "username / email" -msgstr "" - -#: src/ARte/users/forms.py:69 -msgid "browse file" -msgstr "" - -#: src/ARte/users/forms.py:70 -msgid "declare different author name" -msgstr "" From c62c7ee16da01b6744b07132997b4476eaa52f71 Mon Sep 17 00:00:00 2001 From: rodrigocam Date: Tue, 25 Jun 2019 10:58:04 -0300 Subject: [PATCH 04/76] Comment out login/signup buttons and my stuff --- src/ARte/core/jinja2/core/header.jinja2 | 8 ++++---- src/ARte/core/jinja2/core/useful_links.jinja2 | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index f84240e6..9a4ff8de 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -38,12 +38,12 @@ {% else %}
- #}
{% endif %} diff --git a/src/ARte/core/jinja2/core/useful_links.jinja2 b/src/ARte/core/jinja2/core/useful_links.jinja2 index 00af89ee..6a7cd1aa 100644 --- a/src/ARte/core/jinja2/core/useful_links.jinja2 +++ b/src/ARte/core/jinja2/core/useful_links.jinja2 @@ -8,9 +8,9 @@ - + {# #} From 13f074fa9562412101162e973358af9a6f8bc7c9 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Tue, 25 Jun 2019 11:13:47 -0300 Subject: [PATCH 05/76] Add google analytics --- src/ARte/core/jinja2/core/arviewer.jinja2 | 9 +++++++++ src/ARte/core/jinja2/core/base.jinja2 | 9 +++++++++ src/ARte/core/jinja2/core/home.jinja2 | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/src/ARte/core/jinja2/core/arviewer.jinja2 b/src/ARte/core/jinja2/core/arviewer.jinja2 index 5a315345..1254a618 100644 --- a/src/ARte/core/jinja2/core/arviewer.jinja2 +++ b/src/ARte/core/jinja2/core/arviewer.jinja2 @@ -1,6 +1,15 @@ + + + Jandig ARte diff --git a/src/ARte/core/jinja2/core/base.jinja2 b/src/ARte/core/jinja2/core/base.jinja2 index e976c6f2..61ec5dd1 100644 --- a/src/ARte/core/jinja2/core/base.jinja2 +++ b/src/ARte/core/jinja2/core/base.jinja2 @@ -1,6 +1,15 @@ + + + diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/ARte/core/jinja2/core/home.jinja2 index 1f5ff040..b7b08927 100644 --- a/src/ARte/core/jinja2/core/home.jinja2 +++ b/src/ARte/core/jinja2/core/home.jinja2 @@ -1,6 +1,15 @@ + + + From 1f8ede7860bf4ab4d672adccf7343195afb9d9e6 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Tue, 25 Jun 2019 11:23:17 -0300 Subject: [PATCH 06/76] Remove photo button --- src/ARte/core/jinja2/core/base.jinja2 | 2 +- src/ARte/core/jinja2/core/ui.jinja2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ARte/core/jinja2/core/base.jinja2 b/src/ARte/core/jinja2/core/base.jinja2 index 61ec5dd1..f0de7010 100644 --- a/src/ARte/core/jinja2/core/base.jinja2 +++ b/src/ARte/core/jinja2/core/base.jinja2 @@ -45,6 +45,6 @@ {% endif %} {% include "core/ui.jinja2" %} {# #} - + {# #} \ No newline at end of file diff --git a/src/ARte/core/jinja2/core/ui.jinja2 b/src/ARte/core/jinja2/core/ui.jinja2 index 18c16cfa..ef94a177 100644 --- a/src/ARte/core/jinja2/core/ui.jinja2 +++ b/src/ARte/core/jinja2/core/ui.jinja2 @@ -1,9 +1,9 @@
-
+ {#
-
+
#}
\ No newline at end of file From df4a516265eec05b857df656992ea4c99c0bc0d7 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Tue, 25 Jun 2019 11:33:11 -0300 Subject: [PATCH 07/76] Fix double click on exhibit select --- src/ARte/core/jinja2/core/exhibit_select.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ARte/core/jinja2/core/exhibit_select.jinja2 b/src/ARte/core/jinja2/core/exhibit_select.jinja2 index 3c88d121..427dd3c7 100644 --- a/src/ARte/core/jinja2/core/exhibit_select.jinja2 +++ b/src/ARte/core/jinja2/core/exhibit_select.jinja2 @@ -25,7 +25,7 @@
\ No newline at end of file diff --git a/src/ARte/core/jinja2/core/language-select-modal.jinja2 b/src/ARte/core/jinja2/core/language-select-modal.jinja2 new file mode 100644 index 00000000..75a25523 --- /dev/null +++ b/src/ARte/core/jinja2/core/language-select-modal.jinja2 @@ -0,0 +1,18 @@ +{% extends '/users/components/generic-modal.jinja2' %} + + +{% block content %} + {# FIXME: maybe this can be improved #} + +
+ {# #} + {{ csrf_input }} + {% for language in LANGUAGES %} +

+ + +

+ {% endfor%} + +
+{% endblock %} \ No newline at end of file diff --git a/src/ARte/core/static/css/language-select-modal.css b/src/ARte/core/static/css/language-select-modal.css new file mode 100644 index 00000000..d3849ba1 --- /dev/null +++ b/src/ARte/core/static/css/language-select-modal.css @@ -0,0 +1,11 @@ +.modal-container { + height: 50%; + width: 50%; + margin-top: 50%; +} + +.modal-content { + position: inherit; + height: 35%; + margin: auto; +} \ No newline at end of file diff --git a/src/ARte/core/urls.py b/src/ARte/core/urls.py index c2ee23d5..215e0e52 100644 --- a/src/ARte/core/urls.py +++ b/src/ARte/core/urls.py @@ -1,5 +1,5 @@ -from django.urls import path, re_path -from .views import service_worker, index, upload_image, exhibit_select, collection, exhibit_detail +from django.urls import path, re_path, include +from .views import service_worker, index, upload_image, exhibit_select, collection, exhibit_detail, lang_selector from .views_s.home import home, ar_viewer, community, marker_generator urlpatterns = [ @@ -10,8 +10,8 @@ path('exhibit_select/', exhibit_select, name='exhibit_select'), path('exhibit/', exhibit_detail, name="exhibit-detail"), path('generator/', marker_generator, name='marker-generator'), - # path('agreement', *, *), - # path('agreement', *, *), path('sw.js', service_worker, name='sw'), path('upload', upload_image, name='upload-image'), + path('i18n/', include('django.conf.urls.i18n'), name='lang-selector'), + # path('lang', lang_selector, name='lang-selector'), ] diff --git a/src/ARte/core/views.py b/src/ARte/core/views.py index 506d6bef..1ede69ec 100644 --- a/src/ARte/core/views.py +++ b/src/ARte/core/views.py @@ -1,6 +1,8 @@ -from django.http import HttpResponseRedirect +from django.conf import settings +from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import render from django.urls import reverse +from django.utils import translation from django.shortcuts import redirect from .helpers import handle_upload_image @@ -8,6 +10,7 @@ from .models import Artwork2, Exhibit from users.models import Artwork, Marker, Object + def service_worker(request): return render(request, 'core/sw.js', content_type='application/x-javascript') @@ -60,4 +63,16 @@ def exhibit_detail(request): 'exhibitImage': "https://cdn3.iconfinder.com/data/icons/basic-mobile-part-2/512/painter-512.png", 'artworks': exhibit.artworks.all() } - return render(request, 'core/exhibit_detail.jinja2', ctx) \ No newline at end of file + return render(request, 'core/exhibit_detail.jinja2', ctx) + + +def lang_selector(request): + user_language = request.POST.get('language', '') + response = redirect('home') + if user_language: + print('old ' + translation.get_language()) + translation.activate(user_language) + print('new ' + translation.get_language()) + response.set_cookie(settings.LANGUAGE_COOKIE_NAME, user_language) + + return response \ No newline at end of file From 726305d9ea0f846e927036c2bff16ec46d6926a6 Mon Sep 17 00:00:00 2001 From: rodrigocam Date: Tue, 25 Jun 2019 23:10:04 -0300 Subject: [PATCH 19/76] Add .mo to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b500eaf4..d898fb90 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ package-lock.json # media files src/ARte/users/media/ docker/media/ + +# translations +*.mo \ No newline at end of file From 50ba17a1f78449c9727e3dc81b293ce28f6f11e6 Mon Sep 17 00:00:00 2001 From: rodrigocam Date: Wed, 26 Jun 2019 00:29:45 -0300 Subject: [PATCH 20/76] Fix change language feature --- src/ARte/config/settings.py | 7 ++++--- .../core/jinja2/core/language-select-modal.jinja2 | 9 +++++++-- src/ARte/core/urls.py | 3 +-- src/ARte/core/views.py | 12 ------------ 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/ARte/config/settings.py b/src/ARte/config/settings.py index 59a860ff..d3587b8e 100644 --- a/src/ARte/config/settings.py +++ b/src/ARte/config/settings.py @@ -128,14 +128,15 @@ # https://docs.djangoproject.com/en/2.1/topics/i18n/ LOCALE_PATHS = ( - os.path.join(str(ROOT_DIR), 'locale'), + # os.path.join(str(ROOT_DIR), 'locale'), + '/ARte/locale', ) LANGUAGE_CODE = 'en' LANGUAGES = ( - ('en_US', _('English')), - ('pt_BR', _('Brazilian Portuguese')), + ('en-us', _('English')), + ('pt-br', _('Brazilian Portuguese')), ) TIME_ZONE = 'UTC' diff --git a/src/ARte/core/jinja2/core/language-select-modal.jinja2 b/src/ARte/core/jinja2/core/language-select-modal.jinja2 index 75a25523..cfe5f762 100644 --- a/src/ARte/core/jinja2/core/language-select-modal.jinja2 +++ b/src/ARte/core/jinja2/core/language-select-modal.jinja2 @@ -4,8 +4,8 @@ {% block content %} {# FIXME: maybe this can be improved #} -
- {# #} + + {{ csrf_input }} {% for language in LANGUAGES %}

@@ -15,4 +15,9 @@ {% endfor%}

+ {% endblock %} \ No newline at end of file diff --git a/src/ARte/core/urls.py b/src/ARte/core/urls.py index 215e0e52..ebd3e692 100644 --- a/src/ARte/core/urls.py +++ b/src/ARte/core/urls.py @@ -12,6 +12,5 @@ path('generator/', marker_generator, name='marker-generator'), path('sw.js', service_worker, name='sw'), path('upload', upload_image, name='upload-image'), - path('i18n/', include('django.conf.urls.i18n'), name='lang-selector'), - # path('lang', lang_selector, name='lang-selector'), + path('i18n/', include('django.conf.urls.i18n')), ] diff --git a/src/ARte/core/views.py b/src/ARte/core/views.py index 1ede69ec..229fda5e 100644 --- a/src/ARte/core/views.py +++ b/src/ARte/core/views.py @@ -64,15 +64,3 @@ def exhibit_detail(request): 'artworks': exhibit.artworks.all() } return render(request, 'core/exhibit_detail.jinja2', ctx) - - -def lang_selector(request): - user_language = request.POST.get('language', '') - response = redirect('home') - if user_language: - print('old ' + translation.get_language()) - translation.activate(user_language) - print('new ' + translation.get_language()) - response.set_cookie(settings.LANGUAGE_COOKIE_NAME, user_language) - - return response \ No newline at end of file From 371e4f35b69f9164c43af3d01050d7c2e4a5859d Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Wed, 26 Jun 2019 10:44:59 -0300 Subject: [PATCH 21/76] Add translations on docker --- docker/Dockerfile | 4 +- docker/docker-compose.yml | 7 +- locale/pt_BR/LC_MESSAGES/django.po | 172 ++++++++++++--------- src/ARte/core/urls.py | 2 +- src/ARte/users/jinja2/users/profile.jinja2 | 1 - tasks.py | 2 +- 6 files changed, 109 insertions(+), 79 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8b1c7a9e..74c6f56d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /ARte COPY docs/ /ARte/docs/ COPY ./src/ARte /ARte/src/ARte/ COPY ./locale/ /ARte/locale/ - COPY ./tasks.py /ARte/tasks.py -COPY ./etc/babel.cfg /ARte/etc/babel.cfg +COPY ./etc/ /ARte/etc/ + RUN find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c0725179..a22d2b61 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -10,14 +10,15 @@ services: ports: - 8000:8000 volumes: - - ../src/ARte/:/src/ARte/ - - ./media/:/src/ARte/users/media/ + - ../src/ARte/:/ARte/src/ARte/ + - ../locale/:/ARte/locale/ + - ./media/:/ARte/src/ARte/users/media/ env_file: - ../src/.envs/.django - ../src/.envs/.postgres depends_on: - postgres - command: inv db -p docs collect run -p + command: inv db -p i18n --compile docs collect run -p postgres: image: postgres diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index 30cafec7..95579e25 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-06-25 10:39-0300\n" +"POT-Creation-Date: 2019-06-26 13:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/ARte/config/settings.py:137 +#: src/ARte/config/settings.py:138 msgid "English" msgstr "" -#: src/ARte/config/settings.py:138 +#: src/ARte/config/settings.py:139 msgid "Brazilian Portuguese" msgstr "" @@ -128,7 +128,7 @@ msgstr "" msgid "object" msgstr "" -#: src/ARte/core/jinja2/core/base.jinja2:33 +#: src/ARte/core/jinja2/core/base.jinja2:42 msgid "Please override the \"content\" block of your template!" msgstr "" @@ -169,6 +169,7 @@ msgid "About us" msgstr "" #: src/ARte/core/jinja2/core/footer.jinja2:4 +#: src/ARte/core/jinja2/core/footer.jinja2:9 msgid "Jandig on Github" msgstr "" @@ -176,55 +177,65 @@ msgstr "" msgid "Jandig on Instagram" msgstr "" +#: src/ARte/core/jinja2/core/footer.jinja2:7 +msgid "Jandig on Twitter" +msgstr "" + +#: src/ARte/core/jinja2/core/footer.jinja2:8 +msgid "Jandig on Facebook" +msgstr "" + #: src/ARte/core/jinja2/core/footer.jinja2:10 -msgid "All content shared under this license." +msgid "Jandig on Telegram" +msgstr "" + +#: src/ARte/core/jinja2/core/footer.jinja2:14 +msgid "Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:21 +#: src/ARte/core/jinja2/core/header.jinja2:29 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:11 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:18 msgid "No uploads yet." msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:23 -#: src/ARte/core/jinja2/core/header.jinja2:25 +#: src/ARte/core/jinja2/core/header.jinja2:31 +#: src/ARte/core/jinja2/core/header.jinja2:33 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:9 msgid " markers" msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:23 -#: src/ARte/core/jinja2/core/header.jinja2:27 +#: src/ARte/core/jinja2/core/header.jinja2:31 +#: src/ARte/core/jinja2/core/header.jinja2:35 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:16 msgid " objects" msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:25 +#: src/ARte/core/jinja2/core/header.jinja2:33 msgid "No objects yet." msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:27 +#: src/ARte/core/jinja2/core/header.jinja2:35 msgid "No markers yet." msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:32 +#: src/ARte/core/jinja2/core/header.jinja2:40 msgid "No exhibits yet." msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:34 +#: src/ARte/core/jinja2/core/header.jinja2:42 #: src/ARte/users/jinja2/users/components/elements-modal.jinja2:37 #: src/ARte/users/jinja2/users/components/elements-modal.jinja2:46 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:37 msgid " exhibits" msgstr "" -#: src/ARte/core/jinja2/core/header.jinja2:42 -#: src/ARte/users/jinja2/users/login.jinja2:10 -#: src/ARte/users/jinja2/users/signup.jinja2:8 -msgid "Sign up" -msgstr "" - -#: src/ARte/core/jinja2/core/header.jinja2:45 -#: src/ARte/users/jinja2/users/signup.jinja2:9 -msgid "Log in" +#: src/ARte/core/jinja2/core/home.jinja2:42 +msgid "Go to camera" msgstr "" -#: src/ARte/core/jinja2/core/home.jinja2:33 -msgid "Authorize camera" +#: src/ARte/core/jinja2/core/language-select-modal.jinja2:16 +msgid "Ok" msgstr "" #: src/ARte/core/jinja2/core/useful_links.jinja2:5 @@ -235,89 +246,85 @@ msgstr "" msgid "Collection" msgstr "" -#: src/ARte/core/jinja2/core/useful_links.jinja2:12 -msgid "My Stuff" -msgstr "" - #: src/ARte/core/jinja2/core/useful_links.jinja2:15 msgid "About Us" -msgstr "" +msgstr "Sobre nós" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:9 -#: src/ARte/users/jinja2/users/profile.jinja2:82 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:10 +#: src/ARte/users/jinja2/users/components/createbox.jinja2:12 msgid "Create Jandig artwork" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:11 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:12 msgid "select marker" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:14 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:15 msgid "select object" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:20 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:21 msgid "Select marker (1/3" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:27 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:28 msgid "I'm this marker author" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:40 -#: src/ARte/users/jinja2/users/artwork-create.jinja2:74 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:41 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:75 #: src/ARte/users/jinja2/users/signup.jinja2:23 msgid "Legal agreement" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:43 -#: src/ARte/users/jinja2/users/artwork-create.jinja2:77 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:44 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:78 msgid "Or choose one from our repository" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:50 -#: src/ARte/users/jinja2/users/artwork-create.jinja2:84 -#: src/ARte/users/jinja2/users/exhibit-create.jinja2:31 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:51 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:85 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:32 msgid "Next" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:54 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:55 msgid "Select object (2/3" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:61 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:62 msgid "I'm this object author" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:88 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:89 msgid "About your artwork (3/3" msgstr "" -#: src/ARte/users/jinja2/users/artwork-create.jinja2:97 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:98 msgid "Publish Artwork" msgstr "" -#: src/ARte/users/jinja2/users/exhibit-create.jinja2:10 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:11 msgid "Create Jandig exhibit" msgstr "" -#: src/ARte/users/jinja2/users/exhibit-create.jinja2:12 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:13 msgid "select artworks" msgstr "" -#: src/ARte/users/jinja2/users/exhibit-create.jinja2:18 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:19 msgid "Select Artworks (1/2" msgstr "" -#: src/ARte/users/jinja2/users/exhibit-create.jinja2:20 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:21 msgid "Choose from your repository" msgstr "" -#: src/ARte/users/jinja2/users/exhibit-create.jinja2:35 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:36 msgid "Exhibit Information (2/2" msgstr "" -#: src/ARte/users/jinja2/users/exhibit-create.jinja2:44 +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:45 msgid "Publish Exhibit" msgstr "" @@ -325,6 +332,11 @@ msgstr "" msgid "Login to continue" msgstr "" +#: src/ARte/users/jinja2/users/login.jinja2:10 +#: src/ARte/users/jinja2/users/signup.jinja2:8 +msgid "Sign up" +msgstr "" + #: src/ARte/users/jinja2/users/login.jinja2:29 msgid "Recover password" msgstr "" @@ -375,30 +387,18 @@ msgstr "" msgid "create" msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:65 -msgid "Edit personal info" -msgstr "" - -#: src/ARte/users/jinja2/users/profile.jinja2:74 -msgid "Upload marker" -msgstr "" - -#: src/ARte/users/jinja2/users/profile.jinja2:77 -msgid "Upload object" -msgstr "" - -#: src/ARte/users/jinja2/users/profile.jinja2:85 -msgid "Create exhibition" -msgstr "" - -#: src/ARte/users/jinja2/users/profile.jinja2:90 +#: src/ARte/users/jinja2/users/profile.jinja2:66 msgid "Log out" msgstr "" -#: src/ARte/users/jinja2/users/profile.jinja2:92 +#: src/ARte/users/jinja2/users/profile.jinja2:68 msgid "Remove account" msgstr "" +#: src/ARte/users/jinja2/users/signup.jinja2:9 +msgid "Log in" +msgstr "" + #: src/ARte/users/jinja2/users/signup.jinja2:27 msgid "Remember me" msgstr "" @@ -421,6 +421,18 @@ msgid "" "creativecommons.org/licenses/by-sa/3.0/\">CC BY-SA 3.0" msgstr "" +#: src/ARte/users/jinja2/users/components/createbox.jinja2:4 +msgid "Upload marker" +msgstr "" + +#: src/ARte/users/jinja2/users/components/createbox.jinja2:7 +msgid "Upload object" +msgstr "" + +#: src/ARte/users/jinja2/users/components/createbox.jinja2:15 +msgid "Create exhibition" +msgstr "" + #: src/ARte/users/jinja2/users/components/elements-modal.jinja2:20 msgid "by " msgstr "" @@ -439,6 +451,7 @@ msgid " Used in " msgstr "" #: src/ARte/users/jinja2/users/components/elements-modal.jinja2:35 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:26 msgid " artworks" msgstr "" @@ -457,3 +470,20 @@ msgstr "" #: src/ARte/users/jinja2/users/components/elements-modal.jinja2:84 msgid "Create artwork with this " msgstr "" + +#: src/ARte/users/jinja2/users/components/userbox.jinja2:22 +msgid "Edit personal info" +msgstr "" + +#: src/ARte/users/jinja2/users/components/userbox.jinja2:29 +msgid "No artworks yet." +msgstr "" + +#: src/ARte/users/jinja2/users/components/userbox.jinja2:32 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:43 +msgid "Create your first!" +msgstr "" + +#: src/ARte/users/jinja2/users/components/userbox.jinja2:40 +msgid "No exhibitions yet." +msgstr "" diff --git a/src/ARte/core/urls.py b/src/ARte/core/urls.py index ebd3e692..80281072 100644 --- a/src/ARte/core/urls.py +++ b/src/ARte/core/urls.py @@ -1,5 +1,5 @@ from django.urls import path, re_path, include -from .views import service_worker, index, upload_image, exhibit_select, collection, exhibit_detail, lang_selector +from .views import service_worker, index, upload_image, exhibit_select, collection, exhibit_detail from .views_s.home import home, ar_viewer, community, marker_generator urlpatterns = [ diff --git a/src/ARte/users/jinja2/users/profile.jinja2 b/src/ARte/users/jinja2/users/profile.jinja2 index da74d5fa..af9dbc77 100644 --- a/src/ARte/users/jinja2/users/profile.jinja2 +++ b/src/ARte/users/jinja2/users/profile.jinja2 @@ -64,7 +64,6 @@ diff --git a/tasks.py b/tasks.py index 823378fb..2901e5b7 100644 --- a/tasks.py +++ b/tasks.py @@ -124,7 +124,7 @@ def i18n(ctx, compile=False, edit=False, lang='pt_BR', keep_pot=False): ctx.run('pybabel extract -F ./etc/babel.cfg -o ./locale/jinja2.pot .') print('Join Django + Jinja translation files') - ctx.run('msgcat ./locale/jinja2.pot --use-first -o ./locale/join.pot', + ctx.run('msgcat ./locale/django.pot ./locale/jinja2.pot --use-first -o ./locale/join.pot', pty=True) ctx.run(r'''sed -i '/"Language: \\n"/d' ./locale/join.pot''', pty=True) From b18d00f78a4a20207689804cf937024d833adc7f Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Wed, 26 Jun 2019 11:10:03 -0300 Subject: [PATCH 22/76] Fix collection access offline --- src/ARte/core/jinja2/core/home.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/ARte/core/jinja2/core/home.jinja2 index 0f5d4156..8a13c9c6 100644 --- a/src/ARte/core/jinja2/core/home.jinja2 +++ b/src/ARte/core/jinja2/core/home.jinja2 @@ -29,7 +29,7 @@ {% if (request.user.is_authenticated and request.path == '/community/') or (request.path == '/community/')%} {% block community %} {% endblock %} - {% elif request.user.is_authenticated %} + {% elif (request.user.is_authenticated) or (request.path == '/collection/') %} {% block content %} {% endblock %} {% else %} From 29953d25f354df7676365ef566257f405095aa9a Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Wed, 26 Jun 2019 14:13:40 -0300 Subject: [PATCH 23/76] Fixing footer in small devices --- src/ARte/core/jinja2/core/footer.jinja2 | 2 +- src/ARte/core/jinja2/core/home.jinja2 | 2 +- src/ARte/core/static/css/reset.css | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/ARte/core/jinja2/core/footer.jinja2 b/src/ARte/core/jinja2/core/footer.jinja2 index 770020d1..de9c06e9 100644 --- a/src/ARte/core/jinja2/core/footer.jinja2 +++ b/src/ARte/core/jinja2/core/footer.jinja2 @@ -11,7 +11,7 @@
- {{ _('Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)') }} + {{ _('Content available under CC BY-SA 4.0 unless otherwise noted.') }} memelab
\ No newline at end of file diff --git a/src/ARte/core/jinja2/core/home.jinja2 b/src/ARte/core/jinja2/core/home.jinja2 index 8a13c9c6..fbb36697 100644 --- a/src/ARte/core/jinja2/core/home.jinja2 +++ b/src/ARte/core/jinja2/core/home.jinja2 @@ -39,7 +39,7 @@
An open source Augmented Reality art community.

To see the artworks you need to grant camera access to the app.

- {{ _('Go to camera') }} + {{ _('Go to camera') }}
diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index 4d739340..84482578 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -201,7 +201,7 @@ button.secondary { margin-left: -140px; height: 70px; float: right; - background: #fff; + /*background: #fff;*/ } .logo { @@ -332,7 +332,8 @@ div.contCam:before { margin: auto; } -.useful-links a { +.useful-links a, +.footer a.useful { /*font-size: 75%;*/ padding: 0 5px; background-image: linear-gradient(to top, #05f7ae, #05f7ae 50%, transparent 50%, transparent); @@ -402,7 +403,9 @@ a.license { background-size: contain; background-position: left center; background-repeat: no-repeat; - padding-left: 85px; + padding-left: 65px; + font-size: 0.5em; + line-height: 20px; margin-left: 0; text-align: left; } @@ -412,8 +415,8 @@ a.memelab { background-size: contain; background-position: left center; background-repeat: no-repeat; - width: 25px; - height: 25px; + width: 20px; + height: 20px; text-indent: -99999px; max-width: 35px; margin: 0; @@ -573,7 +576,7 @@ a.sq-github { line-height: 30px; } -a.instagram, a.twitter, a.facebook, a.telegram, a.sq-github { + a.instagram, a.twitter, a.facebook, a.telegram, a.sq-github { width: 30px; height: 30px; } @@ -584,6 +587,10 @@ a.instagram, a.twitter, a.facebook, a.telegram, a.sq-github { a.license { padding-left: 100px; + width: 30px; + height: 30px; + line-height: 30px; + font-size: 0.75em; } a.memelab { From 037a86860f8e94ee31884eed123e4e1bf61633f4 Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Wed, 26 Jun 2019 15:01:08 -0300 Subject: [PATCH 24/76] Fixing footer link --- src/ARte/core/jinja2/core/footer.jinja2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ARte/core/jinja2/core/footer.jinja2 b/src/ARte/core/jinja2/core/footer.jinja2 index de9c06e9..f6399fb7 100644 --- a/src/ARte/core/jinja2/core/footer.jinja2 +++ b/src/ARte/core/jinja2/core/footer.jinja2 @@ -1,6 +1,6 @@
- {{ _('About us') }} + {{ _('About Us') }}
- {{ _('Content available under CC BY-SA 4.0 unless otherwise noted.') }} + {{ _('Content under CC BY-SA 4.0 unless otherwise noted.') }} memelab
\ No newline at end of file From b614528eefbc0bd5149d57a49d958adf7796898f Mon Sep 17 00:00:00 2001 From: rodrigocam Date: Wed, 26 Jun 2019 15:34:25 -0300 Subject: [PATCH 25/76] Fix modal open --- src/ARte/core/jinja2/core/header.jinja2 | 2 +- .../jinja2/core/language-select-modal.jinja2 | 69 +++++++++++++++++-- .../core/static/css/language-select-modal.css | 62 ++++++++++++++++- .../users/components/generic-modal.jinja2 | 12 ++-- 4 files changed, 131 insertions(+), 14 deletions(-) diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 03cc4def..6d6fe4f6 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -8,7 +8,7 @@
-
+
Language
{% endblock %} \ No newline at end of file diff --git a/src/ARte/users/static/css/login.css b/src/ARte/users/static/css/login.css index 22a22156..ad74f28d 100644 --- a/src/ARte/users/static/css/login.css +++ b/src/ARte/users/static/css/login.css @@ -82,8 +82,8 @@ } -body{ +/*body{ background-image: url(../images/icons/bg.png); background-repeat: repeat-x; background-position: center top; -} \ No newline at end of file +}*/ \ No newline at end of file From 1973d5d7e616d71443f9d1129aa079046630895b Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Wed, 26 Jun 2019 17:55:11 -0300 Subject: [PATCH 28/76] Update header --- src/ARte/core/jinja2/core/header.jinja2 | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 6d6fe4f6..107bd9b4 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -20,28 +20,6 @@

Welcome, {{ request.user.username }}

-

- {% set markers = request.user.profile.marker_set.all()|length %} - {% set objects = request.user.profile.object_set.all()|length %} - {% set exhibits = request.user.profile.exhibits.all()|length %} - - {% if not markers and not objects %} - {{ _('No uploads yet.') }} - {% elif markers and objects%} - {{ markers }} {{ _(' markers') }} | {{ objects }} {{ _(' objects') }} - {% elif markers and not objects %} - {{ markers }} {{ _(' markers') }} | {{ _('No objects yet.') }} - {% else %} - {{ _('No markers yet.') }} | {{ objects }} {{ _(' objects') }} - {% endif %} -

-

- {% if not exhibits %} - {{ _('No exhibits yet.') }} - {% else %} - {{ exhibits }} {{ _(' exhibits') }} - {% endif %} -

{% else %} From 967e9e51bff5f9bcc691e3a1011eb5209b509955 Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Wed, 26 Jun 2019 19:06:39 -0300 Subject: [PATCH 29/76] Fixing content --- src/ARte/core/static/css/reset.css | 2 +- .../users/jinja2/users/artwork-create.jinja2 | 2 +- .../jinja2/users/components/userbox.jinja2 | 2 ++ src/ARte/users/jinja2/users/upload.jinja2 | 18 +++++++++++------- src/ARte/users/static/css/upload.css | 8 ++++---- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index cdca8f12..46ee480a 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -137,7 +137,7 @@ button, .button { border: none; } -input:disabled, input[type="submit" i]:disabled, input[type=submit]:disable, button.disable { +input:disabled, input[type="submit" i]:disabled, input[type=submit]:disabled, button.disabled { opacity: 0.2; pointer-events: none; } diff --git a/src/ARte/users/jinja2/users/artwork-create.jinja2 b/src/ARte/users/jinja2/users/artwork-create.jinja2 index 7d95fd48..dbeea71b 100644 --- a/src/ARte/users/jinja2/users/artwork-create.jinja2 +++ b/src/ARte/users/jinja2/users/artwork-create.jinja2 @@ -7,7 +7,7 @@ -

{{ _('Create Jandig artwork') }}

+

{{ _('Create Jandig artwork') }}

diff --git a/src/ARte/users/jinja2/users/components/userbox.jinja2 b/src/ARte/users/jinja2/users/components/userbox.jinja2 index 8c405560..7747ef31 100644 --- a/src/ARte/users/jinja2/users/components/userbox.jinja2 +++ b/src/ARte/users/jinja2/users/components/userbox.jinja2 @@ -26,6 +26,7 @@ {{ _('Jandig Artist')}} +
{{ artworks }} {{ _(' artworks') }} {% else %}
@@ -43,6 +44,7 @@ {{ _('Jandig Curator')}} +
{{ exhibits }} {{ _(' exhibits') }} {% else %}
diff --git a/src/ARte/users/jinja2/users/upload.jinja2 b/src/ARte/users/jinja2/users/upload.jinja2 index bcad740f..3f2dcc92 100644 --- a/src/ARte/users/jinja2/users/upload.jinja2 +++ b/src/ARte/users/jinja2/users/upload.jinja2 @@ -5,26 +5,30 @@ {# FIXME: maybe this can be improved #} -

{{ _('Upload ') }} {{ form_type }}

+

{{ _('Upload ') }} {{ form_type }}

{{ csrf_input }}

{%if route == 'object-upload' %} - Choose object +

Choose object

{% else %} - Choose marker image +
+ No marker files yet? Don't fret! You can get them + here. +
+

Choose marker image

{% endif %} {{ form.visible_fields()[0] }} {{ form.visible_fields()[0].errors }}

{% if form_type == 'marker' %} -

- Choose patt +

Choose .patt file

+
{{ form.visible_fields()[2] }} {{ form.visible_fields()[2].errors }} -

+
{% endif %}

@@ -37,7 +41,7 @@

- {{ _('I agree to have this content on CC BY-SA 3.0') }} + {{ _('I agree to have this content under CC BY-SA 3.0') }}

diff --git a/src/ARte/users/static/css/upload.css b/src/ARte/users/static/css/upload.css index f3b804dd..63046d93 100644 --- a/src/ARte/users/static/css/upload.css +++ b/src/ARte/users/static/css/upload.css @@ -1,9 +1,9 @@ .upload{ - text-align: center; - margin-bottom: 4%; + /*text-align: center;*/ + margin-bottom: 20px; } -.upload-form { +/*.upload-form { border: 1px solid #4F4545; background-color: white; } @@ -26,7 +26,7 @@ text-align: center; border-radius: 8px; border-color: #4286f4; -} +}*/ .form-options{ text-align: left; From af16d83ea88e4aa227f81c03d78e726064258920 Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Wed, 26 Jun 2019 20:31:06 -0300 Subject: [PATCH 30/76] Testing reset.css update --- src/ARte/core/static/css/reset.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index 46ee480a..7f4e1324 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -204,6 +204,7 @@ button.secondary { .header { margin-top: 25px; + font-size: 75%; } .aside { @@ -308,6 +309,7 @@ div.contCam:before { border-style: solid; border-width: 7px; pointer-events: none; + z-index: 1; } .animCam { @@ -335,6 +337,7 @@ div.contCam:before { font-size: 0.75em; font-weight: bold; clear: both; + font-size: 75%; } .useful-links .container { @@ -467,11 +470,11 @@ a.sq-github { } /* Media Queries */ -@media all and (max-width: 400px) { +/*@media all and (max-width: 400px) { .header, .useful-links { font-size: 75%; } -} +}*/ @media all and (min-width: 800px) { .container { @@ -630,6 +633,12 @@ a.sq-github { opacity: 0.8; } +.editProf a.option-link:hover, +.welcome a { + transition: all .2s ease-in; + color: #06f7ae; +} + /****** Animation ********/ .animCam { From bc1e3d7415318ca03af069393404ab0c33ef5b73 Mon Sep 17 00:00:00 2001 From: VJ pixel Date: Wed, 26 Jun 2019 22:33:40 -0300 Subject: [PATCH 31/76] Updated footer Updated Twitter link and added Telegram link --- src/ARte/core/jinja2/core/footer.jinja2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ARte/core/jinja2/core/footer.jinja2 b/src/ARte/core/jinja2/core/footer.jinja2 index f6399fb7..ef59ec43 100644 --- a/src/ARte/core/jinja2/core/footer.jinja2 +++ b/src/ARte/core/jinja2/core/footer.jinja2 @@ -4,14 +4,14 @@
{{ _('Content under CC BY-SA 4.0 unless otherwise noted.') }} memelab
-
\ No newline at end of file + From dc4f018bfa35a7759250873a5cd3fde57c062dd3 Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 08:50:10 -0300 Subject: [PATCH 32/76] Containers corretions --- src/ARte/core/jinja2/core/header.jinja2 | 5 ++-- src/ARte/core/static/css/reset.css | 31 ++++++++++++----------- src/ARte/users/jinja2/users/upload.jinja2 | 4 +-- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 107bd9b4..14e01f88 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -32,7 +32,8 @@
#}
{% endif %} - {% include "core/language-select-modal.jinja2" %}
- \ No newline at end of file + + +{% include "core/language-select-modal.jinja2" %} diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index 7f4e1324..a0966692 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -114,35 +114,36 @@ blockquote { background-size: 100% 200%;*/ } -input[type=submit], input[type="submit" i] { +input { width: 100%; - margin: 20px 0 0 0; - color: #fff; + height: 40px; +} + +input[type=submit], +input[type="submit" i], +button, +.button { + width: 100%; + margin: 20px 0; background: #000; border: none; + color: #fff; + font-weight: bold; font-size: 0.75em; + line-height: 40px; text-transform: uppercase; padding: 10px 0; -} - -button, .button { - background: #000; - width: 100%; - line-height: 40px; - margin: 10px 0; text-align: center; display: inline-block; - color: #fff; - font-weight: bold; - border: none; } input:disabled, input[type="submit" i]:disabled, input[type=submit]:disabled, button.disabled { - opacity: 0.2; + opacity: 0.4; pointer-events: none; } -button.secondary { +button.secondary, +input[type=submit].secondary { background: #666; width: 100%; line-height: 30px; diff --git a/src/ARte/users/jinja2/users/upload.jinja2 b/src/ARte/users/jinja2/users/upload.jinja2 index 3f2dcc92..246fb2ed 100644 --- a/src/ARte/users/jinja2/users/upload.jinja2 +++ b/src/ARte/users/jinja2/users/upload.jinja2 @@ -1,7 +1,7 @@ {% extends '/core/home.jinja2' %} {% block content %} -
+
{# FIXME: maybe this can be improved #} @@ -41,7 +41,7 @@

- {{ _('I agree to have this content under CC BY-SA 3.0') }} + {{ _('I agree to have this content under CC BY-SA 4.0') }}

From 92b40cf160057fa017e9520e4a17567e601b09eb Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 09:07:09 -0300 Subject: [PATCH 33/76] Adding classe to lang-modal Add modal and modal-container classes in order to hide it in the layout --- src/ARte/core/jinja2/core/language-select-modal.jinja2 | 4 ++-- src/ARte/users/jinja2/users/artwork-create.jinja2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ARte/core/jinja2/core/language-select-modal.jinja2 b/src/ARte/core/jinja2/core/language-select-modal.jinja2 index 7292dc44..a147e44b 100644 --- a/src/ARte/core/jinja2/core/language-select-modal.jinja2 +++ b/src/ARte/core/jinja2/core/language-select-modal.jinja2 @@ -1,10 +1,10 @@ {# {% extends '/users/components/generic-modal.jinja2' %} #} -
+
{# FIXME: maybe this can be improved #} -
+

{{ _('Select your language') }}

{# FIXME: maybe this can be improved #} diff --git a/src/ARte/users/jinja2/users/artwork-create.jinja2 b/src/ARte/users/jinja2/users/artwork-create.jinja2 index dbeea71b..1af1a29b 100644 --- a/src/ARte/users/jinja2/users/artwork-create.jinja2 +++ b/src/ARte/users/jinja2/users/artwork-create.jinja2 @@ -2,7 +2,7 @@ {% block content %} -
+
{# FIXME: maybe this can be improved #} From 2bef25c1b27bd2c13acf49c91d414f2dccabc04f Mon Sep 17 00:00:00 2001 From: VJ pixel Date: Thu, 27 Jun 2019 11:13:22 -0300 Subject: [PATCH 34/76] Update translation to PT-BR Updates the translation to Brazilian Portuguese --- locale/pt_BR/LC_MESSAGES/django.po | 72 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index fd8b2ef4..65a5408f 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -3,68 +3,68 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-18 16:31-0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"PO-Revision-Date: 2019-06-26 21:24-0300\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Last-Translator: \n" +"Language-Team: \n" +"X-Generator: Poedit 2.2.3\n" #: src/ARte/config/settings.py:136 msgid "English" -msgstr "" +msgstr "Inglês" #: src/ARte/config/settings.py:137 msgid "Brazilian Portuguese" -msgstr "" +msgstr "Português do Brasil" #: src/ARte/users/forms.py:17 msgid "Your e-mail address" -msgstr "" +msgstr "Seu endereço de e-mail" #: src/ARte/users/forms.py:22 msgid "Your username" -msgstr "" +msgstr "Seu nome de usuário" #: src/ARte/users/forms.py:28 msgid "email" -msgstr "" +msgstr "e-mail" #: src/ARte/users/forms.py:29 msgid "chosen username" -msgstr "" +msgstr "nome de usuário escolhido" #: src/ARte/users/forms.py:30 src/ARte/users/forms.py:52 msgid "password" -msgstr "" +msgstr "senha" #: src/ARte/users/forms.py:31 msgid "confirm password" -msgstr "" +msgstr "confirmar senha" #: src/ARte/users/forms.py:41 msgid "Email address must be unique" -msgstr "" +msgstr "O endereço de e-mail deve ser único" #: src/ARte/users/forms.py:51 msgid "username / email" -msgstr "" +msgstr "nome de usuário / e-mail" #: src/ARte/users/forms.py:69 msgid "browse file" -msgstr "" +msgstr "procurar arquivo" #: src/ARte/users/forms.py:70 msgid "declare different author name" -msgstr "" +msgstr "declarar outro autor" #: src/ARte/core/jinja2/core/base.jinja2:30 #: src/ARte/core/jinja2/core/base2.jinja2:21 @@ -75,23 +75,23 @@ msgstr "" #: src/ARte/users/jinja2/users/login.jinja2:9 #: src/ARte/users/jinja2/users/signup.jinja2:8 msgid "Sign up" -msgstr "" +msgstr "Cadastro" #: src/ARte/core/jinja2/core/home.jinja2:33 msgid "Repository" -msgstr "" +msgstr "Repositório" #: src/ARte/core/jinja2/core/home.jinja2:34 msgid "Get involved" -msgstr "" +msgstr "Envolva-se" #: src/ARte/core/jinja2/core/home.jinja2:35 msgid "Documentation" -msgstr "" +msgstr "Documentação" #: src/ARte/core/jinja2/core/home.jinja2:55 msgid "Authorize camera" -msgstr "" +msgstr "Autorizar câmera" #: src/ARte/core/jinja2/core/home.jinja2:63 msgid "Legal text" @@ -99,53 +99,53 @@ msgstr "" #: src/ARte/core/jinja2/core/home.jinja2:64 msgid "Footer links" -msgstr "" +msgstr "Links do rodapé" #: src/ARte/users/jinja2/users/login.jinja2:8 msgid "Login to continue" -msgstr "" +msgstr "Faça login para continuar" #: src/ARte/users/jinja2/users/login.jinja2:25 #: src/ARte/users/jinja2/users/signup.jinja2:30 msgid "Submit" -msgstr "" +msgstr "Enviar" #: src/ARte/users/jinja2/users/login.jinja2:28 msgid "Recover password" -msgstr "" +msgstr "Recuperar senha" #: src/ARte/users/jinja2/users/profile.jinja2:9 msgid "Edit personal info" -msgstr "" +msgstr "Editar dados pessoais" #: src/ARte/users/jinja2/users/profile.jinja2:10 #: src/ARte/users/jinja2/users/upload-marker.jinja2:4 msgid "Upload marker" -msgstr "" +msgstr "Subir marcador" #: src/ARte/users/jinja2/users/profile.jinja2:11 msgid "Upload object" -msgstr "" +msgstr "Subir objeto" #: src/ARte/users/jinja2/users/profile.jinja2:12 msgid "Create Jandig artwork" -msgstr "" +msgstr "Criar obra Jandig" #: src/ARte/users/jinja2/users/profile.jinja2:13 msgid "Create exhibit" -msgstr "" +msgstr "Criar exposição" #: src/ARte/users/jinja2/users/profile.jinja2:16 msgid "Log out" -msgstr "" +msgstr "Sair" #: src/ARte/users/jinja2/users/profile.jinja2:17 msgid "Remove account" -msgstr "" +msgstr "Remover conta" #: src/ARte/users/jinja2/users/signup.jinja2:9 msgid "Log in" -msgstr "" +msgstr "Entrar" #: src/ARte/users/jinja2/users/signup.jinja2:23 msgid "Legal agreement" @@ -153,4 +153,4 @@ msgstr "" #: src/ARte/users/jinja2/users/signup.jinja2:27 msgid "Remember me" -msgstr "" +msgstr "Lembre-se de mim" From e8791856a29cd755d7e6f39b487dae9e2ce3c388 Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 11:51:51 -0300 Subject: [PATCH 35/76] Minor corrections --- src/ARte/core/jinja2/core/footer.jinja2 | 2 +- src/ARte/core/jinja2/core/header.jinja2 | 4 +-- src/ARte/core/static/css/home.css | 4 +++ src/ARte/core/static/css/reset.css | 34 +++++++++++++------ .../users/jinja2/users/profile-edit.jinja2 | 5 +++ src/ARte/users/jinja2/users/profile.jinja2 | 5 --- 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/ARte/core/jinja2/core/footer.jinja2 b/src/ARte/core/jinja2/core/footer.jinja2 index ef59ec43..031f87b6 100644 --- a/src/ARte/core/jinja2/core/footer.jinja2 +++ b/src/ARte/core/jinja2/core/footer.jinja2 @@ -7,7 +7,7 @@ {{ _('Jandig on Github') }} - + {{ _('Jandig on Telegram') }}
diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 14e01f88..2e6f283b 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -8,9 +8,7 @@
-
- Language -
+ Language
diff --git a/src/ARte/core/static/css/home.css b/src/ARte/core/static/css/home.css index 447408c4..94d76f31 100644 --- a/src/ARte/core/static/css/home.css +++ b/src/ARte/core/static/css/home.css @@ -79,6 +79,10 @@ a:visited{ background-image: url(../images/icons/fill.png); } +.use-guide blockquote:before, .use-guide blockquote:after { + background-image: #f1f1f1; +} + /*.text-content{ border: 1px solid #4F4545; margin-top: 5%; diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index a0966692..33cd2791 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -35,22 +35,24 @@ a, a:visited { h1 { font-size: 1.25em; - line-height: 1.75em; + line-height: 50px; background-image: linear-gradient(to top, #77777766, #77777766 50%, transparent 50%, transparent); background-position: 100% 15%; background-size: 100% 200%; - margin-top: 40px; + margin-top: 10px; } h2 { font-size: 1.25em; color: #03b595; + margin: 30px auto 10px; } h3 { - font-size: 1.25em; + font-size: 1.1em; + line-height: 20px; text-align: left; - padding-left: 30px; + /* padding-left: 15px; */ } h3:before { @@ -58,7 +60,7 @@ h3:before { height: 20px; background: #03b595; display: inline-block; - margin: 5px 10px -3px -10px; + margin: 5px 10px -3px 0px; content: ' '; } @@ -105,13 +107,25 @@ ul, ol { blockquote { font-size: 1.1em; - line-height: 2.25em; - margin: 2em 5em; + line-height: 2em; + margin: 10px 40px; color: #888; font-style: italic; - /*background-image: linear-gradient(to top, #77777766, #77777766 50%, transparent 50%, transparent); - background-position: 100% 10%; - background-size: 100% 200%;*/ +} + +blockquote:before, blockquote:after { + max-width: 40px; + height: 40px; + display: block; + margin: 0 auto -20px 0; + background-image: url(../static/images/icons/fill.png); + content: ''; + text-align: left; +} + +blockquote:after { + text-align: right; + margin: -30px 0 20px auto; } input { diff --git a/src/ARte/users/jinja2/users/profile-edit.jinja2 b/src/ARte/users/jinja2/users/profile-edit.jinja2 index 42dffdb9..08c33be5 100644 --- a/src/ARte/users/jinja2/users/profile-edit.jinja2 +++ b/src/ARte/users/jinja2/users/profile-edit.jinja2 @@ -2,6 +2,11 @@ {% block content %}
+ +
{{ csrf_input }} diff --git a/src/ARte/users/jinja2/users/profile.jinja2 b/src/ARte/users/jinja2/users/profile.jinja2 index 414d7fff..23b7dad4 100644 --- a/src/ARte/users/jinja2/users/profile.jinja2 +++ b/src/ARte/users/jinja2/users/profile.jinja2 @@ -62,11 +62,6 @@ {% include "users/components/createbox.jinja2" %} - -
{% endblock %} \ No newline at end of file From 60bc476be693ef31526ddc1ed97050efb4266502 Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 12:11:42 -0300 Subject: [PATCH 36/76] Adding hidden and new buttons --- src/ARte/core/jinja2/core/header.jinja2 | 8 ++--- src/ARte/core/jinja2/core/ui.jinja2 | 4 +++ src/ARte/core/jinja2/core/useful_links.jinja2 | 32 +++++++++---------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 2e6f283b..25c92886 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -22,12 +22,12 @@ {% else %}
- {#
{% endif %} diff --git a/src/ARte/core/jinja2/core/ui.jinja2 b/src/ARte/core/jinja2/core/ui.jinja2 index ef94a177..ef9eecb2 100644 --- a/src/ARte/core/jinja2/core/ui.jinja2 +++ b/src/ARte/core/jinja2/core/ui.jinja2 @@ -1,5 +1,9 @@
+
+ {{ _('Change exhibition') }} + {{ _('Back to home') }} +
{#
diff --git a/src/ARte/core/jinja2/core/useful_links.jinja2 b/src/ARte/core/jinja2/core/useful_links.jinja2 index 6a7cd1aa..089d1b28 100644 --- a/src/ARte/core/jinja2/core/useful_links.jinja2 +++ b/src/ARte/core/jinja2/core/useful_links.jinja2 @@ -1,19 +1,19 @@
-
-
-
- {{ _('AR Viewer') }} -
-
- - {# #} - - +
+
+
+ {{ _('AR Viewer') }}
+
+ + + + +
\ No newline at end of file From 27b96205b04ac9ed6dd665089c5fcbbf8cb0ff9a Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 12:32:10 -0300 Subject: [PATCH 37/76] Formatting Exhibition view --- src/ARte/core/jinja2/core/exhibit_detail.jinja2 | 12 ++++++------ src/ARte/core/static/css/home.css | 4 ++-- src/ARte/core/static/css/reset.css | 12 ++++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/ARte/core/jinja2/core/exhibit_detail.jinja2 b/src/ARte/core/jinja2/core/exhibit_detail.jinja2 index 1c995fa9..7cf2f911 100644 --- a/src/ARte/core/jinja2/core/exhibit_detail.jinja2 +++ b/src/ARte/core/jinja2/core/exhibit_detail.jinja2 @@ -3,13 +3,13 @@ {% block content %}
- -

{{exhibit.name}}

-

{{exhibit.slug}}

-

{{_("Created by ")}} {{exhibit.owner.user.username}}

+ {# #} +

{{exhibit.name}}

+

{{ url('home') }}/{{exhibit.slug}}

+

{{_("Created by ")}} {{exhibit.owner.user.username}}

-

{{exhibit.artworks_count}} artworks | Published on {{exhibit.date}}

- {{_("Artworks")}} +

{{exhibit.artworks_count}} artworks | Published on {{exhibit.date}}

+

{{_("Artworks")}}

{% with repository_list = artworks, element_type="artwork" %} {% include "users/components/item-list.jinja2" %} {% endwith %} diff --git a/src/ARte/core/static/css/home.css b/src/ARte/core/static/css/home.css index 94d76f31..14d9263f 100644 --- a/src/ARte/core/static/css/home.css +++ b/src/ARte/core/static/css/home.css @@ -146,7 +146,7 @@ a:visited{ } .header .signup-btn, .header .login-btn { - height: 30px; - line-height: 30px; + height: 40px; + line-height: 40px; } } \ No newline at end of file diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index 33cd2791..1bd935eb 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -215,6 +215,9 @@ input[type=submit].secondary { .colorful .container { background-color: #fff; + margin-top: 40px; + padding: 20px; + max-width: 280px; } .header { @@ -497,6 +500,11 @@ a.sq-github { margin: 0 auto; } + .colorful .container { + padding: 20px; + max-width: 560px; + } + .header { margin-top: 25px; } @@ -556,6 +564,10 @@ a.sq-github { margin: 0 0 0 10px; } + .header .signup-btn a, .header .login-btn a { + font-size: 1em; + } + .useful-links a, a.useful { /* font-size: 75%; */ padding: 5px; From bb3e6c4b0dc0548fbc94446bf5a26b47ab4937ae Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 12:43:44 -0300 Subject: [PATCH 38/76] Fix exhibition --- src/ARte/core/jinja2/core/exhibit_detail.jinja2 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ARte/core/jinja2/core/exhibit_detail.jinja2 b/src/ARte/core/jinja2/core/exhibit_detail.jinja2 index 7cf2f911..76b5fc8c 100644 --- a/src/ARte/core/jinja2/core/exhibit_detail.jinja2 +++ b/src/ARte/core/jinja2/core/exhibit_detail.jinja2 @@ -2,15 +2,15 @@ {% block content %} -
+
{# #}

{{exhibit.name}}

-

{{ url('home') }}/{{exhibit.slug}}

-

{{_("Created by ")}} {{exhibit.owner.user.username}}

+

https://jandig.app/{{exhibit.slug}}

+

{{_("Created by ")}} {{exhibit.owner.user.username}}

+

{{exhibit.artworks_count}} artworks | Published on {{exhibit.date}}

+

{{_("Exhibition Artworks")}}

+ {% with repository_list = artworks, element_type="artwork" %} + {% include "users/components/item-list.jinja2" %} + {% endwith %}
-

{{exhibit.artworks_count}} artworks | Published on {{exhibit.date}}

-

{{_("Artworks")}}

- {% with repository_list = artworks, element_type="artwork" %} - {% include "users/components/item-list.jinja2" %} - {% endwith %} {% endblock %} \ No newline at end of file From debde8a26efa0a160eea6487e87a182919e772e2 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Thu, 27 Jun 2019 18:14:59 -0300 Subject: [PATCH 39/76] Revert classes on modal --- src/ARte/core/jinja2/core/language-select-modal.jinja2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ARte/core/jinja2/core/language-select-modal.jinja2 b/src/ARte/core/jinja2/core/language-select-modal.jinja2 index a147e44b..7292dc44 100644 --- a/src/ARte/core/jinja2/core/language-select-modal.jinja2 +++ b/src/ARte/core/jinja2/core/language-select-modal.jinja2 @@ -1,10 +1,10 @@ {# {% extends '/users/components/generic-modal.jinja2' %} #} -
+
{# FIXME: maybe this can be improved #} -
+

{{ _('Select your language') }}

{# FIXME: maybe this can be improved #} From ed42db68f0df789a11dd31b516a435a131683e95 Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Thu, 27 Jun 2019 18:18:54 -0300 Subject: [PATCH 40/76] Move include for modal --- src/ARte/core/jinja2/core/header.jinja2 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 25c92886..54d8e371 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -8,7 +8,9 @@
- Language +
+ Language +
@@ -30,8 +32,7 @@
{% endif %} + {% include "core/language-select-modal.jinja2" %}
-
- -{% include "core/language-select-modal.jinja2" %} +
\ No newline at end of file From 7a6b624dc15979766365a3ca9e2f28fa2f5c9670 Mon Sep 17 00:00:00 2001 From: rodrigocam Date: Thu, 27 Jun 2019 18:32:08 -0300 Subject: [PATCH 41/76] Add language to link text --- src/ARte/core/jinja2/core/header.jinja2 | 2 +- .../jinja2/core/language-select-modal.jinja2 | 41 +------------------ 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/src/ARte/core/jinja2/core/header.jinja2 b/src/ARte/core/jinja2/core/header.jinja2 index 54d8e371..68833ebf 100644 --- a/src/ARte/core/jinja2/core/header.jinja2 +++ b/src/ARte/core/jinja2/core/header.jinja2 @@ -9,7 +9,7 @@
- Language + {{request.LANGUAGE_CODE}}
diff --git a/src/ARte/core/jinja2/core/language-select-modal.jinja2 b/src/ARte/core/jinja2/core/language-select-modal.jinja2 index 7292dc44..6866a984 100644 --- a/src/ARte/core/jinja2/core/language-select-modal.jinja2 +++ b/src/ARte/core/jinja2/core/language-select-modal.jinja2 @@ -1,5 +1,3 @@ -{# {% extends '/users/components/generic-modal.jinja2' %} #} -
{# FIXME: maybe this can be improved #} @@ -44,41 +42,4 @@ langTriggers.click(toggleLangModal); window.addEventListener("click", windowOnClick); -
- -{# {% block content %} #} - {# FIXME: maybe this can be improved #} - {# - - - {{ csrf_input }} - {% for language in LANGUAGES %} -

- - -

- {% endfor%} - - - -
- {{ csrf_input }} - {% for language in LANGUAGES %} -

- - -

- {% endfor%} - -
- - #} -{# {% endblock %} #} \ No newline at end of file +
\ No newline at end of file From b33fa27b805628e044159e42fd6ec1d1e8bcf77a Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 18:53:06 -0300 Subject: [PATCH 42/76] CSS corrections --- src/ARte/core/static/css/reset.css | 12 ++++++++---- src/ARte/users/jinja2/users/artwork-create.jinja2 | 2 +- src/ARte/users/static/css/marker-creation.css | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index 1bd935eb..fcd5c668 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -226,11 +226,12 @@ input[type=submit].secondary { } .aside { - max-width: 140px; - margin-left: -140px; + max-width: 120px; + margin-left: -120px; + padding-left: 10px; height: 70px; float: right; - /*background: #fff;*/ + background: #fff; } .logo { @@ -311,6 +312,10 @@ input[type=submit].secondary { background-size: contain; } +.trigger-lang-modal { + margin: 0 0 0 auto; +} + .contCam { min-width: 90px; } @@ -630,7 +635,6 @@ a.sq-github { a.license { padding-left: 100px; - width: 30px; height: 30px; line-height: 30px; font-size: 0.75em; diff --git a/src/ARte/users/jinja2/users/artwork-create.jinja2 b/src/ARte/users/jinja2/users/artwork-create.jinja2 index 1af1a29b..fa0e71a7 100644 --- a/src/ARte/users/jinja2/users/artwork-create.jinja2 +++ b/src/ARte/users/jinja2/users/artwork-create.jinja2 @@ -7,7 +7,7 @@ -

{{ _('Create Jandig artwork') }}

+

{{ _('Create Jandig artwork') }}

diff --git a/src/ARte/users/static/css/marker-creation.css b/src/ARte/users/static/css/marker-creation.css index 1eb56658..7f6183ec 100644 --- a/src/ARte/users/static/css/marker-creation.css +++ b/src/ARte/users/static/css/marker-creation.css @@ -5,7 +5,7 @@ padding: 3%; } -.creation-form { +/*.creation-form { background-color: white; } @@ -15,9 +15,9 @@ .create-artwork { text-align: center; -} +}*/ -.select-btn { +/*.select-btn { font-size: 14px; height: 35px; width: 90%; @@ -26,7 +26,7 @@ border-radius: 8px; border-color: #4286f4; margin-bottom: 5%; -} +}*/ .form-options{ font-size: 12px; From 32a946bf064d9cce129d9b2571a98d2915a5920b Mon Sep 17 00:00:00 2001 From: pablodiegoss Date: Thu, 27 Jun 2019 18:57:05 -0300 Subject: [PATCH 43/76] Revert "Update Generator content and styles" --- src/ARte/core/jinja2/core/generator.html | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/ARte/core/jinja2/core/generator.html b/src/ARte/core/jinja2/core/generator.html index 507ad0d5..4c43fbc8 100644 --- a/src/ARte/core/jinja2/core/generator.html +++ b/src/ARte/core/jinja2/core/generator.html @@ -1,15 +1,14 @@ Jandig Marker Generator - ---> - + - + + @@ -22,17 +21,17 @@
-
- - -
- Jandig Marker Generator is based on the awesome code you can find here. + +

Welcome!

+
+ Details on how to pick the inner image can be found here
-
- +
+
From ecff6291235bea53f7404714c937b13fcd0279c2 Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Thu, 27 Jun 2019 19:30:09 -0300 Subject: [PATCH 44/76] Styling updates --- src/ARte/core/static/css/reset.css | 1 + src/ARte/users/jinja2/users/artwork-create.jinja2 | 6 +++--- src/ARte/users/jinja2/users/components/item-list.jinja2 | 6 ++++-- .../users/jinja2/users/components/repository-list.jinja2 | 4 ++-- src/ARte/users/jinja2/users/profile.jinja2 | 5 +++-- src/ARte/users/static/css/repository-list.css | 5 +++++ 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index fcd5c668..0873ccce 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -555,6 +555,7 @@ a.sq-github { .welcome, .welcome p { line-height: 80px; + font-size: 1em; } .header .logo img{ diff --git a/src/ARte/users/jinja2/users/artwork-create.jinja2 b/src/ARte/users/jinja2/users/artwork-create.jinja2 index fa0e71a7..12faa9c5 100644 --- a/src/ARte/users/jinja2/users/artwork-create.jinja2 +++ b/src/ARte/users/jinja2/users/artwork-create.jinja2 @@ -18,7 +18,7 @@
{{ csrf_input }}
-

{{ _('Select marker (1/3') }}

+

{{ _('Select marker (1/3)') }}

{{ form.visible_fields()[0] }} {{ form.visible_fields()[0].errors }} @@ -52,7 +52,7 @@

-

{{ _('Select object (2/3') }}

+

{{ _('Select object (2/3)') }}

{{ form.visible_fields()[2] }} {{ form.visible_fields()[2].errors }} @@ -86,7 +86,7 @@

-

{{ _('About your artwork (3/3') }}

+

{{ _('About your artwork (3/3)') }}

{{ form.visible_fields()[6] }} {{ form.visible_fields()[6].errors }} diff --git a/src/ARte/users/jinja2/users/components/item-list.jinja2 b/src/ARte/users/jinja2/users/components/item-list.jinja2 index f3952bc4..d4116516 100644 --- a/src/ARte/users/jinja2/users/components/item-list.jinja2 +++ b/src/ARte/users/jinja2/users/components/item-list.jinja2 @@ -17,10 +17,12 @@ {% endif %} {% else %} - + {##} +

{{element.name}}

-

{{element.name}}

+

{{_("Created by ")}} {{exhibit.owner.user.username}}

+ {#

{{element.name}}

#}

TO_BE_FILLED_ON_SCRIPT{{element.slug}}

{{element.artworks_count}} artworks | Published on {{element.date}}

{% if editable == True %} diff --git a/src/ARte/users/jinja2/users/components/repository-list.jinja2 b/src/ARte/users/jinja2/users/components/repository-list.jinja2 index 2ae30f74..e6180d76 100644 --- a/src/ARte/users/jinja2/users/components/repository-list.jinja2 +++ b/src/ARte/users/jinja2/users/components/repository-list.jinja2 @@ -9,7 +9,7 @@ {% endblock %} \ No newline at end of file From 8ffb2323961233a6deca5f1c66d39fad92111fea Mon Sep 17 00:00:00 2001 From: Hebert Valois Date: Sun, 30 Jun 2019 21:58:08 -0300 Subject: [PATCH 52/76] CSS updates --- src/ARte/core/static/css/home.css | 6 +++--- src/ARte/core/static/css/reset.css | 7 ++++--- src/ARte/users/jinja2/users/login.jinja2 | 2 +- src/ARte/users/static/css/login.css | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/ARte/core/static/css/home.css b/src/ARte/core/static/css/home.css index 14d9263f..25720d9c 100644 --- a/src/ARte/core/static/css/home.css +++ b/src/ARte/core/static/css/home.css @@ -30,11 +30,11 @@ a:visited{ .header .logo{ max-width: 50%; -}*/ +} .connect.flex { margin-left: 10px; -} +}*/ .header .signup-btn, .header .login-btn { background-color: black; @@ -52,7 +52,7 @@ a:visited{ font-weight: bold; color: white; display: block; - font-size: 0.75em; + font-size: 1.25em; } /*.header { diff --git a/src/ARte/core/static/css/reset.css b/src/ARte/core/static/css/reset.css index c2034a88..bf1b5cef 100644 --- a/src/ARte/core/static/css/reset.css +++ b/src/ARte/core/static/css/reset.css @@ -230,12 +230,12 @@ a.changeExb, a.jandigIco { } a.changeExb { - background-image: url(../static/images/icons/icoChgExb.png); + background-image: url(../images/icons/icoChgExb.png); background-position: center left; } a.jandigIco { - background-image: url(../static/images/icons/jandigIcon.png); + background-image: url(../images/icons/jandigIcon.png); background-position: center right; } @@ -317,7 +317,7 @@ a.jandigIco { background-position: center center; background-size: contain; margin: 0 0 0 auto; - font-size: 1em; + font-size: 0.75em; color: #000; padding: 10px; height: 20px; @@ -542,6 +542,7 @@ a.sq-github { .aside { max-width: 250px; + min-width: 250px; height: 100px; margin-left: -250px; } diff --git a/src/ARte/users/jinja2/users/login.jinja2 b/src/ARte/users/jinja2/users/login.jinja2 index d5409b4f..55bcae05 100644 --- a/src/ARte/users/jinja2/users/login.jinja2 +++ b/src/ARte/users/jinja2/users/login.jinja2 @@ -3,7 +3,7 @@ {% block content %} {# FIXME: maybe this can be improved #} -