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

projects/models.py

@@ -290,7 +290,7 @@ class Portfolio(models.Model):
     construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=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)
-    description = models.TextField()
+    description = models.TextField(blank=True)
     location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True)
     name = models.CharField(max_length=255)
     specialization = TreeForeignKey(Specialization, related_name='portfolios', null=True, blank=True)

projects/templates/portfolio_detail.html

@@ -20,90 +20,42 @@
           </div>
         {% endif %}
       </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">
-      {% if object.text %}
+        {% 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.text }}
+              {{ 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">
-              <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>
+          {% if object.photos.all|length > 1 %}
             <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>
+          {% endif %}
         </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>#}
-{#      <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' %}
-
     </div>
   </div>
 

users/templates/contractor_office.html

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

users/templates/contractor_office_open_projects.html

@@ -20,7 +20,7 @@
 				<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-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 class="btn-group valProject2" role="group">

work_sell/templates/worksell_detail.html

@@ -46,58 +46,54 @@
       </div>
 
 
-
       <div class="desReadyBlock">
-      {% if object.text %}
+        {% 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.text }}
+              {{ 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">
-			            <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>
+          {% if object.photos.all|length > 1 %}
             <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>
+          {% endif %}
         </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>
 
-
       <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 %}
+                <a href="{% url 'work_sell:detail' worksell.pk %}">
                   <div class="imgGal" style="background: url('{{ im.url }}') no-repeat center;">
                     <div class="imgFigure"></div>
                   </div>
+                </a>
               {% endthumbnail %}
             </div>
           </div>