Merge branch 'dev' into 'master'

Dev

See merge request lilcity/backend!37

apps/course/templates/course/course.html

@@ -223,66 +223,7 @@
     {% endwith %}
 
 {% endfor %}
-{% if user.is_authenticated and course.lessons.exists %}
+
-<div class="section">
-  <div class="section__center center center_sm">
-    <div class="lessons">
-      <div class="lessons__title title">Содержание курса</div>
-      <div class="lessons__list">
-        {% for lesson in course.lessons.all %}
-        {% if course.author == request.user and request.user.role >= request.user.AUTHOR_ROLE %}
-        <a href="{% url 'lesson' pk=lesson.id %}?next={{ request.get_full_path }}">
-        {% elif request.user.role == request.user.ADMIN_ROLE %}
-        <a href="{% url 'lesson' pk=lesson.id %}?next={{ request.get_full_path }}">
-        {% else %}
-        <div>
-        {% endif %}
-          <div class="lessons__item">
-            <div class="lessons__subtitle subtitle">{{ lesson.title }}</div>
-            <div class="lessons__row">
-              <div class="lessons__content">{{ lesson.short_description | safe }}</div>
-            </div>
-          </div>
-        {% if course.author == request.user and request.user.role >= request.user.AUTHOR_ROLE %}
-        </a>
-        {% elif request.user.role == request.user.ADMIN_ROLE %}
-        </a>
-        {% else %}
-        </div>
-        {% endif %}
-        {% endfor %}
-      </div>
-      {% comment %} <div class="lessons__load load">
-        <button class="load__btn btn">еще</button>
-      </div> {% endcomment %}
-    </div>
-  </div>
-</div>
-{% comment %} <div class="section">
-  <div class="section__center center center_sm">
-    <div class="title">Материалы, которые понадобятся</div>
-    <div class="materials">
-      {% for material in course.materials.all %}
-      <div class="materials__item">
-        {% if material.cover %}
-        <div class="materials__preview">
-          <img class="materials__pic" src="{{ material.cover.url }}">
-        </div>
-        {% else %}
-        <div class="materials__preview">
-          <img class="materials__pic" src="{% static 'img/pic-3.jpg' %}">
-        </div>
-        {% endif %}
-        <div class="materials__wrap">
-          <div class="materials__title">{{ material.title }}</div>
-          <div class="materials__content">{{ material.short_description }}</div>
-        </div>
-      </div>
-      {% endfor %}
-    </div>
-  </div>
-</div> {% endcomment %}
-{% endif %}
 {% if False %}
 <div class="section section_gradient">
   <div class="section__center center center_sm">

apps/course/templates/course/course_only_lessons.html

@@ -179,7 +179,7 @@
         <a href="{% if course.author == request.user and request.user.role >= request.user.AUTHOR_ROLE %}{% url 'lesson' pk=lesson.id %}{% else %}#{% endif %}">
         {% endif %}
           <div class="lessons__item">
-            <div class="lessons__subtitle subtitle">{{ lesson.title }}</div>
+            <div class="lessons__subtitle subtitle">{{ forloop.counter }}. {{ lesson.title }}</div>
             <div class="lessons__row">
               {% if lesson.cover %}
               <div class="lessons__preview">
@@ -212,7 +212,7 @@
             <a href="#" class="questions__reply-cancel grey-link">Отменить</a>
           </div>
           <div class="questions__field">
-            <textarea class="questions__textarea" placeholder="Спросите автора курса интересующие вас вопросы"></textarea>
+            <textarea class="questions__textarea" placeholder="Задайте автору курса интересующие вас вопросы"></textarea>
           </div>
           <button class="questions__btn btn btn_light">ОТПРАВИТЬ</button>
         </div>

apps/school/templates/school/livelesson_detail.html

@@ -13,7 +13,7 @@
         <iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}" frameborder="0" webkitallowfullscreen
           mozallowfullscreen allowfullscreen>
         </iframe>
-        <a href="#" class="center center_sm" onclick="location.reload();">Если видео не загрузилось обновите страницу</a>
+        <a href="#" onclick="location.reload();">Если видео не загрузилось обновите страницу</a>
         <iframe class="lesson__chat_frame" src="https://vimeo.com/live-chat/{{ livelesson.stream_index }}" frameborder="0"></iframe>
         {% else %}
         {% if livelesson.cover %}

project/templates/lilcity/edit_index.html

@@ -53,7 +53,11 @@
               <use xlink:href="{% static 'img/sprite.svg' %}#icon-eye"></use>
             </svg>
           </button>
-          <button id="course-redactor__publish-button" class="header__btn btn" disabled>ОПУБЛИКОВАТЬ</button>
+          {% if live == 'true' %}
+            <button id="course-redactor__publish-button" class="header__btn btn" disabled>Сохранить</button>
+          {% else %}
+            <button id="course-redactor__publish-button" class="header__btn btn" disabled>На модерацию</button>
+          {% endif %}
         </div>
         {% include 'templates/blocks/user_menu.html' %}
       </div>

project/templates/lilcity/index.html

@@ -30,7 +30,7 @@
     {% 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" %}?2>
+    <link rel="stylesheet" media="all" href={% static "app.css" %}?3>
     <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
     <script>
         var viewportmeta = document.querySelector('meta[name="viewport"]');

web/src/components/CourseRedactor.vue

@@ -33,7 +33,7 @@
                               v-model="course.title"></textarea>
                   </div>
                 </div>
-                <div class="info__field field field_info"
+                <div class="info__field field field_info field_short_description"
                      v-bind:class="{ error: ($v.course.short_description.$dirty || showErrors) && $v.course.short_description.$invalid }">
                   <div class="field__label">{{titles.shortDescription}}</div>
                   <div class="field__wrap">
@@ -1207,5 +1207,10 @@
     height: 270px;
     overflow: scroll;
   }
+
+  .field_short_description {
+    max-height: 200px;
+    overflow: scroll;
+  }
 </style>