diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-23 09:21:14 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-23 09:21:14 -0800 |
| commit | a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2 (patch) | |
| tree | f1b1c37242136098941d3d96b32245bf2b6a528c /web/templates | |
| parent | dc79707787b521ea5fc0d9088ccd9069780c8e0c (diff) | |
| parent | d42d0e3467c8eec38fdca429ba9ba5ac2af68db8 (diff) | |
| download | chat-a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2.tar.gz chat-a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2.tar.bz2 chat-a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2.zip | |
Merge pull request #237 from mattermost/mm-1570
fixes mm-1570 adds support for using mattermost as an OAuth client
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/login.html | 2 | ||||
| -rw-r--r-- | web/templates/signup_user_complete.html | 2 | ||||
| -rw-r--r-- | web/templates/signup_user_oauth.html | 26 |
3 files changed, 28 insertions, 2 deletions
diff --git a/web/templates/login.html b/web/templates/login.html index 24cebec8f..4b2813358 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -20,7 +20,7 @@ </div> </div> <script> -window.setup_login_page({{.Props.TeamDisplayName}}, {{.Props.TeamName}}); +window.setup_login_page('{{.Props.TeamDisplayName}}', '{{.Props.TeamName}}', '{{.Props.AuthServices}}'); </script> </body> </html> diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html index 0cc655b63..176ca77b1 100644 --- a/web/templates/signup_user_complete.html +++ b/web/templates/signup_user_complete.html @@ -19,7 +19,7 @@ </div> </div> <script> - window.setup_signup_user_complete_page('{{.Props.Email}}', '{{.Props.TeamName}}', '{{.Props.TeamDisplayName}}', '{{.Props.TeamId}}', '{{.Props.Data}}', '{{.Props.Hash}}'); + window.setup_signup_user_complete_page('{{.Props.Email}}', '{{.Props.TeamName}}', '{{.Props.TeamDisplayName}}', '{{.Props.TeamId}}', '{{.Props.Data}}', '{{.Props.Hash}}', '{{.Props.AuthServices}}'); </script> </body> </html> diff --git a/web/templates/signup_user_oauth.html b/web/templates/signup_user_oauth.html new file mode 100644 index 000000000..2eddb50d2 --- /dev/null +++ b/web/templates/signup_user_oauth.html @@ -0,0 +1,26 @@ +{{define "signup_user_oauth"}} +<!DOCTYPE html> +<html> +{{template "head" . }} +<body class="white"> + <div class="container-fluid"> + <div class="inner__wrap"> + <div class="row content"> + <div class="col-sm-12"> + <div class="signup-team__container"> + <div id="signup-user-complete"></div> + </div> + </div> + <div class="footer-push"></div> + </div> + <div class="row footer"> + {{template "footer" . }} + </div> + </div> + </div> + <script> + window.setup_signup_user_oauth_page('{{.Props.User}}', '{{.Props.TeamName}}', '{{.Props.TeamDisplayName}}'); + </script> +</body> +</html> +{{end}} |