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

expo-95-91

Browse Source
remotes/origin/1203
pavel 11 years ago
parent cbf649ebe3
commit 03c7ea3d07
5 changed files with 59 additions and 33 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. 18
      templates/client/includes/accounts/simple_user.html
  2. 19
      templates/client/includes/company/company_edit.html
  3. 50
      templates/client/includes/company/company_object.html
  4. 3
      templates/client/static_client/css/main.css
  5. 2
      templates/client/static_client/css_min/main.min.css

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

@ -35,7 +35,7 @@
</div> </div>
<div class="i-descr"> <div class="i-descr">
{{ member.profile.about_company|safe|linebreaks }} {{ member.profile.about_company|safe }}
</div> </div>
<hr /> <hr />
@ -69,7 +69,6 @@
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
<div class="ic-links"> <div class="ic-links">
{% if member.profile.phone and member.profile.show_phone %} {% if member.profile.phone and member.profile.show_phone %}
<div class="ic-tel"> <div class="ic-tel">
@ -104,10 +103,17 @@
<div class="ish-title">{% trans 'Участие в событиях' %}</div> <div class="ish-title">{% trans 'Участие в событиях' %}</div>
<div class="ish-data"> <div class="ish-data">
<span><a href="/user/{{ member.url }}/expositions/"><b>{{ member.get_expositions_number }}</b> в&nbsp;выставках</a></span> {% if member.get_expositions_number > 0 %}
<span><a href="/user/{{ member.url }}/conferences/"><b>{{ member.get_conferences_number }}</b> в&nbsp;конференциях</a></span> <span><a href="/user/{{ member.url }}/expositions/"><b>{{ member.get_expositions_number }}</b> в&nbsp;выставках</a></span>
<span><a href="/user/{{ member.url }}/seminars/"><b>{{ member.get_seminars_number }}</b> в&nbsp;семинарах</a></span> {% endif %}
</div> {% if member.get_conferences_number > 0 %}
<span><a href="/user/{{ member.url }}/conferences/"><b>{{ member.get_conferences_number }}</b> в&nbsp;конференциях</a></span>
{% endif %}
{% if member.get_seminars_number > 0 %}
<span><a href="/user/{{ member.url }}/seminars/"><b>{{ member.get_seminars_number }}</b> в&nbsp;семинарах</a></span>
{% endif %}
</div>
</header> </header>
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
</ul> </ul>

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

@ -158,8 +158,7 @@
<div class="add_link_text_text">{% trans 'краткое описание компании' %} <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 {% if spec_form.specialization %}{% else %}hidden{% endif %} 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|linebreaks }}&nbsp;</span> <span id="static-spec-value" class="static-value min-height">{{ spec_form.specialization.value }}&nbsp;</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
@ -204,12 +203,12 @@
{% endwith %} {% endwith %}
<hr /> <hr />
<div class="form-item-wrap {% if address_form.address_inf %}hidden{% else %}{% endif %}"> <div class="form-item-wrap ">
<div class="i-descr add_link_text "> <div class="i-descr add_link_text {% if address_form.address_inf.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" 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 class="add_link_text_text">{% trans 'адрес компании' %} <b>+15</b></div>
</div> </div>
<div class="ic-tel p-editable editable-wrap {% if address_form.address_inf %}{% else %}hidden{% endif %} required"> <div class="ic-tel p-editable editable-wrap {% if address_form.address_inf.value %}{% else %}hidden{% endif %} 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 fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
@ -278,11 +277,10 @@
<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 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 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 %} 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" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></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"> <ul class="soc-media-buttons soc-media-buttons1">
<li> <li>
@ -325,7 +323,7 @@
</ul> </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> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<div class="e-form"> <div class="e-form">
@ -612,10 +610,8 @@
</dl> </dl>
<!-- !!! --> <!-- !!! -->
</div> </div>
<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> <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>
</div> </div>
</div> </div>
@ -651,6 +647,7 @@
avatarImageClass:'user-avatar', avatarImageClass:'user-avatar',
avatarInputId:"id_avatar", avatarInputId:"id_avatar",
noImageSrc:"{% static 'client/img/no-logo.png' %}", noImageSrc:"{% static 'client/img/no-logo.png' %}",
previewBtnId:"profile-preview-btn",
// text and paths for dynamically rendered selectboxes // text and paths for dynamically rendered selectboxes
selectBox:[ selectBox:[

50
templates/client/includes/company/company_object.html
Unescape View File

@ -22,7 +22,9 @@
<div class="i-title">{{ company.name|safe }}</div> <div class="i-title">{{ company.name|safe }}</div>
</header> </header>
<div class="i-area"><a href="#">{{ company.specialization|linebreaks }}</a></div> <div class="i-area specialization">
{{ company.specialization }}
</div>
{% with themes=company.theme.all %} {% with themes=company.theme.all %}
<div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}"> <div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}">
{% for th in themes %} {% for th in themes %}
@ -41,8 +43,11 @@
{% endwith %} {% endwith %}
</div> </div>
<hr /> {% if company.address_inf %}
{{ company.address_inf }}
<hr />
{{ company.address_inf }}
{% endif %}
<hr /> <hr />
@ -96,7 +101,9 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% if company.foundation or company.staff_number or company.description %}
<hr /> <hr />
<div class="i-additional"> <div class="i-additional">
<div class="ia-title">{% trans 'Дополнительная информация' %}</div> <div class="ia-title">{% trans 'Дополнительная информация' %}</div>
@ -118,21 +125,35 @@
</dl> </dl>
</div> </div>
{% endif %}
</div>
</div>
</div> </div>
<hr />
<div class="i-statistics">
<header class="clearfix">
<div class="ish-title">{% trans 'Участие в событиях' %}</div>
<div class="ish-data">
<span><a href="/expositions/member-{{ company.url }}"><b>{{ company.get_expositions_number }}</b> в&nbsp;{% trans 'выставках' %}</a></span>
<span><a href="/conferences/member-{{ company.url }}"><b>{{ company.get_conferences_number }}</b> в&nbsp;{% trans 'конференциях' %}</a></span>
<span><a href="/seminars/member-{{ company.url }}"><b>{{ company.get_seminars_number }}</b> в&nbsp;{% trans 'семинарах' %}</a></span>
</div>
</header>
<div class="i-statistics">
{% if company.get_expositions_number > 0 or company.get_conferences_number > 0 or company.get_seminars_number > 0 %}
<hr />
<header class="clearfix">
<div class="ish-title">{% trans 'Участие в событиях' %}</div>
<div class="ish-data">
{% if company.get_expositions_number > 0 %}
<span><a href="/expositions/member-{{ company.url }}"><b>{{ company.get_expositions_number }}</b> в&nbsp;{% trans 'выставках' %}</a></span>
{% endif %}
{% if company.get_conferences_number > 0 %}
<span><a href="/conferences/member-{{ company.url }}"><b>{{ company.get_conferences_number }}</b> в&nbsp;{% trans 'конференциях' %}</a></span>
{% endif %}
{% if company.get_seminars_number > 0 %}
<span><a href="/seminars/member-{{ company.url }}"><b>{{ company.get_seminars_number }}</b> в&nbsp;{% trans 'семинарах' %}</a></span>
{% endif %}
</div>
</header>
{% endif %}
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
{% for event in company.get_events %} {% for event in company.get_events %}
<li class="cl-item"> <li class="cl-item">
@ -179,6 +200,7 @@
<a class="button more" href="/expositions/member-{{ company.url }}">{% trans 'Все события' %}</a> <a class="button more" href="/expositions/member-{{ company.url }}">{% trans 'Все события' %}</a>
{% endif %} {% endif %}
</div> </div>
<hr /> <hr />
<div class="i-staff"> <div class="i-staff">
<div class="sect-title"><a href="#">{% trans 'Сотрудники' %}</a></div> <div class="sect-title"><a href="#">{% trans 'Сотрудники' %}</a></div>

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

@ -13191,9 +13191,10 @@ hr + .rq-note {
.edit-profile .specialization .p-editable{ .edit-profile .specialization .p-editable{
min-height: 27px; min-height: 27px;
} }
.edit-profile .theme-form{ .edit-profile .theme-form select{
opacity: 0; opacity: 0;
} }
/************************\ /************************\
# about page /about/ # 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
Write Preview
Loading…
Cancel
Save