diff --git a/assets/css/main.css b/assets/css/main.css index 7e2b3f7..0bf5b8c 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1113,7 +1113,7 @@ footer:after { float: left; background-color: #F2F2F2; position: relative; - padding: 30px 0 0 0; + padding: 30px 0 30px 0; } .titleF1 { @@ -1243,9 +1243,9 @@ footer:after { background: none; } -.searchF1 { +/*.searchF1 { margin: 18px 0 0 0; -} +}*/ .searchInp { width: 100%; @@ -1371,6 +1371,7 @@ label { display: block; position: relative; float: left; + margin-right: 10px; } input[type="checkbox"] + span { @@ -1399,7 +1400,7 @@ input[type="checkbox"]:checked + span { font-weight: bold; color: #2c2c2c; float: left; - margin: 2px 0 0 18px; + margin: 2px 0 0 0px; } .linkSort { @@ -2030,7 +2031,7 @@ input[type="checkbox"]:checked + span { .galleryWork2 { width: 75%; - float: left; + float: right; } .galleryWork2 .col-lg-4:hover { @@ -2062,9 +2063,9 @@ input[type="checkbox"]:checked + span { border-color: #DFDFDF; } -.polsF3 { +/*.polsF3 { margin-bottom: 23px; -} +}*/ .mLeft { float: left; @@ -5247,7 +5248,7 @@ input[type="radio"]:checked + span { padding: 0 15px; font-size: 15px; background-color: white; - color: #9c9c9c; + color: #444; float: left; margin-right: 26px; font-family: 'Arial-MT-Regular', sans-serif; @@ -5568,7 +5569,7 @@ input[type="radio"]:checked + span { } .dashedCol4 { width: 254px; - height: 239px; + height: 199px; position: absolute; overflow: hidden; display: block; @@ -5577,7 +5578,7 @@ input[type="radio"]:checked + span { .dashedCol4:after { content: ""; position: absolute; - height: 50px; + height: 23px; width: 100%; background: #fff; bottom: 0; @@ -5732,4 +5733,29 @@ input[type="radio"]:checked + span { .linkSort button:focus{ outline: none; } +.executorBlock .dashedCol4{ + height: 136px; + margin: 11px 0 0 0; + padding: 26px 24px 26px 24px; +} +.doneBlock .new-dashed .dashedCol44{ + height: 117px; + margin-left: -35px; +} +#fileUploadContainer .list-new-new{ + margin-top: 15px; + margin-bottom: 15px; +} +#fileUploadContainer .list-new-new li{ + margin: 4px 0 4px 0; +} +.birth_edit_dat .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn){ + width: 190px; +} +.btn-submit-link{ + color: #333 !important; + background: #fff; + border-color: #ccc !important; + margin-bottom: 0 !important +} /*end_new*/ \ No newline at end of file diff --git a/projects/forms.py b/projects/forms.py index 75783c4..0771918 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -151,6 +151,7 @@ class RealtyForm(forms.ModelForm): class PortfolioForm(forms.ModelForm): duplicate = forms.BooleanField(required=False,label='Some label here') + images_ids = forms.CharField(required=True) class Meta: model = Portfolio diff --git a/projects/views.py b/projects/views.py index 20b0919..c3364c4 100644 --- a/projects/views.py +++ b/projects/views.py @@ -656,7 +656,7 @@ def contractor_portfolio_create(request): work_sell.contractor = instance.user work_sell.save() - images_ids = request.POST.get('images-ids').split(';')[:-1] + images_ids = request.POST.get('images_ids').split(';')[:-1] for pk in images_ids: picture = Picture.objects.get(pk=pk) temp_file = ContentFile(picture.file.read()) diff --git a/ratings/templatetags/specializtions_tags.py b/ratings/templatetags/specializtions_tags.py index 564e8d5..6ef72bb 100644 --- a/ratings/templatetags/specializtions_tags.py +++ b/ratings/templatetags/specializtions_tags.py @@ -15,6 +15,7 @@ def specialization_widget(context, user_id, class_name=None): 'user_id': user_id, } + @register.inclusion_tag('templatetags/specializations_widget.html', takes_context=True) def specialization_team_widget(context, team_id): team_id = int(team_id) diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 4aec367..de876f1 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -103,7 +103,7 @@ {{ contractor.team }}
Россия, Москва
- {# #} + {# #}