From 3b3a261fb6cd62cda56edb6155be96f9fd95c7b8 Mon Sep 17 00:00:00 2001 From: Zambom Date: Wed, 30 Aug 2017 22:45:14 -0300 Subject: [PATCH] Adjusting bugs involving image in user create/update by admin --- amadeus/locale/pt_BR/LC_MESSAGES/django.po | 2 +- amadeus/static/js/crop.js | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ amadeus/static/js/crop_news.js | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------- analytics/locale/pt_BR/LC_MESSAGES/django.po | 2 +- api/locale/pt_BR/LC_MESSAGES/django.po | 2 +- bulletin/locale/pt_BR/LC_MESSAGES/django.po | 2 +- categories/locale/pt_BR/LC_MESSAGES/django.po | 2 +- chat/locale/pt_BR/LC_MESSAGES/django.po | 2 +- dashboards/locale/pt_BR/LC_MESSAGES/django.po | 2 +- file_link/locale/pt_BR/LC_MESSAGES/django.po | 2 +- goals/locale/pt_BR/LC_MESSAGES/django.po | 2 +- links/locale/pt_BR/LC_MESSAGES/django.po | 2 +- log/locale/pt_BR/LC_MESSAGES/django.po | 2 +- mailsender/locale/pt_BR/LC_MESSAGES/django.po | 2 +- mural/locale/pt_BR/LC_MESSAGES/django.po | 2 +- news/locale/pt_BR/LC_MESSAGES/django.po | 2 +- notifications/locale/pt_BR/LC_MESSAGES/django.po | 2 +- pdf_file/locale/pt_BR/LC_MESSAGES/django.po | 2 +- pendencies/locale/pt_BR/LC_MESSAGES/django.po | 2 +- reports/locale/pt_BR/LC_MESSAGES/django.po | 2 +- security/locale/pt_BR/LC_MESSAGES/django.po | 2 +- students_group/locale/pt_BR/LC_MESSAGES/django.po | 2 +- subjects/locale/pt_BR/LC_MESSAGES/django.po | 2 +- themes/locale/pt_BR/LC_MESSAGES/django.po | 2 +- topics/locale/pt_BR/LC_MESSAGES/django.po | 2 +- users/locale/pt_BR/LC_MESSAGES/django.po | 23 ++++++++++++++++------- users/static/js/crop.js | 66 ------------------------------------------------------------------ users/templates/users/_form.html | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- webconference/locale/pt_BR/LC_MESSAGES/django.po | 2 +- webpage/locale/pt_BR/LC_MESSAGES/django.po | 2 +- youtube_video/locale/pt_BR/LC_MESSAGES/django.po | 2 +- 31 files changed, 286 insertions(+), 182 deletions(-) create mode 100644 amadeus/static/js/crop.js delete mode 100644 users/static/js/crop.js diff --git a/amadeus/locale/pt_BR/LC_MESSAGES/django.po b/amadeus/locale/pt_BR/LC_MESSAGES/django.po index 3a1d003..ef9d50f 100644 --- a/amadeus/locale/pt_BR/LC_MESSAGES/django.po +++ b/amadeus/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/amadeus/static/js/crop.js b/amadeus/static/js/crop.js new file mode 100644 index 0000000..619a0cd --- /dev/null +++ b/amadeus/static/js/crop.js @@ -0,0 +1,98 @@ +$(function () { + /* Script para abrir o modal com a imagem selecionada */ + $("#id_image").change(function () { + var max_size = 2*1024*1024; + var submit_btn = $("#user-form").find("input[type='submit']"); + var regex = new RegExp("(.*?)\.(jpg|jpeg|png)$"); + var errors = 0; + + $(".client-file-errors").hide(); + $(".size").hide(); + $(".format").hide(); + $(submit_btn).prop('disable', false); + $(submit_btn).prop('disabled', false); + + if (this.files && this.files[0]) { + if (this.files[0].size > max_size) { + $(submit_btn).prop('disable', true); + $(submit_btn).prop('disabled', true); + + $(".client-file-errors").show(); + $(".size").show(); + + errors++; + } + + if (!this.files[0].type.match(/^image\//)) { + $(submit_btn).prop('disable', true); + $(submit_btn).prop('disabled', true); + + $(".client-file-errors").show(); + $(".format").show(); + + errors++; + } + + if (errors == 0) { + var reader = new FileReader(); + reader.onload = function (e) { + $("#image").attr("src", e.target.result); + $("#modalCrop").modal("show"); + } + reader.readAsDataURL(this.files[0]); + } + } + }); + + /* Scripts da caixa de corte da imagem */ + var $image = $("#image"); + var cropBoxData; + var canvasData; + $("#modalCrop").on("shown.bs.modal", function () { + $image.cropper({ + viewMode: 1, + aspectRatio: 1/1, + minCropBoxWidth: 200, + minCropBoxHeight: 200, + ready: function () { + $image.cropper("setCanvasData", canvasData); + $image.cropper("setCropBoxData", cropBoxData); + } + }); + }).on("hidden.bs.modal", function () { + cropBoxData = $image.cropper("getCropBoxData"); + canvasData = $image.cropper("getCanvasData"); + $image.cropper("destroy"); + }); + + $(".js-zoom-in").click(function () { + $image.cropper("zoom", 0.1); + }); + + $(".js-zoom-out").click(function () { + $image.cropper("zoom", -0.1); + }); + + /* Script para pegar os valores das dimensões e depois fechar o modal */ + $(".js-crop-and-upload").click(function () { + var cropData = $image.cropper("getData"); + $("#id_x").val(cropData["x"]); + $("#id_y").val(cropData["y"]); + $("#id_height").val(cropData["height"]); + $("#id_width").val(cropData["width"]); + $("#modalCrop").modal('hide'); + }); + + /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/ + $("#id_image").on('change', function(){ + console.log(this.value); + }); + + $('#crop_cancel').on('click', function(e){ + var input = $("#id_image"); + var holder = $("#pic_holder"); + input.replaceWith(input.val('').clone(true)); + holder.replaceWith(holder.val('').clone(true)); + }); + +}); diff --git a/amadeus/static/js/crop_news.js b/amadeus/static/js/crop_news.js index c7ce82b..f241bc2 100644 --- a/amadeus/static/js/crop_news.js +++ b/amadeus/static/js/crop_news.js @@ -1,67 +1,67 @@ $(function () { - /* Script para abrir o modal com a imagem selecionada */ - $("#id_image").change(function () { - if (this.files && this.files[0]) { - var reader = new FileReader(); - reader.onload = function (e) { - $("#image").attr("src", e.target.result); - $("#modalCrop").modal("show"); - } - reader.readAsDataURL(this.files[0]); - } - }); + /* Script para abrir o modal com a imagem selecionada */ + $("#id_image").change(function () { + if (this.files && this.files[0]) { + var reader = new FileReader(); + reader.onload = function (e) { + $("#image").attr("src", e.target.result); + $("#modalCrop").modal("show"); + } + reader.readAsDataURL(this.files[0]); + } + }); - /* Scripts da caixa de corte da imagem */ - var $image = $("#image"); - var cropBoxData; - var canvasData; - $("#modalCrop").on("shown.bs.modal", function () { - $image.cropper({ - viewMode: 1 , - aspectRatio: 24/5, - minCropBoxWidth: 200, - minCropBoxHeight: 200, - dragMode: 'move', - ready: function () { - $image.cropper("setCanvasData", canvasData); - $image.cropper("setCropBoxData", cropBoxData); - } - }); - }).on("hidden.bs.modal", function () { - cropBoxData = $image.cropper("getCropBoxData"); - canvasData = $image.cropper("getCanvasData"); - $image.cropper("destroy"); - }); + /* Scripts da caixa de corte da imagem */ + var $image = $("#image"); + var cropBoxData; + var canvasData; + $("#modalCrop").on("shown.bs.modal", function () { + $image.cropper({ + viewMode: 1 , + aspectRatio: 24/5, + minCropBoxWidth: 200, + minCropBoxHeight: 200, + dragMode: 'move', + ready: function () { + $image.cropper("setCanvasData", canvasData); + $image.cropper("setCropBoxData", cropBoxData); + } + }); + }).on("hidden.bs.modal", function () { + cropBoxData = $image.cropper("getCropBoxData"); + canvasData = $image.cropper("getCanvasData"); + $image.cropper("destroy"); + }); - $(".js-zoom-in").click(function () { - $image.cropper("zoom", 0.1); - }); + $(".js-zoom-in").click(function () { + $image.cropper("zoom", 0.1); + }); - $(".js-zoom-out").click(function () { - $image.cropper("zoom", -0.1); - }); + $(".js-zoom-out").click(function () { + $image.cropper("zoom", -0.1); + }); - /* Script para pegar os valores das dimensões e depois fechar o modal */ - $(".js-crop-and-upload").click(function () { - var cropData = $image.cropper("getData"); - $("#id_x").val(cropData["x"]); - $("#id_y").val(cropData["y"]); - $("#id_height").val(cropData["height"]); - $("#id_width").val(cropData["width"]); - $("#modalCrop").modal('hide'); - }); + /* Script para pegar os valores das dimensões e depois fechar o modal */ + $(".js-crop-and-upload").click(function () { + var cropData = $image.cropper("getData"); + $("#id_x").val(cropData["x"]); + $("#id_y").val(cropData["y"]); + $("#id_height").val(cropData["height"]); + $("#id_width").val(cropData["width"]); + $("#modalCrop").modal('hide'); + }); - /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/ - $("#id_image").on('change', function(){ - console.log(this.value); - }); + /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/ + $("#id_image").on('change', function(){ + console.log(this.value); + }); - $('#crop_cancel').on('click', function(e){ - var input = $("#id_image"); - var holder = $("#pic_holder"); - input.replaceWith(input.val('').clone(true)); - holder.replaceWith(holder.val('').clone(true)); - }); + $('#crop_cancel').on('click', function(e){ + var input = $("#id_image"); + var holder = $("#pic_holder"); + input.replaceWith(input.val('').clone(true)); + holder.replaceWith(holder.val('').clone(true)); + }); }); diff --git a/analytics/locale/pt_BR/LC_MESSAGES/django.po b/analytics/locale/pt_BR/LC_MESSAGES/django.po index 09f414d..7307f43 100644 --- a/analytics/locale/pt_BR/LC_MESSAGES/django.po +++ b/analytics/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/api/locale/pt_BR/LC_MESSAGES/django.po b/api/locale/pt_BR/LC_MESSAGES/django.po index 620fcba..e73f5fd 100644 --- a/api/locale/pt_BR/LC_MESSAGES/django.po +++ b/api/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/bulletin/locale/pt_BR/LC_MESSAGES/django.po b/bulletin/locale/pt_BR/LC_MESSAGES/django.po index 8bd4127..d3fee85 100644 --- a/bulletin/locale/pt_BR/LC_MESSAGES/django.po +++ b/bulletin/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/categories/locale/pt_BR/LC_MESSAGES/django.po b/categories/locale/pt_BR/LC_MESSAGES/django.po index f2602d6..ae200e0 100644 --- a/categories/locale/pt_BR/LC_MESSAGES/django.po +++ b/categories/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/chat/locale/pt_BR/LC_MESSAGES/django.po b/chat/locale/pt_BR/LC_MESSAGES/django.po index 461f120..759c11f 100644 --- a/chat/locale/pt_BR/LC_MESSAGES/django.po +++ b/chat/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/dashboards/locale/pt_BR/LC_MESSAGES/django.po b/dashboards/locale/pt_BR/LC_MESSAGES/django.po index 353cc24..e199cf0 100644 --- a/dashboards/locale/pt_BR/LC_MESSAGES/django.po +++ b/dashboards/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/file_link/locale/pt_BR/LC_MESSAGES/django.po b/file_link/locale/pt_BR/LC_MESSAGES/django.po index 99fe684..e6fd487 100644 --- a/file_link/locale/pt_BR/LC_MESSAGES/django.po +++ b/file_link/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/goals/locale/pt_BR/LC_MESSAGES/django.po b/goals/locale/pt_BR/LC_MESSAGES/django.po index d2721ff..cfc8686 100644 --- a/goals/locale/pt_BR/LC_MESSAGES/django.po +++ b/goals/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/links/locale/pt_BR/LC_MESSAGES/django.po b/links/locale/pt_BR/LC_MESSAGES/django.po index 01b7be8..b4d4f62 100644 --- a/links/locale/pt_BR/LC_MESSAGES/django.po +++ b/links/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/log/locale/pt_BR/LC_MESSAGES/django.po b/log/locale/pt_BR/LC_MESSAGES/django.po index 7c76da4..aa65e69 100644 --- a/log/locale/pt_BR/LC_MESSAGES/django.po +++ b/log/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/mailsender/locale/pt_BR/LC_MESSAGES/django.po b/mailsender/locale/pt_BR/LC_MESSAGES/django.po index 58711b6..5aae38b 100644 --- a/mailsender/locale/pt_BR/LC_MESSAGES/django.po +++ b/mailsender/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/mural/locale/pt_BR/LC_MESSAGES/django.po b/mural/locale/pt_BR/LC_MESSAGES/django.po index b18d062..32553d2 100644 --- a/mural/locale/pt_BR/LC_MESSAGES/django.po +++ b/mural/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/news/locale/pt_BR/LC_MESSAGES/django.po b/news/locale/pt_BR/LC_MESSAGES/django.po index 306e84b..2591756 100644 --- a/news/locale/pt_BR/LC_MESSAGES/django.po +++ b/news/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/notifications/locale/pt_BR/LC_MESSAGES/django.po b/notifications/locale/pt_BR/LC_MESSAGES/django.po index 2229043..d20fa73 100644 --- a/notifications/locale/pt_BR/LC_MESSAGES/django.po +++ b/notifications/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/pdf_file/locale/pt_BR/LC_MESSAGES/django.po b/pdf_file/locale/pt_BR/LC_MESSAGES/django.po index 3d2c2a8..a52a21e 100644 --- a/pdf_file/locale/pt_BR/LC_MESSAGES/django.po +++ b/pdf_file/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/pendencies/locale/pt_BR/LC_MESSAGES/django.po b/pendencies/locale/pt_BR/LC_MESSAGES/django.po index 994f7f5..b8a2828 100644 --- a/pendencies/locale/pt_BR/LC_MESSAGES/django.po +++ b/pendencies/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/reports/locale/pt_BR/LC_MESSAGES/django.po b/reports/locale/pt_BR/LC_MESSAGES/django.po index 52d126a..fd531eb 100644 --- a/reports/locale/pt_BR/LC_MESSAGES/django.po +++ b/reports/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/security/locale/pt_BR/LC_MESSAGES/django.po b/security/locale/pt_BR/LC_MESSAGES/django.po index 7f77621..3f5b1e4 100644 --- a/security/locale/pt_BR/LC_MESSAGES/django.po +++ b/security/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/students_group/locale/pt_BR/LC_MESSAGES/django.po b/students_group/locale/pt_BR/LC_MESSAGES/django.po index 344a5b1..7d0c439 100644 --- a/students_group/locale/pt_BR/LC_MESSAGES/django.po +++ b/students_group/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/subjects/locale/pt_BR/LC_MESSAGES/django.po b/subjects/locale/pt_BR/LC_MESSAGES/django.po index 1b48b92..2bef317 100644 --- a/subjects/locale/pt_BR/LC_MESSAGES/django.po +++ b/subjects/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/themes/locale/pt_BR/LC_MESSAGES/django.po b/themes/locale/pt_BR/LC_MESSAGES/django.po index 83c2a5c..21da284 100644 --- a/themes/locale/pt_BR/LC_MESSAGES/django.po +++ b/themes/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/topics/locale/pt_BR/LC_MESSAGES/django.po b/topics/locale/pt_BR/LC_MESSAGES/django.po index 99e8acc..6c2265f 100644 --- a/topics/locale/pt_BR/LC_MESSAGES/django.po +++ b/topics/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/users/locale/pt_BR/LC_MESSAGES/django.po b/users/locale/pt_BR/LC_MESSAGES/django.po index 352e132..118c75d 100644 --- a/users/locale/pt_BR/LC_MESSAGES/django.po +++ b/users/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" msgid "You must insert an email address" msgstr "Você deve inserir um endereço de email" -#: users/forms.py:43 +#: users/forms.py:43 users/templates/users/_form.html:94 msgid "The image is too large. It should have less than 2MB." msgstr "A imagem é muito grande. Ela deve conter menos de 2MB." @@ -87,7 +87,7 @@ msgstr "Email" msgid "You must insert a valid email address" msgstr "Você deve inserir um endereço de email válido" -#: users/models.py:18 +#: users/models.py:18 users/templates/users/_form.html:95 msgid "File not supported." msgstr "Arquivo não suportado." @@ -173,15 +173,24 @@ msgstr "Sim" msgid "Is not an admin" msgstr "Não é administrador" -#: users/templates/users/_form.html:16 users/templates/users/register.html:53 +#: users/templates/users/_form.html:18 users/templates/users/register.html:53 msgid "Choose your photo..." msgstr "Escolha sua foto..." -#: users/templates/users/_form.html:76 +#: users/templates/users/_form.html:32 +msgid "Click or drop the file here" +msgstr "" + +#: users/templates/users/_form.html:34 +msgid "The photo could not exceed 2MB." +msgstr "A imagem não pode exceder o tamanho de 2MB." + +#: users/templates/users/_form.html:103 msgid "Save" msgstr "Salvar" -#: users/templates/users/_form.html:79 users/templates/users/modal_crop.html:24 +#: users/templates/users/_form.html:106 +#: users/templates/users/modal_crop.html:24 msgid "Cancel" msgstr "Cancelar" @@ -259,7 +268,7 @@ msgstr "Entrar" msgid "Sign Up" msgstr "Cadastrar" -#: users/templates/users/login.html:81 users/templates/users/login.html:114 +#: users/templates/users/login.html:79 users/templates/users/login.html:107 msgid "Forgot your password?" msgstr "Esqueceu sua senha?" diff --git a/users/static/js/crop.js b/users/static/js/crop.js deleted file mode 100644 index 13bb437..0000000 --- a/users/static/js/crop.js +++ /dev/null @@ -1,66 +0,0 @@ -$(function () { - - /* Script para abrir o modal com a imagem selecionada */ - $("#id_image").change(function () { - if (this.files && this.files[0]) { - var reader = new FileReader(); - reader.onload = function (e) { - $("#image").attr("src", e.target.result); - $("#modalCrop").modal("show"); - } - reader.readAsDataURL(this.files[0]); - } - }); - - /* Scripts da caixa de corte da imagem */ - var $image = $("#image"); - var cropBoxData; - var canvasData; - $("#modalCrop").on("shown.bs.modal", function () { - $image.cropper({ - viewMode: 1, - aspectRatio: 1/1, - minCropBoxWidth: 200, - minCropBoxHeight: 200, - ready: function () { - $image.cropper("setCanvasData", canvasData); - $image.cropper("setCropBoxData", cropBoxData); - } - }); - }).on("hidden.bs.modal", function () { - cropBoxData = $image.cropper("getCropBoxData"); - canvasData = $image.cropper("getCanvasData"); - $image.cropper("destroy"); - }); - - $(".js-zoom-in").click(function () { - $image.cropper("zoom", 0.1); - }); - - $(".js-zoom-out").click(function () { - $image.cropper("zoom", -0.1); - }); - - /* Script para pegar os valores das dimensões e depois fechar o modal */ - $(".js-crop-and-upload").click(function () { - var cropData = $image.cropper("getData"); - $("#id_x").val(cropData["x"]); - $("#id_y").val(cropData["y"]); - $("#id_height").val(cropData["height"]); - $("#id_width").val(cropData["width"]); - $("#modalCrop").modal('hide'); - }); - - /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/ - $("#id_image").on('change', function(){ - console.log(this.value); - }); - - $('#crop_cancel').on('click', function(e){ - var input = $("#id_image"); - var holder = $("#pic_holder"); - input.replaceWith(input.val('').clone(true)); - holder.replaceWith(holder.val('').clone(true)); - }); - -}); diff --git a/users/templates/users/_form.html b/users/templates/users/_form.html index 53552e9..a374bc3 100644 --- a/users/templates/users/_form.html +++ b/users/templates/users/_form.html @@ -1,7 +1,7 @@ {% load static i18n %} {% load widget_tweaks %} -
+ {% csrf_token %} {% for field in form %}
@@ -10,16 +10,31 @@ {% else %} - {% endif %} - {% render_field field class='form-control' %} -
- - - - -
+ {% endif %} + + {% render_field field class='file-selector' %} + +
+ + + + +
+ +
+ {% if acc.image %} +
+ + {{ acc.image.path }} + {% else %} + {% trans 'Click or drop the file here' %}
+ + {% trans 'The photo could not exceed 2MB.' %} + {% endif %} +
+ {% elif field.auto_id == 'id_description' %} {% if field.field.required %} @@ -52,23 +67,35 @@ {% else %} {% render_field field class='form-control' %} {% endif %} - - - {% endif %} - {{ field.help_text }} - {% if field.errors %} - {% endif %} + + {{ field.help_text }}
+ + {% if field.errors %} + + {% endif %} + + {% if field.auto_id == 'id_image' %} + + {% endif %} {% endfor %}
@@ -84,3 +111,39 @@ {% include 'users/modal_crop.html' %} + diff --git a/webconference/locale/pt_BR/LC_MESSAGES/django.po b/webconference/locale/pt_BR/LC_MESSAGES/django.po index d63f8c4..250b599 100644 --- a/webconference/locale/pt_BR/LC_MESSAGES/django.po +++ b/webconference/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/webpage/locale/pt_BR/LC_MESSAGES/django.po b/webpage/locale/pt_BR/LC_MESSAGES/django.po index 63a813c..c97bb86 100644 --- a/webpage/locale/pt_BR/LC_MESSAGES/django.po +++ b/webpage/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/youtube_video/locale/pt_BR/LC_MESSAGES/django.po b/youtube_video/locale/pt_BR/LC_MESSAGES/django.po index 2ef78bb..4733ad3 100644 --- a/youtube_video/locale/pt_BR/LC_MESSAGES/django.po +++ b/youtube_video/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: 2017-08-27 21:08-0300\n" +"POT-Creation-Date: 2017-08-30 22:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- libgit2 0.21.2