remotes/origin/PR-39
ArturBaybulatov 9 years ago
parent d7baf2c0d7
commit 619202555a
  1. 1
      templates/partials/base.html
  2. 15
      users/templates/user_profile_edit.html
  3. 19
      wallets/migrations/0015_auto_20160902_1904.py

@ -68,6 +68,7 @@
<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>

@ -33,7 +33,7 @@
</div>
<div class="menuUser upload-img disTab">
<div class="upload2 up-l1">
<input type="file" name="{{ form.avatar.html_name }}">
<input type="file" name="{{ form.avatar.html_name }}" class="-fileupload">
<p>Загрузить фотографию</p>
</div>
</div>
@ -165,3 +165,16 @@
</div>
</div>
{% endblock %}
{% block js_block %}
<script>
{# $('#fileupload').fileupload({#}
{# dataType: 'json',#}
{# done: function (e, data) {#}
{# $.each(data.result.files, function (index, file) {#}
{# $('<p/>').text(file.name).appendTo(document.body);#}
{# });#}
{# }#}
{# })#}
</script>
{% endblock %}

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2016-09-02 16:04
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('wallets', '0014_payfromscore'),
]
operations = [
migrations.AlterModelOptions(
name='payfromscore',
options={'ordering': ('-created_at',), 'verbose_name': 'Оплата со счета', 'verbose_name_plural': 'Оплата со счета'},
),
]
Loading…
Cancel
Save