Merge remote-tracking branch 'origin/dev' into dev

remotes/origin/hasaccess
Vitaly Baev 8 years ago
commit 5f82ab424f
  1. 4
      apps/course/templates/course/_items.html
  2. 11
      apps/course/templates/course/course.html
  3. 26
      project/templates/lilcity/index.html
  4. 765
      web/yarn.lock

@ -34,7 +34,7 @@
<div class="courses__content">{{ course.short_description }}
</div>
<div class="courses__user user">
<a href="{% url 'user' course.author.id %}">
<a href="{% if course.author %}{% url 'user' course.author.id %}{% endif %}">
{% if course.author.photo %}
<div class="user__ava ava">
<img class="ava__pic" src="{{ course.author.photo.url }}"/>
@ -46,7 +46,7 @@
{% endif %}
</a>
<div class="user__info">
<a href="{% url 'user' course.author.id %}" class="link--black">
<a href="{% if course.author %}{% url 'user' course.author.id %}{% endif %}" class="link--black">
<div class="user__name">{{ course.author.get_full_name }}</div>
</a>
<div class="user__meta">

@ -3,7 +3,16 @@
{% load data_liked from data_liked %}
{% load rupluralize from plural %}
{% block title %}{{ course.title }} - {{ block.super }}{% endblock title %}
{% block description %}{{ course.title }} - {{ block.super }}{% endblock description%}
{% comment %} seo tags {% endcomment %}
{% block description %}{{ course.short_description }}{% endblock description%}
{% block twurl %}{{ request.build_absolute_uri }}{% endblock twurl %}
{% block ogtitle %}{{ course.title }} - {{ block.super }}{% endblock ogtitle %}
{% block ogurl %}{{ request.build_absolute_uri }}{% endblock ogurl %}
{% if course.cover %}
{% block ogimage %}{{ request.build_absolute_uri }}{{ course.cover.url }}{% endblock ogimage %}
{% endif %}
{% block ogdescription %}{{ course.short_description }}{% endblock ogdescription %}
{% block content %}
<div class="section section_border">
<div class="section__center center center_sm">

@ -18,19 +18,21 @@
<meta name="description" content="{% block description %}Онлайн-курсы LilCity{% endblock description%}">
<!--Twitter Card data-->
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@publisher_handle">
<meta name="twitter:title" content="Page Title">
<meta name="twitter:description" content="Page description less than 200 characters">
<meta name="twitter:creator" content="@author_handle">
<meta name="twitter:image" content="http://www.example.com/image.jpg">
<meta name="twitter:site" content="{% block twurl %}{{ request.build_absolute_uri }}{% endblock twurl %}">
{% comment %} <meta name="twitter:title" content="{% block twtitle %}Онлайн-курсы LilCity{% endblock twtitle %}"> {% endcomment %}
{% comment %} <meta name="twitter:description" content="{% block twdescription %}Онлайн-курсы LilCity{% endblock twdescription %}"> {% endcomment %}
{% comment %} <meta name="twitter:creator" content="@author_handle"> {% endcomment %}
{% comment %} <meta name="twitter:image" content="{% block twimage %}{{ request.build_absolute_uri }}{% static 'img/video-1.jpg' %}{% endblock twimage %}"> {% endcomment %}
<!--Open Graph data-->
<meta property="og:title" content="Title Here">
<meta property="og:type" content="article">
<meta property="og:url" content="http://www.example.com/">
<meta property="og:image" content="http://example.com/image.jpg">
<meta property="og:description" content="Description Here">
<meta property="og:site_name" content="Site Name, i.e. Moz">
<meta property="fb:admins" content="Facebook numeric ID">
<meta property="og:title" content="{% block ogtitle %}Онлайн-курсы LilCity{% endblock ogtitle %}">
{% comment %} <meta property="og:type" content="article"> {% endcomment %}
<meta property="og:url" content="{% block ogurl %}{{ request.build_absolute_uri }}{% endblock ogurl %}">
<meta property="og:image" content="{% block ogimage %}{{ request.build_absolute_uri }}{% static 'img/video-1.jpg' %}{% endblock ogimage %}">
<meta property="og:description" content="{% block ogdescription %}Онлайн-курсы LilCity{% endblock ogdescription %}">
<meta property="og:site_name" content="Онлайн-курсы LilCity">
<meta property="og:locale" content="ru_RU">
{% comment %} <meta property="fb:admins" content="Facebook numeric ID"> {% endcomment %}
<meta name="csrf-token" content="{{ csrf_token }}">
<link rel="stylesheet" media="all" href={% static "app.css" %}>
<link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.ico' %}"/>

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save