diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-06 11:12:37 -0500 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-06 11:12:37 -0500 |
| commit | d8b92b4bc99d642c7fd9a6080bdfa8d782e8c325 (patch) | |
| tree | ba54f16bd242d619bb4ffdc051ea07a6c2311117 /templates/base | |
| parent | 1249392c8390d9e348c388c0ad6e80fce208cd95 (diff) | |
| parent | 4c1858c07b972e64d47218646f89b2fb5340a993 (diff) | |
| download | gitea-d8b92b4bc99d642c7fd9a6080bdfa8d782e8c325.tar.gz gitea-d8b92b4bc99d642c7fd9a6080bdfa8d782e8c325.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
templates/user/signup.tmpl
Diffstat (limited to 'templates/base')
| -rw-r--r-- | templates/base/footer.tmpl | 3 | ||||
| -rw-r--r-- | templates/base/navbar.tmpl | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index eaf5bd626e..4ae4a95fa0 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -1,6 +1,7 @@ <script> $(function(){ - initCore(); + initCore(); + {{if .PageIsSignUp}}initRegister();{{end}} }); </script> </body> diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl index 82fc3ae180..a52ce6c034 100644 --- a/templates/base/navbar.tmpl +++ b/templates/base/navbar.tmpl @@ -1,8 +1,8 @@ <div class="gogs-masthead navbar navbar-fixed-top" id="masthead"> <div class="container"> <nav class="gogs-nav"> - <a class="gogs-nav-item active" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="gogs-logo"></a> - <a class="gogs-nav-item" href="#">Dashboard</a> + <a id="gogs-nav-logo" class="gogs-nav-item{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="gogs-logo"></a> + <a class="gogs-nav-item{{if .PageIsUserDashboard}} active{{end}}" href="#">Dashboard</a> <a class="gogs-nav-item" href="#">Explore</a> <a class="gogs-nav-item" href="#">Help</a>{{if .IsSigned}} <a id="gogs-nav-out" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/user/login/"><i class="fa fa-power-off fa-lg"></i></a> |