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

15 files changed, 56 insertions, 65 deletions

diff --git a/templates/.VERSION b/templates/.VERSION
index 036f90911f..a4f4593d76 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.4.7.0725 Alpha
\ No newline at end of file
+0.4.7.0726 Alpha
\ No newline at end of file
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 10a53b5397..34e710bf62 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -176,11 +176,11 @@
                     <dt>Enable Set Cookie</dt>
                     <dd><i class="fa fa{{if .SessionConfig.EnableSetCookie}}-check{{end}}-square-o"></i></dd>
                     <dt>GC Interval Time</dt>
-                    <dd>{{.SessionConfig.GcIntervalTime}} seconds</dd>
+                    <dd>{{.SessionConfig.Gclifetime}} seconds</dd>
                     <dt>Session Life Time</dt>
-                    <dd>{{.SessionConfig.SessionLifeTime}} seconds</dd>
+                    <dd>{{.SessionConfig.Maxlifetime}} seconds</dd>
                     <dt>HTTPS Only</dt>
-                    <dd><i class="fa fa{{if .SessionConfig.CookieSecure}}-check{{end}}-square-o"></i></dd>
+                    <dd><i class="fa fa{{if .SessionConfig.Secure}}-check{{end}}-square-o"></i></dd>
                     <dt>Cookie Life Time</dt>
                     <dd>{{.SessionConfig.CookieLifeTime}} seconds</dd>
                     <dt>Session ID Hash Function</dt>
diff --git a/templates/ng/base/head.tmpl b/templates/ng/base/head.tmpl
index 0cd7686ffb..bab914bfe7 100644
--- a/templates/ng/base/head.tmpl
+++ b/templates/ng/base/head.tmpl
@@ -12,10 +12,10 @@
 		<!-- Stylesheet -->
 		<link rel="stylesheet" href="/ng/css/ui.css">
 		<link rel="stylesheet" href="/ng/css/gogs.css">
-		<link rel="stylesheet" href="/ng/css/font-awesome.min.css">
+		<link rel="stylesheet" href="/css/font-awesome.min.css">
 		<link rel="stylesheet" href="/ng/fonts/octicons.css">
 		<!-- <link rel="stylesheet" href="http://cdn.bootcss.com/highlight.js/8.1/styles/github.min.css"> -->
-		<link rel="stylesheet" href="/ng/css/github.min.css">
+		<link rel="stylesheet" href="/css/github.min.css">
 
 		<!-- JavaScript -->
 		<script src="/ng/js/lib/jquery-1.11.1.min.js"></script>
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index 385f9d5bae..420e973a50 100644
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -34,7 +34,7 @@
                     <td class="author"><img class="avatar" src="{{AvatarLink .Author.Email}}" alt=""/><a href="/user/email2user?email={{.Author.Email}}">{{.Author.Name}}</a></td>
                     <td class="sha"><a rel="nofollow" class="label label-success" href="/{{$username}}/{{$reponame}}/commit/{{.Id}} ">{{SubStr .Id.String 0 10}} </a></td>
                     <td class="message">{{.Summary}} </td>
-                    <td class="date">{{TimeSince .Author.When}}</td>
+                    <td class="date">{{TimeSince .Author.When $.Lang}}</td>
                 </tr>
                 {{end}}
                 </tbody>
diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl
index c85caa21ec..6adea04593 100644
--- a/templates/repo/diff.tmpl
+++ b/templates/repo/diff.tmpl
@@ -20,7 +20,7 @@
                 <p class="author">
                     <img class="avatar" src="{{AvatarLink .Commit.Author.Email}}" alt=""/>
                     <a class="name" href="/user/email2user?email={{.Commit.Author.Email}}"><strong>{{.Commit.Author.Name}}</strong></a>
-                    <span class="time">{{TimeSince .Commit.Author.When}}</span>
+                    <span class="time">{{TimeSince .Commit.Author.When $.Lang}}</span>
                 </p>
             </div>
         </div>
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index ffbdcc8379..099e41b2dd 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -86,7 +86,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/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index aec50ca62e..c12de7dd7e 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -18,7 +18,7 @@
                         <a class="btn btn-primary pull-right issue-edit-save hidden" href="#" data-ajax="{{.RepoLink}}/issues/{{.Issue.Index}}" data-ajax-name="issue-edit-save" data-ajax-method="post">Save</a>{{end}}
                         <span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span>
                         <a href="/user/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue
-                        <span class="time">{{TimeSince .Issue.Created}}</span> · {{.Issue.NumComments}} comments
+                        <span class="time">{{TimeSince .Issue.Created $.Lang}}</span> · {{.Issue.NumComments}} comments
                     </p>
                 </div>
                 <div class="issue-main">
@@ -66,7 +66,7 @@
                         <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
                         <div class="issue-content panel panel-default">
                             <div class="panel-heading">
-                                <a href="/user/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created}}</span>
+                                <a href="/user/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created $.Lang}}</span>
                                 <!-- <a class="issue-comment-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a>
                                 <a class="issue-comment-edit pull-right issue-action" href="#" title="Remove Comment" data-url="{remove-link}"><i class="fa fa-edit"></i></a> -->
                                 <span class="role label label-default pull-right">Owner</span>
@@ -95,14 +95,14 @@
                     <div class="issue-child issue-opened">
                         <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" /></a>
                         <div class="issue-content">
-                            <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created}}</span>
+                            <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-success">Reopened</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
                         </div>
                     </div>
                     {{else if eq .Type 2}}
                     <div class="issue-child issue-closed">
                         <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a>
                         <div class="issue-content">
-                            <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created}}</span>
+                            <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created $.Lang}}</span>
                         </div>
                     </div>
                     {{else if eq .Type 4}}
diff --git a/templates/status/401.tmpl b/templates/status/401.tmpl
index 6e24302fef..2c38d90fb5 100644
--- a/templates/status/401.tmpl
+++ b/templates/status/401.tmpl
@@ -1,6 +1,6 @@
-{{template "base/head" .}}
-{{template "base/header" .}}
+{{template "ng/base/head" .}}
+{{template "ng/base/header" .}}
 <div class="container">
 	401 Unauthorized: {{.ErrorMsg}}
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "ng/base/footer" .}}
\ No newline at end of file
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index 7062fb122e..2d04b55917 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -6,5 +6,6 @@
     <br>
     <p>Application Version: {{AppVer}}</p>
     <p>If you think this is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p>
+    <h3>We're currently working on 0.5 beta version, many pages may be missing at this time. Sorry for confusion!</h3>
 </div>
 {{template "ng/base/footer" .}}
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