diff --git a/assets/css/main.css b/assets/css/main.css index 80ce79a..2da5f6d 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -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; } diff --git a/assets/img/avatars/avatar-female.jpg b/assets/img/avatars/avatar-female.jpg new file mode 100644 index 0000000..8607377 Binary files /dev/null and b/assets/img/avatars/avatar-female.jpg differ diff --git a/assets/img/avatars/avatar-male.jpg b/assets/img/avatars/avatar-male.jpg new file mode 100644 index 0000000..9e5c876 Binary files /dev/null and b/assets/img/avatars/avatar-male.jpg differ diff --git a/assets/js/chat.js b/assets/js/chat.js index 4e83512..10ead9f 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -121,7 +121,10 @@ function updateCounts() { } $(function () { -function dialog (message, yesCallback, notCallback) { + 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'); $("#btnYes").click(function (e) { @@ -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) { diff --git a/chat/templates/inc-contact-card.html b/chat/templates/inc-contact-card.html index fc3abbe..402b160 100644 --- a/chat/templates/inc-contact-card.html +++ b/chat/templates/inc-contact-card.html @@ -28,7 +28,11 @@ mess-image {% endthumbnail %} {% else %} - mess-image + {% if contact.gender == "female" %} + mess-image + {% else %} + mess-image + {% endif %} {% endif %}

diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index ddce2bb..e1e1174 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -41,7 +41,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if project.customer.gender == "female" %} + execitor-image + {% else %} + execitor-image + {% endif %} {% endif %} @@ -235,7 +239,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.gender == "female" %} + mess-image + {% else %} + mess-image + {% endif %} {% endif %} @@ -252,7 +260,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.owner.gender == "female" %} + mess-image + {% else %} + mess-image + {% endif %} {% endif %} @@ -613,7 +625,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.gender == "female" %} + mess-image + {% else %} + mess-image + {% endif %} {% endif %} @@ -630,7 +646,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.owner.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} @@ -827,7 +847,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} @@ -844,7 +868,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.owner.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} @@ -1044,7 +1072,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} @@ -1061,7 +1093,11 @@ execitor-image {% endthumbnail %} {% else %} - execitor-image + {% if answer.author.owner.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} diff --git a/templates/partials/header.html b/templates/partials/header.html index 2de63d0..aa94290 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -27,7 +27,7 @@

{{ user_balance|floatformat:2 }}р - {{ num_orders_in_work }} {{ new_messages_count| max_count:99 }} @@ -37,27 +37,19 @@ {% endif %}
  • - {% if request.user.is_contractor %} - - {% if request.user.avatar %} - {% thumbnail request.user.avatar "75x75" crop="center" as im %} - profile-image - {% endthumbnail %} - {% else %} - profile-image - {% endif %} - - {% elif request.user.is_customer %} - - {% if request.user.avatar %} - {% thumbnail request.user.avatar "75x75" crop="center" as im %} - profile-image - {% endthumbnail %} + + {% if request.user.avatar %} + {% thumbnail request.user.avatar "75x75" crop="center" as im %} + profile-image + {% endthumbnail %} + {% else %} + {% if request.user.gender == "female" %} + profile-image {% else %} - profile-image + profile-image {% endif %} - - {% endif %} + {% endif %} +
    • {% if request.user.is_authenticated %} diff --git a/templates/partials/trash/header.html b/templates/partials/trash/header.html index cea82c3..9b9ea67 100644 --- a/templates/partials/trash/header.html +++ b/templates/partials/trash/header.html @@ -113,7 +113,7 @@ Сообщения {% if request.user %}
    {{ new_messages_count| max_count:99 }}
    -{# {% count_new_message request.user %}#} + {# {% count_new_message request.user %}#} {% endif %}
  • @@ -147,7 +147,11 @@ profile-image {% endthumbnail %} {% else %} - profile-image + {% if request.user.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} {% elif request.user.is_customer %} @@ -157,7 +161,11 @@ profile-image {% endthumbnail %} {% else %} - profile-image + {% if request.user.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} {% endif %} diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html index b64b70d..b4752f3 100644 --- a/users/templates/contractor_filter.html +++ b/users/templates/contractor_filter.html @@ -195,7 +195,11 @@ profile-image {% endthumbnail %} {% else %} - profile-image + {% if team.owner.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %}
    • @@ -316,7 +320,11 @@ profile-image {% endthumbnail %} {% else %} - profile-image + {% if contractor.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 41bcc4c..fb02c5f 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -82,8 +82,15 @@ src="{{ im.url }}" alt="profile-image"> {% endthumbnail %} {% else %} - profile-image + + {% if contractor.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} + {% endif %} @@ -105,7 +112,13 @@ mess-image {% endthumbnail %} {% else %} - mess-image + {% if c.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} @@ -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/') @@ -309,10 +324,10 @@ var pageSize = {% if TESTING %}99999{% else %}9{% endif %} $.get('/api/teams/' + teamId + '/').then(function (res) { - Array.prototype.push.apply(contractorIds, _.map(function (contractor) { - return contractor.id - }, res.contractors)) - }) + Array.prototype.push.apply(contractorIds, _.map(function (contractor) { + return contractor.id + }, res.contractors)) + }) .then(loadMorePortfolios) .then(loadMoreWorkSells) diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index 4349b67..99c0543 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -18,7 +18,13 @@ profile-image {% endthumbnail %} {% else %} - profile-image + {% if contractor.gender == "female" %} + profile-image + {% else %} + profile-image + {% endif %} {% endif %} @@ -32,7 +38,7 @@ {% endif %} - + {% if display_team_invitation_button %}
  • @@ -54,24 +60,26 @@ {% if request.user.is_customer %}
  • - предложить заказ + href="#" + onclick="return false" + data-contractor-id="{{ contractor.pk }}" + data-toggle="modal" + data-target="#projectSelectionModal"> + предложить заказ
    • {% endif %} - + {% if contractor.teams.exists %}
    Является членом групп:
    - + {% endif %} @@ -82,18 +90,19 @@

    {{ contractor.get_full_name }} [{{ contractor.username }}]

    - +

    {{ contractor.get_location }}

    -

    На сайте c {{ contractor.created|date:"d M Y"}}

    +

    На сайте c {{ contractor.created|date:"d M Y" }}

    {% if contractor.contractor_status == 'free' %}
    Свободен
    {% else %} -
    Занят
    +
    Занят
    {% endif %} {% if request.user.is_authenticated %} - показать контакты + показать + контакты {% endif %}
    @@ -115,7 +124,8 @@
    - +

    Контакты владельца

    @@ -125,17 +135,17 @@ {% if contractor.website %}
  • {{ contractor.website }}
    • {% endif %} - +
  • {{ contractor.email }}
    • - + {% if contractor.skype %}
  • {{ contractor.skype }}
    • {% endif %} - + {% if contractor.phone %}
  • {{ contractor.phone }}
    • {% endif %} - + {% if contractor.phone2 %}
  • {{ contractor.phone2 }}
    • {% endif %} @@ -166,24 +176,7 @@
    - - - - - - - - - - - - - - - - - - +
    {% if contractor.pk == request.user.pk %} @@ -197,10 +190,11 @@
    - +

    Добавить портфолио

    - + {% include 'portfolio_create_form.html' %}
    @@ -211,29 +205,35 @@
    - +
    - показать еще + показать + еще
    - - - - - - - - - - - - - - - - +
    {% if contractor == request.user %}
    - +

    Загрузить резюме

    - -
    + +

    Удалить резюме

    {% endif %} - +
    @@ -363,35 +357,36 @@

    {{ contractor.get_full_name }}

    - + {% if contractor.contractor_resume.resume_file %} - скачать резюме + href="{{ contractor.contractor_resume.resume_file.url }}" + class="download-summ"> + скачать резюме {% endif %} - +

    {{ contractor.summary }}

    - +
      {% if contractor.website %}
    • {{ contractor.website }}
      • {% endif %} - +
    • {{ contractor.email }}
      • - + {% if contractor.phone %}
    • {{ contractor.phone }}
      • {% endif %} - + {% if contractor.phone2 %}
    • {{ contractor.phone2 }}
      • {% endif %} - +
    • {{ contractor.get_location }}
    @@ -403,33 +398,37 @@
    {% if contractor.pk == request.user.pk %} - + {% endif %} - +
    {{ contractor.contractor_resume.text|safe }}
    - - + +
    - +

    Редактировать текст резюме

    - +
    - +
    - +
    @@ -439,18 +438,18 @@
    - + - +
    {% for review in reviews %}
    @@ -173,15 +194,15 @@

    {{ review.get_sender }}

    - + {% if review.project.deal_type == 'secure_deal' %} Безопасная сделка {% endif %} - +
    положительный отзыв
    - +

    {{ review.text|safe }}

    @@ -194,9 +215,8 @@ {% endfor %}
    - - - + +
    {% include 'partials/footer.html' %}
    @@ -208,93 +228,93 @@ {% block js_block %}