expo-91-95 bugs diferent

templates/client/includes/accounts/simple_user.html

@@ -104,10 +104,17 @@
                     <div class="ish-title">{% trans 'Участие в событиях' %}</div>
 
                     <div class="ish-data">
-                        <span><a href="/user/{{ member.url }}/expositions/"><b>{{ member.get_expositions_number }}</b> в&nbsp;выставках</a></span>
+						{% if member.get_expositions_number > 0 %}
-                        <span><a href="/user/{{ member.url }}/conferences/"><b>{{ member.get_conferences_number }}</b> в&nbsp;конференциях</a></span>
+                        	<span><a href="/user/{{ member.url }}/expositions/"><b>{{ member.get_expositions_number }}</b> в&nbsp;выставках</a></span>
-                        <span><a href="/user/{{ member.url }}/seminars/"><b>{{ member.get_seminars_number }}</b> в&nbsp;семинарах</a></span>
+						{% endif %}
-                    </div>
+						{% if member.get_conferences_number > 0 %}
+                        	<span><a href="/user/{{ member.url }}/conferences/"><b>{{ member.get_conferences_number }}</b> в&nbsp;конференциях</a></span>
+						{% endif %}
+						{% if member.get_seminars_number > 0 %}
+                        	<span><a href="/user/{{ member.url }}/seminars/"><b>{{ member.get_seminars_number }}</b> в&nbsp;семинарах</a></span>
+						{% endif %}
+
+					</div>
                 </header>
                 <ul class="cat-list cl-exhibitions">
                 </ul>

templates/client/includes/company/company_edit.html

@@ -203,12 +203,12 @@
             {% endwith %}
 
             <hr />
-			<div class="form-item-wrap {% if address_form.address_inf %}hidden{% else %}{% endif %}">
+			<div class="form-item-wrap ">
-				<div class="i-descr add_link_text ">
+				<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>
 				</div>
-				<div class="ic-tel p-editable editable-wrap {% if address_form.address_inf %}{% else %}hidden{% endif %} required">
+				<div class="ic-tel p-editable editable-wrap {% if address_form.address_inf.value %}{% else %}hidden{% endif %} required">
 					<span id="static-address-value" class="static-value address">{{ address_form.address_inf.value }}&nbsp;</span>
 					<div class="edit-wrap">
 						<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
@@ -280,8 +280,8 @@
 
 							<div class="i-descr add_link_text add_link_text_medium soc-media-indent">
 
-								<a class="e-btn social not-complete no-refresh" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
+								<a class="e-btn social not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %} no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
-								<a class="e-btn social full-complete no-refresh" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
+								<a class="e-btn social full-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}{% else %}hidden{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
 
 								<ul class="soc-media-buttons soc-media-buttons1">
 									<li>
@@ -324,7 +324,7 @@
 
 								</ul>
 
-								<div class="add_link_text_text not-complete"><b>{% trans '+5 за каждый' %}</b></div>
+								<div class="add_link_text_text not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}"><b>{% trans '+5 за каждый' %}</b></div>
 							</div>
 							<div class="edit-wrap">
 								<div class="e-form">

templates/client/includes/company/company_object.html

@@ -101,7 +101,9 @@
                         {% endif %}
 					</div>
 				</div>
+				{% if company.foundation or company.staff_number or company.description %}
                 <hr />
+
                 <div class="i-additional">
 					<div class="ia-title">{% trans 'Дополнительная информация' %}</div>
 
@@ -123,30 +125,35 @@
 					</dl>
 
 				</div>
+				{% endif %}
 
-            </div>
+
+			</div>
         </div>
 
-		{% if company.get_expositions_number > 0 or company.get_conferences_number > 0 or company.get_seminars_number > 0 %}
-		<hr />
-		<div class="i-statistics">
-			<header class="clearfix">
-				<div class="ish-title">{% trans 'Участие в событиях' %}</div>
 
-				<div class="ish-data">
+		<div class="i-statistics">
-					{% if company.get_expositions_number > 0 %}
+			{% if company.get_expositions_number > 0 or company.get_conferences_number > 0 or company.get_seminars_number > 0 %}
-						<span><a href="/expositions/member-{{ company.url }}"><b>{{ company.get_expositions_number }}</b> в&nbsp;{% trans 'выставках' %}</a></span>
+			<hr />
-					{% endif %}
+				<header class="clearfix">
-					{% if company.get_conferences_number > 0 %}
+
-						<span><a href="/conferences/member-{{ company.url }}"><b>{{ company.get_conferences_number }}</b> в&nbsp;{% trans 'конференциях' %}</a></span>
+					<div class="ish-title">{% trans 'Участие в событиях' %}</div>
-					{% endif %}
+
-					{% if company.get_seminars_number > 0 %}
+					<div class="ish-data">
-						<span><a href="/seminars/member-{{ company.url }}"><b>{{ company.get_seminars_number }}</b> в&nbsp;{% trans 'семинарах' %}</a></span>
+						{% if company.get_expositions_number > 0 %}
-					{% endif %}
+							<span><a href="/expositions/member-{{ company.url }}"><b>{{ company.get_expositions_number }}</b> в&nbsp;{% trans 'выставках' %}</a></span>
+						{% endif %}
+						{% if company.get_conferences_number > 0 %}
+							<span><a href="/conferences/member-{{ company.url }}"><b>{{ company.get_conferences_number }}</b> в&nbsp;{% trans 'конференциях' %}</a></span>
+						{% endif %}
+						{% if company.get_seminars_number > 0 %}
+							<span><a href="/seminars/member-{{ company.url }}"><b>{{ company.get_seminars_number }}</b> в&nbsp;{% trans 'семинарах' %}</a></span>
+						{% endif %}
 
-				</div>
+					</div>
-			</header>
 
+				</header>
+			{% endif %}
             <ul class="cat-list cl-exhibitions">
             {% for event in company.get_events %}
                 <li class="cl-item">
@@ -193,7 +200,7 @@
             <a class="button more" href="/expositions/member-{{ company.url }}">{% trans 'Все события' %}</a>
             {% endif %}
         </div>
-		{% endif %}
+
         <hr />
         <div class="i-staff">
 			<div class="sect-title"><a href="#">{% trans 'Сотрудники' %}</a></div>

templates/client/static_client/css/main.css

@@ -13191,7 +13191,7 @@ hr + .rq-note {
 	.edit-profile .specialization .p-editable{
 		min-height: 27px;
 	}
-	.edit-profile .theme-form{
+	.edit-profile .theme-form select{
 		opacity: 0;
 	}
 	/************************\