taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding jitsi to meetup choices

stable
Alejandro Alonso 2015-05-04 10:25:27 +02:00
parent a3f453b897
commit c7b2b423ce
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/coffee/modules/nav.coffee
View File

@ -249,15 +249,19 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location, $
container.replaceWith(dom) container.replaceWith(dom)
videoConferenceUrl = (project) -> videoConferenceUrl = (project) ->
urlSeparator = "-"
if project.videoconferences == "appear-in" if project.videoconferences == "appear-in"
baseUrl = "https://appear.in/" baseUrl = "https://appear.in/"
else if project.videoconferences == "talky" else if project.videoconferences == "talky"
baseUrl = "https://talky.io/" baseUrl = "https://talky.io/"
else if project.videoconferences == "jitsi"
urlSeparator = ""
baseUrl = "https://meet.jit.si/"
else else
return "" return ""
if project.videoconferences_salt if project.videoconferences_salt
url = "#{project.slug}-#{project.videoconferences_salt}" url = "#{project.slug}#{urlSeparator}#{project.videoconferences_salt}"
else else
url = "#{project.slug}" url = "#{project.slug}"

2
app/partials/admin/admin-project-modules.jade
View File

@ -85,7 +85,7 @@ div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl"
div.videoconference-attributes.hidden div.videoconference-attributes.hidden
select(ng-model="project.videoconferences", 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") option(value="", translate="ADMIN.MODULES.SELECT_VIDEOCONFERENCE")
input(type="text", ng-model="project.videoconferences_salt", input(type="text", ng-model="project.videoconferences_salt",
placeholder="{{'ADMIN.MODULES.SALT_CHAT_ROOM' | translate}}") placeholder="{{'ADMIN.MODULES.SALT_CHAT_ROOM' | translate}}")