remotes/origin/stage6
ya_dim4ik 9 years ago
parent 07b4571704
commit 7859d85bca
  1. 7
      static/client/css/main.css
  2. 2
      static/client/css_min/main.min.css
  3. 2
      static/client/js_min/_modules/page.exposition.object.min.js
  4. 39
      templates/client/article/article.html

@ -13789,6 +13789,10 @@ blockquote{
color: #333333;
}
.conference_about .text-indent-1-5em{
text-indent: 0;
}
.i-photo-slides h2{
font-family: dindisplay_pro, sans-serif;
font-size: 28px;
@ -14162,7 +14166,8 @@ h1 .preview_toggle{
width: 180px;
text-align: center;
border-radius: 3px;
margin-left: 15px;
margin-left: 25px;
margin-top: 3px;
}
h1 .preview_toggle:hover{

File diff suppressed because one or more lines are too long

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,i=EXPO.common,s={},e=function(t,i){this.opt=i,this.DOMthis=t,this.DOMbutton=t.querySelector("."+i.buttonClass),this.DOMinput=t.querySelector("."+i.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return e.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,s={},e=this,o=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};s[this.inputName]=this.DOMinput.value,t=i.getRequest(s,this.url,o)}},s.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),s.init=function(s){$.extend(this.opt,s);var o=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new e(this,o.opt.note);o.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),i.opt.addCalendarText=this.opt.addCalendarText,i.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass(o.opt.visit.activeClass)?($("."+o.opt.visit.activeClass).hide().siblings("."+o.opt.visit.passiveClass).show(),$("#"+o.opt.visit.visitorsListId).append(o.opt.visit.currentHtml),$("#"+o.opt.visit.somebodyId).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden")):($("."+o.opt.visit.passiveClass).hide().siblings("."+o.opt.visit.activeClass).show(),$("#"+o.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+o.opt.visit.visitorsListId).children().length&&($("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var s=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(i){var s=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=i.success){s();for(var e in i.errors)i.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(i.errors[e])}else s(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();t.hide()};return t.show(),i.postRequest(s,e,n),!1})},s}();
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,s=EXPO.common,i={},e=function(t,s){this.opt=s,this.DOMthis=t,this.DOMbutton=t.querySelector("."+s.buttonClass),this.DOMinput=t.querySelector("."+s.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return e.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,i={},e=this,o=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};i[this.inputName]=this.DOMinput.value,t=s.getRequest(i,this.url,o)}},i.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),i.init=function(i){$.extend(this.opt,i);var o=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new e(this,o.opt.note);o.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),s.opt.addCalendarText=this.opt.addCalendarText,s.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass(o.opt.visit.activeClass)?($("."+o.opt.visit.activeClass).hide().siblings("."+o.opt.visit.passiveClass).show(),$("#"+o.opt.visit.visitorsListId).append(o.opt.visit.currentHtml),$("#"+o.opt.visit.somebodyId).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden")):($("."+o.opt.visit.passiveClass).hide().siblings("."+o.opt.visit.activeClass).show(),$("#"+o.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+o.opt.visit.visitorsListId).children().length&&($("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();t.hide()};return t.show(),s.postRequest(i,e,n),!1}),$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)console.log(s.errors.hasOwnProperty(e)),console.log(e),s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==s.sent?window.location=s.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);t.hide()};return t.show(),s.postRequest(i,e,n),!1})},i}();

@ -31,13 +31,12 @@
{# {% include 'client/includes/article/article_logo.html' with obj=object %} #}
<h1><a href="#" class="preview_toggle" data-short="{% trans 'Краткое содержание' %}" data-full="{% trans 'Полное содержание' %}">{% trans 'Краткое содержание' %}</a>{{ object.main_title }}</h1>
<ul class="article_info">
{# TODO: подставить переменную #}
<li><i class="fa fa-user"></i> {{ object.author_s.fullname }}</li>
<li><i class="fa fa-calendar"></i> {{ object.publish_date|date:"d E Y" }}</li>
{# TODO: подставить переменную #}
<li>Раздел: <a href="/blogs/theme/{{ object.theme.all.0.url }}"> {{ object.theme.all.0 }} </a></li>
</ul>
{# <strong><span>{{ object.publish_date|date:"d E Y" }}</span></strong> #}
{# FIXME: проверить условие #}
{% if object.theme.all.exists %}
<div class="article_tags">
{% trans 'Теги:' %}&nbsp;&nbsp; {% include 'includes/article_tags.html' with obj=object %}
@ -69,18 +68,6 @@
{% include 'client/includes/sharing_block_full.html' %}
</div>
{# <div class="blog_avtor">#}
{# <i>{% trans 'Источник' %}: {{ object.author }}</i> #}
{# {% if object.tag.all.exists %}#}
{# <div class="blog_avtor_right">#}
{# {% include 'includes/article_tags.html' with obj=object %}#}
{# </div>#}
{# {% endif %}#}
{##}
{# <div class="clear"></div>#}
{# </div>#}
<div class="article_author">
<div class="author">
{# для thumbnail '148x148' crop="center" #}
@ -165,32 +152,10 @@
</form>
</div>
{% else %}
<p>{% trans 'Для отправки комментариев авторизуйтесь.' %}</p>
<p class="no_login">{% trans 'Для отправки комментариев' %}, <a class="login pw-open" href="#pw-login">{% trans 'авторизуйтесь' %}.</a></p>
{% endif %}
</div>
</div>
{# {% with blogs=object.similars %}#}
{# {% if blogs %}#}
{# <div class="rq-to-hide">#}
{# <div class="s-comments">#}
{# <div class="sect-title blog_link">{% trans 'Похожие статьи' %}<a class="button more" href="/blogs/">{% trans 'Все статьи' %}</a></div>#}
{# <div class="cat-list sc-comments">#}
{# {% for blog in blogs %}#}
{# <div class="cl-item">#}
{# <div class="acticle_list">#}
{# <a href="{{ blog.get_permanent_url }}" title="">{% include 'includes/show_logo.html' with obj=blog %}</a>#}
{# <h3><a href="{{ blog.get_permanent_url }}" title="">{{ blog.main_title }}</a></h3>#}
{# <p>{{ blog.preview|safe }}</p>#}
{# <strong><span>{{ blog.publish_date|date:"d E Y" }}</span><a href="{{ blog.author.get_permanent_url }}" title=""><i>{% trans "Евгения Булавина" %}</i></a></strong>#}
{# </div>#}
{# </div>#}
{# {% endfor %}#}
{# </div>#}
{# </div>#}
{# </div>#}
{# {% endif %}#}
{# {% endwith %}#}
{% endblock %}

Loading…
Cancel
Save