EXPO-91_9

templates/client/includes/accounts/current_user.html

@@ -68,7 +68,7 @@
             <header>
                 {# country and city #}
                 <div class="form-item-wrap"> <!-- 1 -->
-                    <div class="i-descr add_link_text ">
+                    <div class="i-descr add_link_text right">
                         <a class="e-btn " href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a>
                         <div class="add_link_text_text">{% trans 'Страну и город' %}<b>+10</b></div>
                     </div>

templates/client/includes/company/company_edit.html

@@ -64,8 +64,8 @@
         <div class="i-info">
             <header>
 <!--!-->
-				<div class="form-item-wrap">
+				<div class="form-item-wrap ">
-					<div class="i-descr add_link_text ">
+					<div class="i-descr add_link_text right">
 						<a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a>
 						<div class="add_link_text_text">{% trans 'город' %} <b>+5</b></div>
 					</div>

templates/client/static_client/css/main.css

@@ -12142,6 +12142,9 @@ hr + .rq-note {
 	.disable-inner:before{
 		display: none !important;
 	}
+	.right{
+		float: right;
+	}
 
 
 

templates/client/static_client/js/_modules/page.company.js

@@ -458,6 +458,10 @@ if (EXPO.company){
 					width: 'element',
 					placeholder:self.opt.selectBox[0].placeholder
 				});
+				$country.on("change", function () {
+					$city.val(0);
+					$city.select2("val", "");
+				});
 				/**
 				 * enable city <select/> when country is chosen
 				 */

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

@@ -466,25 +466,36 @@ if (EXPO.profile){
 			this.rating = new Rating(this.opt.rating);
 			this.forms = {};
 			$(function () {
-				var	$editables = $('.'+self.opt.editableClass);
+				var	$editables = $('.'+self.opt.editableClass),
+					$country = $('#'+self.opt.selectBox[0].id),
+					$city = $('#'+self.opt.selectBox[2].id);
 
 					$waiter = $('#wait-ajax').css({'z-index': '8012'});
 				/**
 				 * <selectbox> styling with 3-rd party libs
 				 */
-				$('#'+self.opt.selectBox[0].id).select2({
+				/**
+				 * select country
+				 */
+				$country.select2({
 					width: 'element'
 				});
-
+				$country.on("change", function () {
+					$city.val(0);
+					$city.select2("val", "");
+				});
+				/**
+				 * select theme
+				 */
 				$('#'+self.opt.selectBox[1].id).select2({
 					width: 'element',
 					placeholder: self.opt.selectBox[1].placeholder,
 					maximumSelectionSize: 3
 				});
 				/**
-				 * country selectbox
+				 * select city
 				 */
-				$('#'+self.opt.selectBox[2].id).select2({
+				$city.select2({
 					placeholder: self.opt.selectBox[2].placeholder,
 					width: 'element',
 					ajax: {