Finish new home page of organization

7 files changed, 83 insertions, 79 deletions

diff --git a/templates/.VERSION b/templates/.VERSION
index 760339a997..2575ec6bc3 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.4.7.0809 Alpha
\ No newline at end of file
+0.4.7.0810 Alpha
\ No newline at end of file
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index b6675d3059..205318b0e9 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -1,70 +1,75 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body-nav" class="org-nav">
-    <div class="container clearfix">
-        <div class="col-md-8" id="org-nav-wrapper">
-            <img class="pull-left org-logo" src="{{.Org.AvatarLink}}?s=140" alt="" width="100"/>
-            <div id="org-nav-info">
-                <h2 class="org-name">{{.Org.FullName}}</h2>
-                {{if .Org.Description}}<p class="org-description">{{.Org.Description}}</p>{{end}}
-                <ul class="org-meta list-inline">
-                    {{if .Org.Website}}<li><i class="fa fa-link"></i><a target="_blank" href="{{.Org.Website}}">{{.Org.Website}}</a></li>{{end}}
-                    <li><i class="fa fa-envelope"></i><a href="mailto:{{.Org.Email}}">{{.Org.Email}}</a></li>
-                </ul>
-            </div>
-        </div>
-    </div>
+{{template "ng/base/head" .}}
+{{template "ng/base/header" .}}
+<div class="org-header" id="org-home-header">
+	<div class="container clear">
+		<img class="avatar-100 left" src="{{.Org.AvatarLink}}?s=140"/>
+		<div id="org-home-header-info">
+			<h2>{{.Org.FullName}} <a class="text-grey" href="/org/{{.Org.LowerName}}/settings"><span class="octicon octicon-gear"></span></a></h2>
+			{{if .Org.Description}}<p>{{.Org.Description}}</p>{{end}}
+            <ul class="text-grey">
+                {{if .Org.Location}}<li><span class="octicon octicon-location"></span> <span>{{.Org.Location}}</span></li>{{end}}
+                {{if .Org.Website}}<li><span class="octicon octicon-link"></span> <a target="_blank" href="{{.Org.Website}}">{{.Org.Website}}</a></li>{{end}}
+                {{if .Org.Email}}<li><span class="octicon octicon-mail"></span> <a href="mailto:{{.Org.Email}}">{{.Org.Email}}</a></li>{{end}}
+            </ul>
+		</div>
+	</div>
 </div>
-<div id="body" class="container">
-    <div id="org">
-        <div class="org-main col-md-8">
-            <div class="org-toolbar clearfix">
-                <a class="btn pull-right btn-success" href="/repo/create?org={{.Org.Id}}"><i class="fa fa-plus"></i> New Repository</a>
-            </div>
-            <hr style="width: 100%;border-color: #DDD"/>
-            <div class="org-repo-list" id="org-repo-list">
-                {{range .Repos}}
-                <div class="org-repo-item">
-                    <div class="org-repo-status pull-right">
-                        <!-- <ul class="list-inline">
-                            <li><strong>Go</strong></li>
-                            <li><i class="i fa fa-star"></i><strong>6</strong></li>
-                            <li><i class="fa fa-code-fork"></i><strong>2</strong></li>
-                        </ul> -->
-                    </div>
-                    <h3 class="org-repo-name"><a href="/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h3>
-                    <p class="org-repo-description">{{.Description}}</p>
-                    <p class="org-repo-update">Updated {{TimeSince .Updated $.Lang}}</p>
-                </div>
-                {{end}}
-            </div>
+<div class="container">
+    <div id="org-home-repo-list" class="left grid-2-3">
+        <div class="clear">
+            <a class="btn btn-green btn-large btn-link btn-radius right" href="/repo/create?org={{.Org.Id}}"><i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}</a>
         </div>
-
-        <div class="org-sidebar col-md-4">
-            <div class="org-panel panel panel-default" id="org-sidebar-members">
-                <div class="panel-heading"><strong><a href="/org/{{$.Org.Name}}/members">Members</a></strong></div>
-                <div class="panel-body">
-                    {{range .Members}}
-                    <a class="org-member" href="/user/{{.Name}}" data-toggle="tooltip" title="{{.Name}}" data-placement="bottom"><img src="{{.AvatarLink}}?s=140" alt=""/></a>
-                    {{end}}
-                </div>
-            </div>
-            <div class="org-panel panel panel-default" id="org-sidebar-teams">
-                <div class="panel-heading"><strong><a href="/org/{{$.Org.Name}}/teams">Teams</a></strong></div>
-                <div class="panel-body">
-                    {{range .Teams}}
-                    <div class="org-team">
-                        <a href="/org/{{$.Org.Name}}/teams/{{.LowerName}}">
-                            <p class="org-team-name"><strong>{{.Name}}</strong></p>
-                            <p class="org-team-meta">
-                                {{.NumMembers}} members · {{.NumRepos}} repositories
-                            </p>
-                        </a>
-                    </div>
-                    {{end}}
-                </div>
-            </div>
+        <div id="org-repo-list">
+			{{range .Repos}}
+				<div class="org-repo-item">
+                    <ul class="org-repo-status right">
+                        <li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
+                        <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
+                    </ul>
+					<h2><a href="/{{$.Org.Name}}/{{.Name}}">{{.Name}}</a></h2>
+					<p class="org-repo-description">{{.Description}}</p>
+					<p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
+				</div>
+			{{end}}
         </div>
     </div>
+    <div class="grid-1-3 right">
+    	<div class="org-sidebar">
+	    	<div class="panel panel-radius">
+	    		<div class="panel-header">
+	    			<a class="text-grey right" href="/org/{{.Org.LowerName}}/members"><strong>{{.Org.NumMembers}}</strong><span class="octicon octicon-chevron-right"></span></a>
+	    			<strong>{{.i18n.Tr "org.people"}}</strong>
+	    		</div>
+	    		<div class="panel-body" id="org-member-avatar-group">
+	    			{{range .Members}}
+	    			<a href="/{{.Name}}"><img src="{{.AvatarLink}}"></a>
+	    			{{end}}
+	    		</div>
+	    		<div class="panel-footer">
+	    			<a class="btn btn-medium btn-blue btn-link btn-radius" href="">{{.i18n.Tr "org.invite_someone"}}</a>
+	    		</div>
+	    	</div>
+	    	<br>
+	    	<div class="panel panel-radius">
+	    		<div class="panel-header">
+	    			<a class="text-grey right" href="/org/{{.Org.LowerName}}/teams"><strong>{{.Org.NumTeams}}</strong><span class="octicon octicon-chevron-right"></span></a>
+	    			<strong>{{.i18n.Tr "org.teams"}}</strong>
+	    		</div>
+	    		<div class="panel-body" id="org-home-team-list">
+	    			<ul>
+		    			{{range .Teams}}
+	    				<li>
+	    					<a class="text-black" href="/org/{{$.Org.LowerName}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
+	    					<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+	    				</li>
+		    			{{end}}
+	    			</ul>
+	    		</div>
+	    		<div class="panel-footer">
+	    			<a class="btn btn-medium btn-blue btn-link btn-radius" href="/org/{{$.Org.LowerName}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
+	    		</div>
+	    	</div>
+    	</div>
+    </div>
 </div>
-{{template "base/footer" .}}
+{{template "ng/base/footer" .}}
\ No newline at end of file
diff --git a/templates/org/teams.tmpl b/templates/org/teams.tmpl
index decfecf598..90ee209c0a 100644
--- a/templates/org/teams.tmpl
+++ b/templates/org/teams.tmpl
@@ -43,7 +43,7 @@
                         </p>
                     </div>
                     <div class="panel-footer">
-                        {{if .IsMember $.SignedUserId}}
+                        {{if .IsMember $.SignedUser.Id}}
                         <a class="pull-right btn btn-danger" href="/org/{{$.Org.Name}}/teams/{{.LowerName}}?action=leave">Leave</a>
                         {{else}}
                         <a class="pull-right btn btn-default" href="/org/{{$.Org.Name}}/teams/{{.LowerName}}?action=join">Join</a>
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index ea716e321a..b5a8ea4e47 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -10,7 +10,7 @@
                 <label for="owner" class="req">{{.i18n.Tr "repo.owner"}}</label>
                 <input id="repo-owner-id" type="hidden" name="uid" value="{{.ContextUser.Id}}" />
                 <div class="inline-block drop">
-                    <a href="#" class="drop-bottom">
+                    <a class="drop-bottom">
                         <img class="avatar" src="{{.ContextUser.AvatarLink}}" id="repo-owner-avatar" alt="user-avatar">
                         <strong id="repo-owner-name">{{.ContextUser.Name}}</strong>
                     </a>
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 5e9c3ea2db..31259f056d 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -20,7 +20,7 @@
                         <button id="repo-clone-https" class="btn btn-gray left">HTTPS</button>
                         <input id="repo-clone-url" type="text" class="ipt ipt-disabled left" value="{{.CloneLink.SSH}}" />
                         <button id="repo-clone-copy" class="btn btn-black left btn-right-radius">Copy</button>
-                        <p class="text-center" id="repo-clone-help">Need help cloning? Visit <a target="_blank" href="http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository">Help</a>!</p>
+                        <p class="text-center" id="repo-clone-help">{{.i18n.Tr "repo.clone_helper" | Str2html}}</p>
                         <hr/>
                         <div class="text-center" id="repo-clone-zip">
                             <a class="btn btn-green btn-radius" href="{{.RepoLink}}/archive/{{.BranchName}}.zip"><i class="octicon octicon-file-zip"></i>ZIP</a>
@@ -30,25 +30,24 @@
                 </div>
             </li>
             <li id="repo-header-watch">
-                <a id="repo-header-watch-btn" href="#">
+                <a id="repo-header-watch-btn" href="{{.RepoLink}}/action/{{if .IsWatchingRepo}}un{{end}}watch">
                     <button class="btn btn-gray text-bold btn-radius">
-                        <i class="octicon octicon-eye-watch"></i>{{if .IsWatchingRepo}}Unwatch{{else}}Watch{{end}}
-                        <span class="num">{{.Repository.NumWatches}}</span>
+                        <i class="octicon octicon-eye-watch"></i>{{if .IsWatchingRepo}}{{.i18n.Tr "repo.unwatch"}}{{else}}{{.i18n.Tr "repo.watch"}}{{end}}<span class="num">{{.Repository.NumWatches}}</span>
                     </button>
                 </a>
             </li>
             <li id="repo-header-star">
-                <a id="repo-header-star-btn" href="#">
+                <a id="repo-header-star-btn" href="{{.RepoLink}}/action/{{if .IsStaringRepo}}un{{end}}star">
                     <button class="btn btn-gray text-bold btn-radius">
-                        <i class="octicon octicon-star"></i>Star
+                        <i class="octicon octicon-star"></i>{{if .IsStaringRepo}}{{.i18n.Tr "repo.unstar"}}{{else}}{{.i18n.Tr "repo.star"}}{{end}}
                         <span class="num">{{.Repository.NumStars}}</span>
                     </button>
                 </a>
             </li>
             <li id="repo-header-fork">
-                <a id="repo-header-fork-btn" href="#">
+                <a id="repo-header-fork-btn" href="{{.RepoLink}}/action/fork">
                     <button class="btn btn-gray text-bold btn-radius">
-                        <i class="octicon octicon-repo-forked"></i>Fork
+                        <i class="octicon octicon-repo-forked"></i>{{.i18n.Tr "repo.fork"}}
                         <span class="num">{{.Repository.NumForks}}</span>
                     </button>
                 </a>
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 266d827547..42b8bdd4b1 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -57,12 +57,12 @@
                 </li>
                 <li id="repo-commits-jump" class="repo-jump right">
                     <a href="#">
-                        <button class="btn btn-small btn-gray btn-radius"><i class="octicon octicon-git-commit"></i></button>
+                        <button class="btn btn-small btn-gray btn-right-radius"><i class="octicon octicon-git-commit"></i></button>
                     </a>
                 </li>
                 <li id="repo-find-jump" class="repo-jump right">
                     <a href="#">
-                        <button class="btn btn-small btn-gray btn-radius"><i class="octicon octicon-list-unordered"></i></button>
+                        <button class="btn btn-small btn-gray btn-left-radius"><i class="octicon octicon-list-unordered"></i></button>
                     </a>
                 </li>
             </ul>
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 0b5cb4f4d9..c19c177e83 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -154,7 +154,7 @@
                                     <strong class="repo">{{.Name}}</strong>
                                 </span>
                                 <span class="right repo-star">
-                                    <i class="octicon octicon-star"></i>{{.NumStars}}
+                                    <i class="octicon octicon-sync"></i>{{.Interval}}H
                                 </span>
                             </a>
                         </li>