merge

10 files changed, 12 insertions, 11 deletions

diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index 547e8ab5..c528185c 100644
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -11,7 +11,7 @@
         <h3>News Feed</h3>
     </div>
 </div>
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
     <div id="gogs-feed-left" class="col-md-8">
         <ul class="list-unstyled activity-list">
diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl
index a116787c..397ea8cc 100644
--- a/templates/user/delete.tmpl
+++ b/templates/user/delete.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     <div id="gogs-user-setting-nav" class="col-md-3">
         <h4>Account Setting</h4>
         <ul class="list-group">
diff --git a/templates/user/notification.tmpl b/templates/user/notification.tmpl
index c1abc46f..ecb3fa85 100644
--- a/templates/user/notification.tmpl
+++ b/templates/user/notification.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     <div id="gogs-user-setting-nav" class="col-md-3">
         <h4>Account Setting</h4>
         <ul class="list-group">
diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl
index a8b1e21e..532a57cb 100644
--- a/templates/user/password.tmpl
+++ b/templates/user/password.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     <div id="gogs-user-setting-nav" class="col-md-3">
         <h4>Account Setting</h4>
         <ul class="list-group">
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 84d3b13c..8dca29ff 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     <div id="gogs-user-profile" class="col-md-3">
         <div class="profile-avatar text-center">
             <a href="{{.Owner.HomeLink}}" class="center-block" data-toggle="tooltip" data-placement="bottom" title="Change Avatar">
@@ -32,10 +32,11 @@
             {{if eq .TabName "activity"}}
             <div class="tab-pane active">
                 <ul class="list-unstyled activity-list">
+                {{$avatarLink := .Owner.AvatarLink}}
                 {{range .Feeds}}
                     <li>
                         <i class="icon fa fa-{{ActionIcon .OpType}}"></i>
-                        <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . | str2html}}</div>
+                        <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $avatarLink | str2html}}</div>
                         <span class="clearfix"></span>
                     </li>
                 {{else}}
diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl
index 104575d4..ef5879b5 100644
--- a/templates/user/publickey.tmpl
+++ b/templates/user/publickey.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     <div id="gogs-user-setting-nav" class="col-md-3">
         <h4>Account Setting</h4>
         <ul class="list-group">
diff --git a/templates/user/security.tmpl b/templates/user/security.tmpl
index 37cd5872..cf51127d 100644
--- a/templates/user/security.tmpl
+++ b/templates/user/security.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     <div id="gogs-user-setting-nav" class="col-md-3">
         <h4>Account Setting</h4>
         <ul class="list-group">
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index edbeeb22..d6a6094f 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container" data-page="user">
     <div id="gogs-user-setting-nav" class="col-md-3">
         <h4>Account Setting</h4>
         <ul class="list-group">
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index 3aefefdc..e60cedec 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div class="container" id="gogs-body">
+<div class="container" id="gogs-body" data-page="user-signin">
     <form action="/user/login" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
         <h3>Log in</h3>
         <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index 2f1e82c7..187364de 100644
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div class="container" id="gogs-body">
+<div class="container" id="gogs-body" data-page="user-signup">
 	<form action="/user/sign_up" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
         <h3>Sign Up</h3>
 	    <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>