Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

templates/client/includes/company/company_edit.html

@@ -1,6 +1,7 @@
 {% load static %}
 {% load i18n %}
 {% load template_filters %}
+{% load thumbnail %}
 
 <div class="m-article edit-profile">
     <div class="item-wrap clearfix">
@@ -18,15 +19,15 @@
 				<div class="i-pict p-editable editable-wrap hidden">
 
 					<div id="pick-block" class="pic_block">
-						<img class="user-avatar {% if company.get_logo %}{% else %}no-image{% endif %}" src="{% if company.get_logo %}{{ company.get_logo.file_path.url }}
+                        {% thumbnail company.logo "100x100" crop="center" as im %}
-                              {% else %}{% static 'client/img/no-logo.png' %} {% endif %}" width="100" height="100"/>
+                            <img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
-
+                        {% endthumbnail %}
 
 					</div>
 					<div class="edit-wrap">
 						<a class="e-btn " href="#">{% trans 'редактировать' %}</a>
 						<div class="e-form">
-							<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form" action="" method="post">{% csrf_token %}
+							<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form" action="/company/update/logo/{{ company.url }}/" method="post">{% csrf_token %}
 								<div class="ef-body">
 
 									<div class="epfl">