FIX for PR-36

Починил datepicker
Вернул серый фон индикатору заполненности профиля
remotes/origin/HEAD
booblegum 9 years ago
parent 386b69b9f4
commit ded415c18a
  1. 2
      templates/partials/sass/header.sass
  2. 3
      users/forms.py
  3. 0
      users/templates/trash/user_profile_edit_old.html
  4. 11
      users/templates/user_profile_edit.html

@ -173,6 +173,8 @@ header
position: relative position: relative
width: 46px width: 46px
height: 46px height: 46px
background-color: #4C4C4C
border-radius: 50%
.ratingInset .ratingInset
width: 100% width: 100%
height: 100% height: 100%

@ -1,4 +1,5 @@
import itertools import itertools
from archilance.settings import dev as settings
import pydash as _; import pydash as _;
from django import forms from django import forms
@ -87,7 +88,7 @@ class UserProfileEditFullForm(forms.ModelForm):
widgets = { widgets = {
# TODO: Use common format with jQueryUI Datepicker: # 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'}) 'contractor_status': forms.Select(attrs={'class': 'simple-select'})
} }

@ -42,11 +42,6 @@
{% else %} {% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image"> <img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %} {% 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 %} {% endif %}
</div> </div>
</div> </div>
@ -327,6 +322,8 @@
<script src='{% static "lib/proekton-components/js/build/init_user_profile.js" %}'></script> <script src='{% static "lib/proekton-components/js/build/init_user_profile.js" %}'></script>
<script src='{% static "projects-filter.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.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.iframe-transport.js" %}'></script>
<script src='{% static "lib/jquery.fileupload/js/jquery.fileupload.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> <script src='{% static "lib/jquery.fileupload/js/jquery.fileupload-process.js" %}'></script>
@ -335,6 +332,10 @@
<script> <script>
$(function () { $(function () {
$('.phone').mask('+7(000)000-00-00'); $('.phone').mask('+7(000)000-00-00');
$('.datepicker').datepicker({
changeMonth: true,
changeYear: true,
})
}) })
</script> </script>
{% endblock %} {% endblock %}

Loading…
Cancel
Save