summaryrefslogtreecommitdiffstats
path: root/web/templates
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-02-01 14:44:17 -0800
committer=Corey Hulen <corey@hulen.com>2016-02-01 14:44:17 -0800
commitb4ec6900510077253290e361d1a706e5368a45de (patch)
tree6fc7c131fa7aa5f32e3aba8102416aa23c65963d /web/templates
parentea71731f838fc010cfc7511c09875184d1b2396b (diff)
parentf28486c4553f7f4bccf7bf69153c2f12699705f9 (diff)
downloadchat-b4ec6900510077253290e361d1a706e5368a45de.tar.gz
chat-b4ec6900510077253290e361d1a706e5368a45de.tar.bz2
chat-b4ec6900510077253290e361d1a706e5368a45de.zip
Fixing merge
Diffstat (limited to 'web/templates')
-rw-r--r--web/templates/authorize.html18
-rw-r--r--web/templates/channel.html22
-rw-r--r--web/templates/claim_account.html18
-rw-r--r--web/templates/docs.html3
-rw-r--r--web/templates/find_team.html5
-rw-r--r--web/templates/footer.html8
-rw-r--r--web/templates/head.html20
-rw-r--r--web/templates/login.html2
-rw-r--r--web/templates/password_reset.html16
-rw-r--r--web/templates/signup_team.html2
-rw-r--r--web/templates/signup_team_confirm.html9
-rw-r--r--web/templates/verify.html11
-rw-r--r--web/templates/welcome.html37
13 files changed, 77 insertions, 94 deletions
diff --git a/web/templates/authorize.html b/web/templates/authorize.html
index 430291676..0fa36b0ab 100644
--- a/web/templates/authorize.html
+++ b/web/templates/authorize.html
@@ -2,24 +2,10 @@
<html>
{{template "head" . }}
<body>
- <div class="container-fluid">
- <div class="oauth-prompt">
- <div class="prompt__heading">
- <div class="prompt__app-icon">
- <img src="/static/images/icon50x50.png" width="50" height="50" alt="">
- </div>
- <div class="text">An application would like to connect to your {{.Props.TeamName}} account.</div>
- </div>
- <p>The app <strong>{{.Props.AppName}}</strong> would like the ability to access Mattermost on your behalf.</p>
- <h2 class="prompt__allow">Allow <strong>{{.Props.AppName}}</strong> access?</h2>
- <div class="prompt__buttons">
- <input type="button" class="btn btn-link" value="Deny">
- <input type="button" class="btn btn-primary" value="Allow">
- </div>
- </div>
+ <div id="authorize">
</div>
<script>
- window.setup_authorize_page('{{.Props}}');
+ window.setup_authorize_page({{.Props}});
</script>
</body>
</html>
diff --git a/web/templates/channel.html b/web/templates/channel.html
index 8abbe36df..94d79a022 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -4,27 +4,9 @@
<html>
{{template "head" . }}
<body>
- <div id="error_bar"></div>
- <div id="channel_view" class="channel-view"></div>
- <div id="channel_loader"></div>
- <div id="post_mention_tab"></div>
- <div id="reply_mention_tab"></div>
- <div id="edit_mention_tab"></div>
- <div id="get_team_invite_link_modal"></div>
- <div id="import_theme_modal"></div>
- <div id="team_settings_modal"></div>
- <div id="invite_member_modal"></div>
- <div id="rename_channel_modal"></div>
- <div id="edit_post_modal"></div>
- <div id="delete_post_modal"></div>
- <div id="more_channels_modal"></div>
- <div id="post_deleted_modal"></div>
- <div id="channel_notifications_modal"></div>
- <div id="team_members_modal"></div>
- <div id="removed_from_channel_modal"></div>
- <div id="register_app_modal"></div>
+ <div id="channel_view" class='channel-view'></div>
<script>
-window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }}, {{ .User }});
+ window.setup_channel_page({{ .Props }}, {{ .Team }}, {{ .Channel }});
$('body').tooltip( {selector: '[data-toggle=tooltip]'} );
var modals = $('.modal-body').not('.edit-modal-body');
if($(window).height() > 1200){
diff --git a/web/templates/claim_account.html b/web/templates/claim_account.html
index 6c9f36fa7..bcf63fd95 100644
--- a/web/templates/claim_account.html
+++ b/web/templates/claim_account.html
@@ -5,8 +5,22 @@
<body class="white">
<div class="container-fluid">
<div class="inner__wrap">
- <div class="row content" id="claim"></div>
- </div>
+ <div class="row content">
+ <div class="signup-header">
+ <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+ </div>
+ <div class="col-sm-12">
+ <div class="signup-team__container">
+ <img class="signup-team-logo" src="/static/images/logo.png" />
+ <div id="claim"></div>
+ </div>
+ </div>
+ <div class="footer-push"></div>
+ </div>
+ <div class="row footer">
+ {{template "footer" . }}
+ </div>
+ <div>
</div>
<script>
window.setup_claim_account_page({{ .Props }});
diff --git a/web/templates/docs.html b/web/templates/docs.html
index 0e0f51648..1a20580fb 100644
--- a/web/templates/docs.html
+++ b/web/templates/docs.html
@@ -6,6 +6,9 @@
<div class="container-fluid">
<div class="inner__wrap">
<div class="row content">
+ <div class="signup-header">
+ <a href="/">{{ .ClientCfg.SiteName }}</a>
+ </div>
<div class="col-sm-12">
<div class="docs__page" id="docs"></div>
</div>
diff --git a/web/templates/find_team.html b/web/templates/find_team.html
index 9acf3ac64..15b8bf463 100644
--- a/web/templates/find_team.html
+++ b/web/templates/find_team.html
@@ -6,6 +6,9 @@
<div class="container-fluid">
<div class="inner__wrap">
<div class="row content">
+ <div class="signup-header">
+ <a href="/">{{ .ClientCfg.SiteName }}</a>
+ </div>
<div class="col-sm-12">
<div class="signup-team__container">
<img class="signup-team-logo" src="/static/images/logo.png" />
@@ -20,7 +23,7 @@
</div>
</div>
<script>
- window.setup_find_team_page();
+ window.setup_find_team_page({{ .Props }});
</script>
</body>
</html>
diff --git a/web/templates/footer.html b/web/templates/footer.html
index 60dd5a40e..5b11328fb 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -5,10 +5,10 @@
</div>
<div class="col-xs-12">
<span class="pull-right footer-link copyright">© 2015 Mattermost, Inc.</span>
- <a id="help_link" class="pull-right footer-link" href="#">Help</a>
- <a id="terms_link" class="pull-right footer-link" href="#">Terms</a>
- <a id="privacy_link" class="pull-right footer-link" href="#">Privacy</a>
- <a id="about_link" class="pull-right footer-link" href="#">About</a>
+ <a id="help_link" class="pull-right footer-link" href="#">{{ .ClientCfg.FooterHelp }}</a>
+ <a id="terms_link" class="pull-right footer-link" href="#">{{ .ClientCfg.FooterTerms }}</a>
+ <a id="privacy_link" class="pull-right footer-link" href="#">{{ .ClientCfg.FooterPrivacy }}</a>
+ <a id="about_link" class="pull-right footer-link" href="#">{{ .ClientCfg.FooterAbout }}</a>
</div>
</div>
<script>
diff --git a/web/templates/head.html b/web/templates/head.html
index 4060d2410..b1ec905b5 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -62,8 +62,11 @@
<style id="antiClickjack">body{display:none !important;}</style>
<script>
- ReactIntl.addLocaleData(ReactIntlLocaleData.en);
- ReactIntl.addLocaleData(ReactIntlLocaleData.es);
+ if ('ReactIntl' in window && 'ReactIntlLocaleData' in window) {
+ Object.keys(ReactIntlLocaleData).forEach(function(lang) {
+ ReactIntl.addLocaleData(ReactIntlLocaleData[lang]);
+ });
+ }
window.mm_config = {{ .ClientCfg }};
window.mm_license = {{ .ClientLicense }};
@@ -71,6 +74,13 @@
window.mm_user = {{ .User }};
window.mm_channel = {{ .Channel }};
window.mm_locale = {{ .Locale }};
+ window.mm_preferences = {{ .Preferences }};
+
+ $(function() {
+ if (window.mm_preferences != null) {
+ PreferenceStore.setPreferences(window.mm_preferences);
+ }
+ });
if ({{.SessionTokenIndex}} >= 0) {
window.mm_session_token_index = {{.SessionTokenIndex}};
@@ -78,13 +88,13 @@
headers: {
'X-MM-TokenIndex': mm_session_token_index,
'Accept-Language': mm_locale
- }
+ }
});
} else {
$.ajaxSetup({
headers: {
'Accept-Language': mm_locale
- }
+ }
});
}
@@ -108,7 +118,7 @@
}
console.log('detected login from a different tab');
- window.location.href = '/' + window.mm_team.name;
+ location.reload();
}
});
});
diff --git a/web/templates/login.html b/web/templates/login.html
index f6a551220..be5e6bf4f 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -7,7 +7,7 @@
<div class="inner__wrap">
<div class="row content">
<div class="signup-header">
- {{.Props.TeamDisplayName}}
+ <a href="/">{{ .ClientCfg.SiteName }}</a>
</div>
<div class="col-sm-12">
<div id="login"></div>
diff --git a/web/templates/password_reset.html b/web/templates/password_reset.html
index 7f6335c92..df82285ef 100644
--- a/web/templates/password_reset.html
+++ b/web/templates/password_reset.html
@@ -5,7 +5,21 @@
<body class="white">
<div class="container-fluid">
<div class="inner__wrap">
- <div class="row content" id="reset"></div>
+ <div class="row content">
+ <div class="signup-header">
+ <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+ </div>
+ <div class="col-sm-12">
+ <div class="signup-team__container">
+ <img class="signup-team-logo" src="/static/images/logo.png" />
+ <div id="reset"></div>
+ </div>
+ </div>
+ <div class="footer-push"></div>
+ </div>
+ <div class="row footer">
+ {{template "footer" . }}
+ </div>
</div>
</div>
<script>
diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html
index 39fd3791b..afba58066 100644
--- a/web/templates/signup_team.html
+++ b/web/templates/signup_team.html
@@ -10,7 +10,7 @@
<div class="signup-team__container">
<img class="signup-team-logo" src="/static/images/logo.png" />
<h1>{{ .ClientCfg.SiteName }}</h1>
- <h4 class="color--light">All team communication in one place, searchable and accessible anywhere</h4>
+ <h4 class="color--light">{{.Props.Info}}</h4>
<div id="signup-team"></div>
</div>
</div>
diff --git a/web/templates/signup_team_confirm.html b/web/templates/signup_team_confirm.html
index 2d27194bc..d16861808 100644
--- a/web/templates/signup_team_confirm.html
+++ b/web/templates/signup_team_confirm.html
@@ -7,11 +7,7 @@
<div class="inner__wrap">
<div class="row content">
<div class="col-sm-12">
- <div class="signup-team__container">
- <h3>Sign up Complete</h3>
- <p>Please check your email: {{ .Props.Email }}<br>
- Your email contains a link to set up your team</p>
- </div>
+ <div id="signup-team-confirm"></div>
</div>
</div>
<div class="row footer">
@@ -19,6 +15,9 @@
</div>
</div>
</div>
+ <script>
+window.setup_signup_team_confirm_page({{ .Props }});
+ </script>
</body>
</html>
{{end}}
diff --git a/web/templates/verify.html b/web/templates/verify.html
index a49ba7930..bab329c7d 100644
--- a/web/templates/verify.html
+++ b/web/templates/verify.html
@@ -6,7 +6,16 @@
<div class="container-fluid">
<div class="inner__wrap">
<div class="row content">
- <div id="verify"></div>
+ <div class="signup-header">
+ <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+ </div>
+ <div class="col-sm-12">
+ <div class="signup-team__container">
+ <img class="signup-team-logo" src="/static/images/logo.png" />
+ <div id="verify"></div>
+ </div>
+ </div>
+ <div class="footer-push"></div>
</div>
<div class="row footer">
{{template "footer" . }}
diff --git a/web/templates/welcome.html b/web/templates/welcome.html
deleted file mode 100644
index 15c072226..000000000
--- a/web/templates/welcome.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{{define "welcome"}}
-<!DOCTYPE html>
-<html>
-{{template "head" . }}
-<body>
- <div class="container-fluid">
- <div class="inner__wrap">
- <div class="row header">
- <div id="navbar"></div>
- </div>
- <div class="row main">
- <div class="app__content">
- <div class="welcome-info">
- <h1>Welcome to {{ .ClientCfg.SiteName }}!</h1>
- <p>
- You do not appear to be part of any teams. Please contact your
- administrator to have him send you an invitation to a private team.
- Or you can start a new private team.
- </p>
- <div class="alert alert-warning">
- If you where invited to a team that you do not see you must
- confirm your email address first before gaining access to the
- team.
- </div>
- <div id="new_channel">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <script>
- window.setup_welcome_page();
- </script>
-</body>
-</html>
-{{end}}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-09-29 21:43:59 +0000