new user dahsboard issues

5 files changed, 119 insertions, 45 deletions

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 0470ac0bed..7d31c51337 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -62,6 +62,7 @@
 
 							{{if .IsSigned}}
 							<a class="item{{if .PageIsDashboard}} active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a>
+							<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
 							{{else}}
 							<a class="item{{if .PageIsHome}} active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a>
 							{{end}}
@@ -75,7 +76,6 @@
 							</div> -->
 
 							{{if .IsSigned}}
-							<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
 							<div class="right menu">
 								<div class="ui dropdown head link jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
 									<span class="text">
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index a92f891e6a..fb2e8c24ab 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -10,9 +10,11 @@
 	  <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks">
 	    {{.i18n.Tr "repo.settings.hooks"}}
 	  </a>
+	  {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}}
 	  <a class="{{if .PageIsSettingsGitHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks/git">
 	    {{.i18n.Tr "repo.settings.githooks"}}
 	  </a>
+	  {{end}}
 	  <a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{.RepoLink}}/settings/keys">
 	    {{.i18n.Tr "repo.settings.deploy_keys"}}
 	  </a>
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
new file mode 100644
index 0000000000..b104d69d16
--- /dev/null
+++ b/templates/user/dashboard/issues.tmpl
@@ -0,0 +1,86 @@
+{{template "base/head" .}}
+<div class="dashboard issues">
+  {{template "user/dashboard/navbar" .}}
+  <div class="ui container">
+  	<div class="ui grid">
+  		<div class="four wide column">
+  			<div class="ui secondary vertical filter menu">
+  				<a class="{{if eq .ViewType "all"}}active{{end}} item" href="{{.Link}}?repo={{.RepoID}}&state={{.State}}">
+  					{{.i18n.Tr "home.issues.in_your_repos"}}
+  					<strong class="ui right">{{.IssueStats.AllCount}}</strong>
+  				</a>
+  				<a class="{{if eq .ViewType "assigned"}}active{{end}} item" href="{{.Link}}?type=assigned&repo={{.RepoID}}&state={{.State}}">
+  					{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}
+  					<strong class="ui right">{{.IssueStats.AssignCount}}</strong>
+  				</a>
+  				<a class="{{if eq .ViewType "created_by"}}active{{end}} item" href="{{.Link}}?type=created_by&repo={{.RepoID}}&state={{.State}}">
+  					{{.i18n.Tr "repo.issues.filter_type.created_by_you"}}
+  					<strong class="ui right">{{.IssueStats.CreateCount}}</strong>
+  				</a>
+  				<div class="ui divider"></div>
+          {{range .Repos}}
+          <a class="{{if eq $.RepoID .ID}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}{{if not (eq $.RepoID .ID)}}&repo={{.ID}}{{end}}&state={{$.State}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="ui right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a>
+          {{end}}
+  			</div>
+  		</div>
+			<div class="twelve wide column content">
+				<div class="ui tiny buttons">
+				  <a class="ui green basic button {{if not .IsShowClosed}}active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&state=open">
+				  	<i class="octicon octicon-issue-opened"></i>
+				  	{{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}}
+				  </a>
+				  <a class="ui red basic button {{if .IsShowClosed}}active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&state=closed">
+				  	<i class="octicon octicon-issue-closed"></i>
+				  	{{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}}
+				  </a>
+				</div>
+
+				<div class="issue list">
+					{{range .Issues}}
+					{{ $timeStr:= TimeSince .Created $.Lang }}
+		      <li class="item">
+		      	<div class="ui label">#{{.ID}}</div>
+		      	<a class="title" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Name}}</a>
+
+		      	{{if .NumComments}}
+		      	<span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span>
+		      	{{end}}
+
+		        <p class="desc">
+		        	{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name | Safe}}
+			        {{if .Assignee}}
+							<a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center">
+								<img class="ui avatar image" src="{{.Assignee.AvatarLink}}">
+							</a>
+			        {{end}}
+		        </p>
+		      </li>
+		      {{end}}
+					
+					{{with .Page}}
+					{{if gt .TotalPages 1}}
+					<div class="center page buttons">
+						<div class="ui borderless pagination menu">
+						  <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&page={{.Previous}}"{{end}}>
+						    <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
+						  </a>
+							{{range .Pages}}
+							{{if eq .Num -1}}
+							<a class="disabled item">...</a>
+							{{else}}
+							<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&page={{.Num}}"{{end}}>{{.Num}}</a>
+							{{end}}
+							{{end}}
+						  <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&page={{.Next}}"{{end}}>
+						    {{$.i18n.Tr "repo.issues.next"}} <i class="icon right arrow"></i>
+						  </a>
+						</div>
+					</div>
+					{{end}}
+					{{end}}
+				</div>
+		  </div>
+  	</div>
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
new file mode 100644
index 0000000000..6e14b4bdaf
--- /dev/null
+++ b/templates/user/dashboard/navbar.tmpl
@@ -0,0 +1,30 @@
+<div class="ui container">
+  <div class="ui floating dropdown link jump">
+    <span class="text">
+    	<img class="ui avatar image" src="{{.ContextUser.AvatarLink}}">
+  		{{.ContextUser.Name}}
+    	<i class="dropdown icon"></i>
+  	</span>
+    <div class="context user menu" tabindex="-1">
+			<div class="ui header">
+				{{.i18n.Tr "home.switch_dashboard_context"}}
+			</div>
+    	<a class="{{if eq .ContextUser.Id .SignedUser.Id}}active selected{{end}} item" href="{{AppSubUrl}}/issues">
+      	<img class="ui image" src="{{.SignedUser.AvatarLink}}">
+    		{{.SignedUser.Name}}
+    	</a>
+    	{{range .Orgs}}
+    	{{if .IsOwnedBy $.SignedUser.Id}}
+    	<a class="{{if eq $.ContextUser.Id .Id}}active selected{{end}} item" href="{{AppSubUrl}}/org/{{.Name}}/issues">
+      	<img class="ui image" src="{{.AvatarLink}}">
+    		{{.Name}}
+    	</a>
+    	{{end}}
+    	{{end}}
+    	<a class="item" href="{{AppSubUrl}}/org/create">
+    		<i class="octicon octicon-repo-create"></i>&nbsp;&nbsp;&nbsp;{{.i18n.Tr "new_org"}}
+    	</a>
+    </div>
+  </div>
+</div>
+<div class="ui divider"></div>
\ No newline at end of file
diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl
deleted file mode 100644
index 677f9d1410..0000000000
--- a/templates/user/issues.tmpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-{{template "user/dashboard/nav" .}}
-<div id="dashboard-wrapper">
-	<div id="dashboard" class="container" data-page="user">
-		{{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
-		<div id="issue">
-		    <div class="left grid-1-5 filter-list">
-		        <ul class="list-unstyled menu menu-vertical">
-		            <li><a href="{{AppSubUrl}}/issues?state={{.State}}&repoid={{.RepoId}}" class="radius{{if eq .ViewType "all"}} active{{end}}" >In your repositories <strong class="pull-right">{{.IssueStats.AllCount}}</strong></a></li>
-		            <li><a href="{{AppSubUrl}}/issues?type=assigned&repoid={{.RepoId}}&state={{.State}}" class="radius{{if eq .ViewType "assigned"}} active{{end}}">Assigned to you <strong class="pull-right">{{.IssueStats.AssignCount}}</strong></a></li>
-		            <li><a href="{{AppSubUrl}}/issues?type=created_by&repoid={{.RepoId}}&state={{.State}}" class="radius{{if eq .ViewType "created_by"}} active{{end}}">Created by you <strong class="pull-right">{{.IssueStats.CreateCount}}</strong></a></li>
-		            <li><hr/></li>
-		            {{range .Repos}}
-		            <li><a href="{{AppSubUrl}}/issues?type={{$.ViewType}}{{if eq $.RepoId .ID}}{{else}}&repoid={{.ID}}{{end}}&state={{$.State}}" class="radius{{if eq $.RepoId .ID}} active{{end}}">{{$.SignedUser.Name}}/{{.Name}} <strong class="pull-right">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</strong></a></li>
-		            {{end}}
-		        </ul>
-		    </div>
-		    <div class="right grid-3-4">
-		        <div class="filter-option">
-		            <div class="btn-group">
-		                <a class="btn btn-white btn-small issue-open{{if not .IsShowClosed}} active{{end}}" href="{{AppSubUrl}}/issues?type={{.ViewType}}&repoid={{.RepoId}}">Open</a>
-		                <a class="btn btn-white btn-small issue-close{{if .IsShowClosed}} active{{end}}" href="{{AppSubUrl}}/issues?type={{.ViewType}}&repoid={{.RepoId}}&state=closed">Closed</a>
-		            </div>
-		        </div>
-		        <div class="issues list-group">
-		            {{range .Issues}}{{if .}}
-		            <div class="list-group-item issue-item" id="issue-{{.ID}}" onclick="window.location.href='{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}'">
-		                <span class="number pull-right">#{{.Index}}</span>
-		                <h5 class="title"><a href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Name}}</a></h5>
-		                <p class="info">
-		                    <span class="author"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" width="20"/>
-		                    <a href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a></span>
-		                    <span class="time">{{TimeSince .Created $.Lang}}</span>
-		                    <span class="comment"><i class="fa fa-comments"></i> {{.NumComments}}</span>
-		                </p>
-		            </div>
-		            {{end}}{{end}}
-		        </div>
-		    </div>
-		</div>
-	</div>
-</div>
-{{template "ng/base/footer" .}}