From ded415c18ac50d5fd6451e67e02394281235f73f Mon Sep 17 00:00:00 2001
From: booblegum <booblegum42@gmail.com>
Date: Wed, 4 Jan 2017 15:31:13 +0300
Subject: [PATCH] FIX for PR-36
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Починил datepicker
Вернул серый фон индикатору заполненности профиля
---
 templates/partials/sass/header.sass                   |  2 ++
 users/forms.py                                        |  3 ++-
 .../templates/{ => trash}/user_profile_edit_old.html  |  0
 users/templates/user_profile_edit.html                | 11 ++++++-----
 4 files changed, 10 insertions(+), 6 deletions(-)
 rename users/templates/{ => trash}/user_profile_edit_old.html (100%)

diff --git a/templates/partials/sass/header.sass b/templates/partials/sass/header.sass
index 052941a..486b6db 100644
--- a/templates/partials/sass/header.sass
+++ b/templates/partials/sass/header.sass
@@ -173,6 +173,8 @@ header
         position: relative
         width: 46px
         height: 46px
+        background-color: #4C4C4C
+        border-radius: 50%
       .ratingInset
         width: 100%
         height: 100%
diff --git a/users/forms.py b/users/forms.py
index b1cd899..c7f8c3d 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -1,4 +1,5 @@
 import itertools
+from archilance.settings import dev as settings
 
 import pydash as _;
 from django import forms
@@ -87,7 +88,7 @@ class UserProfileEditFullForm(forms.ModelForm):
 
         widgets = {
             # TODO: Use common format with jQueryUI Datepicker:
-            'date_of_birth': forms.TextInput(attrs={'class': 'datepicker box-sizing simple-input'}),
+            'date_of_birth': forms.DateInput(attrs={'class': 'datepicker box-sizing simple-input'}),
             'contractor_status': forms.Select(attrs={'class': 'simple-select'})
         }
 
diff --git a/users/templates/user_profile_edit_old.html b/users/templates/trash/user_profile_edit_old.html
similarity index 100%
rename from users/templates/user_profile_edit_old.html
rename to users/templates/trash/user_profile_edit_old.html
diff --git a/users/templates/user_profile_edit.html b/users/templates/user_profile_edit.html
index 0eddcab..3aee387 100644
--- a/users/templates/user_profile_edit.html
+++ b/users/templates/user_profile_edit.html
@@ -42,11 +42,6 @@
                                         {% else %}
                                             <img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
                                         {% endif %}
-{#                                        {% with "/static/img/profile.jpg" as path %}#}
-{#                                            {% thumbnail path "100x100" crop="center" as im %}#}
-{#                                                <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt="profile-image" class="-avatar-image">#}
-{#                                            {% endthumbnail %}#}
-{#                                        {% endwith %}#}
                                     {% endif %}
                                 </div>
                             </div>
@@ -327,6 +322,8 @@
     <script src='{% static "lib/proekton-components/js/build/init_user_profile.js" %}'></script>
     <script src='{% static "projects-filter.js" %}'></script>
     <script src='{% static "lib/jquery.fileupload/js/vendor/jquery.ui.widget.js" %}'></script>
+    <script src='{% static "lib/jquery-ui/jquery-ui.js" %}'></script>
+    <script src='{% static "lib/jquery-ui/i18n/datepicker-ru.js" %}'></script>
     <script src='{% static "lib/jquery.fileupload/js/jquery.iframe-transport.js" %}'></script>
     <script src='{% static "lib/jquery.fileupload/js/jquery.fileupload.js" %}'></script>
     <script src='{% static "lib/jquery.fileupload/js/jquery.fileupload-process.js" %}'></script>
@@ -335,6 +332,10 @@
     <script>
         $(function () {
             $('.phone').mask('+7(000)000-00-00');
+            $('.datepicker').datepicker({
+                changeMonth: true,
+                changeYear: true,
+            })
         })
     </script>
 {% endblock %}