From c02157665b4cb174db56eb2e5a690fa5eb379848 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Fri, 10 Jun 2016 15:35:12 +0300
Subject: [PATCH] Update

---
 .../customer_profile_current_projects.html    |  75 -------
 .../customer_profile_deleted_projects.html    | 191 +++---------------
 .../customer_profile_open_projects.html       |   4 +-
 3 files changed, 27 insertions(+), 243 deletions(-)

diff --git a/users/templates/customer_profile_current_projects.html b/users/templates/customer_profile_current_projects.html
index 3111c63..977f259 100644
--- a/users/templates/customer_profile_current_projects.html
+++ b/users/templates/customer_profile_current_projects.html
@@ -13,7 +13,6 @@
                         </div>
                     </div>
 				</div>
-				
 				<div class="col-lg-9 divCol9">
 					<div class="col-lg-4">
 						<p class="nameUser">
@@ -46,7 +45,6 @@
 						<a href="javascript:void(0)" class="new-red">редактировать профиль</a>
 					</div>
 				</div>
-				
 				<div class="col-lg-9 divCol9 new-mar2">
 					<div class="profileTabs2 tabs-new">
 						<ul class="nav nav-tabs nav-justified">
@@ -74,79 +72,6 @@
 					</div>
 				</div>
 			</div>
-			
-			<div class="buttonGP disTab">
-				<div class="btn-group valProject2" role="group" aria-label="...">
-  					<button type="button" class="btn btn-default">
-  						Открытые проекты
-						<span><mark>2</mark> / <span>35</span></span>
-  					</button>
-  					
-  					<button type="button" class="btn btn-default">
-  						Корзина
-  						<span><mark></mark><span>7</span></span>
-  					</button>
-				</div>
-				
-				<div class="polsF1 disTab polsSearch">
-					<div class="col-lg-3">
-						<select class="selectpicker">
-							<option>Mustard</option>
-							<option>Ketchup</option>
-							<option>Relish</option>
-						</select>
-					</div>	
-				</div>
-				
-				<div class="col-lg-3 col-lg-offset-1">
-					<p class="addWork add-work-new"><a href="{% url 'projects:project-create' %}">Разместить заказ</a></p>
-				</div>
-			</div>
-			
-			<div class="projectsBlock new-pro-block disTab">
-                {% for proj in object.projects.all %}
-                    <div class="projectPro clearfix">
-                        <div class="col-lg-9 leftPro">
-                            <p class="titlePro">
-                                <a href="{% url 'projects:detail' proj.id %}">{{ proj.name }}</a> 
-                            </p>
-                            
-                            <ul class="desPro">
-                                <li>Объект "{{ proj.realty.name }}"</li>
-                                <li><span>0</span> ответ от имени группы</li>
-                            </ul>
-                            
-                            <ul class="color-menu">
-                                <li><a href="#">Новые: 0</a></li>
-                                <li><a href="#">Кандидаты: 0</a></li>
-                                <li><a href="#">Отказал: 0</a></li>
-                            </ul>
-                            
-                            <p class="textPro">
-                                {{ proj.text }}
-                            </p>
-                            
-                            <ul class="listPro">
-                                <li>{{ proj.created}}</li>
-                                <li>0</li>
-                                <li>0</li>
-                                <li>{{ object.get_full_name }}</li>
-                            </ul>
-                        </div>
-                        
-                        <div class="col-lg-3 rightPro right-pro-red">
-                            <p class="cenaPro">
-                                {{ proj.price }} <i class="fa fa-rub"></i>
-                            </p>
-                            
-                            <ul>
-                                <li>Редактировать</li>
-                                <li>Переместить в корзину</li>
-                            </ul>
-                        </div>
-                    </div>
-                {% endfor %}
-            </div>
         </div>
     </div>
 {% endblock %}
diff --git a/users/templates/customer_profile_deleted_projects.html b/users/templates/customer_profile_deleted_projects.html
index b017053..f93ebe4 100644
--- a/users/templates/customer_profile_deleted_projects.html
+++ b/users/templates/customer_profile_deleted_projects.html
@@ -1,110 +1,22 @@
-<!DOCTYPE html>
-<html lang="ru">
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Archilance</title>
-	<link rel="stylesheet" href="css/bootstrap.css">
-	<link rel="stylesheet" href="css/font-awesome.min.css">
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/css/bootstrap-select.min.css">
-	<link rel="stylesheet" href="css/reset.css">
-	<link rel="stylesheet" href="css/main.css">
-	<!--[if lt IE 9]>
-		<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-	<![endif]-->
-</head>
-<body>
-	<div class="wrTop disTab">
-		<div class="container-fluid topMain">
-			<div class="row">
-				<div class="col-lg-3">
-					<div class="logo" onClick="window.location='/'"></div>
-				</div>
-				<div class="col-lg-7">
-					<ul class="mainMenu">
-						<li class="icon_tm1">
-							<a href="javascript:void(0)">Биржа проектов</a>
-							<span></span>
-						</li>
-						<li class="officeList icon_tml">
-							<a href="javascript:void(0)">Мой офис</a>
-							<span></span>
-						</li>						
-					</ul>
-				</div>
-				<div class="col-lg-2">
-					<div class="imgProfile">
-						<img src="img/profile.jpg" alt="profile-image">
-					</div>
-					<div class="infoProfile disTab">
-		  				<div class="btn-group" role="group">
-		    				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-		      					<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
-		    				</button>
-		    				<ul class="dropdown-menu menu-drop-new">
-		      					<li class="icon_mm1">
-		      						<a href="#">
-		      							Войти заказчиком
-		      							<span></span>
-		      						</a>
-		      					</li>
-		      					<li class="icon_mm2">
-		      						<a href="#">
-		      							Войти исполнителем
-		      							<span></span>
-		      						</a>
-		      					</li>
-		      					<li class="icon_mm3">
-		      						<a href="#">
-		      							Сообщения
-		      							<span></span>
-		      						</a>
-		      					</li>
-		      					<li class="icon_mm4">
-		      						<a href="#">
-		      							Счет
-		      							<span></span>
-		      						</a>	
-		      					</li>
-		      					<li class="icon_mm5">
-		      						<a href="#">
-		      							Настройки
-		      							<span></span>
-		      						</a>
-		      					</li>
-		      					<li class="icon_mm6">
-		      						<a href="#">
-		      							FAQ
-		      							<span></span>
-		      						</a>
-		      					</li>
-		    				</ul>
-		  				</div>
-		  			</div>
-		  			<div class="rating">
-		  				<div class="ratingInset"></div>
-		  				<div class="iconRating"></div>
-		  			</div>
-		  			<p class="ratingPer">45%</p>
-				</div>
-			</div>
-		</div>
-	</div>
+{% extends 'partials/base.html' %}
+
+{% block content %}
+    {% include 'partials/header.html' %}
+    
 	<div class="container mainScore mainBlock2">
 		<div class="row">
 			<div class="col-lg-12">
 				<div class="col-lg-3 divCol3">
 					<div class="avatar new-mar">
-								<div class="avatarInset">
-									<img src="img/profile.jpg" alt="profile-image">
-								</div>
-							</div>
+                        <div class="avatarInset">
+                            <img src="img/profile.jpg" alt="profile-image">
+                        </div>
+                    </div>
 				</div>
 				<div class="col-lg-9 divCol9">
 					<div class="col-lg-4">
 						<p class="nameUser">
-							Иванов Петр Иванович [ivanov_petr]
+							{{ object.get_full_name }} [ivanov_petr]
 						</p>
 						<p class="cityUser">Россия, Москва</p>
 						<p class="navv">На сайте 8 лет и 3 месяца</p>
@@ -153,16 +65,17 @@
 				</div>
 			</div>
 			<div class="buttonGP disTab">
-				<div class="btn-group valProject2" role="group" aria-label="...">
-  					<button type="button" class="btn btn-default">
-  						Открытые проекты
-						<span><mark>2</mark> / <span>35</span></span>
-  					</button>
-  					<button type="button" class="btn btn-default">
-  						Корзина
-  						<span><mark></mark><span>7</span></span>
-  					</button>
-				</div>
+                <div class="btn-group valProject2">
+                    <a href="{% url 'users:customer-profile-open-projects' pk=user.pk %}" class="btn btn-default">
+                        Открытые проекты
+                        <span><mark>2</mark> / <span>35</span></span>
+                    </a>
+                    
+                    <a href="{% url 'users:customer-profile-deleted-projects' pk=user.pk %}" class="btn btn-default" disabled>
+                        Корзина
+                        <span><mark></mark><span>7</span></span>
+                    </a>
+                </div>
 				<div class="polsF1 disTab polsSearch">
 					<div class="col-lg-3">
 						<select class="selectpicker">
@@ -170,7 +83,7 @@
 							<option>Ketchup</option>
 							<option>Relish</option>
 						</select>
-					</div>	
+					</div>
 				</div>
 				<div class="col-lg-3 col-lg-offset-1">
 					<p class="addWork add-work-new">Разместить заказ</p>
@@ -403,62 +316,8 @@
 					</div>
 				</div>
 			</div>
-			<footer class="disTab">
-				<div class="col-lg-4">
-					<div class="logoF" onclick="window.location='/'"></div>
-					<div class="linksSoc box-sizing disTab">
-						<a href="https://www.facebook.com/" target="_blank" class="icon_ls1"></a>
-						<a href="https://twitter.com/" target="_blank" class="icon_ls2"></a>
-						<a href="https://plus.google.com/" target="_blank" class="icon_ls3"></a>
-						<a href="http://vk.com/" target="_blank" class="icon_ls4"></a>
-						<a href="https://www.youtube.com/" target="_blank" class="icon_ls5"></a>
-					</div>
-					<p class="copy-rights">&copy; 2016 archilance.ru</p>
-				</div>
-				<div class="col-lg-3 col-lg-offset-2 listF1">
-					<p>Профиль</p>
-					<ul>
-						<li>
-							<a href="javascript:void(0)">Войти</a>
-						</li>
-						<li>
-							<a href="javascript:void(0)">Регистрация</a>
-						</li>
-						<li>
-							<a href="javascript:void(0)">Востановить доступ</a>
-						</li>
-						<li>
-							<a href="javascript:void(0)">Опубликовать проект</a>
-						</li>
-					</ul>
-				</div>
-				<div class="col-lg-3 listF1">
-					<p>О сайте</p>
-					<ul>
-						<li>
-							<a href="javascript:void(0)">Помощь</a>
-						</li>
-						<li>
-							<a href="javascript:void(0)">Правила сайта</a>
-						</li>
-						<li>
-							<a href="javascript:void(0)">Команда</a>
-						</li>
-						<li>
-							<a href="javascript:void(0)">FAQ</a>
-						</li>
-						<li>
-							<a href="javascript:void(0)">Контакты</a>
-						</li>
-					</ul>
-				</div>
-			</footer>
+			
+			{% include 'partials/footer.html' %}
 		</div>
 	</div>
-	<script src="js/jquery-2.2.3.min.js"></script>
-	<script src="js/bootstrap.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/js/bootstrap-select.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/js/i18n/defaults-*.min.js"></script>
-	<script src="js/main.js"></script>
-</body>
-</html>
\ No newline at end of file
+{% endblock %}
diff --git a/users/templates/customer_profile_open_projects.html b/users/templates/customer_profile_open_projects.html
index 1a96949..3e47141 100644
--- a/users/templates/customer_profile_open_projects.html
+++ b/users/templates/customer_profile_open_projects.html
@@ -74,7 +74,6 @@
 					</div>
 				</div>
 			</div>
-			
 			<div class="buttonGP disTab">
                 <div class="btn-group valProject2">
                     <a href="{% url 'users:customer-profile-open-projects' pk=user.pk %}" class="btn btn-default" disabled>
@@ -102,7 +101,6 @@
 					<p class="addWork add-work-new"><a href="{% url 'projects:project-create' %}">Разместить заказ</a></p>
 				</div>
 			</div>
-			
 			<div class="projectsBlock new-pro-block disTab">
                 {% for proj in object.projects.all %}
                     <div class="projectPro clearfix">
@@ -147,6 +145,8 @@
                     </div>
                 {% endfor %}
             </div>
+            
+			{% include 'partials/footer.html' %}
         </div>
     </div>
 {% endblock %}