From c7b2b423ce5dfd9516f182bbbff39037f5a41b5e Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Mon, 4 May 2015 10:25:27 +0200 Subject: [PATCH] Adding jitsi to meetup choices --- app/coffee/modules/nav.coffee | 6 +++++- app/partials/admin/admin-project-modules.jade | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index 578890e0..ec95aa6c 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -249,15 +249,19 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location, $ container.replaceWith(dom) videoConferenceUrl = (project) -> + urlSeparator = "-" if project.videoconferences == "appear-in" baseUrl = "https://appear.in/" else if project.videoconferences == "talky" baseUrl = "https://talky.io/" + else if project.videoconferences == "jitsi" + urlSeparator = "" + baseUrl = "https://meet.jit.si/" else return "" if project.videoconferences_salt - url = "#{project.slug}-#{project.videoconferences_salt}" + url = "#{project.slug}#{urlSeparator}#{project.videoconferences_salt}" else url = "#{project.slug}" diff --git a/app/partials/admin/admin-project-modules.jade b/app/partials/admin/admin-project-modules.jade index 7019a879..11e440b7 100644 --- a/app/partials/admin/admin-project-modules.jade +++ b/app/partials/admin/admin-project-modules.jade @@ -85,7 +85,7 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl" div.videoconference-attributes.hidden select(ng-model="project.videoconferences", - ng-options="e.id as e.name for e in [{'id':'appear-in', 'name':'AppearIn'},{'id':'talky', 'name': 'Talky'}]") + ng-options="e.id as e.name for e in [{'id':'appear-in', 'name':'AppearIn'},{'id':'jitsi', 'name': 'Jitsi'},{'id':'talky', 'name': 'Talky'}]") option(value="", translate="ADMIN.MODULES.SELECT_VIDEOCONFERENCE") input(type="text", ng-model="project.videoconferences_salt", placeholder="{{'ADMIN.MODULES.SALT_CHAT_ROOM' | translate}}")