multiselect for tags ready

templates/client/includes/company/company_edit.html

@@ -30,12 +30,12 @@
 								<div class="ef-body">
 
 									<div class="epfl">
-										<label>{{ logo_form.logo.label }}</label>
+										<label>{{ avatar_form.avatar.label }}</label>
 										<div class="epf-field">
 											<div class="input-file clearfix">
 												<div class="button icon-clip">{% trans 'выберите файл' %}</div>
 												<div class="file-text placehlder">{% trans 'Файл не выбран' %}</div>
-												<div class="if-field-wrap"><input id="id_logo" type="file" name="logo" /></div>
+												<div class="if-field-wrap"><input id="id_avatar" type="file" name="avatar" /></div>
 											</div>
 										</div>
 									</div>
@@ -228,11 +228,12 @@
             <hr />
 
             <div class="add_link_teg">
-				<form  id="tag_form" action="/company/update/tag/{{ company.url }}/"  method="post">
+
+				<form class="inline-block" id="tag_form" action="/company/update/tag/{{ company.url }}/"  method="post">
 					{% csrf_token %}
 					<div class="tag-select">{{ tag_form.tag }}</div>
 				</form>
-                <b>+5</b>
+                <b class="inline-block label">+5 {% trans 'за каждый' %}</b>
             </div>
 
             <div class="clear"></div>

templates/client/static_client/css/main.css

@@ -12045,6 +12045,10 @@ hr + .rq-note {
 		background: #dbdbdb; /* Old browsers */
 
 	}
+	.inline-block{
+		display: inline-block;
+		vertical-align: top;
+	}
 
 
 
@@ -12897,6 +12901,15 @@ hr + .rq-note {
 	.edit-profile .social .e-form .err:before{
 		margin-right: 9px;
 	}
+	.edit-profile .add_link_teg .select2-input{
+		font-size: 36px !important;
+		line-height: 36px !important;
+		font-size: 16px !important;
+	}
+	.edit-profile .add_link_teg .label{
+		float: none;
+		margin-left: 12px;
+	}
 
 /************************\
 # страница редактирования профиля

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

@@ -449,7 +449,7 @@ if (EXPO.company){
 
 				});
 
-				//$('#'+self.opt.selectBox[2].id).attr('data-predifined','[{"id":"1128","text":"тег1"},{"id":"3365","text":"тег2"}]');
+				$('#'+self.opt.selectBox[2].id).val('0');
 				$('#'+self.opt.selectBox[2].id).select2({
 					placeholder: self.opt.selectBox[2].placeholder,
 					width: '368px',
@@ -487,9 +487,13 @@ if (EXPO.company){
 						console.log(element);
 						var data = [],
 							dataObjArr;
+						element.val('');
 						if($.trim(element.attr('data-predifined')) != '' && $.trim(element.attr('data-predifined')) != '[]'){
 							dataObjArr = JSON.parse(element.attr('data-predifined'));
 							callback(dataObjArr);
+						}else{
+							$('#tag_form .select2-input').width(336).addClass('select2-default').val(self.opt.selectBox[2].placeholder);
+
 						}
 
 					}
@@ -511,15 +515,15 @@ if (EXPO.company){
 								type: 'POST',
 								url: $form.attr('action'),
 								data:dataToSend,
-								processData: false,
-								contentType: false,
 								success: function(data) {
 									afterAJAX(data);
 									$('#wait-ajax').fadeOut();
 								}
 							});
 						};
-					doAJAX(new FormData($form.eq(0) ));
+					doAJAX($form.serialize());
+					$('#wait-ajax').show();
+
 					console.log('change complete');
 					console.log(e.val);
 				});