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 diff --git a/docker/Dockerfile b/docker/Dockerfile index 97a5db8d..74c6f56d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,11 @@ FROM jandigarte/requirements:latest -RUN mkdir -p /src/ARte -COPY docs/ /docs/ -COPY ./src/ARte /src/ARte - -COPY ./tasks.py /tasks.py +RUN mkdir -p /ARte +WORKDIR /ARte +COPY docs/ /ARte/docs/ +COPY ./src/ARte /ARte/src/ARte/ +COPY ./locale/ /ARte/locale/ +COPY ./tasks.py /ARte/tasks.py +COPY ./etc/ /ARte/etc/ RUN find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf - -ENTRYPOINT ["inv"] \ No newline at end of file diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index 86801c47..a47841ff 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -3,8 +3,9 @@ FROM debian:buster-slim RUN apt-get update && apt-get install -y --no-install-recommends \ python3 \ python3-pip \ - python3-setuptools - + python3-setuptools \ + gettext \ + docutils-common COPY ./src/requirements.txt /src/requirements.txt RUN pip3 install --upgrade pip diff --git a/docker/docker-compose.deploy.yml b/docker/docker-compose.deploy.yml index f279f80d..b63528e2 100644 --- a/docker/docker-compose.deploy.yml +++ b/docker/docker-compose.deploy.yml @@ -43,7 +43,7 @@ services: volumes: - static_dev_files:/collect/ - ./media/dev/:/src/ARte/users/media/ - command: db -p docs collect run -g -p + command: inv db -p docs collect run -g -p labels: - "com.centurylinklabs.watchtower.enable=true" @@ -72,7 +72,7 @@ services: volumes: - static_staging_files:/collect/ - ./media/staging/:/src/ARte/users/media/ - command: db -p docs collect run -g -p + command: inv db -p docs collect run -g -p labels: - "com.centurylinklabs.watchtower.enable=true" @@ -102,7 +102,7 @@ services: volumes: - static_prod_files:/collect/ - ./media/prod/:/src/ARte/users/media/ - command: db -p docs collect run -g -p + command: inv db -p docs collect run -g -p labels: - "com.centurylinklabs.watchtower.enable=true" diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 19720dea..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: db -p docs collect run -p + command: inv db -p i18n --compile docs collect run -p postgres: image: postgres diff --git a/docs/_static/custom.css b/docs/_static/custom.css new file mode 100644 index 00000000..bf1b5cef --- /dev/null +++ b/docs/_static/custom.css @@ -0,0 +1,736 @@ +/* @import url('https://fonts.googleapis.com/css?family=Istok+Web:400,400i,700,700i&display=swap'); */ + +body { + color: #000; + background: #FFF; + margin: 0; + padding: 0; + line-height: 1; + font-family: "Istok Web", sans-serif; + text-align: center; +} + +body.colorful { + background-image: url(../images/icons/bg.png); + background-repeat: repeat-x; + background-position: center top; +} + +h1, h2, h3, h4, h5, h6 { + font-family: "Istok Web", serif; + font-weight: bolder; +} + +p, ul, ol { + line-height: 1.75; + margin: 0 0 1em 0; +} + +a, a:visited { + color: #03b595; + color: #777; + padding: 0; + text-decoration: none; +} + +h1 { + font-size: 1.25em; + 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: 10px; +} + +h2 { + font-size: 1.25em; + color: #03b595; + margin: 30px auto 10px; +} + +h3 { + font-size: 1.1em; + line-height: 20px; + text-align: left; + /* padding-left: 15px; */ +} + +h3:before { + width: 20px; + height: 20px; + background: #03b595; + display: inline-block; + margin: 5px 10px -3px 0px; + content: ' '; +} + +h4 { + font-size: 1.1em; + color: #03b595; +} + +h5 { + font-size: 1.1em; +} + +h6 { + font-size: 1em; + color: #03b595; +} + +hr { + height: 10px; + width: 80%; + border: none; + background: #03b595; + margin: 20px auto; +} + +.account-options a { + color: #777; + padding: 0; + text-decoration: none; + transition: all .2s ease-in; + background-image: linear-gradient(to top, #77777766, #77777766 50%, transparent 50%, transparent); + background-position: 100% 10%; + background-size: 100% 200%; +} + +ul { + list-style: square; +} + +ul, ol { + padding: 0 0 0 5em; + text-align: left; +} + +blockquote { + font-size: 1.1em; + line-height: 2em; + margin: 10px 40px; + color: #888; + font-style: italic; +} + +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 { + width: 100%; + 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;*/ + text-align: center; + display: inline-block; +} + +input:disabled, input[type="submit" i]:disabled, input[type=submit]:disabled, button.disabled { + opacity: 0.4; + pointer-events: none; +} + +button.secondary, +input[type=submit].secondary { + background: #666; + width: 100%; + line-height: 30px; + color: #fff; +} + + +.flex { + display: flex; + flex-flow: row wrap; + align-items: center; + justify-content: space-between; +} + +.half { + width: calc(50% - 10px); + /* flex-flow: column; */ +} + +.one-third { + width: calc(33% - 10px); + /*display: inline-block; + margin-right: 1%; + margin-left: 1%;*/ +} + +.sm-one-third { + flex-basis: calc(33% - 10px); +} + +.sm-half { + flex-basis: calc(50% - 10px); +} + +.sm-full { + flex-basis: 100%; +} + +.left { + /*float: left;*/ + text-align: left; +} + +.right { + /*float: right;*/ + text-align: right; +} + +/* Structure */ +.container { + max-width: 320px; + margin: 0 auto; + text-align: center; +} + +.colorful .container { + background-color: #fff; + margin-top: 40px; + padding: 20px; + max-width: 280px; +} + +a.changeExb, a.jandigIco { + text-indent: -9999px; + height: 20px; + text-align: left; + line-height: 20px; + background-repeat: no-repeat; + background-size: contain; +} + +a.changeExb { + background-image: url(../images/icons/icoChgExb.png); + background-position: center left; +} + +a.jandigIco { + background-image: url(../images/icons/jandigIcon.png); + background-position: center right; +} + +.header { + margin-top: 25px; + font-size: 75%; +} + +.aside { + max-width: 120px; + margin-left: -120px; + padding-left: 10px; + height: 70px; + float: right; + background: #fff; +} + +.logo { + text-align: left; + height: 60px; + width: 100%; + /*width: calc(100% - 125px);*/ + float: left; + background-image: linear-gradient(to top, #77777766, #77777766 50%, transparent 50%, transparent); + background-position: 100% 10%; + background-size: 100% 200%; +} + +.logo a { + display: block; +} + +.logo img{ + max-height: 55px; + height: auto; + margin: auto; +} + +.welcome, .icon-menu, .connect { + height: 30px; + text-align: right; +} + +.welcome { + /* line-height: 30px; */ + height: 30px; + font-size: 0.65em; + overflow: hidden; + vertical-align: bottom; +} + +.welcome a, .welcome a:visited { + font-size: 1.25em; + font-weight: bold; + color: #03b595; +} + +.welcome p { + line-height: 45px; +} + +.icon-menu a { + width: 30px; + height: 30px; + margin: 0 0 0 10px; + display: block; + /*text-indent: -999999px;*/ + font-size: 0; +} + +/****** temporary disable icons ******/ +.icon-menu a { + opacity: 0.2; + pointer-events: none; +} + +.icon-menu a.btnLang { + background: url(../images/icons/icoLng.png) no-repeat; + background-position: center center; + background-size: contain; + margin: 0 0 0 auto; + font-size: 0.75em; + color: #000; + padding: 10px; + height: 20px; + width: 20px; + line-height: 20px; + text-align: center; +} + +.icon-menu a.btnSearch { + background: url(../images/icons/icoSrc.png) no-repeat; + background-position: center center; + background-size: contain; +} + +.icon-menu a.btnHelp { + background: url(../images/icons/icoHlp.png) no-repeat; + background-position: center center; + background-size: contain; +} + +.trigger-lang-modal { + margin: 0 0 0 auto; +} + +.contCam { + min-width: 90px; +} + +div.contCam:before { + content: ''; + display: block; + height: 0; + width: 0; + position: relative; + top: -21px; + left: 45px; + border-color: #c9c9c9 transparent transparent #c9c9c9; + border-style: solid; + border-width: 7px; + pointer-events: none; + z-index: 1; +} + +.animCam { + width: 40px; + height: 40px; + margin: -25px auto 0; + background: #03b595; +} + +.useful-links a.cambtn { + width: 40px; + height: 40px; + margin: 0; + /*margin-left: -25px;*/ + padding: 0; + display: block; + text-indent: -999999px; + background: url(../images/icons/icoARV.png) no-repeat; + background-position: center center; + background-size: contain; +} + +.useful-links { + margin-bottom: 20px; + font-size: 0.75em; + font-weight: bold; + clear: both; + font-size: 75%; +} + +.useful-links .container { + height: 50px; + margin: auto; +} + +.useful-links a, +.footer a.useful { + /*font-size: 75%;*/ + padding: 0 5px; + background-image: linear-gradient(to top, #05f7ae, #05f7ae 50%, transparent 50%, transparent); + background-position: 100% 15%; + background-size: 100% 200%; +} + +h1.titExb, h1.titArt, h1.titMrk, h1.titObj { + height: 40px; + line-height: 45px; + text-align: left; + padding-left: 35px; + background-position: left center; + background-size: 25px 25px; + background-repeat: no-repeat; + border-bottom: 10px solid #f1f1f1; +} + +h1.titExb { + background-image: url(../images/icons/icoExb.png); +} + +h1.titArt { + background-image: url(../images/icons/icoArt.png); +} + +h1.titMrk { + background-image: url(../images/icons/icoMrk.png); +} + +h1.titObj { + background-image: url(../images/icons/icoObj.png); +} + +.footer { + min-height: 90px; +} + +.footer .container { + height: 25px; + margin-bottom: 20px; +} + +.footer a { + font-size: 75%; + line-height: 25px; + margin: auto; +} + +.footer a.useful { + margin: 0; + line-height: 25px; + /* padding: 0; */ +} + +a.github { + background-image: url(../images/icons/bulGit.png); + background-size: contain; + background-position: left center; + background-repeat: no-repeat; + color: #03b595; + padding-left: 35px; +} + +a.license { + background-image: url(../images/icons/license.png); + background-size: contain; + background-position: left center; + background-repeat: no-repeat; + padding-left: 65px; + font-size: 0.5em; + line-height: 20px; + margin-left: 0; + text-align: left; + white-space: nowrap; + max-width: calc(100% - 160px); + overflow: hidden; +} + +a.memelab { + background-image: url(../images/icons/memelab.png); + background-size: contain; + background-position: left center; + background-repeat: no-repeat; + width: 20px; + height: 20px; + text-indent: -99999px; + max-width: 35px; + margin: 0; +} + +a.instagram, a.twitter, a.facebook, a.telegram, a.sq-github { + background-size: contain; + background-position: left center; + background-repeat: no-repeat; + width: 25px; + height: 25px; + text-indent: -99999px; + max-width: 35px; + margin: 5px 0px 5px 5px; +} + +a.instagram { + background-image: url(../images/icons/icoIst.png); +} + +a.twitter { + background-image: url(../images/icons/icoTwt.png); +} + +a.facebook { + background-image: url(../images/icons/icoFcb.png); +} + +a.telegram { + background-image: url(../images/icons/icoTel.png); +} + +a.sq-github { + background-image: url(../images/icons/icoGit.png); +} + +/* Media Queries */ +/*@media all and (max-width: 400px) { + .header, .useful-links { + font-size: 75%; + } +}*/ + +@media all and (min-width: 800px) { + .container { + max-width: 600px; + margin: 0 auto; + } + + .colorful .container { + padding: 20px; + max-width: 560px; + } + + .header { + margin-top: 25px; + } + + .aside { + max-width: 250px; + min-width: 250px; + height: 100px; + margin-left: -250px; + } + + .half { + width: 290px; + /* flex-flow: column; */ + } + + .lg-one-third { + flex-basis: calc(33% - 10px); + } + + .lg-half { + flex-basis: calc(50% - 10px); + } + + .lg-full { + flex-basis: 100%; + } + + .logo { + text-align: left; + height: 95px; + width: calc(100% - 160px); + float: left; + background-image: linear-gradient(to top, #77777766, #77777766 50%, transparent 50%, transparent); + background-position: 100% 10%; + background-size: 100% 200%; + } + + .welcome, .icon-menu, .connect { + height: 50px; + text-align: right; + font-size: 0.75em; + } + + .welcome, .welcome p { + line-height: 80px; + font-size: 1em; + } + + .header .logo img{ + max-height: 75px; + height: auto; + margin: auto; + } + + .icon-menu a { + width: 40px; + height: 40px; + 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; + background-image: linear-gradient(to top, #05f7ae, #05f7ae 50%, transparent 50%, transparent); + background-position: 100% 15%; + background-size: 100% 200%; + } + + .contCam { + min-width: 250px; + } + + div.contCam:before { + top: -10px; + left: 125px; + border-width: 10px; + } + + .animCam { + width: 40px; + height: 40px; + margin: 0 auto; + margin-top: -20px; + background: #03b595; + } + + .useful-links a.cambtn { + width: 40px; + height: 40px; + margin: 0; + padding: 0; + display: block; + text-indent: -999999px; + background: url(../images/icons/icoARV.png) no-repeat; + background-position: center center; + background-size: contain; + } + + .footer { + min-height: 100px; + } + + .footer .container { + height: 30px; + margin-bottom: 40px; + } + + .footer a { + line-height: 30px; + } + + a.instagram, a.twitter, a.facebook, a.telegram, a.sq-github { + width: 30px; + height: 30px; + } + + a.github { + padding-left: 40px; + } + + a.license { + padding-left: 100px; + height: 30px; + line-height: 30px; + font-size: 0.75em; + } + + a.memelab { + width: 30px; + height: 30px; + max-width: 40px; + } +} + +/* Hover Elements */ +.useful-links a, +.footer a.useful, +.account-options a, +.header .logo img, +.animCam, +.memelab, +.social a, +.editProf a.option-link, +.welcome a, +a.changeExb, +a.jandigIco { + transition: all .2s ease-in; +} + +.useful-links a:hover, +.footer a.useful:hover, +.account-options a:hover { + color: #FFF; + background-position: 0 100%; +} + +.header .logo img:hover, +.animCam:hover, +.memelab:hover, +.social a:hover, +a.changeExb:hover, +a.jandigIco:hover { + opacity: 0.7; +} + +.editProf a.option-link:hover, +.welcome a:hover { + color: #06f7ae; +} + + +/****** Animation ********/ +.animCam { + /*transition: all .2s ease-in;*/ + animation: colorchange 4s infinite; /* animation-name followed by duration in seconds*/ + /* you could also use milliseconds (ms) or something like 2.5s */ + -webkit-animation: colorchange 4s infinite; /* Chrome and Safari */ + /*animation-iteration-count: infinite;*/ + } + +@keyframes colorchange + { + 0% {background: #03b595;} + 50% {background: #06f7ae;} + 100% {background: #03b595;} + } + +@-webkit-keyframes colorchange + { + 0% {background: #03b595;} + 50% {background: #06f7ae;} + 100% {background: #03b595;} + } \ No newline at end of file diff --git a/docs/about.rst b/docs/about.rst new file mode 100644 index 00000000..0e8d5675 --- /dev/null +++ b/docs/about.rst @@ -0,0 +1,20 @@ +Sobre a Jandig +============================== + +Celulares e tablets são usados para ler marcadores e assim abrir “janelas” onde se encontram outros objetos de arte. O público é convidado a transcender o espaço de exposição, levando adesivos com marcadores para serem colados em outros locais, criando Zonas Autônomas Temporárias (TAZes). O público se torna co-autor, e os marcadores e obras digitais são reconfigurados pelos espaços. + +Entenda +------- + +O projeto Jandig é uma investigação a respeito da intervenção de marcadores para visualização de obras por meio de realidade aumentada sobre o espaço urbano. Trata-se de um projeto colaborativo de arte digital que propõe a criação de Zonas Autônomas Temporárias (TAZes) em cada espaço em que é instalado. Essas TAZes são formadas através de marcadores espalhados por um espaço por artistas e pelo público – que assim torna-se co-criador daquela experiência. Os usuários interagem com marcadores, utilizando dispositivos móveis para abrir janelas no mundo real para visualizar criações digitais (cedidas através de licença Creative Commons). + +Nossos objetivos +~~~~~~~~~~~~~~~~ + +A plataforma Jandig viabiliza a realização de exposições com o uso de realidade aumentada. + +Cada exposição é feita a partir da disposição de diversos marcadores, que utilizam como suporte adesivos, imagens de stencil, de carimbos, ou outras, em diferentes tamanhos. Esses suportes são também entregues ao público que circulam pelo espaço, de modo que possam fazer interferências locais e que seja possível “viralizar” os marcadores enquanto a exposição estiver disponível, deixando rastros e proporcionando interações entre os participantes/visitantes. + +Para enxergar através das “janelas” e ver as imagens fabulosas o que elas revelam, o público deverá apontar seus dispositivos para os marcadores, para que o visualizador da plataforma Jandig ufaça a leitura dos mesmos e mostre o conteúdo em realidade aumentada + +As bordas são os elementos gráficos que engatilham o reconhecimento do objeto associado a cada marcador. Por esse motivo, não se deve cobri-las e elas devem sempre ser vistas completamente pela câmera. Colocar o dedo sobre uma das bordas ou aproximar demais a câmera do marcador inviabiliza o reconhecimento, por exemplo. Essa característica deve sempre ser levada em consideração na produção e aplicação dos marcadores. diff --git a/docs/conf.py b/docs/conf.py index cf9ab306..d9088a0e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,3 +57,6 @@ # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] + +def setup(app): + app.add_css_file('reset.css') \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index a0a3b82d..86b9002a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,22 +3,15 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -Welcome to Jandig ARte's documentation! -======================================= +Ajuda +===== .. toctree:: :maxdepth: 2 :caption: Contents: - animacoes - marcadores - publicando-obras - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` - + * animacoes + * marcadores + * publicando-obras + \ No newline at end of file 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..1df15d1b 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -3,154 +3,512 @@ # 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" +"POT-Creation-Date: 2019-06-26 13:40+0000\n" +"PO-Revision-Date: 2019-06-30 23:03-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" +"X-Generator: Poedit 2.2.3\n" +"Last-Translator: \n" +"Language-Team: \n" -#: src/ARte/config/settings.py:136 +#: src/ARte/config/settings.py:138 msgid "English" -msgstr "" +msgstr "Inglês" -#: src/ARte/config/settings.py:137 +#: src/ARte/config/settings.py:139 msgid "Brazilian Portuguese" -msgstr "" +msgstr "Português do Brasil" -#: src/ARte/users/forms.py:17 +#: src/ARte/users/forms.py:20 src/ARte/users/forms.py:81 msgid "Your e-mail address" -msgstr "" +msgstr "Seu endereço de e-mail" -#: src/ARte/users/forms.py:22 +#: src/ARte/users/forms.py:25 src/ARte/users/forms.py:85 msgid "Your username" -msgstr "" +msgstr "Seu nome de usuário" -#: src/ARte/users/forms.py:28 +#: src/ARte/users/forms.py:31 msgid "email" -msgstr "" +msgstr "e-mail" -#: src/ARte/users/forms.py:29 +#: src/ARte/users/forms.py:32 msgid "chosen username" -msgstr "" +msgstr "nome de usuário escolhido" -#: 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 "" +msgstr "senha" -#: src/ARte/users/forms.py:31 +#: src/ARte/users/forms.py:34 msgid "confirm password" -msgstr "" +msgstr "confirmar senha" + +#: src/ARte/users/forms.py:44 +msgid "E-mail taken" +msgstr "E-mail já existente" -#: src/ARte/users/forms.py:41 +#: src/ARte/users/forms.py:53 +msgid "Old Password" +msgstr "Senha antiga" + +#: src/ARte/users/forms.py:54 +msgid "New Password" +msgstr "Nova senha" + +#: src/ARte/users/forms.py:55 +msgid "New Password Again" +msgstr "Nova senha novamente" + +#: src/ARte/users/forms.py:74 +msgid "E-mail" +msgstr "E-mail" + +#: src/ARte/users/forms.py:75 +msgid "Username" +msgstr "Usuário" + +#: src/ARte/users/forms.py:76 src/ARte/users/forms.py:95 +msgid "Personal Bio / Description" +msgstr "Biografia / Descrição" + +#: src/ARte/users/forms.py:77 src/ARte/users/forms.py:99 +msgid "Personal Website" +msgstr "Site pessoal" + +#: src/ARte/users/forms.py:105 +msgid "Username already in use" +msgstr "Nome de usuário já em uso" + +#: src/ARte/users/forms.py:111 msgid "Email address must be unique" -msgstr "" +msgstr "O endereço de e-mail deve ser único" -#: src/ARte/users/forms.py:51 +#: src/ARte/users/forms.py:120 msgid "username / email" -msgstr "" +msgstr "nome de usuário / e-mail" -#: 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 "" +msgstr "procurar arquivo" -#: 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 "" +msgstr "declarar outro autor" -#: 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!" -msgstr "" +#: src/ARte/users/forms.py:176 +msgid "artwork title" +msgstr "título da obra" #: 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" -msgstr "" +msgstr "Cadastro" + +#: src/ARte/users/forms.py:177 +msgid "artwork description" +msgstr "descrição da obra" #: src/ARte/core/jinja2/core/home.jinja2:33 msgid "Repository" -msgstr "" +msgstr "Repositório" + +#: src/ARte/users/forms.py:197 +msgid "Exhibit Title" +msgstr "Título da exposição" #: src/ARte/core/jinja2/core/home.jinja2:34 msgid "Get involved" -msgstr "" +msgstr "Envolva-se" + +#: src/ARte/users/forms.py:198 +msgid "Exhibit URL" +msgstr "URL da exposição" #: src/ARte/core/jinja2/core/home.jinja2:35 msgid "Documentation" -msgstr "" +msgstr "Documentação" + +#: src/ARte/users/views.py:158 +msgid "marker" +msgstr "marcador" #: src/ARte/core/jinja2/core/home.jinja2:55 msgid "Authorize camera" -msgstr "" +msgstr "Autorizar câmera" + +#: src/ARte/users/views.py:202 +msgid "object" +msgstr "objeto" -#: src/ARte/core/jinja2/core/home.jinja2:63 -msgid "Legal text" +#: src/ARte/core/jinja2/core/base.jinja2:42 +msgid "Please override the \"content\" block of your template!" msgstr "" #: src/ARte/core/jinja2/core/home.jinja2:64 msgid "Footer links" -msgstr "" +msgstr "Links do rodapé" + +#: src/ARte/core/jinja2/core/collection.jinja2:11 +msgid "Jandig Exhibitions" +msgstr "Exposições Jandig" #: src/ARte/users/jinja2/users/login.jinja2:8 msgid "Login to continue" -msgstr "" +msgstr "Faça login para continuar" + +#: src/ARte/core/jinja2/core/collection.jinja2:17 +msgid "Jandig Artworks" +msgstr "Obras Jandig" + +#: src/ARte/core/jinja2/core/collection.jinja2:23 +msgid "Jandig Markers" +msgstr "Marcadores Jandig" + +#: src/ARte/core/jinja2/core/collection.jinja2:29 +msgid "Jandig Objects" +msgstr "Objetos Jandig" + +#: src/ARte/core/jinja2/core/exhibit_detail.jinja2:9 +msgid "Created by " +msgstr "Criado por " + +#: src/ARte/core/jinja2/core/exhibit_detail.jinja2:12 +msgid "Artworks" +msgstr "Obras" -#: src/ARte/users/jinja2/users/login.jinja2:25 +#: 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 "" +msgstr "Enviar" #: src/ARte/users/jinja2/users/login.jinja2:28 msgid "Recover password" -msgstr "" +msgstr "Recuperar senha" + +#: src/ARte/core/jinja2/core/footer.jinja2:3 +msgid "About us" +msgstr "Sobre" #: src/ARte/users/jinja2/users/profile.jinja2:9 msgid "Edit personal info" -msgstr "" +msgstr "Editar dados pessoais" + +#: src/ARte/core/jinja2/core/footer.jinja2:4 +#: src/ARte/core/jinja2/core/footer.jinja2:9 +msgid "Jandig on Github" +msgstr "Jandig no GitHub" #: 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/core/jinja2/core/footer.jinja2:6 +msgid "Jandig on Instagram" +msgstr "Jandig no Instagram" #: src/ARte/users/jinja2/users/profile.jinja2:11 msgid "Upload object" -msgstr "" - -#: src/ARte/users/jinja2/users/profile.jinja2:12 +msgstr "Subir objeto" + +#: src/ARte/core/jinja2/core/footer.jinja2:7 +msgid "Jandig on Twitter" +msgstr "Jandig no Twitter" + +#: src/ARte/core/jinja2/core/footer.jinja2:8 +msgid "Jandig on Facebook" +msgstr "Jandig no Facebook" + +#: src/ARte/core/jinja2/core/footer.jinja2:10 +msgid "Jandig on Telegram" +msgstr "Jandig no Telegram" + +#: src/ARte/core/jinja2/core/footer.jinja2:14 +msgid "Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" +msgstr "Atrubuição-CompartilhaIgual 4.0 Internacional (CC BY-SA 4.0)" + +#: 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 "Ainda sem conteúdo." + +#: 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 " marcadores" + +#: 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 " objetos" + +#: src/ARte/core/jinja2/core/header.jinja2:33 +msgid "No objects yet." +msgstr "Ainda sem objetos." + +#: src/ARte/core/jinja2/core/header.jinja2:35 +msgid "No markers yet." +msgstr "Ainda sem marcadores." + +#: src/ARte/core/jinja2/core/header.jinja2:40 +msgid "No exhibits yet." +msgstr "Ainda sem exposições." + +#: 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 " exposições" + +#: src/ARte/core/jinja2/core/home.jinja2:42 +msgid "Go to camera" +msgstr "Ir para câmera" + +#: src/ARte/core/jinja2/core/language-select-modal.jinja2:16 +msgid "Ok" +msgstr "Ok" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:5 +msgid "AR Viewer" +msgstr "Visualizador RA" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:9 +msgid "Collection" +msgstr "Coleção" + +#: src/ARte/core/jinja2/core/useful_links.jinja2:15 +msgid "About Us" +msgstr "Sobre nós" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:10 +#: src/ARte/users/jinja2/users/components/createbox.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 +#: src/ARte/users/jinja2/users/artwork-create.jinja2:12 +msgid "select marker" +msgstr "escolher marcador" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:15 +msgid "select object" +msgstr "escolher objeto" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:21 +msgid "Select marker (1/3" +msgstr "Escolher marcador (1/3" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:28 +msgid "I'm this marker author" +msgstr "Sou autor/a desse marcador" + +#: 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 "Acordo legal" + +#: 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 "Ou escolha um de nosso repositório" + +#: 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 "Próximo" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:55 +msgid "Select object (2/3" +msgstr "Selecione um objeto (2/3" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:62 +msgid "I'm this object author" +msgstr "Sou autor/a desse objeto" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:89 +msgid "About your artwork (3/3" +msgstr "Sobre sua obra (3/3" + +#: src/ARte/users/jinja2/users/artwork-create.jinja2:98 +msgid "Publish Artwork" +msgstr "Publicar Obra" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:11 +msgid "Create Jandig exhibit" +msgstr "Criar exposição Jandig" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:13 +msgid "select artworks" +msgstr "escolher obras" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:19 +msgid "Select Artworks (1/2" +msgstr "Escolher Obras (1/2" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:21 +msgid "Choose from your repository" +msgstr "Esolha de seu repositório" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:36 +msgid "Exhibit Information (2/2" +msgstr "Informações da Exposição (2/2" + +#: src/ARte/users/jinja2/users/exhibit-create.jinja2:45 +msgid "Publish Exhibit" +msgstr "Publicar Exposição" + +#: src/ARte/users/jinja2/users/profile-edit.jinja2:14 +msgid "Change Password" +msgstr "Trocar Senha" + +#: src/ARte/users/jinja2/users/profile.jinja2:14 +msgid "Your Exhibitions" +msgstr "Suas Exposições" + +#: src/ARte/users/jinja2/users/profile.jinja2:21 +msgid "You have no exhibits :c" +msgstr "Você não tem exposições :c" + +#: 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 "Criar" + +#: src/ARte/users/jinja2/users/profile.jinja2:25 +msgid "Your Artworks" +msgstr "Suas Obras" + +#: src/ARte/users/jinja2/users/profile.jinja2:32 +msgid "You have no artworks :c" +msgstr "Você não tem obras :c" + +#: src/ARte/users/jinja2/users/profile.jinja2:36 +msgid "Your Markers" +msgstr "Seus Marcadores" + +#: src/ARte/users/jinja2/users/profile.jinja2:43 +msgid "You have no markers :c" +msgstr "Você não tem marcadores :c" + +#: src/ARte/users/jinja2/users/profile.jinja2:47 +msgid "Your Objects" +msgstr "Seus Objetos" + +#: src/ARte/users/jinja2/users/profile.jinja2:54 +msgid "You have no objects :c" +msgstr "Você não tem objetos :c" + +#: src/ARte/users/jinja2/users/profile.jinja2:55 +msgid "create" +msgstr "criar" + +#: src/ARte/users/jinja2/users/profile.jinja2:66 msgid "Log out" -msgstr "" +msgstr "Sair" -#: src/ARte/users/jinja2/users/profile.jinja2:17 +#: src/ARte/users/jinja2/users/profile.jinja2:68 msgid "Remove account" -msgstr "" +msgstr "Remover conta" #: src/ARte/users/jinja2/users/signup.jinja2:9 msgid "Log in" -msgstr "" - -#: src/ARte/users/jinja2/users/signup.jinja2:23 -msgid "Legal agreement" -msgstr "" +msgstr "Entrar" #: src/ARte/users/jinja2/users/signup.jinja2:27 msgid "Remember me" -msgstr "" +msgstr "Lembre-se de mim" + +#: src/ARte/users/jinja2/users/upload.jinja2:8 +msgid "Upload " +msgstr "Upload " + +#: src/ARte/users/jinja2/users/upload.jinja2:31 +msgid "I'm this " +msgstr "Eu sou " + +#: src/ARte/users/jinja2/users/upload.jinja2:31 +msgid " author" +msgstr " autor" + +#: src/ARte/users/jinja2/users/upload.jinja2:40 +msgid "I agree to have this content on CC BY-SA 3.0" +msgstr "Concordo em publicar esse conteúdo em CC BY-SA 3.0" + +#: src/ARte/users/jinja2/users/components/createbox.jinja2:15 +msgid "Create exhibition" +msgstr "Crir exposição" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:20 +msgid "by " +msgstr "por " + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:25 +msgid "Uploaded by " +msgstr "Publicado por " + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:27 +msgid "in " +msgstr "em " + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:34 +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:44 +msgid " Used in " +msgstr " Usado em " + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:35 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:26 +msgid " artworks" +msgstr " obras" + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:36 +msgid " and in " +msgstr " e em " + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:74 +msgid "This is a Jandig " +msgstr "Isso é um jandig " + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:81 +msgid "Share this " +msgstr "Compartilhe " + +#: src/ARte/users/jinja2/users/components/elements-modal.jinja2:84 +msgid "Create artwork with this " +msgstr "Criar oba com " + +#: src/ARte/users/jinja2/users/components/userbox.jinja2:29 +msgid "No artworks yet." +msgstr "Ainda em obras." + +#: src/ARte/users/jinja2/users/components/userbox.jinja2:32 +#: src/ARte/users/jinja2/users/components/userbox.jinja2:43 +msgid "Create your first!" +msgstr "Crie seu primeiro!" + +#: src/ARte/users/jinja2/users/components/userbox.jinja2:40 +msgid "No exhibitions yet." +msgstr "Sem exposições ainda." + 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 "" diff --git a/src/ARte/config/jinja2.py b/src/ARte/config/jinja2.py index b3faf99d..54bc4333 100644 --- a/src/ARte/config/jinja2.py +++ b/src/ARte/config/jinja2.py @@ -13,6 +13,8 @@ def environment(**options): env.globals.update({ 'static': staticfiles_storage.url, 'url': reverse, + 'LANGUAGES': settings.LANGUAGES, + 'CUR_LANGUAGE': translation.get_language(), }) env.install_gettext_translations(translation, newstyle=True) diff --git a/src/ARte/config/settings.py b/src/ARte/config/settings.py index ef63f988..d3587b8e 100644 --- a/src/ARte/config/settings.py +++ b/src/ARte/config/settings.py @@ -43,12 +43,12 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.locale.LocaleMiddleware', ] ## Let whitenoise serve static files -- DON'T USE IN PRODUCTION -- @@ -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/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 diff --git a/src/ARte/core/jinja2/core/arviewer.jinja2 b/src/ARte/core/jinja2/core/arviewer.jinja2 index 5a315345..2d572483 100644 --- a/src/ARte/core/jinja2/core/arviewer.jinja2 +++ b/src/ARte/core/jinja2/core/arviewer.jinja2 @@ -1,6 +1,15 @@ + + + Jandig ARte @@ -20,7 +29,7 @@ {# #} {# #} - + {% if content is defined %}
{{ content }} diff --git a/src/ARte/core/jinja2/core/base.jinja2 b/src/ARte/core/jinja2/core/base.jinja2 index e976c6f2..f0de7010 100644 --- a/src/ARte/core/jinja2/core/base.jinja2 +++ b/src/ARte/core/jinja2/core/base.jinja2 @@ -1,6 +1,15 @@ + + + @@ -36,6 +45,6 @@ {% endif %} {% include "core/ui.jinja2" %} {# #} - + {# #} \ No newline at end of file diff --git a/src/ARte/core/jinja2/core/community.jinja2 b/src/ARte/core/jinja2/core/community.jinja2 index 3d37de65..367dff38 100644 --- a/src/ARte/core/jinja2/core/community.jinja2 +++ b/src/ARte/core/jinja2/core/community.jinja2 @@ -3,34 +3,28 @@ {% block community %}
-

Heading 1

-
Fusce a bibendum ante, sit amet luctus est. Praesent sit amet ullamcorper velit. Donec orci nisl, sagittis nec rhoncus vitae.
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut lorem enim, euismod a velit ut, congue tincidunt lacus. Nunc id dui eu leo blandit sodales non id odio. Nulla ut ante vitae tortor gravida efficitur vitae nec arcu. Integer id fringilla eros. Suspendisse porta feugiat tempor. Aenean eu turpis vitae mi euismod vestibulum. Duis ullamcorper suscipit arcu, at accumsan metus dignissim eu. Ut pellentesque pellentesque tincidunt.

-

Heading 2

-

Proin lacinia augue id ex pretium finibus. Donec egestas euismod tortor. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed aliquet convallis ante, at sodales odio egestas pretium. Fusce id fermentum quam. Curabitur vitae ante porta, pharetra metus vitae, vestibulum erat. Morbi eu pellentesque diam. Sed lobortis ultricies viverra. Fusce tempus neque ut orci posuere euismod. Sed vel lacus fermentum, maximus metus sit amet, varius urna.

-

Heading 3

-

Etiam leo neque, gravida non nisl nec, tempus aliquam velit. In ut sagittis erat. Aliquam sit amet pretium urna. Mauris rhoncus nulla quis ligula maximus vehicula. Nullam iaculis purus ultrices leo bibendum ultrices. Donec urna quam, gravida vitae molestie nec, malesuada id risus.

-

Heading 3

-

Nunc gravida, nulla vitae vestibulum eleifend, magna est accumsan massa, consectetur semper metus massa vel nunc. Suspendisse nec urna eu nulla mattis laoreet. Vestibulum tincidunt sit amet orci at maximus. Mauris risus massa, elementum interdum eros ut, porttitor volutpat neque. Quisque gravida convallis ipsum, in pharetra nulla aliquam vitae.

-
    -
  • Fusce a bibendum ante, sit amet luctus est.
    • -
  • Praesent sit amet ullamcorper velit.
    • -
  • Donec orci nisl, sagittis nec rhoncus vitae.
    • -
-

Heading 4

-

Maecenas varius urna at justo accumsan ullamcorper. Nullam dapibus posuere efficitur. Nulla venenatis mi sit amet quam blandit, nec scelerisque turpis tempus. Sed luctus sit amet eros placerat porttitor. Mauris eu convallis nibh.

-
-

Aenean diam magna, porta nec dui eu, pellentesque accumsan orci. Cras id sodales magna, eu eleifend lectus. Nulla facilisi. Ut orci libero, finibus eget faucibus nec, ullamcorper ac quam. Sed semper, nisi vitae tempus vehicula, orci erat euismod metus, vitae lobortis lacus mauris sit amet purus.

-
Heading 5
-

Etiam interdum tortor rhoncus, efficitur diam pretium, tristique orci. Fusce non sapien nec ligula lacinia rhoncus nec ac risus. Etiam efficitur ultricies ante. Nunc vitae eleifend felis. Phasellus posuere augue dolor, quis consequat dui mollis imperdiet. Proin quis fringilla lorem. Praesent pellentesque ac felis vel placerat. Mauris ac mauris sed lectus efficitur pulvinar. Nulla facilisi. Mauris bibendum urna ac ultrices aliquet.

-
    -
  1. Fusce a bibendum ante, sit amet luctus est.
    2. -
  2. Praesent sit amet ullamcorper velit.
    3. -
  3. Donec orci nisl, sagittis nec rhoncus vitae.
    4. -
-
Heading 6
-

Fusce a bibendum ante, sit amet luctus est. Praesent sit amet ullamcorper velit. Donec orci nisl, sagittis nec rhoncus vitae, iaculis et lacus. Sed cursus ligula non nunc interdum, a efficitur purus gravida. Aliquam ullamcorper pharetra libero commodo gravida. Curabitur eget arcu dictum, accumsan nulla sed, gravida ligula. Aliquam turpis lectus, semper eget justo at, fringilla iaculis turpis. In tincidunt quis leo ut interdum. Nulla tellus dolor, euismod nec ipsum et, viverra varius dolor.

+

Jandig

+
Uma experimentação de arte para exibições digitais em espaços físicos.
+

Celulares e tablets são usados para ler marcadores e assim abrir “janelas” onde se encontram outros objetos de arte. O público é convidado a transcender o espaço de exposição, levando adesivos com marcadores para serem colados em outros locais, criando Zonas Autônomas Temporárias (TAZes). O público se torna co-autor, e os marcadores e obras digitais são reconfigurados pelos espaços.

+ +
+

Entenda

+ +

O projeto Jandig é uma investigação a respeito da intervenção de marcadores para visualização de obras por meio de realidade aumentada sobre o espaço urbano. Trata-se de um projeto colaborativo de arte digital que propõe a criação de Zonas Autônomas Temporárias (TAZes) em cada espaço em que é instalado. Essas TAZes são formadas através de marcadores espalhados por um espaço por artistas e pelo público – que assim torna-se co-criador daquela experiência. Os usuários interagem com marcadores, utilizando dispositivos móveis para abrir janelas no mundo real para visualizar criações digitais (cedidas através de licença Creative Commons).

+
+ +
+

Nossos objetivos

+ +

A plataforma Jandig viabiliza a realização de exposições com o uso de realidade aumentada.

+ +

Cada exposição é feita a partir da disposição de diversos marcadores, que utilizam como suporte adesivos, imagens de stencil, de carimbos, ou outras, em diferentes tamanhos. Esses suportes são também entregues ao público que circulam pelo espaço, de modo que possam fazer interferências locais e que seja possível “viralizar” os marcadores enquanto a exposição estiver disponível, deixando rastros e proporcionando interações entre os participantes/visitantes.

+ +

Para enxergar através das “janelas” e ver as imagens fabulosas o que elas revelam, o público deverá apontar seus dispositivos para os marcadores, para que o visualizador da plataforma Jandig ufaça a leitura dos mesmos e mostre o conteúdo em realidade aumentada.

+ +

As bordas são os elementos gráficos que engatilham o reconhecimento do objeto associado a cada marcador. Por esse motivo, não se deve cobri-las e elas devem sempre ser vistas completamente pela câmera. Colocar o dedo sobre uma das bordas ou aproximar demais a câmera do marcador inviabiliza o reconhecimento, por exemplo. Essa característica deve sempre ser levada em consideração na produção e aplicação dos marcadores.

+
{% endblock %} \ No newline at end of file diff --git a/src/ARte/core/jinja2/core/community2.jinja2 b/src/ARte/core/jinja2/core/community2.jinja2 new file mode 100644 index 00000000..3d37de65 --- /dev/null +++ b/src/ARte/core/jinja2/core/community2.jinja2 @@ -0,0 +1,36 @@ +{% extends 'core/home.jinja2' %} + +{% block community %} +
+
+

Heading 1

+
Fusce a bibendum ante, sit amet luctus est. Praesent sit amet ullamcorper velit. Donec orci nisl, sagittis nec rhoncus vitae.
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut lorem enim, euismod a velit ut, congue tincidunt lacus. Nunc id dui eu leo blandit sodales non id odio. Nulla ut ante vitae tortor gravida efficitur vitae nec arcu. Integer id fringilla eros. Suspendisse porta feugiat tempor. Aenean eu turpis vitae mi euismod vestibulum. Duis ullamcorper suscipit arcu, at accumsan metus dignissim eu. Ut pellentesque pellentesque tincidunt.

+

Heading 2

+

Proin lacinia augue id ex pretium finibus. Donec egestas euismod tortor. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed aliquet convallis ante, at sodales odio egestas pretium. Fusce id fermentum quam. Curabitur vitae ante porta, pharetra metus vitae, vestibulum erat. Morbi eu pellentesque diam. Sed lobortis ultricies viverra. Fusce tempus neque ut orci posuere euismod. Sed vel lacus fermentum, maximus metus sit amet, varius urna.

+

Heading 3

+

Etiam leo neque, gravida non nisl nec, tempus aliquam velit. In ut sagittis erat. Aliquam sit amet pretium urna. Mauris rhoncus nulla quis ligula maximus vehicula. Nullam iaculis purus ultrices leo bibendum ultrices. Donec urna quam, gravida vitae molestie nec, malesuada id risus.

+

Heading 3

+

Nunc gravida, nulla vitae vestibulum eleifend, magna est accumsan massa, consectetur semper metus massa vel nunc. Suspendisse nec urna eu nulla mattis laoreet. Vestibulum tincidunt sit amet orci at maximus. Mauris risus massa, elementum interdum eros ut, porttitor volutpat neque. Quisque gravida convallis ipsum, in pharetra nulla aliquam vitae.

+
    +
  • Fusce a bibendum ante, sit amet luctus est.
    • +
  • Praesent sit amet ullamcorper velit.
    • +
  • Donec orci nisl, sagittis nec rhoncus vitae.
    • +
+

Heading 4

+

Maecenas varius urna at justo accumsan ullamcorper. Nullam dapibus posuere efficitur. Nulla venenatis mi sit amet quam blandit, nec scelerisque turpis tempus. Sed luctus sit amet eros placerat porttitor. Mauris eu convallis nibh.

+
+

Aenean diam magna, porta nec dui eu, pellentesque accumsan orci. Cras id sodales magna, eu eleifend lectus. Nulla facilisi. Ut orci libero, finibus eget faucibus nec, ullamcorper ac quam. Sed semper, nisi vitae tempus vehicula, orci erat euismod metus, vitae lobortis lacus mauris sit amet purus.

+
Heading 5
+

Etiam interdum tortor rhoncus, efficitur diam pretium, tristique orci. Fusce non sapien nec ligula lacinia rhoncus nec ac risus. Etiam efficitur ultricies ante. Nunc vitae eleifend felis. Phasellus posuere augue dolor, quis consequat dui mollis imperdiet. Proin quis fringilla lorem. Praesent pellentesque ac felis vel placerat. Mauris ac mauris sed lectus efficitur pulvinar. Nulla facilisi. Mauris bibendum urna ac ultrices aliquet.

+
    +
  1. Fusce a bibendum ante, sit amet luctus est.
    2. +
  2. Praesent sit amet ullamcorper velit.
    3. +
  3. Donec orci nisl, sagittis nec rhoncus vitae.
    4. +
+
Heading 6
+

Fusce a bibendum ante, sit amet luctus est. Praesent sit amet ullamcorper velit. Donec orci nisl, sagittis nec rhoncus vitae, iaculis et lacus. Sed cursus ligula non nunc interdum, a efficitur purus gravida. Aliquam ullamcorper pharetra libero commodo gravida. Curabitur eget arcu dictum, accumsan nulla sed, gravida ligula. Aliquam turpis lectus, semper eget justo at, fringilla iaculis turpis. In tincidunt quis leo ut interdum. Nulla tellus dolor, euismod nec ipsum et, viverra varius dolor.

+ +
+
+{% endblock %} \ No newline at end of file diff --git a/src/ARte/core/jinja2/core/documentation.jinja2 b/src/ARte/core/jinja2/core/documentation.jinja2 new file mode 100644 index 00000000..091d845e --- /dev/null +++ b/src/ARte/core/jinja2/core/documentation.jinja2 @@ -0,0 +1,12 @@ +{% extends '/core/home.jinja2' %} + +{% block content %} + + + +{% endblock %} \ No newline at end of file diff --git a/src/ARte/core/jinja2/core/exhibit_detail.jinja2 b/src/ARte/core/jinja2/core/exhibit_detail.jinja2 index 1c995fa9..8262d3b3 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}}

-

{{exhibit.slug}}

-

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

+
+ {# #} +

{{exhibit.name}}

+

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 diff --git a/src/ARte/core/jinja2/core/exhibit_select.jinja2 b/src/ARte/core/jinja2/core/exhibit_select.jinja2 index 427dd3c7..900b4778 100644 --- a/src/ARte/core/jinja2/core/exhibit_select.jinja2 +++ b/src/ARte/core/jinja2/core/exhibit_select.jinja2 @@ -11,7 +11,7 @@
-

Choose the exhibition you're seeing

+

{{_("Choose the exhibition you're seeing")}}

{{ csrf_input }} {% for field in form.visible_fields() %} @@ -19,7 +19,7 @@ {{ field }} {{ field.errors }}

- {% endfor%} + {% endfor %}
@@ -32,5 +32,12 @@ $('input[type="submit"]').prop('disabled', true); } }); + $('#id_exhibit').on('load',function(e){ + if($(this).prop('value') != ''){ + $('input[type="submit"]').prop('disabled', false); + }else{ + $('input[type="submit"]').prop('disabled', true); + } + }); {% endblock %} \ No newline at end of file diff --git a/src/ARte/core/jinja2/core/footer.jinja2 b/src/ARte/core/jinja2/core/footer.jinja2 index 8b34ebba..b27abdb5 100644 --- a/src/ARte/core/jinja2/core/footer.jinja2 +++ b/src/ARte/core/jinja2/core/footer.jinja2 @@ -1,13 +1,18 @@
- {{ _('About us') }} - {{ _('Jandig on Github') }} - + + {{ _('Documentation') }} + +
- {{ _('All content shared under this license.') }} - memelab + {{ _('Content under CC BY-SA 4.0 unless otherwise noted.') }} + memelab
-
\ No newline at end of file +
diff --git a/src/ARte/core/jinja2/core/generator.html b/src/ARte/core/jinja2/core/generator.html index 3b6347e3..4c43fbc8 100644 --- a/src/ARte/core/jinja2/core/generator.html +++ b/src/ARte/core/jinja2/core/generator.html @@ -19,7 +19,7 @@ - +
@@ -17,8 +19,8 @@
{{ csrf_input }}
-

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

-

+

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

+ {#

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

@@ -29,30 +31,31 @@

{{ form.visible_fields()[1] }} {{ form.visible_fields()[1].errors }} -

+

#}

{{ form.visible_fields()[4].as_hidden() }} {{ form.visible_fields()[4].errors }}

-
-

- - {{ _('Legal agreement') }} -

-
-

{{ _('Or choose one from our repository') }}

+ {#

{{ _('Or choose one from our repository') }}

#} {% with repository_list = marker_list, element_type = 'marker', selected=selected_marker %} {% include "users/components/repository-list.jinja2" %} {% endwith%} +
+

+ + {{ _("I agree to share this content under CC BY-SA 4.0 and I'm aware that, once uploaded, I cannot remove it. ") }} +

+
+
-

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

-

+

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

+ {#

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

@@ -63,29 +66,29 @@

{{ form.visible_fields()[3] }} {{ form.visible_fields()[3].errors }} -

+

#}

{{ form.visible_fields()[5].as_hidden() }} {{ form.visible_fields()[5].errors }}

-
-

- - {{ _('Legal agreement') }} -

-
-

{{ _('Or choose one from our repository') }}

+ {#

{{ _('Or choose one from our repository') }}

#} {% with repository_list = object_list, element_type = 'object', selected=selected_object%} {% include "users/components/repository-list.jinja2" %} {% endwith%} +
+

+ + {{ _("I agree to share this content under CC BY-SA 4.0 and I'm aware that, once uploaded, I cannot remove it. ") }} +

+
-

{{ _('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/createbox.jinja2 b/src/ARte/users/jinja2/users/components/createbox.jinja2 new file mode 100644 index 00000000..f2a75343 --- /dev/null +++ b/src/ARte/users/jinja2/users/components/createbox.jinja2 @@ -0,0 +1,17 @@ +

+
+
+ {{ _('Upload marker') }} +
+
+ {{ _('Upload object') }} +
+
+
+
+ {{ _('Create Jandig artwork') }} +
+
+ {{ _('Create exhibition') }} +
+
\ No newline at end of file diff --git a/src/ARte/users/jinja2/users/components/elements-modal.jinja2 b/src/ARte/users/jinja2/users/components/elements-modal.jinja2 index 1e706c98..f7d8f796 100644 --- a/src/ARte/users/jinja2/users/components/elements-modal.jinja2 +++ b/src/ARte/users/jinja2/users/components/elements-modal.jinja2 @@ -13,8 +13,8 @@

Download file:

- - + {# + #} - -

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

- +
+

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

+ +