summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-22 11:51:32 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-22 11:51:32 -0500
commitbc69f2aae0cdc030adbebadd51d388d35e63950f (patch)
tree61a495e2e74ecdc01d117262088cbc2747a2ee8a
parent32ae72d91d31699899d5e2084cf7faa40c81e42c (diff)
parent70eee522978333174c9e51b0f7505413a9a2b66c (diff)
downloadchat-bc69f2aae0cdc030adbebadd51d388d35e63950f.tar.gz
chat-bc69f2aae0cdc030adbebadd51d388d35e63950f.tar.bz2
chat-bc69f2aae0cdc030adbebadd51d388d35e63950f.zip
Merge pull request #2211 from mattermost/asaadmahmoodspin-ui-improvements
Adding back button for login pages
Diffstat
-rw-r--r--api/templates/error.html2
-rw-r--r--i18n/en.json4
-rw-r--r--web/sass-files/sass/partials/_signup.scss5
-rw-r--r--web/templates/claim_account.html2
-rw-r--r--web/templates/docs.html2
-rw-r--r--web/templates/find_team.html2
-rw-r--r--web/templates/login.html2
-rw-r--r--web/templates/password_reset.html2
-rw-r--r--web/templates/signup_team_complete.html3
-rw-r--r--web/templates/signup_team_confirm.html3
-rw-r--r--web/templates/signup_user_complete.html3
-rw-r--r--web/templates/verify.html2
-rw-r--r--web/web.go1
13 files changed, 26 insertions, 7 deletions
diff --git a/api/templates/error.html b/api/templates/error.html
index 2b6211be2..2f588aead 100644
--- a/api/templates/error.html
+++ b/api/templates/error.html
@@ -1,7 +1,7 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <title>{{ .ClientCfg.SiteName }} - Error</title>
+ <title><span class='fa fa-chevron-left'></span>Back - Error</title>
<link rel="stylesheet" href="/static/css/bootstrap-3.3.5.min.css">
<link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet">
diff --git a/i18n/en.json b/i18n/en.json
index f45f65526..b904cd822 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3356,6 +3356,10 @@
"translation": "Find Team"
},
{
+ "id": "web.header.back",
+ "translation": "Back"
+ },
+ {
"id": "web.footer.about",
"translation": "About"
},
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 81fe037f7..e9c872a6e 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -5,6 +5,11 @@
line-height: 33px;
padding: 0 1em 0.2em;
background: #EEE;
+
+ .fa {
+ margin-right: 5px;
+ }
+
}
.signup-team__container {
padding: 100px 0px 50px 0px;
diff --git a/web/templates/claim_account.html b/web/templates/claim_account.html
index bcf63fd95..2a9126d1b 100644
--- a/web/templates/claim_account.html
+++ b/web/templates/claim_account.html
@@ -7,7 +7,7 @@
<div class="inner__wrap">
<div class="row content">
<div class="signup-header">
- <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+ <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
</div>
<div class="col-sm-12">
<div class="signup-team__container">
diff --git a/web/templates/docs.html b/web/templates/docs.html
index 1a20580fb..dc18e5cb6 100644
--- a/web/templates/docs.html
+++ b/web/templates/docs.html
@@ -7,7 +7,7 @@
<div class="inner__wrap">
<div class="row content">
<div class="signup-header">
- <a href="/">{{ .ClientCfg.SiteName }}</a>
+ <a href="/"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
</div>
<div class="col-sm-12">
<div class="docs__page" id="docs"></div>
diff --git a/web/templates/find_team.html b/web/templates/find_team.html
index 15b8bf463..b7e1d7eca 100644
--- a/web/templates/find_team.html
+++ b/web/templates/find_team.html
@@ -7,7 +7,7 @@
<div class="inner__wrap">
<div class="row content">
<div class="signup-header">
- <a href="/">{{ .ClientCfg.SiteName }}</a>
+ <a href="/"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
</div>
<div class="col-sm-12">
<div class="signup-team__container">
diff --git a/web/templates/login.html b/web/templates/login.html
index be5e6bf4f..88540a906 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">
- <a href="/">{{ .ClientCfg.SiteName }}</a>
+ <a href="/"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</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 df82285ef..e68f8b693 100644
--- a/web/templates/password_reset.html
+++ b/web/templates/password_reset.html
@@ -7,7 +7,7 @@
<div class="inner__wrap">
<div class="row content">
<div class="signup-header">
- <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+ <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
</div>
<div class="col-sm-12">
<div class="signup-team__container">
diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html
index 4b179b1e1..3873d8978 100644
--- a/web/templates/signup_team_complete.html
+++ b/web/templates/signup_team_complete.html
@@ -6,6 +6,9 @@
<div class="container-fluid">
<div class="inner__wrap">
<div class="row content">
+ <div class="signup-header">
+ <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
+ </div>
<div class="col-sm-12">
<div class="signup-team__container">
<div id="signup-team-complete"></div>
diff --git a/web/templates/signup_team_confirm.html b/web/templates/signup_team_confirm.html
index d16861808..31f1ba95b 100644
--- a/web/templates/signup_team_confirm.html
+++ b/web/templates/signup_team_confirm.html
@@ -6,6 +6,9 @@
<div class="container-fluid">
<div class="inner__wrap">
<div class="row content">
+ <div class="signup-header">
+ <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
+ </div>
<div class="col-sm-12">
<div id="signup-team-confirm"></div>
</div>
diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html
index 2400b7b77..937a89dd2 100644
--- a/web/templates/signup_user_complete.html
+++ b/web/templates/signup_user_complete.html
@@ -6,6 +6,9 @@
<div class="container-fluid">
<div class="inner__wrap">
<div class="row content">
+ <div class="signup-header">
+ <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
+ </div>
<div class="col-sm-12">
<div class="signup-team__container padding--less">
<div id="signup-user-complete"></div>
diff --git a/web/templates/verify.html b/web/templates/verify.html
index bab329c7d..2e5496d7a 100644
--- a/web/templates/verify.html
+++ b/web/templates/verify.html
@@ -7,7 +7,7 @@
<div class="inner__wrap">
<div class="row content">
<div class="signup-header">
- <a href="/{{.Props.TeamName}}">{{.Props.TeamDisplayName}}</a>
+ <a href="/{{.Props.TeamName}}"><span class='fa fa-chevron-left'></span>{{ .ClientCfg.HeaderBack }}</a>
</div>
<div class="col-sm-12">
<div class="signup-team__container">
diff --git a/web/web.go b/web/web.go
index efe0e6b13..09450b976 100644
--- a/web/web.go
+++ b/web/web.go
@@ -54,6 +54,7 @@ func (me *HtmlTemplatePage) Render(c *api.Context, w http.ResponseWriter) {
me.Props["Locale"] = me.Locale
me.SessionTokenIndex = c.SessionTokenIndex
+ me.ClientCfg["HeaderBack"] = c.T("web.header.back")
me.ClientCfg["FooterHelp"] = c.T("web.footer.help")
me.ClientCfg["FooterTerms"] = c.T("web.footer.terms")
me.ClientCfg["FooterPrivacy"] = c.T("web.footer.privacy")
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 00:03:51 +0000