remotes/origin/1203
pavel 11 years ago
parent cf9b3579bc
commit 3f938c5d53
  1. 24
      templates/client/includes/company/company_edit.html
  2. 24
      templates/client/static_client/css/main.css
  3. 2
      templates/client/static_client/css_min/main.min.css
  4. 13
      templates/client/static_client/js/_modules/page.company.js
  5. 1
      templates/client/static_client/js/_modules/page.profile.js
  6. 2
      templates/client/static_client/js_min/_modules/page.company.min.js

@ -185,12 +185,20 @@
</div>
</div>
{% with themes=company.theme.all %}
<div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}">
<form class="inline-block" id="theme_form" action="/company/update/theme/{{ company.url }}/" method="post">
{% csrf_token %}
<div class="tag-select">{{ theme_form.theme }}</div>
</form>
</div>
<div class="theme-wrap">
<div class="label">
<p>Тематика:</p>
</div>
<div class="input">
<div class="i-area" id="theme-inf" data-theme="{% for th in themes %}{{ th.id }},{% endfor %}">
<form class="inline-block" id="theme_form" action="/company/update/theme/{{ company.url }}/" method="post">
{% csrf_token %}
<div class="tag-select">{{ theme_form.theme }}</div>
</form>
</div>
</div>
</div>
{% endwith %}
<hr />
@ -630,6 +638,10 @@
{id:'id_tag',
placeholder:'Выберите ключевые теги',
path:'http://{{ request.get_host }}/theme/get-tag/'
},
{id:'id_theme',
placeholder:'Укажите тематику',
}
],
// we need this id to enable mapping library

@ -13150,10 +13150,28 @@ hr + .rq-note {
min-height: 19px;
padding-top: 5px;
}
.edit-profile .theme-wrap .label,
.edit-profile .theme-wrap .input{
display: inline-block;
}
.edit-profile .theme-wrap .label {
font-size: 15px;
color: #a2a2a2;
font-family: dindisplay_pro;
font-weight: 500;
display: inline-block;
position: relative;
padding-right: 6px;
}
.edit-profile .theme-wrap .label p{
display: inline;
/************************\
# about page /about/
\***********************/
}
/************************\
# about page /about/
\***********************/
.about-page .tab{
display: none;

File diff suppressed because one or more lines are too long

@ -488,13 +488,21 @@ if (EXPO.company){
$(function () {
var $editables = $('.'+self.opt.editableClass),
$country = $('#'+self.opt.selectBox[0].id),
$city = $('#'+self.opt.selectBox[1].id);
$city = $('#'+self.opt.selectBox[1].id),
$theme = $('#'+self.opt.selectBox[3].id);
//start of document.ready
$waiter = $('#wait-ajax').css({'z-index': '8012'});
/**
* <selectbox> styling with 3-rd party libs
*/
/**
* company theme multiple select
*/
$theme.select2({
width: 'element',
placeholder: self.opt.selectBox[3].placeHolder,
maximumSelectionSize: 3
});
/**
* select country
*/
@ -525,6 +533,7 @@ if (EXPO.company){
if($country.val() == 0 || $country.val() == ''){
$city.prop('disabled', true);
}
$city.select2({
placeholder: self.opt.selectBox[1].placeHolder,
width: 'element',

@ -423,7 +423,6 @@ if (EXPO.profile){
};
this.ajaxPath = path;
};

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