expo-91_13-14

remotes/origin/1203
pavel 11 years ago
parent 93491dfd90
commit a0ace1e1b2
  1. 88
      templates/client/includes/accounts/current_user.html
  2. 13
      templates/client/includes/show_logo.html
  3. 35
      templates/client/password_reset/base.html
  4. 178
      templates/client/static_client/css/main.css
  5. 2
      templates/client/static_client/css_min/main.min.css
  6. 4
      templates/client/static_client/js/_modules/page.profile.js
  7. 2
      templates/client/static_client/js_min/_modules/page.company.min.js
  8. 2
      templates/client/static_client/js_min/_modules/page.profile.min.js

@ -10,7 +10,7 @@
{# avatar #}
<aside>
<div class="form-item-wrap">
<div class="avatar-btn i-pict i-descr">
<div class="avatar-btn i-pict i-descr {% if request.user.profile.avatar %}hidden{% else %}{% endif %}">
<a class="add_pic_block" title="">
<span class="fa fa-plus-circle">&nbsp;</span>
<i>{% trans 'Добавить фото' %}</i>
@ -18,7 +18,7 @@
</a>
</div>
<div class="i-pict p-editable editable-wrap hidden">
<div class="i-pict p-editable editable-wrap {% if request.user.profile.avatar %}{% else %}hidden{% endif %}">
<div id="pick-block" class="pic_block">
{% if request.user.profile.avatar %}
@ -30,7 +30,7 @@
{% endif %}
</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="/profile/update/avatar/" method="post">{% csrf_token %}
<div class="ef-body">
@ -52,7 +52,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>
@ -68,11 +68,11 @@
<header>
{# country and city #}
<div class="form-item-wrap"> <!-- 1 -->
<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>+10</b></div>
</div>
<div class="i-place p-editable editable-wrap hidden"> <!-- 2 -->
<div class="i-place p-editable editable-wrap {% if home_form.instance.country %}{% else %}hidden{% endif %}"> <!-- 2 -->
<span class="static-value"> <!-- 3 -->
<span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
@ -81,7 +81,7 @@
<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="/profile/update/home/" method="post">{% csrf_token %}
<div class="ef-body">
@ -107,7 +107,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>
@ -116,16 +116,16 @@
{# name #}
<div class="form-item-wrap"> <!-- 1 -->
<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.get_full_name %}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"> <!-- 2 -->
<div class="i-title p-editable editable-wrap {% if name_form.get_full_name %}{% else %}hidden{% endif %} "> <!-- 2 -->
<span id="static-name-value" class="static-value"><!-- 3 -->
{{ name_form.get_full_name }}
</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="name_form" action="/profile/update/name/"
method="post" method="post">{% csrf_token %}
@ -152,7 +152,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -162,13 +162,13 @@
</header>
{# position #}
<div class="form-item-wrap">
<div class="form-item-wrap full-width">
<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 work_form.position.value or work_form.work.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-position p-editable editable-wrap hidden">
<div class="i-position p-editable editable-wrap {% if work_form.position.value or work_form.work.value %}{% else %}hidden{% endif %}">
<p id="static-work-value" class="static-value">
{{ work_form.position.value }}
{% if work_form.work.value %}
@ -177,7 +177,7 @@
</p>
<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="work_form" action="/profile/update/work/" method="post">{% csrf_token %}
@ -204,7 +204,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -218,8 +218,8 @@
<div class="form-item-wrap"><!-- 1 -->
<div class="p-editable editable-wrap social">
<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 {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social full-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}{% else %}hidden{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<ul class="soc-media-buttons soc-media-buttons1">
<li>
@ -261,7 +261,7 @@
</li></li>
</ul>
<div class="add_link_text_text not-complete"><b>{% trans '+5 за каждый' %}</b></div>
<div class="add_link_text_text not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}"><b>{% trans '+5 за каждый' %}</b></div>
</div>
@ -308,7 +308,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -318,16 +318,16 @@
{# contacts #}
<div class="ic-links dd_width_5">
<div class="form-item-wrap"> <!-- 1 -->
<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 %}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"> <!-- 2 -->
<span id="static-phone-value" class="static-value"> <!-- 3 -->
<div class="ic-tel p-editable editable-wrap {% if phone_form.phone.value %}{% else %}hidden{% endif %}"> <!-- 2 -->
<span id="static-phone-value" class="static-value "> <!-- 3 -->
{{ 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="/profile/update/phone/" method="post">{% csrf_token %}
@ -347,7 +347,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -358,7 +358,7 @@
<a class="icon-mail" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a>
{% endif %}
<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" action="/profile/update/email/" method="post">{% csrf_token %}
@ -378,17 +378,17 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
{% endcomment %}
<div class="form-item-wrap">
<div class=" i-descr ic-site p-editable 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 ic-site p-editable 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 class="icon-ext-link static-value" id="static-web-page-value" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank">
{% if web_page_form.web_page.value %}
{{ web_page_form.web_page.value }}
@ -396,7 +396,7 @@
</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="/profile/update/web-page/" method="post">{% csrf_token %}
@ -416,7 +416,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -431,15 +431,15 @@
<div class="i-additional">
<div class="ia-title">{% trans 'О себе:' %}</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 about_form.about.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="p-editable editable-wrap hidden">
<div class="p-editable editable-wrap {% if about_form.about.value %}{% else %}hidden{% endif %}">
<p id="static-about-value" class="static-value">{{ about_form.about.value }}</p>
<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="about_form" action="/profile/update/about/" method="post">{% csrf_token %}
@ -459,7 +459,7 @@
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
@ -486,7 +486,7 @@
<div class="company">
<a href="{{ company.get_permanent_url }}">
<span class="logo">
{% include 'client/includes/show_logo.html' with obj=company %}
{% include 'client/includes/show_logo.html' with obj=company customSize="188x141" %}
</span>
<span class="title ">
<i class="e-btn fa fa-pencil-square-o">&nbsp;</i>
@ -500,7 +500,7 @@
</div>
<div class="add-company-block">
<a class="button icon-add" href="#" id="add-new-company">{% trans 'Добавить компанию' %}</a>
<a class="button icon-add" href="javascript:void(0);" id="add-new-company">{% trans 'Добавить компанию' %}</a>
</div>
{# END companies #}

@ -11,9 +11,16 @@
{% else %}
{% if obj.logo %}
{% thumbnail obj.logo "100x100" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
{% endthumbnail %}
{% if customSize %}
{% thumbnail obj.logo customSize as im %}
<img src="{{ im.url }}" {% if im.height > im.width %}class="portrait"{% endif %}/>
{% endthumbnail %}
{% else %}
{% thumbnail obj.logo "100x100" as im %}
<img src="{{ im.url }}"/>
{% endthumbnail %}
{% endif %}
{% else %}
<img src="{% static 'client/img/no-logo.png' %}" class="no-logo" alt="" />

@ -13,27 +13,32 @@
{% endblock %}
{% block content_list %}
<div class="m-article">
<div class="m-article recovery-page">
<form class="pw-form" method="post" action="{{ url }}">{% csrf_token %}
<p>{{ form.username_or_email.label }}</p>
<p class="label">{{ form.username_or_email.label }}</p>
<div>
<button type="submit" class="icon-check">{% trans 'Восстановить' %}</button>
<button type="submit" class="icon-check submit">{% trans 'Восстановить' %}</button>
{% if form.errors %}
{# если есть ошибка #}
<div class="required err">
{{ form.username_or_email }}
</div>
{{ form.errors.username_or_email.0 }}{# текст ошибки #}
{% else %}
{# ошибки нет #}
<div>
{{ form.username_or_email }}
</div>
{% endif %}
{% if form.errors %}
{# если есть ошибка #}
<div class="required err input">
{{ form.username_or_email }}
</div>
<div class="error-text">
{{ form.errors.username_or_email.0 }}{# текст ошибки #}
</div>
{% else %}
{# ошибки нет #}
<div class="input">
{{ form.username_or_email }}
</div>
{% endif %}
</div>
</form>

@ -5970,7 +5970,6 @@ form.s-message {
.i-info .i-position {
font-family: 'dindisplay_pro', sans-serif;
font-size: 20px;
margin: -5px 0 20px;
}
.i-info .i-position a {
@ -8070,9 +8069,6 @@ a.order-button:hover .ob-text,
line-height: 1em;
}
.i-title.p-editable .edit-wrap {
margin-top: 10px;
}
.i-place.p-editable .edit-wrap {
margin-top: 10px;
@ -11847,13 +11843,37 @@ hr + .rq-note {
background: #fff url(../img/sprites.png) -117px -145px no-repeat;
}
.add_link_text { padding-left: 0 !important; line-height: 20px; min-height: 25px;}
.add_link_text_text { font-size: 17px; color: #a2a2a2;font-family:'dindisplay_pro'; font-weight: 500; display: inline-block; position: relative; top: -1px;}
.add_link_text_top { min-height: 60px;}
.add_link_text {
padding-left:0!important;
line-height:20px;
min-height:25px;
}
.add_link_text a {color: #a2a2a2;}
.add_link_text_text {
font-size:17px;
color:#a2a2a2;
font-family:dindisplay_pro;
font-weight:500;
display:inline-block;
position:relative;
}
.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_top {
min-height:60px;
}
.add_link_text a {
color:#a2a2a2;
}
.add_link_text .edit-wrap {
display: inline-block !important;
position: relative;
left: 0;
top: 0;
height: 20px;
margin: 0 5px 0 0 !important;
}
.add_link_text a.e-btn {
display:inline-block;
width:auto;
@ -11866,6 +11886,7 @@ hr + .rq-note {
vertical-align:middle;
margin:0 5px 0 0;
padding:0 0 0 0;
line-height: 18px;
}
.add_link_text a.e-btn .fa{
width: 24px;
@ -11892,7 +11913,6 @@ hr + .rq-note {
.add_link_text.p-editable.pe-current .add_link_text_text { display: none;}
.add_link_text_medium a.e-btn, .add_link_text_medium .add_link_text_text, .add_link_text_medium { font-size: 15px !important;}
.add_link_text_medium .add_link_text_text { top: 0;}
.i-info header .i-place.add_link_text:before { display: none;}
.i-info header .i-place.add_link_text a { text-decoration: underline;color: #a2a2a2;}
@ -12872,9 +12892,18 @@ hr + .rq-note {
.edit-profile .edit-wrap{
display: block;
}
.edit-profile .i-title .e-form{
margin-top: 7px;
}
.edit-profile .full-width .static-value{
height: 27px;
}
.edit-profile .pe-current .e-form{
display: block;
}
.edit-profile .social.pe-current .i-descr{
opacity: 0;
}
.edit-profile .p-editable{
padding-left: 22px;
@ -12930,22 +12959,40 @@ hr + .rq-note {
.my-companies-block .company .logo{
display: block;
width: 100%;
height: 180px;
/*height: 180px;*/
height: auto;
-moz-box-sizing: border-box;
box-sizing: border-box;
border-radius: 4px;
border-top: 1px solid #CCCBC6;
background-color: #ffffff;
overflow: hidden;
min-height: 141px;
position: relative;
}
.my-companies-block .company .logo img.no-logo{
margin-top: 58px;
}
.my-companies-block .company .logo img{
display: table;
display: block;
width: 100%;
height: auto;
}
.my-companies-block .company .logo img.portrait{
height: 141px;
width: auto;
margin-left: auto;
margin-right: auto;
}
.my-companies-block .company .logo img.no-logo{
position: absolute;
margin-top: -29px;
margin-left: -30px;
top: 50%;
left: 50%;
width: 60px;
height: 58px;
}
.my-companies-block .company .title{
display: block;
color: #606060;
@ -12986,8 +13033,6 @@ hr + .rq-note {
}
.edit-profile .i-info .add_link_text_text{
vertical-align: middle;
top: 0;
}
.edit-profile .ic-buttons .add_link_text{
display: inline-block;
@ -13057,6 +13102,10 @@ hr + .rq-note {
.edit-profile .i-additional .editable-wrap > p{
min-height: 23px;
}
.edit-profile .i-additional .editable-wrap .static-value{
min-height: 27px;
}
.edit-profile .editable-wrap:before{
display: none;
}
@ -13211,39 +13260,74 @@ hr + .rq-note {
/************************\
# successful registration message
\***********************/
.message-register-success{
margin-top: 40px;
.message-register-success{
margin-top: 40px;
}
.message-register-success .fa{
color: #ff6600;
font-size: 80px;
margin-bottom: 40px;
}
.message-register-success span{
display: block;
text-align: center;
}
.message-register-success .message{
font-family: 'dindisplay_pro', Arial, sans-serif;
font-size: 26px;
/*color: #a2a2a2;*/
}
}
.message-register-success .fa{
color: #ff6600;
font-size: 80px;
margin-bottom: 40px;
}
.message-register-success span{
display: block;
text-align: center;
}
.message-register-success .message{
font-family: 'dindisplay_pro', Arial, sans-serif;
font-size: 26px;
/*color: #a2a2a2;*/
}
/*********************\
# add more company message
\*********************/
.message-standart{
margin-top: 40px;
}
.message-standart .fa{
color: #ff6600;
font-size: 40px;
vertical-align: sub;
margin-right: 9px;
}
.message-standart .message{
font-family: 'dindisplay_pro', Arial, sans-serif;
font-size: 26px;
}
.message-standart{
margin-top: 40px;
}
.message-standart .fa{
color: #ff6600;
font-size: 40px;
vertical-align: sub;
margin-right: 9px;
}
.message-standart .message{
font-family: 'dindisplay_pro', Arial, sans-serif;
font-size: 26px;
}
/*********************\
# recovery password page
\*********************/
.recovery-page{
padding-bottom: 2.6em;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.recovery-page .label{
font-size: 18px;
margin-bottom: 1.5em;
}
.recovery-page .submit, .recovery-page .input, .recovery-page .error-text{
display: inline-block;
}
.recovery-page .submit{
height: 40px;
line-height: 40px;
}
.recovery-page .input input{
margin-left: 24px;
width: 340px;
}
.recovery-page .input.err:before{
margin-right: 12px;
}
.recovery-page .error-text{
padding-left: 12px;
font-size: 14px;
color: #d80000;
}

File diff suppressed because one or more lines are too long

@ -606,8 +606,8 @@ if (EXPO.profile){
self.forms[formName].noImageSrc = self.opt.noImageSrc;
}
self.forms[formName].refreshState();
// todo:временно отключил
//self.forms[formName].refreshState();
// submit events handler
$(this).off('submit');

File diff suppressed because one or more lines are too long

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