remotes/origin/1203
pavel 11 years ago
parent 7eea6811f3
commit beb1dd5ce6
  1. 2
      templates/client/includes/company/company_edit.html
  2. 11
      templates/client/includes/company/company_object.html
  3. 4
      templates/client/static_client/css/main.css
  4. 7
      templates/client/static_client/js/_modules/page.company.js
  5. 2
      templates/client/static_client/js_min/_modules/page.company.min.js

@ -613,6 +613,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>
</div>
</div>
@ -649,6 +650,7 @@
avatarImageClass:'user-avatar',
avatarInputId:"id_avatar",
noImageSrc:"{% static 'client/img/no-logo.png' %}",
previewBtnId:"profile-preview-btn",
// text and paths for dynamically rendered selectboxes
selectBox:[

@ -41,8 +41,10 @@
{% endwith %}
</div>
<hr />
{{ company.address_inf }}
{% if company.address_inf %}
<hr />
{{ company.address_inf }}
{% endif %}
<hr />
@ -121,9 +123,10 @@
</div>
</div>
<hr />
{% if company.get_expositions_number > 0 or company.get_conferences_number > 0 or company.get_seminars_number > 0 %}
<div class="i-statistics">
<hr />
<div class="i-statistics">
<header class="clearfix">
<div class="ish-title">{% trans 'Участие в событиях' %}</div>

@ -13172,6 +13172,10 @@ hr + .rq-note {
.company-preview .i-info .i-contacts .ic-buttons .soc-media-buttons{
margin-top: 12px;
}
.profile-preview-btn{
margin-top: 1em;
margin-bottom: 2em;
}
/************************\
# about page /about/

@ -806,6 +806,13 @@ if (EXPO.company){
}
});
/**
* preview button
*/
$('#'+self.opt.previewBtnId).attr('href',window.location.href+"?logout=1");
//$('#'+self.opt.previewBtnId).on("click", function () {
//
//});
});

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