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

EXPO_91-6

Browse Source
remotes/origin/1203
pavel 11 years ago
parent 07448bb78b
commit 7011f2a2fb
9 changed files with 78 additions and 71 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. 110
      templates/client/includes/company/company_edit.html
  2. 3
      templates/client/static_client/css/main.css
  3. 2
      templates/client/static_client/css_min/main.min.css
  4. 18
      templates/client/static_client/js/_modules/block.common.js
  5. 8
      templates/client/static_client/js/_modules/page.company.js
  6. 2
      templates/client/static_client/js/_modules/page.profile.js
  7. 2
      templates/client/static_client/js_min/_modules/block.common.min.js
  8. 2
      templates/client/static_client/js_min/_modules/page.company.min.js
  9. 2
      templates/client/static_client/js_min/_modules/page.profile.min.js

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

@ -9,14 +9,14 @@
<aside>
<!--!!-->
<div class="form-item-wrap">
<div class=" avatar-btn i-pict i-descr">
<div class=" avatar-btn i-pict i-descr {% if company.logo %}hidden{% else %}{% endif %}">
<a class="add_pic_block" title="">
<span class="fa fa-plus-circle">&nbsp;</span>
<i>{% trans 'Добавить лого' %}</i>
<b>+20</b>
</a>
</div>
<div class="i-pict p-editable editable-wrap hidden">
<div class="i-pict p-editable editable-wrap {% if company.logo %}{% else %}hidden{% endif %}">
<div id="pick-block" class="pic_block">
{% if company.logo %}
@ -29,7 +29,7 @@
</div>
<div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form" action="/company/update/logo/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -51,7 +51,7 @@
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -63,18 +63,18 @@
<div class="i-info">
<header>
<div class="form-item-wrap ">
<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="i-descr add_link_text right {% if home_form.instance.country %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a>
<div class="add_link_text_text">{% trans 'город' %} <b>+5</b></div>
</div>
<div class="i-place p-editable editable-wrap hidden">
<div class="i-place p-editable editable-wrap {% if home_form.instance.country %}{% else %}hidden{% endif %}">
<span class="static-value">
<span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
</span>
<div class="edit-wrap e-left">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="home_form" action="/company/update/home/{{ company.url }}/" method="post">{% csrf_token %}
@ -103,7 +103,7 @@
</div>
<a class="ef-close" href="#">закрыть</a>
<a class="ef-close" href="javascript:void(0);">закрыть</a>
</form>
</div>
</div>
@ -116,15 +116,16 @@
</a>
</div>
<div class="form-item-wrap">
<div class="i-descr add_link_text ">
<a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a>
<div class="i-descr add_link_text {% if name_form.name.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a>
<div class="add_link_text_text">{% trans 'название компании' %}<b>+10</b></div>
</div>
<div class="i-title p-editable editable-wrap hidden required">
<div class="i-title p-editable editable-wrap {% if name_form.name.value %}{% else %}hidden{% endif %} required">
<span id="static-name-value" class="static-value">{{ name_form.name.value }}</span>
<div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="#">редактировать</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">редактировать</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/company/update/name/{{ company.url }}/" method="post">{% csrf_token %}
@ -144,7 +145,7 @@
</div>
</form>
<a class="ef-close" href="#">закрыть</a>
<a class="ef-close" href="javascript:void(0);">закрыть</a>
</div>
</div>
</div>
@ -152,14 +153,14 @@
</header>
<div class="form-item-wrap specialization">
<div class="i-descr add_link_text ">
<a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="i-descr add_link_text {% if spec_form.specialization %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'краткое описание компании' %} <b>+20</b></div>
</div>
<div class="i-position p-editable editable-wrap hidden required">
<div class="i-position p-editable editable-wrap {% if spec_form.specialization %}{% else %}hidden{% endif %} required">
<span id="static-spec-value" class="static-value min-height">{{ spec_form.specialization.value }}&nbsp;</span>
<div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/{{ company.url }}/" method="post">{% csrf_token %}
@ -179,7 +180,7 @@
</div>
</form>
<a class="ef-close" href="#">закрыть</a>
<a class="ef-close" href="javascript:void(0);">закрыть</a>
</div>
</div>
</div>
@ -191,7 +192,7 @@
</div>
<div class="input">
<div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}">
<form class="inline-block" id="theme_form" action="/company/update/theme/{{ company.url }}/" method="post">
<form class="inline-block theme-form" id="theme_form" action="/company/update/theme/{{ company.url }}/" method="post">
{% csrf_token %}
<div class="tag-select">{{ theme_form.theme }}</div>
</form>
@ -202,15 +203,15 @@
{% endwith %}
<hr />
<div class="form-item-wrap">
<div class="form-item-wrap {% if address_form.address_inf %}hidden{% else %}{% endif %}">
<div class="i-descr add_link_text ">
<a class="e-btn" href="#" title=""> <i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn" href="javascript:void(0);" title=""> <i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'адрес компании' %} <b>+15</b></div>
</div>
<div class="ic-tel p-editable editable-wrap hidden required">
<div class="ic-tel p-editable editable-wrap {% if address_form.address_inf %}{% else %}hidden{% endif %} required">
<span id="static-address-value" class="static-value address">{{ address_form.address_inf.value }}&nbsp;</span>
<div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="address_form" action="/company/update/address/{{ company.url }}/" method="post">{% csrf_token %}
@ -226,7 +227,7 @@
</div>
</form>
<a class="ef-close" href="#">закрыть</a>
<a class="ef-close" href="javascript:void(0);">закрыть</a>
</div>
</div>
@ -234,12 +235,10 @@
</div>
<hr />
<div class="add_link_teg">
<div class="form-item-wrap">
<div class="i-tags hidden i-descr">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="i-tags i-descr {% if company.tag.all %}hidden{% else %}{% endif %}">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<p class="tags static-value">
{% with tags=company.tag.all %}
{% for tag in tags %}
@ -249,10 +248,9 @@
</p>
</div>
<!---->
<div class="editable-wrap">
<div class="editable-wrap {% if company.tag.all %}hidden{% else %}{% endif %}">
<form class="inline-block update-profile-form" id="tag_form" action="/company/update/tag/{{ company.url }}/" method="post">
{% csrf_token %}
<!-- todo: в data-predifined добавить url-->
<div class="tag-select">{{ tag_form.tag }}</div>
</form>
<b class="inline-block label">+5 {% trans 'за каждый' %}</b>
@ -282,8 +280,8 @@
<div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn social not-complete no-refresh" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social full-complete no-refresh" href="#" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<a class="e-btn social not-complete no-refresh" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social full-complete no-refresh" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<ul class="soc-media-buttons soc-media-buttons1">
<li>
@ -370,7 +368,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -382,15 +380,15 @@
<div class="ic-links ic-links_indent dd_width_5">
<div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium">
<a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="i-descr add_link_text add_link_text_medium {% if phone_form.phone.value|phone %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'номер телефона' %} <b>+15</b></div>
</div>
<div class="ic-tel p-editable editable-wrap hidden">
<div class="ic-tel p-editable editable-wrap {% if phone_form.phone.value|phone %}{% else %}hidden{% endif %}">
<span id="static-phone-value" class="static-value">{{ phone_form.phone.value|phone }}</span>
<div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -406,25 +404,25 @@
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
</div>
<div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium">
<a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="i-descr add_link_text add_link_text_medium {% if email_form.email.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'email' %} <b>+15</b></div>
</div>
<div class=" p-editable editable-wrap hidden required">
<div class=" p-editable editable-wrap {% if email_form.email.value %}{% else %}hidden{% endif %} ">
<div class="ic-mail add_indent ">
<a id="static-email-value" class="icon-mail static-value" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a>
</div>
<div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="email_form" action="/company/update/email/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -440,7 +438,7 @@
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -448,17 +446,17 @@
<div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium">
<a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="i-descr add_link_text add_link_text_medium {% if web_page_form.web_page.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'сайт' %} <b>+5</b></div>
</div>
<div class="ic-site p-editable editable-wrap hidden">
<div class="ic-site p-editable editable-wrap {% if web_page_form.web_page.value %}{% else %}hidden{% endif %}">
<a id="static-web-page-value" class="icon-ext-link static-value website" href="{{ web_page_form.web_page.value }}" target="_blank">
{{ web_page_form.web_page.value }}
</a>
<div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/{{ company.url }}/" method="post">{% csrf_token %}
@ -475,7 +473,7 @@
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -492,7 +490,7 @@
<!-- !!! -->
<dl class="add-info">
<div class="form-item-wrap">
<dt><a class="e-btn fa fa-pencil-square-o" href="#" title="">{% trans 'Добавить' %}</a>{% trans 'Год основания' %}:</dt>
<dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'Год основания' %}:</dt>
<div class="p-editable ic-tel ic-links editable-wrap hidden">
<div class="edit-wrap">
@ -513,7 +511,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'Закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'Закрыть' %}</a>
</div>
</div>
</div>
@ -532,7 +530,7 @@
<div class="form-item-wrap">
<dt><a class="e-btn fa fa-pencil-square-o" href="#" title="">{% trans 'Добавить' %}</a>{% trans 'Количество сотрудников' %}:</dt>
<dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'Количество сотрудников' %}:</dt>
<div class="p-editable ic-tel ic-links editable-wrap hidden">
<div class="edit-wrap">
@ -554,7 +552,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'Закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'Закрыть' %}</a>
</div>
</div>
</div>
@ -570,7 +568,7 @@
</div>
<div class="form-item-wrap">
<dt><a class="e-btn fa fa-pencil-square-o" href="#" title="">{% trans 'Добавить' %}</a>{% trans 'О компании' %}:</dt>
<dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'О компании' %}:</dt>
<div class="p-editable ic-tel editable-wrap hidden">
<div class="edit-wrap">
@ -592,7 +590,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'Закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'Закрыть' %}</a>
</div>
</div>
</div>
@ -613,7 +611,7 @@
</dl>
<!-- !!! -->
</div>
<a rel="nofollow" id="profile-preview-btn" class="button profile-preview-btn" href="#" target="_blank">Предварительный просмотр <i class="fa fa-eye"></i></a>
<a rel="nofollow" id="profile-preview-btn" class="button profile-preview-btn" href="javascript:void(0);" target="_blank">Предварительный просмотр <i class="fa fa-eye"></i></a>
</div>
</div>

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

@ -13191,6 +13191,9 @@ hr + .rq-note {
.edit-profile .specialization .p-editable{
min-height: 27px;
}
.edit-profile .theme-form{
opacity: 0;
}
/************************\
# 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

18
templates/client/static_client/js/_modules/block.common.js
Unescape View File

@ -355,12 +355,6 @@ if (EXPO.common){
/**
* hide error icon on validated field when it is focused
*/
//$('.'+self.opt.requiredClass+'.'+self.opt.errorClass+' input:text').focusin(function () {
// $(this).closest('.'+self.opt.errorClass).addClass('disable-inner');
//});
//$('.'+self.opt.requiredClass+'.'+self.opt.errorClass+' input:text').focusout(function () {
// $(this).closest('.'+self.opt.errorClass).removeClass('disable-inner');
//});
$('#'+self.opt.socialFormId).on('focus','.'+self.opt.requiredClass+'.'+self.opt.errorClass+' input:text',function () {
$(this).closest('.'+self.opt.errorClass).addClass('disable-inner');
});
@ -568,6 +562,18 @@ if (EXPO.common){
}
};
/**
* format raw text (for example textarea input data), replaces newline by tag <br>
* @param {String} str string value to process
* @param {Boolean} is_xhtml if true than use xhtml notation for tag <br>
* @returns {string} formateed string
*/
that.nl2br = function (str, is_xhtml) {
var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br ' + '/>' : '<br>'; // Adjust comment to avoid issue on phpjs.org display
return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2');
};
return that;
}());
}

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

@ -14,7 +14,8 @@ if (EXPO.company){
}; //default module setting
that.lang ={};
//dependences
var $waiter;
var $waiter,
com = EXPO.common;
//private
/**
* Rating functional. Object stores data, HTML Instance of rating field, and can refresh its value
@ -149,7 +150,7 @@ if (EXPO.company){
Forms.spec_form = function (path) {
this.pullHandler = function (data) {
if (data.success){
$('#static-spec-value').text($('#id_specialization').val());
$('#static-spec-value').html(com.nl2br($('#id_specialization').val()));
$('.p-editable').removeClass('pe-current');
this.refreshState();
@ -379,7 +380,7 @@ if (EXPO.company){
var $fullComplete = $('.full-complete',this.$staticValue);
currValue = $.trim($input.val());
$fullComplete.text(currValue);
$fullComplete.html(com.nl2br(currValue));
$('.p-editable').removeClass('pe-current');
this.refreshState();
@ -725,7 +726,6 @@ if (EXPO.company){
self.forms[formName].noImageSrc = self.opt.noImageSrc;
}
self.forms[formName].refreshState();
// submit events handler
$(this).off('submit');

2
templates/client/static_client/js/_modules/page.profile.js
Unescape View File

@ -261,7 +261,7 @@ if (EXPO.profile){
*/
this.pullHandler = function (data) {
if (data.success){
$('#static-about-value').text($('#id_about').val());
$('#static-about-value').html(com.nl2br($('#id_about').val()));
$('.p-editable').removeClass('pe-current');
this.refreshState();

2
templates/client/static_client/js_min/_modules/block.common.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

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

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