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

font awesome integration profiles

Browse Source
remotes/origin/1203
pavel 11 years ago
parent a5f5ceb16f
commit f74e12d019
4 changed files with 157 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      templates/client/includes/accounts/current_user.html
  2. 46
      templates/client/includes/company/company_edit.html
  3. 136
      templates/client/static_client/css/main.css
  4. 2
      templates/client/static_client/css_min/main.min.css

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

@ -12,7 +12,7 @@
<div class="form-item-wrap">
<div class="avatar-btn i-pict i-descr">
<a class="add_pic_block" title="">
<span></span>
<span class="fa fa-plus-circle">&nbsp;</span>
<i>{% trans 'Добавить фото' %}</i>
<b>+20</b>
</a>
@ -29,7 +29,7 @@
{% endif %}
</div>
<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">
<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">
@ -68,7 +68,7 @@
{# country and city #}
<div class="form-item-wrap"> <!-- 1 -->
<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>
<div class="i-place p-editable editable-wrap hidden"> <!-- 2 -->
@ -81,7 +81,7 @@
<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">
<form class="clearfix update-profile-form" id="home_form" action="/profile/update/home/" method="post">{% csrf_token %}
<div class="ef-body">
@ -117,7 +117,7 @@
{# name #}
<div class="form-item-wrap"> <!-- 1 -->
<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>
<div class="i-title p-editable editable-wrap hidden"> <!-- 2 -->
@ -125,7 +125,7 @@
{{ name_form.get_full_name }}
</span>
<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">
<form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/"
method="post" method="post">{% csrf_token %}
@ -165,7 +165,7 @@
<div class="form-item-wrap">
<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>
<div class="i-position p-editable editable-wrap hidden">
@ -177,7 +177,7 @@
</p>
<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">
<form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %}
@ -218,7 +218,7 @@
<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 no-refresh social" href="#" title="">{% trans 'Добавить' %}</a>
<a class="e-btn no-refresh social " href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<ul class="soc-media-buttons soc-media-buttons1">
<li>
@ -318,7 +318,7 @@
<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="">{% 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>
<div class="ic-tel p-editable editable-wrap hidden"> <!-- 2 -->
@ -326,7 +326,7 @@
{{ phone_form.phone.value|phone }}
</span>
<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">
<form class="clearfix update-profile-form" id="phone_form" action="/profile/update/phone/" method="post">{% csrf_token %}
@ -357,7 +357,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" href="#">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="#">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix" action="/profile/update/email/" method="post">{% csrf_token %}
@ -384,7 +384,7 @@
{% 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="">{% 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>
<div class="ic-site p-editable editable-wrap hidden">
@ -395,7 +395,7 @@
</a>
<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">
<form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %}
@ -431,14 +431,14 @@
<div class="ia-title">{% trans 'О себе:' %}</div>
<div class="form-item-wrap">
<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>
<div class="p-editable editable-wrap hidden">
<p id="static-about-value" class="static-value">{{ about_form.about.value }}</p>
<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">
<form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %}
@ -469,7 +469,7 @@
{# companies #}
<div class="my-companies-block editable">
<div class="ia-title">{% trans 'Мои компании:' %}</div>
<div class="ia-title ">{% trans 'Мои компании:' %}</div>
{% if request.user.created_company.all %}
{% else %}
<div class="message-standart">
@ -487,8 +487,9 @@
<span class="logo">
{% include 'client/includes/show_logo.html' with obj=company %}
</span>
<span class="title">
{{ company.name }}
<span class="title ">
<i class="e-btn fa fa-pencil-square-o">&nbsp;</i>
<span>{{ company.name }}</span>
</span>
</a>
</div>

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

@ -11,7 +11,7 @@
<div class="form-item-wrap">
<div class=" avatar-btn i-pict i-descr">
<a class="add_pic_block" title="">
<span></span>
<span class="fa fa-plus-circle">&nbsp;</span>
<i>{% trans 'Добавить лого' %}</i>
<b>+20</b>
</a>
@ -66,7 +66,7 @@
<!--!-->
<div class="form-item-wrap">
<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>+5</b></div>
</div>
<div class="i-place p-editable editable-wrap hidden">
@ -77,7 +77,7 @@
<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">
<form class="clearfix update-profile-form" id="home_form" action="/company/update/home/{{ company.url }}/" method="post">{% csrf_token %}
@ -120,14 +120,14 @@
</div>
<div class="form-item-wrap">
<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>
<div class="i-title p-editable editable-wrap hidden required">
<span id="static-name-value" class="static-value">{{ name_form.name.value }}</span>
<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">
<form class="clearfix update-profile-form" id="name_form" action="/company/update/name/{{ company.url }}/" method="post">{% csrf_token %}
@ -157,13 +157,13 @@
<!--!-->
<div class="form-item-wrap">
<div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">Добавить</a>
<div class="add_link_text_text">краткое описание компании <b>+20</b></div>
<a class="e-btn" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'краткое описание компании' %} <b>+20</b></div>
</div>
<div class="i-position p-editable editable-wrap hidden required">
<span id="static-spec-value" class="static-value">{{ spec_form.specialization.value }}</span>
<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">
<form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/{{ company.url }}/" method="post">{% csrf_token %}
@ -200,13 +200,13 @@
<!--!-->
<div class="form-item-wrap">
<div class="i-descr add_link_text ">
<a class="e-btn" href="#" title="">Добавить</a>
<div class="add_link_text_text">адрес компании <b>+15</b></div>
<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>
<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>
<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">
<form class="clearfix update-profile-form" id="address_form" action="/company/update/address/{{ company.url }}/" method="post">{% csrf_token %}
@ -355,14 +355,14 @@
<div class="ic-links ic-links_indent dd_width_5">
<div class="form-item-wrap">
<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>
<div class="ic-tel p-editable editable-wrap hidden">
<span id="static-phone-value" class="static-value">{{ phone_form.phone.value|phone }}</span>
<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">
<form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -386,7 +386,7 @@
<div class="form-item-wrap">
<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>
<div class=" p-editable editable-wrap hidden required">
@ -396,7 +396,7 @@
</div>
<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">
<form class="clearfix update-profile-form" id="email_form" action="/company/update/email/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -421,7 +421,7 @@
<div class="form-item-wrap">
<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>
<div class="ic-site p-editable editable-wrap hidden">
@ -430,7 +430,7 @@
</a>
<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">
<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="form-item-wrap">
<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>
<div class="p-editable ic-tel ic-links editable-wrap hidden">
@ -472,7 +472,7 @@
<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">
<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 class="form-item-wrap">
<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>
@ -508,7 +508,7 @@
<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">
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body">
@ -532,7 +532,7 @@
</div>
<div class="form-item-wrap">
<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>
@ -543,7 +543,7 @@
<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 %}">

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

@ -8113,14 +8113,12 @@ a.order-button:hover .ob-text,
}
.e-btn:before {
content: '';
display: block;
width: 18px;
height: 16px;
background: url(../img/sprites.png) -117px -145px no-repeat;
position: absolute;
left: 5px;
top: 4px;
font-size: 18px;
color: #ff6600;
}
.e-btn:hover {
@ -11724,17 +11722,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.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';
cursor: pointer;}
.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;}
.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 0;}
.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;margin:0 4px 0 0;position:relative;top:1px;}
.add_pic_block:hover { color: #ff6600;}
.add_pic_block:hover span { background-color: #ff6600;}
.add_pic_block:hover b:before { background-position: -181px -32px;}
.add_pic_block {
display:block;
width:100px;
height:80px;
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;
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{
margin: 0;
padding: 0;}
@ -11793,9 +11853,34 @@ hr + .rq-note {
.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 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;
vertical-align: middle;}
.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;}
.add_link_text a.e-btn {
display:inline-block;
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: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;}
@ -12857,17 +12942,22 @@ hr + .rq-note {
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{
text-decoration: none;
}
.my-companies-block.editable .company .title:before{
content: '';
width: 18px;
height: 16px;
background: url(../img/sprites.png) -117px -145px no-repeat;
.my-companies-block.editable .company .fa:before{
position: absolute;
left: 0;
top: 0;
font-size: 18px;
color: #ff6600;
}
.add-company-block{
margin-top: 2em;

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