Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	routers/user/user.go
	web.go

README.md

@@ -3,7 +3,7 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0b
 
 Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language, it currently supports Linux and Max OS X, but Windows has **NOT** supported yet due to installation problem with [libgit2](http://libgit2.github.com/) in Windows.
 
-##### Current version: 0.0.7 Alpha
+##### Current version: 0.0.8 Alpha
 
 ## Purpose
 

models/action.go

@@ -56,6 +56,7 @@ func NewRepoAction(user *User, repo *Repository) error {
 	return err
 }
 
+// GetFeeds returns action list of given user in given context.
 func GetFeeds(userid, offset int64, isProfile bool) ([]Action, error) {
 	actions := make([]Action, 0, 20)
 	sess := orm.Limit(20, int(offset)).Desc("id").Where("user_id=?", userid)

models/repo2.go

@@ -1,3 +1,7 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package models
 
 import (

modules/auth/user.go

@@ -63,7 +63,7 @@ func IsSignedIn(session sessions.Session) bool {
 
 type FeedsForm struct {
 	UserId int64 `form:"userid" binding:"Required"`
-	Offset int64 `form:"offset"`
+	Page   int64 `form:"p"`
 }
 
 type UpdateProfileForm struct {

routers/user/user.go

@@ -5,6 +5,7 @@
 package user
 
 import (
+	"fmt"
 	"net/http"
 
 	"github.com/codegangsta/martini"
@@ -27,6 +28,13 @@ func Dashboard(r render.Render, data base.TmplData, session sessions.Session) {
 		return
 	}
 	data["MyRepos"] = repos
+
+	feeds, err := models.GetFeeds(auth.SignedInId(session), 0, false)
+	if err != nil {
+		log.Handle(200, "user.Dashboard", data, r, err)
+		return
+	}
+	data["Feeds"] = feeds
 	r.HTML(200, "user/dashboard", data)
 }
 
@@ -172,10 +180,21 @@ func Delete(data base.TmplData, req *http.Request, session sessions.Session, r r
 	r.HTML(200, "user/delete", data)
 }
 
+const (
+	feedTpl = `<i class="icon fa fa-%s"></i>
+                        <div class="info"><span class="meta">%s</span><br>%s</div>`
+)
+
 func Feeds(form auth.FeedsForm, r render.Render) {
-	actions, err := models.GetFeeds(form.UserId, form.Offset, false)
+	actions, err := models.GetFeeds(form.UserId, form.Page*20, false)
 	if err != nil {
 		r.JSON(500, err)
 	}
-	r.JSON(200, actions)
+
+	feeds := make([]string, len(actions))
+	for i := range actions {
+		feeds[i] = fmt.Sprintf(feedTpl, base.ActionIcon(actions[i].OpType),
+			base.TimeSince(actions[i].Created), base.ActionDesc(actions[i]))
+	}
+	r.JSON(200, &feeds)
 }

templates/repo/created.tmpl

@@ -1,8 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div class="container" id="gogs-body">
-	<div class="col-md-offset-4 col-md-3">
-		Created successfully!
-	</div>
-</div>
-{{template "base/footer" .}}

templates/user/dashboard.tmpl

@@ -14,7 +14,17 @@
 <div id="gogs-body" class="container">
     {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
     <div id="gogs-feed-left" class="col-md-8">
-        Website is still in the progress of building...please come back later! <strong>{{.SignedUserName}}</strong> is logged!
+        <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>
+                <span class="clearfix"></span>
+            </li>
+        {{else}}
+            <li>Not any activity yet.</li>
+        {{end}}
+        </ul>
     </div>
     <div id="gogs-feed-right" class="col-md-4">
         <div class="panel panel-default repo-panel">

templates/user/profile.tmpl

@@ -39,12 +39,12 @@
                         <span class="clearfix"></span>
                     </li>
                 {{else}}
-                    <li>Not found any activity</li>
+                    <li>Not any public activity yet.</li>
                 {{end}}
                 </ul>
             </div>
             {{else}}
-                <div class="tab-pane active">repo</div>
+            <div class="tab-pane active">repo</div>
             {{end}}
         </div>
     </div>

web.go

@@ -49,7 +49,7 @@ func runWeb(*cli.Context) {
 	m.Use(middleware.InitContext())
 
 	// Routers.
-	m.Get("/", middleware.SignInRequire(false), routers.Home)
+	m.Get("/", middleware.SignInRequire(true), routers.Home)
 	m.Any("/user/login", middleware.SignOutRequire(), binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
 	m.Any("/user/logout", middleware.SignInRequire(true), user.SignOut)
 	m.Any("/user/sign_up", middleware.SignOutRequire(), binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)