diff options
Diffstat (limited to 'web/templates')
-rw-r--r-- | web/templates/authorize.html | 2 | ||||
-rw-r--r-- | web/templates/footer.html | 2 | ||||
-rw-r--r-- | web/templates/head.html | 21 | ||||
-rw-r--r-- | web/templates/home.html | 2 | ||||
-rw-r--r-- | web/templates/signup_team.html | 2 | ||||
-rw-r--r-- | web/templates/welcome.html | 2 |
6 files changed, 20 insertions, 11 deletions
diff --git a/web/templates/authorize.html b/web/templates/authorize.html index b0fa3e475..430291676 100644 --- a/web/templates/authorize.html +++ b/web/templates/authorize.html @@ -6,7 +6,7 @@ <div class="oauth-prompt"> <div class="prompt__heading"> <div class="prompt__app-icon"> - <img src="/static/images/icon50x50.gif" width="50" height="50" alt=""> + <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> diff --git a/web/templates/footer.html b/web/templates/footer.html index 296e902cf..dc1a7c9d0 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -1,7 +1,7 @@ {{define "footer"}} <div class="footer-pane col-xs-12"> <div class="col-xs-12"> - <span class="pull-right footer-site-name">{{ .ClientProps.SiteName }}</span> + <span class="pull-right footer-site-name">{{ .ClientCfg.SiteName }}</span> </div> <div class="col-xs-12"> <span class="pull-right footer-link copyright">© 2015 Mattermost, Inc.</span> diff --git a/web/templates/head.html b/web/templates/head.html index 3466510d4..041831ed7 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -18,10 +18,6 @@ <link rel="manifest" href="/static/config/manifest.json"> <!-- Android add to homescreen --> - <script> - window.config = {{ .ClientProps }}; - </script> - <!-- CSS Should always go first --> <link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css"> <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css"> @@ -44,6 +40,19 @@ <style id="antiClickjack">body{display:none !important;}</style> <script> + window.mm_config = {{ .ClientCfg }}; + window.mm_team = {{ .Team }}; + window.mm_user = {{ .User }}; + + if ({{.SessionTokenIndex}} >= 0) { + window.mm_session_token_index = {{.SessionTokenIndex}}; + $.ajaxSetup({ + headers: { 'X-MM-TokenIndex': mm_session_token_index } + }); + } + </script> + + <script> window.onerror = function(msg, url, line, column, stack) { var l = {}; l.level = 'ERROR'; @@ -70,9 +79,9 @@ </script> <script type="text/javascript"> - if (window.config.SegmentDeveloperKey != null && window.config.SegmentDeveloperKey !== "") { + if (window.mm_config.SegmentDeveloperKey != null && window.mm_config.SegmentDeveloperKey !== "") { !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","group","track","ready","alias","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="3.0.1"; - analytics.load(window.config.SegmentDeveloperKey); + analytics.load(window.mm_config.SegmentDeveloperKey); var user = window.UserStore.getCurrentUser(true); if (user) { analytics.identify(user.id, { diff --git a/web/templates/home.html b/web/templates/home.html index 0d8b89061..08876d41d 100644 --- a/web/templates/home.html +++ b/web/templates/home.html @@ -17,7 +17,7 @@ </div> </div> <script> - window.setup_home_page({{ .Props }}); + window.setup_home_page(); </script> </body> </html> diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html index a6000696e..39fd3791b 100644 --- a/web/templates/signup_team.html +++ b/web/templates/signup_team.html @@ -9,7 +9,7 @@ <div class="col-sm-12"> <div class="signup-team__container"> <img class="signup-team-logo" src="/static/images/logo.png" /> - <h1>{{ .ClientProps.SiteName }}</h1> + <h1>{{ .ClientCfg.SiteName }}</h1> <h4 class="color--light">All team communication in one place, searchable and accessible anywhere</h4> <div id="signup-team"></div> </div> diff --git a/web/templates/welcome.html b/web/templates/welcome.html index e7eeb5648..15c072226 100644 --- a/web/templates/welcome.html +++ b/web/templates/welcome.html @@ -11,7 +11,7 @@ <div class="row main"> <div class="app__content"> <div class="welcome-info"> - <h1>Welcome to {{ .ClientProps.SiteName }}!</h1> + <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. |