Mukhtar
10 years ago
parent
381a86982e
commit
bcdd5707a6
12 changed files with 829 additions and 492 deletions
@ -0,0 +1,32 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.6 on 2016-05-30 13:55 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.conf import settings |
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
import django.utils.timezone |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0011_auto_20160525_1526'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterModelOptions( |
||||
name='order', |
||||
options={'verbose_name': 'Заказ', 'verbose_name_plural': 'Заказы'}, |
||||
), |
||||
migrations.AddField( |
||||
model_name='project', |
||||
name='created', |
||||
field=models.DateTimeField(default=django.utils.timezone.now), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='portfolio', |
||||
name='user', |
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='portfolio', to=settings.AUTH_USER_MODEL), |
||||
), |
||||
] |
||||
@ -0,0 +1,279 @@ |
||||
{% extends "base.html" %} |
||||
{#{% block content %}#} |
||||
|
||||
|
||||
{#{% endblock %}#} |
||||
{% block content %} |
||||
<div class="container mainScore"> |
||||
<div class="row"> |
||||
<div class="col-lg-12"> |
||||
<p class="titleScore">{{ object }}</p> |
||||
</div> |
||||
<div class="doneBlock disTab"> |
||||
<div class="triangle1"></div> |
||||
<div class="col-lg-4"> |
||||
<a href="#" class="aLinkExe"><div class="imgExecutor"> |
||||
<img src="img/profile.jpg" alt="execitor-image"> |
||||
</div></a> |
||||
<p class="nameExecutor"> |
||||
<a href="#">{{ object.get_full_name }}</a> |
||||
</p> |
||||
<p class="navv2">На сайте {{ object.user.created }}</p> |
||||
<ul class="rettList restList3"> |
||||
<li> |
||||
<a href="javascript:void(0)">Отзывы: |
||||
<span> + 385</span> |
||||
<small> 0</small> |
||||
<mark> - 0</mark> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<div class="col-lg-3 col-lg-offset-1"> |
||||
<div class="dashedCol4 dashedCol44 dashedColColor"> |
||||
<p class="specUser"> |
||||
Специализации: |
||||
</p> |
||||
|
||||
<div class="insetSpec"> |
||||
<span>Интерьеры</span> |
||||
</div> |
||||
<div class="insetSpec"> |
||||
<span>Визуализация/3D</span> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-4 retts"> |
||||
<ul class="desListPro"> |
||||
<li> |
||||
13.0.2016 |
||||
</li> |
||||
<li> |
||||
Техническое сопровождение |
||||
</li> |
||||
</ul> |
||||
<div class="sroUser sroExecutor sroPro"> |
||||
<div class="iconSRO"></div> |
||||
<p>Есть допуск СРО</p> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="infoProjectBlock disTab"> |
||||
<div class="triangle2"></div> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<ul class="listProjectIn"> |
||||
<li> |
||||
<span>Местоположение:</span> Россия, Москва |
||||
</li> |
||||
<li> |
||||
<span>Классификация здания:</span> Коттедж |
||||
</li> |
||||
<li> |
||||
<span>Вид строительства:</span> Новое |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<p class="textProIn"> |
||||
{{ object.text }} |
||||
</p> |
||||
</div> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<a href="javascript:void(0)" class="linkProIn linkProIn1"> |
||||
Редактировать |
||||
</a> |
||||
<a href="javascript:void(0)" class="linkProIn linkProIn2"> |
||||
снять с публикачии |
||||
</a> |
||||
</div> |
||||
</div> |
||||
<div class="exBigBlock disTab"> |
||||
<div class="col-lg-12"> |
||||
<p class="titleEx">Исполнители</p> |
||||
</div> |
||||
<div class="col-lg-12 exButton"> |
||||
<div class="btn-group" role="group" aria-label="..."> |
||||
<button type="button" class="btn btn-default"> |
||||
Новые <span>+7</span> |
||||
</button> |
||||
<button type="button" class="btn btn-default"> |
||||
Кандидаты <span>7</span> |
||||
</button> |
||||
<button type="button" class="btn btn-default"> |
||||
Отказал <span>7</span> |
||||
</button> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-12 compareBlock"> |
||||
<div class="col-lg-2 col-lg-offset-5"> |
||||
<p>Сравнить кандидатов</p> |
||||
</div> |
||||
</div> |
||||
{% if perms.projects.add_answer %} |
||||
|
||||
<h4>Оставить ответ</h4> |
||||
<form method="post" action=""> |
||||
{{ form.errors }} |
||||
{% csrf_token %} |
||||
|
||||
{% for field in form %} |
||||
<div class="row"> |
||||
{{ field.label }} |
||||
{{ field }} |
||||
</div> |
||||
{% endfor %} |
||||
<input type="submit" value="Создать" /> |
||||
</form> |
||||
{% endif %} |
||||
<div class="col-lg-12 exNew"> |
||||
<p>Новые исполнители</p> |
||||
</div> |
||||
<div class="candidateBlock disTab"> |
||||
|
||||
{% for answer in object.answers.all %} |
||||
<div class="candidate"> |
||||
<div class="col-lg-4"> |
||||
<a href="#" class="aLinkExe"><div class="imgExecutor"> |
||||
<img src="img/profile.jpg" alt="execitor-image"> |
||||
</div></a> |
||||
<p class="nameExecutor"> |
||||
<a href="#">Иванов Петр Иванович [ivanov_petr]</a> |
||||
</p> |
||||
<p class="navv2">На сайте 8 лет и 3 месяца</p> |
||||
<div class="statusUser">Свободен</div> |
||||
</div> |
||||
<div class="col-lg-3 retts"> |
||||
<ul class="rettList restList2"> |
||||
<li>Рейтинг: <span> 1245</span></li> |
||||
<li>Безопасные сделки: <span> 5</span></li> |
||||
<li> |
||||
<a href="javascript:void(0)">Отзывы: |
||||
<span> + 385</span> |
||||
<small> 0</small> |
||||
<mark> - 0</mark> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
<div class="sroUser sroExecutor"> |
||||
<div class="iconSRO"></div> |
||||
<p>Есть допуск СРО</p> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-2 listCens"> |
||||
<p>Цена: |
||||
<span> {{ answer.cost }}</span> |
||||
<i class="fa fa-rub"></i> |
||||
</p> |
||||
<p> |
||||
Срок: <span>{{ answer.term }} {{ answer.term_type }}</span> |
||||
</p> |
||||
<p>Опубликован:{{ answer.created }}</p> |
||||
</div> |
||||
<div class="col-lg-3 retts"> |
||||
<a href="javascript:void(0)" class="candLink candLink1"> |
||||
Кандидат |
||||
</a> |
||||
<a href="javascript:void(0)" class="candLink candLink2"> |
||||
предложить проект |
||||
</a> |
||||
<a href="javascript:void(0)" class="candLink candLink3"> |
||||
отказ |
||||
</a> |
||||
</div> |
||||
<div class="gallMini disTab"> |
||||
<div class="col-lg-3"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="commBlock44 disTab"> |
||||
<div class="comm44 disTab"> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<p class="nameComm"> |
||||
Иванов Петр Иванович |
||||
</p> |
||||
<span class="dateComm44"> |
||||
13.0.2016 / 21:05 |
||||
</span> |
||||
<div class="stars box-sizing"> |
||||
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span> |
||||
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span> |
||||
<span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span> |
||||
<span class="glyphicon glyphicon-star" aria-hidden="true"></span> |
||||
<span class="glyphicon glyphicon-star" aria-hidden="true"></span> |
||||
</div> |
||||
<p class="textComm44"> |
||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. |
||||
</p> |
||||
</div> |
||||
</div> |
||||
<div class="comm44 disTab"> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<p class="nameComm nameCommAct"> |
||||
Иванов Петр Иванович |
||||
</p> |
||||
<span class="dateComm44"> |
||||
13.0.2016 / 21:05 |
||||
</span> |
||||
<p class="textComm44"> |
||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. |
||||
</p> |
||||
<a href="javascript:void(0)" class="answerComm"> |
||||
Ответить |
||||
</a> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
</div> |
||||
<div class="col-lg-12 pagin"> |
||||
<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> |
||||
</div> |
||||
|
||||
{% endblock %} |
||||
@ -1,13 +1,14 @@ |
||||
{% load staticfiles %} |
||||
<!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> |
||||
</head> |
||||
<body> |
||||
{% extends '_layout.html' %} |
||||
{% block content %} |
||||
|
||||
</body> |
||||
</html> |
||||
<h1>Angular setup |
||||
|
||||
<form class="form-horizontal" ng-controller="dropdownCtrl"> |
||||
<div class="form-group"> |
||||
<label for="spec1" class="col-sm-2">Spec1</label> |
||||
<select ng-model="spec1"> |
||||
<option value="">-- Choose Country --</option> |
||||
</select> |
||||
</div> |
||||
</form> |
||||
{% endblock %} |
||||
|
||||
@ -1,24 +1,22 @@ |
||||
{% extends 'base.html' %} |
||||
{% block content %} |
||||
<h1>Вход на сайт</h1> |
||||
<form method="post" action=""> |
||||
{% csrf_token %} |
||||
{{ form.errors }} |
||||
<div class="form-group row"> |
||||
<div class="col-md-6"> |
||||
<input type="email" name="{{ form.username.name }}" class="col-xs-6 form-control" id="inputEmail" placeholder="Электронная почта"> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-12"> |
||||
<p class="titleScore">Вход на сайт</p> |
||||
</div> |
||||
<div class="form-regestration"> |
||||
<form method="post">{% csrf_token %} |
||||
<div class="col-lg-12 select-reg"> |
||||
<input type="text" name="{{ form.username.name }}" class="box-sizing email-reg" placeholder="Электронная почта"> |
||||
</div> |
||||
<div class="col-lg-12 select-reg"> |
||||
<input type="password" name="{{ form.password.name }}" class="box-sizing pass-reg" placeholder="Пароль"> |
||||
</div> |
||||
<div class="col-lg-12 select-reg"> |
||||
<button class="reg-sub">Вход</button> |
||||
</div> |
||||
|
||||
<div class="form-group row"> |
||||
<div class="col-md-6"> |
||||
<input type="password" name="{{ form.password.name }}" class="col-xs-6 form-control" id="inputEmail" placeholder="Пароль"> |
||||
</div> |
||||
</div> |
||||
</form> |
||||
|
||||
{# {{ form.as_p }}#} |
||||
</div> |
||||
|
||||
<input type="submit" value="Вход" /> |
||||
<input type="hidden" name="next" value="{{ next }}" /> |
||||
</form> |
||||
{% endblock %} |
||||
{% endblock %} |
||||
|
||||
@ -1,14 +1,46 @@ |
||||
{% extends 'base.html' %} |
||||
{% block content %} |
||||
<h1>Регистрация</h1> |
||||
<form action="" method="post"> |
||||
{% csrf_token %} |
||||
{% for field in form %} |
||||
<div class="row"> |
||||
{{ field.label }} |
||||
{{ field }} |
||||
</div> |
||||
{% endfor %} |
||||
<input type="submit" value="Зарегистрировать"> |
||||
</form> |
||||
<div class="col-lg-12"> |
||||
<p class="titleScore">Регистрация</p> |
||||
</div> |
||||
<div class="form-regestration"> |
||||
<form method="post">{% csrf_token %} |
||||
<div class="col-lg-12 select-reg polsF1"> |
||||
<select class="selectpicker3"> |
||||
<option>Выберете вашу роль</option> |
||||
<option>Исполнитель</option> |
||||
<option>Заказчик</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-12 select-reg"> |
||||
<input type="text" name="{{ form.email.name }}" class="box-sizing email-reg" placeholder="Электронная почта"> |
||||
</div> |
||||
<div class="col-lg-12 select-reg"> |
||||
<input type="password" name="{{ form.password.name }}" class="box-sizing pass-reg" placeholder="Пароль"> |
||||
</div> |
||||
<div class="col-lg-12 select-reg"> |
||||
<button class="reg-sub">Зарегистрироваться</button> |
||||
</div> |
||||
<div class="col-lg-12 select-reg"> |
||||
<div class="check-reg"> |
||||
<label><input type="checkbox" name="check-reg"><span></span></label> |
||||
<p>Регистрируясь, я подтверждаю свое согласие у условиями <a href="#">пользавательского соглашения</a></p> |
||||
</div> |
||||
</div> |
||||
</form> |
||||
<div class="col-lg-12 select-reg"> |
||||
<a href="#" class="have-ac">Я уже зарегистрирован на ресурсе</a> |
||||
</div> |
||||
</div> |
||||
{#<h1>Регистрация</h1>#} |
||||
{# <form action="" method="post">#} |
||||
{# {% csrf_token %}#} |
||||
{# {% for field in form %}#} |
||||
{# <div class="row">#} |
||||
{# {{ field.label }}#} |
||||
{# {{ field }}#} |
||||
{# </div>#} |
||||
{# {% endfor %}#} |
||||
{# <input type="submit" value="Зарегистрировать">#} |
||||
{# </form>#} |
||||
{% endblock %} |
||||
|
||||
Loading…
Reference in new issue