From 05aee66f8da0c0a561e1286767a682d33454ef7a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 19 Nov 2020 17:47:30 +0000 Subject: [PATCH] people: Update design of conference page Signed-off-by: Michael Tremer --- src/backend/talk.py | 10 +++ src/templates/people/conferences.html | 120 +++++++++++++++++--------- 2 files changed, 88 insertions(+), 42 deletions(-) diff --git a/src/backend/talk.py b/src/backend/talk.py index 4215e7d5..e37fb854 100644 --- a/src/backend/talk.py +++ b/src/backend/talk.py @@ -320,6 +320,16 @@ class Conference(object): def sip_id(self): return 900 + self.number + @property + def sip_url(self): + return "%s@ipfire.org" % self.sip_id + + @property + def phone_numbers(self): + return [ + "+4923636035%s" % self.sip_id, + ] + @lazy_property def channels(self): return self.freeswitch._get_channels("SELECT * FROM channels \ diff --git a/src/templates/people/conferences.html b/src/templates/people/conferences.html index b382c5d0..33ca062a 100644 --- a/src/templates/people/conferences.html +++ b/src/templates/people/conferences.html @@ -2,56 +2,92 @@ {% block title %}{{ _("Conferences") }}{% end block %} -{% block content %} -
-
+{% block container %} +
+

{{ _("Conferences") }}

+
+
+ +
+
+
+
+ {% if conferences %} + {% for c in conferences %} +
+
+
+
+
{{ _("Room %s") % c.number }}
+ +
+ {{ _("One Participant", "%(num)s Participants", len(c)) % { "num" : len(c) } }} +
+
+ +
+
    +
  • + + + + {{ c.sip_id }} + +
    • + + {% for phone_number in c.phone_numbers %} +
  • + - {% if conferences %} - {% for c in conferences %} -
    -
    -
    {{ _("Conference Room %s") % c.number }}
    - -

    - {{ _("This conference room has one participant", "This conference room has %(num)s participants", len(c)) % { "num" : len(c) } }} -

    -
    - - +
    +
+
+ +
    + {% for chan in c.channels %} +
  • {% if chan.caller %} {{ chan.caller }} {% else %} {{ chan.caller_name }} + + ({{ format_phone_number(chan.caller_number) }}) {% end %} - - ({{ format_phone_number(chan.caller_number) }}) -
- {{ format_time(chan.duration) }} -
+
    +
  • + {{ format_time(chan.duration) }} +
    • - - {% if chan.is_secure() %} - - {% end %} - - {{ chan.codec }} - - - {% end %} -
-
- {% end %} - {% else %} -

- {{ _("There are currently no conferences") }} -

- {% end %} -
+ {% if chan.is_secure() %} +
  • + +
    • + {% end %} + +
  • + {{ chan.codec }} +
    • + + + {% end %} + +
    + {% end %} + {% else %} +

    + {{ _("There are currently no conferences") }} +

    + {% end %} +
    +
    + {% end block %} -- 2.47.3