remotes/origin/PR-39
PekopT 10 years ago
parent 80cfcc653b
commit d0c7138a1b
  1. 2
      assets/js/chat.js
  2. 8
      templates/partials/header.html
  3. 5
      update.sh
  4. 2
      users/templates/contractor_filter.html
  5. 3
      users/templates/contractor_profile.html
  6. 3
      work_sell/templates/worksells_list.html

@ -1,6 +1,6 @@
var SocketHandler = function () { var SocketHandler = function () {
domain = domain.replace(':' + port, ''); domain = domain.replace(':' + port, '');
var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; var url = 'ws://' + domain + '/chat/' + userId + '/';
var sock = new WebSocket(url); var sock = new WebSocket(url);
var intervalId; var intervalId;
sock.onopen = function () { sock.onopen = function () {

@ -107,12 +107,12 @@
<a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a> <a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a>
</li> </li>
<li class="icon_mm5"> <li class="icon_mm5">
<a href="#">Настройки<span></span></a> <a href="{% url 'users:user-profile-edit' pk=request.user.pk %}">Настройки<span></span></a>
</li> </li>
<li class="icon_mm6"> {# <li class="icon_mm6">#}
<a href="#">FAQ<span></span></a> {# <a href="#">FAQ<span></span></a>#}
</li> {# </li>#}
<li class="icon_mm6"> <li class="icon_mm6">
<a href="{% url 'auth_logout' %}">Выйти<span></span></a> <a href="{% url 'auth_logout' %}">Выйти<span></span></a>

@ -4,8 +4,9 @@ source ../env/bin/activate &&
pip install -r requirements/base.txt && pip install -r requirements/base.txt &&
git reset --hard && git reset --hard &&
git pull && git pull &&
chmod +x update.sh &&
./manage.py migrate --noinput && ./manage.py migrate --noinput &&
./manage.py collectstatic --noinput && ./manage.py collectstatic --noinput &&
supervisorctl restart arch && supervisorctl restart arch &&
./manage.py recalculation_spec ./manage.py recalculation_spec &&
chown -R www-data:www-data ./ && chmod -R 775 ./ &&
chmod +x update.sh

@ -178,7 +178,7 @@
<img src="img/profile.jpg" alt="execitor-image"> <img src="img/profile.jpg" alt="execitor-image">
</div></a> </div></a>
<p class="nameExecutor"> <p class="nameExecutor">
<a href="#">{{ team.name }}</a> <a href="">{{ team.name }}</a> {# TODO #}
</p> </p>
<p class="navv2">На сайте 8 лет и 3 месяца</p> <p class="navv2">На сайте 8 лет и 3 месяца</p>
<div class="statusUser">Свободен</div> <div class="statusUser">Свободен</div>

@ -252,8 +252,7 @@
</div> </div>
</div> </div>
<div class="insetCol2 box-sizing disTab"> <div class="insetCol2 box-sizing disTab">
<p>{{ ws }}</p> <a href="{% url 'work_sell:detail' ws.pk %}">{{ ws }}</a>
{% if request.user.pk == contractor.pk %} {% if request.user.pk == contractor.pk %}
<div class="buttonsImg" disTab> <div class="buttonsImg" disTab>
<div class="insetBI insetBI1"> <div class="insetBI insetBI1">

@ -154,8 +154,7 @@
</div> </div>
</div> </div>
<div class="insetCol2 box-sizing disTab"> <div class="insetCol2 box-sizing disTab">
<p>{{ work }}</p> <a href="{% url 'work_sell:detail' work.pk %}">{{ work }}</a>
{% if request.user.pk == work.contractor.pk %} {% if request.user.pk == work.contractor.pk %}
<div class="buttonsImg" disTab> <div class="buttonsImg" disTab>
<a href="{% url 'work_sell:edit' work.pk %}"> <a href="{% url 'work_sell:edit' work.pk %}">

Loading…
Cancel
Save