Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into mukhtar
Mukhtar
9 years ago
commit
c8b8e665f4
16 changed files with 483 additions and 65 deletions
@ -0,0 +1,45 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-09-15 17:56 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0031_merge'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.CreateModel( |
||||
name='ProjectWorkTypeSuggestion', |
||||
fields=[ |
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||
('name', models.CharField(max_length=255)), |
||||
('commentary', models.TextField(blank=True)), |
||||
('processed', models.BooleanField(default=False)), |
||||
('username', models.CharField(max_length=255)), |
||||
('email', models.CharField(max_length=255)), |
||||
], |
||||
options={ |
||||
'verbose_name': 'Предложение типов работ (проектов)', |
||||
'verbose_name_plural': 'Предложения типов работ (проектов)', |
||||
}, |
||||
), |
||||
migrations.AlterField( |
||||
model_name='answerfile', |
||||
name='file', |
||||
field=models.FileField(upload_to='projects/answer_files/'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='portfoliophoto', |
||||
name='img', |
||||
field=models.ImageField(upload_to='projects/portfolio/'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='projectfile', |
||||
name='file', |
||||
field=models.FileField(upload_to='projects/project_files/'), |
||||
), |
||||
] |
||||
@ -0,0 +1,20 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-09-16 12:34 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0032_auto_20160915_2056'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='projectworktypesuggestion', |
||||
name='email', |
||||
field=models.EmailField(max_length=254), |
||||
), |
||||
] |
||||
@ -0,0 +1,55 @@ |
||||
<div class="modal fade" id="projectWorkTypeSuggestionModal" tabindex="-1"> |
||||
<div class="modal-dialog" role="document"> |
||||
<div class="modal-content"> |
||||
<div class="modal-header"> |
||||
<button type="button" class="close" data-dismiss="modal"><span>×</span></button> |
||||
<h4 class="modal-title">Предложение нового типа работы</h4> |
||||
</div> |
||||
|
||||
<div class="modal-body"> |
||||
<form action="{% url 'projects:suggest-work-type' %}" method="POST" novalidate class="-project-work-type-suggestion-form"> |
||||
{% csrf_token %} |
||||
|
||||
<div>{{ work_type_suggestion_form.non_field_errors }}</div> |
||||
|
||||
<div class="row"> |
||||
<div class="col-xs-12 projectsBlock"> |
||||
<div>{{ work_type_suggestion_form.name.label }}</div> |
||||
<div>{{ work_type_suggestion_form.name }}</div> |
||||
<div class="-error -error-{{ work_type_suggestion_form.name.html_name }}"></div> |
||||
</div> |
||||
</div> |
||||
|
||||
<div class="row"> |
||||
<div class="col-xs-12 projectsBlock"> |
||||
<div>{{ work_type_suggestion_form.commentary.label }}</div> |
||||
<div>{{ work_type_suggestion_form.commentary }}</div> |
||||
<div class="-error -error-{{ work_type_suggestion_form.commentary.html_name }}"></div> |
||||
</div> |
||||
</div> |
||||
|
||||
<div class="row"> |
||||
<div class="col-xs-12 projectsBlock"> |
||||
<div>{{ work_type_suggestion_form.email.label }}</div> |
||||
<div>{{ work_type_suggestion_form.email }}</div> |
||||
<div class="-error -error-{{ work_type_suggestion_form.email.html_name }}"></div> |
||||
</div> |
||||
</div> |
||||
|
||||
<div class="row"> |
||||
<div class="col-xs-12 projectsBlock"> |
||||
<div>{{ work_type_suggestion_form.username.label }}</div> |
||||
<div>{{ work_type_suggestion_form.username }}</div> |
||||
<div class="-error -error-{{ work_type_suggestion_form.username.html_name }}"></div> |
||||
</div> |
||||
</div> |
||||
</form> |
||||
</div> |
||||
|
||||
<div class="modal-footer"> |
||||
<button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button> |
||||
<button type="button" class="btn btn-primary -action-button">Предложить</button> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
@ -0,0 +1,83 @@ |
||||
{% load staticfiles %} |
||||
{% load compress %} |
||||
|
||||
|
||||
<!doctype html> |
||||
<html> |
||||
<head> |
||||
<meta charset='utf-8'> |
||||
<meta http-equiv='X-UA-Compatible' content='IE=edge, chrome=1'> |
||||
<meta name='viewport' content='width=device-width, initial-scale=1'> |
||||
<!--<meta name='viewport' content='initial-scale=1.0, user-scalable=no, maximum-scale=1'>--> |
||||
|
||||
{% block head %}{% endblock %} |
||||
|
||||
<title>PROEKTON</title> |
||||
|
||||
{% compress css %} |
||||
<link rel='stylesheet' href='{% static "lib/jquery-ui/jquery-ui.css" %}'> |
||||
<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" %}'>#} |
||||
{# <link rel='stylesheet' href='{% static "lib/bootstrap-select/css/bootstrap-select.css" %}'>#} |
||||
{# <link rel='stylesheet' href='{% static "lib/select2/select2.css" %}'> <!-- Tmp -->#} |
||||
{# <link rel='stylesheet' href='{% static "css/swiper.min.css" %}'>#} |
||||
{# <link rel='stylesheet' href='{% static "lib/jquery.fileupload/css/jquery.fileupload.css" %}'>#} |
||||
{# <link rel='stylesheet' href='{% static "js/magnific-popup.css" %}'>#} |
||||
{# <link rel="stylesheet" href='{% static "lib/jquery-jgrowl/jquery.jgrowl.min.css" %}'>#} |
||||
|
||||
{% block head_css %}{% endblock %} |
||||
|
||||
{# <link rel='stylesheet' href='{% static "css/main.css" %}'>#} |
||||
{# <link rel='stylesheet' href='{% static "css/extra.css" %}'> <!-- Our additional CSS -->#} |
||||
<link rel='stylesheet' href='{% static "css/dev-colors.css" %}'> <!-- Dev-time only, temporary!!! --> |
||||
{% endcompress %} |
||||
</head> |
||||
|
||||
<body> |
||||
{% if messages %} |
||||
{% for message in messages %} |
||||
<div class="c" |
||||
style="position: relative; padding: 10px; margin-bottom: 6px; z-index: 100">{{ message|safe }}</div> |
||||
{% endfor %} |
||||
{% endif %} |
||||
|
||||
<div ondblclick="$(this).css('display', 'none')" style="position: absolute; left: 0; bottom: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50"> |
||||
{{ request.user }}<br> |
||||
|
||||
{% if request.user.is_authenticated %} |
||||
<b>PK:</b> {{ request.user.pk }}<br> |
||||
<b>Groups:</b> {{ request.user.groups.all }} |
||||
{% endif %} |
||||
</div> |
||||
|
||||
{% block content %}{% endblock %} |
||||
|
||||
<script src='{% static "lib/lodash/lodash.js" %}'></script> |
||||
<script src='{% static "lib/lodash/lodash.fp.js" %}'></script> |
||||
|
||||
<script src='{% static "js/jquery-2.2.3.min.js" %}'></script> |
||||
<script src='{% static "lib/jquery-ui/jquery-ui.js" %}'></script> |
||||
<script src='{% static "lib/jquery-ui/i18n/datepicker-ru.js" %}'></script> <!-- jQueryUI Datepicker i18n --> |
||||
<script src='{% static "js/bootstrap.min.js" %}'></script> |
||||
<script src='{% static "lib/bootstrap-select/js/bootstrap-select.js" %}'></script> |
||||
<script src='{% static "lib/select2/select2.js" %}'></script> |
||||
<script src='{% static "lib/urijs/URI.min.js" %}'></script> |
||||
|
||||
{#<script src='{% static "lib/jquery.fileupload/js/vendor/jquery.ui.widget.js" %}'></script>#} |
||||
{#<script src='{% static "lib/jquery.fileupload/js/jquery.iframe-transport.js" %}'></script>#} |
||||
{#<script src='{% static "lib/jquery.fileupload/js/jquery.fileupload.js" %}'></script>#} |
||||
{#<script src='{% static "lib/jquery.fileupload/js/jquery.fileupload-process.js" %}'></script>#} |
||||
{##} |
||||
{#<script src='{% static "js/jquery.magnific-popup.min.js" %}'></script>#} |
||||
{#<script src='{% static "lib/jquery.cookie/jquery.cookie.min.js" %}'></script>#} |
||||
{#<script src='{% static "lib/jquery-jgrowl/jquery.jgrowl.min.js" %}'></script>#} |
||||
|
||||
<script src='{% static "my-libs.js" %}'></script> |
||||
|
||||
{#<script src='{% static "js/main.js" %}'></script> <!-- Файл верстальщика -->#} |
||||
<script src='{% static "index.js" %}'></script> <!-- Файл программистов --> |
||||
|
||||
{% block js_block %}{% endblock %} |
||||
</body> |
||||
</html> |
||||
@ -0,0 +1,26 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-09-15 17:56 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
import sorl.thumbnail.fields |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('work_sell', '0014_merge'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='picture', |
||||
name='file', |
||||
field=models.ImageField(upload_to='worksell/pictures/'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='worksellphoto', |
||||
name='img', |
||||
field=sorl.thumbnail.fields.ImageField(upload_to='worksell/worksell/'), |
||||
), |
||||
] |
||||
Loading…
Reference in new issue