From 875efcc81db68c89f505d7df16429d00b7386d1e Mon Sep 17 00:00:00 2001 From: pavel Date: Sun, 15 Feb 2015 16:28:33 +0000 Subject: [PATCH] EXPO-95-7b --- templates/client/includes/company/company_edit.html | 8 ++++---- .../client/static_client/js/_modules/page.company.js | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/templates/client/includes/company/company_edit.html b/templates/client/includes/company/company_edit.html index 067543a8..57d1ed3c 100644 --- a/templates/client/includes/company/company_edit.html +++ b/templates/client/includes/company/company_edit.html @@ -485,7 +485,7 @@
- +
Дополнительная информация
@@ -515,7 +515,7 @@
-
{% if found_form.foundation.value %}{{ found_form.foundation.value }}{% else %}{% trans 'Не заполнено' %}{% endif %}
+
{% if found_form.foundation.value %}{{ found_form.foundation.value }}{% else %}{% trans 'Не заполнено' %}{% endif %}
@@ -548,7 +548,7 @@ -
{% if staff_form.staff_number.value %}{{ staff_form.staff_number.value }}{% else %}{% trans 'Не заполнено' %}{% endif %}
+
{% if staff_form.staff_number.value %}{{ staff_form.staff_number.value }}{% else %}{% trans 'Не заполнено' %}{% endif %}
@@ -579,7 +579,7 @@
-
{% if description_form.description.value %}{{ description_form.description.value }}{% else %}{% trans 'Не заполнено' %}{% endif %}
+
{% if description_form.description.value %}{{ description_form.description.value }}{% else %}{% trans 'Не заполнено' %}{% endif %}
diff --git a/templates/client/static_client/js/_modules/page.company.js b/templates/client/static_client/js/_modules/page.company.js index b64b1c83..8de07a02 100644 --- a/templates/client/static_client/js/_modules/page.company.js +++ b/templates/client/static_client/js/_modules/page.company.js @@ -418,6 +418,10 @@ if (EXPO.company){ if (data.success){ //todo: Назар должен возвращать json формат с url, именем каждого выбранного тега // todo: сделать наполнение + for(var i=0; i < data.tags.length; i++){ + this.$staticValue.html(''); + this.$staticValue.append($(""+data.tags[i].text+"")); + } this.refreshState(); } }; @@ -425,12 +429,15 @@ if (EXPO.company){ this.ajaxPath = path; this.$input = $('#id_tag'); - this.$initial = $(".initial-position",this.$wrapper); this.refreshState = function () { + this.$label = $('.label', this.$editable); + this.$initial = $(".initial-position",this.$wrapper); this.formId = this.$form.attr("id"); if( $.trim(this.$input.val()) == ''){ + this.$form.detach().appendTo(this.$initial); + this.$label.detach().appendTo(this.$initial); this.$initial.removeClass("hidden"); this.$description.addClass("hidden"); @@ -438,6 +445,7 @@ if (EXPO.company){ }else{ if($('#'+this.formId, this.$editable).length < 0){ this.$form.detach().appendTo(this.$editable); + this.$label.detach().appendTo(this.$editable); } this.$editable.addClass("hidden");