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

Merge branch 'develop' of http://git.general-servers.com/expomap/expomap into develop

Browse Source
remotes/origin/1203
Назар Котюк 11 years ago
parent 4690d4e19c 01c9462c0c
commit 614bf306d7
12 changed files with 452 additions and 200 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      templates/client/includes/accounts/current_user.html
  2. 9
      templates/client/includes/accounts/simple_user.html
  3. 70
      templates/client/includes/company/company_edit.html
  4. 153
      templates/client/static_client/css/main.css
  5. 2
      templates/client/static_client/css_min/main.min.css
  6. BIN
      templates/client/static_client/img/no-userpic-big.gif
  7. 156
      templates/client/static_client/js/_modules/page.company.js
  8. 28
      templates/client/static_client/js/_modules/page.profile.calendar.js
  9. 167
      templates/client/static_client/js/_modules/page.profile.js
  10. 2
      templates/client/static_client/js_min/_modules/page.company.min.js
  11. 2
      templates/client/static_client/js_min/_modules/page.profile.calendar.min.js
  12. 2
      templates/client/static_client/js_min/_modules/page.profile.min.js

61
templates/client/includes/accounts/current_user.html
Unescape View File

@ -12,7 +12,7 @@
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="avatar-btn i-pict i-descr"> <div class="avatar-btn i-pict i-descr">
<a class="add_pic_block" title=""> <a class="add_pic_block" title="">
<span></span> <span class="fa fa-plus-circle">&nbsp;</span>
<i>{% trans 'Добавить фото' %}</i> <i>{% trans 'Добавить фото' %}</i>
<b>+20</b> <b>+20</b>
</a> </a>
@ -20,16 +20,17 @@
<div class="i-pict p-editable editable-wrap hidden"> <div class="i-pict p-editable editable-wrap hidden">
<div id="pick-block" class="pic_block"> <div id="pick-block" class="pic_block">
{% if request.user.profile.avatar %} {% if request.user.profile.avatar %}
{% thumbnail request.user.profile.avatar "100x100" crop="center" as im %} {% thumbnail request.user.profile.avatar "100x100" crop="center" as im %}
<img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/> <img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
{% endthumbnail %} {% endthumbnail %}
{% else %} {% else %}
<img class="user-avatar" src="{% static 'client/img/no-logo.png' %}" width="100" height="100"/> <img class="user-avatar" src="{% static 'client/img/no-userpic-big.gif' %}" width="100" height="100"/>
{% endif %} {% endif %}
</div> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn " href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form"action="/profile/update/avatar/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form"action="/profile/update/avatar/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -67,21 +68,20 @@
<header> <header>
{# country and city #} {# country and city #}
<div class="form-item-wrap"> <!-- 1 --> <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="">{% trans 'Указать' %}</a> <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 class="add_link_text_text">{% trans 'Страну и город' %}<b>+10</b></div>
</div> </div>
<div class="i-place p-editable editable-wrap hidden"> <!-- 2 --> <div class="i-place p-editable editable-wrap hidden"> <!-- 2 -->
<span class="static-value"> <!-- 3 --> <span class="static-value"> <!-- 3 -->
<span id="static-home-country">{{ home_form.instance.country }}</span> <span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
, <span id="static-home-city">{{ home_form.instance.city }}</span>
</span> </span>
<div class="edit-wrap e-left"> <div class="edit-wrap e-left">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="home_form" action="/profile/update/home/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="home_form" action="/profile/update/home/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -117,7 +117,7 @@
{# name #} {# name #}
<div class="form-item-wrap"> <!-- 1 --> <div class="form-item-wrap"> <!-- 1 -->
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">{% trans 'Указать' %}</a> <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 class="add_link_text_text">{% trans 'имя и фамилию' %}<b>+10</b></div>
</div> </div>
<div class="i-title p-editable editable-wrap hidden"> <!-- 2 --> <div class="i-title p-editable editable-wrap hidden"> <!-- 2 -->
@ -125,7 +125,7 @@
{{ name_form.get_full_name }} {{ name_form.get_full_name }}
</span> </span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/" <form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/"
method="post" method="post">{% csrf_token %} method="post" method="post">{% csrf_token %}
@ -165,7 +165,7 @@
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">{% trans 'Указать' %}</a> <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 class="add_link_text_text">{% trans 'свою должность и место работы' %}<b>+10</b></div>
</div> </div>
<div class="i-position p-editable editable-wrap hidden"> <div class="i-position p-editable editable-wrap hidden">
@ -177,7 +177,7 @@
</p> </p>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %}
@ -214,11 +214,12 @@
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
<div class="ic-buttons dd_width_4"> <div class="ic-buttons dd_width_4">
<div class="ic-buttons_text">{% trans 'Добавить профили в соц.сетях:' %}</div> <div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
<div class="form-item-wrap"><!-- 1 --> <div class="form-item-wrap"><!-- 1 -->
<div class="p-editable editable-wrap social"> <div class="p-editable editable-wrap social">
<div class="i-descr add_link_text add_link_text_medium soc-media-indent"> <div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn no-refresh social" href="#" title="">{% trans 'Добавить' %}</a> <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>
<ul class="soc-media-buttons soc-media-buttons1"> <ul class="soc-media-buttons soc-media-buttons1">
<li> <li>
@ -260,7 +261,7 @@
</li></li> </li></li>
</ul> </ul>
<div class="add_link_text_text"><b>{% trans '+5 за каждый' %}</b></div> <div class="add_link_text_text not-complete"><b>{% trans '+5 за каждый' %}</b></div>
</div> </div>
@ -318,7 +319,7 @@
<div class="ic-links dd_width_5"> <div class="ic-links dd_width_5">
<div class="form-item-wrap"> <!-- 1 --> <div class="form-item-wrap"> <!-- 1 -->
<div class="i-descr add_link_text add_link_text_medium"> <div class="i-descr add_link_text add_link_text_medium">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <a class="e-btn " href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'номер телефона' %} <b>+15</b></div> <div class="add_link_text_text">{% trans 'номер телефона' %} <b>+15</b></div>
</div> </div>
<div class="ic-tel p-editable editable-wrap hidden"> <!-- 2 --> <div class="ic-tel p-editable editable-wrap hidden"> <!-- 2 -->
@ -326,7 +327,7 @@
{{ phone_form.phone.value|phone }} {{ phone_form.phone.value|phone }}
</span> </span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="phone_form" action="/profile/update/phone/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="phone_form" action="/profile/update/phone/" method="post">{% csrf_token %}
@ -357,7 +358,7 @@
<a class="icon-mail" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a> <a class="icon-mail" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix" action="/profile/update/email/" method="post">{% csrf_token %} <form class="clearfix" action="/profile/update/email/" method="post">{% csrf_token %}
@ -384,7 +385,7 @@
{% endcomment %} {% endcomment %}
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class=" i-descr ic-site p-editable add_link_text add_link_text_medium"> <div class=" i-descr ic-site p-editable add_link_text add_link_text_medium">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <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 class="add_link_text_text">{% trans 'сайт' %} <b>+5</b></div>
</div> </div>
<div class="ic-site p-editable editable-wrap hidden"> <div class="ic-site p-editable editable-wrap hidden">
@ -395,7 +396,7 @@
</a> </a>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %}
@ -431,14 +432,14 @@
<div class="ia-title">{% trans 'О себе:' %}</div> <div class="ia-title">{% trans 'О себе:' %}</div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text"> <div class="i-descr add_link_text">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <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 class="add_link_text_text">{% trans 'информацию о себе' %} <b>+10</b></div>
</div> </div>
<div class="p-editable editable-wrap hidden"> <div class="p-editable editable-wrap hidden">
<p id="static-about-value" class="static-value">{{ about_form.about.value }}</p> <p id="static-about-value" class="static-value">{{ about_form.about.value }}</p>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %}
@ -469,7 +470,7 @@
{# companies #} {# companies #}
<div class="my-companies-block editable"> <div class="my-companies-block editable">
<div class="ia-title">{% trans 'Мои компании:' %}</div> <div class="ia-title ">{% trans 'Мои компании:' %}</div>
{% if request.user.created_company.all %} {% if request.user.created_company.all %}
{% else %} {% else %}
<div class="message-standart"> <div class="message-standart">
@ -487,8 +488,9 @@
<span class="logo"> <span class="logo">
{% include 'client/includes/show_logo.html' with obj=company %} {% include 'client/includes/show_logo.html' with obj=company %}
</span> </span>
<span class="title"> <span class="title ">
{{ company.name }} <i class="e-btn fa fa-pencil-square-o">&nbsp;</i>
<span>{{ company.name }}</span>
</span> </span>
</a> </a>
</div> </div>
@ -533,13 +535,16 @@
editButtonClass:'e-btn', editButtonClass:'e-btn',
avatarButtonClass:'avatar-btn', avatarButtonClass:'avatar-btn',
avatarImageClass:'user-avatar', avatarImageClass:'user-avatar',
noImageSrc:"{% static 'client/img/no-logo.png' %}", noImageSrc:"{% static 'client/img/no-userpic-big.gif' %}",
// text and paths for dynamically rendered selectboxes // text and paths for dynamically rendered selectboxes
addCompanyButtonId:'add-new-company', addCompanyButtonId:'add-new-company',
selectBox:[ companyAddInputMask:'http://expomap.ru/members/',
avatarInputId:"id_avatar",
selectBox:[
{id:'id_country'}, {id:'id_country'},
{id:'id_theme', {id:'id_theme',
placeHolder:'Выберите тематику компании' placeholder:'Выберите тематику компании'
}, },
{id:'id_city', {id:'id_city',
placeholder:'Поиск города', placeholder:'Поиск города',

9
templates/client/includes/accounts/simple_user.html
Unescape View File

@ -6,18 +6,15 @@
<div class="m-article outer-profile"> <div class="m-article outer-profile">
<div class="item-wrap clearfix"> <div class="item-wrap clearfix">
<aside> <aside>
{% if member.profile.avatar %}
<div class="i-pict"> <div class="i-pict">
{% if member.profile.avatar %}
{% thumbnail member.profile.avatar "100x100" crop="center" as im %} {% thumbnail member.profile.avatar "100x100" crop="center" as im %}
<img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/> <img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
{% endthumbnail %} {% endthumbnail %}
{% else %} {% else %}
<img class="user-avatar" src="{% static 'client/img/no-logo.png' %}" width="100" height="100"/> <img class="user-avatar" src="{% static 'client/img/no-userpic-big.gif' %}" width="100" height="100"/>
{% endif %}
</div> </div>
{% endif %}
</aside> </aside>
<div class="i-info"> <div class="i-info">
<header> <header>

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

@ -11,7 +11,7 @@
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class=" avatar-btn i-pict i-descr"> <div class=" avatar-btn i-pict i-descr">
<a class="add_pic_block" title=""> <a class="add_pic_block" title="">
<span></span> <span class="fa fa-plus-circle">&nbsp;</span>
<i>{% trans 'Добавить лого' %}</i> <i>{% trans 'Добавить лого' %}</i>
<b>+20</b> <b>+20</b>
</a> </a>
@ -29,7 +29,7 @@
</div> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn " href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <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 %} <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"> <div class="ef-body">
@ -64,20 +64,19 @@
<div class="i-info"> <div class="i-info">
<header> <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="">{% trans 'Указать' %}</a> <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 class="add_link_text_text">{% trans 'город' %} <b>+5</b></div>
</div> </div>
<div class="i-place p-editable editable-wrap hidden"> <div class="i-place p-editable editable-wrap hidden">
<span class="static-value"> <span class="static-value">
<span><a href="#" id="static-home-country">{{ home_form.instance.country }}</a></span> <span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
,<span><a href="#" id="static-home-city">{{ home_form.instance.city }}</a></span>
</span> </span>
<div class="edit-wrap e-left"> <div class="edit-wrap e-left">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="home_form" action="/company/update/home/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="home_form" action="/company/update/home/{{ company.url }}/" method="post">{% csrf_token %}
@ -120,14 +119,14 @@
</div> </div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">{% trans 'Указать' %}</a> <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 class="add_link_text_text">{% trans 'название компании' %}<b>+10</b></div>
</div> </div>
<div class="i-title p-editable editable-wrap hidden required"> <div class="i-title p-editable editable-wrap hidden required">
<span id="static-name-value" class="static-value">{{ name_form.name.value }}</span> <span id="static-name-value" class="static-value">{{ name_form.name.value }}</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">редактировать</a> <a class="e-btn fa fa-pencil-square-o" href="#">редактировать</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/company/update/name/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="name_form" action="/company/update/name/{{ company.url }}/" method="post">{% csrf_token %}
@ -157,13 +156,13 @@
<!--!--> <!--!-->
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">краткое описание компании <b>+20</b></div> <div class="add_link_text_text">{% trans 'краткое описание компании' %} <b>+20</b></div>
</div> </div>
<div class="i-position p-editable editable-wrap hidden required"> <div class="i-position p-editable editable-wrap hidden required">
<span id="static-spec-value" class="static-value">{{ spec_form.specialization.value }}</span> <span id="static-spec-value" class="static-value">{{ spec_form.specialization.value }}</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/{{ company.url }}/" method="post">{% csrf_token %}
@ -200,13 +199,13 @@
<!--!--> <!--!-->
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title=""> <i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">адрес компании <b>+15</b></div> <div class="add_link_text_text">{% trans 'адрес компании' %} <b>+15</b></div>
</div> </div>
<div class="ic-tel p-editable editable-wrap hidden required"> <div class="ic-tel p-editable editable-wrap hidden required">
<span id="static-address-value" class="static-value address">{{ address_form.address_inf.value }}&nbsp;</span> <span id="static-address-value" class="static-value address">{{ address_form.address_inf.value }}&nbsp;</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="address_form" action="/company/update/address/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="address_form" action="/company/update/address/{{ company.url }}/" method="post">{% csrf_token %}
@ -248,14 +247,15 @@
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
<div class="ic-buttons ic-buttons_pos dd_width_4"> <div class="ic-buttons ic-buttons_pos dd_width_4">
<div class="ic-buttons_text">{% trans 'Добавить профили в соц.сетях:' %}</div> <div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="p-editable editable-wrap social"> <div class="p-editable editable-wrap social">
<div class="i-descr add_link_text add_link_text_medium soc-media-indent"> <div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn no-refresh social" href="#" title="">{% trans 'Добавить' %}</a> <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>
<ul class="soc-media-buttons soc-media-buttons1"> <ul class="soc-media-buttons soc-media-buttons1">
<li> <li>
@ -298,7 +298,7 @@
</ul> </ul>
<div class="add_link_text_text"><b>{% trans '+5 за каждый' %}</b></div> <div class="add_link_text_text not-complete"><b>{% trans '+5 за каждый' %}</b></div>
</div> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<div class="e-form"> <div class="e-form">
@ -355,14 +355,14 @@
<div class="ic-links ic-links_indent dd_width_5"> <div class="ic-links ic-links_indent dd_width_5">
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium"> <div class="i-descr add_link_text add_link_text_medium">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'номер телефона' %} <b>+15</b></div> <div class="add_link_text_text">{% trans 'номер телефона' %} <b>+15</b></div>
</div> </div>
<div class="ic-tel p-editable editable-wrap hidden"> <div class="ic-tel p-editable editable-wrap hidden">
<span id="static-phone-value" class="static-value">{{ phone_form.phone.value|phone }}</span> <span id="static-phone-value" class="static-value">{{ phone_form.phone.value|phone }}</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -386,7 +386,7 @@
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium"> <div class="i-descr add_link_text add_link_text_medium">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'email' %} <b>+15</b></div> <div class="add_link_text_text">{% trans 'email' %} <b>+15</b></div>
</div> </div>
<div class=" p-editable editable-wrap hidden required"> <div class=" p-editable editable-wrap hidden required">
@ -396,7 +396,7 @@
</div> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="email_form" action="/company/update/email/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="email_form" action="/company/update/email/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -421,7 +421,7 @@
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium"> <div class="i-descr add_link_text add_link_text_medium">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <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 class="add_link_text_text">{% trans 'сайт' %} <b>+5</b></div>
</div> </div>
<div class="ic-site p-editable editable-wrap hidden"> <div class="ic-site p-editable editable-wrap hidden">
@ -430,7 +430,7 @@
</a> </a>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <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 %} <form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/{{ company.url }}/" method="post">{% csrf_token %}
@ -463,7 +463,7 @@
<div class="ia-title">{% trans 'Дополнительная информация' %}</div> <div class="ia-title">{% trans 'Дополнительная информация' %}</div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'год основания' %} <b>+15</b></div> <div class="add_link_text_text">{% trans 'год основания' %} <b>+15</b></div>
</div> </div>
<div class="p-editable ic-tel ic-links editable-wrap hidden"> <div class="p-editable ic-tel ic-links editable-wrap hidden">
@ -472,7 +472,7 @@
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#" >{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#" >{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/{{ company.url }}/" method="post">{% csrf_token %}
@ -497,7 +497,7 @@
</div> </div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'к-во сотрудников' %} <b>+15</b></div> <div class="add_link_text_text">{% trans 'к-во сотрудников' %} <b>+15</b></div>
</div> </div>
@ -508,7 +508,7 @@
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/{{ 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="ef-body">
@ -532,7 +532,7 @@
</div> </div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a> <a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'подробное описание компании' %}<b>+15</b></div> <div class="add_link_text_text">{% trans 'подробное описание компании' %}<b>+15</b></div>
</div> </div>
@ -543,7 +543,7 @@
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div id="static-description" style="{% if description_form.description.value %} display:none;{% endif %}"> <div id="static-description" style="{% if description_form.description.value %} display:none;{% endif %}">
@ -606,13 +606,17 @@
editButtonClass:'e-btn', editButtonClass:'e-btn',
avatarButtonClass:'avatar-btn', avatarButtonClass:'avatar-btn',
avatarImageClass:'user-avatar', avatarImageClass:'user-avatar',
avatarInputId:"id_avatar",
noImageSrc:"{% static 'client/img/no-logo.png' %}", noImageSrc:"{% static 'client/img/no-logo.png' %}",
// text and paths for dynamically rendered selectboxes // text and paths for dynamically rendered selectboxes
selectBox:[ selectBox:[
{id:'id_country'}, {
id:'id_country',
placeholder:"{% trans 'Выберите Страну' %}"
},
{id:'id_city', {id:'id_city',
placeHolder:'Search city', placeHolder:"{% trans 'Выберите город' %}",
path:'http://{{ request.get_host }}/city/get-city/' path:'http://{{ request.get_host }}/city/get-city/'
}, },
{id:'id_tag', {id:'id_tag',

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

@ -8067,6 +8067,7 @@ a.order-button:hover .ob-text,
left: 100%; left: 100%;
top: 5px; top: 5px;
margin: 0 0 0 -30px; margin: 0 0 0 -30px;
line-height: 1em;
} }
.i-title.p-editable .edit-wrap { .i-title.p-editable .edit-wrap {
@ -8113,14 +8114,12 @@ a.order-button:hover .ob-text,
} }
.e-btn:before { .e-btn:before {
content: '';
display: block; display: block;
width: 18px;
height: 16px;
background: url(../img/sprites.png) -117px -145px no-repeat;
position: absolute; position: absolute;
left: 5px; left: 5px;
top: 4px; top: 4px;
font-size: 18px;
color: #ff6600;
} }
.e-btn:hover { .e-btn:hover {
@ -8158,7 +8157,7 @@ a.order-button:hover .ob-text,
.i-pict.p-editable .e-btn:hover:before, .i-pict.p-editable .e-btn:hover:before,
.p-editable.pe-current .e-btn:before { .p-editable.pe-current .e-btn:before {
background-position: -136px -145px; color: #ffffff;
} }
.i-pict.p-editable.pe-current .e-btn { .i-pict.p-editable.pe-current .e-btn {
@ -11724,17 +11723,79 @@ hr + .rq-note {
.end_reg_list li table tr td.width2 {width:88px;padding:0 9px 0 0;} .end_reg_list li table tr td.width2 {width:88px;padding:0 9px 0 0;}
.end_reg_list li table tr td.width3 {width:185px;} .end_reg_list li table tr td.width3 {width:185px;}
.add_pic_block {display:block;width:100px;height:80px;padding:20px 0 0 0;text-align:center;font-size:12px;color:#a2a2a2;font-weight:500;text-decoration:none;position:relative;line-height:1.0;-webkit-transition:background .3s, color .3s;-o-transition:background .3s, color .3s;transition:background .3s, color .3s;font-family:'dindisplay_pro'; .add_pic_block {
cursor: pointer;} display:block;
.add_pic_block span {display:block;margin:0 auto;width:35px;height:35px;background-color:#d0d0d0;border-radius:50%;background-image:url(../img/add_pic_block_bg.png);background-position:center center;background-repeat:no-repeat;-webkit-transition:background .3s, color .3s;-o-transition:background .3s, color .3s;transition:background .3s, color .3s; position: relative;} width:100px;
.add_pic_block .input { display: block; width: 100px; height: 100px; position: absolute; left: 0; top: 0; opacity: 0; cursor: pointer;} height:80px;
.add_pic_block i {display:block;font-style:normal;padding:10px 0 1px 0;} text-align:center;
.add_pic_block b {font-size:14px;font-weight:500;} font-size:12px;
.add_pic_block b:before {content:'';display:inline-block;width:14px;height:12px;background:url(../img/sprites.png) -365px -53px no-repeat;margin:0 4px 0 0;position:relative;top:1px;} color:#a2a2a2;
font-weight:500;
.add_pic_block:hover { color: #ff6600;} text-decoration:none;
.add_pic_block:hover span { background-color: #ff6600;} position:relative;
.add_pic_block:hover b:before { background-position: -181px -32px;} line-height:1.0;
-webkit-transition:background .3s, color .3s;
-o-transition:background .3s, color .3s;
transition:background .3s, color .3s;
font-family:dindisplay_pro;
cursor:pointer;
padding:20px 0 0;
}
.add_pic_block span {
display: block;
width: 36px;
font-size: 40px;
background-position: center center;
background-repeat: no-repeat;
-webkit-transition: all .3s;
-o-transition: all .3s;
transition: all .3s;
position: relative;
margin: 0 auto;
}
.add_pic_block .input {
display:block;
width:100px;
height:100px;
position:absolute;
left:0;
top:0;
opacity:0;
cursor:pointer;
}
.add_pic_block i {
display:block;
font-style:normal;
padding:10px 0 1px;
}
.add_pic_block b {
font-size:14px;
font-weight:500;
}
.add_pic_block b:before {
content:'';
display:inline-block;
width:14px;
height:12px;
background:url(../img/sprites.png) -365px -53px no-repeat;
position:relative;
top:1px;
margin:0 4px 0 0;
}
.add_pic_block:hover {
color:#f60;
}
.add_pic_block:hover b:before {
background-position:-181px -32px;
}
.add_pic_block .add-wrapper{ .add_pic_block .add-wrapper{
margin: 0; margin: 0;
padding: 0;} padding: 0;}
@ -11793,9 +11854,34 @@ hr + .rq-note {
.add_link_text a {color: #a2a2a2;} .add_link_text a {color: #a2a2a2;}
.add_link_text .edit-wrap { display: inline-block!important; position: relative; left: 0; top: 0; margin: 0 5px 0 0!important; height: 20px;} .add_link_text .edit-wrap { display: inline-block!important; position: relative; left: 0; top: 0; margin: 0 5px 0 0!important; height: 20px;}
.add_link_text a.e-btn {color: #a2a2a2; display: inline-block; padding: 0 0 0 22px; margin: 0 5px 0 0; width: auto; height: auto;font-size: 17px; color: #a2a2a2;font-family:'dindisplay_pro'; font-weight: 500; opacity: 1; .add_link_text a.e-btn {
vertical-align: middle;} display:inline-block;
.add_link_text a.e-btn:before { content:'';display: inline-block;width:16px;height:17px; background: url(../img/sprites.png) -385px -52px;-webkit-transition: color .3s;-o-transition: color .3s;transition: color .3s; position: absolute; top: 0; left: 0;} width:auto;
height:auto;
font-size:17px;
color:#a2a2a2;
font-family:dindisplay_pro;
font-weight:500;
opacity:1;
vertical-align:middle;
margin:0 5px 0 0;
padding:0 0 0 0;
}
.add_link_text a.e-btn .fa{
width: 24px;
}
.add_link_text a.e-btn .fa:before {
display:inline-block;
width:16px;
height:17px;
-webkit-transition:color .3s;
-o-transition:color .3s;
transition:color .3s;
position:absolute;
top:0;
left:0;
font-size: 18px;
}
.add_link_text b { margin-left: 10px;} .add_link_text b { margin-left: 10px;}
.add_link_text b:before {content:'';display:inline-block;width:14px;height:12px;background:url(../img/sprites.png) -365px -53px no-repeat;margin:0 4px 0 0;} .add_link_text b:before {content:'';display:inline-block;width:14px;height:12px;background:url(../img/sprites.png) -365px -53px no-repeat;margin:0 4px 0 0;}
.add_link_text_medium a:before { top: 2px;} .add_link_text_medium a:before { top: 2px;}
@ -12056,6 +12142,9 @@ hr + .rq-note {
.disable-inner:before{ .disable-inner:before{
display: none !important; display: none !important;
} }
.right{
float: right;
}
@ -12786,12 +12875,21 @@ hr + .rq-note {
.edit-profile .pe-current .e-form{ .edit-profile .pe-current .e-form{
display: block; display: block;
} }
.edit-profile .p-editable{ .edit-profile .p-editable{
padding-left: 22px; padding-left: 22px;
} }
.edit-profile .p-editable.i-place{ .edit-profile .p-editable.i-place{
padding-left: 36px; padding-left: 36px;
} }
.edit-profile .p-editable.social .e-btn.full-complete{
color: #ff6600;
}
.edit-profile .p-editable.social .e-btn.full-complete:hover{
opacity: 0.7;
}
.edit-profile .i-pict.p-editable{ .edit-profile .i-pict.p-editable{
padding: 0; padding: 0;
} }
@ -12857,17 +12955,22 @@ hr + .rq-note {
position: relative; position: relative;
} }
.my-companies-block .company .title .e-btn{
padding: 0; border-radius: 0;
height: 16px;
top: 3px;
}
.my-companies-block .company a:hover .title{ .my-companies-block .company a:hover .title{
text-decoration: none; text-decoration: none;
} }
.my-companies-block.editable .company .title:before{ .my-companies-block.editable .company .fa:before{
content: '';
width: 18px;
height: 16px;
background: url(../img/sprites.png) -117px -145px no-repeat;
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
font-size: 18px;
color: #ff6600;
} }
.add-company-block{ .add-company-block{
margin-top: 2em; margin-top: 2em;
@ -12954,7 +13057,7 @@ hr + .rq-note {
margin: 0; margin: 0;
} }
.edit-profile .i-additional .editable-wrap > p{ .edit-profile .i-additional .editable-wrap > p{
height: 23px; min-height: 23px;
} }
.edit-profile .editable-wrap:before{ .edit-profile .editable-wrap:before{
display: none; display: none;

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

File diff suppressed because one or more lines are too long

BIN
templates/client/static_client/img/no-userpic-big.gif
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -216,6 +216,8 @@ if (EXPO.company){
$input.parent('.required').addClass('err'); $input.parent('.required').addClass('err');
} }
} }
this.refreshState();
}; };
this.pushHandler = function (data, formName){ this.pushHandler = function (data, formName){
var formData = $('#'+formName).serialize(); var formData = $('#'+formName).serialize();
@ -225,6 +227,22 @@ if (EXPO.company){
};
this.refreshState = function () {
console.log(this);
var fullComplete = true;
$('input:text',this.$form).each(function () {
if($.trim($(this).val()) == ''){
fullComplete = false;
}
});
if(fullComplete){
$('.full-complete',this.$description).removeClass('hidden');
$('.not-complete',this.$description).addClass('hidden');
}else{
$('.full-complete',this.$description).addClass('hidden');
$('.not-complete',this.$description).removeClass('hidden');
}
}; };
this.ajaxPath = path; this.ajaxPath = path;
@ -331,13 +349,6 @@ if (EXPO.company){
this.refreshState(); this.refreshState();
} }
}; };
$input.on('keypress', function (e) {
var keycode = (e.keyCode ? e.keyCode : e.which);
if(keycode == '13'){
return false;
}
});
this.ajaxPath = path; this.ajaxPath = path;
@ -358,8 +369,9 @@ if (EXPO.company){
if($avatar.length){ if($avatar.length){
$avatar.attr('src', data.url); $avatar.attr('src', data.url);
this.refreshState();
} }
$('.p-editable').removeClass('pe-current');
} }
}; };
@ -410,9 +422,11 @@ if (EXPO.company){
} }
}, },
showMaskOnHover: false, showMaskOnHover: false,
insertMode:false,
autoUnmask: true autoUnmask: true
}, },
match: /[0-9]/, match: /[0-9]/,
insertMode:false,
replace: '#', replace: '#',
list: maskList, list: maskList,
listKey: "mask", listKey: "mask",
@ -429,18 +443,46 @@ if (EXPO.company){
this.forms = {}; this.forms = {};
$(function () { $(function () {
var $editables = $('.'+self.opt.editableClass); var $editables = $('.'+self.opt.editableClass),
$country = $('#'+self.opt.selectBox[0].id),
$city = $('#'+self.opt.selectBox[1].id);
//start of document.ready //start of document.ready
$waiter = $('#wait-ajax').css({'z-index': '8012'}); $waiter = $('#wait-ajax').css({'z-index': '8012'});
/** /**
* <selectbox> styling with 3-rd party libs * <selectbox> styling with 3-rd party libs
*/ */
/**
* select country
*/
$country.select2({
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
*/
//todo:чтобы работал надо ждать пока Назар сделает нулевой option
$('#'+self.opt.selectBox[0].id).select2({ $country.on('change', function () {
width: 'element' if($(this).val() != 0 || $(this).val() != ''){
$city.prop('disabled', false);
}
}); });
$('#'+self.opt.selectBox[1].id).select2({ /**
* select city inside country
*/
/**
* disable city <select/> if country is not chosen
*/
if($country.val() == 0 || $country.val() == ''){
$city.prop('disabled', true);
}
$city.select2({
placeholder: self.opt.selectBox[1].placeHolder, placeholder: self.opt.selectBox[1].placeHolder,
width: 'element', width: 'element',
ajax: { ajax: {
@ -450,7 +492,7 @@ if (EXPO.company){
quietMillis: 200, quietMillis: 200,
data: function(term, page, country){ data: function(term, page, country){
var country = $('#'+self.opt.selectBox[0].id).val() var country = $('#'+self.opt.selectBox[0].id).val();
return {term: term, return {term: term,
page: page, page: page,
country: country}; country: country};
@ -468,14 +510,16 @@ if (EXPO.company){
} }
}, },
initSelection : function(element, callback) { initSelection : function(element, callback) {
var id= $(element).val(); var id= $.trim($(element).val());
var text = $(element).attr('data-init-text'); var text = $(element).attr('data-init-text');
callback({id: id, text:text}); callback({id: id, text:text});
} }
}); });
/**
* tags
*/
$('#'+self.opt.selectBox[2].id).val('0'); $('#'+self.opt.selectBox[2].id).val('0');
$('#'+self.opt.selectBox[2].id).select2({ $('#'+self.opt.selectBox[2].id).select2({
placeholder: self.opt.selectBox[2].placeholder, placeholder: self.opt.selectBox[2].placeholder,
@ -614,53 +658,67 @@ if (EXPO.company){
self.forms[formName].refreshState(); self.forms[formName].refreshState();
return false; return false;
}); });
/**
* edit button if($('.'+self.opt.avatarButtonClass).length){
*/ /**
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () { * avatar image choose button
//close other active editable forms */
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass), $('.'+self.opt.editButtonClass+','+' .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'), var $input = $('#'+self.opt.avatarInputId);
$description = $wrapper.find('.'+self.opt.descriptionClass), $input.trigger('click');
$editable = $wrapper.find('.'+self.opt.editableClass); return false;
$editables.each(function () { });
}else{
/**
* edit button
*/
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
//close other active editable forms
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass), var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'), formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass), $description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass); $editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){ $editables.each(function () {
if(self.forms[formId].refrashable){ var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){
if(self.forms[formId].refrashable){
self.forms[formId].refreshState();
$editable.removeClass(EXPO.company.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
}
self.forms[formId].refreshState();
$editable.removeClass(EXPO.company.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
} }
});
} if(self.forms[formId].refrashable){
}); $editable.removeClass('hidden');
$description.addClass('hidden');
if(self.forms[formId].refrashable){ }else{
$editable.removeClass('hidden');
$description.addClass('hidden');
}else{
}
$editable.addClass(self.opt.formCurrentClass);
$(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
} }
}); $editable.addClass(self.opt.formCurrentClass);
return false; $(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
}
});
return false;
}); });
}
}); });
}); });
}; };

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

@ -46,19 +46,31 @@ if (EXPO.profile.calendar) {
result = 0, result = 0,
width = self.opt.cellWidth, width = self.opt.cellWidth,
$calendar = $('#' + self.opt.calenadrId), $calendar = $('#' + self.opt.calenadrId),
currentDay = $calendar.find('td.' + self.opt.currentDayClass).index()+1, currentDay = $calendar.find('td.' + self.opt.currentDayClass).index(),
onestep = self.opt.cellsToScroll, onestep = self.opt.cellsToScroll,
allDays = $calendar.find('.'+self.opt.daysClass+' td').length, allDays = $calendar.find('.'+self.opt.daysClass+' td').length,
stepsCount = allDays / onestep, stepsCount,
currenCount = allDays / currentDay; currenCount;
result = stepsCount - currenCount;
self.stepWidth = onestep*width; self.stepWidth = onestep*width;
self.calendarWidth = width* allDays; self.calendarWidth = width* allDays;
if (result) { if(currentDay > 0){
result = Math.floor(result); currentDay++;
offset = onestep * result * width; stepsCount = allDays / onestep;
} else { currenCount = allDays / currentDay;
result = stepsCount - currenCount;
self.currentDay =currentDay;
if (result) {
result = Math.floor(result-1);
offset = onestep * result * width;
} else {
offset = 0;
}
}else{
self.currentDay = 0;
offset = 0; offset = 0;
} }

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

@ -267,13 +267,6 @@ if (EXPO.profile){
} }
}; };
$('#id_about').on('keypress', function (e) {
var keycode = (e.keyCode ? e.keyCode : e.which);
if(keycode == '13'){
return false;
}
});
this.ajaxPath = path; this.ajaxPath = path;
}; };
@ -317,6 +310,7 @@ if (EXPO.profile){
} }
$('.p-editable').removeClass('pe-current'); $('.p-editable').removeClass('pe-current');
this.refreshState();
}else { }else {
for (item in data.errors) { for (item in data.errors) {
@ -333,6 +327,22 @@ if (EXPO.profile){
};
this.refreshState = function () {
console.log(this);
var fullComplete = true;
$('input:text',this.$form).each(function () {
if($.trim($(this).val()) == ''){
fullComplete = false;
}
});
if(fullComplete){
$('.full-complete',this.$description).removeClass('hidden');
$('.not-complete',this.$description).addClass('hidden');
}else{
$('.full-complete',this.$description).addClass('hidden');
$('.not-complete',this.$description).removeClass('hidden');
}
}; };
this.ajaxPath = path; this.ajaxPath = path;
@ -353,8 +363,9 @@ if (EXPO.profile){
if($avatar.length){ if($avatar.length){
$avatar.attr('src', data.url); $avatar.attr('src', data.url);
this.refreshState();
} }
$('.p-editable').removeClass('pe-current');
} }
}; };
@ -436,8 +447,10 @@ if (EXPO.profile){
} }
}, },
showMaskOnHover: false, showMaskOnHover: false,
insertMode:false,
autoUnmask: true autoUnmask: true
}, },
insertMode:false,
match: /[0-9]/, match: /[0-9]/,
replace: '#', replace: '#',
list: maskList, list: maskList,
@ -454,23 +467,37 @@ if (EXPO.profile){
this.rating = new Rating(this.opt.rating); this.rating = new Rating(this.opt.rating);
this.forms = {}; this.forms = {};
$(function () { $(function () {
var $editables = $('.'+self.opt.editableClass); var $editables = $('.'+self.opt.editableClass),
$country = $('#'+self.opt.selectBox[0].id),
$city = $('#'+self.opt.selectBox[2].id),
$companyUrl = $("#id_url");
$waiter = $('#wait-ajax').css({'z-index': '8012'}); $waiter = $('#wait-ajax').css({'z-index': '8012'});
/** /**
* <selectbox> styling with 3-rd party libs * <selectbox> styling with 3-rd party libs
*/ */
$('#'+self.opt.selectBox[0].id).select2({ /**
* select country
*/
$country.select2({
width: 'element' width: 'element'
}); });
$country.on("change", function () {
$city.val(0);
$city.select2("val", "");
});
/**
* select theme
*/
$('#'+self.opt.selectBox[1].id).select2({ $('#'+self.opt.selectBox[1].id).select2({
width: 'element', width: 'element',
placeholder: self.opt.selectBox[1].placeholder, placeholder: self.opt.selectBox[1].placeholder,
maximumSelectionSize: 3 maximumSelectionSize: 3
}); });
/**
$('#'+self.opt.selectBox[2].id).select2({ * select city
*/
$city.select2({
placeholder: self.opt.selectBox[2].placeholder, placeholder: self.opt.selectBox[2].placeholder,
width: 'element', width: 'element',
ajax: { ajax: {
@ -602,50 +629,62 @@ if (EXPO.profile){
self.forms[formName].refreshState(); self.forms[formName].refreshState();
return false; return false;
}); });
/** if($('.'+self.opt.avatarButtonClass).length){
* edit button /**
*/ * avatar image choose button
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () { */
//close other active editable forms $('.'+self.opt.editButtonClass+','+' .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass), var $input = $('#'+self.opt.avatarInputId);
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'), $input.trigger('click');
$description = $wrapper.find('.'+self.opt.descriptionClass), return false;
$editable = $wrapper.find('.'+self.opt.editableClass); });
$editables.each(function () {
}else{
/**
* edit button
*/
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
//close other active editable forms
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass), var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'), formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass), $description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass); $editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){ $editables.each(function () {
if(self.forms[formId].refrashable){ var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){
if(self.forms[formId].refrashable){
self.forms[formId].refreshState();
$editable.removeClass(EXPO.company.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
}
self.forms[formId].refreshState();
$editable.removeClass(EXPO.profile.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
} }
});
} if(self.forms[formId].refrashable){
}); $editable.removeClass('hidden');
$description.addClass('hidden');
if(self.forms[formId].refrashable){ }else{
$editable.removeClass('hidden');
$description.addClass('hidden');
}else{
}
$editable.addClass(self.opt.formCurrentClass);
$(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
} }
}); $editable.addClass(self.opt.formCurrentClass);
return false; $(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
}
});
return false;
}); });
}
}); });
@ -657,7 +696,41 @@ if (EXPO.profile){
$.fancybox.open('#'+ self.opt.addCompany.modalId); $.fancybox.open('#'+ self.opt.addCompany.modalId);
return false; return false;
}); });
/**
* add company url placeholder
*/
$companyUrl.on('focus', function () {
var $this = $(this),
placeholder = self.opt.companyAddInputMask;
if($.trim($this.val()) == ''){
$this.val(placeholder);
}
return false;
});
$companyUrl.on('click', function () {
if (this.setSelectionRange && $.trim($(this).val()) == self.opt.companyAddInputMask){
var len = $(this).val().length;
this.setSelectionRange(len, len);
}
});
$companyUrl.on('keypress', function () {
var $this = $(this),
placeholder = self.opt.companyAddInputMask;
if($.trim($this.val()) == ''){
$this.val(placeholder);
}
});
$companyUrl.on('blur', function () {
var $this = $(this),
placeholder = self.opt.companyAddInputMask;
if($.trim($this.val()) == placeholder){
$this.val('');
}
});
}); });

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.calendar.min.js vendored
Unescape View File

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),n=$("#"+this.opt.calenadrId),o=(n.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),a=$("#"+this.opt.scrollRightId),l=$("."+this.opt.noEventsClass),i=$("."+this.opt.calendarToggleClass),r=this.opt.cellWidth*this.opt.cellsToScroll,c=0,d=function(){var t=0,s=0,n=e.opt.cellWidth,o=$("#"+e.opt.calenadrId),a=o.find("td."+e.opt.currentDayClass).index()+1,l=e.opt.cellsToScroll,i=o.find("."+e.opt.daysClass+" td").length,r=i/l,c=i/a;return s=r-c,e.stepWidth=l*n,e.calendarWidth=n*i,s?(s=Math.floor(s),t=l*s*n):t=0,t};this.currentOffset=d(),this.$messages=[],$(function(){l.each(function(){$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&e.$messages.push($(".message",$(this)).width(e.stepWidth).css({marginLeft:e.currentOffset+"px"})):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass).each(function(){c++,3==c&&$(this).addClass("grey"),4==c&&($(this).addClass("grey"),c=0)})}),$(window).load(function(){s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+EXPO.profile.calendar.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1}})}),o.on("click",function(){if(e.currentOffset>=e.stepWidth){e.currentOffset-=r,s.mCustomScrollbar("scrollTo","+="+r);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n>0&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),a.on("click",function(){if(e.currentOffset+e.stepWidth<e.calendarWidth){e.currentOffset+=r,s.mCustomScrollbar("scrollTo","-="+r);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n+e.$messages[t].width()<e.calendarWidth&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),i.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(a.hide(),o.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(a.show(),o.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t}(); var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),n=$("#"+this.opt.calenadrId),a=(n.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),o=$("#"+this.opt.scrollRightId),r=$("."+this.opt.noEventsClass),l=$("."+this.opt.calendarToggleClass),i=this.opt.cellWidth*this.opt.cellsToScroll,c=0,d=function(){var t,s,n=0,a=0,o=e.opt.cellWidth,r=$("#"+e.opt.calenadrId),l=r.find("td."+e.opt.currentDayClass).index(),i=e.opt.cellsToScroll,c=r.find("."+e.opt.daysClass+" td").length;return e.stepWidth=i*o,e.calendarWidth=o*c,l>0?(l++,t=c/i,s=c/l,a=t-s,e.currentDay=l,a?(a=Math.floor(a-1),n=i*a*o):n=0):(e.currentDay=0,n=0),n};this.currentOffset=d(),this.$messages=[],$(function(){r.each(function(){$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&e.$messages.push($(".message",$(this)).width(e.stepWidth).css({marginLeft:e.currentOffset+"px"})):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass).each(function(){c++,3==c&&$(this).addClass("grey"),4==c&&($(this).addClass("grey"),c=0)})}),$(window).load(function(){s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+EXPO.profile.calendar.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1}})}),a.on("click",function(){if(e.currentOffset>=e.stepWidth){e.currentOffset-=i,s.mCustomScrollbar("scrollTo","+="+i);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n>0&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),o.on("click",function(){if(e.currentOffset+e.stepWidth<e.calendarWidth){e.currentOffset+=i,s.mCustomScrollbar("scrollTo","-="+i);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n+e.$messages[t].width()<e.calendarWidth&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),l.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(o.hide(),a.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(o.show(),a.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t}();

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