Merge branch 'PR-14-mod'

remotes/origin/PR-58
booblegum 9 years ago
commit fb0931cb22
  1. 40
      assets/css/main.css
  2. BIN
      assets/img/avatars/avatar-female.jpg
  3. BIN
      assets/img/avatars/avatar-male.jpg
  4. 5
      assets/js/chat.js
  5. 6
      chat/templates/inc-contact-card.html
  6. 54
      projects/templates/project_detail.html
  7. 18
      templates/partials/header.html
  8. 12
      templates/partials/trash/header.html
  9. 12
      users/templates/contractor_filter.html
  10. 25
      users/templates/contractor_office.html
  11. 126
      users/templates/contractor_profile.html
  12. 6
      users/templates/partials/inc-customer_profile-info.html
  13. 44
      users/templates/team_profile.html
  14. 6
      users/templates/trash/customer_profile_info_block.html
  15. 6
      users/templates/user_financial_info_edit.html
  16. 6
      users/templates/user_profile_edit.html
  17. 6
      users/templates/user_profile_edit_old.html

@ -355,46 +355,6 @@ a, a:hover, a:focus, a:active {
background-color: rgb(255,0,39);
}
.rating {
width: 46px;
height: 46px;
float: right;
border-radius: 100%;
background-color: #4D4D4D;
margin: 15px 0 0 10px;
position: relative;
}
.ratingInset {
width: 46px;
height: 46px;
border-radius: 100%;
background-color: #FF0027;
position: absolute;
/*left:-1.859px;*/
/*bottom: 3px;*/
clip: rect(0, 22px, 50px, 0);
transform: rotate(-90deg);
}
.iconRating {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
background: url('../img/button12.png') no-repeat center;
}
.ratingPer {
color: #ff2c2c;
font-size: 18px;
font-family: 'pfdintextcomppro-regular', sans-serif;
float: right;
margin: 28px 0 0 9px;
cursor: pointer;
}
.mainScore {
position: relative;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

@ -121,6 +121,9 @@ function updateCounts() {
}
$(function () {
window.onhashchange = function (e) {
$('a[data-toggle="tab"][href="#'+location.hash.slice(1)+'"]').trigger("click");
};
function dialog(message, yesCallback, notCallback) {
$("#dialog_delete .modal-title").html(message);
$("#dialog_delete").modal('show');
@ -138,6 +141,7 @@ function dialog (message, yesCallback, notCallback) {
var currentHash = URI(location.href).hash();
$('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
console.log("TAB!");
var activeTab = $(this).attr('href').substring(1);
var liveHash = URI(location.href).hash();
@ -155,7 +159,6 @@ function dialog (message, yesCallback, notCallback) {
case 'tab2':
console.log("tab2");
// /api/message?recipent__id=5
updateCounts();
setTimeout(function () {
if (liveHash.indexOf("#order") == 0) {

@ -28,7 +28,11 @@
<img src="{{ im.url }}" alt="mess-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="mess-image">
{% if contact.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="mess-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="mess-image">
{% endif %}
{% endif %}
</div>
<p class="nameMess">

@ -41,7 +41,11 @@
<img src="{{ im.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if project.customer.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="execitor-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="execitor-image">
{% endif %}
{% endif %}
</div>
</a>
@ -235,7 +239,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="mess-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="mess-image">
{% endif %}
{% endif %}
</div>
</a>
@ -252,7 +260,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.owner.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="mess-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="mess-image">
{% endif %}
{% endif %}
</div>
</a>
@ -613,7 +625,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="mess-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="mess-image">
{% endif %}
{% endif %}
</div>
</a>
@ -630,7 +646,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.owner.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</a>
@ -827,7 +847,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</a>
@ -844,7 +868,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.owner.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</a>
@ -1044,7 +1072,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</a>
@ -1061,7 +1093,11 @@
<img src="{{ avatar.url }}" alt="execitor-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{% if answer.author.owner.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</a>

@ -27,7 +27,7 @@
<div class="user-info">
<a href="{% url 'wallets:score-detail' pk=request.user.pk %}"
class="cash">{{ user_balance|floatformat:2 }}р</a>
<a href="{% url 'chat:chat-user' %}#order{{ fist_order_id }}"
<a href="{% url 'chat:chat-user' %}#tab2"
class="icon_hand">{{ num_orders_in_work }}</a>
<a href="{% url 'chat:chat-user' %}" class="icon_chat js-all-messages">
{{ new_messages_count| max_count:99 }}
@ -37,27 +37,19 @@
{% endif %}
<li>
<div class="imgProfile">
{% if request.user.is_contractor %}
<a href="{{ profile_url }}">
{% if request.user.avatar %}
{% thumbnail request.user.avatar "75x75" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% endif %}
</a>
{% elif request.user.is_customer %}
<a href="{{ profile_url }}">
{% if request.user.avatar %}
{% thumbnail request.user.avatar "75x75" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% if request.user.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
</a>
{% endif %}
</a>
</div> <!-- //imgProfile -->
</li>
{% if request.user.is_authenticated %}

@ -147,7 +147,11 @@
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% if request.user.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</a>
{% elif request.user.is_customer %}
@ -157,7 +161,11 @@
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% if request.user.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</a>
{% endif %}

@ -195,7 +195,11 @@
<img src="{{ avatar.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% if team.owner.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</a>
@ -316,7 +320,11 @@
<img src="{{ avatar.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% if contractor.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</a>

@ -82,8 +82,15 @@
src="{{ im.url }}" alt="profile-image"></a>
{% endthumbnail %}
{% else %}
<a href="{% url 'users:team-profile' pk=contractor.team.pk %}"><img
src="{% static 'img/profile.jpg' %}" alt="profile-image"></a>
<a href="{% url 'users:team-profile' pk=contractor.team.pk %}">
{% if contractor.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}"
alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}"
alt="profile-image">
{% endif %}
</a>
{% endif %}
</div>
</div>
@ -105,7 +112,13 @@
<img src="{{ im.url }}" alt="mess-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="mess-image">
{% if c.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}"
alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}"
alt="profile-image">
{% endif %}
{% endif %}
</div>
@ -300,8 +313,10 @@
var $moreWorkSellsfBtn = $('.-more-work-sells-btn').first()
var workSellAbsUrl = '/work_sell/'
var contractorId ={{ contractor.pk }}
var teamId ={{ contractor.team.pk }}
var contractorId =
{{ contractor.pk }}
var teamId =
{{ contractor.team.pk }}
var contractorIds = [contractorId]
var portfUrl = new URI('/api/portfolios/')

@ -18,7 +18,13 @@
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% if contractor.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}"
alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}"
alt="profile-image">
{% endif %}
{% endif %}
</div>
</div>
@ -71,7 +77,9 @@
<ul>
{% for team in contractor.teams.all %}
<li><a href="{% url 'users:team-profile' pk=team.pk %}">{{ team.name }}</a><span></span></li>
<li>
<a href="{% url 'users:team-profile' pk=team.pk %}">{{ team.name }}</a><span></span>
</li>
{% endfor %}
</ul>
{% endif %}
@ -93,7 +101,8 @@
{% endif %}
{% if request.user.is_authenticated %}
<a href="#" data-toggle="modal" data-target="#contact-contactor-modal" class="showCon">показать контакты</a>
<a href="#" data-toggle="modal" data-target="#contact-contactor-modal" class="showCon">показать
контакты</a>
{% endif %}
</div>
<div class="col-lg-4">
@ -115,7 +124,8 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
<h4 class="modal-title">Контакты владельца </h4>
</div>
<div class="modal-body">
@ -167,23 +177,6 @@
</div>
<div class="tab-content">
<div id="tab11" class="tab-pane fade in active">
{% if contractor.pk == request.user.pk %}
@ -197,7 +190,8 @@
<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">&times;</button>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
<h4 class="modal-title">Добавить портфолио</h4>
</div>
@ -211,8 +205,12 @@
<script type="text/x-template" class="-portfolio-item-templ">
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
<div class="imgGal" style="background:rgba(0, 0, 0, 0) url('<%- portfolio.photos[0] && portfolio.photos[0].img %>') no-repeat scroll center center / cover">
<a class="open-modal-image" href="<%- portfolio.photos[0] && portfolio.photos[0].img %>"><div class="imgFigure"></div></a>
<div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('<%- portfolio.photos[0] && portfolio.photos[0].img %>') no-repeat scroll center center / cover">
<a class="open-modal-image"
href="<%- portfolio.photos[0] && portfolio.photos[0].img %>">
<div class="imgFigure"></div>
</a>
</div>
</div>
@ -230,7 +228,9 @@
<form action="<%- portfTrashUrl %>" 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>
<a href="#"
onclick="$(this).closest('form').submit(); return false"><i
class="fa fa-times"></i></a>
</form>
</div>
</div>
@ -242,7 +242,8 @@
<div class="col-lg-9 col-lg-offset-3 -more-portfolios-btn">
<div class="linkElse">
<a href="#" onclick="loadMorePortfolios(); return false" class="showElse">показать еще</a>
<a href="#" onclick="loadMorePortfolios(); return false" class="showElse">показать
еще</a>
</div>
</div>
</div>
@ -273,8 +274,12 @@
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
<a href="#">
<div class="imgGal" style="background:rgba(0, 0, 0, 0) url('<%- workSell.photos[0] && workSell.photos[0].img %>') no-repeat scroll center center / cover">
<a class="open-modal-image" href="<%- workSell.photos[0] && workSell.photos[0].img %>"><div class="imgFigure"></div></a>
<div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('<%- workSell.photos[0] && workSell.photos[0].img %>') no-repeat scroll center center / cover">
<a class="open-modal-image"
href="<%- workSell.photos[0] && workSell.photos[0].img %>">
<div class="imgFigure"></div>
</a>
</div>
</a>
@ -299,7 +304,9 @@
<form action="<%- workSellTrashUrl %>" 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>
<a href="#"
onclick="$(this).closest('form').submit(); return false"><i
class="fa fa-times"></i></a>
</form>
</div>
</div>
@ -311,27 +318,13 @@
<div class="col-lg-9 col-lg-offset-3 -more-work-sells-btn">
<div class="linkElse">
<a href="#" onclick="loadMoreWorkSells(); return false" class="showElse">показать еще</a>
<a href="#" onclick="loadMoreWorkSells(); return false" class="showElse">показать
еще</a>
</div>
</div>
</div>
<div id="tab13" class="tab-pane fade">
<div class="col-lg-9">
{% if contractor == request.user %}
@ -344,7 +337,8 @@
<p>Загрузить резюме</p>
</div>
<div class="upload2 up-l2" id="remove-resume-file" style="display:{% if contractor.contractor_resume.resume_file %}block;{% else %}none;{% endif %}">
<div class="upload2 up-l2" id="remove-resume-file"
style="display:{% if contractor.contractor_resume.resume_file %}block;{% else %}none;{% endif %}">
<p style="margin:0;">Удалить резюме</p>
</div>
</form>
@ -366,7 +360,8 @@
{% if contractor.contractor_resume.resume_file %}
<a style="display:block;"
href="{{ contractor.contractor_resume.resume_file.url }}" class="download-summ">
href="{{ contractor.contractor_resume.resume_file.url }}"
class="download-summ">
скачать резюме
</a>
{% endif %}
@ -403,7 +398,8 @@
</div>
<div class="col-lg-12 wr-inset-pluss">
{% if contractor.pk == request.user.pk %}
<a href="#" data-toggle="modal" data-target="#resume-text-edit" style="float: left; margin-right: 10px;">
<a href="#" data-toggle="modal" data-target="#resume-text-edit"
style="float: left; margin-right: 10px;">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
</a>
{% endif %}
@ -418,18 +414,21 @@
<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">&times;</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" class="-ckeditor">{{ contractor.contractor_resume.text }}</textarea>
<textarea name="text" id="text-new"
class="-ckeditor">{{ contractor.contractor_resume.text }}</textarea>
</div>
<div class="searchF1 polsF1 polsFF links-filter">
<input class="btn-submit-link" type="submit" value="Сохранить">
<input class="btn-submit-link" type="submit"
value="Сохранить">
</div>
</form>
</div>
@ -458,7 +457,8 @@
{% thumbnail diplom.img "210x334" crop="center" as im %}
<div class="imgGal"
style="background: url('{{ im.url }}') no-repeat center;">
<a href="{{ diplom.img.url }}" class='open-modal-image'>
<a href="{{ diplom.img.url }}"
class='open-modal-image'>
<div class="imgFigure"></div>
</a>
</div>
@ -471,7 +471,8 @@
{% if contractor.pk == request.user.pk %}
<div class="buttonsImg" distab="">
<div class="insetBI insetBI2 delete-resume-file" data-id="{{ diplom.pk }}">
<div class="insetBI insetBI2 delete-resume-file"
data-id="{{ diplom.pk }}">
<i class="fa fa-times"></i>
</div>
</div>
@ -498,7 +499,8 @@
{% thumbnail cro.img "210x334" crop="center" as im %}
<div class="imgGal"
style="background: url('{{ im.url }}') no-repeat center;">
<a href="{{ cro.img.url }}" class='open-modal-image'>
<a href="{{ cro.img.url }}"
class='open-modal-image'>
<div class="imgFigure"></div>
</a>
</div>
@ -511,7 +513,8 @@
{% if contractor.pk == request.user.pk %}
<div class="buttonsImg" distab="">
<div class="insetBI insetBI2 delete-resume-file" data-id="{{ cro.pk }}">
<div class="insetBI insetBI2 delete-resume-file"
data-id="{{ cro.pk }}">
<i class="fa fa-times"></i>
</div>
</div>
@ -569,7 +572,8 @@
<script src='{% static "lib/ckeditor/adapters/jquery.js" %}'></script>
<script>
;(function() {
;
(function () {
// Pagination ---------------------------------------------------
@ -587,8 +591,10 @@
var workSellEditUrl = '/work_sell/%id%/edit/'
var workSellTrashUrl = '/work_sell/%id%/trash/'
var contractorId = {{ contractor.pk }}
var authedContractorId{% if request.user.is_authenticated %} = {{ request.user.pk }}{% endif %}
var contractorId =
{{ contractor.pk }}
var authedContractorId{% if request.user.is_authenticated %} =
{{ request.user.pk }}{% endif %}
var portfUrl = new URI('/api/portfolios/')
var workSellUrl = new URI('/api/work-sells/')
@ -661,7 +667,6 @@
loadMoreWorkSells()
// Persistent Bootstrap tabs --------------------------------------
@ -672,14 +677,12 @@
})
// A wysiwyg editor ----------------------------------------------
$('textarea.-ckeditor').first().ckeditor()
// Team invitation -----------------------------------------------
@ -1060,6 +1063,7 @@
}
});
}
$('#diplom-upload').fileupload({
url: url,
crossDomain: false,

@ -10,7 +10,11 @@
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" width="220" height="220" alt="profile-image">
{% if customer.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</div>

@ -17,7 +17,13 @@
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% if team.owner.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}"
alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}"
alt="profile-image">
{% endif %}
{% endif %}
</div>
</div>
@ -40,7 +46,13 @@
<img src="{{ im.url }}" alt="mess-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="mess-image">
{% if c.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}"
alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}"
alt="profile-image">
{% endif %}
{% endif %}
</div>
@ -77,7 +89,8 @@
<div class="statusUser busy">Занят</div>
{% endif %}
<a href="{% url 'chat:chat-user' %}?user_id={{ team.owner.pk }}#user{{ team.owner.pk }}" class="new-prop new-prop2 new-prop3">написать сообщение</a>
<a href="{% url 'chat:chat-user' %}?user_id={{ team.owner.pk }}#user{{ team.owner.pk }}"
class="new-prop new-prop2 new-prop3">написать сообщение</a>
</div>
<div class="col-lg-4">
@ -118,8 +131,11 @@
<script type="text/x-template" class="-portfolio-item-templ">
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
<div class="imgGal" style="background:rgba(0, 0, 0, 0) url('<%- portfolio.photos[0].img %>') no-repeat scroll center center / cover">
<a class="open-modal-image" href="<%- portfolio.photos[0].img %>"><div class="imgFigure"></div></a>
<div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('<%- portfolio.photos[0].img %>') no-repeat scroll center center / cover">
<a class="open-modal-image" href="<%- portfolio.photos[0].img %>">
<div class="imgFigure"></div>
</a>
</div>
</div>
@ -132,7 +148,8 @@
<div class="col-lg-9 col-lg-offset-3 -more-portfolios-btn">
<div class="linkElse">
<a href="#" onclick="loadMorePortfolios(); return false" class="showElse">показать еще</a>
<a href="#" onclick="loadMorePortfolios(); return false" class="showElse">показать
еще</a>
</div>
</div>
</div>
@ -142,8 +159,11 @@
<script type="text/x-template" class="-work-sell-item-templ">
<div class="col-lg-4">
<div class="insetCol box-sizing disTab">
<div class="imgGal" style="background:rgba(0, 0, 0, 0) url('<%- workSell.photos[0].img %>') no-repeat scroll center center / cover ;">
<a class="open-modal-image" href="<%- workSell.photos[0].img %>"><div class="imgFigure"></div></a>
<div class="imgGal"
style="background:rgba(0, 0, 0, 0) url('<%- workSell.photos[0].img %>') no-repeat scroll center center / cover ;">
<a class="open-modal-image" href="<%- workSell.photos[0].img %>">
<div class="imgFigure"></div>
</a>
</div>
<div class="cenaImg box-sizing">
@ -161,7 +181,8 @@
<div class="col-lg-9 col-lg-offset-3 -more-work-sells-btn">
<div class="linkElse">
<a href="#" onclick="loadMoreWorkSells(); return false" class="showElse">показать еще</a>
<a href="#" onclick="loadMoreWorkSells(); return false" class="showElse">показать
еще</a>
</div>
</div>
</div>
@ -196,7 +217,6 @@
</div>
<div>
{% include 'partials/footer.html' %}
</div>
@ -222,7 +242,8 @@
var $moreWorkSellsfBtn = $('.-more-work-sells-btn').first()
var workSellAbsUrl = '/work_sell/'
var teamId = {{ team.pk }}
var teamId =
{{ team.pk }}
var contractorIds = [{{ team.owner.pk }}]
var portfUrl = new URI('/api/portfolios/')
@ -288,7 +309,6 @@
window.loadMoreWorkSells = loadMoreWorkSells
// Persistent Bootstrap tabs --------------------------------------

@ -13,7 +13,11 @@
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% if customer.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</div>

@ -42,7 +42,11 @@
<img src="{{ avatar.url }}" alt="profile-image" class="-avatar-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image" class="-avatar-image">
{% if request.user.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</div>

@ -37,7 +37,11 @@
<img src="{{ avatar.url }}" alt="profile-image" class="-avatar-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" width="208" height="208" alt="profile-image" class="-avatar-image">
{% if request.user.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% 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">#}

@ -42,7 +42,11 @@
<img src="{{ avatar.url }}" alt="profile-image" class="-avatar-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image" class="-avatar-image">
{% if request.user.gender == "female" %}
<img src="{% static 'img/avatars/avatar-female.jpg' %}" alt="profile-image">
{% else %}
<img src="{% static 'img/avatars/avatar-male.jpg' %}" alt="profile-image">
{% endif %}
{% endif %}
</div>
</div>

Loading…
Cancel
Save