EXPO-95 bugs diff

templates/client/includes/company/company_edit.html

@@ -153,11 +153,11 @@
             </header>
 
 			<div class="form-item-wrap specialization">
-				<div class="i-descr add_link_text  {% if spec_form.specialization %}hidden{% else %}{% endif %}">
+				<div class="i-descr add_link_text  {% if spec_form.specialization.value %}hidden{% else %}{% endif %}">
 					<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
 					<div class="add_link_text_text">{% trans 'краткое описание компании' %} <b>+20</b></div>
 				</div>
-				<div class="i-position p-editable editable-wrap {% if spec_form.specialization %}{% else %}hidden{% endif %} required">
+				<div class="i-position p-editable editable-wrap {% if spec_form.specialization.value %}{% else %}hidden{% endif %} required">
 					<span id="static-spec-value" class="static-value  min-height">{{ spec_form.specialization.value }}&nbsp;</span>
 					<div class="edit-wrap">
 						<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
@@ -203,7 +203,7 @@
             {% endwith %}
 
             <hr />
-			<div class="form-item-wrap ">
+			<div class="form-item-wrap mb-05em">
 				<div class="i-descr add_link_text {% if address_form.address_inf.value %}hidden{% else %}{% endif %}">
 					<a class="e-btn" href="javascript:void(0);" title=""> <i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
 					<div class="add_link_text_text">{% trans 'адрес компании' %} <b>+15</b></div>
@@ -237,7 +237,7 @@
 
             <div class="add_link_teg">
 				<div class="form-item-wrap">
-					<div class="i-tags  i-descr {% if company.tag.all %}hidden{% else %}{% endif %}">
+					<div class="i-tags  i-descr {% if company.tag.all|length > 0 %}{% else %}hidden{% endif %}">
 						<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
 						<p class="tags static-value">
                             {% with tags=company.tag.all %}
@@ -248,7 +248,7 @@
 						</p>
 					</div>
 					<!---->
-					<div class="editable-wrap {% if company.tag.all %}hidden{% else %}{% endif %}">
+					<div class="editable-wrap {% if company.tag.all|length > 0 %}hidden{% else %}{% endif %}">
 						<form class="inline-block update-profile-form" id="tag_form" action="/company/update/tag/{{ company.url }}/"  method="post">
 							{% csrf_token %}
 							<div class="tag-select">{{ tag_form.tag }}</div>

templates/client/includes/company/company_object.html

@@ -22,7 +22,9 @@
 					<div class="i-title">{{ company.name|safe }}</div>
 				</header>
 
-				<div class="i-area"><a href="#">{{ company.specialization|linebreaks }}</a></div>
+				<div class="i-area">
+					<a href="#">{{ company.specialization|linebreaks }}</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 %}
@@ -30,9 +32,9 @@
                         {% endfor %}
                     </div>
                 {% endwith %}
-
-
                 <hr />
+
+				{% if company.tag.all|length > 0 %}
 					<div class="i-tags">
 						{% with tags=company.tag.all %}
 							{% for tag in tags %}
@@ -42,11 +44,14 @@
 
 					</div>
 					<hr />
+				{% endif %}
+				{% if company.address_inf %}
 					{{ company.address_inf }}
 					<hr />
-
+				{% endif %}
 
                 <div class="i-contacts clearfix">
+					{% if company.facebook or company.linkedin or company.vk or company.twitter %}
 						<div class="ic-buttons">
 							<div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
 
@@ -77,6 +82,7 @@
 								{% endif %}
 							</ul>
 						</div>
+					{% endif %}
 
 					<div class="ic-links">
                         {% if company.phone %}
@@ -195,8 +201,10 @@
             <a class="button more" href="/expositions/member-{{ company.url }}">{% trans 'Все события' %}</a>
             {% endif %}
         </div>
-
+		{% if company.get_expositions_number > 0 or company.get_conferences_number > 0 or company.get_seminars_number > 0 %}
         	<hr />
+		{% endif %}
+
 		<div class="i-staff">
 			<div class="sect-title"><a href="#">{% trans 'Сотрудники' %}</a></div>
 

templates/client/static_client/css/main.css

@@ -12168,6 +12168,10 @@ hr + .rq-note {
 	.min-height{
 		min-height: 27px;
 	}
+	.mb-05em{
+		margin-bottom: .5em;
+	}
+
 
 
 
@@ -13051,9 +13055,6 @@ hr + .rq-note {
 	}
 	.edit-profile .hidden{
 		display: none;
-	}
-	.edit-profile .i-info .i-descr{
-		/*margin-top: 1em;*/
 	}
 	.edit-profile .i-info .e-btn{
 		margin-right: 0;
@@ -13176,6 +13177,7 @@ hr + .rq-note {
 	.add_link_teg .tags{
 		display: inline-block;
 		font-size: 14px;
+		margin-top: 0;
 	}
 	.add_link_teg .e-btn{
 		vertical-align: middle;