remotes/origin/1203
Назар Котюк 11 years ago
commit fca258e3ff
  1. 7
      templates/client/article/news.html
  2. 10
      templates/client/includes/header.html
  3. 5
      templates/client/popups/advertise.html
  4. 43
      templates/client/service/translator.html
  5. 2
      templates/client/simple_pages/advertising.html
  6. 39
      templates/client/static_client/css/main.css
  7. 2
      templates/client/static_client/css_min/main.min.css
  8. 83
      templates/client/static_client/js/_modules/page.translator.js
  9. 1
      templates/client/static_client/js_min/_modules/page.translator.min.js

@ -41,11 +41,16 @@
{% for news in object.similar %} {% for news in object.similar %}
<div class="cl-item"> <div class="cl-item">
<div class="acticle_list"> <div class="acticle_list">
<a href="{{ news.get_permanent_url }}" title="">{% include 'includes/show_logo.html' with obj=news %}</a> <a href="{{ news.get_permanent_url }}" title="">
<span class="cli-pict">
{% include 'includes/show_logo.html' with obj=news %}
</span>
</a>
<h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title }}</a></h3> <h3><a href="{{ news.get_permanent_url }}" title="">{{ news.main_title }}</a></h3>
<p>{{ news.preview }}</p> <p>{{ news.preview }}</p>
<strong><span>{{ news.publish_date|date:"d E Y" }}</span>{% if news.get_event %}<a href="{{ news.get_event.get_permanent_url }}" title=""><b>{{ news.get_event.name }}</b></a><{% endif %}</strong> <strong><span>{{ news.publish_date|date:"d E Y" }}</span>{% if news.get_event %}<a href="{{ news.get_event.get_permanent_url }}" title=""><b>{{ news.get_event.name }}</b></a><{% endif %}</strong>
</div> </div>
<div class="clearfix"></div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>

@ -57,16 +57,14 @@
<div class="cabinet-links"> <div class="cabinet-links">
<div class="cl-body clearfix"> <div class="cl-body clearfix">
<div class="clb-profile"><a class="icon-user" href="{{ request.user.get_permanent_url }}">{% trans 'личный кабинет' %}</a></div> <div class="clb-profile"><a class="icon-user" href="{{ request.user.get_permanent_url }}">{% trans 'личный кабинет' %}</a></div>
<div class="clb-docs">
<a class="cl-btn icon-cal" href="/profile/calendar/">{% trans 'календарь' %}</a>
<a class="cl-btn icon-doc" href="/profile/feed/">{% trans 'документы' %}</a>
</div>
<div class="clb-messages"><a class="icon-msg" href="/profile/messages/">{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a></div> <div class="clb-messages"><a class="icon-msg" href="/profile/messages/">{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a></div>
<div class="clb-settings"> <div class="clb-settings">
<a class="cl-btn icon-gear" href="/profile/settings/">{% trans 'настройки' %}</a> <a class="cl-btn icon-gear" href="/profile/settings/">{% trans 'настройки' %}</a>
</div> </div>
<div class="clb-docs">
<a class="cl-btn icon-cal" href="/profile/calendar/">{% trans 'календарь' %}</a>
<a class="cl-btn icon-doc" href="/profile/feed/">{% trans 'документы' %}</a>
</div>
</div> </div>
<div class="logout"><a href="/logout/">{% trans 'Выход' %}</a></div> <div class="logout"><a href="/logout/">{% trans 'Выход' %}</a></div>

@ -6,6 +6,11 @@
<div class="pw-title">{% trans 'Ваши контактные данные' %}</div> <div class="pw-title">{% trans 'Ваши контактные данные' %}</div>
</header> </header>
<div class="pw-body clearfix"> <div class="pw-body clearfix">
<div class="label">
<p>
Оставьте свои контактные данные. В кратчайшие сроки мы с Вами свяжемся, чтобы подобрать наиболее подходящие рекламные инструменты!
</p>
</div>
<form class="pw-form simple-validate" method="post" id="advertise-form" action="/service/com_rek/"> <form class="pw-form simple-validate" method="post" id="advertise-form" action="/service/com_rek/">
{% csrf_token %} {% csrf_token %}
<div class="pwf-line"> <div class="pwf-line">

@ -61,42 +61,12 @@
<div class="mf-line cols-2 rq-trans"> <div class="mf-line cols-2 rq-trans">
<div class="mf-field"> <div class="mf-field">
<label>{% trans 'Знание языков' %}:</label> <input id="id_languages" name="languages" placeholder="{% trans 'Знание языков' %}" type="text">
<div class="c-select-box select" data-placeholder="">
<div class="csb-selected-items"></div>
<div class="csb-menu-wrap">
<div class="scroll-container csb-menu">
<div class="scroll-content clearfix">
<ul>
{% for choice_id, choice_label in form.languages.field.choices %}
<li><label><input type="checkbox" name="languages" value="{{ choice_id }}" />{{ choice_label }}</label></li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
</div> </div>
<div class="mf-field"> <div class="mf-field">
<label>{% trans 'Тематика' %}:</label> <input id="id_themes" name="themes" placeholder="{% trans 'Тематика' %}" type="text">
<div class="c-select-box select" data-placeholder="">
<div class="csb-selected-items"></div>
<div class="csb-menu-wrap">
<div class="scroll-container csb-menu">
<div class="scroll-content clearfix">
<ul>
{% for choice_id, choice_label in form.theme.field.choices %}
<li><label><input type="checkbox" name="themes" value="{{ choice_id }}" />{{ choice_label }}</label></li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
@ -374,5 +344,12 @@
</div> </div>
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.translator.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.translator.min.js' %}"></script>
{% endif %}
<script>
EXPO.translator.init({});
</script>
{% endblock %} {% endblock %}

@ -208,5 +208,7 @@
</div> </div>
</div> </div>
<div class="popups-wrap">
{% include 'client/popups/advertise.html' %} {% include 'client/popups/advertise.html' %}
</div>
{% endblock %} {% endblock %}

@ -688,7 +688,7 @@ a.l-button.ico:before {
.cabinet-links .cl-body > div.clb-docs { .cabinet-links .cl-body > div.clb-docs {
width: 57px; width: 57px;
padding-left: 6px; padding-left: 6px;
float: right; float: left;
} }
.cabinet-links .cl-body > div.clb-docs a.cl-btn { .cabinet-links .cl-body > div.clb-docs a.cl-btn {
@ -2263,7 +2263,7 @@ button.icon-arrow:before {
margin-bottom: 4px; margin-bottom: 4px;
} }
.mp-catalog-lists .mpc-list ul a { .mp-catalog-lists .mpc-list ul a, .leter-list a {
color: #464646; color: #464646;
text-decoration: none; text-decoration: none;
} }
@ -2278,6 +2278,7 @@ button.icon-arrow:before {
} }
.mp-catalog-lists .mpc-list ul a, .mp-catalog-lists .mpc-list ul a,
.leter-list a,
.mp-catalog-lists .mpc-list ul a * { .mp-catalog-lists .mpc-list ul a * {
-webkit-transition: color .3s; -webkit-transition: color .3s;
-o-transition: color .3s; -o-transition: color .3s;
@ -2285,6 +2286,7 @@ button.icon-arrow:before {
} }
.mp-catalog-lists .mpc-list ul a:hover, .mp-catalog-lists .mpc-list ul a:hover,
.leter-list a:hover,
.mp-catalog-lists .mpc-list ul a:hover * { .mp-catalog-lists .mpc-list ul a:hover * {
color: #ff6600; color: #ff6600;
text-decoration: none; text-decoration: none;
@ -4268,14 +4270,15 @@ form.s-message {
.ui-datepicker { .ui-datepicker {
display: none; display: none;
width: 236px; width: 200px;
height: auto; height: auto;
padding: 10px; padding: 10px;
font-family: 'dindisplay_pro', sans-serif; font-family: 'dindisplay_pro', sans-serif;
font-size: 15px; font-size: 13px;
border: 1px solid #bdbdbd; border: 1px solid #bdbdbd;
background: #fff; background: #fff;
border-radius: 4px; border-radius: 4px;
line-height: 13px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, .5); box-shadow: 0 0 10px 0 rgba(0, 0, 0, .5);
} }
@ -4292,8 +4295,8 @@ form.s-message {
font-weight: 500; font-weight: 500;
text-transform: uppercase; text-transform: uppercase;
border-bottom: 1px dotted #bdbdbd; border-bottom: 1px dotted #bdbdbd;
padding-bottom: 12px; padding-bottom: 6px;
margin-bottom: 12px; margin-bottom: 6px;
font-size: 21px; font-size: 21px;
line-height: 33px; line-height: 33px;
} }
@ -4380,7 +4383,7 @@ form.s-message {
} }
.ui-datepicker tbody td { .ui-datepicker tbody td {
padding: 4px 0; padding: 2px 0;
text-align: center; text-align: center;
} }
@ -6807,7 +6810,7 @@ dl.add-info dd ul li {
.i-members a.more { .i-members a.more {
font-size: 11px; font-size: 11px;
display: block; display: block;
} }
.i-members ul { .i-members ul {
@ -8749,16 +8752,16 @@ a.order-button:hover .ob-text,
line-height: 32px; line-height: 32px;
word-spacing: -4px; word-spacing: -4px;
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
max-width: 94px; max-width: 94px;
} }
.pr-list .prl-value .small{ .pr-list .prl-value .small{
word-spacing: 0; word-spacing: 0;
white-space: normal; white-space: normal;
font-size: 14px; font-size: 14px;
display: block; display: block;
line-height: 1em; line-height: 1em;
padding-top: 2px; padding-top: 2px;
} }
.pr-list .prl-descr { .pr-list .prl-descr {
@ -11369,9 +11372,9 @@ hr + .rq-note {
} }
.leter-list .leter{ .leter-list .leter{
color: #ff6600; color: #ff6600;
margin-bottom: 1em;
} }
/* END block*/ /* END block*/
@ -12939,8 +12942,8 @@ hr + .rq-note {
position: absolute; position: absolute;
text-align: center; text-align: center;
/*-webkit-transition: all 0.8s ease-In;*/ /*-webkit-transition: all 0.8s ease-In;*/
/*-o-transition: all 0.8s ease-In;*/ /*-o-transition: all 0.8s ease-In;*/
/*transition: all 0.8s ease-In;*/ /*transition: all 0.8s ease-In;*/
} }

File diff suppressed because one or more lines are too long

@ -0,0 +1,83 @@
var EXPO = EXPO || {}; //isolated namespace
if (EXPO.translator) {
console.warn('WARNING: EXPO.translator is already defined!');
} else {
EXPO.translator = (function () {
/**
* private (visible inside this module only) variables
*/
/**
* @type {Object} - module API interafce realization
*/
var that = {};
/**
* @type {Object} default setting
*/
that.opt = {};
/**
* dependencies.Place where you can switch on dependencies for module
* @type {EXPO.common|*} - mostly used in project functions and data (block.common.js)
*/
var com = EXPO.common;
/**
* current module general initialization
* @param {Object} options - options recieved from web page view
*/
that.init = function (options) {
/**
* default module options
* @type {Object}
*/
this.opt = {
fromDateId:"id_fr",
toDateId:"id_to"
};
// settings extending
$.extend(this.opt, options);
// begin of initialization
var self = this,
opt = this.opt,
$dateFrom = $(document.getElementById(opt.fromDateId)),
$dateTo = $(document.getElementById(opt.toDateId));
$(function () {
$.datepicker.setDefaults($.datepicker.regional["ru"]);
$dateFrom.datepicker({
dateFormat: 'dd.mm.yy',
showOn: 'button',
showOtherMonths: true,
constrainInput: true,
onClose: function( selectedDate ) {
$dateTo.datepicker( "option", "minDate", selectedDate );
}
}).inputmask("99.99.9999",{
showMaskOnHover:false,
insertMode:false,
'oncomplete': function () {
$activeField = this;
}
});
$dateTo.datepicker({
dateFormat: 'dd.mm.yy',
showOn: 'button',
showOtherMonths: true,
constrainInput: true,
onClose: function( selectedDate ) {
$dateFrom.datepicker( "option", "maxDate", selectedDate );
}
}).inputmask("99.99.9999",{
showMaskOnHover:false,
insertMode:false,
'oncomplete': function () {
$activeField = this;
}
});
});
};
return that;
}());
}

@ -0,0 +1 @@
var EXPO=EXPO||{};EXPO.translator?console.warn("WARNING: EXPO.translator is already defined!"):EXPO.translator=function(){var t={};t.opt={};EXPO.common;return t.init=function(t){this.opt={fromDateId:"id_fr",toDateId:"id_to"},$.extend(this.opt,t);var e=this.opt,o=$(document.getElementById(e.fromDateId)),n=$(document.getElementById(e.toDateId));$(function(){$.datepicker.setDefaults($.datepicker.regional.ru),o.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(t){n.datepicker("option","minDate",t)}}).inputmask("99.99.9999",{showMaskOnHover:!1,insertMode:!1,oncomplete:function(){$activeField=this}}),n.datepicker({dateFormat:"dd.mm.yy",showOn:"button",showOtherMonths:!0,constrainInput:!0,onClose:function(t){o.datepicker("option","maxDate",t)}}).inputmask("99.99.9999",{showMaskOnHover:!1,insertMode:!1,oncomplete:function(){$activeField=this}})})},t}();
Loading…
Cancel
Save