issue list in user

diff --git a/public/css/gogs.css b/public/css/gogs.css
index ae970b479982a72810d0fd63fec305c2e1c7c5bd..06f59319168a671432451721f459901f5b3b8381 100755 (executable)
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1026,6 +1026,14 @@ html, body {
     color: #444;
 }
 
+#issue .filter-list a.sm{
+    font-size: 13px;
+}
+
+#issue .filter-list hr{
+    border-color: #CCC;
+}
+
 #issue .filter-list a:hover {
     background-color: #DDD;
     text-decoration: none;
@@ -1044,6 +1052,10 @@ html, body {
     background-color: #FFF;
 }
 
+#issue .issue-item:hover{
+    background-color: rgba(19, 95, 215, 0.03);
+}
+
 #issue .list-group .list-group-item.unread {
     border-left: 2px solid #DD4B39;
 }

diff --git a/routers/user/user.go b/routers/user/user.go
index a0321f187bb50caa9a7ba213c01c0df50b8076a9..d3ef96211eb242f444438cfa8fa24fe424fbc804 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -285,7 +285,8 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
 }
 
 func Issues(ctx *middleware.Context) {
-       ctx.HTML(200, "user/issues")
+       ctx.Data["Title"] = "Your Issues"
+       ctx.HTML(200, "issue/user")
 }
 
 func Pulls(ctx *middleware.Context) {

diff --git a/templates/issue/repo.tmpl b/templates/issue/repo.tmpl
new file mode 100644 (file)
index 0000000..c348f27
--- /dev/null
+++ b/templates/issue/repo.tmpl
@@ -0,0 +1,56 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="body" class="container">
+    <div id="issue">
+        <div class="col-md-3 filter-list">
+            <ul class="list-unstyled">
+                <li><a href="#" class="active">All Issues <strong class="pull-right">10</strong></a></li>
+                <li><a href="#">My Issues</a></li>
+                <li><a href="#">Mentioned</a></li>
+            </ul>
+        </div>
+        <div class="col-md-9">
+            <div class="filter-option">
+                <div class="btn-group">
+                    <a class="btn btn-default active issue-open" href="#">27 Open</a>
+                    <a class="btn btn-default issue-close" href="#">Close 128</a>
+                </div>
+            </div>
+            <div class="issues list-group">
+                <div class="list-group-item unread issue-item" id="issue-id">
+                    <span class="number pull-right">#123</span>
+                    <h5 class="title"><a href="#">Bug: When running tests after generating a beego app, templates do not load.</a></h5>
+                    <p class="info">
+                        <span class="author"><img class="avatar" src="http://tp2.sinaimg.cn/5068084885/50/40050297589/1" alt="" width="20"/>
+                        <a href="#">Obama</a></span>
+                        <span class="time">3 days ago</span>
+                        <span class="comment"><i class="fa fa-comments"></i> 3</span>
+                    </p>
+                </div>
+                <div class="list-group-item issue-item" id="issue-id2">
+                    <span class="number pull-right">#123</span>
+                    <h5 class="title"><a href="#">Bug: When running tests after generating a beego app, templates do not load.</a></h5>
+                    <p class="info">
+                        <span class="author"><img class="avatar" src="http://tp2.sinaimg.cn/5068084885/50/40050297589/1" alt="" width="20"/>
+                        <a href="#">Obama</a></span>
+                        <span class="time">3 days ago</span>
+                        <span class="comment"><i class="fa fa-comments"></i> 3</span>
+                    </p>
+                </div>
+                <div class="list-group-item issue-item" id="issue-id3">
+                    <span class="number pull-right">#123</span>
+                    <h5 class="title"><a href="#">Bug: When running tests after generating a beego app, templates do not load.</a></h5>
+                    <p class="info">
+                        <span class="author"><img class="avatar" src="http://tp2.sinaimg.cn/5068084885/50/40050297589/1" alt="" width="20"/>
+                        <a href="#">Obama</a></span>
+                        <span class="time">3 days ago</span>
+                        <span class="comment"><i class="fa fa-comments"></i> 3</span>
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/issue/user.tmpl b/templates/issue/user.tmpl
new file mode 100644 (file)
index 0000000..2cf9571
--- /dev/null
+++ b/templates/issue/user.tmpl
@@ -0,0 +1,70 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body-nav">
+    <div class="container">
+        <ul class="nav nav-pills pull-right">
+            <li><a href="/">Feed</a></li>
+            <li class="active"><a href="/issues">Issues</a></li>
+            <!-- <li><a href="/pulls">Pull Requests</a></li>
+            <li><a href="/stars">Stars</a></li> -->
+        </ul>
+        <h3>Your Issues</h3>
+    </div>
+</div>
+<div id="body" class="container" data-page="user">
+    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
+    <div id="issue">
+        <div class="col-md-3 filter-list">
+            <ul class="list-unstyled">
+                <li><a href="#" class="active">In your repositories <strong class="pull-right">10</strong></a></li>
+                <li><a href="#">Created by you</a></li>
+                <li><a href="#">Assigned to you</a></li>
+                <li><hr/></li>
+                <li><a href="" class="sm">gogits/gogs <strong class="pull-right">12</strong></a></li>
+                <li><a href="" class="sm">gogits/session <strong class="pull-right">8</strong></a></li>
+                <li><a href="" class="sm">gogits/git <strong class="pull-right">2</strong></a></li>
+            </ul>
+        </div>
+        <div class="col-md-9">
+            <div class="filter-option">
+                <div class="btn-group">
+                    <a class="btn btn-default active issue-open" href="#">27 Open</a>
+                    <a class="btn btn-default issue-close" href="#">Close 128</a>
+                </div>
+            </div>
+            <div class="issues list-group">
+                <div class="list-group-item unread issue-item" id="issue-id">
+                    <span class="number pull-right">#123</span>
+                    <h5 class="title"><a href="#">Bug: When running tests after generating a beego app, templates do not load.</a></h5>
+                    <p class="info">
+                        <span class="author"><img class="avatar" src="http://tp2.sinaimg.cn/5068084885/50/40050297589/1" alt="" width="20"/>
+                        <a href="#">Obama</a></span>
+                        <span class="time">3 days ago</span>
+                        <span class="comment"><i class="fa fa-comments"></i> 3</span>
+                    </p>
+                </div>
+                <div class="list-group-item issue-item" id="issue-id2">
+                    <span class="number pull-right">#123</span>
+                    <h5 class="title"><a href="#">Bug: When running tests after generating a beego app, templates do not load.</a></h5>
+                    <p class="info">
+                        <span class="author"><img class="avatar" src="http://tp2.sinaimg.cn/5068084885/50/40050297589/1" alt="" width="20"/>
+                        <a href="#">Obama</a></span>
+                        <span class="time">3 days ago</span>
+                        <span class="comment"><i class="fa fa-comments"></i> 3</span>
+                    </p>
+                </div>
+                <div class="list-group-item issue-item" id="issue-id3">
+                    <span class="number pull-right">#123</span>
+                    <h5 class="title"><a href="#">Bug: When running tests after generating a beego app, templates do not load.</a></h5>
+                    <p class="info">
+                        <span class="author"><img class="avatar" src="http://tp2.sinaimg.cn/5068084885/50/40050297589/1" alt="" width="20"/>
+                        <a href="#">Obama</a></span>
+                        <span class="time">3 days ago</span>
+                        <span class="comment"><i class="fa fa-comments"></i> 3</span>
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/repo/issues.tmpl b/templates/repo/issues.tmpl
deleted file mode 100644 (file)
index df53197..0000000
--- a/templates/repo/issues.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-{{template "repo/nav" .}}
-{{template "repo/toolbar" .}}
-<div id="body" class="container">
-    <div id="source">
-        issues
-    </div>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl
deleted file mode 100644 (file)
index dd17b66..0000000
--- a/templates/user/issues.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body-nav">
-    <div class="container">
-        <ul class="nav nav-pills pull-right">
-            <li><a href="/">Feed</a></li>
-            <li class="active"><a href="/issues">Issues</a></li>
-            <!-- <li><a href="/pulls">Pull Requests</a></li>
-            <li><a href="/stars">Stars</a></li> -->
-        </ul>
-        <h3>Issues</h3>
-    </div>
-</div>
-<div id="body" class="container" data-page="user">
-    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
-</div>
-{{template "base/footer" .}}
\ No newline at end of file