From b311b80a128b045bfa23e5ea5693838d91554c8a Mon Sep 17 00:00:00 2001 From: Adabriand Furtado Date: Wed, 20 Jul 2016 00:52:31 -0300 Subject: [PATCH] Adiciona upload do avatar no cadastro. --- pybossa/forms/account_view_forms.py | 3 ++- pybossa/forms/forms.py | 8 ++++++++ pybossa/themes/default/static/css/theme.css | 12 ++++++------ pybossa/themes/default/templates/_navbar.html | 8 ++------ pybossa/themes/default/templates/account/_helpers.html | 12 +++++++++++- pybossa/themes/default/templates/account/register.html | 30 +++++++++++++++++++++++++++--- pybossa/themes/default/templates/account/update.html | 18 +++++++++--------- pybossa/themes/default/templates/projects/presenter.html | 13 +------------ pybossa/themes/default/templates/projects/update-bak.html | 56 -------------------------------------------------------- pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.mo | Bin 54998 -> 0 bytes pybossa/themes/default/translations/pt_BR/LC_MESSAGES/messages.po | 6 ++++++ pybossa/uploader/__init__.py | 4 ++++ pybossa/uploader/local.py | 15 +++++++++++++++ pybossa/view/account.py | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ tmp/.gitempty | 0 15 files changed, 153 insertions(+), 112 deletions(-) delete mode 100644 pybossa/themes/default/templates/projects/update-bak.html delete mode 100644 tmp/.gitempty diff --git a/pybossa/forms/account_view_forms.py b/pybossa/forms/account_view_forms.py index 3470d7a..4a15dc8 100644 --- a/pybossa/forms/account_view_forms.py +++ b/pybossa/forms/account_view_forms.py @@ -24,4 +24,5 @@ from forms import ( ChangePasswordForm, ResetPasswordForm, ForgotPasswordForm, - AvatarUploadForm) + AvatarUploadForm, + AvatarUploadRegisterForm) diff --git a/pybossa/forms/forms.py b/pybossa/forms/forms.py index c948ba0..3523d37 100644 --- a/pybossa/forms/forms.py +++ b/pybossa/forms/forms.py @@ -392,3 +392,11 @@ class AvatarUploadForm(Form): y1 = IntegerField(label=None, widget=HiddenInput(), default=0) x2 = IntegerField(label=None, widget=HiddenInput(), default=0) y2 = IntegerField(label=None, widget=HiddenInput(), default=0) + +class AvatarUploadRegisterForm(Form): + id = IntegerField(label=None, widget=HiddenInput()) + avatar = FileField(lazy_gettext('Avatar (optional)')) + x1 = IntegerField(label=None, widget=HiddenInput(), default=0) + y1 = IntegerField(label=None, widget=HiddenInput(), default=0) + x2 = IntegerField(label=None, widget=HiddenInput(), default=0) + y2 = IntegerField(label=None, widget=HiddenInput(), default=0) diff --git a/pybossa/themes/default/static/css/theme.css b/pybossa/themes/default/static/css/theme.css index 9626648..6411aea 100644 --- a/pybossa/themes/default/static/css/theme.css +++ b/pybossa/themes/default/static/css/theme.css @@ -310,10 +310,12 @@ h6 small { color: #6F9CA2; background-color: #d9edf7; border-color: #d9edf7; +} .alert-warning { color: #B59D5A; background-color: #FFE7AB; border-color: #FFE7AB; +} .alert-danger { color: #A45E4D; background-color: #F8AFAB; @@ -326,11 +328,9 @@ h6 small { background-color: blue; border: 1px solid #ddd; } -/* -.carousel-indicators li { - border: solid 1px #34495E; +.upload-container { + padding-bottom: 30px; } -.carousel-indicators .active { - background-color: #34495E; +.upload-container .form-actions { + padding-top: 10px; } -*/ diff --git a/pybossa/themes/default/templates/_navbar.html b/pybossa/themes/default/templates/_navbar.html index bbcc215..88d433e 100644 --- a/pybossa/themes/default/templates/_navbar.html +++ b/pybossa/themes/default/templates/_navbar.html @@ -12,13 +12,7 @@ - -{{ project.info.task_presenter|safe }} +{{ project.info.task_presenter|safe }}