Update

projects/templates/projects/project_detail.html

@@ -1,7 +1,11 @@
 {% extends 'partials/base.html' %}
+
 {% load staticfiles %}
+{% load humanize %}
+
+
 {% block content %}
-    {% load humanize %}
+    {% include 'partials/header.html' %}
     
     <div class="col-lg-12">
         <p class="titleScore">{{ object }}</p>
@@ -193,7 +197,6 @@
 
     <div class="candidateBlock disTab">
         {% for answer in object.answers.all %}
-
             <div class="candidate can-new">
                 <div class="col-lg-4">
                     <a href="#" class="aLinkExe">
@@ -262,29 +265,11 @@
                 </div>
             </div>
         {% endfor %}
-
     </div>
+    
     <div class="col-lg-12 pagin">
-        <nav>
+        {% include 'partials/pagination.html' %}
-            <ul class="pagination">
-                <li>
-                    <a href="#" aria-label="Previous">
-                        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
-                    </a>
-                </li>
-                <li class="active"><a href="#">1</a></li>
-                <li><a href="#">2</a></li>
-                <li><a href="#">3</a></li>
-                <li><a href="#">4</a></li>
-                <li><a href="#">5</a></li>
-                <li>...</li>
-                <li><a href="#">17</a></li>
-                <li>
-                    <a href="#" aria-label="Next">
-                        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-                    </a>
-                </li>
-            </ul>
-        </nav>
     </div>
+    
+    {% include 'partials/footer.html' %}
 {% endblock %}

projects/templates/projects/project_list.html

@@ -1,6 +1,10 @@
 {% extends 'partials/base.html' %}
 
 {% block content %}
+    {% include 'partials/header.html' %}
+    
+	<div class="container mainScore">
+		<div class="row">
 			<div class="col-lg-12">
 				<p class="titleScore">Биржа проектов</p>
 			</div>
@@ -190,18 +194,19 @@
                                     Стадия: "П"
                                 </li>
                                 <li>
-                            Отказаться и переместить
+                                    Отказаться и перемстить 
                                     в корзину
                                 </li>
                             </ul>
                         </div>
                     </div>
                 {% endfor %}
-
 			</div>
 			<div class="col-lg-12 pagin">
-        <nav>
+                {% include 'partials/pagination.html' %}
-        </nav>
 			</div>
 			
+			{% include 'partials/footer.html' %}
+		</div>
+	</div>
 {% endblock %}

specializations/templates/specializations/specialization.html

@@ -1,4 +1,5 @@
 {% extends '_layout.html' %}
+
 {% block content %}
 
     <h1>Angular setup

specializations/templates/specializations/specialization_detail.html

@@ -1,4 +1,5 @@
 {% extends 'partials/base.html' %}
+
 {% block content %}
     {{ object }}
 {% endblock %}

specializations/templates/specializations/specialization_list.html

@@ -1,4 +1,5 @@
 {% extends 'partials/base.html' %}
+
 {% block content %}
     <h1>Специализации</h1>
     {% load mptt_tags %}
@@ -29,7 +30,7 @@
     <div id="children" style="border:2px solid #000;">
 
     </div>
-    {% block js_block %}
+    {% block js %}
         <script type="text/javascript">
 
             $(function () {

templates/home.html

@@ -1,7 +1,5 @@
 {% extends 'partials/base.html' %}
 
-{% load staticfiles %}
-
 {% block content %}
 	<section class="mainContainer">
         {% include 'partials/header.html' %}
@@ -9,9 +7,6 @@
 		<div class="container-fluid">
 			<div class="row">
 				<p class="welcomeMain">Основная задача сайта</p>
-                <p>Authed? {{ user.is_authenticated }}</p>
-                {{ user }}
-                {{ user.groups.all }}
 			</div>
 		</div>
 		
@@ -38,7 +33,6 @@
 				</div>
 			</div>
 		</div>
-		
 		<div class="container-fluid">
 			<div class="row">
 				<div class="youtube"></div>

templates/partials/base.html

@@ -10,9 +10,6 @@
 
 <title>Archilance</title>
 
-<!-- Prevent Angular from displaying unrendered template expressions: -->
-<style>[ng-cloak] {display: none !important}</style>
-
 <link rel='stylesheet' href='{% static "css/bootstrap.css" %}'>
 <link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
 <link rel='stylesheet' href='{% static "css/reset.css" %}'>

templates/partials/footer.html

@@ -1,5 +1,3 @@
-{% extends 'partials/base.html' %}
-
 {% load staticfiles %}
 
 

templates/partials/header.html

@@ -1,20 +1,21 @@
 {% load staticfiles %}
 
-<div class="wrTop">
+
+<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>
+                    <li class="icon_tm1">
                         <a href="{% url 'projects:list' %}">Биржа проектов</a>
+                        <span></span>
                     </li>
-                    
+                    <li class="icon_tm2">
-                    <li>
                         <a href="{% url 'users:contractor-list' %}">Поиск исполнителей</a>
+                        <span></span>
                     </li>
                     
                     <li>
@@ -25,15 +26,66 @@
                         {% endif %}
                     </li>
                     					
-                    {#<li>
+{#                    <li class="icon_tm3">#}
-                        <a href="javascript:void(0)">Работы на продажу</a>
+{#                        <a href="javascript:void(0)">Работы на продажу</a>#}
-                    </li>#}
+{#                        <span></span>#}
+{#                    </li>						#}
                 </ul>
             </div>
-            
             <div class="col-lg-2">
-                <a href="javascript:void(0)" class="reg">регистрация</a>
+                <div class="imgProfile">
-                <div class="lock"></div>
+                    <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>

templates/partials/pagination.html

@@ -0,0 +1,21 @@
+<nav>
+    <ul class="pagination">
+        <li>
+        <a href="#" aria-label="Previous">
+            <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+        </a>
+        </li>
+        <li class="active"><a href="#">1</a></li>
+        <li><a href="#">2</a></li>
+        <li><a href="#">3</a></li>
+        <li><a href="#">4</a></li>
+        <li><a href="#">5</a></li>
+        <li>...</li>
+        <li><a href="#">17</a></li>
+        <li>
+        <a href="#" aria-label="Next">
+            <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+        </a>
+        </li>
+    </ul>
+</nav>