diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 1c12e1c..a56a662 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -329,3 +329,4 @@ DEFAULT_FILE_STORAGE = 'archilance.util.ASCIIFileSystemStorage' RECAPTCHA_PUBLIC_KEY = '6LftaQgUAAAAAG0oKrt1ORtop1jfIEzkTnCL4S3Q' RECAPTCHA_PRIVATE_KEY = '6LftaQgUAAAAAMaIK-YCL1u1AfakVXjblULQCvfa' +NOCAPTCHA = True \ No newline at end of file diff --git a/assets/css/main.css b/assets/css/main.css index 02682d2..35834f1 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -2383,6 +2383,19 @@ input[type="checkbox"]:checked + span { position: relative; } +.infoProjectBlock .existing-file-widget { + margin-left: 50px; +} + +.infoProjectBlock .existing-file-widget a { + color: #737373; + font-size: 13px; +} + +.infoProjectBlock .existing-file-widget a:hover { + color: #000; +} + .listProjectIn { float: left; margin: 40px 0 0 57px; @@ -4431,6 +4444,15 @@ input[type="checkbox"]:checked + span { vertical-align: top; } +.select-reg.captcha { + text-align: center; +} + +.select-reg .g-recaptcha { + display: inline-table; + margin: 25px 0 0 0; +} + .email-reg, .pass-reg { width: 360px; height: 51px; @@ -4483,7 +4505,7 @@ input[type="checkbox"]:checked + span { color: #6c6c6c; font-size: 15px; float: left; - margin: -2px 0 0 10px; + /*margin: -2px 0 0 10px;*/ line-height: 18px; width: 90%; text-align: left; @@ -6152,6 +6174,7 @@ li.officeList.icon_tml > a > p{ padding: 12px 30px; font-size: 15px; margin: auto; + margin: auto; margin-bottom: 20px; } #simpleSpecContainer .-simple-spec-widget{ diff --git a/assets/js/main.js b/assets/js/main.js index 99e66b9..097bcae 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -34,34 +34,50 @@ $(document).ready(function(){ $('.showSpec').eq(ind).slideDown(300); }); + $('.selectpicker').selectpicker({ style: 'btn-info', - size: 4, - width: '237px' + size: 10, + width: '237px', + liveSearch: true, + liveSearchNormalize: true, + liveSearchPlaceholder: 'Поиск', + noneSelectedText: 'Выберите значение' + }); + + $('.selectpicker6').selectpicker({ + style: 'btn-info', + size: 10, + width: '237px', + noneSelectedText: 'Выберите значение' }); $('.selectpicker2').selectpicker({ style: 'btn-info', size: 4, - width: '90px' + width: '90px', + noneSelectedText: 'Выберите значение' }); $('.selectpicker3').selectpicker({ style: 'btn-info', size: 4, - width: '360px' + width: '360px', + noneSelectedText: 'Выберите значение' }); $('.selectpicker4').selectpicker({ style: 'btn-info', size: 4, - width: '254px' + width: '254px', + noneSelectedText: 'Выберите значение' }); $('.selectpicker5').selectpicker({ style: 'btn-info', size: 4, - width: '117px' + width: '117px', + noneSelectedText: 'Выберите значение' }); }); diff --git a/projects/forms.py b/projects/forms.py index 23364fc..cb3919d 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -42,7 +42,7 @@ class ProjectFilterForm(forms.ModelForm): ) widgets = { - 'work_type': forms.Select(attrs={'class': 'selectpicker -project-work-type-select-field'}), + 'work_type': forms.Select(attrs={'class': 'selectpicker6 -project-work-type-select-field'}), } def __init__(self, *args, **kwargs): diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index 26c6776..d47b605 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -115,6 +115,19 @@

{{ project.text|linebreaksbr }}

+ br + +
+ +

+ Приложенные файлы: + + {% for file in project.files.all %} +

  • + {{ file.file.name|basename }} {{ file.file.size|filesizeformat }} +
  • + {% endfor %} +

    @@ -757,7 +770,7 @@ {% csrf_token %} -
    +
    @@ -887,11 +900,11 @@ {% else %} - {% if answer.author|class_name == 'User' %} - Перейти к обсуждению - {% elif answer.author|class_name == 'Team'%} - Перейти к обсуждению - {% endif %} +{# {% if answer.author|class_name == 'User' %}#} +{# Перейти к обсуждению#} +{# {% elif answer.author|class_name == 'Team'%}#} +{# Перейти к обсуждению#} +{# {% endif %}#} {% endif %}
    @@ -961,8 +974,7 @@ {% csrf_token %} - -
    +
    @@ -1151,59 +1163,55 @@ {% endblock %} diff --git a/projects/views.py b/projects/views.py index 5bdfad0..58aa439 100644 --- a/projects/views.py +++ b/projects/views.py @@ -298,7 +298,7 @@ class ProjectFilterView(BaseMixin, View): keywords = tuple(filter(None, re.split(r'\s|,|;', keywords))) for k in keywords: - projects = projects.filter(Q(name__icontains=k) | Q(text__icontains=k)) + projects = projects.filter(Q(name__icontains=k.lower()) | Q(text__icontains=k.lower())) if cro: projects = projects.filter(cro=cro) diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index 7f30e0f..b56312e 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -51,7 +51,7 @@ {{ form.password2.errors }} -
    +
    {{ form.captcha }} {{ form.captcha.errors }}
    @@ -60,7 +60,7 @@
    -
    +