EXPO-91-NEW-2,3,4

remotes/origin/1203
pavel 11 years ago
parent ff57abdcaa
commit 29a716619b
  1. 6
      templates/client/includes/accounts/current_user.html
  2. 5
      templates/client/includes/accounts/simple_user.html
  3. 19
      templates/client/static_client/css/main.css
  4. 2
      templates/client/static_client/css_min/main.min.css
  5. 12
      templates/client/static_client/js/_modules/page.profile.js
  6. 2
      templates/client/static_client/js_min/_modules/page.profile.min.js

@ -338,7 +338,11 @@
<label>{{ phone_form.phone.label }}</label>
<div class="epf-field">
{{ phone_form.phone }}
{{ phone_form.show_phone }}
<label class="check">
{{ phone_form.show_phone }}
{% trans 'Показывать всем' %}
</label>
</div>
</div>

@ -65,8 +65,9 @@
</li>
{% endif %}
</ul>
<a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a>
{% if user.is_authenticated %}
<a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a>
{% endif %}
</div>
<div class="ic-links">
{% if member.profile.phone and member.profile.show_phone %}

@ -12929,10 +12929,29 @@ hr + .rq-note {
}
.edit-profile .i-pict.p-editable{
padding: 0;
}
.edit-profile .ic-tel .custom-radio-check{
position: relative;
}
.edit-profile .i-pict.p-editable img{
z-index: 0;
}
.edit-profile .ic-tel .epfl{
margin-bottom: 0;
}
.edit-profile .check{
color: #f5f5f5;
margin-top: 4px;
margin-bottom: 0;
padding-left: 4px;
}
.edit-profile .check .custom-checkbox{
width: 14px;
height: 14px;
margin: 0;
margin-top: -1px;
margin-right: 5px;
}
.my-companies-block{
}

File diff suppressed because one or more lines are too long

@ -661,7 +661,7 @@ if (EXPO.profile){
if(self.forms[formId].refrashable){
self.forms[formId].refreshState();
$editable.removeClass(EXPO.company.opt.formCurrentClass);
$editable.removeClass(EXPO.profile.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
}
@ -734,6 +734,16 @@ if (EXPO.profile){
$this.val('');
}
});
/**
* show phone to all checkbox
*/
//$('#id_show_phone').on("change", function () {
// if ($(this).prop("checked")){
// $(this).closest(".custom-radio-check").addClass("active");
// }else{
// $(this).closest(".custom-radio-check").removeClass("active");
// }
//});
});

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