diff --git a/apps/content/admin.py b/apps/content/admin.py
index 1c92c012..c025f198 100644
--- a/apps/content/admin.py
+++ b/apps/content/admin.py
@@ -8,6 +8,7 @@ from polymorphic.admin import (
from apps.content.models import (
Baner, Content, Image, Text, ImageText, Video,
Gallery, GalleryImage, ImageObject,
+ Contest,ContestWork,
)
@@ -79,3 +80,13 @@ class ContentAdmin(PolymorphicParentModelAdmin):
@admin.register(GalleryImage)
class GalleryImageAdmin(admin.ModelAdmin):
pass
+
+
+@admin.register(Contest)
+class ContestAdmin(admin.ModelAdmin):
+ base_model = Contest
+
+
+@admin.register(ContestWork)
+class ContestWorkAdmin(admin.ModelAdmin):
+ base_model = ContestWork
diff --git a/apps/content/templates/content/contest_work.html b/apps/content/templates/content/contest_work.html
index 67e2e287..5184faae 100644
--- a/apps/content/templates/content/contest_work.html
+++ b/apps/content/templates/content/contest_work.html
@@ -1,8 +1,14 @@
{% extends "templates/lilcity/index.html" %}
+{% load rupluralize from plural %}
{% load static %}
-{% block title %}{{ contest_work.child_full_name }}, {{ contest_work.age }} лет{% endblock title %}
-
+{% block title %}Конкурс Lil.School{% endblock title %}
+{% block description %}Работа {{ contest_work.child_full_name }}, {{ contest_work.age | rupluralize:"год,года,лет" }}{% endblock description%}
+{% block ogdescription %}Работа {{ contest_work.child_full_name }}, {{ contest_work.age | rupluralize:"год,года,лет" }}{% endblock ogdescription %}
{% block ogimage %}http://{{request.META.HTTP_HOST}}{{ contest_work.image.image.url }}{% endblock ogimage %}
+{% block head %}
+
+
+{% endblock head %}
{% block content %}
@@ -25,7 +31,7 @@
{{ contest_work.child_full_name }}
-
{{ contest_work.age }} {% if contest_work.age < 5 %}года{% else %}лет{% endif %}
+
{{ contest_work.age | rupluralize:"год,года,лет" }}
-
+ {% include 'templates/blocks/share.html' with share_object_name='курсом' %}
{% endblock content %}
diff --git a/project/templates/blocks/share.html b/project/templates/blocks/share.html
index 9bb1cb72..85fa1ebb 100644
--- a/project/templates/blocks/share.html
+++ b/project/templates/blocks/share.html
@@ -1,27 +1,14 @@
{% load static %}
+
Поделиться {% if share_object_name %}{{ share_object_name }}{% else %}{% if livelesson or lesson %}уроком{% else %}курсом{% endif %}{% endif %}
-
diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index 484058be..1c41b857 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -115,6 +115,7 @@
{% include "templates/blocks/mixpanel.html" %}
+ {% block head %}{% endblock head %}
{% include "templates/blocks/social.html" %}
diff --git a/web/src/components/ContestWorks.vue b/web/src/components/ContestWorks.vue
index 6446cfe2..18bb1fc8 100644
--- a/web/src/components/ContestWorks.vue
+++ b/web/src/components/ContestWorks.vue
@@ -1,7 +1,15 @@
Здесь вы сможете увидеть работы участников после их добавления
@@ -38,6 +46,18 @@
});
}
},
+ computed: {
+ columns() {
+ const first = [];
+ const second = [];
+ const third = [];
+ for(let i=0; i < this.contestWorks.length; i++) {
+ const work = this.contestWorks[i];
+ [first, second, third][i % 3].push(work);
+ }
+ return [first, second, third];
+ }
+ },
methods: {
load() {
this.loading = true;
@@ -70,9 +90,13 @@
width: 100%;
}
.contest-works__works {
- column-width: 300px;
- column-gap: 20px;
text-align: left;
+ display: flex;
+ }
+ .contest-works__column {
+ display: flex;
+ flex-direction: column;
+ margin-right: 20px;
}
.contest-works__loader {
width: 100%;
diff --git a/web/src/js/app.js b/web/src/js/app.js
index 2eb7a1bb..ff6f5609 100644
--- a/web/src/js/app.js
+++ b/web/src/js/app.js
@@ -1,6 +1,8 @@
/**
* Входная точка клиентского приложения.
*/
+import 'ilyabirman-likely/release/likely.js';
+import 'ilyabirman-likely/release/likely.css';
import "./modules/common";
import "./modules/header";
import "./modules/search";