From 5813749813599dfd3c5c2d9c3fcaa3bd69354cdc Mon Sep 17 00:00:00 2001 From: booblegum Date: Fri, 23 Dec 2016 19:54:39 +0300 Subject: [PATCH] =?UTF-8?q?PR-14-mod=20=D0=9C=D0=BE=D0=B4=D0=B8=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20=D1=88=D0=B0=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B0=D0=BA=D0=BA=D0=B0=D1=83=D0=BD=D1=82=20=D0=98?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8F=20?= =?UTF-8?q?(=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлены визуальные недоработки Реализованы М/Ж иконки аватаров по умолчанию --- assets/css/main.css | 40 - assets/img/avatars/avatar-female.jpg | Bin 0 -> 4002 bytes assets/img/avatars/avatar-male.jpg | Bin 0 -> 3883 bytes assets/js/chat.js | 7 +- chat/templates/inc-contact-card.html | 6 +- projects/templates/project_detail.html | 54 +- templates/partials/header.html | 32 +- templates/partials/trash/header.html | 14 +- users/templates/contractor_filter.html | 12 +- users/templates/contractor_office.html | 33 +- users/templates/contractor_profile.html | 734 +++++++++--------- .../partials/inc-customer_profile-info.html | 6 +- users/templates/team_profile.html | 164 ++-- .../trash/customer_profile_info_block.html | 6 +- users/templates/user_financial_info_edit.html | 76 +- users/templates/user_profile_edit.html | 6 +- users/templates/user_profile_edit_old.html | 6 +- 17 files changed, 633 insertions(+), 563 deletions(-) create mode 100644 assets/img/avatars/avatar-female.jpg create mode 100644 assets/img/avatars/avatar-male.jpg 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 0000000000000000000000000000000000000000..86073776b28fbb1b3ec0a1f900f3fbd7fc0d4aa6 GIT binary patch literal 4002 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 literal 0 HcmV?d00001 diff --git a/assets/img/avatars/avatar-male.jpg b/assets/img/avatars/avatar-male.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9e5c8762399d38153b5b35b53d706905c893dc07 GIT binary patch literal 3883 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 literal 0 HcmV?d00001 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 @@

@@ -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 %}