Huge updates!!!!! Be careful to merge!!!!

6 files changed, 39 insertions, 49 deletions

diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index e9027230a5..209a495b58 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -70,15 +70,7 @@
                 <div class="panel-body">
                     <ul class="list-no-style">
                         {{range .Repos}}
-                        <li {{if .IsPrivate}}class="private"{{end}}>
-                            <a href="{{$.ContextUser.Name}}/{{.Name}}">
-                                <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
-                                <span class="repo-name">
-                                    <!-- <span class="repo-name-prefix">gogits / </span> -->
-                                    <strong class="repo">{{.Name}}</strong>
-                                </span>
-                            </a>
-                        </li>
+                            {{template "user/dashboard/repo_list" .}}
                         {{end}}
                     </ul>
                 </div>
@@ -87,42 +79,9 @@
                 </div>
                 <div class="panel-body">
                     <ul class="list-no-style">
-                        <li>
-                            <a href="#">
-                                <i class="octicon octicon-repo"></i>
-                            <span class="repo-name">
-                                <span class="repo-name-prefix">gogits / </span>
-                                <strong class="repo">gogs</strong>
-                            </span>
-                            <span class="right repo-star">
-                                <i class="octicon octicon-star"></i>2048
-                            </span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="octicon octicon-repo"></i>
-                            <span class="repo-name">
-                                <span class="repo-name-prefix">astaxie / </span>
-                                <strong class="repo">beego</strong>
-                            </span>
-                            <span class="right repo-star">
-                                <i class="octicon octicon-star"></i>2301
-                            </span>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="octicon octicon-repo"></i>
-                            <span class="repo-name">
-                                <span class="repo-name-prefix">gogits / </span>
-                                <strong class="repo">scaffold</strong>
-                            </span>
-                            <span class="right repo-star">
-                                <i class="octicon octicon-star"></i>0
-                            </span>
-                            </a>
-                        </li>
+                        {{range .CollaborativeRepos}}
+                            {{template "user/dashboard/repo_list" .}}
+                        {{end}}
                     </ul>
                 </div>
             </div>
diff --git a/templates/user/dashboard/repo_list.tmpl b/templates/user/dashboard/repo_list.tmpl
new file mode 100644
index 0000000000..e3d35e8ecc
--- /dev/null
+++ b/templates/user/dashboard/repo_list.tmpl
@@ -0,0 +1,12 @@
+<li {{if .IsPrivate}}class="private"{{end}}>
+    <a href="{{.Owner.Name}}/{{.Name}}">
+        <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
+        <span class="repo-name">
+            <!-- <span class="repo-name-prefix">gogits / </span> -->
+            <strong class="repo">{{.Name}}</strong>
+        </span>
+        <span class="right repo-star">
+            <i class="octicon octicon-star"></i>{{.NumStars}}
+        </span>
+    </a>
+</li>
\ No newline at end of file
diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl
index c4ad64a4cf..93e798aa30 100644
--- a/templates/user/issues.tmpl
+++ b/templates/user/issues.tmpl
@@ -41,7 +41,7 @@
                     <p class="info">
                         <span class="author"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" width="20"/>
                         <a href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a></span>
-                        <span class="time">{{TimeSince .Created}}</span>
+                        <span class="time">{{TimeSince .Created $.Lang}}</span>
                         <span class="comment"><i class="fa fa-comments"></i> {{.NumComments}}</span>
                     </p>
                 </div>
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 0c9ada0130..4f80f1659d 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -50,8 +50,8 @@
                 <ul class="list-unstyled activity-list">
                 {{range .Feeds}}
                     <li>
-                        <i class="icon fa fa-{{ActionIcon .OpType}}"></i>
-                        <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . | str2html}}</div>
+                        <i class="icon fa fa-{{ActionIcon .GetOpType}}"></i>
+                        <div class="info"><span class="meta">{{TimeSince .Created $.Lang}}</span><br>{{ActionDesc . | str2html}}</div>
                         <span class="clearfix"></span>
                     </li>
                 {{else}}
@@ -69,7 +69,7 @@
                             <a href="/{{$.Owner.Name}}/{{.Name}}">{{.Name}}{{if .IsPrivate}} <span class="label label-default">Private</span>{{end}}</a>
                         </h4>
                         <p class="desc">{{.Description}}</p>
-                        <div class="info">Last updated {{.Updated|TimeSince}}</div>
+                        <div class="info">Last updated {{TimeSince .Updated $.Lang}}</div>
                     </li>
                 {{end}}
                 </ul>
diff --git a/templates/user/settings/nav.tmpl b/templates/user/settings/nav.tmpl
index d6d20dee96..cae120527c 100644
--- a/templates/user/settings/nav.tmpl
+++ b/templates/user/settings/nav.tmpl
@@ -6,6 +6,7 @@
             <li {{if .PageIsSettingsPassword}}class="current"{{end}}><a href="/user/settings/password">{{.i18n.Tr "settings.password"}}</a></li>
             <li {{if .PageIsSettingsSSHKeys}}class="current"{{end}}><a href="/user/settings/ssh">{{.i18n.Tr "settings.ssh_keys"}}</a></li>
             <li {{if .PageIsSettingsSocial}}class="current"{{end}}><a href="/user/settings/social">{{.i18n.Tr "settings.social"}}</a></li>
+            <li {{if .PageIsSettingsOrgs}}class="current"{{end}}><a href="/user/settings/orgs">{{.i18n.Tr "settings.orgs"}}</a></li>
             <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="/user/settings/delete">{{.i18n.Tr "settings.delete"}}</a></li>
         </ul>
     </div>
diff --git a/templates/user/settings/orgs.tmpl b/templates/user/settings/orgs.tmpl
new file mode 100644
index 0000000000..fb9096c3da
--- /dev/null
+++ b/templates/user/settings/orgs.tmpl
@@ -0,0 +1,18 @@
+{{template "ng/base/head" .}}
+{{template "ng/base/header" .}}
+<div id="setting-wrapper" class="main-wrapper">
+    <div id="user-profile-setting" class="container clear">
+        {{template "user/settings/nav" .}}
+        <div class="grid-4-5 left">
+            <div class="setting-content">
+                {{template "ng/base/alert" .}}
+                <div id="setting-content">
+                    <div id="user-profile-setting-content" class="panel panel-radius">
+                        <p class="panel-header"><strong>{{.i18n.Tr "settings.manage_orgs"}}</strong></p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{template "ng/base/footer" .}}
\ No newline at end of file