From 2e729da995d006a1c21c7647d2144e29bd372d64 Mon Sep 17 00:00:00 2001 From: gzbender Date: Wed, 10 Oct 2018 01:06:55 +0500 Subject: [PATCH 1/3] LIL-691 --- project/templates/lilcity/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index fbf876b3..72419d88 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -20,12 +20,12 @@ {% comment %} {% endcomment %} {% comment %} {% endcomment %} {% comment %} {% endcomment %} - {% comment %} {% endcomment %} + {% comment %} {% endcomment %} {% comment %} {% endcomment %} - + From fdf00518f97bb68a51b99b678e7d85c7bcfa78d2 Mon Sep 17 00:00:00 2001 From: gzbender Date: Wed, 10 Oct 2018 01:12:32 +0500 Subject: [PATCH 2/3] LIL-691 --- web/src/sass/_common.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index e2fa0554..77abc6f9 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -197,7 +197,7 @@ button background: white border: 1px solid $gray color: $gray - + &:hover, &:active color: $cl @@ -633,7 +633,7 @@ a.btn font-size: 18px text-align: center &__bonuses-link - color: #ccc + color: rgba(25, 25, 25, 0.3) &__lil-coin-img margin-bottom: -5px From 7cab84a3cad735bc66ab307e5ee0e331606ba257 Mon Sep 17 00:00:00 2001 From: gzbender Date: Wed, 10 Oct 2018 01:34:25 +0500 Subject: [PATCH 3/3] LIL-691 --- apps/user/templates/user/bonus-history.html | 2 +- project/templates/lilcity/main.html | 8 ++++++++ web/src/js/modules/profile.js | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apps/user/templates/user/bonus-history.html b/apps/user/templates/user/bonus-history.html index f98474bb..bc10a5ab 100644 --- a/apps/user/templates/user/bonus-history.html +++ b/apps/user/templates/user/bonus-history.html @@ -28,7 +28,7 @@
- +
{% include 'templates/blocks/share.html' with share_object_name="ссылкой" share_url=referrer_url %} diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html index 0f1c5b7e..5f98f1fd 100644 --- a/project/templates/lilcity/main.html +++ b/project/templates/lilcity/main.html @@ -1,11 +1,19 @@ {% extends "templates/lilcity/index.html" %} {% load static %} {% if is_referral_url and referrer %} + +{% block twdescription %} +{{ referrer.get_full_name }} приглашает вас и ваших детей в первую онлайн школу креативного мышления Lil School. +Занимайтесь с ребёнком творчеством, не выходя из дома. +Перейдите по ссылке и получите скидку {{ config.REFERRAL_BONUS }}% на первую покупку +{% endblock twdescription %} + {% block ogdescription %} {{ referrer.get_full_name }} приглашает вас и ваших детей в первую онлайн школу креативного мышления Lil School. Занимайтесь с ребёнком творчеством, не выходя из дома. Перейдите по ссылке и получите скидку {{ config.REFERRAL_BONUS }}% на первую покупку {% endblock ogdescription %} + {% endif %} {% block title %}School LIL.CITY{% endblock title %} diff --git a/web/src/js/modules/profile.js b/web/src/js/modules/profile.js index 8bf9df91..60933c3d 100644 --- a/web/src/js/modules/profile.js +++ b/web/src/js/modules/profile.js @@ -1,13 +1,17 @@ import $ from 'jquery'; import slugify from 'slugify'; import ClipboardJS from 'clipboard'; +import {showNotification} from './notification'; export const main = (app) => { if(app.urlIs('userBonuses')){ $('#referrer-url').select().click(function(){ $(this).select(); }); - new ClipboardJS('.btn'); + const clipboard = new ClipboardJS('#copy-referrer-url-btn'); + clipboard.on('success', e => { + showNotification('success', 'Ссылка скопирована'); + }); return; } // Обработчик выбора пола