fixing merge conflicts

9 files changed, 12 insertions, 12 deletions

diff --git a/web/templates/channel.html b/web/templates/channel.html
index d96aee3d4..eaf0f2563 100644
--- a/web/templates/channel.html
+++ b/web/templates/channel.html
@@ -46,7 +46,7 @@
   <div id="direct_channel_modal"></div>
   <div id="channel_info_modal"></div>
 <script>
-window.setup_channel_page('{{ .Props.TeamName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}');
+window.setup_channel_page('{{ .Props.TeamDisplayName }}', '{{ .Props.TeamType }}', '{{ .Props.TeamId }}', '{{ .Props.ChannelName }}', '{{ .Props.ChannelId }}');
 </script>
 </body>
 </html>
diff --git a/web/templates/head.html b/web/templates/head.html
index ead648571..d14340998 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -31,7 +31,6 @@
     <link rel="stylesheet" href="/static/css/styles.css">
 
     <script src="/static/js/perfect-scrollbar-0.6.3.jquery.js"></script>
-    <script src="/static/js/bundle.js"></script>
 
     <script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1','packages':['annotationchart']}]}"></script>
 
@@ -43,6 +42,9 @@
         }
         config.SiteName = '{{ .SiteName }}';
     </script>
+
+    <script src="/static/js/bundle.js"></script>
+
     <script>
         if (config.LogglyWriteKey != null && config.LogglyWriteKey !== "") {
             var _LTracker = _LTracker || [];
@@ -60,7 +62,7 @@
             var user = window.UserStore.getCurrentUser(true);
             if (user) {
               analytics.identify(user.id, {
-                  name: user.full_name,
+                  name: user.nickname,
                   email: user.email,
                   createdAt: user.create_at,
                   username: user.username,
diff --git a/web/templates/home.html b/web/templates/home.html
index abf8062f2..9ec8b7000 100644
--- a/web/templates/home.html
+++ b/web/templates/home.html
@@ -17,7 +17,7 @@
     </div>
   </div>
   <script>
-  window.setup_home_page();
+	window.setup_home_page({{.Props.TeamURL}});
   </script>
 </body>
 </html>
diff --git a/web/templates/login.html b/web/templates/login.html
index c107e1ad5..24cebec8f 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.TeamName}}
+					{{.Props.TeamDisplayName}}
 				</div>
 				<div class="col-sm-12">
 						<div id="login"></div>
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 	<script>
-		window.setup_login_page();
+window.setup_login_page({{.Props.TeamDisplayName}}, {{.Props.TeamName}});
 	</script>
 </body>
 </html>
diff --git a/web/templates/password_reset.html b/web/templates/password_reset.html
index 8b63556b1..6244f6418 100644
--- a/web/templates/password_reset.html
+++ b/web/templates/password_reset.html
@@ -9,7 +9,7 @@
 		</div>
 	</div>
 	<script>
-		window.setup_password_reset_page('{{ .Props.IsReset }}', '{{ .Props.TeamName }}', '{{ .Props.Domain }}', '{{ .Props.Hash }}', '{{ .Props.Data }}');
+		window.setup_password_reset_page('{{ .Props.IsReset }}', '{{ .Props.TeamDisplayName }}', '{{ .Props.TeamName }}', '{{ .Props.Hash }}', '{{ .Props.Data }}');
 	</script>
 </body>
 </html>
diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html
index fad332bee..b86590589 100644
--- a/web/templates/signup_team.html
+++ b/web/templates/signup_team.html
@@ -12,7 +12,6 @@
                         <h2>All team communication in one place, searchable and accessible anywhere</h2>
                         <h4 class="text--light">{{ .SiteName }} is free for an unlimited time, for unlimited users </h4 class="text--light">
                         <div id="signup-team"></div>
-                        <a class="signup-team-login" href="/login">or Sign In</a>
                     </div>
                 </div>
                 <div class="footer-push"></div>
@@ -23,7 +22,7 @@
         </div>
     </div>
     <script>
-    window.setup_signup_team_page();
+window.setup_signup_team_page();
     </script>
 </body>
 </html>
diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html
index 59f49cdbd..674e54ee2 100644
--- a/web/templates/signup_team_complete.html
+++ b/web/templates/signup_team_complete.html
@@ -19,7 +19,7 @@
         </div>
     </div>
     <script>
-    window.setup_signup_team_complete_page('{{.Props.Email}}', '{{.Props.Name}}', '{{.Props.Data}}', '{{.Props.Hash}}');
+window.setup_signup_team_complete_page('{{.Props.Email}}', '{{.Props.DisplayName}}', '{{.Props.Data}}', '{{.Props.Hash}}');
     </script>
 </body>
 </html>
diff --git a/web/templates/signup_team_confirm.html b/web/templates/signup_team_confirm.html
index 9e21126da..3a6134af3 100644
--- a/web/templates/signup_team_confirm.html
+++ b/web/templates/signup_team_confirm.html
@@ -8,7 +8,6 @@
             <div class="row content">
                 <div class="col-sm-12">
                     <div class="signup-team__container">
-                        <p>Did you mean to sign-in rather than sign up? Sign in <a href="/login">here</a>. </p>
                         <h3>Sign up Complete</h3>
                         <p>Please check your email: {{ .Props.Email }}<br>
                         You email contains a link to set up your team</p>
diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html
index 5fe907ba7..0cc655b63 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.TeamDomain}}', '{{.Props.TeamName}}', '{{.Props.TeamId}}', '{{.Props.Data}}', '{{.Props.Hash}}');
+    window.setup_signup_user_complete_page('{{.Props.Email}}', '{{.Props.TeamName}}', '{{.Props.TeamDisplayName}}', '{{.Props.TeamId}}', '{{.Props.Data}}', '{{.Props.Hash}}');
     </script>
 </body>
 </html>