mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#ARC-53

Browse Source
remotes/origin/PR-39
ArturBaybulatov 10 years ago
parent ed31e61440
commit 1f8713db24
3 changed files with 113 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 178
      users/templates/contractor_profile.html
  2. 47
      users/templates/portfolio_create_form.html
  3. 18
      users/templates/worksell_create_form.html

178
users/templates/contractor_profile.html
Unescape View File

@ -31,7 +31,6 @@
</a>
<span></span>
</li>
{% endif %}
{% if contractor.pk != request.user.pk and request.user.is_contractor %}
@ -60,7 +59,6 @@
<span></span>
</li>
{% endif %}
</ul>
</div>
</div>
@ -69,6 +67,7 @@
<p class="nameUser">
{{ contractor.get_full_name }} [{{ contractor.username }}]
</p>
<p class="cityUser">{{ contractor.get_location }}</p>
<p class="navv">На сайте c {{ contractor.created|date:"d M Y"}}</p>
@ -77,6 +76,7 @@
{% else %}
<div class="statusUser busy">Занят</div>
{% endif %}
<a href="#" data-toggle="modal" data-target="#contact-contactor-modal" class="showCon">показать контакты</a>
</div>
<div class="col-lg-4">
@ -98,28 +98,26 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
</button>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Контакты владельца </h4>
</div>
<div class="modal-body">
<div class="row" style="height: 100px;">
<div class="col-lg-8 col-lg-offset-1">
<ul class="list-summ">
{% if contractor.website %}
<div class="row" style="height: 100px;">
<div class="col-lg-8 col-lg-offset-1">
<ul class="list-summ">
{% if contractor.website %}
<li>{{ contractor.website }}</li>
{% endif %}
<li>{{ contractor.email }}</li>
{% if contractor.phone %}
{% endif %}
<li>{{ contractor.email }}</li>
{% if contractor.phone %}
<li>{{ contractor.phone }}</li>
{% endif %}
</ul>
{% endif %}
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@ -152,16 +150,14 @@
</p>
</div>
<div id="portfolio-modal" class="modal fade">
<div class="modal-dialog" style="width:900px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Добавить портфолио</h4>
</div>
{% include 'portfolio_create_form.html' %}
</div>
</div>
@ -172,42 +168,35 @@
{% for p in contractor.portfolios.all %}
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
{% thumbnail p.get_cover "224x224" crop="center" as im %}
<div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('{{ im.url }}') no-repeat scroll center center / cover ;">
<a class="open-modal-image" href="{{ p.get_cover.url }}"><div class="imgFigure"></div></a>
</div>
{% endthumbnail %}
</div>
<div class="insetCol2 box-sizing disTab">
<p>{{ p.name }}</p>
{% if request.user.pk == contractor.pk %}
<div class="buttonsImg" disTab>
<a href="{% url 'projects:contractor-portfolio-edit' p.pk %}">
<div class="insetBI insetBI1">
<i class="fa fa-pencil"></i>
<div class="buttonsImg" disTab>
<a href="{% url 'projects:contractor-portfolio-edit' p.pk %}">
<div class="insetBI insetBI1">
<i class="fa fa-pencil"></i>
</div>
</a>
<div class="insetBI insetBI2">
<form action="{% url 'projects:contractor-portfolio-trash' pk=p.pk %}" method="POST" novalidate>
{% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}">
<a href="#" onclick="$(this).closest('form').submit(); return false"><i class="fa fa-times"></i></a>
</form>
</div>
</a>
<div class="insetBI insetBI2">
<form action="{% url 'projects:contractor-portfolio-trash' pk=p.pk %}"
method="POST" novalidate>
{% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}">
<a href="#"
onclick="$(this).closest('form').submit(); return false"><i
class="fa fa-times"></i></a>
</form>
</div>
</div>
{% endif %}
</div>
</div>
{% endfor %}
</div>
<div class="col-lg-9 col-lg-offset-3">
@ -228,11 +217,10 @@
<div class="modal-dialog" style="width: 900px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Добавить готовую работу</h4>
</div>
{% include 'worksell_create_form.html' %}
</div>
</div>
@ -244,42 +232,38 @@
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
<a href="{% url 'work_sell:detail' ws.pk %}">
{% thumbnail ws.get_cover "224x224" crop="center" as im %}
<div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('{{ im.url }}') no-repeat scroll center center / cover ;">
<a class="open-modal-image" href="{{ ws.get_cover.url }}"><div class="imgFigure"></div></a>
</div>
{% endthumbnail %}
{% thumbnail ws.get_cover "224x224" crop="center" as im %}
<div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('{{ im.url }}') no-repeat scroll center center / cover ;">
<a class="open-modal-image" href="{{ ws.get_cover.url }}"><div class="imgFigure"></div></a>
</div>
{% endthumbnail %}
</a>
<div class="cenaImg box-sizing">
<div class="cenaImgInset">
{{ ws.budget }} <i class="fa fa-rub"></i>
</div>
</div>
</div>
<div class="insetCol2 box-sizing disTab">
<p>{{ ws }}</p>
{% if request.user.pk == contractor.pk %}
<div class="buttonsImg" disTab>
<div class="insetBI insetBI1">
<a href="{% url 'work_sell:edit' ws.pk %}">
<i class="fa fa-pencil"></i>
</a>
</div>
<div class="insetBI insetBI2">
<form action="{% url 'work_sell:contractor-worksell-trash' pk=ws.pk %}"
method="POST" novalidate>
{% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}">
<a href="#"
onclick="$(this).closest('form').submit(); return false"><i
class="fa fa-times"></i></a>
</form>
<div class="buttonsImg" disTab>
<div class="insetBI insetBI1">
<a href="{% url 'work_sell:edit' ws.pk %}">
<i class="fa fa-pencil"></i>
</a>
</div>
<div class="insetBI insetBI2">
<form action="{% url 'work_sell:contractor-worksell-trash' pk=ws.pk %}" method="POST" novalidate>
{% csrf_token %}
<input type="hidden" name="next" value="{{ request.path }}">
<a href="#" onclick="$(this).closest('form').submit(); return false"><i class="fa fa-times"></i></a>
</form>
</div>
</div>
</div>
{% endif %}
</div>
</div>
@ -293,7 +277,6 @@
</div>
<div id="tab13" class="tab-pane fade">
<div class="col-lg-9">
<div class="col-lg-12 resume">
<form enctype="multipart/form-data">
@ -310,34 +293,37 @@
{% thumbnail contractor.avatar "176x160" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
</div>
</div>
<div class="col-lg-9">
<div class="top-summary">
<p class="name-summ">{{ contractor.get_full_name }}</p>
<div id="resume-success"></div>
{% if contractor.contractor_resume.resume_file %}
<a style="display:{% if contractor.contractor_resume.resume_file %}block{% else %}none{% endif %};"href="{% if contractor.contractor_resume.resume_file %}{{ contractor.contractor_resume.resume_file.url }}{% endif %}"
class="download-summ">скачать резюме</a>
<a
style="display: {% if contractor.contractor_resume.resume_file %}block{% else %}none{% endif %};"
href="{% if contractor.contractor_resume.resume_file %}{{ contractor.contractor_resume.resume_file.url }}{% endif %}"
class="download-summ">
скачать резюме
</a>
{% endif %}
<p class="who-summ">
{{ contractor.get_gender }}, {{ contractor.date_of_birth }}
</p>
<div class="list-summ-block">
<div class="col-lg-4">
<ul class="list-summ">
{% if contractor.website %}
<li>{{ contractor.website }}</li>
<li>{{ contractor.website }}</li>
{% endif %}
<li>{{ contractor.email }}</li>
{% if contractor.phone %}
<li>{{ contractor.phone }}</li>
<li>{{ contractor.phone }}</li>
{% endif %}
</ul>
</div>
<div class="col-lg-6 col-lg-offset-2">
@ -349,35 +335,30 @@
<div class="col-lg-12 wr-inset-pluss">
<div class="pluss-block" id="resume-text-out">
{{ contractor.contractor_resume.text | safe }}
</div>
<a href="#" data-toggle="modal" data-target="#resume-text-edit">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
</a>
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
</a>
<!-- Редактирование текста резюме (модальное окно)-->
<div id="resume-text-edit" class="modal fade">
<div class="modal-dialog" style="width:900px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×
</button>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Редактировать текст резюме</h4>
</div>
<div class="modal-body">
<div style="height: 180px;">
<form id="resume-edit-form">
<div class="textAreaBlock2 text-nn box-sizing disTab">
<textarea name="text"
id="text-new">{{ contractor.contractor_resume.text }}</textarea>
</div>
<div class="searchF1 polsF1 polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Сохранить">
</div>
</form>
<form id="resume-edit-form">
<div class="textAreaBlock2 text-nn box-sizing disTab">
<textarea name="text" id="text-new">{{ contractor.contractor_resume.text }}</textarea>
</div>
<div class="searchF1 polsF1 polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Сохранить">
</div>
</form>
</div>
</div>
<div class="modal-footer"></div>
</div>
@ -393,7 +374,6 @@
<p>Загрузить файл</p>
</div>
<div class="galleryWork2 gal-iss disTab" id="diplom-gallery">
{% for diplom in resume_diploms %}
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
@ -416,8 +396,6 @@
</div>
</div>
{% endfor %}
</div>
</div>
<div class="inset-gp">
@ -427,7 +405,6 @@
<p>Загрузить файл</p>
</div>
<div class="galleryWork2 gal-iss disTab" id="cro-gallery">
{% for cro in resume_cro %}
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
@ -450,8 +427,6 @@
</div>
</div>
{% endfor %}
</div>
</div>
</div>
@ -461,7 +436,6 @@
</div>
<div id="tab14" class="tab-pane fade">
{% for review in contractor.reviews_by_contractor.all %}
<div class="new-comm-44">
<div class="col-lg-12">
@ -482,7 +456,6 @@
</div>
</div>
{% endfor %}
</div>
</div>
@ -497,6 +470,7 @@
{% block js_block %}
<script type="text/javascript" src='{% static "js/jquery.magnific-popup.min.js" %}'></script>
<script type="text/javascript">
var userId = '{{ contractor.pk }}';
$(function () {

47
users/templates/portfolio_create_form.html
Unescape View File

@ -1,7 +1,8 @@
{% load common_tags %}
<div class="modal-body">
<form method="post" id="portfolio-add-form">{% csrf_token %}
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Название<span style="color: red; margin-left:8px; font-size: 12px;"
class="error-{{ portfolio_form.name.html_name }}">{{ portfolio_form.name.errors.as_text }}</span>
@ -21,28 +22,31 @@
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Специализации</p>
</div>
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<input type="hidden" id="chosenSpecId" name="{{ portfolio_form.specialization.html_name }}"
value="{{ portfolio_form.specialization.value }}">
<div class="-spec-select-container">
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>
<input
type="hidden"
name="{{ portfolio_form.specialization.html_name }}"
value="{{ portfolio_form.specialization.value }}"
class="-chosen-spec-id">
</div>
<div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<p>Бюджет{{ portfolio_form.budget.errors.as_text }}</p>
<div class="row">
@ -137,7 +141,6 @@
<div class="textAreaBlock2 polsF1 text-nn box-sizing disTab">
<input class="btn-submit-link add_file_to_port" type="submit" value="Разместить портфолио">
</div>
<!-- </div> -->
</form>
</div>

18
users/templates/worksell_create_form.html
Unescape View File

@ -1,4 +1,6 @@
{% load common_tags %}
<div class="modal-body">
<form method="post" id="worksell-add-form">{% csrf_token %}
@ -16,7 +18,8 @@
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Специализации</p>
</div>
<div class="-spec-select-container">
<div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
@ -33,9 +36,12 @@
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>
<input type="hidden" id="chosenSpecId" name="{{ worksell_form.specialization.html_name }}"
value="{{ worksell_form.specialization.value }}">
<input
type="hidden"
class="-chosen-spec-id"
name="{{ worksell_form.specialization.html_name }}"
value="{{ worksell_form.specialization.value }}">
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Бюджет{{ worksell_form.budget.errors.as_text }}</p>
@ -98,8 +104,8 @@
<br>
<div class="searchF1 polsF1 polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Разместить проект">
</div>
<input class="btn-submit-link" type="submit" value="Разместить проект">
</div>
</form>
</div>

Write Preview
Loading…
Cancel
Save