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

Conflicts:
	templates/client/includes/company/company_object.html

company/edit_views.py

@@ -25,7 +25,11 @@ class BaseView(ProfileInvalidView):
             form = self.form_class(self.request.POST, instance=company)
 
         company = form.save()
-        response = {'success': True, 'rating': company.rating}
+        try:
+            rating = company.rating
+        except AttributeError:
+            rating = company.master.rating
+        response = {'success': True, 'rating': rating}
         return HttpResponse(json.dumps(response), content_type='application/json')
 
 

templates/client/includes/company/company_object.html

@@ -23,22 +23,28 @@
 				</header>
 
 				<div class="i-area"><a href="#">{{ company.specialization }}</a></div>
+                {% with themes=company.theme.all %}
+                    <div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}">
+                        {% for th in themes %}
+                            <a href="/members/theme/{{ th.url }}">{{ th.name }}</a>{% ifnotequal forloop.counter themes|length %},{% endifnotequal %}
+                        {% endfor %}
+                    </div>
+                {% endwith %}
+
 
                 <hr />
-                {% if company.address %}
-                    {% with address=company.address %}
-                        {% include 'includes/address_block.html' %}
+                <div class="i-tags">
+                    {% with tags=company.tag.all %}
+                        {% for tag in tags %}
+                            <a href="{{ company.catalog }}tag/{{ tag.url }}">{{ tag.name }}</a>,
+                        {% endfor %}
                     {% endwith %}
 
-                    <hr />
-                {% endif %}
-
-                <div class="i-tags">
-                {% with obj=company filter=filter %}
-                    {% include 'includes/show_tags.html' %}
-                {% endwith %}
                 </div>
                 <hr />
+                {{ company.address_inf }}
+                <hr />
+
 
                 <div class="i-contacts clearfix">
 					<div class="ic-buttons">
@@ -168,17 +174,20 @@
 
 		    <div class="i-staff-list">
                 <ul>
-                {% for user in company.users.all %}
+                {% with users=company.users.all %}
+                {% for user in users %}
                 <li>
                     <a href="{{ user.get_permanent_url }}">
                         <div class="sl-item clearfix">
                             <div class="sl-pict">
-                                {% if user.get_avatar %}
 
+                                {% if user.profile.avatar %}
+                                    {% thumbnail user.profile.avatar "100x100" crop="center" as im %}
+                                        <img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
+                                    {% endthumbnail %}
                                 {% else %}
                                 <img src="{% static 'client/img/no-logo.png' %}" alt="" />
                                 {% endif %}
-                                <!--<img src="img/_del-temp/usr-1.jpg" alt="" />-->
                             </div>
                             <div class="sl-info">
                                 <div class="sl-info-wrap">
@@ -190,6 +199,7 @@
                     </a>
                 </li>
                 {% endfor %}
+                {% endwith %}
                 </ul>
             </div>