-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add online video link to menu (#150)
* send invitation for additional speaker input * add join video button without token * remove not related file * update token for video join button * rework feature add join video on menu * fix pipeline isort/black --------- Co-authored-by: Mario Behling <[email protected]> Co-authored-by: lcduong <[email protected]>
- Loading branch information
1 parent
149d206
commit 7c659da
Showing
10 changed files
with
326 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/pretalx/sso_provider/templates/socialaccount/authentication_error.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
$(function () { | ||
var popup_window = null | ||
var popup_check_interval = null | ||
|
||
$("#join-event-link").on("click", function (e) { | ||
e.preventDefault(); // prevent the default action (redirecting to the href) | ||
var url = $(this).attr('href'); // get the href attribute | ||
$.ajax({ | ||
"method": "GET", | ||
"url": url, | ||
"success": function(json) { | ||
if(json.redirect_url) { | ||
window.location.href = json.redirect_url; | ||
} | ||
}, | ||
"error": function(jqXHR, textStatus, errorThrown) { | ||
// handle any errors that occur while making the AJAX request | ||
$("body").addClass("has-join-popup") | ||
if(jqXHR.responseText === 'user_not_allowed') { | ||
// handle 'user_not_allowed' error | ||
$("body").addClass("has-join-popup") | ||
$("#join-video-popupmodal").removeAttr("hidden"); | ||
} else if (jqXHR.responseText === 'missing_configuration'){ | ||
// handle other errors | ||
$("body").addClass("has-join-popup") | ||
$("#join-video-popupmodal-missing-config").removeAttr("hidden"); | ||
|
||
} | ||
} | ||
}); | ||
}); | ||
$('#join-online-close-button').click(function() { | ||
$('#join-video-popupmodal').attr('hidden', 'true'); | ||
$("body").removeClass("has-join-popup") | ||
}); | ||
$('#join-online-close-button-missing-config').click(function() { | ||
$('#join-video-popupmodal-missing-config').attr('hidden', 'true'); | ||
$("body").removeClass("has-join-popup") | ||
}); | ||
}) | ||
|
Oops, something went wrong.