Merge branch 'stage3_release' of bitbucket.org:Bonus_05/expomap into stage3_release

remotes/origin/stage3_release
Alexander Burdeiny 10 years ago
commit f95e502e25
  1. 37
      static/participation_landing/css/main.css
  2. 5
      static/participation_landing/js/main.js
  3. 7
      templates/admin/base.html
  4. 4
      templates/admin/includes/admin_nav.html
  5. 4
      templates/admin/includes/staff_nav.html
  6. 4
      templates/client/article/news.html
  7. 2
      templates/client/includes/accounts/simple_user.html
  8. 15
      templates/client/simple_pages/participation_landing.html

@ -489,7 +489,7 @@ h1 .orange{
.not_end{ .not_end{
font-size: 24px; font-size: 24px;
font-weight: 700; font-weight: 400;
} }
.not_end a{ .not_end a{
@ -630,6 +630,7 @@ h1 .orange{
.review h5{ .review h5{
font-size: 22px; font-size: 22px;
margin-bottom: 5px; margin-bottom: 5px;
font-weight: 400;
} }
.review i{ .review i{
@ -703,11 +704,6 @@ h1 .orange{
text-decoration: none; text-decoration: none;
} }
.articles li a:hover img{
box-shadow: 0px 8px 18px rgba(255, 132, 0, 0.48), 8px 0px 18px rgba(255, 132, 0, 0.48);
transition: box-shadow .3s;
}
.articles li a:hover span{ .articles li a:hover span{
text-decoration: none; text-decoration: none;
color: #ff6600; color: #ff6600;
@ -740,8 +736,12 @@ footer h5{
padding: 50px 0px; padding: 50px 0px;
} }
.subscribe_form input{ .subscribe_form .form_field{
display: inline-block; display: inline-block;
position: relative;
}
.subscribe_form input{
vertical-align: top; vertical-align: top;
width: 395px; width: 395px;
height: 45px; height: 45px;
@ -771,6 +771,16 @@ footer h5{
cursor: pointer; cursor: pointer;
} }
.subscribe_form .form_error{
padding-top: 5px;
text-align: center;
font-size: 18px;
color: #f00;
position: absolute;
left: 0px;
right: 0px;
}
footer p{ footer p{
font-size: 36px; font-size: 36px;
font-weight: 400; font-weight: 400;
@ -814,15 +824,16 @@ footer p span{
background: -ms-linear-gradient(top, rgba(19,22,26,1) 0%, rgba(29,22,29,1) 100%); background: -ms-linear-gradient(top, rgba(19,22,26,1) 0%, rgba(29,22,29,1) 100%);
background: linear-gradient(to bottom, rgba(19,22,26,1) 0%, rgba(29,22,29,1) 100%); background: linear-gradient(to bottom, rgba(19,22,26,1) 0%, rgba(29,22,29,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#13161a', endColorstr='#1d161d', GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#13161a', endColorstr='#1d161d', GradientType=0 );
font-family: 'Open Sans', sans-serif;
} }
.modal h2 { .modal h2 {
font: 33px 'DinProBlack', sans-serif; font: bold 28px 'Open Sans', sans-serif;
color: #fff; color: #fff;
} }
.modal h3 { .modal h3 {
font: 300 18px 'DinPro', sans-serif; font: 300 18px 'Open Sans', sans-serif;
color: #fff; color: #fff;
padding: 10px 0px 20px; padding: 10px 0px 20px;
} }
@ -830,7 +841,7 @@ footer p span{
.modal input { .modal input {
display: block; display: block;
width: 310px; width: 310px;
font: 300 15px/43px 'DinPro', sans-serif; font: 300 15px/43px 'Open Sans', sans-serif;
padding: 0px 18px 0px; padding: 0px 18px 0px;
background: #eaeaea; background: #eaeaea;
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
@ -843,6 +854,12 @@ input.error {
box-shadow: 0px 0px 2px 2px #f00; box-shadow: 0px 0px 2px 2px #f00;
} }
.modal .form_error{
color: #f00;
position: relative;
top: -10px;
}
.modal button { .modal button {
display: block; display: block;
width: 348px; width: 348px;

@ -49,6 +49,7 @@ $(document).ready(function(){
type = $form.attr('method'); type = $form.attr('method');
$form.find('.error').removeClass('error'); $form.find('.error').removeClass('error');
$form.find('.form_error').remove();
$.ajax({ $.ajax({
url: url, url: url,
@ -63,6 +64,8 @@ $(document).ready(function(){
if (data.errors) { if (data.errors) {
$.each(data.errors, function(i, val) { $.each(data.errors, function(i, val) {
$form.find('input[name="' + i + '"]').addClass('error') $form.find('input[name="' + i + '"]').addClass('error')
.after('<div class="form_error">' + val + '</div>');
}); });
} }
} }
@ -77,6 +80,7 @@ $(document).ready(function(){
type = $form.attr('method'); type = $form.attr('method');
$form.find('.error').removeClass('error'); $form.find('.error').removeClass('error');
$form.find('.form_error').remove();
$.ajax({ $.ajax({
url: url, url: url,
@ -91,6 +95,7 @@ $(document).ready(function(){
if (data.errors) { if (data.errors) {
$.each(data.errors, function(i, val) { $.each(data.errors, function(i, val) {
$form.find('input[name="' + i + '"]').addClass('error') $form.find('input[name="' + i + '"]').addClass('error')
.after('<div class="form_error">' + val + '</div>');
}); });
} }
} }

@ -27,7 +27,7 @@
<link href="{% static 'css/jquery.iphone.toggle.css' %}" rel='stylesheet'> <link href="{% static 'css/jquery.iphone.toggle.css' %}" rel='stylesheet'>
<link href="{% static 'css/opa-icons.css' %}" rel='stylesheet'> <link href="{% static 'css/opa-icons.css' %}" rel='stylesheet'>
<link href="{% static 'css/uploadify.css' %}" rel='stylesheet'> <link href="{% static 'css/uploadify.css' %}" rel='stylesheet'>
{# select2 #} {# select2 #}
<link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/> <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
<script src="{% static 'js/select/select2.js' %}"></script> <script src="{% static 'js/select/select2.js' %}"></script>
@ -37,7 +37,7 @@
<link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/> <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
<script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script> <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>
<script src="{% static 'js/datetimepicker/js/locales/bootstrap-datetimepicker.ru.js' %}"></script> <script src="{% static 'js/datetimepicker/js/locales/bootstrap-datetimepicker.ru.js' %}"></script>
{% block main_js_exlude %} {% block main_js_exlude %}
<script src="{% static 'custom_js/main.js' %}"></script> <script src="{% static 'custom_js/main.js' %}"></script>
{% endblock main_js_exlude %} {% endblock main_js_exlude %}
@ -55,6 +55,9 @@
#navigation{ #navigation{
margin-top: 10px; margin-top: 10px;
} }
.dropdown-menu{
margin-bottom: 20px;
}
{% block styles %} {% block styles %}
{% endblock %} {% endblock %}
</style> </style>

@ -1,6 +1,6 @@
{% load i18n %} {% load i18n %}
<div class="span3" data-spy="affix" data-offset-top="0" id="navigation"> <div class="span3" data-spy="affix" data-offset-top="0" id="navigation" style="position: static;">
<div class="well sidebar-nav"> <div class="well sidebar-nav">
<ul class="nav nav-tabs nav-stacked"> <ul class="nav nav-tabs nav-stacked">
<li class="nav-header">Добавить</li> <li class="nav-header">Добавить</li>
@ -54,7 +54,7 @@
<li class="divider"></li> <li class="divider"></li>
<li><a href="/admin/import-theme">Импорт тематик</a></li> <li><a href="/admin/import-theme">Импорт тематик</a></li>
<li><a href="/admin/import-tag">Импорт тегов</a></li> <li><a href="/admin/import-tag">Импорт тегов</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="/admin/stats/">{% trans "Статистика разделов" %}</a></li> <li><a href="/admin/stats/">{% trans "Статистика разделов" %}</a></li>
<li><a href="/admin/stats/events/">{% trans "Статистика событий" %}</a></li> <li><a href="/admin/stats/events/">{% trans "Статистика событий" %}</a></li>

@ -1,4 +1,4 @@
<div class="span3" data-spy="affix" data-offset-top="0" id="navigation"> <div class="span3" data-spy="affix" data-offset-top="0" id="navigation" style="position: static;">
<div class="well sidebar-nav"> <div class="well sidebar-nav">
<ul class="nav nav-tabs nav-stacked"> <ul class="nav nav-tabs nav-stacked">
<li class="nav-header">Добавить</li> <li class="nav-header">Добавить</li>
@ -24,4 +24,4 @@
</ul> </ul>
</div> </div>
</div> </div>

@ -44,7 +44,7 @@
</div> </div>
<div class="rq-to-hide"> <div class="rq-to-hide">
<div class="s-comments"> <div class="s-comments">
<div class="sect-title blog_link">{% trans 'Похожие новости' %}<a class="button more" href="/news/">{% trans 'Все новости' %}</a></div> <div class="sect-title blog_link">{% trans 'Последние новости' %} {{ object.main_title }}<a class="button more" href="/news/">{% trans 'Все новости' %}</a></div>
<div class="cat-list sc-comments"> <div class="cat-list sc-comments">
{% for news in object.similar %} {% for news in object.similar %}
<div class="cl-item"> <div class="cl-item">
@ -64,4 +64,4 @@
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

@ -69,7 +69,7 @@
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a> <a class="button icon-msg pw-open" href="#pw-reply">{% trans 'отправить сообщение' %}</a>
{% else %} {% else %}
<a class="button icon-msg pw-open" href="#pw-reg">{% trans 'отправить сообщение' %}</a> <a class="button icon-msg pw-open" href="#pw-login">{% trans 'отправить сообщение' %}</a>
{% endif %} {% endif %}
</div> </div>
<div class="ic-links"> <div class="ic-links">

@ -10,6 +10,7 @@
<head lang="{{ LANGUAGE_CODE }}"> <head lang="{{ LANGUAGE_CODE }}">
{% include 'client/includes/meta.html' %} {% include 'client/includes/meta.html' %}
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.5.9/slick.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.5.9/slick.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.5.9/slick-theme.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.5.9/slick-theme.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.5/jquery.fancybox.min.css">
@ -118,7 +119,7 @@
<a href="https://www.linkedin.com/in/evgeniya-bulavina-60a5ba55" target="_blank" class="person"> <a href="https://www.linkedin.com/in/evgeniya-bulavina-60a5ba55" target="_blank" class="person">
<img src="{% static 'participation_landing/images/person1.jpg' %}" alt=""> <img src="{% static 'participation_landing/images/person1.jpg' %}" alt="">
{% blocktrans %}<span>Евгени <br> Булавина <i>ведущий консультант</i></span>{% endblocktrans %} {% blocktrans %}<span>Евгения <br> Булавина <i>ведущий консультант</i></span>{% endblocktrans %}
</a> </a>
<a href="https://www.linkedin.com/in/emanukovskaya" target="_blank" class="person"> <a href="https://www.linkedin.com/in/emanukovskaya" target="_blank" class="person">
<img src="{% static 'participation_landing/images/person2.jpg' %}" alt=""> <img src="{% static 'participation_landing/images/person2.jpg' %}" alt="">
@ -216,7 +217,7 @@
<p>{{ comment.position }}</p> <p>{{ comment.position }}</p>
</div> </div>
</div> </div>
{% empty %} {% empty %}
<div class="review"> <div class="review">
<img src="{% static 'participation_landing/images/review.png' %}" alt=""> <img src="{% static 'participation_landing/images/review.png' %}" alt="">
<div class="review_text"> <div class="review_text">
@ -305,8 +306,12 @@
<h5>{% blocktrans %}Подпишитесь, чтобы получать полезные статьи, видео и презентации,<br>а также афишу важных событий, скидки и подарки.{% endblocktrans %}</h5> <h5>{% blocktrans %}Подпишитесь, чтобы получать полезные статьи, видео и презентации,<br>а также афишу важных событий, скидки и подарки.{% endblocktrans %}</h5>
<form action="{% url 'landing_partisipation_validate' %}" method="POST" class="subscribe_form"> <form action="{% url 'landing_partisipation_validate' %}" method="POST" class="subscribe_form">
{% csrf_token %} {% csrf_token %}
<input type="text" name="first_name" placeholder="{% trans "Ваше имя" %}*"> <div class="form_field">
<input type="email" name="email" placeholder="{% trans "Ваш e-mail" %}*"> <input type="text" name="first_name" placeholder="{% trans "Ваше имя" %}*">
</div>
<div class="form_field">
<input type="email" name="email" placeholder="{% trans "Ваш e-mail" %}*">
</div>
<button type="submit">{% trans "Подписаться" %}</button> <button type="submit">{% trans "Подписаться" %}</button>
</form> </form>
<p>{% blocktrans with specialist_count=specialist_count %}Нас читают уже <span>{{ specialist_count }}</span> специалиста!{% endblocktrans %}</p> <p>{% blocktrans with specialist_count=specialist_count %}Нас читают уже <span>{{ specialist_count }}</span> специалиста!{% endblocktrans %}</p>
@ -315,7 +320,7 @@
<div class="modal" id="modal_presentation"> <div class="modal" id="modal_presentation">
<h2>{% trans "Запросить презентацию" %}</h2> <h2>{% trans "Запросить презентацию" %}</h2>
<h3>{% trans "Отправьте заявку и мы пришлем Вам нашу презентацию!" %}</h3> <h3>{% trans "Отправьте заявку, и мы пришлем Вам нашу презентацию!" %}</h3>
<form action="." id="form_request" method="POST"> <form action="." id="form_request" method="POST">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="event" value="лендинг - Запросить презентацию"> <input type="hidden" name="event" value="лендинг - Запросить презентацию">

Loading…
Cancel
Save