Commit a4836dd76adb99edf66b0b8debae16317af36d78

Authored by Erik Zambom
Committed by GitHub
2 parents fc10a779 d1823e72

Merge pull request #547 from amadeusproject/refactoring

Daily Update - 31_08_2017
Showing 40 changed files with 459 additions and 233 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
No preview for this file type
amadeus/static/css/themes/green.css
... ... @@ -557,6 +557,9 @@ a.add-row {
557 557 .bulletin-warning a {
558 558 color: #4caf50; }
559 559  
  560 +.login_subcommands a, .login_subcommands a:hover {
  561 + color: #43a251; }
  562 +
560 563 @media(max-width: 768px) {
561 564 .navbar .navbar-nav .dropdown .dropdown-menu li > a {
562 565 color: #333333 !important; }
... ...
amadeus/static/css/themes/green.css.map
1 1 {
2 2 "version": 3,
3   -"mappings": "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",
  3 +"mappings": "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",
4 4 "sources": ["green.sass"],
5 5 "names": [],
6 6 "file": "green.css"
... ...
amadeus/static/css/themes/green.sass
... ... @@ -724,6 +724,9 @@ a.add-row
724 724 .bulletin-warning a
725 725 color: #4caf50
726 726  
  727 +.login_subcommands a, .login_subcommands a:hover
  728 + color: #43a251
  729 +
727 730 @media(max-width: 768px)
728 731 .navbar .navbar-nav .dropdown .dropdown-menu li > a
729 732 color: #333333 !important
... ...
amadeus/static/js/crop.js 0 → 100644
... ... @@ -0,0 +1,98 @@
  1 +$(function () {
  2 + /* Script para abrir o modal com a imagem selecionada */
  3 + $("#id_image").change(function () {
  4 + var max_size = 2*1024*1024;
  5 + var submit_btn = $("#user-form").find("input[type='submit']");
  6 + var regex = new RegExp("(.*?)\.(jpg|jpeg|png)$");
  7 + var errors = 0;
  8 +
  9 + $(".client-file-errors").hide();
  10 + $(".size").hide();
  11 + $(".format").hide();
  12 + $(submit_btn).prop('disable', false);
  13 + $(submit_btn).prop('disabled', false);
  14 +
  15 + if (this.files && this.files[0]) {
  16 + if (this.files[0].size > max_size) {
  17 + $(submit_btn).prop('disable', true);
  18 + $(submit_btn).prop('disabled', true);
  19 +
  20 + $(".client-file-errors").show();
  21 + $(".size").show();
  22 +
  23 + errors++;
  24 + }
  25 +
  26 + if (!this.files[0].type.match(/^image\//)) {
  27 + $(submit_btn).prop('disable', true);
  28 + $(submit_btn).prop('disabled', true);
  29 +
  30 + $(".client-file-errors").show();
  31 + $(".format").show();
  32 +
  33 + errors++;
  34 + }
  35 +
  36 + if (errors == 0) {
  37 + var reader = new FileReader();
  38 + reader.onload = function (e) {
  39 + $("#image").attr("src", e.target.result);
  40 + $("#modalCrop").modal("show");
  41 + }
  42 + reader.readAsDataURL(this.files[0]);
  43 + }
  44 + }
  45 + });
  46 +
  47 + /* Scripts da caixa de corte da imagem */
  48 + var $image = $("#image");
  49 + var cropBoxData;
  50 + var canvasData;
  51 + $("#modalCrop").on("shown.bs.modal", function () {
  52 + $image.cropper({
  53 + viewMode: 1,
  54 + aspectRatio: 1/1,
  55 + minCropBoxWidth: 200,
  56 + minCropBoxHeight: 200,
  57 + ready: function () {
  58 + $image.cropper("setCanvasData", canvasData);
  59 + $image.cropper("setCropBoxData", cropBoxData);
  60 + }
  61 + });
  62 + }).on("hidden.bs.modal", function () {
  63 + cropBoxData = $image.cropper("getCropBoxData");
  64 + canvasData = $image.cropper("getCanvasData");
  65 + $image.cropper("destroy");
  66 + });
  67 +
  68 + $(".js-zoom-in").click(function () {
  69 + $image.cropper("zoom", 0.1);
  70 + });
  71 +
  72 + $(".js-zoom-out").click(function () {
  73 + $image.cropper("zoom", -0.1);
  74 + });
  75 +
  76 + /* Script para pegar os valores das dimensões e depois fechar o modal */
  77 + $(".js-crop-and-upload").click(function () {
  78 + var cropData = $image.cropper("getData");
  79 + $("#id_x").val(cropData["x"]);
  80 + $("#id_y").val(cropData["y"]);
  81 + $("#id_height").val(cropData["height"]);
  82 + $("#id_width").val(cropData["width"]);
  83 + $("#modalCrop").modal('hide');
  84 + });
  85 +
  86 + /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/
  87 + $("#id_image").on('change', function(){
  88 + console.log(this.value);
  89 + });
  90 +
  91 + $('#crop_cancel').on('click', function(e){
  92 + var input = $("#id_image");
  93 + var holder = $("#pic_holder");
  94 + input.replaceWith(input.val('').clone(true));
  95 + holder.replaceWith(holder.val('').clone(true));
  96 + });
  97 +
  98 +});
... ...
amadeus/static/js/crop_news.js
1 1 $(function () {
2 2  
3   - /* Script para abrir o modal com a imagem selecionada */
4   - $("#id_image").change(function () {
5   - if (this.files && this.files[0]) {
6   - var reader = new FileReader();
7   - reader.onload = function (e) {
8   - $("#image").attr("src", e.target.result);
9   - $("#modalCrop").modal("show");
10   - }
11   - reader.readAsDataURL(this.files[0]);
12   - }
13   - });
  3 + /* Script para abrir o modal com a imagem selecionada */
  4 + $("#id_image").change(function () {
  5 + if (this.files && this.files[0]) {
  6 + var reader = new FileReader();
  7 + reader.onload = function (e) {
  8 + $("#image").attr("src", e.target.result);
  9 + $("#modalCrop").modal("show");
  10 + }
  11 + reader.readAsDataURL(this.files[0]);
  12 + }
  13 + });
14 14  
15   - /* Scripts da caixa de corte da imagem */
16   - var $image = $("#image");
17   - var cropBoxData;
18   - var canvasData;
19   - $("#modalCrop").on("shown.bs.modal", function () {
20   - $image.cropper({
21   - viewMode: 1 ,
22   - aspectRatio: 24/5,
23   - minCropBoxWidth: 200,
24   - minCropBoxHeight: 200,
25   - dragMode: 'move',
26   - ready: function () {
27   - $image.cropper("setCanvasData", canvasData);
28   - $image.cropper("setCropBoxData", cropBoxData);
29   - }
30   - });
31   - }).on("hidden.bs.modal", function () {
32   - cropBoxData = $image.cropper("getCropBoxData");
33   - canvasData = $image.cropper("getCanvasData");
34   - $image.cropper("destroy");
35   - });
  15 + /* Scripts da caixa de corte da imagem */
  16 + var $image = $("#image");
  17 + var cropBoxData;
  18 + var canvasData;
  19 + $("#modalCrop").on("shown.bs.modal", function () {
  20 + $image.cropper({
  21 + viewMode: 1 ,
  22 + aspectRatio: 24/5,
  23 + minCropBoxWidth: 200,
  24 + minCropBoxHeight: 200,
  25 + dragMode: 'move',
  26 + ready: function () {
  27 + $image.cropper("setCanvasData", canvasData);
  28 + $image.cropper("setCropBoxData", cropBoxData);
  29 + }
  30 + });
  31 + }).on("hidden.bs.modal", function () {
  32 + cropBoxData = $image.cropper("getCropBoxData");
  33 + canvasData = $image.cropper("getCanvasData");
  34 + $image.cropper("destroy");
  35 + });
36 36  
37   - $(".js-zoom-in").click(function () {
38   - $image.cropper("zoom", 0.1);
39   - });
  37 + $(".js-zoom-in").click(function () {
  38 + $image.cropper("zoom", 0.1);
  39 + });
40 40  
41   - $(".js-zoom-out").click(function () {
42   - $image.cropper("zoom", -0.1);
43   - });
  41 + $(".js-zoom-out").click(function () {
  42 + $image.cropper("zoom", -0.1);
  43 + });
44 44  
45   - /* Script para pegar os valores das dimensões e depois fechar o modal */
46   - $(".js-crop-and-upload").click(function () {
47   - var cropData = $image.cropper("getData");
48   - $("#id_x").val(cropData["x"]);
49   - $("#id_y").val(cropData["y"]);
50   - $("#id_height").val(cropData["height"]);
51   - $("#id_width").val(cropData["width"]);
52   - $("#modalCrop").modal('hide');
53   - });
  45 + /* Script para pegar os valores das dimensões e depois fechar o modal */
  46 + $(".js-crop-and-upload").click(function () {
  47 + var cropData = $image.cropper("getData");
  48 + $("#id_x").val(cropData["x"]);
  49 + $("#id_y").val(cropData["y"]);
  50 + $("#id_height").val(cropData["height"]);
  51 + $("#id_width").val(cropData["width"]);
  52 + $("#modalCrop").modal('hide');
  53 + });
54 54  
55   - /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/
56   - $("#id_image").on('change', function(){
57   - console.log(this.value);
58   - });
  55 + /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/
  56 + $("#id_image").on('change', function(){
  57 + console.log(this.value);
  58 + });
59 59  
60   - $('#crop_cancel').on('click', function(e){
61   - var input = $("#id_image");
62   - var holder = $("#pic_holder");
63   - input.replaceWith(input.val('').clone(true));
64   - holder.replaceWith(holder.val('').clone(true));
65   - });
  60 + $('#crop_cancel').on('click', function(e){
  61 + var input = $("#id_image");
  62 + var holder = $("#pic_holder");
  63 + input.replaceWith(input.val('').clone(true));
  64 + holder.replaceWith(holder.val('').clone(true));
  65 + });
66 66  
67 67 });
... ...
amadeus/static/js/themes.js
... ... @@ -30,10 +30,47 @@ function Init() {
30 30 // file selection
31 31 function FileSelectHandler(e) {
32 32 var files = e.target.files || e.dataTransfer.files,
33   - parent = $(e.target.offsetParent);
  33 + parent = $(e.target.offsetParent),
  34 + file_id = parent.data('file_id'),
  35 + submit_btn = $("#theme-form").find("input[type='submit']"),
  36 + max_size = 2*1024*1024;
34 37  
  38 + parent.removeClass('alert-file');
  39 +
  40 + var alerts_open = $("#theme-form").find(".alert-file").length;
  41 +
  42 + console.log(alerts_open);
  43 +
  44 + if (alerts_open == 0) {
  45 + $(submit_btn).prop('disable', false);
  46 + $(submit_btn).prop('disabled', false);
  47 + }
  48 +
  49 + $("." + file_id + "-file-errors").hide();
  50 + $("." + file_id + "-file-errors .size").hide();
  51 + $("." + file_id + "-file-errors .format").hide();
35 52 // process all File objects
36 53 for (var i = 0, f; f = files[i]; i++) {
  54 + if (f.size > max_size) {
  55 + $(submit_btn).prop('disable', true);
  56 + $(submit_btn).prop('disabled', true);
  57 +
  58 + $("." + file_id + "-file-errors").show();
  59 + $("." + file_id + "-file-errors .size").show();
  60 +
  61 + parent.addClass('alert-file');
  62 + }
  63 +
  64 + if (!f.type.match(/^image\//)) {
  65 + $(submit_btn).prop('disable', true);
  66 + $(submit_btn).prop('disabled', true);
  67 +
  68 + $("." + file_id + "-file-errors").show();
  69 + $("." + file_id + "-file-errors .format").show();
  70 +
  71 + parent.addClass('alert-file');
  72 + }
  73 +
37 74 parent.find('.filedrag').html(f.name);
38 75 }
39 76 }
40 77 \ No newline at end of file
... ...
analytics/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
api/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
bulletin/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
categories/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
chat/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
dashboards/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
file_link/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
goals/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
links/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
log/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
mailsender/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
mural/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
news/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
notifications/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
pdf_file/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
pendencies/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
reports/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
security/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
students_group/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
subjects/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
themes/forms.py
1 1 # coding=utf-8
2 2 from django import forms
3 3  
  4 +from resubmit.widgets import ResubmitFileWidget
  5 +
4 6 from .models import Themes
5 7  
6 8 class BasicElemetsForm(forms.ModelForm):
... ... @@ -45,6 +47,11 @@ class BasicElemetsForm(forms.ModelForm):
45 47 class Meta:
46 48 model = Themes
47 49 fields = ['title', 'favicon', 'small_logo', 'large_logo', 'footer_note']
  50 + widgets = {
  51 + 'favicon': ResubmitFileWidget(attrs={'accept':'image/*'}),
  52 + 'small_logo': ResubmitFileWidget(attrs={'accept':'image/*'}),
  53 + 'larger_logo': ResubmitFileWidget(attrs={'accept':'image/*'}),
  54 + }
48 55  
49 56 class CSSStyleForm(forms.ModelForm):
50 57  
... ...
themes/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
themes/templates/themes/basic_update.html
... ... @@ -15,10 +15,10 @@
15 15 <div class="card-body">
16 16 <a href="{% url 'themes:basic' %}" class="page_selector"><h4><i class="fa fa-angle-down"></i> {% trans 'Basic Elements' %}</h4></a>
17 17  
18   - <form method="post" action="" enctype="multipart/form-data">
  18 + <form id="theme-form" method="post" action="" enctype="multipart/form-data">
19 19 {% csrf_token %}
20 20 {% for field in form %}
21   - <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
  21 + <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput" data-file_id="{{ field.auto_id }}">
22 22 {% if field.auto_id == 'id_small_logo' or field.auto_id == 'id_large_logo' or field.auto_id == 'id_favicon' %}
23 23 {% if field.field.required %}
24 24 <label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
... ... @@ -70,19 +70,33 @@
70 70 {% endif %}
71 71  
72 72 <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
73   - {% if field.errors %}
74   - <div class="alert alert-danger alert-dismissible" role="alert">
75   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
76   - <span aria-hidden="true">&times;</span>
77   - </button>
78   - <ul>
79   - {% for error in field.errors %}
80   - <li>{{ error }}</li>
81   - {% endfor %}
82   - </ul>
83   - </div>
84   - {% endif %}
85 73 </div>
  74 +
  75 + {% if field.errors %}
  76 + <div class="alert alert-danger alert-dismissible" role="alert">
  77 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  78 + <span aria-hidden="true">&times;</span>
  79 + </button>
  80 + <ul>
  81 + {% for error in field.errors %}
  82 + <li>{{ error }}</li>
  83 + {% endfor %}
  84 + </ul>
  85 + </div>
  86 + {% endif %}
  87 +
  88 + {% if field.auto_id == 'id_small_logo' or field.auto_id == 'id_large_logo' or field.auto_id == 'id_favicon' %}
  89 + <div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible {{ field.auto_id }}-file-errors" style="display:none" role="alert">
  90 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  91 + <span aria-hidden="true">&times;</span>
  92 + </button>
  93 + <ul>
  94 + <li class="size" style="display:none">{% trans "The image is too large. It should have less than 2MB." %}</li>
  95 + <li class="format" style="display:none">{% trans 'File not supported.' %}</li>
  96 + </ul>
  97 + </div>
  98 + <br clear="all" />
  99 + {% endif %}
86 100 {% endfor %}
87 101 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
88 102 <div class="text-center">
... ...
topics/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
users/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -22,7 +22,7 @@ msgstr &quot;&quot;
22 22 msgid "You must insert an email address"
23 23 msgstr "Você deve inserir um endereço de email"
24 24  
25   -#: users/forms.py:43
  25 +#: users/forms.py:43 users/templates/users/_form.html:94
26 26 msgid "The image is too large. It should have less than 2MB."
27 27 msgstr "A imagem é muito grande. Ela deve conter menos de 2MB."
28 28  
... ... @@ -87,7 +87,7 @@ msgstr &quot;Email&quot;
87 87 msgid "You must insert a valid email address"
88 88 msgstr "Você deve inserir um endereço de email válido"
89 89  
90   -#: users/models.py:18
  90 +#: users/models.py:18 users/templates/users/_form.html:95
91 91 msgid "File not supported."
92 92 msgstr "Arquivo não suportado."
93 93  
... ... @@ -173,15 +173,24 @@ msgstr &quot;Sim&quot;
173 173 msgid "Is not an admin"
174 174 msgstr "Não é administrador"
175 175  
176   -#: users/templates/users/_form.html:16 users/templates/users/register.html:53
  176 +#: users/templates/users/_form.html:18 users/templates/users/register.html:53
177 177 msgid "Choose your photo..."
178 178 msgstr "Escolha sua foto..."
179 179  
180   -#: users/templates/users/_form.html:76
  180 +#: users/templates/users/_form.html:32
  181 +msgid "Click or drop the file here"
  182 +msgstr ""
  183 +
  184 +#: users/templates/users/_form.html:34
  185 +msgid "The photo could not exceed 2MB."
  186 +msgstr "A imagem não pode exceder o tamanho de 2MB."
  187 +
  188 +#: users/templates/users/_form.html:103
181 189 msgid "Save"
182 190 msgstr "Salvar"
183 191  
184   -#: users/templates/users/_form.html:79 users/templates/users/modal_crop.html:24
  192 +#: users/templates/users/_form.html:106
  193 +#: users/templates/users/modal_crop.html:24
185 194 msgid "Cancel"
186 195 msgstr "Cancelar"
187 196  
... ... @@ -259,7 +268,7 @@ msgstr &quot;Entrar&quot;
259 268 msgid "Sign Up"
260 269 msgstr "Cadastrar"
261 270  
262   -#: users/templates/users/login.html:81 users/templates/users/login.html:114
  271 +#: users/templates/users/login.html:79 users/templates/users/login.html:107
263 272 msgid "Forgot your password?"
264 273 msgstr "Esqueceu sua senha?"
265 274  
... ...
users/static/js/crop.js
... ... @@ -1,66 +0,0 @@
1   -$(function () {
2   -
3   - /* Script para abrir o modal com a imagem selecionada */
4   - $("#id_image").change(function () {
5   - if (this.files && this.files[0]) {
6   - var reader = new FileReader();
7   - reader.onload = function (e) {
8   - $("#image").attr("src", e.target.result);
9   - $("#modalCrop").modal("show");
10   - }
11   - reader.readAsDataURL(this.files[0]);
12   - }
13   - });
14   -
15   - /* Scripts da caixa de corte da imagem */
16   - var $image = $("#image");
17   - var cropBoxData;
18   - var canvasData;
19   - $("#modalCrop").on("shown.bs.modal", function () {
20   - $image.cropper({
21   - viewMode: 1,
22   - aspectRatio: 1/1,
23   - minCropBoxWidth: 200,
24   - minCropBoxHeight: 200,
25   - ready: function () {
26   - $image.cropper("setCanvasData", canvasData);
27   - $image.cropper("setCropBoxData", cropBoxData);
28   - }
29   - });
30   - }).on("hidden.bs.modal", function () {
31   - cropBoxData = $image.cropper("getCropBoxData");
32   - canvasData = $image.cropper("getCanvasData");
33   - $image.cropper("destroy");
34   - });
35   -
36   - $(".js-zoom-in").click(function () {
37   - $image.cropper("zoom", 0.1);
38   - });
39   -
40   - $(".js-zoom-out").click(function () {
41   - $image.cropper("zoom", -0.1);
42   - });
43   -
44   - /* Script para pegar os valores das dimensões e depois fechar o modal */
45   - $(".js-crop-and-upload").click(function () {
46   - var cropData = $image.cropper("getData");
47   - $("#id_x").val(cropData["x"]);
48   - $("#id_y").val(cropData["y"]);
49   - $("#id_height").val(cropData["height"]);
50   - $("#id_width").val(cropData["width"]);
51   - $("#modalCrop").modal('hide');
52   - });
53   -
54   - /* Script para remover o arquivo enviado caso o usuário clique em cancelar*/
55   - $("#id_image").on('change', function(){
56   - console.log(this.value);
57   - });
58   -
59   - $('#crop_cancel').on('click', function(e){
60   - var input = $("#id_image");
61   - var holder = $("#pic_holder");
62   - input.replaceWith(input.val('').clone(true));
63   - holder.replaceWith(holder.val('').clone(true));
64   - });
65   -
66   -});
users/templates/users/_form.html
1 1 {% load static i18n %}
2 2 {% load widget_tweaks %}
3 3  
4   -<form method="post" action="" enctype="multipart/form-data">
  4 +<form id="user-form" method="post" action="" enctype="multipart/form-data">
5 5 {% csrf_token %}
6 6 {% for field in form %}
7 7 <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput col-lg-12 col-md-12 col-sm-12">
... ... @@ -10,16 +10,31 @@
10 10 <label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
11 11 {% else %}
12 12 <label for="{{ field.auto_id }}">{{ field.label }}</label>
13   - {% endif %}
14   - {% render_field field class='form-control' %}
15   - <div class="input-group">
16   - <input type="text" readonly="" class="form-control" id="pic_holder" placeholder="{% trans 'Choose your photo...' %}">
17   - <span class="input-group-btn input-group-sm">
18   - <button type="button" class="btn btn-fab btn-fab-mini">
19   - <i class="material-icons">image</i>
20   - </button>
21   - </span>
22   - </div>
  13 + {% endif %}
  14 +
  15 + {% render_field field class='file-selector' %}
  16 +
  17 + <div class="input-group common-file-input">
  18 + <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
  19 + <span class="input-group-btn input-group-sm">
  20 + <button type="button" class="btn btn-fab btn-fab-mini">
  21 + <i class="material-icons">attach_file</i>
  22 + </button>
  23 + </span>
  24 + </div>
  25 +
  26 + <div class="filedrag">
  27 + {% if acc.image %}
  28 + <i class="fa fa-file-archive-o"></i> <br />
  29 +
  30 + <small>{{ acc.image.path }}</small>
  31 + {% else %}
  32 + {% trans 'Click or drop the file here' %}<br />
  33 +
  34 + <small>{% trans 'The photo could not exceed 2MB.' %}</small>
  35 + {% endif %}
  36 + </div>
  37 +
23 38 {% elif field.auto_id == 'id_description' %}
24 39 {% if field.field.required %}
25 40 <label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
... ... @@ -52,23 +67,35 @@
52 67 {% else %}
53 68 {% render_field field class='form-control' %}
54 69 {% endif %}
55   -
56   -
57   - {% endif %}
58   - <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
59   - {% if field.errors %}
60   - <div class="alert alert-danger alert-dismissible" role="alert">
61   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
62   - <span aria-hidden="true">&times;</span>
63   - </button>
64   - <ul>
65   - {% for error in field.errors %}
66   - <li>{{ error }}</li>
67   - {% endfor %}
68   - </ul>
69   - </div>
70 70 {% endif %}
  71 +
  72 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
71 73 </div>
  74 +
  75 + {% if field.errors %}
  76 + <div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible" role="alert">
  77 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  78 + <span aria-hidden="true">&times;</span>
  79 + </button>
  80 + <ul>
  81 + {% for error in field.errors %}
  82 + <li>{{ error }}</li>
  83 + {% endfor %}
  84 + </ul>
  85 + </div>
  86 + {% endif %}
  87 +
  88 + {% if field.auto_id == 'id_image' %}
  89 + <div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible client-file-errors" style="display:none" role="alert">
  90 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  91 + <span aria-hidden="true">&times;</span>
  92 + </button>
  93 + <ul>
  94 + <li class="size" style="display:none">{% trans "The image is too large. It should have less than 2MB." %}</li>
  95 + <li class="format" style="display:none">{% trans 'File not supported.' %}</li>
  96 + </ul>
  97 + </div>
  98 + {% endif %}
72 99 {% endfor %}
73 100 <div class="row">
74 101 <div class="col-lg-12 col-md-12 col-sm-12">
... ... @@ -84,3 +111,39 @@
84 111 </form>
85 112 {% include 'users/modal_crop.html' %}
86 113 <script src="{% static 'js/crop.js' %}"></script> <!-- Js for cropper-->
  114 +<script type="text/javascript">
  115 +// check if browser supports drag n drop
  116 +// call initialization file
  117 +if (window.File && window.FileList && window.FileReader) {
  118 + Init();
  119 +}
  120 +
  121 +// initialize
  122 +function Init() {
  123 + var small = $(".file-selector"),
  124 + filedrag = $(".filedrag"),
  125 + common = $(".common-file-input");
  126 +
  127 + // file select
  128 + small.on("change", FileSelectHandler);
  129 +
  130 + // is XHR2 available?
  131 + var xhr = new XMLHttpRequest();
  132 + if (xhr.upload) {
  133 + // file drop
  134 + filedrag.on("drop", FileSelectHandler);
  135 + filedrag.attr('style', 'display:block');
  136 + common.attr('style', 'display:none');
  137 + }
  138 +}
  139 +
  140 +// file selection
  141 +function FileSelectHandler(e) {
  142 + var files = e.target.files || e.dataTransfer.files,
  143 + parent = $(e.target.offsetParent);
  144 + // process all File objects
  145 + for (var i = 0, f; f = files[i]; i++) {
  146 + parent.find('.filedrag').html(f.name);
  147 + }
  148 +}
  149 +</script>
... ...
users/templates/users/login.html
... ... @@ -72,29 +72,23 @@
72 72 {% endif %}
73 73 </div>
74 74 </div>
75   - <div class="row">
76   -
77   -
  75 + <div class="row login_subcommands">
78 76 {% if not deny_register %}
79 77 <div class="col-sm-offset-1 col-md-10 col-lg-10 col-sm-10 col-xs-12">
80 78 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-right forgotPassword">
81 79 <a class="pull-right" href="{% url 'users:forgot_pass' %}">{% trans 'Forgot your password?' %}</a>
82 80 <li class="dropdown language-selector pull-right " style="margin-top:1px;margin-right:10px;">
83 81 {% get_current_language as LANGUAGE_CODE %}
  82 +
84 83 <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
85   -
86   -
87   - <span >[{{LANGUAGE_CODE}}] </span>
88   -
  84 + <span >[{{LANGUAGE_CODE}}] </span>
89 85 </a>
90 86 <a href="{% url 'themes:contrast' %}" id = "contrast_button" style="margin-left:10px;"><i class="glyphicon glyphicon-adjust"></i></a>
91 87 <ul class="dropdown-menu">
92   -
93   -
94 88 {% get_available_languages as LANGUAGES %}
95 89 {% get_language_info_list for LANGUAGES as languages %}
  90 +
96 91 {% for language in languages %}
97   -
98 92 <li {% if language.code == LANGUAGE_CODE %}
99 93 class="active"
100 94 {% endif %}>
... ... @@ -102,7 +96,6 @@
102 96 <span>{{language.code}}</span>
103 97 </a>
104 98 </li>
105   -
106 99 {% endfor %}
107 100 </ul>
108 101 </li>
... ...
users/templates/users/register.html
... ... @@ -41,22 +41,37 @@
41 41 </div>
42 42 </div>
43 43  
44   - <form class="{% if form.has_error %} has-error {% endif %} form-horizontal is-fileinput" method="post" enctype="multipart/form-data" id="formUpload">
  44 + <form class="{% if form.has_error %} has-error {% endif %} form-horizontal is-fileinput" method="post" enctype="multipart/form-data" id="user-form">
45 45 {% csrf_token %}
46 46 {% for field in form %}
47 47 <div class="col-lg-12 col-md-12 col-sm-12">
48 48 <div class="form-group form-group-md">
49 49 <div class="col-md-12 col-sm-12 col-xs-12 col-lg-12">
50 50 {% if field.auto_id == 'id_image' %}
51   - {% render_field field class='form-control' %}
52   - <div class="input-group">
53   - <input type="text" readonly="" class="form-control" id="pic_holder" placeholder="{% trans 'Choose your photo...' %}">
54   - <span class="input-group-btn">
55   - <button type="button" class="btn btn-fab btn-fab-mini">
56   - <i class="material-icons">image</i>
57   - </button>
58   - </span>
59   - </div>
  51 + <label for="{{ field.auto_id }}">{{ field.label }}</label>
  52 +
  53 + {% render_field field class='form-control file-selector' %}
  54 +
  55 + <div class="input-group common-file-input">
  56 + <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
  57 + <span class="input-group-btn input-group-sm">
  58 + <button type="button" class="btn btn-fab btn-fab-mini">
  59 + <i class="material-icons">attach_file</i>
  60 + </button>
  61 + </span>
  62 + </div>
  63 +
  64 + <div class="filedrag">
  65 + {% if acc.image %}
  66 + <i class="fa fa-file-archive-o"></i> <br />
  67 +
  68 + <small>{{ acc.image.path }}</small>
  69 + {% else %}
  70 + {% trans 'Click or drop the file here' %}<br />
  71 +
  72 + <small>{% trans 'The photo could not exceed 2MB.' %}</small>
  73 + {% endif %}
  74 + </div>
60 75 {% else %}
61 76 {% if field.auto_id == 'id_show_email' %}
62 77 {% else %}
... ... @@ -66,21 +81,34 @@
66 81  
67 82 {% endif %}
68 83 <span class="help-block">{{ field.help_text }}</span>
69   - {% if field.errors %}
70   - <div class="row">
71   - <div class="alert alert-danger alert-dismissible" role="alert">
72   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
73   - <span aria-hidden="true">&times;</span>
74   - </button>
75   - <ul>
76   - {% for error in field.errors %}
77   - <li>{{ error }}</li>
78   - {% endfor %}
79   - </ul>
80   - </div>
81   - </div>
82   - {% endif %}
83 84 </div>
  85 +
  86 + {% if field.errors %}
  87 + <div class="row">
  88 + <div class="alert alert-danger alert-dismissible" role="alert">
  89 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  90 + <span aria-hidden="true">&times;</span>
  91 + </button>
  92 + <ul>
  93 + {% for error in field.errors %}
  94 + <li>{{ error }}</li>
  95 + {% endfor %}
  96 + </ul>
  97 + </div>
  98 + </div>
  99 + {% endif %}
  100 +
  101 + {% if field.auto_id == 'id_image' %}
  102 + <div class="col-lg-12 col-md-12 col-sm-12 alert alert-danger alert-dismissible client-file-errors" style="display:none" role="alert">
  103 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  104 + <span aria-hidden="true">&times;</span>
  105 + </button>
  106 + <ul>
  107 + <li class="size" style="display:none">{% trans "The image is too large. It should have less than 2MB." %}</li>
  108 + <li class="format" style="display:none">{% trans 'File not supported.' %}</li>
  109 + </ul>
  110 + </div>
  111 + {% endif %}
84 112 </div>
85 113 </div>
86 114 {% endfor %}
... ... @@ -102,6 +130,43 @@
102 130  
103 131 {% include 'users/modal_crop.html' %}
104 132 <script src="{% static 'js/crop.js' %}"></script> <!-- Js for cropper-->
  133 +<script type="text/javascript">
  134 +// check if browser supports drag n drop
  135 +// call initialization file
  136 +if (window.File && window.FileList && window.FileReader) {
  137 + Init();
  138 +}
  139 +
  140 +// initialize
  141 +function Init() {
  142 + var small = $(".file-selector"),
  143 + filedrag = $(".filedrag"),
  144 + common = $(".common-file-input");
  145 +
  146 + // file select
  147 + small.on("change", FileSelectHandler);
  148 +
  149 + // is XHR2 available?
  150 + var xhr = new XMLHttpRequest();
  151 + if (xhr.upload) {
  152 + // file drop
  153 + filedrag.on("drop", FileSelectHandler);
  154 + filedrag.attr('style', 'display:block');
  155 + common.attr('style', 'display:none');
  156 + }
  157 +}
  158 +
  159 +// file selection
  160 +function FileSelectHandler(e) {
  161 + var files = e.target.files || e.dataTransfer.files,
  162 + parent = $(e.target.offsetParent);
  163 + // process all File objects
  164 + for (var i = 0, f; f = files[i]; i++) {
  165 + parent.find('.filedrag').html(f.name);
  166 + }
  167 +}
  168 +</script>
  169 +
105 170  
106 171 {% endblock %}
107 172  
... ...
webconference/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
webpage/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
youtube_video/locale/pt_BR/LC_MESSAGES/django.po
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2017-08-27 21:08-0300\n"
  11 +"POT-Creation-Date: 2017-08-30 22:41-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...