]> git.parisson.com Git - teleforma.git/commitdiff
Chat small fixes
authortest test <yoanl@pilotsystems.net>
Thu, 10 Jun 2021 09:56:50 +0000 (11:56 +0200)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Thu, 10 Jun 2021 09:56:50 +0000 (11:56 +0200)
teleforma/models/chat.py
teleforma/src/js/components/Chat.vue
teleforma/static/teleforma/css/teleforma.css

index ab565a368c21035935b792eb998b14fc536072bf..9f578455210de861949d5725346e7b540e73923f 100644 (file)
@@ -50,8 +50,7 @@ class ChatMessage(models.Model):
         room_name = ChatMessage.get_room_name(
             conference.period, conference.course)
         text = _("A new live conference has started : ")
-        text += "<a href=''>test</a>"
-        # text += f"<a href=\"http://{Site.objects.all()[0].domain}{reverse('teleforma-conference-detail', kwargs={'period_id': conference.period.id, 'pk': conference.id})}\">lien</a>"
+        text += f"<a href=\"http://{Site.objects.all()[0].domain}{reverse('teleforma-conference-detail', kwargs={'period_id': conference.period.id, 'pk': conference.id})}\">lien</a>"
         message = ChatMessage.add_message(
             None, room_name, text, system=True)
         channel_layer = get_channel_layer()
index dc1ee53ef99a1a7b48ba64830b33202600ca80a1..3dc418e1e137dab2f74f184283b60a1df2d81048 100644 (file)
@@ -34,7 +34,7 @@ import { Component, Vue } from "vue-property-decorator"
 import ChatWindow, { Message, Messages, Rooms } from "vue-advanced-chat"
 import axios from "axios"
 
-import "../vue-advanced-chat/dist/vue-advanced-chat.css"
+import "vue-advanced-chat/dist/vue-advanced-chat.css"
 
 @Component({
   components: {
index ae7dcf685b87c2a5e389029e73da6f51fe49fd71..0857000b89ccd80e084e58a02f70ea984c176a92 100644 (file)
@@ -1419,7 +1419,7 @@ input,textarea{
     border: 1px solid #000;
     background: repeat url(/static/teleforma/images/tw_hd.png) 0 0;
     padding: 0.2em;
-    margin: 2em 1em 0em 0em;
+    margin: 0;
     -moz-border-radius: 8px 0px 11px 11px;
     -webkit-border-radius: 8px 0px 11px 11px;
     border-radius: 8px 0px 11px 11px;