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

Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into artur

Browse Source
remotes/origin/PR-39
ArturBaybulatov 10 years ago
parent b84a4f9366 c408bd7cc9
commit d90a7d1e90
5 changed files with 156 additions and 208 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      projects/models.py
  2. 92
      projects/templates/portfolio_detail.html
  3. 2
      users/templates/contractor_office.html
  4. 2
      users/templates/contractor_office_open_projects.html
  5. 266
      work_sell/templates/worksell_detail.html

2
projects/models.py
Unescape View File

@ -290,7 +290,7 @@ class Portfolio(models.Model):
construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True) construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True)
created = models.DateTimeField(auto_now_add=True, auto_created=True) created = models.DateTimeField(auto_now_add=True, auto_created=True)
currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True) currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True)
description = models.TextField() description = models.TextField(blank=True)
location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True) location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True)
name = models.CharField(max_length=255) name = models.CharField(max_length=255)
specialization = TreeForeignKey(Specialization, related_name='portfolios', null=True, blank=True) specialization = TreeForeignKey(Specialization, related_name='portfolios', null=True, blank=True)

92
projects/templates/portfolio_detail.html
Unescape View File

@ -20,90 +20,42 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{# <div class="btnReadyBlock disTab">#}
{# <div class="triangle1"></div>#}
{# <div class="col-lg-3">#}
{# <p class="cenaReady">{{ object.budget }} <i class="fa fa-rub"></i></p>#}
{# </div>#}
{# {% if request.user.is_authenticated %}#}
{# <div class="col-lg-3">#}
{# <a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR1">#}
{# купить#}
{# </a>#}
{# </div>#}
{##}
{# <div class="col-lg-3">#}
{# <a href="{% url 'chat:chat-user' %}?user_id={{ object.contractor.pk }}" class="linkReady LR2">#}
{# Написать сообщение#}
{# </a>#}
{# </div>#}
{# {% endif %}#}
{# <div class="col-lg-3">#}
{# <a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR3">#}
{# посмотреть контакты#}
{# </a>#}
{# </div>#}
{# </div>#}
<div class="desReadyBlock"> <div class="desReadyBlock">
{% if object.text %} {% if object.description %}
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="titleReady">Описание:</p> <p class="titleReady">Описание:</p>
</div> </div>
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="textReady"> <p class="textReady">
{{ object.text }} {{ object.description }}
</p> </p>
</div> </div>
{% endif %} {% endif %}
<div class="col-lg-12 sliderReady"> <div class="col-lg-12 sliderReady">
<div class="arroww prev3"></div> {% if object.photos.all|length > 1 %}
<div class="arroww next3"></div> <div class="arroww prev3"></div>
<div class="arroww next3"></div>
{% endif %}
<div class="swiper-container gallery-top"> <div class="swiper-container gallery-top">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div class="swiper-slide" style="background-image:url('{% static object.get_cover.url %}')"></div>
{% for photo in object.photos.all %} {% for photo in object.photos.all %}
<div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div> <div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<div class="swiper-container gallery-thumbs"> {% if object.photos.all|length > 1 %}
<div class="swiper-wrapper"> <div class="swiper-container gallery-thumbs">
<div class="swiper-slide is-selected" <div class="swiper-wrapper">
style="background-image:url('{% static object.get_cover.url %}')"></div> {% for photo in object.photos.all %}
{% for photo in object.photos.all %} <div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div>
<div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div> {% endfor %}
{% endfor %} </div>
</div> </div>
</div> {% endif %}
</div> </div>
{# <div class="col-lg-12">#}
{# <div class="triangle2"></div>#}
{# <div class="arr arr1"></div>#}
{# <div class="arr arr2"></div>#}
{# </div>#}
</div> </div>
{# <div class="col-lg-12 sibl">#}
{# <p>Похожие работы</p>#}
{# </div>#}
{# <div class="gallMini disTab">#}
{# {% for worksell in worksell_related %}#}
{# <div class="col-lg-3">#}
{##}
{# <div class="insetCol box-sizing disTab">#}
{# {% thumbnail worksell.get_cover "265x265" crop="center" as im %}#}
{# <div class="imgGal" style="background: url('{{ im.url }}') no-repeat center;">#}
{# <div class="imgFigure"></div>#}
{# </div>#}
{# {% endthumbnail %}#}
{# </div>#}
{# </div>#}
{# {% endfor %}#}
{# </div>#}
{% include 'partials/footer.html' %} {% include 'partials/footer.html' %}
</div> </div>
</div> </div>

2
users/templates/contractor_office.html
Unescape View File

@ -17,7 +17,7 @@
<div class="buttonGP disTab"> <div class="buttonGP disTab">
<div class="btn-group valProject2 val-pro3" role="group"> <div class="btn-group valProject2 val-pro3" role="group">
{% if False and contractor.team %} {% if contractor.team %}
<button type="button" class="btn btn-default"> <button type="button" class="btn btn-default">
{{ contractor.team.name }} {{ contractor.team.name }}
<span><mark>0</mark></span> <span><mark>0</mark></span>

2
users/templates/contractor_office_open_projects.html
Unescape View File

@ -20,7 +20,7 @@
<div class="btn-group valProject2" role="group"> <div class="btn-group valProject2" role="group">
<a href="#" data-param-name="owner" data-default onclick="return false" class="btn btn-default -nav">Все</a> <a href="#" data-param-name="owner" data-default onclick="return false" class="btn btn-default -nav">Все</a>
<a href="#" data-param-name="owner" data-param-val="private" onclick="return false" class="btn btn-default -nav">Личные</a> <a href="#" data-param-name="owner" data-param-val="private" onclick="return false" class="btn btn-default -nav">Личные</a>
<a href="#" data-param-name="owner" data-param-val="teams" onclick="return false" class="btn btn-default -nav">От именни группы</a> <a href="#" data-param-name="owner" data-param-val="teams" onclick="return false" class="btn btn-default -nav">От имени группы</a>
</div> </div>
<div class="btn-group valProject2" role="group"> <div class="btn-group valProject2" role="group">

266
work_sell/templates/worksell_detail.html
Unescape View File

@ -2,152 +2,148 @@
{% load staticfiles %} {% load staticfiles %}
{% load thumbnail %} {% load thumbnail %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container mainScore"> <div class="container mainScore">
<div class="row"> <div class="row">
<div class="col-lg-12 allProjects"> <div class="col-lg-12 allProjects">
<p class="titleScore">{{ object }}</p> <p class="titleScore">{{ object }}</p>
{% if object.get_prev %} {% if object.get_prev %}
<div class="all all1"> <div class="all all1">
<p><a href="{% url 'work_sell:detail' object.get_prev.pk %}"> предыдущий</a></p> <p><a href="{% url 'work_sell:detail' object.get_prev.pk %}"> предыдущий</a></p>
</div> </div>
{% endif %} {% endif %}
{% if object.get_next %} {% if object.get_next %}
<div class="all all2"> <div class="all all2">
<p><a href="{% url 'work_sell:detail' object.get_next.pk %}">следующий</a></p> <p><a href="{% url 'work_sell:detail' object.get_next.pk %}">следующий</a></p>
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="btnReadyBlock disTab"> <div class="btnReadyBlock disTab">
<div class="triangle1"></div> <div class="triangle1"></div>
<div class="col-lg-3"> <div class="col-lg-3">
<p class="cenaReady">{{ object.budget }} <i class="fa fa-rub"></i></p> <p class="cenaReady">{{ object.budget }} <i class="fa fa-rub"></i></p>
</div> </div>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<div class="col-lg-3"> <div class="col-lg-3">
<a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR1"> <a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR1">
купить купить
</a> </a>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<a href="{% url 'chat:chat-user' %}?user_id={{ object.contractor.pk }}" class="linkReady LR2"> <a href="{% url 'chat:chat-user' %}?user_id={{ object.contractor.pk }}" class="linkReady LR2">
Написать сообщение Написать сообщение
</a> </a>
</div> </div>
{% endif %} {% endif %}
<div class="col-lg-3"> <div class="col-lg-3">
<a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR3"> <a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR3">
посмотреть контакты посмотреть контакты
</a> </a>
</div> </div>
</div> </div>
<div class="desReadyBlock">
{% if object.description %}
<div class="col-lg-10 col-lg-offset-1">
<p class="titleReady">Описание:</p>
</div>
<div class="col-lg-10 col-lg-offset-1">
<p class="textReady">
{{ object.description }}
</p>
</div>
{% endif %}
<div class="col-lg-12 sliderReady">
{% if object.photos.all|length > 1 %}
<div class="arroww prev3"></div>
<div class="arroww next3"></div>
{% endif %}
<div class="swiper-container gallery-top">
<div class="swiper-wrapper">
{% for photo in object.photos.all %}
<div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div>
{% endfor %}
</div>
</div>
{% if object.photos.all|length > 1 %}
<div class="swiper-container gallery-thumbs">
<div class="swiper-wrapper">
{% for photo in object.photos.all %}
<div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div>
{% endfor %}
</div>
</div>
{% endif %}
</div>
</div>
<div class="col-lg-12 sibl">
<p>Похожие работы</p>
</div>
<div class="desReadyBlock"> <div class="gallMini disTab">
{% if object.text %} {% for worksell in worksell_related %}
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-3">
<p class="titleReady">Описание:</p> <div class="insetCol box-sizing disTab">
</div> {% thumbnail worksell.get_cover "265x265" crop="center" as im %}
<div class="col-lg-10 col-lg-offset-1"> <a href="{% url 'work_sell:detail' worksell.pk %}">
<p class="textReady"> <div class="imgGal" style="background: url('{{ im.url }}') no-repeat center;">
{{ object.text }} <div class="imgFigure"></div>
</p> </div>
</div> </a>
{% endif %} {% endthumbnail %}
<div class="col-lg-12 sliderReady"> </div>
<div class="arroww prev3"></div> </div>
<div class="arroww next3"></div> {% endfor %}
<div class="swiper-container gallery-top"> </div>
<div class="swiper-wrapper">
<div class="swiper-slide" style="background-image:url('{% static object.get_cover.url %}')"></div>
{% for photo in object.photos.all %}
<div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div>
{% endfor %}
</div>
</div>
<div class="swiper-container gallery-thumbs">
<div class="swiper-wrapper">
<div class="swiper-slide is-selected" style="background-image:url('{% static object.get_cover.url %}')"></div>
{% for photo in object.photos.all %}
<div class="swiper-slide" style="background-image:url('{% static photo.img.url %}')"></div>
{% endfor %}
</div>
</div>
</div>
{# <div class="col-lg-12">#}
{# <div class="triangle2"></div>#}
{# <div class="arr arr1"></div>#}
{# <div class="arr arr2"></div>#}
{# </div>#}
</div>
<div class="col-lg-12 sibl">
<p>Похожие работы</p>
</div>
{% include 'partials/footer.html' %}
<div class="gallMini disTab"> </div>
{% for worksell in worksell_related %} </div>
<div class="col-lg-3">
<div class="insetCol box-sizing disTab">
{% thumbnail worksell.get_cover "265x265" crop="center" as im %}
<div class="imgGal" style="background: url('{{ im.url }}') no-repeat center;">
<div class="imgFigure"></div>
</div>
{% endthumbnail %}
</div>
</div>
{% endfor %}
</div>
{% include 'partials/footer.html' %}
</div>
</div>
{% endblock %} {% endblock %}
{% block js_block %} {% block js_block %}
<script src="{% static 'js/swiper.min.js' %}"></script> <script src="{% static 'js/swiper.min.js' %}"></script>
<script> <script>
var galleryTop = new Swiper('.gallery-top', { var galleryTop = new Swiper('.gallery-top', {
nextButton: '.next3', nextButton: '.next3',
prevButton: '.prev3', prevButton: '.prev3',
spaceBetween: 10, spaceBetween: 10,
}); });
var galleryTop = new Swiper('.gallery-top', { var galleryTop = new Swiper('.gallery-top', {
nextButton: '.next3', nextButton: '.next3',
prevButton: '.prev3', prevButton: '.prev3',
spaceBetween: 15, spaceBetween: 15,
onSlideChangeEnd: function(swiper){ onSlideChangeEnd: function (swiper) {
var activeIndex = swiper.activeIndex; var activeIndex = swiper.activeIndex;
$(galleryThumbs.slides).removeClass('is-selected'); $(galleryThumbs.slides).removeClass('is-selected');
$(galleryThumbs.slides).eq(activeIndex).addClass('is-selected'); $(galleryThumbs.slides).eq(activeIndex).addClass('is-selected');
galleryThumbs.slideTo(activeIndex,300, false); galleryThumbs.slideTo(activeIndex, 300, false);
} }
}); });
var galleryThumbs = new Swiper('.gallery-thumbs', { var galleryThumbs = new Swiper('.gallery-thumbs', {
spaceBetween: 15, spaceBetween: 15,
freeMode: true, freeMode: true,
centeredSlides: false, centeredSlides: false,
slidesPerView: 6, slidesPerView: 6,
touchRatio: 0.2, touchRatio: 0.2,
nextButton: '.arr2', nextButton: '.arr2',
prevButton: '.arr1', prevButton: '.arr1',
onClick: function (swiper, event){ onClick: function (swiper, event) {
var clicked = swiper.clickedIndex var clicked = swiper.clickedIndex
swiper.activeIndex = clicked; swiper.activeIndex = clicked;
swiper.updateClasses() swiper.updateClasses()
$(swiper.slides).removeClass('is-selected'); $(swiper.slides).removeClass('is-selected');
$(swiper.clickedSlide).addClass('is-selected'); $(swiper.clickedSlide).addClass('is-selected');
galleryTop.slideTo(clicked,300, false); galleryTop.slideTo(clicked, 300, false);
} }
}); });
</script> </script>
{% endblock %} {% endblock %}

Write Preview
Loading…
Cancel
Save