mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EXPO-95-7

Browse Source
remotes/origin/1203
pavel 11 years ago
parent 875efcc81d
commit 5dbf7a8fb7
6 changed files with 94 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      templates/client/includes/company/company_edit.html
  2. 9
      templates/client/includes/company/company_object.html
  3. 10
      templates/client/static_client/css/main.css
  4. 2
      templates/client/static_client/css_min/main.min.css
  5. 58
      templates/client/static_client/js/_modules/page.company.js
  6. 2
      templates/client/static_client/js_min/_modules/page.company.min.js

32
templates/client/includes/company/company_edit.html
Unescape View File

@ -515,7 +515,15 @@
</div>
</div>
<dd class="static-value">{% if found_form.foundation.value %}{{ found_form.foundation.value }}{% else %}{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+5</b></div>{% endif %} </dd>
<dd class="static-value">
<span class="full-complete {% if found_form.foundation.value %}{% else %}hidden{% endif %}">
{% if found_form.foundation.value %}{{ found_form.foundation.value }}{% endif %}
</span>
<span class="not-complete {% if found_form.foundation.value %}hidden{% else %}{% endif %}">
{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+5</b></div>
</span>
</dd>
</div>
@ -528,7 +536,7 @@
<div class="e-form">
<div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div>
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/foundation/{{ company.url }}/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
@ -548,7 +556,14 @@
</div>
</div>
<dd class="static-value">{% if staff_form.staff_number.value %}{{ staff_form.staff_number.value }}{% else %}{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+5</b></div>{% endif %}</dd>
<dd class="static-value">
<span class="full-complete {% if staff_form.staff_number.value %}{% else %}hidden{% endif %}">
{% if staff_form.staff_number.value %}{{ staff_form.staff_number.value }}{% endif %}
</span>
<span class="not-complete {% if staff_form.staff_number.value %}hidden{% else %}{% endif %}">
{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+5</b></div>
</span>
</dd>
</div>
<div class="form-item-wrap">
@ -559,7 +574,7 @@
<div class="e-form">
<div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div>
<form class="clearfix update-profile-form" id="description_form" action="/company/update/foundation/{{ company.url }}/" method="post">{% csrf_token %}
<form class="clearfix update-profile-form" id="description_form" action="/company/update/description/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
@ -579,7 +594,14 @@
</div>
</div>
<dd class="static-value">{% if description_form.description.value %}{{ description_form.description.value }}{% else %}{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+5</b></div>{% endif %}</dd>
<dd class="static-value">
<span class="full-complete {% if description_form.description.value %}{% else %}hidden{% endif %}">
{% if description_form.description.value %}{{ description_form.description.value }}{% endif %}
</span>
<span class="not-complete {% if description_form.description.value %}hidden{% else %}{% endif %}">
{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+15</b></div>
</span>
</dd>
</div>

9
templates/client/includes/company/company_object.html
Unescape View File

@ -4,7 +4,7 @@
{% load thumbnail %}
{% block page_body %}
<div class="m-article">
<div class="m-article company-preview">
<div class="item-wrap clearfix">
<aside>
<div class="i-pict">
@ -48,9 +48,12 @@
<div class="i-contacts clearfix">
<div class="ic-buttons">
<!--
<div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
{% comment %}
<a class="button icon-msg" href="#">{% trans 'отправить сообщение' %}</a>
-->
{% endcomment %}
<ul class="soc-media-buttons">
{% if company.facebook %}
<li>

10
templates/client/static_client/css/main.css
Unescape View File

@ -13146,9 +13146,11 @@ hr + .rq-note {
vertical-align: middle;
margin-right: 3px;
}
.edit-profile.company .i-additional dl.add-info dd{
min-height: 19px;
.edit-profile.company .i-additional dl.add-info dd, .edit-profile.company .i-additional dl.add-info dt{
min-height: 24px;
line-height: 24px;
padding-top: 5px;
margin-bottom: 0;
}
.edit-profile .theme-wrap .label,
.edit-profile .theme-wrap .input{
@ -13167,7 +13169,9 @@ hr + .rq-note {
display: inline;
}
.company-preview .i-info .i-contacts .ic-buttons .soc-media-buttons{
margin-top: 12px;
}
/************************\
# about page /about/

2
templates/client/static_client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

58
templates/client/static_client/js/_modules/page.company.js
Unescape View File

@ -312,17 +312,31 @@ if (EXPO.company){
$input;
this.pullHandler = function (data) {
if (data.success){
var $fullComplete = $('.full-complete',this.$staticValue);
$input = $('#id_foundation');
currValue = $.trim($input.val());
this.$staticValue.text(currValue);
$fullComplete.text(currValue);
$('.p-editable').removeClass('pe-current');
this.refreshState();
}
};
this.ajaxPath = path;
this.refreshState = function () {
var $fullComplete = $('.full-complete',this.$staticValue),
$notComplete = $('.not-complete',this.$staticValue);
if($.trim($fullComplete.text()) == ''){
$fullComplete.addClass('hidden');
$notComplete.removeClass('hidden');
}else{
$fullComplete.removeClass('hidden');
$notComplete.addClass('hidden');
}
return false;
}
@ -332,15 +346,29 @@ if (EXPO.company){
$input;
this.pullHandler = function (data) {
if (data.success){
var $fullComplete = $('.full-complete',this.$staticValue);
$input = $('#id_staff_number');
currValue = $.trim($input.val());
this.$staticValue.text(currValue);
$fullComplete.text(currValue);
$('.p-editable').removeClass('pe-current');
this.refreshState();
}
};
this.ajaxPath = path;
this.refreshState = function () {
var $fullComplete = $('.full-complete',this.$staticValue),
$notComplete = $('.not-complete',this.$staticValue);
if($.trim($fullComplete.text()) == ''){
$fullComplete.addClass('hidden');
$notComplete.removeClass('hidden');
}else{
$fullComplete.removeClass('hidden');
$notComplete.addClass('hidden');
}
return false;
}
};
Forms.description_form = function (path) {
@ -348,8 +376,10 @@ if (EXPO.company){
$input = $('#id_description');
this.pullHandler = function (data) {
if (data.success){
var $fullComplete = $('.full-complete',this.$staticValue);
currValue = $.trim($input.val());
this.$staticValue.text(currValue);
$fullComplete.text(currValue);
$('.p-editable').removeClass('pe-current');
this.refreshState();
@ -357,6 +387,19 @@ if (EXPO.company){
};
this.ajaxPath = path;
this.refreshState = function () {
var $fullComplete = $('.full-complete',this.$staticValue),
$notComplete = $('.not-complete',this.$staticValue);
if($.trim($fullComplete.text()) == ''){
$fullComplete.addClass('hidden');
$notComplete.removeClass('hidden');
}else{
$fullComplete.removeClass('hidden');
$notComplete.addClass('hidden');
}
return false;
}
};
Forms.avatar_form = function (path) {
@ -415,12 +458,15 @@ if (EXPO.company){
* @param data -data object recieved from server
*/
this.pullHandler = function (data) {
var divider ='<span>, </span>';
if (data.success){
//todo: Назар должен возвращать json формат с url, именем каждого выбранного тега
// todo: сделать наполнение
this.$staticValue.html('');
for(var i=0; i < data.tags.length; i++){
this.$staticValue.html('');
this.$staticValue.append($("<a href='"+data.tags[i].url+"' target='_blank'>"+data.tags[i].text+"</a>"));
if(i != data.tags.length-1) {
this.$staticValue.append($(divider));
}
}
this.refreshState();
}

2
templates/client/static_client/js_min/_modules/page.company.min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save