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

templates/client/includes/accounts/calendar_table.html

@@ -83,8 +83,12 @@
                                     {% if day.month == event.data_begin.month %}
                                         {% if day.day == event.data_begin.day %}
                                             <td class="c-cur" colspan="{{ event|duration }}">
+												{% comment %}
                                                 <div class="c-event active-event {% if day.month != event.data_end.month %}cont-next{% endif %}">
-                                                    <div class="ce-wrap">
+												{% endcomment %}
+													<div class="c-event active-event">
+
+													<div class="ce-wrap">
                                                         <h3><a href="{{ event.get_permanent_url }}">{{ event.name|safe }}</a></h3>
 
                                                         <div class="ce-info">

templates/client/includes/accounts/simple_user.html

@@ -18,11 +18,11 @@
             </aside>
             <div class="i-info">
                 <header>
-                    <div class="i-place">
-                    {% if member.profile.country %}
-                        {{ member.profile.country }}, {{ member.profile.city }}
-                    {% endif %}
-                    </div>
+					{% if member.profile.country or member.profile.city%}
+						<div class="i-place">
+						{% if member.profile.country %}{{ member.profile.country }},{% endif %}{% if member.profile.city %} {{ member.profile.city }}{% endif %}
+						</div>
+					{% endif %}
                     <div class="i-title">{{ member.get_full_name }}</div>
                 </header>
 

templates/client/includes/company/company_list.html

@@ -41,13 +41,15 @@
                     {% if company.get_events %}
 					<a class="button blue icon-list" href="/expositions/member-{{ company.url }}">{% trans 'события' %} ({{ company.get_events_number }})</a>
                     {% endif %}
+					{% comment %}
 					<a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
+					{% endcomment %}
 				</div>
 
 				<div class="cli-s-buttons">
-                    <!--
+					{% comment %}
 					<a class="button icon-msg" href="#">{% trans 'отправить сообщение' %}</a>
-					-->
+					{% endcomment %}
 				</div>
 			</div>
 

templates/client/static_client/css/select2.css

@@ -99,8 +99,8 @@
 
 .select2-dropdown-open.select2-drop-above .select2-choice,
 .select2-dropdown-open.select2-drop-above .select2-choices {
-	padding: 6px 29px 1px 2px;
-	/*border-bottom: 2px solid #ff6600;*/
+	padding: 6px 26px 1px 2px;
+	border-bottom: 2px solid #ff6600;
 	border-top: none;
 	-webkit-border-radius: 0 0 3px 3px;
 	-moz-border-radius: 0 0 3px 3px;

templates/client/static_client/css/vendor.css

@@ -2270,8 +2270,8 @@ Pagination Styles
 
 .select2-dropdown-open.select2-drop-above .select2-choice,
 .select2-dropdown-open.select2-drop-above .select2-choices {
-	padding: 6px 29px 1px 2px;
-	/*border-bottom: 2px solid #ff6600;*/
+	padding: 6px 26px 1px 2px;
+	border-bottom: 2px solid #ff6600;
 	border-top: none;
 	-webkit-border-radius: 0 0 3px 3px;
 	-moz-border-radius: 0 0 3px 3px;

templates/client/static_client/js/_modules/page.profile.calendar.js

@@ -84,12 +84,12 @@ if (EXPO.profile.calendar) {
 						stepsCount = allDays / onestep;
 						currenCount = allDays / currentDay;
 
-						result = stepsCount - Math.floor(currenCount);
+						result = Math.floor(stepsCount) - Math.floor(currenCount);
 
 
 						self.currentDay =currentDay;
 						if (result) {
-							result--;
+							//result--;
 							offset = onestep * result * width;
 						} else {